diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-12 14:43:24 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-12 14:43:24 +0000 |
| commit | bc89fe0147c04b67141936d109c00dfd4d69cc4b (patch) | |
| tree | 544ff450c40fe1f43853a8420228a26f27f1eafb /gtk2_ardour/audio_streamview.cc | |
| parent | 30daaebaa2d90d6b0e8673143ccc3cacd7bd1753 (diff) | |
most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas.cc; builds and runs and does a few specific things but expect it to be buggy for a while yet
git-svn-id: svn://localhost/ardour2/branches/3.0@4313 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_streamview.cc')
| -rw-r--r-- | gtk2_ardour/audio_streamview.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 7fc7be2db2..ed585a91e1 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -32,6 +32,7 @@ #include <ardour/playlist_templates.h> #include <ardour/source.h> #include <ardour/region_factory.h> +#include <ardour/profile.h> #include "audio_streamview.h" #include "audio_region_view.h" @@ -139,7 +140,7 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wai _samples_per_unit, region_color, recording, TimeAxisViewItem::Visibility(TimeAxisViewItem::ShowFrame | TimeAxisViewItem::HideFrameRight)); } else { region_view = new AudioRegionView (canvas_group, _trackview, region, - _samples_per_unit, region_color); + _samples_per_unit, region_color); } break; case Destructive: @@ -821,9 +822,12 @@ AudioStreamView::color_handler () //case cAudioBusBase: if (!_trackview.is_track()) { - canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AudioBusBase.get(); + if (Profile->get_sae() && _trackview.route()->is_master()) { + canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AudioMasterBusBase.get(); + } else { + canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AudioBusBase.get(); + } } - } void |