merge from trunk

[ardour.git] / libs / ardour / import.cc

diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc
index b70a7bbc9c0154e8af0ca4cb9f8c462f78fd8193..c68eb16aae6745c4a4ea6134d6f254300465319c 100644 (file)
--- 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) {