Commit 496b2935 authored by Brendan Long's avatar Brendan Long

Revert "Added duration-bytes and duration-nanos properties to support running...

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 70ff594b.
parent 3b77484b
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment