diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2007-11-15 02:31:19 +0000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2007-11-15 02:31:19 +0000 |
| commit | 4f7e6c0714fd385bbe68acc223c951ef9a07c1b9 (patch) | |
| tree | 539844d9321d8dfa3e055a8dd42df516af8c471a /libs | |
| parent | 4e89709c2d140648c03efacb828d75dfff53cf58 (diff) | |
Use boost::scoped_array to manage working buffer for RAII in Session::import_audiofile
git-svn-id: svn://localhost/ardour2/trunk@2658 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/import.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index f0d3892999..94bb309e75 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -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) { |