X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_streamview.cc;h=85812b43d6d49ce90015b1f0cc21340932a8b6cf;hb=3705a2d6307cf443acbf8419b0e0f560591f2016;hp=14036bc569c3603e23f537a95491ae2cb6239bdd;hpb=36d88c8e494c1997c05d122fa03c00d0e8b6e401;p=ardour.git diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 14036bc569..85812b43d6 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -18,6 +18,7 @@ #include #include +#include #include @@ -31,6 +32,7 @@ #include #include #include +#include #include "audio_streamview.h" #include "audio_region_view.h" @@ -46,10 +48,10 @@ #include "rgb_macros.h" #include "gui_thread.h" #include "utils.h" -#include "color.h" #include "i18n.h" +using namespace std; using namespace ARDOUR; using namespace PBD; using namespace Editing; @@ -60,43 +62,16 @@ AudioStreamView::AudioStreamView (AudioTimeAxisView& tv) crossfades_visible = true; _waveform_scale = LinearWaveform; _waveform_shape = Traditional; - - if (tv.is_audio_track()) - stream_base_color = color_map[cAudioTrackBase]; - else - stream_base_color = color_map[cAudioBusBase]; - - canvas_rect->property_fill_color_rgba() = stream_base_color; - canvas_rect->property_outline_color_rgba() = color_map[cAudioTrackOutline]; - + color_handler (); _amplitude_above_axis = 1.0; - use_rec_regions = tv.editor.show_waveforms_recording (); - last_rec_peak_frame = 0; - + use_rec_regions = tv.editor().show_waveforms_recording (); } AudioStreamView::~AudioStreamView () { } -int -AudioStreamView::set_height (gdouble h) -{ - /* limit the values to something sane-ish */ - if (h < 10.0 || h > 1000.0) { - return -1; - } - - StreamView::set_height(h); - - for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { - (*i)->set_height (h); - } - - return 0; -} - int AudioStreamView::set_samples_per_unit (gdouble spp) { @@ -129,17 +104,15 @@ AudioStreamView::set_amplitude_above_axis (gdouble app) return 0; } -void -AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wait_for_waves) +RegionView* +AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wait_for_waves, bool recording) { AudioRegionView *region_view = 0; - ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::add_region_view), r)); - boost::shared_ptr region = boost::dynamic_pointer_cast (r); if (region == 0) { - return; + return NULL; } for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { @@ -156,14 +129,19 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wai arv->set_waveform_shape (_waveform_shape); } - return; + return NULL; } } switch (_trackview.audio_track()->mode()) { case Normal: - region_view = new AudioRegionView (canvas_group, _trackview, region, - _samples_per_unit, region_color); + 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, @@ -177,9 +155,9 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wai region_view->init (region_color, wait_for_waves); region_view->set_amplitude_above_axis(_amplitude_above_axis); + region_view->set_height (child_height ()); region_views.push_front (region_view); - /* if its the special single-sample length that we use for rec-regions, make it insensitive to events */ @@ -211,12 +189,14 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wai /* follow global waveform setting */ - region_view->set_waveform_visible(_trackview.editor.show_waveforms()); + region_view->set_waveform_visible(_trackview.editor().show_waveforms()); /* catch regionview going away */ region->GoingAway.connect (bind (mem_fun (*this, &AudioStreamView::remove_region_view), boost::weak_ptr (r))); RegionViewAdded (region_view); + + return region_view; } void @@ -248,7 +228,6 @@ AudioStreamView::remove_region_view (boost::weak_ptr weak_r) } } - StreamView::remove_region_view(r); } @@ -265,11 +244,23 @@ AudioStreamView::undisplay_diskstream () } void -AudioStreamView::playlist_modified () +AudioStreamView::playlist_modified_weak (boost::weak_ptr ds) { - ENSURE_GUI_THREAD (mem_fun (*this, &AudioStreamView::playlist_modified)); + boost::shared_ptr sp (ds.lock()); + if (!sp) { + return; + } - StreamView::playlist_modified(); + playlist_modified (sp); +} + +void +AudioStreamView::playlist_modified (boost::shared_ptr ds) +{ + /* we do not allow shared_ptr to be bound to slots */ + ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::playlist_modified_weak), ds)); + + StreamView::playlist_modified (ds); /* make sure xfades are on top and all the regionviews are stacked correctly. */ @@ -290,19 +281,34 @@ AudioStreamView::playlist_changed (boost::shared_ptr ds) playlist_connections.push_back (apl->NewCrossfade.connect (mem_fun (*this, &AudioStreamView::add_crossfade))); } +void +AudioStreamView::add_crossfade_weak (boost::weak_ptr crossfade) +{ + boost::shared_ptr sp (crossfade.lock()); + + if (!sp) { + return; + } + + add_crossfade (sp); +} + void AudioStreamView::add_crossfade (boost::shared_ptr crossfade) { AudioRegionView* lview = 0; AudioRegionView* rview = 0; + + /* we do not allow shared_ptr to be bound to slots */ - ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::add_crossfade), crossfade)); + ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::add_crossfade_weak), boost::weak_ptr (crossfade))); /* first see if we already have a CrossfadeView for this Crossfade */ for (list::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { if ((*i)->crossfade == crossfade) { - if (!crossfades_visible) { + + if (!crossfades_visible || _layer_display == Stacked) { (*i)->hide(); } else { (*i)->show (); @@ -325,25 +331,26 @@ AudioStreamView::add_crossfade (boost::shared_ptr crossfade) } } - CrossfadeView *cv = new CrossfadeView (_trackview.canvas_display, + CrossfadeView *cv = new CrossfadeView (_trackview.canvas_display (), _trackview, crossfade, _samples_per_unit, region_color, *lview, *rview); - + cv->set_valid (true); crossfade->Invalidated.connect (mem_fun (*this, &AudioStreamView::remove_crossfade)); crossfade_views.push_back (cv); - - if (!Config->get_xfades_visible() || !crossfades_visible) { + if (!Config->get_xfades_visible() || !crossfades_visible || _layer_display == Stacked) { cv->hide (); } } void -AudioStreamView::remove_crossfade (boost::shared_ptr xfade) +AudioStreamView::remove_crossfade (boost::shared_ptr r) { - ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::remove_crossfade), xfade)); + ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::remove_crossfade), r)); + + boost::shared_ptr xfade = boost::dynamic_pointer_cast (r); for (list::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { if ((*i)->crossfade == xfade) { @@ -366,7 +373,7 @@ AudioStreamView::redisplay_diskstream () for (xi = crossfade_views.begin(); xi != crossfade_views.end(); ++xi) { (*xi)->set_valid (false); - if ((*xi)->visible()) { + if ((*xi)->visible() && _layer_display != Stacked) { (*xi)->show (); } } @@ -379,6 +386,9 @@ AudioStreamView::redisplay_diskstream () apl->foreach_crossfade (this, &AudioStreamView::add_crossfade); } + RegionViewList copy; + + /* Place regions */ for (i = region_views.begin(); i != region_views.end(); ) { tmp = i; tmp++; @@ -386,7 +396,41 @@ AudioStreamView::redisplay_diskstream () if (!(*i)->is_valid()) { delete *i; region_views.erase (i); - } + i = tmp; + continue; + } else { + (*i)->enable_display(true); + } + + /* Sort regionviews by layer so that when we call region_layered () + the canvas layering works out (in non-stacked mode). */ + + if (copy.size() == 0) { + copy.push_front((*i)); + i = tmp; + continue; + } + + RegionViewList::iterator k = copy.begin(); + RegionViewList::iterator l = copy.end(); + l--; + + if ((*i)->region()->layer() <= (*k)->region()->layer()) { + copy.push_front((*i)); + i = tmp; + continue; + } else if ((*i)->region()->layer() >= (*l)->region()->layer()) { + copy.push_back((*i)); + i = tmp; + continue; + } + + for (RegionViewList::iterator j = copy.begin(); j != copy.end(); ++j) { + if ((*j)->region()->layer() >= (*i)->region()->layer()) { + copy.insert(j, (*i)); + break; + } + } i = tmp; } @@ -402,10 +446,10 @@ AudioStreamView::redisplay_diskstream () xi = tmpx; } - + /* now fix layering */ - for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) { + for (RegionViewList::iterator i = copy.begin(); i != copy.end(); ++i) { region_layered (*i); } } @@ -415,8 +459,9 @@ AudioStreamView::set_show_waveforms (bool yn) { for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { AudioRegionView* const arv = dynamic_cast(*i); - if (arv) + if (arv) { arv->set_waveform_visible (yn); + } } } @@ -445,7 +490,7 @@ AudioStreamView::set_waveform_scale (WaveformScale scale) void AudioStreamView::setup_rec_box () { - // cerr << _trackview.name() << " streamview SRB\n"; + //cerr << _trackview.name() << " streamview SRB region_views.size() = " << region_views.size() << endl; if (_trackview.session().transport_rolling()) { @@ -454,27 +499,28 @@ AudioStreamView::setup_rec_box () if (!rec_active && _trackview.session().record_status() == Session::Recording && _trackview.get_diskstream()->record_enabled()) { - if (_trackview.audio_track()->mode() == Normal && use_rec_regions && rec_regions.size() == rec_rects.size()) { /* add a new region, but don't bother if they set use_rec_regions mid-record */ SourceList sources; - for (list::iterator prc = peak_ready_connections.begin(); prc != peak_ready_connections.end(); ++prc) { + for (list::iterator prc = rec_data_ready_connections.begin(); prc != rec_data_ready_connections.end(); ++prc) { (*prc).disconnect(); } - peak_ready_connections.clear(); + rec_data_ready_connections.clear(); // FIXME boost::shared_ptr ads = boost::dynamic_pointer_cast(_trackview.get_diskstream()); assert(ads); - for (uint32_t n=0; n < ads->n_channels(); ++n) { + for (uint32_t n=0; n < ads->n_channels().n_audio(); ++n) { boost::shared_ptr src = boost::static_pointer_cast (ads->write_source (n)); if (src) { sources.push_back (src); - peak_ready_connections.push_back (src->PeakRangeReady.connect (bind (mem_fun (*this, &AudioStreamView::rec_peak_range_ready), boost::weak_ptr(src)))); + + rec_data_ready_connections.push_back (src->PeakRangeReady.connect (bind + (mem_fun (*this, &AudioStreamView::rec_peak_range_ready), boost::weak_ptr(src)))); } } @@ -482,36 +528,36 @@ AudioStreamView::setup_rec_box () nframes_t start = 0; if (rec_regions.size() > 0) { - start = rec_regions.back()->start() + _trackview.get_diskstream()->get_captured_frames(rec_regions.size()-1); + start = rec_regions.back().first->start() + _trackview.get_diskstream()->get_captured_frames(rec_regions.size()-1); } boost::shared_ptr region (boost::dynamic_pointer_cast (RegionFactory::create (sources, start, 1 , "", 0, (Region::Flag)(Region::DefaultFlags | Region::DoNotSaveState), false))); + assert(region); region->set_position (_trackview.session().transport_frame(), this); - - rec_regions.push_back (region); + rec_regions.push_back (make_pair(region, (RegionView*)0)); } /* start a new rec box */ - AudioTrack* at; + boost::shared_ptr at; at = _trackview.audio_track(); /* we know what it is already */ boost::shared_ptr ds = at->audio_diskstream(); nframes_t frame_pos = ds->current_capture_start (); - gdouble xstart = _trackview.editor.frame_to_pixel (frame_pos); + gdouble xstart = _trackview.editor().frame_to_pixel (frame_pos); gdouble xend; uint32_t fill_color; switch (_trackview.audio_track()->mode()) { case Normal: xend = xstart; - fill_color = color_map[cRecordingRectFill]; + fill_color = ARDOUR_UI::config()->canvasvar_RecordingRect.get(); break; case Destructive: xend = xstart + 2; - fill_color = color_map[cRecordingRectFill]; + fill_color = ARDOUR_UI::config()->canvasvar_RecordingRect.get(); /* make the recording rect translucent to allow the user to see the peak data coming in, etc. */ @@ -523,9 +569,11 @@ AudioStreamView::setup_rec_box () rec_rect->property_x1() = xstart; 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() = color_map[cRecordingRectOutline]; + rec_rect->property_y2() = child_height (); + rec_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get(); + rec_rect->property_outline_what() = 0x1 | 0x2 | 0x4 | 0x8; rec_rect->property_fill_color_rgba() = fill_color; + rec_rect->lower_to_bottom(); RecBoxInfo recbox; recbox.rectangle = rec_rect; @@ -542,11 +590,9 @@ AudioStreamView::setup_rec_box () } else if (rec_active && (_trackview.session().record_status() != Session::Recording || !_trackview.get_diskstream()->record_enabled())) { - screen_update_connection.disconnect(); rec_active = false; rec_updating = false; - } } else { @@ -558,24 +604,23 @@ AudioStreamView::setup_rec_box () /* disconnect rapid update */ screen_update_connection.disconnect(); - for (list::iterator prc = peak_ready_connections.begin(); prc != peak_ready_connections.end(); ++prc) { + for (list::iterator prc = rec_data_ready_connections.begin(); prc != rec_data_ready_connections.end(); ++prc) { (*prc).disconnect(); } - peak_ready_connections.clear(); + rec_data_ready_connections.clear(); rec_updating = false; rec_active = false; - last_rec_peak_frame = 0; /* remove temp regions */ - for (list >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); ) { - list >::iterator tmp; + for (list,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); ) { + list,RegionView*> >::iterator tmp; tmp = iter; ++tmp; - (*iter)->drop_references (); + (*iter).first->drop_references (); iter = tmp; } @@ -617,15 +662,15 @@ AudioStreamView::rec_peak_range_ready (nframes_t start, nframes_t cnt, boost::we // this is called from the peak building thread - if (rec_peak_ready_map.size() == 0 || start+cnt > last_rec_peak_frame) { - last_rec_peak_frame = start + cnt; + if (rec_data_ready_map.size() == 0 || start+cnt > last_rec_data_frame) { + last_rec_data_frame = start + cnt; } - rec_peak_ready_map[src] = true; + rec_data_ready_map[src] = true; - if (rec_peak_ready_map.size() == _trackview.get_diskstream()->n_channels()) { + if (rec_data_ready_map.size() == _trackview.get_diskstream()->n_channels().n_audio()) { this->update_rec_regions (); - rec_peak_ready_map.clear(); + rec_data_ready_map.clear(); } } @@ -633,12 +678,11 @@ void AudioStreamView::update_rec_regions () { if (use_rec_regions) { - uint32_t n = 0; - for (list >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) { + for (list,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) { - list >::iterator tmp; + list,RegionView*> >::iterator tmp; tmp = iter; ++tmp; @@ -649,18 +693,18 @@ AudioStreamView::update_rec_regions () continue; } - boost::shared_ptr region = boost::dynamic_pointer_cast(*iter); + boost::shared_ptr region = boost::dynamic_pointer_cast(iter->first); if (!region) { continue; } nframes_t origlen = region->length(); - if (region == rec_regions.back() && rec_active) { + if (region == rec_regions.back().first && rec_active) { - if (last_rec_peak_frame > region->start()) { + if (last_rec_data_frame > region->start()) { - nframes_t nlen = last_rec_peak_frame - region->start(); + nframes_t nlen = last_rec_data_frame - region->start(); if (nlen != region->length()) { @@ -671,12 +715,12 @@ 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 */ ArdourCanvas::SimpleRect * rect = rec_rects[n].rectangle; - gdouble xend = _trackview.editor.frame_to_pixel (region->position() + region->length()); + gdouble xend = _trackview.editor().frame_to_pixel (region->position() + region->length()); rect->property_x2() = xend; } } @@ -696,7 +740,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 */ @@ -712,6 +756,28 @@ AudioStreamView::update_rec_regions () } } +void +AudioStreamView::show_all_fades () +{ + for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { + AudioRegionView* const arv = dynamic_cast(*i); + if (arv) { + arv->set_fade_visibility (true); + } + } +} + +void +AudioStreamView::hide_all_fades () +{ + for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { + AudioRegionView* const arv = dynamic_cast(*i); + if (arv) { + arv->set_fade_visibility (false); + } + } +} + void AudioStreamView::show_all_xfades () { @@ -740,32 +806,41 @@ void AudioStreamView::reveal_xfades_involving (AudioRegionView& rv) { for (list::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { - if ((*i)->crossfade->involves (rv.audio_region()) && (*i)->visible()) { + if ((*i)->crossfade->involves (rv.audio_region()) && (*i)->visible() && _layer_display != Stacked) { (*i)->show (); } } } void -AudioStreamView::color_handler (ColorID id, uint32_t val) +AudioStreamView::color_handler () { - switch (id) { - case cAudioTrackBase: - if (_trackview.is_track()) { - canvas_rect->property_fill_color_rgba() = val; - } - break; - case cAudioBusBase: - if (!_trackview.is_track()) { - canvas_rect->property_fill_color_rgba() = val; + //case cAudioTrackBase: + if (_trackview.is_track()) { + canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AudioTrackBase.get(); + } + + //case cAudioBusBase: + if (!_trackview.is_track()) { + 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(); } - break; - case cAudioTrackOutline: - canvas_rect->property_outline_color_rgba() = val; - break; - - default: - break; } } +void +AudioStreamView::update_contents_height () +{ + StreamView::update_contents_height (); + + for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { + if (_layer_display == Overlaid) { + (*i)->show (); + (*i)->set_height (height); + } else { + (*i)->hide (); + } + } +}