Emit no audio from DCPs if none is mapped

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

diff --git a/src/wx/name_format_editor.cc b/src/wx/name_format_editor.cc
index b2c11b50c8ad385a12fd1b2efd364e3b2a1728f2..67e2517bed7758f818d9f554b7714065e7c99cca 100644 (file)
--- a/src/wx/name_format_editor.cc
+++ b/src/wx/name_format_editor.cc
@@ -20,8 +20,8 @@
 
 
 #include "name_format_editor.h"
-#include "wx_util.h"
 #include "static_text.h"
+#include "wx_util.h"
 #include "lib/util.h"
 
 
@@ -43,15 +43,17 @@ NameFormatEditor::NameFormatEditor (wxWindow* parent, dcp::NameFormat name, dcp:
        }
        _panel->SetSizer (_sizer);
 
+       auto titles_sizer = new wxFlexGridSizer (2);
        for (auto const& i: titles) {
                auto t = new StaticText (_panel, std_to_wx (String::compose ("%%%1 %2", i.first, i.second)));
-               _sizer->Add (t);
+               titles_sizer->Add(t, 1, wxRIGHT, DCPOMATIC_SIZER_X_GAP);
                auto font = t->GetFont();
                font.SetStyle (wxFONTSTYLE_ITALIC);
                font.SetPointSize (font.GetPointSize() - 1);
                t->SetFont (font);
                t->SetForegroundColour (wxColour (0, 0, 204));
        }
+       _sizer->Add (titles_sizer);
 
        _specification->SetValue (std_to_wx (_name.specification()));
        _specification->Bind (wxEVT_TEXT, boost::bind(&NameFormatEditor::changed, this));
@@ -75,9 +77,9 @@ NameFormatEditor::update_example ()
                return;
        }
 
-       _name.set_specification (careful_string_filter(wx_to_std(_specification->GetValue())));
+       _name.set_specification(wx_to_std(_specification->GetValue()));
 
-       auto example = wxString::Format (_("e.g. %s"), std_to_wx (_name.get (_examples, _suffix)));
+       auto example = wxString::Format(_("e.g. %s"), std_to_wx(careful_string_filter(_name.get(_examples, _suffix))));
        wxString wrapped;
        for (size_t i = 0; i < example.Length(); ++i) {
                if (i > 0 && (i % 40) == 0) {