Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index c1ea926eafe669327f02e5bde3c153a81be723d3..fa7ccf7cc707b305d450acd00301927c0663ed22 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -1117,18 +1117,26 @@ public:
                table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxALL);
                table->AddSpacer (0);
 
-               add_label_to_sizer (table, panel, _("Log"), true);
-               _log_general = new wxCheckBox (panel, wxID_ANY, _("General"));
-               table->Add (_log_general, 1, wxEXPAND | wxALL);
-               _log_warning = new wxCheckBox (panel, wxID_ANY, _("Warnings"));
-               table->AddSpacer (0);
-               table->Add (_log_warning, 1, wxEXPAND | wxALL);
-               _log_error = new wxCheckBox (panel, wxID_ANY, _("Errors"));
-               table->AddSpacer (0);
-               table->Add (_log_error, 1, wxEXPAND | wxALL);
-               _log_timing = new wxCheckBox (panel, wxID_ANY, S_("Config|Timing"));
-               table->AddSpacer (0);
-               table->Add (_log_timing, 1, wxEXPAND | wxALL);
+               int flags = wxALIGN_TOP | wxLEFT | wxRIGHT | wxEXPAND | wxALL;
+#ifdef __WXOSX__
+               flags |= wxALIGN_RIGHT;
+               t += wxT (":");
+#endif 
+               wxStaticText* m = new wxStaticText (panel, wxID_ANY, _("Log"));
+               table->Add (m, 0, flags, 6);
+               
+               {
+                       wxBoxSizer* t = new wxBoxSizer (wxVERTICAL);
+                       _log_general = new wxCheckBox (panel, wxID_ANY, _("General"));
+                       t->Add (_log_general, 1, wxEXPAND | wxALL);
+                       _log_warning = new wxCheckBox (panel, wxID_ANY, _("Warnings"));
+                       t->Add (_log_warning, 1, wxEXPAND | wxALL);
+                       _log_error = new wxCheckBox (panel, wxID_ANY, _("Errors"));
+                       t->Add (_log_error, 1, wxEXPAND | wxALL);
+                       _log_timing = new wxCheckBox (panel, wxID_ANY, S_("Config|Timing"));
+                       t->Add (_log_timing, 1, wxEXPAND | wxALL);
+                       table->Add (t, 0, wxALL, 6);
+               }
 
                Config* config = Config::instance ();
                

diff --git a/test/test.cc b/test/test.cc
index 0211c2cb8ae9d8e88c60a677b4b471f702daad06..71cd50ac928b9b9cab897abc445532c7c918a55e 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -72,6 +72,7 @@ struct TestConfig
                Config::instance()->set_default_container (static_cast<Ratio*> (0));
                Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
                Config::instance()->set_default_audio_delay (0);
+               Config::instance()->set_default_j2k_bandwidth (100000000);
 
                ServerFinder::instance()->disable ();