X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_streamview.cc;h=3a7f985e303a99b3d9b1ea0042258e6e68947ce4;hb=90e73a3a6dc196f8295291eca7e67e85595b82d4;hp=6b1aed626866582cd3489bd569551f81f1cbd161;hpb=ce7a5e1c9fa3edf2d9cc66875505e402a0aaa6f6;p=ardour.git diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 6b1aed6268..3a7f985e30 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -29,7 +29,6 @@ #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" @@ -62,13 +61,11 @@ using namespace Editing; AudioStreamView::AudioStreamView (AudioTimeAxisView& tv) : StreamView (tv) { - crossfades_visible = true; + crossfades_visible = tv.session()->config.get_xfades_visible (); color_handler (); _amplitude_above_axis = 1.0; - use_rec_regions = tv.editor().show_waveforms_recording (); - - Config->ParameterChanged.connect (*this, ui_bind (&AudioStreamView::parameter_changed, this, _1), gui_context()); + Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&AudioStreamView::parameter_changed, this, _1), gui_context()); } AudioStreamView::~AudioStreamView () @@ -122,16 +119,19 @@ AudioStreamView::create_region_view (boost::shared_ptr r, bool wait_for_ case NonLayered: case Normal: if (recording) { - region_view = new AudioRegionView (canvas_group, _trackview, region, + region_view = new AudioRegionView (_canvas_group, _trackview, region, _samples_per_unit, region_color, recording, TimeAxisViewItem::Visibility( - TimeAxisViewItem::ShowFrame | TimeAxisViewItem::HideFrameRight)); + TimeAxisViewItem::ShowFrame | + TimeAxisViewItem::HideFrameRight | + TimeAxisViewItem::HideFrameLeft | + TimeAxisViewItem::HideFrameTB)); } else { - region_view = new AudioRegionView (canvas_group, _trackview, region, + region_view = new AudioRegionView (_canvas_group, _trackview, region, _samples_per_unit, region_color); } break; case Destructive: - region_view = new TapeAudioRegionView (canvas_group, _trackview, region, + region_view = new TapeAudioRegionView (_canvas_group, _trackview, region, _samples_per_unit, region_color); break; default: @@ -163,6 +163,7 @@ 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; } @@ -192,7 +193,7 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr r, bool wai /* catch region going away */ - r->DropReferences.connect (*this, boost::bind (&AudioStreamView::remove_region_view, this, boost::weak_ptr (r)), gui_context()); + r->DropReferences.connect (*this, invalidator (*this), boost::bind (&AudioStreamView::remove_region_view, this, boost::weak_ptr (r)), gui_context()); RegionViewAdded (region_view); @@ -210,8 +211,6 @@ AudioStreamView::remove_region_view (boost::weak_ptr weak_r) return; } - cerr << "a region went way, it appears to be ours (" << this << ")\n"; - if (!_trackview.session()->deletion_in_progress()) { for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end();) { @@ -234,9 +233,9 @@ AudioStreamView::remove_region_view (boost::weak_ptr weak_r) } void -AudioStreamView::undisplay_diskstream () +AudioStreamView::undisplay_track () { - StreamView::undisplay_diskstream(); + StreamView::undisplay_track (); for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { delete i->second; @@ -246,46 +245,40 @@ AudioStreamView::undisplay_diskstream () } void -AudioStreamView::playlist_layered (boost::weak_ptr wds) +AudioStreamView::playlist_layered (boost::weak_ptr wtr) { - boost::shared_ptr ds (wds.lock()); + boost::shared_ptr tr (wtr.lock()); - if (!ds) { + if (!tr) { return; } - cerr << "AS, call SV::modified @ " << get_microseconds() << endl; - - StreamView::playlist_layered (wds); - - cerr << "AS, done with SV::modified @ " << get_microseconds() << endl; + StreamView::playlist_layered (wtr); /* make sure xfades are on top and all the regionviews are stacked correctly. */ - cerr << "AS, raise xfades @ " << get_microseconds() << endl; for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) { i->second->get_canvas_group()->raise_to_top(); } - cerr << "AS, done with xfades @ " << get_microseconds() << endl; } void -AudioStreamView::playlist_switched (boost::weak_ptr wds) +AudioStreamView::playlist_switched (boost::weak_ptr wtr) { - boost::shared_ptr ds (wds.lock()); + boost::shared_ptr tr (wtr.lock()); - if (!ds) { + if (!tr) { return; } playlist_connections.drop_connections (); - StreamView::playlist_switched (ds); + StreamView::playlist_switched (tr); - boost::shared_ptr apl = boost::dynamic_pointer_cast(ds->playlist()); + boost::shared_ptr apl = boost::dynamic_pointer_cast (tr->playlist()); if (apl) { - apl->NewCrossfade.connect (playlist_connections, ui_bind (&AudioStreamView::add_crossfade, this, _1), gui_context()); + apl->NewCrossfade.connect (playlist_connections, invalidator (*this), ui_bind (&AudioStreamView::add_crossfade, this, _1), gui_context()); } } @@ -334,9 +327,9 @@ AudioStreamView::add_crossfade (boost::weak_ptr wc) region_color, *lview, *rview); cv->set_valid (true); - crossfade->Invalidated.connect (*this, ui_bind (&AudioStreamView::remove_crossfade, this, _1), gui_context()); + crossfade->Invalidated.connect (*this, invalidator (*this), ui_bind (&AudioStreamView::remove_crossfade, this, _1), gui_context()); crossfade_views[cv->crossfade] = cv; - if (!_trackview.session()->config.get_xfades_visible() || !crossfades_visible) { + if (!crossfades_visible) { cv->hide (); } @@ -360,7 +353,7 @@ AudioStreamView::remove_crossfade (boost::shared_ptr r) } void -AudioStreamView::redisplay_diskstream () +AudioStreamView::redisplay_track () { list::iterator i; CrossfadeViewList::iterator xi, tmpx; @@ -382,12 +375,12 @@ AudioStreamView::redisplay_diskstream () // Add and display region and crossfade views, and flag them as valid if (_trackview.is_audio_track()) { - _trackview.get_diskstream()->playlist()->foreach_region( + _trackview.track()->playlist()->foreach_region( sigc::hide_return (sigc::mem_fun (*this, &StreamView::add_region_view)) ); boost::shared_ptr apl = boost::dynamic_pointer_cast( - _trackview.get_diskstream()->playlist() + _trackview.track()->playlist() ); if (apl) { @@ -455,21 +448,22 @@ 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()) { + _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; rec_data_ready_connections.drop_connections (); - boost::shared_ptr ads = _trackview.audio_track()->audio_diskstream(); + boost::shared_ptr tr = _trackview.audio_track(); - for (uint32_t n=0; n < ads->n_channels().n_audio(); ++n) { - boost::shared_ptr src = ads->write_source (n); + 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); src->PeakRangeReady.connect (rec_data_ready_connections, + invalidator (*this), ui_bind (&AudioStreamView::rec_peak_range_ready, this, _1, _2, boost::weak_ptr(src)), gui_context()); } @@ -480,7 +474,7 @@ AudioStreamView::setup_rec_box () nframes_t start = 0; if (rec_regions.size() > 0) { start = rec_regions.back().first->start() - + _trackview.get_diskstream()->get_captured_frames(rec_regions.size()-1); + + _trackview.track()->get_captured_frames(rec_regions.size()-1); } PropertyList plist; @@ -494,9 +488,9 @@ AudioStreamView::setup_rec_box () boost::dynamic_pointer_cast(RegionFactory::create (sources, plist, false))); assert(region); - region->block_property_changes (); + region->suspend_property_changes (); region->set_position (_trackview.session()->transport_frame(), this); - rec_regions.push_back (make_pair(region, (RegionView*)0)); + rec_regions.push_back (make_pair(region, (RegionView*) 0)); } /* start a new rec box */ @@ -504,8 +498,7 @@ AudioStreamView::setup_rec_box () 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 (); + nframes_t frame_pos = at->current_capture_start (); gdouble xstart = _trackview.editor().frame_to_pixel (frame_pos); gdouble xend; uint32_t fill_color; @@ -527,13 +520,13 @@ AudioStreamView::setup_rec_box () 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() = child_height (); + rec_rect->property_outline_what() = 0x0; 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(); @@ -552,7 +545,7 @@ AudioStreamView::setup_rec_box () } else if (rec_active && (_trackview.session()->record_status() != Session::Recording || - !_trackview.get_diskstream()->record_enabled())) { + !_trackview.track()->record_enabled())) { screen_update_connection.disconnect(); rec_active = false; rec_updating = false; @@ -626,7 +619,7 @@ AudioStreamView::rec_peak_range_ready (nframes_t start, nframes_t cnt, boost::we rec_data_ready_map[src] = true; - if (rec_data_ready_map.size() == _trackview.get_diskstream()->n_channels().n_audio()) { + if (rec_data_ready_map.size() == _trackview.track()->n_channels().n_audio()) { this->update_rec_regions (); rec_data_ready_map.clear(); } @@ -635,7 +628,7 @@ AudioStreamView::rec_peak_range_ready (nframes_t start, nframes_t cnt, boost::we void AudioStreamView::update_rec_regions () { - if (use_rec_regions) { + if (Config->get_show_waveforms_while_recording ()) { uint32_t n = 0; for (list,RegionView*> >::iterator iter = rec_regions.begin(); @@ -651,6 +644,7 @@ AudioStreamView::update_rec_regions () } boost::shared_ptr region = boost::dynamic_pointer_cast(iter->first); + if (!region) { iter = tmp; continue; @@ -666,10 +660,10 @@ AudioStreamView::update_rec_regions () if (nlen != region->length()) { - region->freeze (); - region->set_position (_trackview.get_diskstream()->get_capture_start_frame(n), this); + region->suspend_property_changes (); + region->set_position (_trackview.track()->get_capture_start_frame(n), this); region->set_length (nlen, this); - region->thaw (); + region->resume_property_changes (); if (origlen == 1) { /* our special initial length */ @@ -685,16 +679,16 @@ AudioStreamView::update_rec_regions () } else { - nframes_t nlen = _trackview.get_diskstream()->get_captured_frames(n); + nframes_t nlen = _trackview.track()->get_captured_frames(n); if (nlen != region->length()) { if (region->source_length(0) >= region->start() + nlen) { - region->freeze (); - region->set_position (_trackview.get_diskstream()->get_capture_start_frame(n), this); + region->suspend_property_changes (); + region->set_position (_trackview.track()->get_capture_start_frame(n), this); region->set_length (nlen, this); - region->thaw (); + region->resume_property_changes (); if (origlen == 1) { /* our special initial length */ @@ -801,8 +795,6 @@ AudioStreamView::update_contents_height () void AudioStreamView::update_content_height (CrossfadeView* cv) { - cv->show (); - if (_layer_display == Overlaid) { cv->set_y (0);