Merge master.

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

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 2b07dd1dc6242836f1bb02ed15cf95848a201f19..911cb4b3f3cf07efb19d28aa8deeb948d2107926 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -26,7 +26,7 @@
 #include <boost/filesystem.hpp>
 #include <wx/stdpaths.h>
 #include <wx/notebook.h>
-#include <libdcp/colour_matrix.h>
+#include <dcp/colour_matrix.h>
 #include "lib/config.h"
 #include "lib/ratio.h"
 #include "lib/scaler.h"
@@ -230,7 +230,7 @@ ConfigDialog::make_defaults_panel ()
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
                _default_j2k_bandwidth = new wxSpinCtrl (_defaults_panel);
                s->Add (_default_j2k_bandwidth);
-               add_label_to_sizer (s, _defaults_panel, _("MBps"), false);
+               add_label_to_sizer (s, _defaults_panel, _("Mbit/s"), false);
                table->Add (s, 1);
        }
 
@@ -501,7 +501,7 @@ ConfigDialog::default_dcp_content_type_changed ()
 void
 ConfigDialog::issuer_changed ()
 {
-       libdcp::XMLMetadata m = Config::instance()->dcp_metadata ();
+       dcp::XMLMetadata m = Config::instance()->dcp_metadata ();
        m.issuer = wx_to_std (_issuer->GetValue ());
        Config::instance()->set_dcp_metadata (m);
 }
@@ -509,7 +509,7 @@ ConfigDialog::issuer_changed ()
 void
 ConfigDialog::creator_changed ()
 {
-       libdcp::XMLMetadata m = Config::instance()->dcp_metadata ();
+       dcp::XMLMetadata m = Config::instance()->dcp_metadata ();
        m.creator = wx_to_std (_creator->GetValue ());
        Config::instance()->set_dcp_metadata (m);
 }