Fix ghostly appearance of reencode-J2K button in simple mode.

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

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 2d489b3e82ec9465acc6c9b336cdb3da986afba5..35b0663b0fd10b596dd73d4f1ce18c26abdf519f 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -122,8 +122,6 @@ FilmViewer::set_film (shared_ptr<Film> film)
 
        _film = film;
 
-       FilmChanged ();
-
        _frame.reset ();
        _closed_captions_dialog->clear ();
 
@@ -193,7 +191,7 @@ FilmViewer::recreate_butler ()
                map.set (dcp::RS,     1, 1 / sqrt(2)); // Rs -> Rt
        }
 
-       _butler.reset (new Butler(_player, _film->log(), map, _audio_channels, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
+       _butler.reset (new Butler(_player, map, _audio_channels, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
        if (!Config::instance()->sound() && !_audio.isStreamOpen()) {
                _butler->disable_audio ();
        }
@@ -638,6 +636,7 @@ 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;