diff options
| author | David Robillard <d@drobilla.net> | 2006-07-19 05:44:23 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-07-19 05:44:23 +0000 |
| commit | 0cdb918d4dd409075c0e2fdc50633e7b6adb22f2 (patch) | |
| tree | 0c2901a6c81dffa69a87533b70c6f8e5bffa2ed4 /gtk2_ardour/route_ui.cc | |
| parent | 50a3102b9b533d7f8786d220f8df67421b9227c8 (diff) | |
Work towards removal of Session's Diskstream list.
Havn't managed to completely remove it because of Session loading from XML - the
Diskstreams are separate from the Tracks (I assume as a throwback to when they
were distinct) so the Diskstreams need to be stored somewhere until the Tracks
are loaded. Ideally tracks should completely own their Diskstreams - not sure
how to accomplish this without breaking Session loading though...
git-svn-id: svn://localhost/ardour2/branches/midi@687 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_ui.cc')
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 34d7e995d6..b18bff46e9 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -75,7 +75,7 @@ RouteUI::RouteUI (ARDOUR::Route& rt, ARDOUR::Session& sess, const char* m_name, if (is_audio_track()) { AudioTrack* at = dynamic_cast<AudioTrack*>(&_route); - get_diskstream()->record_enable_changed.connect (mem_fun (*this, &RouteUI::route_rec_enable_changed)); + get_diskstream()->RecordEnableChanged.connect (mem_fun (*this, &RouteUI::route_rec_enable_changed)); _session.RecordStateChanged.connect (mem_fun (*this, &RouteUI::session_rec_enable_changed)); @@ -886,13 +886,10 @@ RouteUI::is_midi_track () const Diskstream* RouteUI::get_diskstream () const { - AudioTrack *at; - MidiTrack *mt; + Track *t; - if ((at = dynamic_cast<AudioTrack*>(&_route)) != 0) { - return &at->disk_stream(); - } else if ((mt = dynamic_cast<MidiTrack*>(&_route)) != 0) { - return &mt->disk_stream(); + if ((t = dynamic_cast<Track*>(&_route)) != 0) { + return &t->diskstream(); } else { return 0; } |