mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

Harmonize state of sinks with the pipeline state.

Browse source 
Original commit message from CVS:
Harmonize state of sinks with the pipeline state.
This commit is contained in:
Julien Moutte 2003-12-16 22:52:01 +00:00
parent 93b49599cb
commit 8e91b64fff
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst-libs/gst/play/gstplay.c
View file

@ -554,8 +554,6 @@ gst_play_seek_to_time (GstPlay * play, gint64 time_nanos)
g_return_val_if_fail (play != NULL, FALSE); g_return_val_if_fail (play != NULL, FALSE);
g_return_val_if_fail (GST_IS_PLAY (play), FALSE); g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
g_message ("trying to seek");
if (time_nanos < 0LL) if (time_nanos < 0LL)
time_nanos = 0LL; time_nanos = 0LL;
@ -567,7 +565,7 @@ gst_play_seek_to_time (GstPlay * play, gint64 time_nanos)
if (GST_IS_ELEMENT (audio_sink_element) && if (GST_IS_ELEMENT (audio_sink_element) &&
GST_IS_ELEMENT (video_sink_element)) { GST_IS_ELEMENT (video_sink_element)) {
gboolean s = FALSE; gboolean s = FALSE;
s = gst_element_seek (audio_sink_element, GST_FORMAT_TIME | s = gst_element_seek (audio_sink_element, GST_FORMAT_TIME |
GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH, GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH,
time_nanos); time_nanos);
@ -580,12 +578,9 @@ gst_play_seek_to_time (GstPlay * play, gint64 time_nanos)
if (s) { if (s) {
GstClock *clock = gst_bin_get_clock (GST_BIN (play)); GstClock *clock = gst_bin_get_clock (GST_BIN (play));
play->priv->time_nanos = gst_clock_get_time (clock); play->priv->time_nanos = gst_clock_get_time (clock);
g_message ("seek succeeded");
g_signal_emit (G_OBJECT (play), gst_play_signals[TIME_TICK], g_signal_emit (G_OBJECT (play), gst_play_signals[TIME_TICK],
0,play->priv->time_nanos); 0,play->priv->time_nanos);
} }
else
g_message ("seek failed");
} }
return TRUE; return TRUE;
@ -686,6 +681,8 @@ gst_play_set_video_sink (GstPlay *play, GstElement *video_sink)
G_CALLBACK (gst_play_have_video_size), play); G_CALLBACK (gst_play_have_video_size), play);
} }
gst_element_set_state (video_sink, GST_STATE (GST_ELEMENT(play)));
return TRUE; return TRUE;
} }
@ -748,6 +745,8 @@ gst_play_set_audio_sink (GstPlay *play, GstElement *audio_sink)
audio_sink_element); audio_sink_element);
} }
gst_element_set_state (audio_sink, GST_STATE (GST_ELEMENT(play)));
return TRUE; return TRUE;
} }

11
gst-libs/gst/play/play.c
View file

@ -554,8 +554,6 @@ gst_play_seek_to_time (GstPlay * play, gint64 time_nanos)
g_return_val_if_fail (play != NULL, FALSE); g_return_val_if_fail (play != NULL, FALSE);
g_return_val_if_fail (GST_IS_PLAY (play), FALSE); g_return_val_if_fail (GST_IS_PLAY (play), FALSE);
g_message ("trying to seek");
if (time_nanos < 0LL) if (time_nanos < 0LL)
time_nanos = 0LL; time_nanos = 0LL;
@ -567,7 +565,7 @@ gst_play_seek_to_time (GstPlay * play, gint64 time_nanos)
if (GST_IS_ELEMENT (audio_sink_element) && if (GST_IS_ELEMENT (audio_sink_element) &&
GST_IS_ELEMENT (video_sink_element)) { GST_IS_ELEMENT (video_sink_element)) {
gboolean s = FALSE; gboolean s = FALSE;
s = gst_element_seek (audio_sink_element, GST_FORMAT_TIME | s = gst_element_seek (audio_sink_element, GST_FORMAT_TIME |
GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH, GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH,
time_nanos); time_nanos);
@ -580,12 +578,9 @@ gst_play_seek_to_time (GstPlay * play, gint64 time_nanos)
if (s) { if (s) {
GstClock *clock = gst_bin_get_clock (GST_BIN (play)); GstClock *clock = gst_bin_get_clock (GST_BIN (play));
play->priv->time_nanos = gst_clock_get_time (clock); play->priv->time_nanos = gst_clock_get_time (clock);
g_message ("seek succeeded");
g_signal_emit (G_OBJECT (play), gst_play_signals[TIME_TICK], g_signal_emit (G_OBJECT (play), gst_play_signals[TIME_TICK],
0,play->priv->time_nanos); 0,play->priv->time_nanos);
} }
else
g_message ("seek failed");
} }
return TRUE; return TRUE;
@ -686,6 +681,8 @@ gst_play_set_video_sink (GstPlay *play, GstElement *video_sink)
G_CALLBACK (gst_play_have_video_size), play); G_CALLBACK (gst_play_have_video_size), play);
} }
gst_element_set_state (video_sink, GST_STATE (GST_ELEMENT(play)));
return TRUE; return TRUE;
} }
@ -748,6 +745,8 @@ gst_play_set_audio_sink (GstPlay *play, GstElement *audio_sink)
audio_sink_element); audio_sink_element);
} }
gst_element_set_state (audio_sink, GST_STATE (GST_ELEMENT(play)));
return TRUE; return TRUE;
} }