Index: /branches/api-cleanup/src/libstreaming/generic/PortManager.cpp
===================================================================
--- /branches/api-cleanup/src/libstreaming/generic/PortManager.cpp (revision 811)
+++ /branches/api-cleanup/src/libstreaming/generic/PortManager.cpp (revision 813)
@@ -36,5 +36,4 @@
 
 PortManager::PortManager() {
-
 }
 
Index: /branches/api-cleanup/src/libstreaming/generic/StreamProcessor.cpp
===================================================================
--- /branches/api-cleanup/src/libstreaming/generic/StreamProcessor.cpp (revision 811)
+++ /branches/api-cleanup/src/libstreaming/generic/StreamProcessor.cpp (revision 813)
@@ -88,7 +88,7 @@
         debugOutput(DEBUG_LEVEL_VERBOSE,"Could not unregister stream processor with the Iso manager\n");
     }
+    // make the threads leave the wait condition
+    POST_SEMAPHORE;
     sem_destroy(&m_signal_semaphore);
-
-    // FIXME: how do we ensure that nobody is using us?
 
     if (m_data_buffer) delete m_data_buffer;
@@ -1277,6 +1277,4 @@
         case ePS_Created:
             assert(m_data_buffer);
-            // object just created
-            result = m_data_buffer->init();
 
             // prepare the framerate estimate
Index: /branches/api-cleanup/src/libutil/TimestampedBuffer.cpp
===================================================================
--- /branches/api-cleanup/src/libutil/TimestampedBuffer.cpp (revision 807)
+++ /branches/api-cleanup/src/libutil/TimestampedBuffer.cpp (revision 813)
@@ -275,16 +275,4 @@
 unsigned int TimestampedBuffer::getBufferSpace() {
     return ffado_ringbuffer_write_space(m_event_buffer)/(m_bytes_per_frame);
-}
-
-/**
- * \brief Initializes the TimestampedBuffer
- *
- * Initializes the TimestampedBuffer, should be called before anything else
- * is done.
- *
- * @return true if successful
- */
-bool TimestampedBuffer::init() {
-    return true;
 }
 
Index: /branches/api-cleanup/src/libutil/TimestampedBuffer.h
===================================================================
--- /branches/api-cleanup/src/libutil/TimestampedBuffer.h (revision 807)
+++ /branches/api-cleanup/src/libutil/TimestampedBuffer.h (revision 813)
@@ -89,38 +89,4 @@
         virtual ~TimestampedBuffer();
 
-        /**
-         * @brief waits for the availability of frames (blocking)
-         * @param nframes number of frames
-         *
-         * @return true if frames are available, false if not (e.g. signal occurred)
-         */
-        bool waitForFrames(unsigned int nframes);
-
-        /**
-         * @brief waits for the availability of frames (blocking)
-         *
-         * waits for one update period of frames
-         *
-         * @return true if frames are available, false if not (e.g. signal occurred)
-         */
-        bool waitForFrames();
-
-        /**
-         * @brief waits for the availability of frames (non-blocking)
-         * @param nframes number of frames
-         *
-         * @return true if frames are available, false if not
-         */
-        bool tryWaitForFrames(unsigned int nframes);
-
-        /**
-         * @brief waits for the availability of frames (non-blocking)
-         *
-         * waits for one update period of frames
-         *
-         * @return true if frames are available, false if not
-         */
-        bool tryWaitForFrames();
-
         bool writeDummyFrame();
         bool dropFrames ( unsigned int nbframes );
@@ -134,5 +100,4 @@
         bool blockProcessReadFrames ( unsigned int nbframes );
 
-        bool init();
         bool prepare();
         bool clearBuffer();
Index: /branches/api-cleanup/tests/test-timestampedbuffer.cpp
===================================================================
--- /branches/api-cleanup/tests/test-timestampedbuffer.cpp (revision 783)
+++ /branches/api-cleanup/tests/test-timestampedbuffer.cpp (revision 813)
@@ -282,6 +282,4 @@
     t->setVerboseLevel(arguments.verbose);
 
-    t->init();
-
     // Setup the buffer
     t->setBufferSize(arguments.buffersize);