- Fixed a buffer size bug when ~/.ardour2 doesn't exist (can't load configuration), if in a hacky way

- Removed useless workbuf/conversion_buffers (same thing), uneeded with libsndfile


git-svn-id: svn://localhost/ardour2/trunk@781 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 7 insertions, 11 deletions

diff --git a/gtk2_ardour/analysis_window.cc b/gtk2_ardour/analysis_window.cc
index f742afd727..24c6cc4fb8 100644
--- a/gtk2_ardour/analysis_window.cc
+++ b/gtk2_ardour/analysis_window.cc
@@ -221,7 +221,6 @@ AnalysisWindow::analyze_data (Gtk::Button *button)
 		Sample *buf    = (Sample *) malloc(sizeof(Sample) * fft_graph.windowSize());
 		Sample *mixbuf = (Sample *) malloc(sizeof(Sample) * fft_graph.windowSize());
 		float  *gain   = (float *)  malloc(sizeof(float) * fft_graph.windowSize());
-		char   *work   = (char *)   malloc(sizeof(char) * fft_graph.windowSize());
 	
 		Selection s = PublicEditor::instance().get_selection();
 		TimeSelection ts = s.time;
@@ -261,7 +260,7 @@ AnalysisWindow::analyze_data (Gtk::Button *button)
 							n = (*j).length() - i;
 						}
 				
-						n = pl->read(buf, mixbuf, gain, work, (*j).start + i, n);
+						n = pl->read(buf, mixbuf, gain, (*j).start + i, n);
 	
 						if ( n < fft_graph.windowSize()) {
 							for (int j = n; j < fft_graph.windowSize(); j++) {
@@ -301,7 +300,7 @@ AnalysisWindow::analyze_data (Gtk::Button *button)
 							n = arv->region().length() - i;
 						}
 
-						n = arv->audio_region().read_at(buf, mixbuf, gain, work, arv->region().position() + i, n);
+						n = arv->audio_region().read_at(buf, mixbuf, gain, arv->region().position() + i, n);
 	
 						if ( n < fft_graph.windowSize()) {
 							for (int j = n; j < fft_graph.windowSize(); j++) {
@@ -331,7 +330,6 @@ AnalysisWindow::analyze_data (Gtk::Button *button)
 	
 		free(buf);
 		free(mixbuf);
-		free(work);
 
 		track_list_ready = true;
 	} /* end lock */
diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index 46a704b435..865796a1ed 100644
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -162,7 +162,6 @@ Editor::write_region (string path, AudioRegion& region)
 	jack_nframes_t to_read;
 	Sample buf[chunk_size];
 	gain_t gain_buffer[chunk_size];
-	char   workbuf[chunk_size *4];
 	jack_nframes_t pos;
 	char s[PATH_MAX+1];
 	uint32_t cnt;
@@ -234,11 +233,11 @@ Editor::write_region (string path, AudioRegion& region)
 			
 			fs = (*src);
 
-			if (region.read_at (buf, buf, gain_buffer, workbuf, pos, this_time) != this_time) {
+			if (region.read_at (buf, buf, gain_buffer, pos, this_time) != this_time) {
 				break;
 			}
 			
-			if (fs->write (buf, this_time, workbuf) != this_time) {
+			if (fs->write (buf, this_time) != this_time) {
 				error << "" << endmsg;
 				goto error_out;
 			}
@@ -309,7 +308,6 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
 	jack_nframes_t nframes;
 	Sample buf[chunk_size];
 	gain_t gain_buffer[chunk_size];
-	char   workbuf[chunk_size*4];
 	jack_nframes_t pos;
 	char s[PATH_MAX+1];
 	uint32_t cnt;
@@ -367,11 +365,11 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
 
 				fs = sources[n];
 				
-				if (playlist.read (buf, buf, gain_buffer, workbuf, pos, this_time, n) != this_time) {
+				if (playlist.read (buf, buf, gain_buffer, pos, this_time, n) != this_time) {
 					break;
 				}
 				
-				if (fs->write (buf, this_time, workbuf) != this_time) {
+				if (fs->write (buf, this_time) != this_time) {
 					goto error_out;
 				}
 			}
@@ -397,7 +395,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
 				for (uint32_t n=0; n < channels; ++n) {
 
 					fs = sources[n];
-					if (fs->write (buf, this_time, workbuf) != this_time) {
+					if (fs->write (buf, this_time) != this_time) {
 						goto error_out;
 					}
 				}