summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2003-02-22 14:18:16 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2003-02-22 14:18:16 +0000
commit5a58fb494ddef8baa61e77a1eaf60fa496f40c85 (patch)
tree0e89a416e6b3c9ad942c0d4070d588bf596d33d3
parent10169b6040ebabb2919b335ef4058d3394f9288a (diff)
downloadxine-lib-5a58fb494ddef8baa61e77a1eaf60fa496f40c85.tar.gz
xine-lib-5a58fb494ddef8baa61e77a1eaf60fa496f40c85.tar.bz2
update extra info (for slider movement) in stills with audio
CVS patchset: 4248 CVS date: 2003/02/22 14:18:16
-rw-r--r--src/xine-engine/audio_out.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index 27795ad61..ed25f69c7 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -17,7 +17,7 @@
* along with self program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: audio_out.c,v 1.107 2003/02/21 02:05:12 guenter Exp $
+ * $Id: audio_out.c,v 1.108 2003/02/22 14:18:16 mroi Exp $
*
* 22-8-2001 James imported some useful AC3 sections from the previous alsa driver.
* (c) 2001 Andy Lo A Foe <andy@alsaplayer.org>
@@ -776,7 +776,10 @@ static void *ao_loop (void *this_gen) {
pthread_mutex_unlock( &this->driver_lock );
- if( in_buf && in_buf->stream && !in_buf->stream->video_decoder_plugin ) {
+ /* we update current_extra_info if either there is no video stream that could do that
+ * or if the current_extra_info is getting too much out of date */
+ if( in_buf && in_buf->stream && (!in_buf->stream->video_decoder_plugin ||
+ in_buf->extra_info->vpts - in_buf->stream->current_extra_info->vpts > 30000)) {
pthread_mutex_lock( &in_buf->stream->current_extra_info_lock );
extra_info_merge( in_buf->stream->current_extra_info, in_buf->extra_info );
pthread_mutex_unlock( &in_buf->stream->current_extra_info_lock );