ardour/livetrax
13
0
Fork 0
Code

Remove unused parameter.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10355 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-10-31 21:16:19 +00:00
parent 8536524bd3
commit 1269b646dd
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,7 +221,7 @@ class AudioDiskstream : public Diskstream
int read (Sample* buf, Sample* mixdown_buffer, float* gain_buffer,
framepos_t& start, framecnt_t cnt,
ChannelInfo* channel_info, int channel, bool reversed);
int channel, bool reversed);
void finish_capture (boost::shared_ptr<ChannelList>);
void transport_stopped_wallclock (struct tm&, time_t, bool abort);

11
libs/ardour/audio_diskstream.cc
View File

@ -773,7 +773,7 @@ AudioDiskstream::overwrite_existing_buffers ()
framecnt_t to_read = size - overwrite_offset;
if (read ((*chan)->playback_buf->buffer() + overwrite_offset, mixdown_buffer, gain_buffer, start, to_read, *chan, n, reversed)) {
if (read ((*chan)->playback_buf->buffer() + overwrite_offset, mixdown_buffer, gain_buffer, start, to_read, n, reversed)) {
error << string_compose(_("AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"),
id(), size, playback_sample) << endmsg;
goto out;
@ -783,8 +783,7 @@ AudioDiskstream::overwrite_existing_buffers ()
cnt -= to_read;
if (read ((*chan)->playback_buf->buffer(), mixdown_buffer, gain_buffer,
start, cnt, *chan, n, reversed)) {
if (read ((*chan)->playback_buf->buffer(), mixdown_buffer, gain_buffer, start, cnt, n, reversed)) {
error << string_compose(_("AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"),
id(), size, playback_sample) << endmsg;
goto out;
@ -869,7 +868,7 @@ AudioDiskstream::internal_playback_seek (framecnt_t distance)
int
AudioDiskstream::read (Sample* buf, Sample* mixdown_buffer, float* gain_buffer,
framepos_t& start, framecnt_t cnt,
ChannelInfo* /*channel_info*/, int channel, bool reversed)
int channel, bool reversed)
{
framecnt_t this_read = 0;
bool reloop = false;
@ -1158,7 +1157,7 @@ AudioDiskstream::_do_refill (Sample* mixdown_buffer, float* gain_buffer)
if (to_read) {
if (read (buf1, mixdown_buffer, gain_buffer, file_frame_tmp, to_read, chan, chan_n, reversed)) {
if (read (buf1, mixdown_buffer, gain_buffer, file_frame_tmp, to_read, chan_n, reversed)) {
ret = -1;
goto out;
}
@ -1175,7 +1174,7 @@ AudioDiskstream::_do_refill (Sample* mixdown_buffer, float* gain_buffer)
so read some or all of vector.len[1] as well.
*/
if (read (buf2, mixdown_buffer, gain_buffer, file_frame_tmp, to_read, chan, chan_n, reversed)) {
if (read (buf2, mixdown_buffer, gain_buffer, file_frame_tmp, to_read, chan_n, reversed)) {
ret = -1;
goto out;
}