Commit 73a6055b authored by Edgard Lima's avatar Edgard Lima

I'm too lazy to comment this

Original commit message from CVS:
Gdkpixbuf ported from 0.8 to 0.10 by Renato Filho <renato.filho@indt.org.br>. gst_loader and gdkpixbufanimation still need port.
parent 96c1cd6e
2006-02-24 Edgard Lima <edgard.lima@indt.org.br>
* configure.ac:
* ext/Makefile.am:
* ext/gdk_pixbuf/Makefile.am:
* ext/gdk_pixbuf/gstgdkpixbuf.c:
* ext/gdk_pixbuf/gstgdkpixbuf.h:
* ext/gdk_pixbuf/pixbufscale.c:
* ext/gdk_pixbuf/pixbufscale.h:
Gdkpixbuf ported from 0.8 to 0.10 by
Renato Filho <renato.filho@indt.org.br>.
gst_loader and gdkpixbufanimation still need port.
2006-02-24 Michael Smith <msmith@fluendo.com>
* configure.ac:
......
......@@ -232,6 +232,9 @@ if test "x$HAVE_GTK_22" = "xyes"; then
AC_SUBST(GTK_VERSION)
GTK_PREFIX=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
AC_SUBST(GTK_BASE_DIR)
GDK_PIXBUF_LIBDIR=`$PKG_CONFIG --variable=libdir gdk-pixbuf-2.0`
GDK_PIXBUF_PREFIXDIR=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
AC_SUBST(GTK_BASE_DIR)
else
PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK_20=yes, HAVE_GTK_20=no)
fi
......@@ -399,6 +402,12 @@ GST_CHECK_FEATURE(GCONF, [GConf libraries], , [
AC_SUBST(GCONF_LIBS)
])
dnl *** GDK pixbuf ***
translit(dnm, m, l) AM_CONDITIONAL(USE_GDK_PIXBUF, true)
GST_CHECK_FEATURE(GDK_PIXBUF, [GDK pixbuf], gdkpixbufsrc, [
if test $HAVE_GTK_22 = "yes"; then HAVE_GDK_PIXBUF=yes; fi;
])
dnl *** HAL ***
translit(dnm, m, l) AM_CONDITIONAL(USE_HAL, true)
GST_CHECK_FEATURE(HAL, [HAL libraries], , [
......@@ -639,6 +648,7 @@ ext/dv/Makefile
ext/esd/Makefile
ext/flac/Makefile
ext/gconf/Makefile
ext/gdk_pixbuf/Makefile
ext/hal/Makefile
ext/ladspa/Makefile
ext/libcaca/Makefile
......
......@@ -40,11 +40,11 @@ else
GCONF_DIR =
endif
# if USE_GDK_PIXBUF
# GDK_PIXBUF_DIR = gdk_pixbuf
# else
if USE_GDK_PIXBUF
GDK_PIXBUF_DIR = gdk_pixbuf
else
GDK_PIXBUF_DIR =
# endif
endif
if USE_HAL
HAL_DIR = hal
......@@ -141,6 +141,7 @@ DIST_SUBDIRS = \
esd \
flac \
gconf \
gdk_pixbuf \
hal \
jpeg \
ladspa \
......
plugin_LTLIBRARIES = libgstgdkpixbuf.la
libgstgdkpixbuf_la_SOURCES = gstgdkpixbuf.c pixbufscale.c
libgstgdkpixbuf_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS)
libgstgdkpixbuf_la_LIBADD = $(GST_LIBS) $(GTK_LIBS)
libgstgdkpixbuf_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) $(GST_BASE_CFLAGS)
libgstgdkpixbuf_la_LIBADD = $(GTK_LIBS) $(GST_BASE_LIBS)
libgstgdkpixbuf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
if HAVE_GDK_LOADERS
loaderdir = $(DESTDIR)$(GDK_PIXBUF_LOADER_DIR)
loader_LTLIBRARIES = gst_loader.la
install-data-hook:
if test -z "$(DESTDIR)" ; then \
$(mkinstalldirs) $(DESTDIR)$(GDK_PIXBUF_CONF_DIR) ; \
$(QUERYLOADERS) > $(DESTDIR)$(GDK_PIXBUF_CONF_DIR)/gdk-pixbuf.loaders ; \
fi
gst_loader_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -DGDK_PIXBUF_ENABLE_BACKEND
gst_loader_la_SOURCES = \
gstgdkanimation.c \
gst_loader.c
gst_loader_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
gst_loader_la_LIBADD = $(GTK_LIBS) $(GST_LIBS)
else
#if
#loaderdir = $(DESTDIR)$(GDK_PIXBUF_LOADER_DIR)
#loader_LTLIBRARIES = gst_loader.la
#
#install-data-hook:
# if test -z "$(DESTDIR)" ; then \
# $(mkinstalldirs) $(DESTDIR)$(GDK_PIXBUF_CONF_DIR) ; \
# $(QUERYLOADERS) > $(DESTDIR)$(GDK_PIXBUF_CONF_DIR)/gdk-pixbuf.loaders ; \
# fi
#
#gst_loader_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -DGDK_PIXBUF_ENABLE_BACKEND
#gst_loader_la_SOURCES = \
# gstgdkanimation.c \
# gst_loader.c
#gst_loader_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) --avoid-version --module
#gst_loader_la_LIBADD = $(GTK_LIBS) $(GST_LIBS)
#else
install-data-hook:
true
endif
#endif
noinst_HEADERS = gstgdkpixbuf.h \
pixbufscale.h \
......
This diff is collapsed.
......@@ -28,15 +28,15 @@
G_BEGIN_DECLS
/* #define's don't like whitespacey bits */
#define GST_TYPE_GDK_PIXBUF \
#define GST_TYPE_GDK_PIXBUF \
(gst_gdk_pixbuf_get_type())
#define GST_GDK_PIXBUF(obj) \
#define GST_GDK_PIXBUF(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GDK_PIXBUF,GstGdkPixbuf))
#define GST_GDK_PIXBUF_CLASS(klass) \
#define GST_GDK_PIXBUF_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GDK_PIXBUF,GstGdkPixbuf))
#define GST_IS_GDK_PIXBUF(obj) \
#define GST_IS_GDK_PIXBUF(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GDK_PIXBUF))
#define GST_IS_GDK_PIXBUF_CLASS(obj) \
#define GST_IS_GDK_PIXBUF_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GDK_PIXBUF))
typedef struct _GstGdkPixbuf GstGdkPixbuf;
......@@ -56,8 +56,8 @@ struct _GstGdkPixbuf
int rowstride;
unsigned int image_size;
gint fps_n;
gint fps_d;
gint framerate_numerator;
gint framerate_denominator;
};
struct _GstGdkPixbufClass
......
This diff is collapsed.
......@@ -25,9 +25,21 @@
#include <gtk/gtk.h>
#include <gst/gst.h>
#include <gst/base/gstbasetransform.h>
G_BEGIN_DECLS
#define GST_TYPE_PIXBUFSCALE \
(gst_pixbufscale_get_type())
#define GST_PIXBUFSCALE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PIXBUFSCALE,GstPixbufScale))
#define GST_PIXBUFSCALE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PIXBUFSCALE,GstPixbufScale))
#define GST_IS_PIXBUFSCALE(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PIXBUFSCALE))
#define GST_IS_PIXBUFSCALE_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PIXBUFSCALE))
typedef enum {
GST_PIXBUFSCALE_NEAREST,
GST_PIXBUFSCALE_TILES,
......@@ -35,27 +47,14 @@ typedef enum {
GST_PIXBUFSCALE_HYPER
} GstPixbufScaleMethod;
#define GST_TYPE_PIXBUFSCALE \
(gst_pixbufscale_get_type())
#define GST_PIXBUFSCALE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_PIXBUFSCALE,GstPixbufScale))
#define GST_PIXBUFSCALE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_PIXBUFSCALE,GstPixbufScale))
#define GST_IS_PIXBUFSCALE(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PIXBUFSCALE))
#define GST_IS_PIXBUFSCALE_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PIXBUFSCALE))
typedef struct _GstPixbufScale GstPixbufScale;
typedef struct _GstPixbufScaleClass GstPixbufScaleClass;
struct _GstPixbufScale {
GstElement element;
GstPad *sinkpad,*srcpad;
GstBaseTransform element;
/* video state */
gboolean inited;
gint to_width;
gint to_height;
gint from_width;
......@@ -73,7 +72,7 @@ struct _GstPixbufScale {
};
struct _GstPixbufScaleClass {
GstElementClass parent_class;
GstBaseTransformClass parent_class;
};
static GType gst_pixbufscale_get_type(void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment