- Changed IO's vector<Port*>'s to PortList

- Added new Port classes, code to drive them
- Added PortList, which is a filthy mess ATM (nevermind that, it's the interface that's important at this stage)
- Added ChanCount, though it isn't very thoroughly used yet.  That's the next step....
- Fixed a few bugs relating to loading sessions saved with trunk
- Fixed a few random other bugs

Slowly working towards type agnosticism while keeping all the former code/logic intact is the name of the game here

Warning:  Removing ports is currently (intentionally) broken due solely to laziness.


git-svn-id: svn://localhost/ardour2/branches/midi@786 d708f5d6-7413-0410-9779-e7cbd77b26cf

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) {