From 10585630e6a5c061060204b177543880b3b64762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 10 Oct 2007 12:02:30 +0000 Subject: [PATCH] configure.ac: Update requirements from past CVS versions to released versions (0.10.14 in this case). Original commit message from CVS: * configure.ac: Update requirements from past CVS versions to released versions (0.10.14 in this case). * ext/sidplay/gstsiddec.cc: Fix compilation with g++-4.2. --- ChangeLog | 9 +++++++++ configure.ac | 4 ++-- ext/sidplay/gstsiddec.cc | 22 +++++----------------- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 518633e1d5..985e2becea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-10-10 Tim-Philipp Müller + + * configure.ac: + Update requirements from past CVS versions to released + versions (0.10.14 in this case). + + * ext/sidplay/gstsiddec.cc: + Fix compilation with g++-4.2. + 2007-10-08 Jan Schmidt * gst/realmedia/asmrules.c: (gst_asm_scan_parse_expression), diff --git a/configure.ac b/configure.ac index 80fa3580b0..d1f3bf1ebf 100644 --- a/configure.ac +++ b/configure.ac @@ -46,8 +46,8 @@ dnl AS_LIBTOOL_TAGS([CXX]) AM_PROG_LIBTOOL dnl *** required versions of GStreamer stuff *** -GST_REQ=0.10.13 -GSTPB_REQ=0.10.13.1 +GST_REQ=0.10.14 +GSTPB_REQ=0.10.14 dnl *** autotools stuff **** diff --git a/ext/sidplay/gstsiddec.cc b/ext/sidplay/gstsiddec.cc index 4ee2be475c..e6b8399e98 100644 --- a/ext/sidplay/gstsiddec.cc +++ b/ext/sidplay/gstsiddec.cc @@ -54,19 +54,6 @@ #include #include "gstsiddec.h" -static const GstElementDetails gst_siddec_details = -GST_ELEMENT_DETAILS ("Sid decoder", - "Codec/Decoder/Audio", - "Use libsidplay to decode SID audio tunes", - "Wim Taymans "); - -/* Sidec signals and args */ -enum -{ - /* FILL ME */ - LAST_SIGNAL -}; - #define DEFAULT_TUNE 0 #define DEFAULT_CLOCK SIDTUNE_CLOCK_PAL #define DEFAULT_MEMORY MPU_BANK_SWITCHING @@ -163,8 +150,6 @@ static void gst_siddec_set_property (GObject * object, guint prop_id, static GstElementClass *parent_class = NULL; -//static guint gst_siddec_signals[LAST_SIGNAL] = { 0 }; - GType gst_siddec_get_type (void) { @@ -197,7 +182,9 @@ gst_siddec_base_init (gpointer g_class) { GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - gst_element_class_set_details (element_class, &gst_siddec_details); + gst_element_class_set_details_simple (element_class, "Sid decoder", + "Codec/Decoder/Audio", "Use libsidplay to decode SID audio tunes", + "Wim Taymans "); gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&src_templ)); @@ -789,8 +776,9 @@ plugin_init (GstPlugin * plugin) GST_TYPE_SIDDEC); } +/* FIXME: remove cast to gchar once we depend on core >= 0.10.14.1 */ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, "siddec", - "Uses libsidplay to decode .sid files", + (gchar *) "Uses libsidplay to decode .sid files", plugin_init, VERSION, "GPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);