summaryrefslogtreecommitdiff
path: root/gtk2_ardour/audio_streamview.cc
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour/audio_streamview.cc')
-rw-r--r--gtk2_ardour/audio_streamview.cc57
1 files changed, 23 insertions, 34 deletions
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 83d1825ef5..2b9cd23567 100644
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -25,11 +25,12 @@
#include <ardour/audioplaylist.h>
#include <ardour/audioregion.h>
-#include <ardour/audiosource.h>
+#include <ardour/audiofilesource.h>
#include <ardour/audio_diskstream.h>
#include <ardour/audio_track.h>
#include <ardour/playlist_templates.h>
#include <ardour/source.h>
+#include <ardour/region_factory.h>
#include "audio_streamview.h"
#include "audio_region_view.h"
@@ -123,11 +124,11 @@ AudioStreamView::set_amplitude_above_axis (gdouble app)
}
void
-AudioStreamView::add_region_view_internal (Region *r, bool wait_for_waves)
+AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wait_for_waves)
{
ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::add_region_view), r));
- AudioRegion* region = dynamic_cast<AudioRegion*> (r);
+ boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (r);
if (region == 0) {
return;
@@ -137,7 +138,7 @@ AudioStreamView::add_region_view_internal (Region *r, bool wait_for_waves)
list<RegionView *>::iterator i;
for (i = region_views.begin(); i != region_views.end(); ++i) {
- if (&(*i)->region() == r) {
+ if ((*i)->region() == r) {
/* great. we already have a AudioRegionView for this Region. use it again. */
@@ -148,11 +149,11 @@ AudioStreamView::add_region_view_internal (Region *r, bool wait_for_waves)
switch (_trackview.audio_track()->mode()) {
case Normal:
- 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;
}
@@ -167,13 +168,13 @@ AudioStreamView::add_region_view_internal (Region *r, bool wait_for_waves)
/* catch regionview going away */
- region->GoingAway.connect (mem_fun (*this, &AudioStreamView::remove_region_view));
+ region->GoingAway.connect (bind (mem_fun (*this, &AudioStreamView::remove_region_view), region));
RegionViewAdded (region_view);
}
void
-AudioStreamView::remove_region_view (Region *r)
+AudioStreamView::remove_region_view (boost::shared_ptr<Region> r)
{
ENSURE_GUI_THREAD (bind (mem_fun (*this, &AudioStreamView::remove_region_view), r));
@@ -183,8 +184,8 @@ AudioStreamView::remove_region_view (Region *r)
tmp = i;
++tmp;
- AudioRegion* ar = dynamic_cast<AudioRegion*>(r);
- if (ar && (*i)->crossfade.involves (*ar)) {
+ boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion>(r);
+ if (ar && (*i)->crossfade.involves (ar)) {
delete *i;
crossfade_views.erase (i);
}
@@ -262,10 +263,10 @@ AudioStreamView::add_crossfade (Crossfade *crossfade)
for (list<RegionView *>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
AudioRegionView* arv = dynamic_cast<AudioRegionView*>(*i);
- if (!lview && arv && &(arv->region()) == &crossfade->out()) {
+ if (!lview && arv && (arv->region() == crossfade->out())) {
lview = arv;
}
- if (!rview && arv && &(arv->region()) == &crossfade->in()) {
+ if (!rview && arv && (arv->region() == crossfade->in())) {
rview = arv;
}
}
@@ -390,7 +391,7 @@ AudioStreamView::setup_rec_box ()
/* add a new region, but don't bother if they set use_rec_regions mid-record */
- AudioRegion::SourceList sources;
+ SourceList sources;
for (list<sigc::connection>::iterator prc = rec_data_ready_connections.begin(); prc != rec_data_ready_connections.end(); ++prc) {
(*prc).disconnect();
@@ -402,7 +403,7 @@ AudioStreamView::setup_rec_box ()
assert(ads);
for (uint32_t n=0; n < ads->n_channels().get(DataType::AUDIO); ++n) {
- AudioSource *src = (AudioSource *) ads->write_source (n);
+ boost::shared_ptr<AudioFileSource> src = boost::static_pointer_cast<AudioFileSource> (ads->write_source (n));
if (src) {
sources.push_back (src);
rec_data_ready_connections.push_back (src->PeakRangeReady.connect (bind (mem_fun (*this, &AudioStreamView::rec_peak_range_ready), src)));
@@ -416,11 +417,12 @@ AudioStreamView::setup_rec_box ()
start = rec_regions.back()->start() + _trackview.get_diskstream()->get_captured_frames(rec_regions.size()-1);
}
- AudioRegion * region = new AudioRegion(sources, start, 1 , "", 0, (Region::Flag)(Region::DefaultFlags | Region::DoNotSaveState), false);
+ boost::shared_ptr<AudioRegion> region (boost::dynamic_pointer_cast<AudioRegion>
+ (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);
/* catch it if it goes away */
- region->GoingAway.connect (mem_fun (*this, &AudioStreamView::remove_rec_region));
+ region->GoingAway.connect (bind (mem_fun (*this, &AudioStreamView::remove_rec_region), region));
/* we add the region later */
}
@@ -501,23 +503,10 @@ AudioStreamView::setup_rec_box ()
last_rec_data_frame = 0;
/* remove temp regions */
- for (list<Region*>::iterator iter=rec_regions.begin(); iter != rec_regions.end(); )
- {
- list<Region*>::iterator tmp;
-
- tmp = iter;
- ++tmp;
-
- /* this will trigger the remove_region_view */
- delete *iter;
-
- iter = tmp;
- }
rec_regions.clear();
// cerr << "\tclear " << rec_rects.size() << " rec rects\n";
-
/* transport stopped, clear boxes */
for (vector<RecBoxInfo>::iterator iter=rec_rects.begin(); iter != rec_rects.end(); ++iter) {
@@ -540,7 +529,7 @@ AudioStreamView::foreach_crossfadeview (void (CrossfadeView::*pmf)(void))
}
void
-AudioStreamView::rec_peak_range_ready (jack_nframes_t start, jack_nframes_t cnt, Source * src)
+AudioStreamView::rec_peak_range_ready (jack_nframes_t start, jack_nframes_t cnt, boost::shared_ptr<Source> src)
{
// this is called from the peak building thread
@@ -565,9 +554,9 @@ AudioStreamView::update_rec_regions ()
uint32_t n = 0;
- for (list<Region*>::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) {
+ for (list<boost::shared_ptr<Region> >::iterator iter = rec_regions.begin(); iter != rec_regions.end(); n++) {
- list<Region*>::iterator tmp;
+ list<boost::shared_ptr<Region> >::iterator tmp;
tmp = iter;
++tmp;
@@ -579,7 +568,7 @@ AudioStreamView::update_rec_regions ()
}
// FIXME
- AudioRegion * region = dynamic_cast<AudioRegion*>(*iter);
+ boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion>(*iter);
assert(region);
jack_nframes_t origlen = region->length();
@@ -615,7 +604,7 @@ AudioStreamView::update_rec_regions ()
if (nlen != region->length()) {
- if (region->source(0).length() >= region->start() + nlen) {
+ if (region->source(0)->length() >= region->start() + nlen) {
region->freeze ();
region->set_position (_trackview.get_diskstream()->get_capture_start_frame(n), this);
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-08 00:41:42 +0000