X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_streamview.cc;h=6d24dff2ca745927e97efdcf74725cb680c8269b;hb=611dcdd24932222d676da4d9a4dca643f79db4a4;hp=aa54af86fbdcc55dc1aa87fc1a96e7235dfa7984;hpb=ef3aa2e1512ede05a24f1e7c4e9b5c70098b7200;p=ardour.git diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index aa54af86fb..6d24dff2ca 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2001, 2006 Paul Davis + Copyright (C) 2001, 2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,19 +18,21 @@ #include #include +#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "pbd/stacktrace.h" + +#include "ardour/audioregion.h" +#include "ardour/audiofilesource.h" +#include "ardour/audio_track.h" +#include "ardour/region_factory.h" +#include "ardour/profile.h" +#include "ardour/rc_configuration.h" +#include "ardour/session.h" #include "audio_streamview.h" #include "audio_region_view.h" @@ -42,14 +44,13 @@ #include "selection.h" #include "public_editor.h" #include "ardour_ui.h" -#include "crossfade_view.h" #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; @@ -57,59 +58,11 @@ using namespace Editing; AudioStreamView::AudioStreamView (AudioTimeAxisView& tv) : StreamView (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; - -} - -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) -{ - StreamView::set_samples_per_unit(spp); - - for (CrossfadeViewList::iterator xi = crossfade_views.begin(); xi != crossfade_views.end(); ++xi) { - (*xi)->set_samples_per_unit (spp); - } - - return 0; -} - -int AudioStreamView::set_amplitude_above_axis (gdouble app) { RegionViewList::iterator i; @@ -129,45 +82,35 @@ 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::create_region_view (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; - } - - for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { - if ((*i)->region() == r) { - - /* great. we already have a AudioRegionView for this Region. use it again. */ - - (*i)->set_valid (true); - - // this might not be necessary - AudioRegionView* const arv = dynamic_cast(*i); - if (arv) { - arv->set_waveform_scale (_waveform_scale); - arv->set_waveform_shape (_waveform_shape); - } - - return; - } + return 0; } switch (_trackview.audio_track()->mode()) { + + case NonLayered: 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 | + TimeAxisViewItem::HideFrameLeft | + TimeAxisViewItem::HideFrameTB)); + } 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, - _samples_per_unit, region_color); + region_view = new TapeAudioRegionView (_canvas_group, _trackview, region, + _samples_per_unit, region_color); break; default: fatal << string_compose (_("programming error: %1"), "illegal track mode in ::add_region_view_internal") << endmsg; @@ -177,369 +120,201 @@ 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_views.push_front (region_view); - - /* if this was the first one, then lets query the waveform scale and shape. - otherwise, we set it to the current value */ - - if (region_views.size() == 1) { - if (region_view->waveform_logscaled()) { - _waveform_scale = LogWaveform; - } else { - _waveform_scale = LinearWaveform; - } - - if (region_view->waveform_rectified()) { - _waveform_shape = Rectified; - } else { - _waveform_shape = Traditional; - } - } - else { - region_view->set_waveform_scale(_waveform_scale); - region_view->set_waveform_shape(_waveform_shape); - } - - /* follow global waveform setting */ - - 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); -} - -void -AudioStreamView::remove_region_view (boost::weak_ptr weak_r) -{ - ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::remove_region_view), weak_r)); + region_view->set_height (child_height ()); - boost::shared_ptr r (weak_r.lock()); + /* if its the special single-sample length that we use for rec-regions, make it + insensitive to events + */ - if (!r) { - return; - } - - if (!_trackview.session().deletion_in_progress()) { - - for (list::iterator i = crossfade_views.begin(); i != crossfade_views.end();) { - list::iterator tmp; - - tmp = i; - ++tmp; - - boost::shared_ptr ar = boost::dynamic_pointer_cast(r); - if (ar && (*i)->crossfade->involves (ar)) { - delete *i; - crossfade_views.erase (i); - } - - i = tmp; - } + if (region->length() == 1) { + region_view->set_sensitive (false); } - - StreamView::remove_region_view(r); + return region_view; } -void -AudioStreamView::undisplay_diskstream () +RegionView* +AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wait_for_waves, bool recording) { - StreamView::undisplay_diskstream(); + RegionView *region_view = create_region_view (r, wait_for_waves, recording); - for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { - delete *i; + if (region_view == 0) { + return 0; } - crossfade_views.clear (); -} +// if(!recording){ +// for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { +// if ((*i)->region() == r) { +// cerr << "audio_streamview in add_region_view_internal region found" << endl; + /* great. we already have a AudioRegionView for this Region. use it again. */ -void -AudioStreamView::playlist_modified () -{ - ENSURE_GUI_THREAD (mem_fun (*this, &AudioStreamView::playlist_modified)); +// (*i)->set_valid (true); - StreamView::playlist_modified(); - - /* make sure xfades are on top and all the regionviews are stacked correctly. */ + // this might not be necessary +// AudioRegionView* const arv = dynamic_cast(*i); - for (list::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { - (*i)->get_canvas_group()->raise_to_top(); - } -} - -void -AudioStreamView::playlist_changed (boost::shared_ptr ds) -{ - ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::playlist_changed), ds)); +// if (arv) { +// arv->set_waveform_scale (_waveform_scale); +// arv->set_waveform_shape (_waveform_shape); +// } - StreamView::playlist_changed(ds); +// return NULL; +// } +// } +// } - boost::shared_ptr apl = boost::dynamic_pointer_cast(ds->playlist()); - if (apl) - playlist_connections.push_back (apl->NewCrossfade.connect (mem_fun (*this, &AudioStreamView::add_crossfade))); -} - -void -AudioStreamView::add_crossfade (boost::shared_ptr crossfade) -{ - AudioRegionView* lview = 0; - AudioRegionView* rview = 0; - - ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::add_crossfade), 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) { - (*i)->hide(); - } else { - (*i)->show (); - } - (*i)->set_valid (true); - return; - } - } - - /* create a new one */ - - for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { - AudioRegionView* arv = dynamic_cast(*i); - - if (!lview && arv && (arv->region() == crossfade->out())) { - lview = arv; - } - if (!rview && arv && (arv->region() == crossfade->in())) { - rview = arv; - } - } + region_views.push_front (region_view); - CrossfadeView *cv = new CrossfadeView (_trackview.canvas_display, - _trackview, - crossfade, - _samples_per_unit, - region_color, - *lview, *rview); + if (_trackview.editor().internal_editing()) { + region_view->hide_rect (); + } else { + region_view->show_rect (); + } - crossfade->Invalidated.connect (mem_fun (*this, &AudioStreamView::remove_crossfade)); - crossfade_views.push_back (cv); + /* catch region going away */ - if (!Config->get_xfades_visible() || !crossfades_visible) { - cv->hide (); - } -} + r->DropReferences.connect (*this, invalidator (*this), boost::bind (&AudioStreamView::remove_region_view, this, boost::weak_ptr (r)), gui_context()); -void -AudioStreamView::remove_crossfade (boost::shared_ptr xfade) -{ - ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::remove_crossfade), xfade)); + RegionViewAdded (region_view); - for (list::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { - if ((*i)->crossfade == xfade) { - delete *i; - crossfade_views.erase (i); - break; - } - } + return region_view; } void -AudioStreamView::redisplay_diskstream () +AudioStreamView::redisplay_track () { - list::iterator i, tmp; - list::iterator xi, tmpx; + list::iterator i; + // Flag region views as invalid and disable drawing for (i = region_views.begin(); i != region_views.end(); ++i) { (*i)->set_valid (false); + (*i)->enable_display (false); } - for (xi = crossfade_views.begin(); xi != crossfade_views.end(); ++xi) { - (*xi)->set_valid (false); - if ((*xi)->visible()) { - (*xi)->show (); - } - } - + // Add and display views, and flag them as valid if (_trackview.is_audio_track()) { - _trackview.get_diskstream()->playlist()->foreach_region (static_cast(this), &StreamView::add_region_view); - - boost::shared_ptr apl = boost::dynamic_pointer_cast(_trackview.get_diskstream()->playlist()); - if (apl) - apl->foreach_crossfade (this, &AudioStreamView::add_crossfade); + _trackview.track()->playlist()->foreach_region( + sigc::hide_return (sigc::mem_fun (*this, &StreamView::add_region_view)) + ); } - for (i = region_views.begin(); i != region_views.end(); ) { - tmp = i; - tmp++; - - if (!(*i)->is_valid()) { - delete *i; - region_views.erase (i); - } - - i = tmp; - } - - for (xi = crossfade_views.begin(); xi != crossfade_views.end();) { - tmpx = xi; - tmpx++; - - if (!(*xi)->valid()) { - delete *xi; - crossfade_views.erase (xi); - } - - xi = tmpx; - } - - /* now fix layering */ - - for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) { - region_layered (*i); - } -} - -void -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) - arv->set_waveform_visible (yn); - } + // Stack regions by layer, and remove invalid regions + layer_regions(); } -void -AudioStreamView::set_waveform_shape (WaveformShape shape) -{ - for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) { - AudioRegionView* const arv = dynamic_cast(*i); - if (arv) - arv->set_waveform_shape (shape); - } - _waveform_shape = shape; -} - -void -AudioStreamView::set_waveform_scale (WaveformScale scale) -{ - for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) { - AudioRegionView* const arv = dynamic_cast(*i); - if (arv) - arv->set_waveform_scale (scale); - } - _waveform_scale = 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()) { + if (_trackview.session()->transport_rolling()) { // cerr << "\trolling\n"; - 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()) { + if (!rec_active && + _trackview.session()->record_status() == Session::Recording && + _trackview.track()->record_enabled()) { + if (_trackview.audio_track()->mode() == Normal && Config->get_show_waveforms_while_recording() && rec_regions.size() == rec_rects.size()) { - /* add a new region, but don't bother if they set use_rec_regions mid-record */ + /* add a new region, but don't bother if they set show-waveforms-while-recording mid-record */ SourceList sources; - for (list::iterator prc = peak_ready_connections.begin(); prc != peak_ready_connections.end(); ++prc) { - (*prc).disconnect(); - } - peak_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) { - boost::shared_ptr src = boost::static_pointer_cast (ads->write_source (n)); + rec_data_ready_connections.drop_connections (); + boost::shared_ptr tr = _trackview.audio_track(); + + for (uint32_t n = 0; n < tr->n_channels().n_audio(); ++n) { + boost::shared_ptr src = tr->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)))); + src->PeakRangeReady.connect (rec_data_ready_connections, + invalidator (*this), + boost::bind (&AudioStreamView::rec_peak_range_ready, this, _1, _2, boost::weak_ptr(src)), + gui_context()); } } // handle multi - - nframes_t start = 0; + + framepos_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.track()->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))); - region->set_position (_trackview.session().transport_frame(), this); - rec_regions.push_back (region); + PropertyList plist; + + plist.add (Properties::start, start); + plist.add (Properties::length, 1); + plist.add (Properties::name, string()); + plist.add (Properties::layer, 0); + + boost::shared_ptr region ( + boost::dynamic_pointer_cast(RegionFactory::create (sources, plist, false))); + + assert(region); + region->set_position (_trackview.session()->transport_frame()); + 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); + framepos_t const frame_pos = at->current_capture_start (); + gdouble xstart = _trackview.editor().frame_to_pixel (frame_pos); gdouble xend; uint32_t fill_color; switch (_trackview.audio_track()->mode()) { case Normal: + case NonLayered: 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. */ fill_color = UINT_RGBA_CHANGE_A (fill_color, 120); break; } - - ArdourCanvas::SimpleRect * rec_rect = new Gnome::Canvas::SimpleRect (*canvas_group); + + ArdourCanvas::SimpleRect * rec_rect = new Gnome::Canvas::SimpleRect (*_canvas_group); 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_what() = 0x0; + rec_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get(); rec_rect->property_fill_color_rgba() = fill_color; - + rec_rect->lower_to_bottom(); + RecBoxInfo recbox; recbox.rectangle = rec_rect; - recbox.start = _trackview.session().transport_frame(); + recbox.start = _trackview.session()->transport_frame(); recbox.length = 0; - + rec_rects.push_back (recbox); - + screen_update_connection.disconnect(); - screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun (*this, &AudioStreamView::update_rec_box)); + screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect ( + sigc::mem_fun (*this, &AudioStreamView::update_rec_box)); rec_updating = true; rec_active = true; } else if (rec_active && - (_trackview.session().record_status() != Session::Recording || - !_trackview.get_diskstream()->record_enabled())) { - + (_trackview.session()->record_status() != Session::Recording || + !_trackview.track()->record_enabled())) { screen_update_connection.disconnect(); rec_active = false; rec_updating = false; - } - + } else { // cerr << "\tNOT rolling, rec_rects = " << rec_rects.size() << " rec_regions = " << rec_regions.size() << endl; @@ -548,29 +323,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) { - (*prc).disconnect(); - } - peak_ready_connections.clear(); - + rec_data_ready_connections.drop_connections (); 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; } - + rec_regions.clear(); // cerr << "\tclear " << rec_rects.size() << " rec rects\n"; @@ -580,116 +349,114 @@ AudioStreamView::setup_rec_box () RecBoxInfo &rect = (*iter); delete rect.rectangle; } - + rec_rects.clear(); - + } } } void -AudioStreamView::foreach_crossfadeview (void (CrossfadeView::*pmf)(void)) +AudioStreamView::rec_peak_range_ready (framepos_t start, framecnt_t cnt, boost::weak_ptr weak_src) { - for (list::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { - ((*i)->*pmf) (); - } -} + ENSURE_GUI_THREAD (*this, &AudioStreamView::rec_peak_range_ready, start, cnt, weak_src) -void -AudioStreamView::rec_peak_range_ready (nframes_t start, nframes_t cnt, boost::weak_ptr weak_src) -{ - ENSURE_GUI_THREAD(bind (mem_fun (*this, &AudioStreamView::rec_peak_range_ready), start, cnt, weak_src)); - boost::shared_ptr src (weak_src.lock()); if (!src) { - return; + return; } // 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; - - if (rec_peak_ready_map.size() == _trackview.get_diskstream()->n_channels()) { - this->update_rec_regions (); - rec_peak_ready_map.clear(); + + rec_data_ready_map[src] = true; + + if (rec_data_ready_map.size() == _trackview.track()->n_channels().n_audio()) { + update_rec_regions (start, cnt); + rec_data_ready_map.clear(); } } void -AudioStreamView::update_rec_regions () +AudioStreamView::update_rec_regions (framepos_t start, framecnt_t cnt) { - if (use_rec_regions) { + if (!Config->get_show_waveforms_while_recording ()) { + return; + } - uint32_t n = 0; + 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 = iter; + ++tmp; - tmp = iter; - ++tmp; + assert (n < rec_rects.size()); - if (!canvas_item_visible (rec_rects[n].rectangle)) { - /* rect already hidden, this region is done */ - iter = tmp; - continue; - } - - boost::shared_ptr region = boost::dynamic_pointer_cast(*iter); - if (!region) { - continue; - } + if (!canvas_item_visible (rec_rects[n].rectangle)) { + /* rect already hidden, this region is done */ + iter = tmp; + continue; + } + + boost::shared_ptr region = boost::dynamic_pointer_cast(iter->first); - nframes_t origlen = region->length(); + if (!region) { + iter = tmp; + continue; + } - if (region == rec_regions.back() && rec_active) { + framecnt_t origlen = region->length(); - if (last_rec_peak_frame > region->start()) { + if (region == rec_regions.back().first && rec_active) { - nframes_t nlen = last_rec_peak_frame - region->start(); + if (last_rec_data_frame > region->start()) { - if (nlen != region->length()) { + framecnt_t nlen = last_rec_data_frame - region->start(); - region->freeze (); - region->set_position (_trackview.get_diskstream()->get_capture_start_frame(n), this); - region->set_length (nlen, this); - region->thaw ("updated"); + if (nlen != region->length()) { - if (origlen == 1) { - /* our special initial length */ - add_region_view_internal (region, false); - } + region->suspend_property_changes (); + region->set_position (_trackview.track()->get_capture_start_frame(n)); + region->set_length (nlen); + region->resume_property_changes (); - /* also update rect */ - ArdourCanvas::SimpleRect * rect = rec_rects[n].rectangle; - gdouble xend = _trackview.editor.frame_to_pixel (region->position() + region->length()); - rect->property_x2() = xend; + if (origlen == 1) { + /* our special initial length */ + add_region_view_internal (region, false, true); + setup_new_rec_layer_time (region); } + + check_record_layers (region, (region->position() - region->start() + start + cnt)); + + /* also update rect */ + ArdourCanvas::SimpleRect * rect = rec_rects[n].rectangle; + gdouble xend = _trackview.editor().frame_to_pixel (region->position() + region->length()); + rect->property_x2() = xend; } } else { - nframes_t nlen = _trackview.get_diskstream()->get_captured_frames(n); + framecnt_t nlen = _trackview.track()->get_captured_frames(n); if (nlen != region->length()) { - if (region->source(0)->length() >= region->start() + nlen) { + if (region->source_length(0) >= region->start() + nlen) { + + region->suspend_property_changes (); + region->set_position (_trackview.track()->get_capture_start_frame(n)); + region->set_length (nlen); + region->resume_property_changes (); - region->freeze (); - region->set_position (_trackview.get_diskstream()->get_capture_start_frame(n), this); - region->set_length (nlen, this); - region->thaw ("updated"); - if (origlen == 1) { /* our special initial length */ - add_region_view_internal (region, false); + add_region_view_internal (region, false, true); } - + /* also hide rect */ ArdourCanvas::Item * rect = rec_rects[n].rectangle; rect->hide(); @@ -697,66 +464,80 @@ AudioStreamView::update_rec_regions () } } } - - iter = tmp; } - } -} -void -AudioStreamView::show_all_xfades () -{ - foreach_crossfadeview (&CrossfadeView::show); - crossfades_visible = true; + iter = tmp; + } } void -AudioStreamView::hide_all_xfades () +AudioStreamView::show_all_fades () { - foreach_crossfadeview (&CrossfadeView::hide); - crossfades_visible = false; + 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_xfades_involving (AudioRegionView& rv) +AudioStreamView::hide_all_fades () { - for (list::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { - if ((*i)->crossfade->involves (rv.audio_region())) { - (*i)->fake_hide (); + 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::reveal_xfades_involving (AudioRegionView& rv) +/** Hide xfades for regions that overlap ar. + * @return Pair of lists; first is the AudioRegionViews that start xfades were hidden for, + * second is the AudioRegionViews that end xfades were hidden for. + */ +pair, list > +AudioStreamView::hide_xfades_with (boost::shared_ptr ar) { - for (list::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { - if ((*i)->crossfade->involves (rv.audio_region()) && (*i)->visible()) { - (*i)->show (); + list start_hidden; + list end_hidden; + + for (list::iterator i = region_views.begin(); i != region_views.end(); ++i) { + AudioRegionView* const arv = dynamic_cast(*i); + if (arv) { + switch (arv->region()->coverage (ar->position(), ar->last_frame())) { + case Evoral::OverlapNone: + break; + default: + if (arv->start_xfade_visible ()) { + start_hidden.push_back (arv); + } + if (arv->end_xfade_visible ()) { + end_hidden.push_back (arv); + } + arv->hide_xfades (); + break; + } } } + + return make_pair (start_hidden, end_hidden); } 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; - } - break; - case cAudioTrackOutline: - canvas_rect->property_outline_color_rgba() = val; - break; + //case cAudioTrackBase: + if (_trackview.is_track()) { + canvas_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_AudioTrackBase.get(); + } - default: - break; + //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(); + } } } -