From d42b09f1d3cc9e9a765e0f986eb142d91a8aca55 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Fri, 29 Jan 2021 01:52:08 +0100
Subject: [PATCH] Remove cruft, there are no more diskstreams

---
 gtk2_ardour/mixer_strip.cc | 27 +--------------------------
 gtk2_ardour/mixer_strip.h  |  1 -
 gtk2_ardour/streamview.cc  | 12 ------------
 gtk2_ardour/streamview.h   |  1 -
 4 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 096adfe922..d968f08d68 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -389,14 +389,6 @@ MixerStrip::init ()
 
 	_width = (Width) -1;
 
-	/* start off as a passthru strip. we'll correct this, if necessary,
-	   in update_diskstream_display().
-	*/
-
-	/* start off as a passthru strip. we'll correct this, if necessary,
-	   in update_diskstream_display().
-	*/
-
 	if (is_midi_track()) {
 		set_name ("MidiTrackStripBase");
 	} else {
@@ -765,7 +757,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 		panners.hide_all ();
 	}
 
-	update_diskstream_display ();
+	route_color_changed ();
 	update_input_display ();
 	update_output_display ();
 
@@ -893,7 +885,6 @@ MixerStrip::set_packed (bool yn)
 	set_gui_property ("visible", _packed);
 }
 
-
 struct RouteCompareByName {
 	bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
 		return a->name().compare (b->name()) < 0;
@@ -1198,16 +1189,6 @@ MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR
 	citems.push_back (MenuElemNoMnemonic (b->name (), sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_output_chosen), b)));
 }
 
-void
-MixerStrip::update_diskstream_display ()
-{
-	if (is_track() && input_selector) {
-		input_selector->hide_all ();
-	}
-
-	route_color_changed ();
-}
-
 void
 MixerStrip::connect_to_pan ()
 {
@@ -1581,12 +1562,6 @@ MixerStrip::fast_update ()
 	gpm.update_meters ();
 }
 
-void
-MixerStrip::diskstream_changed ()
-{
-	Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&MixerStrip::update_diskstream_display, this));
-}
-
 void
 MixerStrip::io_changed_proxy ()
 {
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index bb6c30be02..e895368b85 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -262,7 +262,6 @@ private:
 	void bundle_input_chosen (boost::shared_ptr<ARDOUR::Bundle>);
 	void bundle_output_chosen (boost::shared_ptr<ARDOUR::Bundle>);
 
-	void diskstream_changed ();
 	void io_changed_proxy ();
 
 	Gtk::Menu *send_action_menu;
diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 957e0c03ee..e5b1325b31 100644
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -343,18 +343,6 @@ StreamView::playlist_switched (boost::weak_ptr<Track> wtr)
 }
 
 
-void
-StreamView::diskstream_changed ()
-{
-	boost::shared_ptr<Track> t;
-
-	if ((t = _trackview.track()) != 0) {
-		Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&StreamView::display_track, this, t));
-	} else {
-		Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&StreamView::undisplay_track, this));
-	}
-}
-
 void
 StreamView::apply_color (Gdk::Color const& c, ColorTarget target)
 {
diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index a2e2a180ae..cc5e3d9299 100644
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -150,7 +150,6 @@ protected:
 
 	void         display_track (boost::shared_ptr<ARDOUR::Track>);
 	virtual void undisplay_track ();
-	void         diskstream_changed ();
 	void         layer_regions ();
 
 	void playlist_switched (boost::weak_ptr<ARDOUR::Track>);