mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-17 21:06:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

revert cruft

Browse source 
Original commit message from CVS:
revert cruft
This commit is contained in:
Andy Wingo 2005-05-05 21:42:24 +00:00
parent e19563e43e
commit 57183c39dc
8 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gst/base/gstbasesink.c
View file

@ -752,7 +752,6 @@ gst_basesink_activate (GstPad * pad, GstActivateMode mode)
result = TRUE; result = TRUE;
break; break;
case GST_ACTIVATE_PULL: case GST_ACTIVATE_PULL:
case GST_ACTIVATE_PULL_RANGE:
/* if we have a scheduler we can start the task */ /* if we have a scheduler we can start the task */
g_return_val_if_fail (basesink->has_loop, FALSE); g_return_val_if_fail (basesink->has_loop, FALSE);
gst_pad_peer_set_active (pad, mode); gst_pad_peer_set_active (pad, mode);

9
gst/base/gstbasesrc.c
View file

@ -103,8 +103,7 @@ static GstElementStateReturn gst_basesrc_change_state (GstElement * element);
static void gst_basesrc_set_dataflow_funcs (GstBaseSrc * this); static void gst_basesrc_set_dataflow_funcs (GstBaseSrc * this);
static void gst_basesrc_loop (GstPad * pad); static void gst_basesrc_loop (GstPad * pad);
static gboolean gst_basesrc_check_get_range (GstPad * pad, static gboolean gst_basesrc_check_get_range (GstPad * pad);
gboolean * random_access);
static GstFlowReturn gst_basesrc_get_range (GstPad * pad, guint64 offset, static GstFlowReturn gst_basesrc_get_range (GstPad * pad, guint64 offset,
guint length, GstBuffer ** buf); guint length, GstBuffer ** buf);
@ -169,7 +168,6 @@ gst_basesrc_init (GstBaseSrc * basesrc, gpointer g_class)
basesrc->srcpad = pad; basesrc->srcpad = pad;
gst_element_add_pad (GST_ELEMENT (basesrc), pad); gst_element_add_pad (GST_ELEMENT (basesrc), pad);
basesrc->random_access = TRUE;
basesrc->segment_start = -1; basesrc->segment_start = -1;
basesrc->segment_end = -1; basesrc->segment_end = -1;
basesrc->blocksize = DEFAULT_BLOCKSIZE; basesrc->blocksize = DEFAULT_BLOCKSIZE;
@ -539,7 +537,7 @@ gst_basesrc_get_range (GstPad * pad, guint64 offset, guint length,
} }
static gboolean static gboolean
gst_basesrc_check_get_range (GstPad * pad, gboolean * random_access) gst_basesrc_check_get_range (GstPad * pad)
{ {
GstBaseSrc *src; GstBaseSrc *src;
@ -550,7 +548,6 @@ gst_basesrc_check_get_range (GstPad * pad, gboolean * random_access)
gst_basesrc_stop (src); gst_basesrc_stop (src);
} }
*random_access = src->random_access;
return src->seekable; return src->seekable;
} }
@ -720,7 +717,6 @@ gst_basesrc_activate (GstPad * pad, GstActivateMode mode)
switch (mode) { switch (mode) {
case GST_ACTIVATE_PUSH: case GST_ACTIVATE_PUSH:
case GST_ACTIVATE_PULL: case GST_ACTIVATE_PULL:
case GST_ACTIVATE_PULL_RANGE:
result = gst_basesrc_start (basesrc); result = gst_basesrc_start (basesrc);
break; break;
default: default:
@ -747,7 +743,6 @@ gst_basesrc_activate (GstPad * pad, GstActivateMode mode)
} }
break; break;
case GST_ACTIVATE_PULL: case GST_ACTIVATE_PULL:
case GST_ACTIVATE_PULL_RANGE:
result = TRUE; result = TRUE;
break; break;
case GST_ACTIVATE_NONE: case GST_ACTIVATE_NONE:

1
gst/base/gstbasesrc.h
View file

@ -60,7 +60,6 @@ struct _GstBaseSrc {
gboolean has_getrange; gboolean has_getrange;
gboolean seekable; gboolean seekable;
gboolean random_access;
guint64 offset; guint64 offset;
guint64 size; guint64 size;
}; };

2
gst/base/gstbasetransform.c
View file

@ -334,7 +334,6 @@ gst_base_transform_sink_activate (GstPad * pad, GstActivateMode mode)
switch (mode) { switch (mode) {
case GST_ACTIVATE_PUSH: case GST_ACTIVATE_PUSH:
case GST_ACTIVATE_PULL: case GST_ACTIVATE_PULL:
case GST_ACTIVATE_PULL_RANGE:
if (bclass->start) if (bclass->start)
result = bclass->start (trans); result = bclass->start (trans);
break; break;
@ -358,7 +357,6 @@ gst_base_transform_src_activate (GstPad * pad, GstActivateMode mode)
result = TRUE; result = TRUE;
break; break;
case GST_ACTIVATE_PULL: case GST_ACTIVATE_PULL:
case GST_ACTIVATE_PULL_RANGE:
result = gst_pad_set_active (trans->sinkpad, mode); result = gst_pad_set_active (trans->sinkpad, mode);
result = gst_pad_peer_set_active (trans->sinkpad, mode); result = gst_pad_peer_set_active (trans->sinkpad, mode);
break; break;

1
libs/gst/base/gstbasesink.c
View file

@ -752,7 +752,6 @@ gst_basesink_activate (GstPad * pad, GstActivateMode mode)
result = TRUE; result = TRUE;
break; break;
case GST_ACTIVATE_PULL: case GST_ACTIVATE_PULL:
case GST_ACTIVATE_PULL_RANGE:
/* if we have a scheduler we can start the task */ /* if we have a scheduler we can start the task */
g_return_val_if_fail (basesink->has_loop, FALSE); g_return_val_if_fail (basesink->has_loop, FALSE);
gst_pad_peer_set_active (pad, mode); gst_pad_peer_set_active (pad, mode);

9
libs/gst/base/gstbasesrc.c
View file

@ -103,8 +103,7 @@ static GstElementStateReturn gst_basesrc_change_state (GstElement * element);
static void gst_basesrc_set_dataflow_funcs (GstBaseSrc * this); static void gst_basesrc_set_dataflow_funcs (GstBaseSrc * this);
static void gst_basesrc_loop (GstPad * pad); static void gst_basesrc_loop (GstPad * pad);
static gboolean gst_basesrc_check_get_range (GstPad * pad, static gboolean gst_basesrc_check_get_range (GstPad * pad);
gboolean * random_access);
static GstFlowReturn gst_basesrc_get_range (GstPad * pad, guint64 offset, static GstFlowReturn gst_basesrc_get_range (GstPad * pad, guint64 offset,
guint length, GstBuffer ** buf); guint length, GstBuffer ** buf);
@ -169,7 +168,6 @@ gst_basesrc_init (GstBaseSrc * basesrc, gpointer g_class)
basesrc->srcpad = pad; basesrc->srcpad = pad;
gst_element_add_pad (GST_ELEMENT (basesrc), pad); gst_element_add_pad (GST_ELEMENT (basesrc), pad);
basesrc->random_access = TRUE;
basesrc->segment_start = -1; basesrc->segment_start = -1;
basesrc->segment_end = -1; basesrc->segment_end = -1;
basesrc->blocksize = DEFAULT_BLOCKSIZE; basesrc->blocksize = DEFAULT_BLOCKSIZE;
@ -539,7 +537,7 @@ gst_basesrc_get_range (GstPad * pad, guint64 offset, guint length,
} }
static gboolean static gboolean
gst_basesrc_check_get_range (GstPad * pad, gboolean * random_access) gst_basesrc_check_get_range (GstPad * pad)
{ {
GstBaseSrc *src; GstBaseSrc *src;
@ -550,7 +548,6 @@ gst_basesrc_check_get_range (GstPad * pad, gboolean * random_access)
gst_basesrc_stop (src); gst_basesrc_stop (src);
} }
*random_access = src->random_access;
return src->seekable; return src->seekable;
} }
@ -720,7 +717,6 @@ gst_basesrc_activate (GstPad * pad, GstActivateMode mode)
switch (mode) { switch (mode) {
case GST_ACTIVATE_PUSH: case GST_ACTIVATE_PUSH:
case GST_ACTIVATE_PULL: case GST_ACTIVATE_PULL:
case GST_ACTIVATE_PULL_RANGE:
result = gst_basesrc_start (basesrc); result = gst_basesrc_start (basesrc);
break; break;
default: default:
@ -747,7 +743,6 @@ gst_basesrc_activate (GstPad * pad, GstActivateMode mode)
} }
break; break;
case GST_ACTIVATE_PULL: case GST_ACTIVATE_PULL:
case GST_ACTIVATE_PULL_RANGE:
result = TRUE; result = TRUE;
break; break;
case GST_ACTIVATE_NONE: case GST_ACTIVATE_NONE:

1
libs/gst/base/gstbasesrc.h
View file

@ -60,7 +60,6 @@ struct _GstBaseSrc {
gboolean has_getrange; gboolean has_getrange;
gboolean seekable; gboolean seekable;
gboolean random_access;
guint64 offset; guint64 offset;
guint64 size; guint64 size;
}; };

2
libs/gst/base/gstbasetransform.c
View file

@ -334,7 +334,6 @@ gst_base_transform_sink_activate (GstPad * pad, GstActivateMode mode)
switch (mode) { switch (mode) {
case GST_ACTIVATE_PUSH: case GST_ACTIVATE_PUSH:
case GST_ACTIVATE_PULL: case GST_ACTIVATE_PULL:
case GST_ACTIVATE_PULL_RANGE:
if (bclass->start) if (bclass->start)
result = bclass->start (trans); result = bclass->start (trans);
break; break;
@ -358,7 +357,6 @@ gst_base_transform_src_activate (GstPad * pad, GstActivateMode mode)
result = TRUE; result = TRUE;
break; break;
case GST_ACTIVATE_PULL: case GST_ACTIVATE_PULL:
case GST_ACTIVATE_PULL_RANGE:
result = gst_pad_set_active (trans->sinkpad, mode); result = gst_pad_set_active (trans->sinkpad, mode);
result = gst_pad_peer_set_active (trans->sinkpad, mode); result = gst_pad_peer_set_active (trans->sinkpad, mode);
break; break;