ardour/livetrax
13
0
Fork 0
Code

Use boost::scoped_array to manage working buffer for RAII in Session::import_audiofile

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@2658 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Tim Mayberry 2007-11-15 02:31:19 +00:00
parent 4e89709c2d
commit 4f7e6c0714
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/ardour/import.cc
View File

@ -31,6 +31,8 @@
#include <glibmm.h>
#include <boost/scoped_array.hpp>
#include <pbd/basename.h>
#include <pbd/convert.h>
@ -94,7 +96,6 @@ Session::import_audiofile (import_status& status)
{
vector<boost::shared_ptr<AudioFileSource> > newfiles;
SF_INFO info;
float *data = 0;
Sample **channel_data = 0;
int nfiles = 0;
string basepath;
@ -154,8 +155,8 @@ Session::import_audiofile (import_status& status)
newfiles[n]->prepare_for_peakfile_writes ();
nfiles++;
}
data = new float[nframes * info.channels];
boost::scoped_array<float> data(new float[nframes * info.channels]);
channel_data = new Sample * [ info.channels ];
for (int n = 0; n < info.channels; ++n) {
@ -186,7 +187,7 @@ Session::import_audiofile (import_status& status)
long x;
long chn;
if ((nread = importable->read (data, nframes)) == 0) {
if ((nread = importable->read (data.get(), nframes)) == 0) {
break;
}
nfread = nread / info.channels;
@ -246,10 +247,6 @@ Session::import_audiofile (import_status& status)
ret = 0;
out:
if (data) {
delete [] data;
}
if (channel_data) {
for (int n = 0; n < info.channels; ++n) {