projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use PBD::copy_file in Session::create() to copy the template file.
[ardour.git]
/
libs
/
ardour
/
reverse.cc
diff --git
a/libs/ardour/reverse.cc
b/libs/ardour/reverse.cc
index 335dacad6ed1b6ec6711e47c611b447365c2ecfc..c7ebecea317029172a8d927a7cb005421861b3ab 100644
(file)
--- a/
libs/ardour/reverse.cc
+++ b/
libs/ardour/reverse.cc
@@
-15,7
+15,6
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <algorithm>
*/
#include <algorithm>
@@
-24,7
+23,7
@@
#include <ardour/types.h>
#include <ardour/reverse.h>
#include <ardour/types.h>
#include <ardour/reverse.h>
-#include <ardour/filesource.h>
+#include <ardour/
audio
filesource.h>
#include <ardour/session.h>
#include <ardour/audioregion.h>
#include <ardour/session.h>
#include <ardour/audioregion.h>
@@
-43,17
+42,15
@@
Reverse::~Reverse ()
}
int
}
int
-Reverse::run (
AudioRegion&
region)
+Reverse::run (
boost::shared_ptr<AudioRegion>
region)
{
{
- AudioRegion::SourceList nsrcs;
- AudioRegion::SourceList::iterator si;
- const jack_nframes_t blocksize = 256 * 1048;
- Sample buf[blocksize];
- char * workbuf = 0;;
- jack_nframes_t fpos;
- jack_nframes_t fend;
- jack_nframes_t fstart;
- jack_nframes_t to_read;
+ SourceList nsrcs;
+ SourceList::iterator si;
+ nframes_t blocksize = 256 * 1024;
+ Sample* buf = 0;
+ nframes_t fpos;
+ nframes_t fstart;
+ nframes_t to_read;
int ret = -1;
/* create new sources */
int ret = -1;
/* create new sources */
@@
-62,53
+59,50
@@
Reverse::run (AudioRegion& region)
goto out;
}
goto out;
}
- workbuf = new char[blocksize * 4];
-
- fend = region.start() + region.length();
- fstart = region.start();
+ fstart = region->start();
- if (blocksize < fend) {
- fpos =max(fstart, fend - blocksize);
- } else {
- fpos = fstart;
+ if (blocksize > region->length()) {
+ blocksize = region->length();
}
}
- to_read = min (region.length(), blocksize);
+ fpos = max (fstart, (fstart + region->length() - blocksize));
+ buf = new Sample[blocksize];
+ to_read = blocksize;
/* now read it backwards */
/* now read it backwards */
- while (
1
) {
+ while (
to_read
) {
uint32_t n;
uint32_t n;
- for (n = 0, si = nsrcs.begin(); n < region
.
n_channels(); ++n, ++si) {
+ for (n = 0, si = nsrcs.begin(); n < region
->
n_channels(); ++n, ++si) {
/* read it in */
/* read it in */
- if (region
.source (n).read (buf, fpos, to_read, workbuf
) != to_read) {
+ if (region
->audio_source (n)->read (buf, fpos, to_read
) != to_read) {
goto out;
}
goto out;
}
-
+
/* swap memory order */
/* swap memory order */
- for (
jack_
nframes_t i = 0; i < to_read/2; ++i) {
+ for (nframes_t i = 0; i < to_read/2; ++i) {
swap (buf[i],buf[to_read-1-i]);
}
/* write it out */
swap (buf[i],buf[to_read-1-i]);
}
/* write it out */
- if ((*si)->write (buf, to_read, workbuf) != to_read) {
+ boost::shared_ptr<AudioSource> asrc(boost::dynamic_pointer_cast<AudioSource>(*si));
+
+ if (asrc && asrc->write (buf, to_read) != to_read) {
goto out;
}
}
goto out;
}
}
- if (fpos == fstart) {
- break;
- } else if (fpos > fstart + to_read) {
+ if (fpos > fstart + blocksize) {
fpos -= to_read;
fpos -= to_read;
- to_read =
min (fstart - fpos, blocksize)
;
+ to_read =
blocksize
;
} else {
} else {
- to_read = fpos
-
fstart;
+ to_read = fpos
-
fstart;
fpos = fstart;
}
};
fpos = fstart;
}
};
@@
-117,15
+111,16
@@
Reverse::run (AudioRegion& region)
out:
out:
+ if (buf) {
+ delete [] buf;
+ }
+
if (ret) {
for (si = nsrcs.begin(); si != nsrcs.end(); ++si) {
if (ret) {
for (si = nsrcs.begin(); si != nsrcs.end(); ++si) {
-
(*si)->mark_for_remove (
);
-
delete *si
;
+
boost::shared_ptr<AudioSource> asrc(boost::dynamic_pointer_cast<AudioSource>(*si)
);
+
asrc->mark_for_remove ()
;
}
}
}
}
- if (workbuf) {
- delete [] workbuf;
- }
return ret;
}
return ret;
}