diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-03 18:32:06 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-03 18:32:06 +0000 |
| commit | 477fca0de02853b32ba5f0b43119d636e77f7a46 (patch) | |
| tree | 4f40bbc3cd20db5668efe5311b665140e398b25b /gtk2_ardour/audio_region_view.cc | |
| parent | 80c46cc451fed4b50bd1e974b4586fcea99c1ab5 (diff) | |
deframe audio regions as well as MIDI when entering internal edit mode
git-svn-id: svn://localhost/ardour2/branches/3.0@9057 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_region_view.cc')
| -rw-r--r-- | gtk2_ardour/audio_region_view.cc | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index d88b6b5266..0dea60b278 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -1335,37 +1335,39 @@ AudioRegionView::set_frame_color () } TimeAxisViewItem::set_frame_color (); + + uint32_t wc; + uint32_t fc; if (_selected) { - for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) { - if (_region->muted()) { - (*w)->property_wave_color() = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_SelectedWaveForm.get(), MUTED_ALPHA); - } else { - (*w)->property_wave_color() = ARDOUR_UI::config()->canvasvar_SelectedWaveForm.get(); - (*w)->property_fill_color() = ARDOUR_UI::config()->canvasvar_SelectedWaveFormFill.get(); - } - } + wc = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_SelectedWaveForm.get(), MUTED_ALPHA); + fc = ARDOUR_UI::config()->canvasvar_SelectedWaveFormFill.get(); } else { if (_recregion) { - for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) { - if (_region->muted()) { - (*w)->property_wave_color() = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_RecWaveForm.get(), MUTED_ALPHA); - } else { - (*w)->property_wave_color() = ARDOUR_UI::config()->canvasvar_RecWaveForm.get(); - (*w)->property_fill_color() = ARDOUR_UI::config()->canvasvar_RecWaveFormFill.get(); - } - } + if (_region->muted()) { + wc = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_RecWaveForm.get(), MUTED_ALPHA); + } else { + wc = ARDOUR_UI::config()->canvasvar_RecWaveForm.get(); + fc = ARDOUR_UI::config()->canvasvar_RecWaveFormFill.get(); + } } else { - for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) { - if (_region->muted()) { - (*w)->property_wave_color() = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_WaveForm.get(), MUTED_ALPHA); - } else { - (*w)->property_wave_color() = ARDOUR_UI::config()->canvasvar_WaveForm.get(); - (*w)->property_fill_color() = ARDOUR_UI::config()->canvasvar_WaveFormFill.get(); - } - } + if (_region->muted()) { + wc = UINT_RGBA_CHANGE_A(ARDOUR_UI::config()->canvasvar_WaveForm.get(), MUTED_ALPHA); + } else { + wc = ARDOUR_UI::config()->canvasvar_WaveForm.get(); + fc = ARDOUR_UI::config()->canvasvar_WaveFormFill.get(); + } } } + + for (vector<ArdourCanvas::WaveView*>::iterator w = waves.begin(); w != waves.end(); ++w) { + if (_region->muted()) { + (*w)->property_wave_color() = wc; + } else { + (*w)->property_wave_color() = wc; + (*w)->property_fill_color() = fc; + } + } } void |