Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
George Kiagiadakis
gst-plugins-base
Commits
9f74ce74
Commit
9f74ce74
authored
Apr 29, 2009
by
Andy Wingo
Browse files
Revert "add can-activate-pull property to baseaudiosink"
This reverts commit
c4074a2e
.
parent
219a31fa
Changes
1
Hide whitespace changes
Inline
Side-by-side
gst-libs/gst/audio/gstbaseaudiosink.c
View file @
9f74ce74
...
...
@@ -80,17 +80,13 @@ enum
#define DEFAULT_PROVIDE_CLOCK TRUE
#define DEFAULT_SLAVE_METHOD GST_BASE_AUDIO_SINK_SLAVE_SKEW
/* FIXME, enable pull mode when clock slaving and trick modes are figured out */
#define DEFAULT_CAN_ACTIVATE_PULL FALSE
enum
{
PROP_0
,
PROP_BUFFER_TIME
,
PROP_LATENCY_TIME
,
PROP_PROVIDE_CLOCK
,
PROP_SLAVE_METHOD
,
PROP_CAN_ACTIVATE_PULL
PROP_SLAVE_METHOD
};
GType
...
...
@@ -204,11 +200,6 @@ gst_base_audio_sink_class_init (GstBaseAudioSinkClass * klass)
GST_TYPE_BASE_AUDIO_SINK_SLAVE_METHOD
,
DEFAULT_SLAVE_METHOD
,
G_PARAM_READWRITE
|
G_PARAM_STATIC_STRINGS
));
g_object_class_install_property
(
gobject_class
,
PROP_CAN_ACTIVATE_PULL
,
g_param_spec_boolean
(
"can-activate-pull"
,
"Allow Pull Scheduling"
,
"Allow pull-based scheduling"
,
DEFAULT_CAN_ACTIVATE_PULL
,
G_PARAM_READWRITE
|
G_PARAM_STATIC_STRINGS
));
gstelement_class
->
change_state
=
GST_DEBUG_FUNCPTR
(
gst_base_audio_sink_change_state
);
gstelement_class
->
provide_clock
=
...
...
@@ -248,7 +239,9 @@ gst_base_audio_sink_init (GstBaseAudioSink * baseaudiosink,
(
GstAudioClockGetTimeFunc
)
gst_base_audio_sink_get_time
,
baseaudiosink
);
GST_BASE_SINK
(
baseaudiosink
)
->
can_activate_push
=
TRUE
;
GST_BASE_SINK
(
baseaudiosink
)
->
can_activate_pull
=
DEFAULT_CAN_ACTIVATE_PULL
;
/* FIXME, enable pull mode when segments, latency, state changes, negotiation
* and clock slaving are figured out */
GST_BASE_SINK
(
baseaudiosink
)
->
can_activate_pull
=
FALSE
;
/* install some custom pad_query functions */
gst_pad_set_query_function
(
GST_BASE_SINK_PAD
(
baseaudiosink
),
...
...
@@ -581,9 +574,6 @@ gst_base_audio_sink_set_property (GObject * object, guint prop_id,
case
PROP_SLAVE_METHOD
:
gst_base_audio_sink_set_slave_method
(
sink
,
g_value_get_enum
(
value
));
break
;
case
PROP_CAN_ACTIVATE_PULL
:
GST_BASE_SINK
(
sink
)
->
can_activate_pull
=
g_value_get_boolean
(
value
);
break
;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID
(
object
,
prop_id
,
pspec
);
break
;
...
...
@@ -611,9 +601,6 @@ gst_base_audio_sink_get_property (GObject * object, guint prop_id,
case
PROP_SLAVE_METHOD
:
g_value_set_enum
(
value
,
gst_base_audio_sink_get_slave_method
(
sink
));
break
;
case
PROP_CAN_ACTIVATE_PULL
:
g_value_set_boolean
(
value
,
GST_BASE_SINK
(
sink
)
->
can_activate_pull
);
break
;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID
(
object
,
prop_id
,
pspec
);
break
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment