summaryrefslogtreecommitdiff
path: root/libs/ardour/import.cc
diff options
context:
space:
mode:
authorHans Fugal <hans@fugal.net>2006-08-12 01:36:34 +0000
committerHans Fugal <hans@fugal.net>2006-08-12 01:36:34 +0000
commitf995ac37860140c513e29c3bc58701474a7ed336 (patch)
treeb9727f47c65d4bc2095992b7e47432054aaa0f7b /libs/ardour/import.cc
parent1b45cf404441de4245053eb928725f9612e50cb3 (diff)
merge from trunk
git-svn-id: svn://localhost/ardour2/branches/undo@794 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/import.cc')
-rw-r--r--libs/ardour/import.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index b70a7bbc9c..c68eb16aae 100644
--- a/libs/ardour/import.cc
+++ b/libs/ardour/import.cc
@@ -57,7 +57,6 @@ Session::import_audiofile (import_status& status)
SF_INFO info;
float *data = 0;
Sample **channel_data = 0;
- char * workbuf = 0;
long nfiles = 0;
long n;
string basepath;
@@ -156,7 +155,6 @@ Session::import_audiofile (import_status& status)
data = new float[BLOCKSIZE * info.channels];
channel_data = new Sample * [ info.channels ];
- workbuf = new char[BLOCKSIZE * 4];
for (n = 0; n < info.channels; ++n) {
channel_data[n] = new Sample[BLOCKSIZE];
@@ -188,7 +186,7 @@ Session::import_audiofile (import_status& status)
/* flush to disk */
for (chn = 0; chn < info.channels; ++chn) {
- newfiles[chn]->write (channel_data[chn], nread, workbuf);
+ newfiles[chn]->write (channel_data[chn], nread);
}
so_far += nread;
@@ -255,9 +253,6 @@ Session::import_audiofile (import_status& status)
if (data) {
delete [] data;
}
- if (workbuf) {
- delete [] workbuf;
- }
if (channel_data) {
for (n = 0; n < info.channels; ++n) {