Emit no audio from DCPs if none is mapped

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

diff --git a/src/wx/table_dialog.cc b/src/wx/table_dialog.cc
index 3f8d10fe14aee08e0459e9c5d30e01f71b63840b..c4ad5fff6eed933257d768bbd39ccd5727c2c1be 100644 (file)
--- a/src/wx/table_dialog.cc
+++ b/src/wx/table_dialog.cc
@@ -1,25 +1,29 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
+#include "static_text.h"
 #include "table_dialog.h"
 #include "wx_util.h"
 
+
 TableDialog::TableDialog (wxWindow* parent, wxString title, int columns, int growable, bool cancel)
        : wxDialog (parent, wxID_ANY, title)
 {
@@ -36,12 +40,13 @@ TableDialog::TableDialog (wxWindow* parent, wxString title, int columns, int gro
                flags |= wxCANCEL;
        }
 
-       wxSizer* buttons = CreateSeparatedButtonSizer (flags);
+       auto buttons = CreateSeparatedButtonSizer (flags);
        if (buttons) {
                _overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
        }
 }
 
+
 void
 TableDialog::layout ()
 {
@@ -49,25 +54,27 @@ TableDialog::layout ()
        _overall_sizer->SetSizeHints (this);
 }
 
-void
+
+wxStaticText *
 #ifdef DCPOMATIC_OSX
-TableDialog::add (wxString text, bool label)
+TableDialog::add (wxString text, bool label, int flags)
 #else
-TableDialog::add (wxString text, bool)
+TableDialog::add (wxString text, bool, int flags)
 #endif
 {
-       int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT;
-#ifdef __WXOSX__
+#ifdef DCPOMATIC_OSX
        if (label) {
                flags |= wxALIGN_RIGHT;
-               t += wxT (":");
+               text += wxT (":");
        }
 #endif
-       wxStaticText* m = new wxStaticText (this, wxID_ANY, wxT (""));
+       auto m = new StaticText (this, wxT (""));
        m->SetLabelMarkup (text);
        _table->Add (m, 0, flags, 6);
+       return m;
 }
 
+
 void
 TableDialog::add_spacer ()
 {