r269@gandalf: fugalh | 2006-08-03 20:18:05 -0600

 Trunk merge conflicts resolved


git-svn-id: svn://localhost/ardour2/branches/undo@756 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 100 insertions, 90 deletions

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 988d6c8b19..8a1fb1c21a 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002 Paul Davis 
+    Copyright (C) 2002-2006 Paul Davis 
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,8 +21,8 @@
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/choice.h>
-#include <gtkmm2ext/bindable_button.h>
 #include <gtkmm2ext/doi.h>
+#include <gtkmm2ext/bindable_button.h>
 
 #include <ardour/route_group.h>
 #include <pbd/memento_command.h>
@@ -45,9 +45,9 @@ using namespace ARDOUR;
 using namespace PBD;
 
 
-RouteUI::RouteUI (ARDOUR::Route& rt, ARDOUR::Session& sess, const char* m_name,
+RouteUI::RouteUI (boost::shared_ptr<ARDOUR::Route> rt, ARDOUR::Session& sess, const char* m_name,
 		  const char* s_name, const char* r_name)
-    : AxisView(sess),
+	: AxisView(sess),
 	  _route(rt),
 	  mute_button(0),
 	  solo_button(0),
@@ -65,35 +65,31 @@ RouteUI::RouteUI (ARDOUR::Route& rt, ARDOUR::Session& sess, const char* m_name,
 		set_color (unique_random_color());
 	}
 
-	_route.GoingAway.connect (mem_fun (*this, &RouteUI::route_removed));
-	_route.active_changed.connect (mem_fun (*this, &RouteUI::route_active_changed));
+	_route->GoingAway.connect (mem_fun (*this, &RouteUI::route_removed));
+	_route->active_changed.connect (mem_fun (*this, &RouteUI::route_active_changed));
 
-        mute_button = manage (new BindableToggleButton (& _route.midi_mute_control(), m_name ));
-	mute_button->set_bind_button_state (2, GDK_CONTROL_MASK);
-        solo_button = manage (new BindableToggleButton (& _route.midi_solo_control(), s_name ));
-	solo_button->set_bind_button_state (2, GDK_CONTROL_MASK);
-
-	if (is_audio_track()) {
-		AudioTrack* at = dynamic_cast<AudioTrack*>(&_route);
+        mute_button = manage (new BindableToggleButton (_route->mute_control(), m_name ));
+        solo_button = manage (new BindableToggleButton (_route->solo_control(), s_name ));
+	
+	if (is_track()) {
+		boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(_route);
 
-		get_diskstream()->record_enable_changed.connect (mem_fun (*this, &RouteUI::route_rec_enable_changed));
+		t->diskstream().RecordEnableChanged.connect (mem_fun (*this, &RouteUI::route_rec_enable_changed));
 
 		_session.RecordStateChanged.connect (mem_fun (*this, &RouteUI::session_rec_enable_changed));
 
-		rec_enable_button = manage (new BindableToggleButton (& at->midi_rec_enable_control(), r_name ));
-		rec_enable_button->set_bind_button_state (2, GDK_CONTROL_MASK);
+		rec_enable_button = manage (new BindableToggleButton (t->rec_enable_control(), r_name ));
 
-	} else {
-		rec_enable_button = manage (new BindableToggleButton (0, r_name ));
-	}
+		rec_enable_button->unset_flags (Gtk::CAN_FOCUS);
+		
+		update_rec_display ();
+	} 
 	
 	mute_button->unset_flags (Gtk::CAN_FOCUS);
 	solo_button->unset_flags (Gtk::CAN_FOCUS);
-	rec_enable_button->unset_flags (Gtk::CAN_FOCUS);
 
 	/* map the current state */
 
-	update_rec_display ();
 	map_frozen ();
 }
 
@@ -146,14 +142,14 @@ RouteUI::mute_press(GdkEventButton* ev)
 					*/
 
 					if (ev->button == 1) {
-						set_mix_group_mute (_route, !_route.muted());
+						set_mix_group_mute (_route, !_route->muted());
 					}
 					
 				} else {
 
 					/* plain click applies change to this route */
 
-					reversibly_apply_route_boolean ("mute change", &Route::set_mute, !_route.muted(), this);
+					reversibly_apply_route_boolean ("mute change", &Route::set_mute, !_route->muted(), this);
 				}
 			}
 		}
@@ -231,7 +227,7 @@ RouteUI::solo_press(GdkEventButton* ev)
 
 					// shift-click: set this route to solo safe
 
-					_route.set_solo_safe (!_route.solo_safe(), this);
+					_route->set_solo_safe (!_route->solo_safe(), this);
 					wait_for_release = false;
 
 				} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
@@ -241,14 +237,14 @@ RouteUI::solo_press(GdkEventButton* ev)
 					*/
 
 					if (ev->button == 1) {
-						set_mix_group_solo (_route, !_route.soloed());
+						set_mix_group_solo (_route, !_route->soloed());
 					}
 
 				} else {
 
 					/* click: solo this route */
 
-					reversibly_apply_route_boolean ("solo change", &Route::set_solo, !_route.soloed(), this);
+					reversibly_apply_route_boolean ("solo change", &Route::set_solo, !_route->soloed(), this);
 				}
 			}
 		}
@@ -276,7 +272,7 @@ RouteUI::solo_release(GdkEventButton* ev)
 gint
 RouteUI::rec_enable_press(GdkEventButton* ev)
 {
-	if (!ignore_toggle && is_audio_track()) {
+	if (!ignore_toggle && is_track() && rec_enable_button) {
 
 		if (ev->button == 2 && Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
 			// do nothing on midi bind event
@@ -298,7 +294,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
 
 		} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
 
-			set_mix_group_rec_enable (_route, !_route.record_enabled());
+			set_mix_group_rec_enable (_route, !_route->record_enabled());
 
 		} else {
 
@@ -326,7 +322,7 @@ RouteUI::update_solo_display ()
 {
 	bool x;
 
-	if (solo_button->get_active() != (x = _route.soloed())){
+	if (solo_button->get_active() != (x = _route->soloed())){
 		ignore_toggle = true;
 		solo_button->set_active(x);
 		ignore_toggle = false;
@@ -334,7 +330,7 @@ RouteUI::update_solo_display ()
 	
 	/* show solo safe */
 
-	if (_route.solo_safe()){
+	if (_route->solo_safe()){
 		solo_button->set_name(safe_solo_button_name());
 	} else {
 		solo_button->set_name(solo_button_name());
@@ -352,7 +348,7 @@ RouteUI::update_mute_display ()
 {
 	bool x;
 
-	if (mute_button->get_active() != (x = _route.muted())){
+	if (mute_button->get_active() != (x = _route->muted())){
 		ignore_toggle = true;
 		mute_button->set_active(x);
 		ignore_toggle = false;
@@ -360,7 +356,7 @@ RouteUI::update_mute_display ()
 }
 
 void
-RouteUI::route_rec_enable_changed (void *src)
+RouteUI::route_rec_enable_changed ()
 {
 	Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &RouteUI::update_rec_display));
 }
@@ -374,7 +370,7 @@ RouteUI::session_rec_enable_changed ()
 void
 RouteUI::update_rec_display ()
 {
-	bool model = _route.record_enabled();
+	bool model = _route->record_enabled();
 	bool view = rec_enable_button->get_active();
 
 	/* first make sure the button's "depressed" visual
@@ -440,7 +436,7 @@ RouteUI::refresh_remote_control_menu ()
 	limit += 4; /* leave some breathing room */
 	
 	rc_items.push_back (RadioMenuElem (rc_group, _("None")));
-	if (_route.remote_control_id() == 0) {
+	if (_route->remote_control_id() == 0) {
 		rc_active = dynamic_cast<CheckMenuItem*> (&rc_items.back());
 		rc_active->set_active ();
 	}
@@ -449,7 +445,7 @@ RouteUI::refresh_remote_control_menu ()
 		snprintf (buf, sizeof (buf), "%u", i);
 		rc_items.push_back (RadioMenuElem (rc_group, buf));
 		rc_active = dynamic_cast<RadioMenuItem*>(&rc_items.back());
-		if (_route.remote_control_id() == i) {
+		if (_route->remote_control_id() == i) {
 			rc_active = dynamic_cast<CheckMenuItem*> (&rc_items.back());
 			rc_active->set_active ();
 		}
@@ -467,7 +463,7 @@ RouteUI::set_remote_control_id (uint32_t id, CheckMenuItem* item)
 	*/
 
 	if (item->get_active()) {
-		_route.set_remote_control_id (id);
+		_route->set_remote_control_id (id);
 	}
 }
 
@@ -482,14 +478,14 @@ RouteUI::build_solo_menu (void)
 	CheckMenuItem* check;
 
 	check = new CheckMenuItem(_("Solo-safe"));
-	check->set_active (_route.solo_safe());
+	check->set_active (_route->solo_safe());
 	check->signal_toggled().connect (bind (mem_fun (*this, &RouteUI::toggle_solo_safe), check));
-	_route.solo_safe_changed.connect(bind (mem_fun (*this, &RouteUI::solo_safe_toggle), check));
+	_route->solo_safe_changed.connect(bind (mem_fun (*this, &RouteUI::solo_safe_toggle), check));
 	items.push_back (CheckMenuElem(*check));
 	check->show_all();
 
 	items.push_back (SeparatorElem());
-	items.push_back (MenuElem (_("MIDI Bind"), mem_fun (*mute_button, &BindableToggleButton::midi_learn)));
+	// items.push_back (MenuElem (_("MIDI Bind"), mem_fun (*mute_button, &BindableToggleButton::midi_learn)));
 	
 }
 
@@ -506,39 +502,39 @@ RouteUI::build_mute_menu(void)
 	check = new CheckMenuItem(_("Pre Fader"));
 	init_mute_menu(PRE_FADER, check);
 	check->signal_toggled().connect(bind (mem_fun (*this, &RouteUI::toggle_mute_menu), PRE_FADER, check));
-	_route.pre_fader_changed.connect(bind (mem_fun (*this, &RouteUI::pre_fader_toggle), check));
+	_route->pre_fader_changed.connect(bind (mem_fun (*this, &RouteUI::pre_fader_toggle), check));
 	items.push_back (CheckMenuElem(*check));
 	check->show_all();
 
 	check = new CheckMenuItem(_("Post Fader"));
 	init_mute_menu(POST_FADER, check);
 	check->signal_toggled().connect(bind (mem_fun (*this, &RouteUI::toggle_mute_menu), POST_FADER, check));
-	_route.post_fader_changed.connect(bind (mem_fun (*this, &RouteUI::post_fader_toggle), check));
+	_route->post_fader_changed.connect(bind (mem_fun (*this, &RouteUI::post_fader_toggle), check));
 	items.push_back (CheckMenuElem(*check));
 	check->show_all();
 	
 	check = new CheckMenuItem(_("Control Outs"));
 	init_mute_menu(CONTROL_OUTS, check);
 	check->signal_toggled().connect(bind (mem_fun (*this, &RouteUI::toggle_mute_menu), CONTROL_OUTS, check));
-	_route.control_outs_changed.connect(bind (mem_fun (*this, &RouteUI::control_outs_toggle), check));
+	_route->control_outs_changed.connect(bind (mem_fun (*this, &RouteUI::control_outs_toggle), check));
 	items.push_back (CheckMenuElem(*check));
 	check->show_all();
 
 	check = new CheckMenuItem(_("Main Outs"));
 	init_mute_menu(MAIN_OUTS, check);
 	check->signal_toggled().connect(bind (mem_fun (*this, &RouteUI::toggle_mute_menu), MAIN_OUTS, check));
-	_route.main_outs_changed.connect(bind (mem_fun (*this, &RouteUI::main_outs_toggle), check));
+	_route->main_outs_changed.connect(bind (mem_fun (*this, &RouteUI::main_outs_toggle), check));
 	items.push_back (CheckMenuElem(*check));
 	check->show_all();
 
 	items.push_back (SeparatorElem());
-	items.push_back (MenuElem (_("MIDI Bind"), mem_fun (*mute_button, &BindableToggleButton::midi_learn)));
+	// items.push_back (MenuElem (_("MIDI Bind"), mem_fun (*mute_button, &BindableToggleButton::midi_learn)));
 }
 
 void
 RouteUI::init_mute_menu(mute_type type, CheckMenuItem* check)
 {
-	if (_route.get_mute_config (type)) {
+	if (_route->get_mute_config (type)) {
 		check->set_active (true);
 	}
 }
@@ -546,21 +542,21 @@ RouteUI::init_mute_menu(mute_type type, CheckMenuItem* check)
 void
 RouteUI::toggle_mute_menu(mute_type type, Gtk::CheckMenuItem* check)
 {
-	_route.set_mute_config(type, check->get_active(), this);
+	_route->set_mute_config(type, check->get_active(), this);
 }
 
 void
 RouteUI::toggle_solo_safe (Gtk::CheckMenuItem* check)
 {
-	_route.set_solo_safe (check->get_active(), this);
+	_route->set_solo_safe (check->get_active(), this);
 }
 
 void
-RouteUI::set_mix_group_solo(Route& route, bool yn)
+RouteUI::set_mix_group_solo(boost::shared_ptr<Route> route, bool yn)
 {
 	RouteGroup* mix_group;
 
-	if((mix_group = route.mix_group()) != 0){
+	if((mix_group = route->mix_group()) != 0){
 		_session.begin_reversible_command (_("mix group solo  change"));
                 Session::GlobalSoloStateCommand *cmd = new Session::GlobalSoloStateCommand(_session, this);
 		mix_group->apply(&Route::set_solo, yn, this);
@@ -568,7 +564,7 @@ RouteUI::set_mix_group_solo(Route& route, bool yn)
 		_session.add_command (cmd);
 		_session.commit_reversible_command ();
 	} else {
-		reversibly_apply_route_boolean ("solo change", &Route::set_solo, !route.soloed(), this);
+		reversibly_apply_route_boolean ("solo change", &Route::set_solo, !route->soloed(), this);
 	}
 }
 
@@ -595,11 +591,11 @@ RouteUI::reversibly_apply_audio_track_boolean (string name, void (AudioTrack::*f
 }
 
 void
-RouteUI::set_mix_group_mute(Route& route, bool yn)
+RouteUI::set_mix_group_mute(boost::shared_ptr<Route> route, bool yn)
 {
 	RouteGroup* mix_group;
 
-	if((mix_group = route.mix_group()) != 0){
+	if((mix_group = route->mix_group()) != 0){
 		_session.begin_reversible_command (_("mix group mute change"));
                 Session::GlobalMuteStateCommand *cmd = new Session::GlobalMuteStateCommand (_session, this);
 		mix_group->apply(&Route::set_mute, yn, this);
@@ -607,16 +603,16 @@ RouteUI::set_mix_group_mute(Route& route, bool yn)
 		_session.add_command(cmd);
 		_session.commit_reversible_command ();
 	} else {
-		reversibly_apply_route_boolean ("mute change", &Route::set_mute, !route.muted(), this);
+		reversibly_apply_route_boolean ("mute change", &Route::set_mute, !route->muted(), this);
 	}
 }
 
 void
-RouteUI::set_mix_group_rec_enable(Route& route, bool yn)
+RouteUI::set_mix_group_rec_enable(boost::shared_ptr<Route> route, bool yn)
 {
 	RouteGroup* mix_group;
 
-	if((mix_group = route.mix_group()) != 0){
+	if((mix_group = route->mix_group()) != 0){
 		_session.begin_reversible_command (_("mix group rec-enable change"));
                 Session::GlobalRecordEnableStateCommand *cmd = new Session::GlobalRecordEnableStateCommand(_session, this);
 		mix_group->apply (&Route::set_record_enable, yn, this);
@@ -624,7 +620,7 @@ RouteUI::set_mix_group_rec_enable(Route& route, bool yn)
 		_session.add_command(cmd);
 		_session.commit_reversible_command ();
 	} else {
-		reversibly_apply_route_boolean ("rec-enable change", &Route::set_record_enable, !_route.record_enabled(), this);
+		reversibly_apply_route_boolean ("rec-enable change", &Route::set_record_enable, !_route->record_enabled(), this);
 	}
 }
 
@@ -655,7 +651,7 @@ RouteUI::set_color (const Gdk::Color & c)
 	snprintf (buf, sizeof (buf), "%d:%d:%d", c.get_red(), c.get_green(), c.get_blue());
 	xml_node->add_property ("color", buf);
 
-	 _route.gui_changed ("color", (void *) 0); /* EMIT_SIGNAL */
+	 _route->gui_changed ("color", (void *) 0); /* EMIT_SIGNAL */
 }
 
 
@@ -663,9 +659,9 @@ void
 RouteUI::ensure_xml_node ()
 {
 	if (xml_node == 0) {
-		if ((xml_node = _route.extra_xml ("GUI")) == 0) {
+		if ((xml_node = _route->extra_xml ("GUI")) == 0) {
 			xml_node = new XMLNode ("GUI");
-			_route.add_extra_xml (*xml_node);
+			_route->add_extra_xml (*xml_node);
 		}
 	}
 }
@@ -710,10 +706,10 @@ RouteUI::remove_this_route ()
 	vector<string> choices;
 	string prompt;
 
-	if (is_audio_track()) {
-		prompt  = string_compose (_("Do you really want to remove track \"%1\" ?\n\nYou may also lose the playlist used by this track.\n(cannot be undone)"), _route.name());
+	if (is_track()) {
+		prompt  = string_compose (_("Do you really want to remove track \"%1\" ?\n\nYou may also lose the playlist used by this track.\n(cannot be undone)"), _route->name());
 	} else {
-		prompt  = string_compose (_("Do you really want to remove bus \"%1\" ?\n(cannot be undone)"), _route.name());
+		prompt  = string_compose (_("Do you really want to remove bus \"%1\" ?\n(cannot be undone)"), _route->name());
 	}
 
 	choices.push_back (_("No, do nothing."));
@@ -747,7 +743,7 @@ RouteUI::route_rename ()
 	ArdourPrompter name_prompter (true);
 	string result;
 	name_prompter.set_prompt (_("New Name: "));
-	name_prompter.set_initial_text (_route.name());
+	name_prompter.set_initial_text (_route->name());
 	name_prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT);
 	name_prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
 	name_prompter.show_all ();
@@ -757,7 +753,7 @@ RouteUI::route_rename ()
 	case Gtk::RESPONSE_ACCEPT:
         name_prompter.get_result (result);
         if (result.length()) {
-			_route.set_name (result, this);
+			_route->set_name (result, this);
 		}	
 		break;
 	}
@@ -771,7 +767,7 @@ RouteUI::name_changed (void *src)
 {
 	ENSURE_GUI_THREAD(bind (mem_fun (*this, &RouteUI::name_changed), src));
 
-	name_label.set_text (_route.name());
+	name_label.set_text (_route->name());
 }
 
 void
@@ -780,8 +776,8 @@ RouteUI::toggle_route_active ()
 	bool yn;
 
 	if (route_active_menu_item) {
-		if (route_active_menu_item->get_active() != (yn = _route.active())) {
-			_route.set_active (!yn);
+		if (route_active_menu_item->get_active() != (yn = _route->active())) {
+			_route->set_active (!yn);
 		}
 	}
 }
@@ -790,7 +786,7 @@ void
 RouteUI::route_active_changed ()
 {
 	if (route_active_menu_item) {
-		Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun (*route_active_menu_item, &CheckMenuItem::set_active), _route.active()));
+		Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun (*route_active_menu_item, &CheckMenuItem::set_active), _route->active()));
 	}
 }
 
@@ -803,12 +799,12 @@ RouteUI::toggle_polarity ()
 
 		ENSURE_GUI_THREAD(mem_fun (*this, &RouteUI::toggle_polarity));
 		
-		if ((x = polarity_menu_item->get_active()) != _route.phase_invert()) {
-			_route.set_phase_invert (x, this);
+		if ((x = polarity_menu_item->get_active()) != _route->phase_invert()) {
+			_route->set_phase_invert (x, this);
 			if (x) {
 			        name_label.set_text (X_("Ø ") + name_label.get_text());
 			} else {
-			        name_label.set_text (_route.name());
+			        name_label.set_text (_route->name());
 			}
 		}
 	}
@@ -823,7 +819,7 @@ RouteUI::polarity_changed ()
 void
 RouteUI::solo_safe_toggle(void* src, Gtk::CheckMenuItem* check)
 {
-	bool yn = _route.solo_safe ();
+	bool yn = _route->solo_safe ();
 
 	if (check->get_active() != yn) {
 		check->set_active (yn);
@@ -834,7 +830,7 @@ RouteUI::pre_fader_toggle(void* src, Gtk::CheckMenuItem* check)
 {
 	ENSURE_GUI_THREAD(bind (mem_fun (*this, &RouteUI::pre_fader_toggle), src, check));
 	
-	bool yn = _route.get_mute_config(PRE_FADER);
+	bool yn = _route->get_mute_config(PRE_FADER);
 	if (check->get_active() != yn) {
 		check->set_active (yn);
 	}
@@ -845,7 +841,7 @@ RouteUI::post_fader_toggle(void* src, Gtk::CheckMenuItem* check)
 {
 	ENSURE_GUI_THREAD(bind (mem_fun (*this, &RouteUI::post_fader_toggle), src, check));
 	
-	bool yn = _route.get_mute_config(POST_FADER);
+	bool yn = _route->get_mute_config(POST_FADER);
 	if (check->get_active() != yn) {
 		check->set_active (yn);
 	}
@@ -856,7 +852,7 @@ RouteUI::control_outs_toggle(void* src, Gtk::CheckMenuItem* check)
 {
 	ENSURE_GUI_THREAD(bind (mem_fun (*this, &RouteUI::control_outs_toggle), src, check));
 	
-	bool yn = _route.get_mute_config(CONTROL_OUTS);
+	bool yn = _route->get_mute_config(CONTROL_OUTS);
 	if (check->get_active() != yn) {
 		check->set_active (yn);
 	}
@@ -867,7 +863,7 @@ RouteUI::main_outs_toggle(void* src, Gtk::CheckMenuItem* check)
 {
 	ENSURE_GUI_THREAD(bind (mem_fun (*this, &RouteUI::main_outs_toggle), src, check));
 	
-	bool yn = _route.get_mute_config(MAIN_OUTS);
+	bool yn = _route->get_mute_config(MAIN_OUTS);
 	if (check->get_active() != yn) {
 		check->set_active (yn);
 	}
@@ -876,42 +872,55 @@ RouteUI::main_outs_toggle(void* src, Gtk::CheckMenuItem* check)
 void
 RouteUI::disconnect_input ()
 {
-	_route.disconnect_inputs (this);
+	_route->disconnect_inputs (this);
 }
 
 void
 RouteUI::disconnect_output ()
 {
-	_route.disconnect_outputs (this);
+	_route->disconnect_outputs (this);
+}
+
+bool
+RouteUI::is_track () const
+{
+	return dynamic_cast<Track*>(_route.get()) != 0;
+}
+
+Track*
+RouteUI::track() const
+{
+	return dynamic_cast<Track*>(_route.get());
 }
 
 bool
 RouteUI::is_audio_track () const
 {
-	return dynamic_cast<AudioTrack*>(&_route) != 0;
+	return dynamic_cast<AudioTrack*>(_route.get()) != 0;
+}
+
+AudioTrack*
+RouteUI::audio_track() const
+{
+	return dynamic_cast<AudioTrack*>(_route.get());
 }
 
-AudioDiskstream*
+Diskstream*
 RouteUI::get_diskstream () const
 {
-	AudioTrack *at;
+	boost::shared_ptr<Track> t;
 
-	if ((at = dynamic_cast<AudioTrack*>(&_route)) != 0) {
-		return &at->disk_stream();
+	if ((t = boost::dynamic_pointer_cast<Track>(_route)) != 0) {
+		return &t->diskstream();
 	} else {
 		return 0;
 	}
 }
 
-AudioTrack*
-RouteUI::audio_track() const
-{
-	return dynamic_cast<AudioTrack*>(&_route);
-}
 string
 RouteUI::name() const
 {
-	return _route.name();
+	return _route->name();
 }
 
 void
@@ -919,7 +928,7 @@ RouteUI::map_frozen ()
 {
 	ENSURE_GUI_THREAD (mem_fun (*this, &RouteUI::map_frozen));
 
- 	AudioTrack* at = dynamic_cast<AudioTrack*>(&_route);
+ 	AudioTrack* at = dynamic_cast<AudioTrack*>(_route.get());
 
 	if (at) {
 		switch (at->freeze_state()) {
@@ -932,3 +941,4 @@ RouteUI::map_frozen ()
 		}
 	}
 }
+