diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-02-09 00:09:36 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-02-09 00:09:36 +0000 |
| commit | 658cbeac0687b0031930e09ca35bf29393bc8c7d (patch) | |
| tree | 313e1a076a8d3acf655b6c64b50456716048125b /ext/rtmp | |
| parent | 8765068879331b2f911d70ee88baa36c4217aec2 (diff) | |
| download | gstreamer-plugins-bad-658cbeac0687b0031930e09ca35bf29393bc8c7d.tar.gz | |
rtmp: don't use gst_element_class_install_std_props()
It's about to be removed.
Diffstat (limited to 'ext/rtmp')
| -rw-r--r-- | ext/rtmp/gstrtmpsink.c | 14 | ||||
| -rw-r--r-- | ext/rtmp/gstrtmpsrc.c | 14 |
2 files changed, 15 insertions, 13 deletions
diff --git a/ext/rtmp/gstrtmpsink.c b/ext/rtmp/gstrtmpsink.c index 17a2865c6..669073c45 100644 --- a/ext/rtmp/gstrtmpsink.c +++ b/ext/rtmp/gstrtmpsink.c @@ -50,12 +50,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_rtmp_sink_debug); #define GST_CAT_DEFAULT gst_rtmp_sink_debug -/* Filter signals and args */ -enum -{ - /* FILL ME */ - LAST_SIGNAL -}; +#define DEFAULT_LOCATION NULL enum { @@ -101,8 +96,9 @@ gst_rtmp_sink_class_init (GstRTMPSinkClass * klass) gobject_class->set_property = gst_rtmp_sink_set_property; gobject_class->get_property = gst_rtmp_sink_get_property; - gst_element_class_install_std_props (gstelement_class, - "location", PROP_LOCATION, G_PARAM_READWRITE, NULL); + g_object_class_install_property (gobject_class, PROP_LOCATION, + g_param_spec_string ("location", "RTMP Location", "RTMP url", + DEFAULT_LOCATION, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); gst_element_class_set_details_simple (gstelement_class, "RTMP output sink", @@ -300,7 +296,7 @@ gst_rtmp_sink_uri_set_uri (GstURIHandler * handler, const gchar * uri, if (GST_STATE (sink) >= GST_STATE_PAUSED) { g_set_error (error, GST_URI_ERROR, GST_URI_ERROR_BAD_STATE, - "Changing the URI on rtmpsrc when it is running is not supported"); + "Changing the URI on rtmpsink when it is running is not supported"); return FALSE; } diff --git a/ext/rtmp/gstrtmpsrc.c b/ext/rtmp/gstrtmpsrc.c index 5b4fe1a6e..0103cad5e 100644 --- a/ext/rtmp/gstrtmpsrc.c +++ b/ext/rtmp/gstrtmpsrc.c @@ -68,11 +68,15 @@ static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", enum { PROP_0, - PROP_LOCATION, - PROP_SWF_URL, + PROP_LOCATION +#if 0 + PROP_SWF_URL, PROP_PAGE_URL +#endif }; +#define DEFAULT_LOCATION NULL + static void gst_rtmp_src_uri_handler_init (gpointer g_iface, gpointer iface_data); @@ -115,8 +119,10 @@ gst_rtmp_src_class_init (GstRTMPSrcClass * klass) gobject_class->get_property = gst_rtmp_src_get_property; /* properties */ - gst_element_class_install_std_props (gstelement_class, - "location", PROP_LOCATION, G_PARAM_READWRITE, NULL); + g_object_class_install_property (gobject_class, PROP_LOCATION, + g_param_spec_string ("location", "RTMP Location", + "Location of the RTMP url to read", + DEFAULT_LOCATION, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); gst_element_class_add_pad_template (gstelement_class, gst_static_pad_template_get (&srctemplate)); |