Hack around changes in main branch with respect to suspend/resume.

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 373e6d717246d956f982242d83103ce1cbc405fb..dc6ed10c4d0616fbb6c2bb15e0f40deb093f6a32 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -306,7 +306,7 @@ FilmViewer::resume ()
                        _audio.setStreamTime (_video_position.seconds());
                        _audio.startStream ();
                }
                        _audio.setStreamTime (_video_position.seconds());
                        _audio.startStream ();
                }

-               timer ();
+               _video_view->start ();

        }
 }
 
        }
 }
 


@@ -461,9 +461,6 @@ FilmViewer::seek (DCPTime t, bool accurate)
 
        if (!_playing) {
                request_idle_get ();
 
        if (!_playing) {
                request_idle_get ();

-       } else {
-               /* Make sure we get a frame so that _video_position is set up before we resume */
-               while (!get(true)) {}

        }
 
        resume ();
        }
 
        resume ();