ardour/livetrax
13
0
Fork 0
Code

Remove unused parameter.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10090 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-09-16 21:45:10 +00:00
parent 32cc399595
commit e65636a087
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,7 +134,7 @@ protected:
bool _input_active;
int no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
bool state_changing, bool can_record, bool rec_monitors_input);
bool state_changing, bool can_record);
void push_midi_input_to_step_edit_ringbuffer (framecnt_t nframes);
void diskstream_data_recorded (boost::shared_ptr<MidiBuffer>, boost::weak_ptr<MidiSource>);

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

@ -112,7 +112,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
int declick, bool can_record, bool rec_monitors_input, bool& need_butler);
virtual int no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
bool state_changing, bool can_record, bool rec_monitors_input);
bool state_changing, bool can_record);
virtual int silent_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
bool can_record, bool rec_monitors_input, bool& need_butler);

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

@ -49,7 +49,7 @@ class Track : public Route, public PublicDiskstream
PBD::Signal0<void> TrackModeChanged;
virtual int no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
bool state_changing, bool can_record, bool rec_monitors_input);
bool state_changing, bool can_record);
int silent_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
bool can_record, bool rec_monitors_input, bool& need_butler);

2
libs/ardour/graph.cc
View File

@ -604,7 +604,7 @@ Graph::process_one_route (Route* route)
retval = route->silent_roll (_process_nframes, _process_start_frame, _process_end_frame, _process_can_record, _process_rec_monitors_input, need_butler);
} else if (_process_noroll) {
route->set_pending_declick (_process_declick);
retval = route->no_roll (_process_nframes, _process_start_frame, _process_end_frame, _process_non_rt_pending, _process_can_record, _process_declick);
retval = route->no_roll (_process_nframes, _process_start_frame, _process_end_frame, _process_non_rt_pending, _process_can_record);
} else {
route->set_pending_declick (_process_declick);
retval = route->roll (_process_nframes, _process_start_frame, _process_end_frame, _process_declick, _process_can_record, _process_rec_monitors_input, need_butler);

4
libs/ardour/midi_track.cc
View File

@ -405,9 +405,9 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame
int
MidiTrack::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
bool state_changing, bool can_record, bool rec_monitors_input)
bool state_changing, bool can_record)
{
int ret = Track::no_roll (nframes, start_frame, end_frame, state_changing, can_record, rec_monitors_input);
int ret = Track::no_roll (nframes, start_frame, end_frame, state_changing, can_record);
if (ret == 0 && _step_editing) {
push_midi_input_to_step_edit_ringbuffer (nframes);

2
libs/ardour/route.cc
View File

@ -2763,7 +2763,7 @@ Route::pans_required () const
int
Route::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
bool session_state_changing, bool /*can_record*/, bool /*rec_monitors_input*/)
bool session_state_changing, bool /*can_record*/)
{
Glib::RWLock::ReaderLock lm (_processor_lock, Glib::TRY_LOCK);
if (!lm.locked()) {

2
libs/ardour/session_process.cc
View File

@ -120,7 +120,7 @@ Session::no_roll (pframes_t nframes)
(*i)->set_pending_declick (declick);
if ((*i)->no_roll (nframes, _transport_frame, end_frame, non_realtime_work_pending(),
actively_recording(), declick)) {
actively_recording())) {
error << string_compose(_("Session: error in no roll for %1"), (*i)->name()) << endmsg;
ret = -1;
break;

2
libs/ardour/track.cc
View File

@ -208,7 +208,7 @@ Track::zero_diskstream_id_in_xml (XMLNode& node)
int
Track::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
bool session_state_changing, bool can_record, bool /*rec_monitors_input*/)
bool session_state_changing, bool can_record)
{
Glib::RWLock::ReaderLock lm (_processor_lock, Glib::TRY_LOCK);
if (!lm.locked()) {