X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=47851a21874249f67244ed168259c2c47d9ddbb6;hb=bcc4e2f7dc4cd5658e199ddacb7202b00ec72cf1;hp=cce7c369be8b9966e563c90ff538392abfcf1130;hpb=b76cc13859babfd18ba528f3d61397ba284884c5;p=dcpomatic.git

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index cce7c369b..47851a218 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -92,6 +92,9 @@
 #include <wx/preferences.h>
 #include <wx/splash.h>
 #include <wx/wxhtml.h>
+#ifdef __WXGTK__
+#include <X11/Xlib.h>
+#endif
 #ifdef __WXMSW__
 #include <shellapi.h>
 #endif
@@ -1488,6 +1491,7 @@ static const wxCmdLineEntryDesc command_line_description[] = {
 	{ wxCMD_LINE_OPTION, "c", "content", "add content file / directory", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
 	{ wxCMD_LINE_OPTION, "d", "dcp", "add content DCP", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
 	{ wxCMD_LINE_SWITCH, "v", "version", "show DCP-o-matic version", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
+	{ wxCMD_LINE_OPTION, "", "config", "directory containing config.xml and cinemas.xml", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
 	{ wxCMD_LINE_PARAM, 0, 0, "film to load or create", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
 	{ wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
 };
@@ -1502,7 +1506,11 @@ public:
 		: wxApp ()
 		, _frame (0)
 		, _splash (0)
-	{}
+	{
+#ifdef DCPOMATIC_LINUX
+		XInitThreads ();
+#endif
+	}
 
 private:
 
@@ -1653,6 +1661,11 @@ private:
 			_dcp_to_add = wx_to_std (dcp);
 		}
 
+		wxString config;
+		if (parser.Found (wxT("config"), &config)) {
+			State::override_path = wx_to_std (config);
+		}
+
 		return true;
 	}