ardour/livetrax
13
0
Fork 0
Code

Small cleanup.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7867 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-10-02 00:06:11 +00:00
parent 1c7f17dcc0
commit fff03c103d
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,7 +230,7 @@ class Diskstream : public SessionObject, public PublicDiskstream
virtual int use_pending_capture_data (XMLNode& node) = 0;
virtual void check_record_status (framepos_t transport_frame, nframes_t nframes, bool can_record);
virtual void check_record_status (framepos_t transport_frame, bool can_record);
virtual void prepare_record_status (framepos_t /*capture_start_frame*/) {}
virtual void set_align_style_from_io() {}
virtual void setup_destructive_playlist () {}

4
libs/ardour/audio_diskstream.cc
View File

@ -437,7 +437,7 @@ AudioDiskstream::process (framepos_t transport_frame, nframes_t nframes, bool ca
return 0;
}
check_record_status (transport_frame, nframes, can_record);
check_record_status (transport_frame, can_record);
if (nframes == 0) {
return 0;
@ -474,7 +474,7 @@ AudioDiskstream::process (framepos_t transport_frame, nframes_t nframes, bool ca
}
OverlapType ot = coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes);
calculate_record_range (ot, transport_frame, nframes, rec_nframes, rec_offset);
if (rec_nframes && !was_recording) {

2
libs/ardour/diskstream.cc
View File

@ -506,7 +506,7 @@ Diskstream::move_processor_automation (boost::weak_ptr<Processor> p, list< Evora
}
void
Diskstream::check_record_status (framepos_t transport_frame, nframes_t /*nframes*/, bool can_record)
Diskstream::check_record_status (framepos_t transport_frame, bool can_record)
{
int possibly_recording;
int rolling;

2
libs/ardour/midi_diskstream.cc
View File

@ -498,7 +498,7 @@ MidiDiskstream::process (framepos_t transport_frame, nframes_t nframes, bool can
playback_distance = 0;
check_record_status (transport_frame, nframes, can_record);
check_record_status (transport_frame, can_record);
nominally_recording = (can_record && re);

1
libs/ardour/playlist.cc
View File

@ -31,6 +31,7 @@
#include "pbd/failed_constructor.h"
#include "pbd/stateful_diff_command.h"
#include "pbd/xml++.h"
#include "pbd/stacktrace.h"
#include "ardour/debug.h"
#include "ardour/playlist.h"

2
libs/ardour/track.cc
View File

@ -266,7 +266,7 @@ Track::no_roll (nframes_t nframes, framepos_t start_frame, framepos_t end_frame,
*/
}
_diskstream->check_record_status (start_frame, nframes, can_record);
_diskstream->check_record_status (start_frame, can_record);
bool send_silence;