ardour/livetrax
13
0
Fork 0
Code

Rename a few bits and fix a undeclared method.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11066 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-12-23 01:38:38 +00:00
parent b7688699ef
commit 2858e239f4
5 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,7 +114,7 @@ public:
protected:
XMLNode& state (bool full);
bool should_monitor () const;
bool ardour_should_monitor () const;
bool send_silence () const;
void act_on_mute ();

2
libs/ardour/ardour/route.h
View File

@ -494,7 +494,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
uint32_t pans_required() const;
ChanCount n_process_buffers ();
virtual bool should_monitor () const;
virtual bool ardour_should_monitor () const;
virtual void maybe_declick (BufferSet&, framecnt_t, int);
boost::shared_ptr<Amp> _amp;

2
libs/ardour/midi_track.cc
View File

@ -653,7 +653,7 @@ MidiTrack::diskstream_data_recorded (boost::weak_ptr<MidiSource> src)
}
bool
MidiTrack::should_monitor () const
MidiTrack::ardour_should_monitor () const
{
return true;
}

5
libs/ardour/route.cc
View File

@ -400,7 +400,7 @@ Route::process_output_buffers (BufferSet& bufs,
framepos_t start_frame, framepos_t end_frame, pframes_t nframes,
int declick, bool gain_automation_ok)
{
bool monitor = should_monitor ();
bool monitor = ardour_should_monitor ();
bufs.set_is_silent (false);
@ -3846,8 +3846,9 @@ Route::setup_invisible_processors ()
}
}
/** @return true if Ardour should provide monitoring for this route */
bool
Route::should_monitor () const
Route::ardour_should_monitor () const
{
switch (Config->get_monitoring_model()) {
case HardwareMonitoring:

10
libs/ardour/session.cc
View File

@ -787,16 +787,6 @@ Session::set_track_monitor_input_status (bool yn)
}
}
void
Session::reset_input_monitor_state ()
{
if (transport_rolling()) {
set_track_monitor_input_status (Config->get_monitoring_model() == HardwareMonitoring && !config.get_auto_input());
} else {
set_track_monitor_input_status (Config->get_monitoring_model() == HardwareMonitoring);
}
}
void
Session::auto_punch_start_changed (Location* location)
{