diff options
| author | Brendan Long <b.long@cablelabs.com> | 2013-12-04 16:33:16 -0600 |
|---|---|---|
| committer | Brendan Long <b.long@cablelabs.com> | 2013-12-04 16:33:16 -0600 |
| commit | 496b2935be54e08dfe6463743668c7b4d878ec4a (patch) | |
| tree | e2371676b0722607b944e2840a6fe6f8879b4e0d | |
| parent | 3b77484b2c85d25b85448358a11bd41a07e8c36e (diff) | |
Revert "Added duration-bytes and duration-nanos properties to support running in standalone mode from webkit. Also fix segfault when performing gst-inspect."
This reverts commit 70ff594bd1888971ac7492ba1aec0c886c3b2b91.
| -rw-r--r-- | src/gstdlnasrc.c | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/src/gstdlnasrc.c b/src/gstdlnasrc.c index 53fe49b..45ce478 100644 --- a/src/gstdlnasrc.c +++ b/src/gstdlnasrc.c @@ -49,9 +49,7 @@ enum PROP_IS_DLNA, PROP_IS_ENCRYPTED, PROP_DTCP_HOST, - PROP_DTCP_PORT, - PROP_DURATION_BYTES, - PROP_DURATION_TIME + PROP_DTCP_PORT }; #define DEFAULT_DTCP_BLOCKSIZE 524288 @@ -440,16 +438,6 @@ gst_dlna_src_class_init (GstDlnaSrcClass * klass) "Port number to use for dtcp/ip encrypted content", 0, G_MAXUINT, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - g_object_class_install_property (gobject_klass, PROP_DURATION_TIME, - g_param_spec_uint64 ("duration-nanos", "duration of npt content in nanos", - "Duration of content in normal play time nanoseconds", 0, - G_MAXUINT64, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - - g_object_class_install_property (gobject_klass, PROP_DURATION_BYTES, - g_param_spec_uint64 ("duration-bytes", "duration of content in bytes", - "Total size in bytes of content duration", 0, - G_MAXUINT64, 0, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); - gobject_klass->finalize = GST_DEBUG_FUNCPTR (gst_dlna_src_finalize); gstelement_klass->change_state = gst_dlna_src_change_state; } @@ -638,21 +626,11 @@ gst_dlna_src_get_property (GObject * object, guint prop_id, GValue * value, break; case PROP_DTCP_HOST: - if (dlna_src->server_info) - g_value_set_string (value, dlna_src->server_info->dtcp_host); + g_value_set_string (value, dlna_src->server_info->dtcp_host); break; case PROP_DTCP_PORT: - if (dlna_src->server_info) - g_value_set_uint (value, dlna_src->server_info->dtcp_port); - break; - - case PROP_DURATION_TIME: - g_value_set_uint64 (value, dlna_src->npt_duration_nanos); - break; - - case PROP_DURATION_BYTES: - g_value_set_uint64 (value, dlna_src->byte_total); + g_value_set_uint (value, dlna_src->server_info->dtcp_port); break; default: |