dcpomatic_create should respond to --version on stdout, not stderr (#1686).

[dcpomatic.git] / src / tools / dcpomatic_player.cc

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 86481884560b36cf172d656283d559f22df5bc35..f68d0ead27bad93741e5cd54eca261f33baf199a 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -395,6 +395,7 @@ public:
        {
                _film = film;
                _film->set_tolerant (true);
+               _film->set_audio_channels (MAX_DCP_AUDIO_CHANNELS);
                _viewer->set_film (_film);
                _controls->set_film (_film);
                _film->Change.connect (bind(&DOMFrame::film_changed, this, _1, _2));
@@ -485,7 +486,7 @@ private:
                _file_menu = new wxMenu;
                _file_menu->Append (ID_file_open, _("&Open...\tCtrl-O"));
                _file_add_ov = _file_menu->Append (ID_file_add_ov, _("&Add OV..."));
-               _file_add_kdm = _file_menu->Append (ID_file_add_kdm, _("&Add KDM..."));
+               _file_add_kdm = _file_menu->Append (ID_file_add_kdm, _("Add &KDM..."));
 
                _history_position = _file_menu->GetMenuItems().GetCount();