mpegdemux: rename plugin to mpegpsdemux

diff --git a/gst/mpegdemux/Makefile.am b/gst/mpegdemux/Makefile.am
index 34706db9e5307edbcb362d1b9d6dbc377079f75e..6fba753ed670db0b0a1e9243b6504b4e96497ee5 100644 (file)
--- a/gst/mpegdemux/Makefile.am
+++ b/gst/mpegdemux/Makefile.am
@@ -1,18 +1,18 @@
-plugin_LTLIBRARIES = libgstmpegdemux.la
+plugin_LTLIBRARIES = libgstmpegpsdemux.la
 
-libgstmpegdemux_la_SOURCES = \
-       flumpegdemux.c \
+libgstmpegpsdemux_la_SOURCES = \
+       plugin.c \
        gstmpegdemux.c \
        gstpesfilter.c 
 
-libgstmpegdemux_la_CFLAGS = \
+libgstmpegpsdemux_la_CFLAGS = \
        $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS)
-libgstmpegdemux_la_LIBADD = \
+libgstmpegpsdemux_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS)
-libgstmpegdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmpegdemux_la_LIBTOOLFLAGS = --tag=disable-static
+libgstmpegpsdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstmpegpsdemux_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = \
        gstmpegdefs.h   \
@@ -21,13 +21,13 @@ noinst_HEADERS = \
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
        androgenizer \
-       -:PROJECT libgstmpegdemux -:SHARED libgstmpegdemux \
+       -:PROJECT libgstmpegpsdemux -:SHARED libgstmpegpsdemux \
         -:TAGS eng debug \
          -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstmpegdemux_la_SOURCES) \
-        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstmpegdemux_la_CFLAGS) \
-        -:LDFLAGS $(libgstmpegdemux_la_LDFLAGS) \
-                  $(libgstmpegdemux_la_LIBADD) \
+        -:SOURCES $(libgstmpegpsdemux_la_SOURCES) \
+        -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstmpegpsdemux_la_CFLAGS) \
+        -:LDFLAGS $(libgstmpegpsdemux_la_LDFLAGS) \
+                  $(libgstmpegpsdemux_la_LIBADD) \
                   -ldl \
         -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
                       LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \

diff --git a/gst/mpegdemux/flumpegdemux.c b/gst/mpegdemux/flumpegdemux.c
deleted file mode 100644 (file)
index 38a3520..0000000
--- a/gst/mpegdemux/flumpegdemux.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * This library is licensed under 2 different licenses and you
- * can choose to use it under the terms of either one of them. The
- * two licenses are the MPL 1.1 and the LGPL.
- *
- * MPL:
- *
- * The contents of this file are subject to the Mozilla Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/.
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * LGPL:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * The Original Code is Fluendo MPEG Demuxer plugin.
- *
- * The Initial Developer of the Original Code is Fluendo, S.L.
- * Portions created by Fluendo, S.L. are Copyright (C) 2005
- * Fluendo, S.L. All Rights Reserved.
- *
- * Contributor(s): Wim Taymans <wim@fluendo.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gstmpegdemux.h"
-
-GST_DEBUG_CATEGORY_EXTERN (gstflupesfilter_debug);
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-  GST_DEBUG_CATEGORY_INIT (gstflupesfilter_debug, "mpegpesfilter", 0,
-      "MPEG-TS/PS PES filter output");
-
-  if (!gst_flups_demux_plugin_init (plugin))
-    return FALSE;
-
-  return TRUE;
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    mpegdemux2,
-    "MPEG demuxers",
-    plugin_init, VERSION,
-    GST_LICENSE_UNKNOWN, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);

diff --git a/gst/mpegdemux/gstmpegdemux.c b/gst/mpegdemux/gstmpegdemux.c
index e87642d676724c0b330fe99a055c3546ca4d5749..787ac052ace2a249c3844747aab6fd3bbc407355 100644 (file)
--- a/gst/mpegdemux/gstmpegdemux.c
+++ b/gst/mpegdemux/gstmpegdemux.c
@@ -3168,14 +3168,3 @@ gst_segment_set_duration (GstSegment * segment, GstFormat format,
   }
   segment->duration = duration;
 }
-
-
-gboolean
-gst_flups_demux_plugin_init (GstPlugin * plugin)
-{
-  if (!gst_element_register (plugin, "mpegpsdemux",
-          GST_RANK_PRIMARY, GST_TYPE_FLUPS_DEMUX))
-    return FALSE;
-
-  return TRUE;
-}

diff --git a/gst/mpegdemux/gstmpegdemux.h b/gst/mpegdemux/gstmpegdemux.h
index 6cf7aed9ce6cfee51c86296f6ed383518588c29b..bea4dc448145b6dd29808bdc3ccd49c9de106201 100644 (file)
--- a/gst/mpegdemux/gstmpegdemux.h
+++ b/gst/mpegdemux/gstmpegdemux.h
@@ -161,7 +161,5 @@ struct _GstFluPSDemuxClass
 
 GType gst_flups_demux_get_type (void);
 
-gboolean gst_flups_demux_plugin_init (GstPlugin * plugin);
-
 G_END_DECLS
 #endif /* __GST_FLUPS_DEMUX_H__ */

diff --git a/gst/mpegdemux/gstpesfilter.c b/gst/mpegdemux/gstpesfilter.c
index f728e4b9c61246a095e71ccdcfe951ee834f620b..d58c72602625668b72a9db8a46c3a2d7075c455f 100644 (file)
--- a/gst/mpegdemux/gstpesfilter.c
+++ b/gst/mpegdemux/gstpesfilter.c
@@ -48,8 +48,8 @@
 #include "gstmpegdefs.h"
 #include "gstpesfilter.h"
 
-GST_DEBUG_CATEGORY (gstflupesfilter_debug);
-#define GST_CAT_DEFAULT (gstflupesfilter_debug)
+GST_DEBUG_CATEGORY (mpegpspesfilter_debug);
+#define GST_CAT_DEFAULT (mpegpspesfilter_debug)
 
 static GstFlowReturn gst_pes_filter_data_push (GstPESFilter * filter,
     gboolean first, GstBuffer * buffer);

diff --git a/gst/mpegdemux/plugin.c b/gst/mpegdemux/plugin.c
new file mode 100644 (file)
index 0000000..28c691c
--- /dev/null
+++ b/gst/mpegdemux/plugin.c
@@ -0,0 +1,70 @@
+/*
+ * This library is licensed under 2 different licenses and you
+ * can choose to use it under the terms of either one of them. The
+ * two licenses are the MPL 1.1 and the LGPL.
+ *
+ * MPL:
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/.
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * LGPL:
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * The Original Code is Fluendo MPEG Demuxer plugin.
+ *
+ * The Initial Developer of the Original Code is Fluendo, S.L.
+ * Portions created by Fluendo, S.L. are Copyright (C) 2005
+ * Fluendo, S.L. All Rights Reserved.
+ *
+ * Contributor(s): Wim Taymans <wim@fluendo.com>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gstmpegdemux.h"
+
+GST_DEBUG_CATEGORY_EXTERN (mpegpspesfilter_debug);
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  GST_DEBUG_CATEGORY_INIT (mpegpspesfilter_debug, "mpegpspesfilter", 0,
+      "MPEG-PS PES filter");
+
+  if (!gst_element_register (plugin, "mpegpsdemux", GST_RANK_PRIMARY,
+          GST_TYPE_FLUPS_DEMUX))
+    return FALSE;
+
+  return TRUE;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    mpegpsdemux,
+    "MPEG-PS demuxer",
+    plugin_init, VERSION,
+    GST_LICENSE_UNKNOWN, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);