Use boost::shared_ptr instead of raw pointers for RouteUI track (etc) accessors (fix FIXME in route_ui.h).
git-svn-id: svn://localhost/ardour2/trunk@1986 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
598d062bb2
commit
cd9fdb935f
|
@ -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();
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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()) {
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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()) {
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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()));
|
||||
|
|
Loading…
Reference in New Issue