diff options
author | Brendan Long <self@brendanlong.com> | 2013-11-06 15:34:10 -0800 |
---|---|---|
committer | Brendan Long <self@brendanlong.com> | 2013-11-06 15:34:10 -0800 |
commit | 26ece7171aa09580c08ca2d82cacd3d7e6d59959 (patch) | |
tree | 6c0fc3ff98f833ab2dead61cf139e9beabc64f88 | |
parent | 32f3871497b9aa4109eb373b62a108669c84d230 (diff) | |
parent | bcb88fee58e60f615619b996782e1a6f0a2f0f26 (diff) |
Merge pull request #109 from cablelabs/dlnasrc-43-remove-cl-name-prop
Removed "cl-name" property since the perferred way is to use g_type_name...
-rw-r--r-- | src/gstdlnasrc.c | 17 | ||||
-rw-r--r-- | src/gstdlnasrc.h | 4 |
2 files changed, 0 insertions, 21 deletions
diff --git a/src/gstdlnasrc.c b/src/gstdlnasrc.c index ecf4e0f..01046aa 100644 --- a/src/gstdlnasrc.c +++ b/src/gstdlnasrc.c @@ -43,12 +43,10 @@ enum { PROP_0, PROP_URI, - PROP_CL_NAME, PROP_SUPPORTED_RATES, PROP_DTCP_BLOCKSIZE, }; -#define DLNA_SRC_CL_NAME "dlnasrc" #define DEFAULT_DTCP_BLOCKSIZE 524288 #define ELEMENT_NAME_SOUP_HTTP_SRC "soup-http-source" @@ -399,12 +397,6 @@ gst_dlna_src_class_init (GstDlnaSrcClass * klass) g_param_spec_string ("uri", "Stream URI", "Sets URI A/V stream", NULL, G_PARAM_READWRITE)); - g_object_class_install_property (gobject_klass, PROP_CL_NAME, - g_param_spec_string ("cl_name", - "CableLabs name", - "CableLabs name used to verify playbin selected source", - NULL, G_PARAM_READABLE)); - g_object_class_install_property (gobject_klass, PROP_SUPPORTED_RATES, g_param_spec_boxed ("supported_rates", "Supported Playspeed rates", @@ -435,7 +427,6 @@ gst_dlna_src_init (GstDlnaSrc * dlna_src) dlna_src->dtcp_decrypter = NULL; dlna_src->src_pad = NULL; - dlna_src->cl_name = g_strdup (DLNA_SRC_CL_NAME); dlna_src->dtcp_blocksize = DEFAULT_DTCP_BLOCKSIZE; dlna_src->src_pad = NULL; dlna_src->dtcp_key_storage = NULL; @@ -556,14 +547,6 @@ gst_dlna_src_get_property (GObject * object, guint prop_id, GValue * value, } break; - case PROP_CL_NAME: - GST_LOG_OBJECT (dlna_src, - "Getting property: CableLab's assigned src name"); - if (dlna_src->cl_name != NULL) { - g_value_set_string (value, dlna_src->cl_name); - } - break; - case PROP_SUPPORTED_RATES: GST_INFO_OBJECT (dlna_src, "Supported rates info not available, make sure URI is initialized"); diff --git a/src/gstdlnasrc.h b/src/gstdlnasrc.h index 3aa8923..e414e6f 100644 --- a/src/gstdlnasrc.h +++ b/src/gstdlnasrc.h @@ -58,10 +58,6 @@ struct _GstDlnaSrc GstPad* src_pad; - /* Name used to identify this element as source in playsrc2 - logging */ - gchar* cl_name; - guint dtcp_blocksize; gchar* dtcp_key_storage; |