- Fix process callbakc handling during export

- Fix filename handling when exporting multiple files
- Some updates to audiographer


git-svn-id: svn://localhost/ardour2/branches/3.0@6402 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 44 insertions, 0 deletions

diff --git a/libs/audiographer/tests/sr_converter_test.cc b/libs/audiographer/tests/sr_converter_test.cc
index 59c05806c6..e7b49a1b71 100644
--- a/libs/audiographer/tests/sr_converter_test.cc
+++ b/libs/audiographer/tests/sr_converter_test.cc
@@ -9,6 +9,7 @@ class SampleRateConverterTest : public CppUnit::TestFixture
   CPPUNIT_TEST (testNoConversion);
   CPPUNIT_TEST (testUpsampleLength);
   CPPUNIT_TEST (testDownsampleLength);
+  CPPUNIT_TEST (testRespectsEndOfInput);
   CPPUNIT_TEST_SUITE_END ();
 
   public:
@@ -17,6 +18,7 @@ class SampleRateConverterTest : public CppUnit::TestFixture
 		frames = 128;
 		random_data = TestUtils::init_random_data(frames);
 		sink.reset (new AppendingVectorSink<float>());
+		grabber.reset (new ProcessContextGrabber<float>());
 		converter.reset (new SampleRateConverter (1));
 	}
 
@@ -88,10 +90,36 @@ class SampleRateConverterTest : public CppUnit::TestFixture
 		CPPUNIT_ASSERT (half_frames - tolerance < frames_output && frames_output < half_frames + tolerance);
 	}
 	
+	void testRespectsEndOfInput()
+	{
+		assert (frames % 2 == 0);
+		nframes_t const half_frames = frames / 2;
+		
+		converter->init (44100, 48000);
+		converter->allocate_buffers (half_frames);
+		converter->add_output (grabber);
+		
+		ProcessContext<float> c (random_data, half_frames, 1);
+		converter->process (c);
+		ProcessContext<float> c2 (&random_data[half_frames], half_frames / 2, 1);
+		c2.set_flag (ProcessContext<float>::EndOfInput);
+		converter->process (c2);
+		
+		for (std::list<ProcessContext<float> >::iterator it = grabber->contexts.begin(); it != grabber->contexts.end(); ++it) {
+			std::list<ProcessContext<float> >::iterator next = it; ++next;
+			if (next == grabber->contexts.end()) {
+				CPPUNIT_ASSERT (it->has_flag (ProcessContext<float>::EndOfInput));
+			} else {
+				CPPUNIT_ASSERT (!it->has_flag (ProcessContext<float>::EndOfInput));
+			}
+		}
+	}
+	
 
   private:
 	boost::shared_ptr<SampleRateConverter > converter;
 	boost::shared_ptr<AppendingVectorSink<float> > sink;
+	boost::shared_ptr<ProcessContextGrabber<float> > grabber;
 
 	float * random_data;
 	nframes_t frames;
diff --git a/libs/audiographer/tests/utils.h b/libs/audiographer/tests/utils.h
index 6b6a1fea0f..b13a7b7f07 100644
--- a/libs/audiographer/tests/utils.h
+++ b/libs/audiographer/tests/utils.h
@@ -12,6 +12,7 @@
 #include "audiographer/exception.h"
 
 #include <vector>
+#include <list>
 #include <cstring>
 #include <cstdlib>
 #include <ctime>
@@ -116,4 +117,19 @@ class ThrowingSink : public AudioGrapher::Sink<T>
 	using AudioGrapher::Sink<T>::process;
 };
 
+template<typename T>
+class ProcessContextGrabber : public AudioGrapher::Sink<T>
+{
+  public:
+	void process (AudioGrapher::ProcessContext<T> const & c)
+	{
+		contexts.push_back (c);
+	}
+	using AudioGrapher::Sink<T>::process;
+	
+	typedef std::list<AudioGrapher::ProcessContext<T> > ContextList;
+	ContextList contexts;
+	
+};
+
 #endif // AUDIOGRAPHER_TESTS_UTILS_H