Rename PRORES -> PRORES_HQ

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 0e6e908b3245c88fb8e9851e4e898a452c8d64bb..b5b2ca972e57aa345856cea8ce28037db1788283 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -228,13 +228,10 @@ FilmViewer::recreate_butler ()
                VideoRange::FULL,
                j2k_gl_optimised ? Image::Alignment::COMPACT : Image::Alignment::PADDED,
                true,
-               j2k_gl_optimised
+               j2k_gl_optimised,
+               (Config::instance()->sound() && _audio.isStreamOpen()) ? Butler::Audio::ENABLED : Butler::Audio::DISABLED
                );
 
-       if (!Config::instance()->sound() && !_audio.isStreamOpen()) {
-               _butler->disable_audio ();
-       }
-
        _closed_captions_dialog->set_butler (_butler);
 
        resume ();
@@ -816,7 +813,7 @@ FilmViewer::set_crop_guess (dcpomatic::Rect<float> crop)
 void
 FilmViewer::unset_crop_guess ()
 {
-       _crop_guess = {};
+       _crop_guess = boost::none;
        _video_view->update ();
 }