Merge master.

diff --git a/ChangeLog b/ChangeLog
index ec7b520b40eabf07f7917c90d1b42c1c40081c52..77eaa67644cc28154f4dcc733be402280f5e9c2d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-08  Carl Hetherington  <cth@carlh.net>
+
+       * Add option to pad sound so that silent channels
+       can be added.
+
 2013-07-08  Carl Hetherington  <cth@carlh.net>
 
        * Version 0.107 released.

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index b9ad12d648cc227f95f84ab0f1002b51360c492f..a54b412b30ff51b24171d3516d924f193315bc6b 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -405,7 +405,7 @@ FilmEditor::make_audio_panel ()
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
                _minimum_audio_channels = new wxSpinCtrl (_audio_panel);
                s->Add (_minimum_audio_channels, 1);
-               add_label_to_sizer (s, _audio_panel, _("channels"));
+               add_label_to_sizer (s, _audio_panel, _("channels"), false);
                grid->Add (s);
        }