X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_streamview.cc;h=99755d6a975ee215386aad7f63a84360b80e8af9;hb=ae6dbb836cc1ab1bcbc21883f282361c43f10883;hp=c571cb1a7cc2a13bc909c75f5035fd9339658b34;hpb=cc862d31bd8c9005964dca94a9942f1b42847252;p=ardour.git diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index c571cb1a7c..99755d6a97 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -24,14 +24,14 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ardour/audioplaylist.h" +#include "ardour/audioregion.h" +#include "ardour/audiofilesource.h" +#include "ardour/audio_diskstream.h" +#include "ardour/audio_track.h" +#include "ardour/source.h" +#include "ardour/region_factory.h" +#include "ardour/profile.h" #include "audio_streamview.h" #include "audio_region_view.h" @@ -59,22 +59,12 @@ AudioStreamView::AudioStreamView (AudioTimeAxisView& tv) : StreamView (tv) { crossfades_visible = true; - _waveform_scale = LinearWaveform; - _waveform_shape = Traditional; - - if (tv.is_track()) - stream_base_color = ARDOUR_UI::config()->canvasvar_AudioTrackBase.get(); - else - stream_base_color = ARDOUR_UI::config()->canvasvar_AudioBusBase.get(); - - canvas_rect->property_fill_color_rgba() = stream_base_color; - canvas_rect->property_outline_color_rgba() = RGBA_BLACK; - + color_handler (); _amplitude_above_axis = 1.0; - use_rec_regions = tv.editor.show_waveforms_recording (); - + use_rec_regions = tv.editor().show_waveforms_recording (); + Config->ParameterChanged.connect (sigc::mem_fun (*this, &AudioStreamView::parameter_changed)); } AudioStreamView::~AudioStreamView () @@ -87,7 +77,7 @@ 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); + xi->second->set_samples_per_unit (spp); } return 0; @@ -114,42 +104,31 @@ AudioStreamView::set_amplitude_above_axis (gdouble app) } RegionView* -AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wait_for_waves) +AudioStreamView::create_region_view (boost::shared_ptr r, bool wait_for_waves, bool recording) { AudioRegionView *region_view = 0; - boost::shared_ptr region = boost::dynamic_pointer_cast (r); if (region == 0) { - return NULL; - } - - 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 NULL; - } + 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)); + } 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); + _samples_per_unit, region_color); break; default: fatal << string_compose (_("programming error: %1"), "illegal track mode in ::add_region_view_internal") << endmsg; @@ -159,9 +138,8 @@ 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); + region_view->set_height (child_height ()); - /* if its the special single-sample length that we use for rec-regions, make it insensitive to events */ @@ -170,33 +148,46 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wai region_view->set_sensitive (false); } - /* 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; - } + region_view->set_waveform_scale (Config->get_waveform_scale ()); + region_view->set_waveform_shape (Config->get_waveform_shape ()); + region_view->set_waveform_visible (Config->get_show_waveforms ()); - 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); + return region_view; +} + +RegionView* +AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wait_for_waves, bool recording) +{ + RegionView *region_view = create_region_view (r, wait_for_waves, recording); + if (region_view == 0) { + return 0; } - - /* follow global waveform setting */ - region_view->set_waveform_visible(_trackview.editor.show_waveforms()); +// 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. */ + +// (*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 NULL; +// } +// } +// } + + region_views.push_front (region_view); /* catch regionview going away */ - region->GoingAway.connect (bind (mem_fun (*this, &AudioStreamView::remove_region_view), boost::weak_ptr (r))); + r->GoingAway.connect (bind (mem_fun (*this, &AudioStreamView::remove_region_view), boost::weak_ptr (r))); RegionViewAdded (region_view); @@ -216,15 +207,15 @@ AudioStreamView::remove_region_view (boost::weak_ptr weak_r) if (!_trackview.session().deletion_in_progress()) { - for (list::iterator i = crossfade_views.begin(); i != crossfade_views.end();) { - list::iterator tmp; + for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end();) { + CrossfadeViewList::iterator tmp; tmp = i; ++tmp; boost::shared_ptr ar = boost::dynamic_pointer_cast(r); - if (ar && (*i)->crossfade->involves (ar)) { - delete *i; + if (ar && i->second->crossfade->involves (ar)) { + delete i->second; crossfade_views.erase (i); } @@ -241,7 +232,7 @@ AudioStreamView::undisplay_diskstream () StreamView::undisplay_diskstream(); for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { - delete *i; + delete i->second; } crossfade_views.clear (); @@ -251,11 +242,9 @@ void AudioStreamView::playlist_modified_weak (boost::weak_ptr ds) { boost::shared_ptr sp (ds.lock()); - if (!sp) { - return; + if (sp) { + playlist_modified (sp); } - - playlist_modified (sp); } void @@ -268,21 +257,34 @@ AudioStreamView::playlist_modified (boost::shared_ptr ds) /* make sure xfades are on top and all the regionviews are stacked correctly. */ - for (list::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { - (*i)->get_canvas_group()->raise_to_top(); + for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { + i->second->get_canvas_group()->raise_to_top(); + } +} + +void +AudioStreamView::playlist_changed_weak (boost::weak_ptr ds) +{ + boost::shared_ptr sp (ds.lock()); + if (sp) { + playlist_changed (sp); } } void AudioStreamView::playlist_changed (boost::shared_ptr ds) { - ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::playlist_changed), ds)); + ENSURE_GUI_THREAD (bind ( + mem_fun (*this, &AudioStreamView::playlist_changed_weak), + boost::weak_ptr (ds))); StreamView::playlist_changed(ds); 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))); + if (apl) { + playlist_connections.push_back (apl->NewCrossfade.connect ( + mem_fun (*this, &AudioStreamView::add_crossfade))); + } } void @@ -309,17 +311,15 @@ AudioStreamView::add_crossfade (boost::shared_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 || layer_display == Stacked) { - (*i)->hide(); - } else { - (*i)->show (); - } - (*i)->set_valid (true); - return; + CrossfadeViewList::iterator i = crossfade_views.find (crossfade); + if (i != crossfade_views.end()) { + if (!crossfades_visible || _layer_display == Stacked) { + i->second->hide(); + } else { + i->second->show (); } + i->second->set_valid (true); + return; } /* create a new one */ @@ -335,7 +335,7 @@ 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, @@ -343,8 +343,8 @@ AudioStreamView::add_crossfade (boost::shared_ptr crossfade) *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 || layer_display == Stacked) { + crossfade_views[cv->crossfade] = cv; + if (!_trackview.session().config.get_xfades_visible() || !crossfades_visible || _layer_display == Stacked) { cv->hide (); } } @@ -356,9 +356,9 @@ AudioStreamView::remove_crossfade (boost::shared_ptr 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) { - delete *i; + for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { + if (i->second->crossfade == xfade) { + delete i->second; crossfade_views.erase (i); break; } @@ -368,99 +368,54 @@ AudioStreamView::remove_crossfade (boost::shared_ptr r) void AudioStreamView::redisplay_diskstream () { - list::iterator i, tmp; - list::iterator xi, tmpx; + list::iterator i; + CrossfadeViewList::iterator xi, tmpx; + // 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); } + // Flag crossfade views as invalid for (xi = crossfade_views.begin(); xi != crossfade_views.end(); ++xi) { - (*xi)->set_valid (false); - if ((*xi)->visible() && layer_display != Stacked) { - (*xi)->show (); + xi->second->set_valid (false); + if (xi->second->visible() && _layer_display != Stacked) { + xi->second->show (); } } - 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); - } - - RegionViewList copy; + // Add and display region and crossfade views, and flag them as valid - for (i = region_views.begin(); i != region_views.end(); ) { - tmp = i; - tmp++; - - 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; - } + if (_trackview.is_audio_track()) { + _trackview.get_diskstream()->playlist()->foreach_region( + sigc::hide_return (sigc::mem_fun (*this, &StreamView::add_region_view)) + ); - for (RegionViewList::iterator j = copy.begin(); j != copy.end(); ++j) { - - if ((*j)->region()->layer() >= (*i)->region()->layer()) { - copy.insert(j, (*i)); - break; - } + boost::shared_ptr apl = boost::dynamic_pointer_cast( + _trackview.get_diskstream()->playlist() + ); + + if (apl) { + apl->foreach_crossfade (sigc::mem_fun (*this, &AudioStreamView::add_crossfade)); } - - i = tmp; - } - + + // Remove invalid crossfade views for (xi = crossfade_views.begin(); xi != crossfade_views.end();) { tmpx = xi; tmpx++; - if (!(*xi)->valid()) { - delete *xi; + if (!xi->second->valid()) { + delete xi->second; crossfade_views.erase (xi); } xi = tmpx; } - /* now fix canvas layering */ - - for (RegionViewList::iterator j = copy.begin(); j != copy.end(); ++j) { - (*j)->enable_display(true); - (*j)->set_y_position_and_height(0, height); - region_layered (*j); - } + // Stack regions by layer, and remove invalid regions + layer_regions(); } void @@ -468,8 +423,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); + } } } @@ -481,7 +437,6 @@ AudioStreamView::set_waveform_shape (WaveformShape shape) if (arv) arv->set_waveform_shape (shape); } - _waveform_shape = shape; } void @@ -489,16 +444,16 @@ 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) + 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()) { @@ -507,7 +462,6 @@ 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 */ @@ -541,10 +495,10 @@ AudioStreamView::setup_rec_box () } boost::shared_ptr region (boost::dynamic_pointer_cast - (RegionFactory::create (sources, start, 1 , "", 0, (Region::Flag)(Region::DefaultFlags | Region::DoNotSaveState), false))); + (RegionFactory::create (sources, start, 1 , "", 0, (Region::Flag)(Region::DefaultFlags), false))); assert(region); + region->block_property_changes (); region->set_position (_trackview.session().transport_frame(), this); - rec_regions.push_back (make_pair(region, (RegionView*)0)); } @@ -555,12 +509,13 @@ AudioStreamView::setup_rec_box () 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: + case NonLayered: xend = xstart; fill_color = ARDOUR_UI::config()->canvasvar_RecordingRect.get(); break; @@ -579,8 +534,9 @@ 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() = ARDOUR_UI::config()->canvasvar_RecordingRect.get(); + 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(); @@ -599,11 +555,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 { @@ -655,8 +609,8 @@ AudioStreamView::setup_rec_box () void AudioStreamView::foreach_crossfadeview (void (CrossfadeView::*pmf)(void)) { - for (list::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { - ((*i)->*pmf) (); + for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { + (i->second->*pmf) (); } } @@ -689,7 +643,6 @@ void AudioStreamView::update_rec_regions () { if (use_rec_regions) { - uint32_t n = 0; for (list,RegionView*> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) { @@ -727,12 +680,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; } } @@ -743,7 +696,7 @@ AudioStreamView::update_rec_regions () if (nlen != region->length()) { - if (region->source(0)->length() >= region->start() + nlen) { + if (region->source_length(0) >= region->start() + nlen) { region->freeze (); region->set_position (_trackview.get_diskstream()->get_capture_start_frame(n), this); @@ -752,7 +705,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 */ @@ -768,6 +721,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 () { @@ -785,9 +760,9 @@ AudioStreamView::hide_all_xfades () void AudioStreamView::hide_xfades_involving (AudioRegionView& rv) { - for (list::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { - if ((*i)->crossfade->involves (rv.audio_region())) { - (*i)->fake_hide (); + for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { + if (i->second->crossfade->involves (rv.audio_region())) { + i->second->fake_hide (); } } } @@ -795,9 +770,9 @@ AudioStreamView::hide_xfades_involving (AudioRegionView& rv) 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() && layer_display != Stacked) { - (*i)->show (); + for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { + if (i->second->crossfade->involves (rv.audio_region()) && i->second->visible() && _layer_display != Stacked) { + i->second->show (); } } } @@ -812,22 +787,37 @@ 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 -AudioStreamView::update_contents_y_position_and_height () +AudioStreamView::update_contents_height () { - StreamView::update_contents_y_position_and_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_y_position_and_height (0, height); + if (_layer_display == Overlaid) { + i->second->show (); + i->second->set_height (height); } else { - (*i)->hide (); + i->second->hide (); } } } + +void +AudioStreamView::parameter_changed (string const & p) +{ + if (p == "show-waveforms") { + set_show_waveforms (Config->get_show_waveforms ()); + } else if (p == "waveform-scale") { + set_waveform_scale (Config->get_waveform_scale ()); + } else if (p == "waveform-shape") { + set_waveform_shape (Config->get_waveform_shape ()); + } +}