diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-04-21 20:42:22 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-04-21 20:42:22 +0000 |
| commit | 061a85191c301ac18f2e8ca59d43127a4499ba96 (patch) | |
| tree | 469688f4dea1853c91372319a899b2efc71b30d5 /gtk2_ardour/route_ui.cc | |
| parent | d9cebc2edf8accded23c6f2a1caab73eb47a50fd (diff) | |
Move Diskstream ownership to Track, so that Session no longer holds lists of Diskstreams. Breaks 3.0 file format again.
git-svn-id: svn://localhost/ardour2/branches/3.0@6945 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_ui.cc')
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 526d99cd94..ee66bf4c90 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -50,9 +50,7 @@ #include "ardour/session.h" #include "ardour/audioengine.h" #include "ardour/audio_track.h" -#include "ardour/audio_diskstream.h" #include "ardour/midi_track.h" -#include "ardour/midi_diskstream.h" #include "ardour/template_utils.h" #include "ardour/filename_extensions.h" #include "ardour/directory_names.h" @@ -221,7 +219,7 @@ RouteUI::set_route (boost::shared_ptr<Route> rp) if (_session->writable() && is_track()) { boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(_route); - t->diskstream()->RecordEnableChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_rec_enable_changed, this), gui_context()); + t->RecordEnableChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_rec_enable_changed, this), gui_context()); rec_enable_button->show(); rec_enable_button->set_controllable (t->rec_enable_control()); @@ -1328,18 +1326,6 @@ RouteUI::midi_track() const return boost::dynamic_pointer_cast<MidiTrack>(_route); } -boost::shared_ptr<Diskstream> -RouteUI::get_diskstream () const -{ - boost::shared_ptr<Track> t; - - if ((t = boost::dynamic_pointer_cast<Track>(_route)) != 0) { - return t->diskstream(); - } else { - return boost::shared_ptr<Diskstream> ((Diskstream*) 0); - } -} - string RouteUI::name() const { |