Remove seemingly unnecessary stream description in audio panel; tidy layout a bit.

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index e27e10752abb64c4135f4f5ce431f74a2944b0f3..b3e78397dd42285e7f92db2b5a605a45777fee43 100644 (file)
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -83,14 +83,13 @@ AudioPanel::AudioPanel (ContentPanel* p)
 
        add_label_to_grid_bag_sizer (grid, this, _("Stream"), true, wxGBPosition (r, 0));
        _stream = new wxChoice (this, wxID_ANY);
-       grid->Add (_stream, wxGBPosition (r, 1));
-       _description = add_label_to_grid_bag_sizer (grid, this, "", false, wxGBPosition (r, 2), wxGBSpan (1, 2));
+       grid->Add (_stream, wxGBPosition (r, 1), wxGBSpan (1, 3), wxEXPAND);
        ++r;
 
        add_label_to_grid_bag_sizer (grid, this, _("Process with"), true, wxGBPosition (r, 0));
        _processor = new wxChoice (this, wxID_ANY);
        setup_processors ();
-       grid->Add (_processor, wxGBPosition (r, 1));
+       grid->Add (_processor, wxGBPosition (r, 1), wxGBSpan (1, 3), wxEXPAND);
        ++r;
        
        _mapping = new AudioMappingView (this);
@@ -138,7 +137,6 @@ AudioPanel::film_content_changed (int property)
                _mapping->set (acs ? acs->audio_mapping () : AudioMapping ());
                _sizer->Layout ();
        } else if (property == FFmpegContentProperty::AUDIO_STREAM) {
-               setup_stream_description ();
                _mapping->set (acs ? acs->audio_mapping () : AudioMapping ());
                _sizer->Layout ();
        } else if (property == FFmpegContentProperty::AUDIO_STREAMS) {
@@ -151,7 +149,6 @@ AudioPanel::film_content_changed (int property)
                        
                        if (fcs->audio_stream()) {
                                checked_set (_stream, fcs->audio_stream()->identifier ());
-                               setup_stream_description ();
                        }
                }
        } else if (property == AudioContentProperty::AUDIO_PROCESSOR) {
@@ -231,33 +228,6 @@ AudioPanel::stream_changed ()
        if (i != a.end ()) {
                fcs->set_audio_stream (*i);
        }
-
-       setup_stream_description ();
-}
-
-void
-AudioPanel::setup_stream_description ()
-{
-       FFmpegContentList fc = _parent->selected_ffmpeg ();
-       if (fc.size() != 1) {
-               _description->SetLabel ("");
-               return;
-       }
-
-       shared_ptr<FFmpegContent> fcs = fc.front ();
-
-       if (!fcs->audio_stream ()) {
-               _description->SetLabel (wxT (""));
-       } else {
-               wxString s;
-               if (fcs->audio_channels() == 1) {
-                       s << _("1 channel");
-               } else {
-                       s << fcs->audio_channels() << wxT (" ") << _("channels");
-               }
-               s << wxT (", ") << fcs->audio_frame_rate() << _("Hz");
-               _description->SetLabel (s);
-       }
 }
 
 void

diff --git a/src/wx/audio_panel.h b/src/wx/audio_panel.h
index 9a9d326985975bc60f98216f85f92f02d0d31a76..d5821d26abd3446844bff8e8aae1b3022901f187 100644 (file)
--- a/src/wx/audio_panel.h
+++ b/src/wx/audio_panel.h
@@ -42,7 +42,6 @@ private:
        void show_clicked ();
        void stream_changed ();
        void mapping_changed (AudioMapping);
-       void setup_stream_description ();
        void processor_changed ();
        void setup_processors ();
 
@@ -51,7 +50,6 @@ private:
        wxButton* _show;
        ContentSpinCtrl<AudioContent>* _delay;
        wxChoice* _stream;
-       wxStaticText* _description;
        wxChoice* _processor;
        AudioMappingView* _mapping;
        AudioDialog* _audio_dialog;