From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 12 Dec 2012 14:06:56 +0000 (+0000)
Subject: finalize fix for MIDI track monitoring
X-Git-Tag: 3.0~456
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=0bf7323df3e28f108fea525549ba2f8edbfc432d;p=ardour.git

finalize fix for MIDI track monitoring

git-svn-id: svn://localhost/ardour2/branches/3.0@13646 d708f5d6-7413-0410-9779-e7cbd77b26cf
---

diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index 934c1862b0..a96094f140 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -102,7 +102,6 @@ public:
 	boost::shared_ptr<MidiBuffer> get_gui_feed_buffer () const;
 
 	void set_monitoring (MonitorChoice);
-	MonitorState monitoring_state () const;
 
 	void set_input_active (bool);
 	bool input_active () const;
diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index 84a04095b9..2226574e6a 100644
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -772,30 +772,3 @@ MidiTrack::set_monitoring (MonitorChoice mc)
 	}
 }
 
-MonitorState
-MidiTrack::monitoring_state () const
-{
-	return Track::monitoring_state();
-
-	/* Explicit requests */
-	
-	if (_monitoring & MonitorInput) {
-		return MonitoringInput;
-	}
-		
-	if (_monitoring & MonitorDisk) {
-		return MonitoringDisk;
-	}
-
-	if (_session.transport_rolling()) {
-		return MonitoringDisk;
-	} 
-
-	/* the return value here doesn't mean that we're actually monitoring
-	 * input, let alone input *audio*. but it means that we are NOT 
-	 * monitoring silence. this allows us to still hear any audio generated
-	 * by using internal generation techniques
-	 */
-
-	return MonitoringInput;
-}