Use boost::shared_ptr instead of raw pointers for RouteUI track (etc) accessors ...

git-svn-id: svn://localhost/ardour2/trunk@1986 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 87f895d977fba906287b6b8a4f687cc48fadf31e..573ed0cebaf19353b5b566691df113b7d33fae75 100644 (file)
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -508,7 +508,7 @@ AudioStreamView::setup_rec_box ()
                        
                        /* start a new rec box */
 
-                       AudioTrack* at;
+                       boost::shared_ptr<AudioTrack> at;
 
                        at = _trackview.audio_track(); /* we know what it is already */
                        boost::shared_ptr<AudioDiskstream> ds = at->audio_diskstream();

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 2eb8b9140a08cd2801d3f088b038ce439be55b31..2c0395f03fabbe9cbc0d35a90d049778f6eb6fea 100644 (file)
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -65,7 +65,7 @@ void
 Editor::add_external_audio_action (ImportMode mode)
 {
        nframes_t& pos = edit_cursor->current_frame;
-       AudioTrack* track = 0;
+       boost::shared_ptr<AudioTrack> track;
 
        if (!selection->tracks.empty()) {
                AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*>(selection->tracks.front());
@@ -74,7 +74,7 @@ Editor::add_external_audio_action (ImportMode mode)
                }
        }
 
-       bring_in_external_audio (mode, track, pos, false);
+       bring_in_external_audio (mode, track.get(), pos, false);
 }
 
 void

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index c3a5cb6e9b0a1d773159b390f0bdbc21b2eb3fe7..0c11092af66c269c0616a48aa26c5798e4635040 100644 (file)
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -523,7 +523,7 @@ Editor::drop_paths (const RefPtr<Gdk::DragContext>& context,
                /* check that its an audio track, not a bus */
                
                if (tv->get_diskstream()) {
-                       do_embed (paths, false, ImportToTrack, tv->audio_track(), frame, true);
+                       do_embed (paths, false, ImportToTrack, tv->audio_track().get(), frame, true);
                }
        }
 

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 4de38a34afbf3bedfc825cf8a59bce6107af86cd..843e0e3addbd279f5eeb42c739ce33b5023a82e3 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1975,7 +1975,7 @@ Editor::separate_region_from_selection ()
                
                if ((rtv = dynamic_cast<RouteTimeAxisView*> ((*i))) != 0) {
 
-                       Track* t = dynamic_cast<Track*>(rtv->track());
+                       boost::shared_ptr<Track> t = rtv->track();
 
                        if (t != 0 && ! t->diskstream()->destructive()) {
                                
@@ -2032,7 +2032,7 @@ Editor::separate_regions_using_location (Location& loc)
                
                if ((rtv = dynamic_cast<RouteTimeAxisView*> ((*i))) != 0) {
 
-                       Track* t = dynamic_cast<Track*>(rtv->track());
+                       boost::shared_ptr<Track> t = rtv->track();
 
                        if (t != 0 && ! t->diskstream()->destructive()) {
                                
@@ -2081,7 +2081,7 @@ Editor::crop_region_to_selection ()
                
                if ((rtv = dynamic_cast<RouteTimeAxisView*> ((*i))) != 0) {
 
-                       Track* t = dynamic_cast<Track*>(rtv->track());
+                       boost::shared_ptr<Track> t = rtv->track();
 
                        if (t != 0 && ! t->diskstream()->destructive()) {
                                

diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index 6f0718bdda0cec936728056cd8149f448017556a..c99f6ca77772ed642fcdaaf0a2ee21b2020626ae 100644 (file)
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -206,7 +206,7 @@ MidiStreamView::setup_rec_box ()
                        
                        /* start a new rec box */
 
-                       MidiTrack* mt = _trackview.midi_track(); /* we know what it is already */
+                       boost::shared_ptr<MidiTrack> mt = _trackview.midi_track(); /* we know what it is already */
                        boost::shared_ptr<MidiDiskstream> ds = mt->midi_diskstream();
                        jack_nframes_t frame_pos = ds->current_capture_start ();
                        gdouble xstart = _trackview.editor.frame_to_pixel (frame_pos);

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 94dbd1d727f52db8102995a18d47ea273bdf10f9..4efc2b0340bd51a9baaa773c3d040dd5f5825b2a 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -184,7 +184,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
 
                rec_enable_button->set_name ("MixerRecordEnableButton");
 
-               AudioTrack* at = audio_track();
+               boost::shared_ptr<AudioTrack> at = audio_track();
 
                at->FreezeChange.connect (mem_fun(*this, &MixerStrip::map_frozen));
 
@@ -1133,7 +1133,7 @@ MixerStrip::map_frozen ()
 {
        ENSURE_GUI_THREAD (mem_fun(*this, &MixerStrip::map_frozen));
 
-       AudioTrack* at = audio_track();
+       boost::shared_ptr<AudioTrack> at = audio_track();
 
        if (at) {
                switch (at->freeze_state()) {

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 766db2938f3f4f9de99cc64cbbc840c6569071f8..fbc5703fb253bffb271f914ae44ecf0037d010d0 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -505,7 +505,7 @@ Mixer_UI::set_all_audio_visibility (int tracks, bool yn)
                        continue;
                }
 
-               AudioTrack* at = strip->audio_track();
+               boost::shared_ptr<AudioTrack> at = strip->audio_track();
 
                switch (tracks) {
                case 0:

diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc
index 40f837eb5ef1a7d4e35b9c99a3a63915e49dd1b9..39abfe3dc1297631f4367c910084e664269ff6a2 100644 (file)
--- a/gtk2_ardour/playlist_selector.cc
+++ b/gtk2_ardour/playlist_selector.cc
@@ -245,7 +245,7 @@ PlaylistSelector::selection_changed ()
 
        if ((playlist = ((*iter)[columns.playlist])) != 0) {
                
-               AudioTrack* at;
+               boost::shared_ptr<AudioTrack> at;
                boost::shared_ptr<AudioPlaylist> apl;
                
                if ((at = rui->audio_track()) == 0) {

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 4450118951f28b944b2b69a2e22fcda4de7dd774..4de34d61d5375f95f1dded4ac0c4f2732557f371 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -503,7 +503,7 @@ RouteTimeAxisView::set_track_mode (TrackMode mode)
        }
 
        if (item->get_active () && track()->mode() != mode) {
-               _set_track_mode (track(), mode, other_item);
+               _set_track_mode (track().get(), mode, other_item);
        }
 }
 

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 5b9e927e812c1ee2b7249193ec6daf8c26b0d54c..e0591f080639b947f9e6043e83245350f17a84f0 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -970,37 +970,37 @@ RouteUI::disconnect_output ()
 bool
 RouteUI::is_track () const
 {
-       return dynamic_cast<Track*>(_route.get()) != 0;
+       return boost::dynamic_pointer_cast<Track>(_route) != 0;
 }
 
-Track*
+boost::shared_ptr<Track>
 RouteUI::track() const
 {
-       return dynamic_cast<Track*>(_route.get());
+       return boost::dynamic_pointer_cast<Track>(_route);
 }
 
 bool
 RouteUI::is_audio_track () const
 {
-       return dynamic_cast<AudioTrack*>(_route.get()) != 0;
+       return boost::dynamic_pointer_cast<AudioTrack>(_route) != 0;
 }
 
-AudioTrack*
+boost::shared_ptr<AudioTrack>
 RouteUI::audio_track() const
 {
-       return dynamic_cast<AudioTrack*>(_route.get());
+       return boost::dynamic_pointer_cast<AudioTrack>(_route);
 }
 
 bool
 RouteUI::is_midi_track () const
 {
-       return dynamic_cast<MidiTrack*>(_route.get()) != 0;
+       return boost::dynamic_pointer_cast<MidiTrack>(_route) != 0;
 }
 
-MidiTrack*
+boost::shared_ptr<MidiTrack>
 RouteUI::midi_track() const
 {
-       return dynamic_cast<MidiTrack*>(_route.get());
+       return boost::dynamic_pointer_cast<MidiTrack>(_route);
 }
 
 boost::shared_ptr<Diskstream>

diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index ceb6cf09cc96fffd2aa6a4327b6be4bc746efe4b..f3021f675dd1c08fdab50f494eda32d25f0b9b93 100644 (file)
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -54,10 +54,9 @@ class RouteUI : public virtual AxisView
 
        boost::shared_ptr<ARDOUR::Route> route() const { return _route; }
        
-       // FIXME: make these return shared_ptr
-       ARDOUR::Track*      track() const;
-       ARDOUR::AudioTrack* audio_track() const;
-       ARDOUR::MidiTrack*  midi_track() const;
+       boost::shared_ptr<ARDOUR::Track>      track() const;
+       boost::shared_ptr<ARDOUR::AudioTrack> audio_track() const;
+       boost::shared_ptr<ARDOUR::MidiTrack>  midi_track() const;
        
        boost::shared_ptr<ARDOUR::Diskstream> get_diskstream() const;
 

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 34b0238769b8ef89335fd70a6fdfc55c4c76b05c..aa8767ac13974ab438863d88c345ed73d3590f40 100644 (file)
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -250,7 +250,7 @@ StreamView::playlist_changed (boost::shared_ptr<Diskstream> ds)
 void
 StreamView::diskstream_changed ()
 {
-       Track *t;
+       boost::shared_ptr<Track> t;
 
        if ((t = _trackview.track()) != 0) {
                Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun (*this, &StreamView::display_diskstream), t->diskstream()));