fixes for endemic (compiler?) issues with virtual inheritance of sigc::trackable...

[ardour.git] / gtk2_ardour / audio_regionview.cc

diff --git a/gtk2_ardour/audio_regionview.cc b/gtk2_ardour/audio_regionview.cc
index e2d20c0cc046214864c0bf309e47a8c781488df6..b50ea72be2b77e98370e5a6a065927cf75b5067f 100644 (file)
--- a/gtk2_ardour/audio_regionview.cc
+++ b/gtk2_ardour/audio_regionview.cc
@@ -360,7 +360,7 @@ AudioRegionView::region_scale_amplitude_changed ()
 
        for (uint32_t n = 0; n < waves.size(); ++n) {
                // force a reload of the cache
-               waves[n]->property_data_src() = &region;
+               waves[n]->property_data_src() = region.get();
        }
 }
 
@@ -484,7 +484,7 @@ AudioRegionView::lower_to_bottom ()
 }
 
 bool
-AudioRegionView::set_position (jack_nframes_t pos, void* src, double* ignored)
+AudioRegionView::set_position (nframes_t pos, void* src, double* ignored)
 {
        double delta;
        bool ret;
@@ -576,11 +576,11 @@ AudioRegionView::reset_fade_shapes ()
 void
 AudioRegionView::reset_fade_in_shape ()
 {
-       reset_fade_in_shape_width ((jack_nframes_t) region.fade_in().back()->when);
+       reset_fade_in_shape_width ((nframes_t) region.fade_in().back()->when);
 }
        
 void
-AudioRegionView::reset_fade_in_shape_width (jack_nframes_t width)
+AudioRegionView::reset_fade_in_shape_width (nframes_t width)
 {
        if (fade_in_handle == 0) {
                return;
@@ -588,7 +588,7 @@ AudioRegionView::reset_fade_in_shape_width (jack_nframes_t width)
 
        /* smallest size for a fade is 64 frames */
 
-       width = std::max ((jack_nframes_t) 64, width);
+       width = std::max ((nframes_t) 64, width);
 
        Points* points;
        double pwidth = width / samples_per_unit;
@@ -660,11 +660,11 @@ AudioRegionView::reset_fade_in_shape_width (jack_nframes_t width)
 void
 AudioRegionView::reset_fade_out_shape ()
 {
-       reset_fade_out_shape_width ((jack_nframes_t) region.fade_out().back()->when);
+       reset_fade_out_shape_width ((nframes_t) region.fade_out().back()->when);
 }
 
 void
-AudioRegionView::reset_fade_out_shape_width (jack_nframes_t width)
+AudioRegionView::reset_fade_out_shape_width (nframes_t width)
 {      
        if (fade_out_handle == 0) {
                return;
@@ -672,7 +672,7 @@ AudioRegionView::reset_fade_out_shape_width (jack_nframes_t width)
 
        /* smallest size for a fade is 64 frames */
 
-       width = std::max ((jack_nframes_t) 64, width);
+       width = std::max ((nframes_t) 64, width);
 
        Points* points;
        double pwidth = width / samples_per_unit;
@@ -765,7 +765,7 @@ AudioRegionView::set_samples_per_unit (gdouble spu)
 }
 
 bool
-AudioRegionView::set_duration (jack_nframes_t frames, void *src)
+AudioRegionView::set_duration (nframes_t frames, void *src)
 {
        if (!TimeAxisViewItem::set_duration (frames, src)) {
                return false;
@@ -887,7 +887,7 @@ AudioRegionView::region_sync_changed ()
        }
 
        int sync_dir;
-       jack_nframes_t sync_offset;
+       nframes_t sync_offset;
 
        sync_offset = region.sync_offset (sync_dir);
 
@@ -1044,7 +1044,7 @@ AudioRegionView::create_one_wave (uint32_t which, bool direct)
 
        WaveView *wave = new WaveView(*group);
 
-       wave->property_data_src() = (gpointer) &region;
+       wave->property_data_src() = (gpointer) region.get()
        wave->property_cache() =  wave_caches[which];
        wave->property_cache_updater() = true;
        wave->property_channel() =  which;
@@ -1129,7 +1129,7 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev)
 
        item->w2i (x, y);
 
-       jack_nframes_t fx = trackview.editor.pixel_to_frame (x);
+       nframes_t fx = trackview.editor.pixel_to_frame (x);
 
        if (fx > region.length()) {
                return;
@@ -1143,9 +1143,10 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev)
 
        gain_line->view_to_model_y (y);
 
+#ifdef FIX_ME_TO_NOT_USE_STATE_MANAGER
        trackview.session().begin_reversible_command (_("add gain control point"));
        trackview.session().add_undo (region.envelope().get_memento());
-
+#endif
 
        if (!region.envelope_active()) {
                trackview.session().add_undo( bind( mem_fun(region, &AudioRegion::set_envelope_active), false) );
@@ -1155,8 +1156,10 @@ AudioRegionView::add_gain_point_event (ArdourCanvas::Item *item, GdkEvent *ev)
 
        region.envelope().add (fx, y);
        
+#ifdef FIX_ME_TO_NOT_USE_STATE_MANAGER
        trackview.session().add_redo_no_execute (region.envelope().get_memento());
        trackview.session().commit_reversible_command ();
+#endif
 }
 
 void
@@ -1269,7 +1272,7 @@ AudioRegionView::add_ghost (AutomationTimeAxisView& atv)
                
                WaveView *wave = new WaveView(*ghost->group);
 
-               wave->property_data_src() =  &region;
+               wave->property_data_src() =  region.get();
                wave->property_cache() =  wave_caches[n];
                wave->property_cache_updater() = false;
                wave->property_channel() = n;
@@ -1365,7 +1368,7 @@ AudioRegionView::set_waveview_data_src()
 
        for (uint32_t n = 0; n < waves.size(); ++n) {
                // TODO: something else to let it know the channel
-               waves[n]->property_data_src() = &region;
+               waves[n]->property_data_src() = region.get();
        }
        
        for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
@@ -1373,7 +1376,7 @@ AudioRegionView::set_waveview_data_src()
                (*i)->set_duration (unit_length);
                
                for (vector<WaveView*>::iterator w = (*i)->waves.begin(); w != (*i)->waves.end(); ++w) {
-                       (*w)->property_data_src() = &region;
+                       (*w)->property_data_src() = region.get();
                }
        }