summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-11-16 16:01:58 +0000
committerCarl Hetherington <cth@carlh.net>2013-11-16 16:01:58 +0000
commit2ccc67a0268395b1d241cb729170009feef397dd (patch)
tree2f677f3b2d85e27e8e07e3418385c17b370ed25e /src
parent3e0d0000886dc0c4aa7f9f8c9168dbdbbb99a40a (diff)
Fix erroneous reset of visible channels in audio level dialog when changing gain.
Diffstat (limited to 'src')
-rw-r--r--src/wx/audio_panel.cc8
-rw-r--r--src/wx/audio_plot.cc1
2 files changed, 4 insertions, 5 deletions
diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 56fcf5c32..6b30c0dd2 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -125,10 +125,6 @@ AudioPanel::film_content_changed (int property)
fcs = dynamic_pointer_cast<FFmpegContent> (acs);
}
- if (_audio_dialog && acs) {
- _audio_dialog->set_content (acs);
- }
-
if (property == AudioContentProperty::AUDIO_MAPPING) {
_mapping->set (acs ? acs->audio_mapping () : AudioMapping ());
_sizer->Layout ();
@@ -260,6 +256,10 @@ void
AudioPanel::content_selection_changed ()
{
AudioContentList sel = _editor->selected_audio_content ();
+
+ if (_audio_dialog && sel.size() == 1) {
+ _audio_dialog->set_content (sel.front ());
+ }
_gain->set_content (sel);
_delay->set_content (sel);
diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index 7ed792351..f78885772 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -146,7 +146,6 @@ AudioPlot::paint ()
gc->StrokePath (grid);
gc->DrawText (_("Time"), data_width, _height - _y_origin + db_label_height / 2);
-
if (_type_visible[AudioPoint::PEAK]) {
for (int c = 0; c < MAX_AUDIO_CHANNELS; ++c) {