mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-27 14:31:01 +00:00
- some minor whitespace cleanups
Original commit message from CVS: - some minor whitespace cleanups - rework _chain_add_element to put the element in either the main or disabled lists depending on whether the element is PLAYING or not.
This commit is contained in:
parent
f1526799e0
commit
590604e430
2 changed files with 16 additions and 10 deletions
2
common
2
common
|
@ -1 +1 @@
|
||||||
Subproject commit bc8b71d0f48b1283b975913c841fa4f1326f2991
|
Subproject commit 50879a63c4fa8f2544d4d89a9dbfa0f5720c3266
|
|
@ -113,14 +113,17 @@ static void gst_basic_scheduler_reset (GstScheduler *sched);
|
||||||
static void gst_basic_scheduler_add_element (GstScheduler *sched, GstElement *element);
|
static void gst_basic_scheduler_add_element (GstScheduler *sched, GstElement *element);
|
||||||
static void gst_basic_scheduler_remove_element (GstScheduler *sched, GstElement *element);
|
static void gst_basic_scheduler_remove_element (GstScheduler *sched, GstElement *element);
|
||||||
static GstElementStateReturn
|
static GstElementStateReturn
|
||||||
gst_basic_scheduler_state_transition (GstScheduler *sched, GstElement *element, gint transition);
|
gst_basic_scheduler_state_transition (GstScheduler *sched, GstElement *element,
|
||||||
|
gint transition);
|
||||||
static void gst_basic_scheduler_lock_element (GstScheduler *sched, GstElement *element);
|
static void gst_basic_scheduler_lock_element (GstScheduler *sched, GstElement *element);
|
||||||
static void gst_basic_scheduler_unlock_element (GstScheduler *sched, GstElement *element);
|
static void gst_basic_scheduler_unlock_element (GstScheduler *sched, GstElement *element);
|
||||||
static gboolean gst_basic_scheduler_yield (GstScheduler *sched, GstElement *element);
|
static gboolean gst_basic_scheduler_yield (GstScheduler *sched, GstElement *element);
|
||||||
static gboolean gst_basic_scheduler_interrupt (GstScheduler *sched, GstElement *element);
|
static gboolean gst_basic_scheduler_interrupt (GstScheduler *sched, GstElement *element);
|
||||||
static void gst_basic_scheduler_error (GstScheduler *sched, GstElement *element);
|
static void gst_basic_scheduler_error (GstScheduler *sched, GstElement *element);
|
||||||
static void gst_basic_scheduler_pad_link (GstScheduler *sched, GstPad *srcpad, GstPad *sinkpad);
|
static void gst_basic_scheduler_pad_link (GstScheduler *sched, GstPad *srcpad,
|
||||||
static void gst_basic_scheduler_pad_unlink (GstScheduler *sched, GstPad *srcpad, GstPad *sinkpad);
|
GstPad *sinkpad);
|
||||||
|
static void gst_basic_scheduler_pad_unlink (GstScheduler *sched, GstPad *srcpad,
|
||||||
|
GstPad *sinkpad);
|
||||||
static GstPad* gst_basic_scheduler_pad_select (GstScheduler *sched, GList *padlist);
|
static GstPad* gst_basic_scheduler_pad_select (GstScheduler *sched, GList *padlist);
|
||||||
static GstClockReturn gst_basic_scheduler_clock_wait (GstScheduler *sched, GstElement *element,
|
static GstClockReturn gst_basic_scheduler_clock_wait (GstScheduler *sched, GstElement *element,
|
||||||
GstClockID id, GstClockTimeDiff *jitter);
|
GstClockID id, GstClockTimeDiff *jitter);
|
||||||
|
@ -748,14 +751,17 @@ gst_basic_scheduler_chain_destroy (GstSchedulerChain * chain)
|
||||||
static void
|
static void
|
||||||
gst_basic_scheduler_chain_add_element (GstSchedulerChain * chain, GstElement * element)
|
gst_basic_scheduler_chain_add_element (GstSchedulerChain * chain, GstElement * element)
|
||||||
{
|
{
|
||||||
GST_INFO (GST_CAT_SCHEDULING, "adding element \"%s\" to chain %p", GST_ELEMENT_NAME (element),
|
|
||||||
chain);
|
|
||||||
|
|
||||||
/* set the sched pointer for the element */
|
/* set the sched pointer for the element */
|
||||||
element->sched = GST_SCHEDULER (chain->sched);
|
element->sched = GST_SCHEDULER (chain->sched);
|
||||||
|
|
||||||
/* add the element to the list of 'disabled' elements */
|
/* add the element to either the main list or the disabled list */
|
||||||
|
if (GST_STATE(element) == GST_STATE_PLAYING) {
|
||||||
|
GST_INFO (GST_CAT_SCHEDULING, "adding element \"%s\" to chain %p enabled", GST_ELEMENT_NAME (element),chain);
|
||||||
|
chain->elements = g_list_prepend (chain->elements, element);
|
||||||
|
} else {
|
||||||
|
GST_INFO (GST_CAT_SCHEDULING, "adding element \"%s\" to chain %p disabled", GST_ELEMENT_NAME (element),chain);
|
||||||
chain->disabled = g_list_prepend (chain->disabled, element);
|
chain->disabled = g_list_prepend (chain->disabled, element);
|
||||||
|
}
|
||||||
chain->num_elements++;
|
chain->num_elements++;
|
||||||
|
|
||||||
/* notify the scheduler that something changed */
|
/* notify the scheduler that something changed */
|
||||||
|
|
Loading…
Reference in a new issue