[gupnp-dlna/gstreamer-1.0: 1/2] Port to 0.11 API
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gupnp-dlna/gstreamer-1.0: 1/2] Port to 0.11 API
- Date: Wed, 25 Jul 2012 07:09:33 +0000 (UTC)
commit ecad90c58ec74849e782cf4db6eb41675ce7cfa9
Author: Jens Georg <mail jensge org>
Date: Mon Jan 23 19:21:33 2012 +0100
Port to 0.11 API
configure.ac | 2 +-
libgupnp-dlna/gupnp-dlna-discoverer.c | 2 +-
libgupnp-dlna/gupnp-dlna-information.c | 20 ++++++++++----------
libgupnp-dlna/gupnp-dlna-profile.c | 18 +++++++++---------
tests/dlna-encoding.c | 2 +-
5 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9db94d4..921d1c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ LT_INIT([win32-dll])
PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.5.0)
-GST_MAJORMINOR=0.10
+GST_MAJORMINOR=0.11
GST_REQ=0.10.29.2
GSTPBU_REQ=0.10.32
diff --git a/libgupnp-dlna/gupnp-dlna-discoverer.c b/libgupnp-dlna/gupnp-dlna-discoverer.c
index faf21ff..87cab52 100644
--- a/libgupnp-dlna/gupnp-dlna-discoverer.c
+++ b/libgupnp-dlna/gupnp-dlna-discoverer.c
@@ -224,7 +224,7 @@ gupnp_dlna_discoverer_class_init (GUPnPDLNADiscovererClass *klass)
NULL, NULL,
gupnp_dlna_marshal_VOID__OBJECT_BOXED,
G_TYPE_NONE, 2, GUPNP_TYPE_DLNA_INFORMATION,
- GST_TYPE_G_ERROR);
+ G_TYPE_ERROR);
/* Load DLNA profiles from disk */
if (g_type_from_name ("GstElement")) {
diff --git a/libgupnp-dlna/gupnp-dlna-information.c b/libgupnp-dlna/gupnp-dlna-information.c
index 5585893..250d817 100644
--- a/libgupnp-dlna/gupnp-dlna-information.c
+++ b/libgupnp-dlna/gupnp-dlna-information.c
@@ -76,8 +76,8 @@ gupnp_dlna_information_get_property (GObject *object,
break;
case PROP_DISCOVERER_INFO:
- gst_value_set_mini_object (value,
- GST_MINI_OBJECT(priv->info));
+ g_value_set_object (value,
+ G_OBJECT (priv->info));
break;
@@ -116,7 +116,7 @@ gupnp_dlna_information_set_property (GObject *object,
if (priv->info)
gst_discoverer_info_unref (priv->info);
priv->info = GST_DISCOVERER_INFO
- (gst_value_dup_mini_object (value));
+ (g_value_dup_object (value));
break;
@@ -174,13 +174,13 @@ gupnp_dlna_information_class_init (GUPnPDLNAInformationClass *klass)
G_PARAM_CONSTRUCT_ONLY);
g_object_class_install_property (object_class, PROP_DLNA_MIME, pspec);
- pspec = gst_param_spec_mini_object ("info",
- "Stream metadata",
- "Metadata of the stream in a "
- "GstDiscovererInfo structure",
- GST_TYPE_DISCOVERER_INFO,
- G_PARAM_READWRITE |
- G_PARAM_CONSTRUCT_ONLY);
+ pspec = g_param_spec_object ("info",
+ "Stream metadata",
+ "Metadata of the stream in a "
+ "GstDiscovererInfo structure",
+ GST_TYPE_DISCOVERER_INFO,
+ G_PARAM_READWRITE |
+ G_PARAM_CONSTRUCT_ONLY);
g_object_class_install_property (object_class,
PROP_DISCOVERER_INFO,
pspec);
diff --git a/libgupnp-dlna/gupnp-dlna-profile.c b/libgupnp-dlna/gupnp-dlna-profile.c
index b88fed6..804d28e 100644
--- a/libgupnp-dlna/gupnp-dlna-profile.c
+++ b/libgupnp-dlna/gupnp-dlna-profile.c
@@ -79,8 +79,8 @@ gupnp_dlna_profile_get_property (GObject *object,
break;
case PROP_ENCODING_PROFILE:
- gst_value_set_mini_object (value,
- GST_MINI_OBJECT (priv->enc_profile));
+ g_value_set_object (value,
+ G_OBJECT (priv->enc_profile));
break;
case PROP_DLNA_EXTENDED:
@@ -176,13 +176,13 @@ gupnp_dlna_profile_class_init (GUPnPDLNAProfileClass *klass)
G_PARAM_CONSTRUCT_ONLY);
g_object_class_install_property (object_class, PROP_DLNA_MIME, pspec);
- pspec = gst_param_spec_mini_object ("encoding-profile",
- "Encoding Profile for the "
- "DLNA Profile",
- "GstEncodingProfile object"
- "corresponding to the DLNA profile",
- GST_TYPE_ENCODING_PROFILE,
- G_PARAM_READABLE);
+ pspec = g_param_spec_object ("encoding-profile",
+ "Encoding Profile for the DLNA Profile",
+ "GstEncodingProfile object corresponding "
+ "to the DLNA profile",
+ GST_TYPE_ENCODING_PROFILE,
+ G_PARAM_READABLE);
+
g_object_class_install_property (object_class,
PROP_ENCODING_PROFILE,
pspec);
diff --git a/tests/dlna-encoding.c b/tests/dlna-encoding.c
index e819801..714cc1b 100644
--- a/tests/dlna-encoding.c
+++ b/tests/dlna-encoding.c
@@ -41,7 +41,7 @@ pad_added_cb (GstElement * uridecodebin, GstPad * pad, GstElement * encodebin)
GstCaps *caps;
/* Ask encodebin for a compatible pad */
- caps = gst_pad_get_caps (pad);
+ caps = gst_pad_query_caps (pad, NULL);
g_signal_emit_by_name (encodebin, "request-pad", caps, &sinkpad);
if (caps)
gst_caps_unref (caps);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]