ardour/livetrax
13
0
Fork 0
Code

finalize fix for MIDI track monitoring

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13646 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-12-12 14:06:56 +00:00
parent 6e337459a9
commit 0bf7323df3
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/midi_track.h
View File

@ -102,7 +102,6 @@ public:
boost::shared_ptr<MidiBuffer> get_gui_feed_buffer () const; boost::shared_ptr<MidiBuffer> get_gui_feed_buffer () const;
void set_monitoring (MonitorChoice); void set_monitoring (MonitorChoice);
MonitorState monitoring_state () const;
void set_input_active (bool); void set_input_active (bool);
bool input_active () const; bool input_active () const;

27
libs/ardour/midi_track.cc
View File

@ -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;
}