Try to fix some warnings.

[dcpomatic.git] / src / wx / film_viewer.cc

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 35b0663b0fd10b596dd73d4f1ce18c26abdf519f..fee5605da9c3352193610325752a68dbe0ca03ba 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -89,6 +89,7 @@ FilmViewer::FilmViewer (wxWindow* p)
        , _pad_black (false)
 #ifdef DCPOMATIC_VARIANT_SWAROOP
        , _in_watermark (false)
+       , _background_image (false)
 #endif
 {
 #ifndef __WXOSX__
@@ -121,6 +122,9 @@ FilmViewer::set_film (shared_ptr<Film> film)
        }
 
        _film = film;
+       _video_position = DCPTime ();
+       _player_video.first.reset ();
+       _player_video.second = DCPTime ();
 
        _frame.reset ();
        _closed_captions_dialog->clear ();
@@ -139,7 +143,7 @@ FilmViewer::set_film (shared_ptr<Film> film)
                if (_dcp_decode_reduction) {
                        _player->set_dcp_decode_reduction (_dcp_decode_reduction);
                }
-       } catch (bad_alloc) {
+       } catch (bad_alloc &) {
                error_dialog (_panel, _("There is not enough free memory to do that."));
                _film.reset ();
                return;
@@ -295,6 +299,8 @@ FilmViewer::timer ()
 
        if (next >= _film->length()) {
                stop ();
+               Finished ();
+               return;
        }
 
        _timer.Start (max ((next.seconds() - time().seconds()) * 1000, 1.0), wxTIMER_ONE_SHOT);
@@ -305,9 +311,9 @@ FilmViewer::timer ()
 }
 
 bool
+#ifdef DCPOMATIC_VARIANT_SWAROOP
 FilmViewer::maybe_draw_background_image (wxPaintDC& dc)
 {
-#ifdef DCPOMATIC_VARIANT_SWAROOP
        optional<boost::filesystem::path> bg = Config::instance()->player_background_image();
        if (bg) {
                wxImage image (std_to_wx(bg->string()));
@@ -315,23 +321,31 @@ FilmViewer::maybe_draw_background_image (wxPaintDC& dc)
                dc.DrawBitmap (bitmap, max(0, (_panel_size.width - image.GetSize().GetWidth()) / 2), max(0, (_panel_size.height - image.GetSize().GetHeight()) / 2));
                return true;
        }
-#endif
 
        return false;
 }
+#else
+FilmViewer::maybe_draw_background_image (wxPaintDC &)
+{
+       return false;
+}
+#endif
 
 void
 FilmViewer::paint_panel ()
 {
        wxPaintDC dc (_panel);
 
-       if (!_frame || !_film || !_out_size.width || !_out_size.height || _out_size != _frame->size()) {
+#ifdef DCPOMATIC_VARIANT_SWAROOP
+       if (_background_image) {
                dc.Clear ();
                maybe_draw_background_image (dc);
                return;
        }
+#endif
 
-       if (_video_position == DCPTime() && maybe_draw_background_image (dc)) {
+       if (!_out_size.width || !_out_size.height || !_film || !_frame || _out_size != _frame->size()) {
+               dc.Clear ();
                return;
        }
 
@@ -598,7 +612,6 @@ FilmViewer::seek (DCPTime t, bool accurate)
        }
 
        PositionChanged ();
-       Seeked (position());
 }
 
 void
@@ -636,7 +649,6 @@ FilmViewer::config_changed (Config::Property p)
                }
 
                _audio_channels = _audio.getDeviceInfo(st).outputChannels;
-               cout << "RtAudio reports " << _audio_channels << " channels.\n";
 
                RtAudio::StreamParameters sp;
                sp.deviceId = st;