Merge master.

[dcpomatic.git] / src / wx / audio_panel.h

diff --git a/src/wx/audio_panel.h b/src/wx/audio_panel.h
index 9a9d326985975bc60f98216f85f92f02d0d31a76..b0218575a7f0f12ca6c5a6b59f3107626e79dbe7 100644 (file)
--- a/src/wx/audio_panel.h
+++ b/src/wx/audio_panel.h
@@ -42,17 +42,18 @@ private:
        void show_clicked ();
        void stream_changed ();
        void mapping_changed (AudioMapping);
-       void setup_stream_description ();
        void processor_changed ();
        void setup_processors ();
+       void setup_description ();
 
        ContentSpinCtrlDouble<AudioContent>* _gain;
        wxButton* _gain_calculate_button;
        wxButton* _show;
        ContentSpinCtrl<AudioContent>* _delay;
        wxChoice* _stream;
-       wxStaticText* _description;
        wxChoice* _processor;
+       wxStaticText* _stream_description;
        AudioMappingView* _mapping;
+       wxStaticText* _description;
        AudioDialog* _audio_dialog;
 };