Barely-functioning GL playback with new arrangement.

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

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 86481884560b36cf172d656283d559f22df5bc35..6bd5b36ffd1f0f61974c6b94d9de177f7a632aa3 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -66,6 +66,9 @@
 #include <wx/preferences.h>
 #include <wx/progdlg.h>
 #include <wx/display.h>
+#ifdef __WXGTK__
+#include <X11/Xlib.h>
+#endif
 #ifdef __WXOSX__
 #include <ApplicationServices/ApplicationServices.h>
 #endif
@@ -395,6 +398,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 +489,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();
 
@@ -1043,7 +1047,11 @@ public:
        App ()
                : wxApp ()
                , _frame (0)
-       {}
+       {
+#ifdef DCPOMATIC_LINUX
+               XInitThreads ();
+#endif
+       }
 
 private: