From acb81c58c547b0e6155fd61b7914f39deea428ad Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <manauw@skynet.be>
Date: Wed, 5 Mar 2008 06:03:03 +0000
Subject: Port mplex element to 0.10. Fixes bug #520329.

Original commit message from CVS:
Patch by: Mark Nauwelaerts <manauw at skynet dot be>
* configure.ac:
* ext/Makefile.am:
* ext/mplex/Makefile.am:
* ext/mplex/gstmplex.cc:
* ext/mplex/gstmplex.hh:
* ext/mplex/gstmplexibitstream.cc:
* ext/mplex/gstmplexibitstream.hh:
* ext/mplex/gstmplexjob.cc:
* ext/mplex/gstmplexjob.hh:
* ext/mplex/gstmplexoutputstream.cc:
* ext/mplex/gstmplexoutputstream.hh:
Port mplex element to 0.10. Fixes bug #520329.
* tests/check/Makefile.am:
* tests/check/elements/mplex.c: (test_sink_event), (setup_src_pad),
(teardown_src_pad), (setup_mplex), (cleanup_mplex),
(GST_START_TEST), (mplex_suite), (main):
Add unit test for the mplex element.
---
 ext/mplex/gstmplexoutputstream.hh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'ext/mplex/gstmplexoutputstream.hh')

diff --git a/ext/mplex/gstmplexoutputstream.hh b/ext/mplex/gstmplexoutputstream.hh
index c67040b7..f93c2f95 100644
--- a/ext/mplex/gstmplexoutputstream.hh
+++ b/ext/mplex/gstmplexoutputstream.hh
@@ -1,5 +1,6 @@
 /* GStreamer mplex (mjpegtools) wrapper
  * (c) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ * (c) 2008 Mark Nauwelaerts <mnauw@users.sourceforge.net>
  *
  * gstmplexoutputstream.hh: gstreamer/mplex output stream wrapper
  *
@@ -26,27 +27,31 @@
 #include <mjpeg_types.h>
 #include <outputstrm.hpp>
 
+#include "gstmplex.hh"
+
 class GstMplexOutputStream : public OutputStream {
 public:
-  GstMplexOutputStream (GstElement *element,
-			GstPad     *pad);
+  GstMplexOutputStream (GstMplex *element, GstPad *pad);
 
   /* open/close. Basically 'no-op's (close() sets EOS). */
   int  Open  (void);
   void Close (void);
 
   /* get size of current segment */
+#if GST_MJPEGTOOLS_API >= 10900
+  uint64_t SegmentSize (void);
+#else
   off_t SegmentSize (void);
+#endif
 
   /* next segment */
   void NextSegment (void);
 
   /* write data */
-  void Write (guint8 *data,
-	      guint   len);
+  void Write (guint8 *data, guint len);
 
 private:
-  GstElement *element;
+  GstMplex *mplex;
   GstPad *pad;
   guint64 size;
 };
-- 
cgit v1.2.1