rtmpsrc: Remove page-url and swf-url properties

It's possible to include all those options in the URL already
by appending the options and separating them by spaces, e.g.
rtmp://somewhere/something opt1=val1 opt2=val2

1 files changed, 0 insertions, 42 deletions

diff --git a/ext/rtmp/gstrtmpsrc.c b/ext/rtmp/gstrtmpsrc.c
index a4806f094..3b9df514d 100644
--- a/ext/rtmp/gstrtmpsrc.c
+++ b/ext/rtmp/gstrtmpsrc.c
@@ -137,14 +137,6 @@ gst_rtmp_src_class_init (GstRTMPSrcClass * klass)
   /* properties */
   gst_element_class_install_std_props (GST_ELEMENT_CLASS (klass),
       "location", PROP_LOCATION, G_PARAM_READWRITE, NULL);
-  g_object_class_install_property (gobject_class, PROP_SWF_URL,
-      g_param_spec_string ("swf-url", "SWF URL",
-          "URL of the corresponding SWF file",
-          NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-  g_object_class_install_property (gobject_class, PROP_PAGE_URL,
-      g_param_spec_string ("page-url", "Page URL",
-          "URL of the originating page",
-          NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   gstbasesrc_class->start = GST_DEBUG_FUNCPTR (gst_rtmp_src_start);
   gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_rtmp_src_stop);
@@ -172,10 +164,6 @@ gst_rtmp_src_finalize (GObject * object)
 
   g_free (rtmpsrc->uri);
   rtmpsrc->uri = NULL;
-  g_free (rtmpsrc->swf_url);
-  rtmpsrc->swf_url = NULL;
-  g_free (rtmpsrc->page_url);
-  rtmpsrc->page_url = NULL;
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -262,20 +250,6 @@ gst_rtmp_src_set_property (GObject * object, guint prop_id,
           g_value_get_string (value));
       break;
     }
-    case PROP_SWF_URL:{
-      if (GST_STATE (src) >= GST_STATE_PAUSED)
-        break;
-      g_free (src->swf_url);
-      src->swf_url = g_value_dup_string (value);
-      break;
-    }
-    case PROP_PAGE_URL:{
-      if (GST_STATE (src) >= GST_STATE_PAUSED)
-        break;
-      g_free (src->page_url);
-      src->page_url = g_value_dup_string (value);
-      break;
-    }
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -545,8 +519,6 @@ gst_rtmp_src_start (GstBaseSrc * basesrc)
 {
   GstRTMPSrc *src;
   gchar *uri_copy;
-  static const AVal av_page_url = { (char *) "pageUrl", 7 };
-  static const AVal av_swf_url = { (char *) "swfUrl", 6 };
 
   src = GST_RTMP_SRC (basesrc);
 
@@ -572,20 +544,6 @@ gst_rtmp_src_start (GstBaseSrc * basesrc)
     return FALSE;
   }
 
-  if (src->page_url) {
-    AVal val;
-
-    STR2AVAL (val, src->page_url);
-    RTMP_SetOpt (src->rtmp, &av_page_url, &val);
-  }
-
-  if (src->swf_url) {
-    AVal val;
-
-    STR2AVAL (val, src->swf_url);
-    RTMP_SetOpt (src->rtmp, &av_swf_url, &val);
-  }
-
   /* open if required */
   if (!RTMP_IsConnected (src->rtmp)) {
     if (!RTMP_Connect (src->rtmp, NULL)) {