mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 19:51:11 +00:00
libs/gst/base/gstbasesink.c: We only query position using the clock in the playing state.
Original commit message from CVS: 2006-01-25 Julien MOUTTE <julien@moutte.net> * libs/gst/base/gstbasesink.c: (gst_base_sink_get_position): We only query position using the clock in the playing state. Query peer in the other cases. * win32/common/config.h: Updates.
This commit is contained in:
parent
213c508b5c
commit
8791aa4fbc
3 changed files with 16 additions and 1 deletions
|
@ -1,3 +1,10 @@
|
|||
2006-01-25 Julien MOUTTE <julien@moutte.net>
|
||||
|
||||
* libs/gst/base/gstbasesink.c: (gst_base_sink_get_position):
|
||||
We only query position using the clock in the playing state.
|
||||
Query peer in the other cases.
|
||||
* win32/common/config.h: Updates.
|
||||
|
||||
2006-01-24 Wim Taymans <wim@fluendo.com>
|
||||
|
||||
* gst/gstsystemclock.c: (gst_system_clock_id_wait_unlocked):
|
||||
|
|
|
@ -1421,6 +1421,13 @@ gst_base_sink_get_position (GstBaseSink * basesink, GstFormat format,
|
|||
{
|
||||
/* we can answer time format */
|
||||
GST_OBJECT_LOCK (basesink);
|
||||
|
||||
/* We get position from clock only in PLAYING */
|
||||
if (GST_STATE (basesink) != GST_STATE_PLAYING) {
|
||||
GST_OBJECT_UNLOCK (basesink);
|
||||
goto beach;
|
||||
}
|
||||
|
||||
if ((clock = GST_ELEMENT_CLOCK (basesink))) {
|
||||
GstClockTime now, base;
|
||||
gint64 time;
|
||||
|
@ -1459,6 +1466,7 @@ gst_base_sink_get_position (GstBaseSink * basesink, GstFormat format,
|
|||
default:
|
||||
break;
|
||||
}
|
||||
beach:
|
||||
return res;
|
||||
}
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
#define GST_MAJORMINOR "0.10"
|
||||
|
||||
/* Define host CPU */
|
||||
#define HOST_CPU "x86_64"
|
||||
#define HOST_CPU "i686"
|
||||
|
||||
/* Define if the host CPU is an Alpha */
|
||||
#undef HAVE_CPU_ALPHA
|
||||
|
|
Loading…
Reference in a new issue