diff options
| author | Doug McLain <doug@nostar.net> | 2008-04-17 09:33:54 +0000 |
|---|---|---|
| committer | Doug McLain <doug@nostar.net> | 2008-04-17 09:33:54 +0000 |
| commit | 6962547e8da2f17ace5dc73906ef612ff737cfa3 (patch) | |
| tree | 323023e74098c13d6332e4f0df5847594cacdc69 /gtk2_ardour/audio_streamview.cc | |
| parent | 803b502bf176c417a70498a98173fb09691a80b7 (diff) | |
What used to be the pink recording rectangle is now blended into the recording regions so that they appear to be the same thing. Then recording specific colors are added so the waveform and region base when recording are all various shades of red during recording. *** Open Theme Manager and click Restore Defaults for these changes to apply ***
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3259 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_streamview.cc')
| -rw-r--r-- | gtk2_ardour/audio_streamview.cc | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 475a4a1183..e287fd8ea2 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -129,7 +129,7 @@ AudioStreamView::set_amplitude_above_axis (gdouble app) } void -AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wait_for_waves) +AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wait_for_waves, bool recording) { AudioRegionView *region_view = 0; @@ -161,8 +161,13 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wai switch (_trackview.audio_track()->mode()) { case Normal: - region_view = new AudioRegionView (canvas_group, _trackview, region, + if (recording) { + region_view = new AudioRegionView (canvas_group, _trackview, region, + _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); + } break; case Destructive: region_view = new TapeAudioRegionView (canvas_group, _trackview, region, @@ -178,7 +183,6 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wai region_view->set_amplitude_above_axis(_amplitude_above_axis); region_views.push_front (region_view); - /* if its the special single-sample length that we use for rec-regions, make it insensitive to events */ @@ -542,7 +546,8 @@ AudioStreamView::setup_rec_box () rec_rect->property_y1() = 1.0; rec_rect->property_x2() = xend; rec_rect->property_y2() = (double) _trackview.height - 1; - rec_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_RecordingRect.get(); + rec_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get(); + rec_rect->property_outline_what() = 0x4 | 0x8; // Draw top and bottom outline to blend with region rec_rect->property_fill_color_rgba() = fill_color; RecBoxInfo recbox; @@ -689,7 +694,7 @@ AudioStreamView::update_rec_regions () if (origlen == 1) { /* our special initial length */ - add_region_view_internal (region, false); + add_region_view_internal (region, false, true); } /* also update rect */ @@ -714,7 +719,7 @@ AudioStreamView::update_rec_regions () if (origlen == 1) { /* our special initial length */ - add_region_view_internal (region, false); + add_region_view_internal (region, false, true); } /* also hide rect */ |