Revert "gdkpixbuf: Add a gdkpixbuf3 plugin that uses gdkpixbuf3"

This reverts commit b6788153161b4e07fbf3d42a2d8921ea049305d0.

There's no gdk-pixbuf3 anymore. gdk-pixbuf was separated from GTK+
and will stay at version 2.0 for GTK+ 3.0.

diff --git a/configure.ac b/configure.ac
index 8f10ba1c7606dd78af764c1854610432cfd76dc3..69200b28450e00540601138a394e6d9c687cb9e9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -723,11 +723,6 @@ AG_GST_CHECK_FEATURE(GDK_PIXBUF, [GDK pixbuf], gdkpixbuf, [
   AG_GST_PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= 2.8.0)
 ])
 
-translit(dnm, m, l) AM_CONDITIONAL(USE_GDK_PIXBUF3, true)
-AG_GST_CHECK_FEATURE(GDK_PIXBUF3, [GDK pixbuf], gdkpixbuf3, [
-  AG_GST_PKG_CHECK_MODULES(GDK_PIXBUF3, gdk-pixbuf-3.0)
-])
-
 dnl *** HAL ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_HAL, true)
 AG_GST_CHECK_FEATURE(HAL, [HAL libraries], halelements, [
@@ -999,7 +994,6 @@ AM_CONDITIONAL(USE_FLAC, false)
 AM_CONDITIONAL(USE_GCONF, false)
 AM_CONDITIONAL(USE_GCONFTOOL, false)
 AM_CONDITIONAL(USE_GDK_PIXBUF, false)
-AM_CONDITIONAL(USE_GDK_PIXBUF3, false)
 AM_CONDITIONAL(USE_GST_V4L2, false)
 AM_CONDITIONAL(USE_HAL, false)
 AM_CONDITIONAL(USE_JPEG, false)

diff --git a/ext/Makefile.am b/ext/Makefile.am
index c78d14c58e38355e7298560a5339e6255160c474..1dc2e2abcafc562900bae5346ce5eb1b4bc75ccd 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -37,12 +37,8 @@ endif
 if USE_GDK_PIXBUF
 GDK_PIXBUF_DIR = gdk_pixbuf
 else
-if USE_GDK_PIXBUF3
-GDK_PIXBUF_DIR = gdk_pixbuf
-else
 GDK_PIXBUF_DIR =
 endif
-endif
 
 if USE_HAL
 HAL_DIR = hal

diff --git a/ext/gdk_pixbuf/Makefile.am b/ext/gdk_pixbuf/Makefile.am
index acd2c5efcc18150728f83dd1e97d0d8086dac9b7..cf5265c2e8feb48659753a1894360548bc3abf13 100644 (file)
--- a/ext/gdk_pixbuf/Makefile.am
+++ b/ext/gdk_pixbuf/Makefile.am
@@ -1,13 +1,4 @@
-plugin_LTLIBRARIES = 
-
-if USE_GDK_PIXBUF
-plugin_LTLIBRARIES += libgstgdkpixbuf.la
-
-endif
-
-if USE_GDK_PIXBUF3
-plugin_LTLIBRARIES += libgstgdkpixbuf3.la
-endif
+plugin_LTLIBRARIES = libgstgdkpixbuf.la
 
 libgstgdkpixbuf_la_SOURCES = gstgdkpixbuf.c gstgdkpixbufsink.c pixbufscale.c
 libgstgdkpixbuf_la_CFLAGS = \
@@ -21,21 +12,8 @@ libgstgdkpixbuf_la_LIBADD = \
 libgstgdkpixbuf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstgdkpixbuf_la_LIBTOOLFLAGS = --tag=disable-static
 
-libgstgdkpixbuf3_la_SOURCES = gstgdkpixbuf.c gstgdkpixbufsink.c pixbufscale.c
-libgstgdkpixbuf3_la_CFLAGS = \
-       $(GST_PLUGINS_BASE_CFLAGS) \
-       $(GST_BASE_CFLAGS) \
-       $(GST_CFLAGS) $(GDK_PIXBUF3_CFLAGS) \
-       -DGDK_PIXBUF3=1
-libgstgdkpixbuf3_la_LIBADD = \
-       $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
-       $(GST_BASE_LIBS) \
-       $(GST_LIBS) $(GDK_PIXBUF3_LIBS)
-libgstgdkpixbuf3_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstgdkpixbuf3_la_LIBTOOLFLAGS = --tag=disable-static
-
 noinst_HEADERS = \
        gstgdkpixbuf.h \
        gstgdkpixbufsink.h \
-       pixbufscale.h
-
+       pixbufscale.h \
+       gstgdkanimation.h

diff --git a/ext/gdk_pixbuf/gstgdkpixbuf.c b/ext/gdk_pixbuf/gstgdkpixbuf.c
index da0637602baa8fd0979d2159070c679a8e6a962c..5c93a3ffdfea9fbc74da3c39765fd4b4d3fc5aea 100644 (file)
--- a/ext/gdk_pixbuf/gstgdkpixbuf.c
+++ b/ext/gdk_pixbuf/gstgdkpixbuf.c
@@ -84,14 +84,7 @@ static gboolean gst_gdk_pixbuf_sink_event (GstPad * pad, GstEvent * event);
 static void gst_gdk_pixbuf_type_find (GstTypeFind * tf, gpointer ignore);
 #endif
 
-#ifdef GDK_PIXBUF3
-typedef GstGdkPixbuf GstGdkPixbuf3;
-typedef GstGdkPixbufClass GstGdkPixbuf3Class;
-
-GST_BOILERPLATE (GstGdkPixbuf3, gst_gdk_pixbuf, GstElement, GST_TYPE_ELEMENT);
-#else
 GST_BOILERPLATE (GstGdkPixbuf, gst_gdk_pixbuf, GstElement, GST_TYPE_ELEMENT);
-#endif
 
 static gboolean
 gst_gdk_pixbuf_sink_setcaps (GstPad * pad, GstCaps * caps)
@@ -523,16 +516,6 @@ gst_gdk_pixbuf_type_find (GstTypeFind * tf, gpointer ignore)
 }
 #endif
 
-#ifdef GDK_PIXBUF3
-#define PLUGIN_NAME "gdkpixbuf3"
-#define GDKPIXBUFDEC "gdkpixbufdec3"
-#define GDKPIXBUFSINK "gdkpixbufsink3"
-#else
-#define PLUGIN_NAME "gdkpixbuf"
-#define GDKPIXBUFDEC "gdkpixbufdec"
-#define GDKPIXBUFSINK "gdkpixbufsink"
-#endif
-
 /* entry point to initialize the plug-in
  * initialize the plug-in itself
  * register the element factories and pad templates
@@ -541,10 +524,10 @@ gst_gdk_pixbuf_type_find (GstTypeFind * tf, gpointer ignore)
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  GST_DEBUG_CATEGORY_INIT (gst_gdk_pixbuf_debug, PLUGIN_NAME, 0,
+  GST_DEBUG_CATEGORY_INIT (gst_gdk_pixbuf_debug, "gdkpixbuf", 0,
       "gdk pixbuf loader");
 
-  if (!gst_element_register (plugin, GDKPIXBUFDEC, GST_RANK_SECONDARY,
+  if (!gst_element_register (plugin, "gdkpixbufdec", GST_RANK_SECONDARY,
           GST_TYPE_GDK_PIXBUF))
     return FALSE;
 
@@ -553,7 +536,7 @@ plugin_init (GstPlugin * plugin)
       gst_gdk_pixbuf_type_find, NULL, GST_CAPS_ANY, NULL);
 #endif
 
-  if (!gst_element_register (plugin, GDKPIXBUFSINK, GST_RANK_NONE,
+  if (!gst_element_register (plugin, "gdkpixbufsink", GST_RANK_NONE,
           GST_TYPE_GDK_PIXBUF_SINK))
     return FALSE;
 
@@ -569,6 +552,6 @@ plugin_init (GstPlugin * plugin)
  * so keep the name plugin_desc, or you cannot get your plug-in registered */
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
-    PLUGIN_NAME,
+    "gdkpixbuf",
     "GdkPixbuf-based image decoder, scaler and sink",
     plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)

diff --git a/ext/gdk_pixbuf/gstgdkpixbufsink.c b/ext/gdk_pixbuf/gstgdkpixbufsink.c
index f17b72f095e39aed2abc127bb4183a2a0e6f55ff..3258358a74cd4d01ebffba8f423c54ecd63f47ba 100644 (file)
--- a/ext/gdk_pixbuf/gstgdkpixbufsink.c
+++ b/ext/gdk_pixbuf/gstgdkpixbufsink.c
@@ -109,16 +109,9 @@ enum
   PROP_LAST
 };
 
-#ifdef GDK_PIXBUF3
-typedef GstGdkPixbufSink GstGdkPixbufSink3;
-typedef GstGdkPixbufSinkClass GstGdkPixbufSink3Class;
 
-GST_BOILERPLATE (GstGdkPixbufSink3, gst_gdk_pixbuf_sink, GstVideoSink,
-    GST_TYPE_VIDEO_SINK);
-#else
 GST_BOILERPLATE (GstGdkPixbufSink, gst_gdk_pixbuf_sink, GstVideoSink,
     GST_TYPE_VIDEO_SINK);
-#endif
 
 static void gst_gdk_pixbuf_sink_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);

diff --git a/ext/gdk_pixbuf/pixbufscale.c b/ext/gdk_pixbuf/pixbufscale.c
index 03063936b5845da7ebf6878e28862db9d2d34bd7..d8d9808236f448d9c638f75d3362ff58324249a7 100644 (file)
--- a/ext/gdk_pixbuf/pixbufscale.c
+++ b/ext/gdk_pixbuf/pixbufscale.c
@@ -81,13 +81,8 @@ gst_pixbufscale_method_get_type (void)
   };
 
   if (!pixbufscale_method_type) {
-#ifdef GDK_PIXBUF3
-    pixbufscale_method_type =
-        g_enum_register_static ("GstPixbuf3ScaleMethod", pixbufscale_methods);
-#else
     pixbufscale_method_type =
         g_enum_register_static ("GstPixbufScaleMethod", pixbufscale_methods);
-#endif
   }
   return pixbufscale_method_type;
 }
@@ -113,16 +108,8 @@ static gboolean gst_pixbufscale_handle_src_event (GstPad * pad,
 
 static gboolean parse_caps (GstCaps * caps, gint * width, gint * height);
 
-#ifdef GDK_PIXBUF3
-typedef GstPixbufScale GstPixbufScale3;
-typedef GstPixbufScaleClass GstPixbufScale3Class;
-
-GST_BOILERPLATE (GstPixbufScale3, gst_pixbufscale, GstBaseTransform,
-    GST_TYPE_BASE_TRANSFORM);
-#else
 GST_BOILERPLATE (GstPixbufScale, gst_pixbufscale, GstBaseTransform,
     GST_TYPE_BASE_TRANSFORM);
-#endif
 
 static void
 gst_pixbufscale_base_init (gpointer g_class)
@@ -482,20 +469,14 @@ gst_pixbufscale_handle_src_event (GstPad * pad, GstEvent * event)
   return ret;
 }
 
-#ifdef GDK_PIXBUF3
-#define GDKPIXBUFSCALE "gdkpixbufscale3"
-#else
-#define GDKPIXBUFSCALE "gdkpixbufscale"
-#endif
-
 gboolean
 pixbufscale_init (GstPlugin * plugin)
 {
-  if (!gst_element_register (plugin, GDKPIXBUFSCALE, GST_RANK_NONE,
+  if (!gst_element_register (plugin, "gdkpixbufscale", GST_RANK_NONE,
           GST_TYPE_PIXBUFSCALE))
     return FALSE;
 
-  GST_DEBUG_CATEGORY_INIT (pixbufscale_debug, GDKPIXBUFSCALE, 0,
+  GST_DEBUG_CATEGORY_INIT (pixbufscale_debug, "gdkpixbufscale", 0,
       "pixbufscale element");
 
   return TRUE;