Changeset 75d4a2b in git


Ignore:
Timestamp:
17/06/11 06:43:33 (8 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, svn/tags/1.2.0, svn/tags/1.2.1, svn/tags/1.2.2, svn/tags/1.2.3, svn/tags/1.2.4, svn/tags/1.2.5, svn/trunk, travis-osx
Children:
0c6b06cb
Parents:
cc9e7a06
Message:

src/gfxcore.cc,src/gfxcore.h: Rename 'mpeg' member to 'movie'.

git-svn-id: file:///home/survex-svn/survex/trunk@3616 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rcc9e7a06 r75d4a2b  
     1Fri Jun 17 05:43:12 GMT 2011  Olly Betts <olly@survex.com>
     2
     3        * src/gfxcore.cc,src/gfxcore.h: Rename 'mpeg' member to 'movie'.
     4
    15Fri Jun 17 04:30:12 GMT 2011  Olly Betts <olly@survex.com>
    26
  • src/gfxcore.cc

    rcc9e7a06 r75d4a2b  
    152152    pres_reverse(false),
    153153    pres_speed(0.0),
    154     mpeg(NULL),
     154    movie(NULL),
    155155    current_cursor(GfxCore::CURSOR_DEFAULT)
    156156{
     
    12771277    static double last_t = 0;
    12781278    double t;
    1279     if (mpeg) {
     1279    if (movie) {
    12801280        // FIXME: this glReadPixels call should be in gla-gl.cc
    1281         glReadPixels(0, 0, mpeg->GetWidth(), mpeg->GetHeight(), GL_RGB,
    1282                      GL_UNSIGNED_BYTE, (GLvoid *)mpeg->GetBuffer());
    1283         mpeg->AddFrame();
     1281        glReadPixels(0, 0, movie->GetWidth(), movie->GetHeight(), GL_RGB,
     1282                     GL_UNSIGNED_BYTE, (GLvoid *)movie->GetBuffer());
     1283        movie->AddFrame();
    12841284        t = 1.0 / 25.0; // 25 frames per second
    12851285    } else {
     
    13061306                SetView(prev_mark);
    13071307                presentation_mode = 0;
    1308                 if (mpeg) {
    1309                     delete mpeg;
    1310                     mpeg = 0;
     1308                if (movie) {
     1309                    delete movie;
     1310                    movie = 0;
    13111311                }
    13121312                break;
     
    28782878    height += (height & 1);
    28792879
    2880     mpeg = new MovieMaker();
     2880    movie = new MovieMaker();
    28812881
    28822882    // FIXME: This should really use fn_str() - currently we probably can't
    28832883    // save to a Unicode path on wxmsw.
    2884     if (!mpeg->Open(fnm.mb_str(), width, height)) {
     2884    if (!movie->Open(fnm.mb_str(), width, height)) {
    28852885        // FIXME : sort out reporting actual errors from ffmpeg library
    28862886        wxGetApp().ReportError(wxString::Format(wmsg(/*Error writing to file `%s'*/110), fnm.c_str()));
    2887         delete mpeg;
    2888         mpeg = 0;
     2887        delete movie;
     2888        movie = 0;
    28892889        return false;
    28902890    }
  • src/gfxcore.h

    rcc9e7a06 r75d4a2b  
    191191    double this_mark_total;
    192192
    193     MovieMaker * mpeg;
     193    MovieMaker * movie;
    194194
    195195    cursor current_cursor;
Note: See TracChangeset for help on using the changeset viewer.