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 934c1862b0ea41e2c21590b429a351b20b8532f6..a96094f140e6a7562eefe0ef7457767a45d225eb 100644 (file)
--- 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 84a04095b952e21bedb9ce0a582d1d3135674408..2226574e6a5f31b489374ebb56abd0e94505fa0f 100644 (file)
--- 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;
-}