From f45651f26bc3aa1b312d282c5d8c4b04be0c2505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?=
 <valtri@users.sourceforge.net>
Date: Thu, 25 Aug 2005 15:36:29 +0000
Subject: *BUGFIX* Windows ports fixes and improvements due to my current work
 on toxine: - first experiments with external win32 pthreads,   more portable
 code (pthread_t may be a struct) - headers refactored - moved dirent win32
 replacement to lib/, hide it for frontends,   used system version, if found,
 not used non-POSIX dirent->d_reclen   (this item doesn't work in MinGW), fix
 memleak in dvb - separated settings for postproc and avcodec when using
 external ffmpeg - check for malloc.h in public xine.m4, used it conditionally
 in xine headers - replaced random() by POSIX more common rand() - prevent one
 segfault in directx vo plugin, if fails - M$VC port update

CVS patchset: 7709
CVS date: 2005/08/25 15:36:29
---
 src/xine-engine/audio_decoder.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/xine-engine/audio_decoder.c')

diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index dd4a1fb3f..f3b09b50b 100644
--- a/src/xine-engine/audio_decoder.c
+++ b/src/xine-engine/audio_decoder.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2004 the xine project
+ * Copyright (C) 2000-2005 the xine project
  * 
  * This file is part of xine, a free video player.
  * 
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_decoder.c,v 1.134 2005/04/19 17:42:29 hadess Exp $
+ * $Id: audio_decoder.c,v 1.135 2005/08/25 15:36:30 valtri Exp $
  *
  *
  * functions that implement audio decoding
@@ -148,7 +148,7 @@ static void *audio_decoder_loop (void *stream_gen) {
 
       pthread_cond_broadcast (&stream->counter_changed);
 
-      if (stream->video_thread) {
+      if (stream->video_thread_created) {
         while (stream->finished_count_video < stream->finished_count_audio) {
           struct timeval tv;
           struct timespec ts;
@@ -490,7 +490,8 @@ void _x_audio_decoder_init (xine_stream_t *stream) {
     pth_params.sched_priority = sched_get_priority_min(SCHED_OTHER);
     pthread_attr_setschedparam(&pth_attrs, &pth_params);
     pthread_attr_setscope(&pth_attrs, PTHREAD_SCOPE_SYSTEM);
-  
+ 
+    stream->audio_thread_created = 1; 
     if ((err = pthread_create (&stream->audio_thread,
                                &pth_attrs, audio_decoder_loop, stream)) != 0) {
       xprintf (stream->xine, XINE_VERBOSITY_DEBUG, 
@@ -507,14 +508,15 @@ void _x_audio_decoder_shutdown (xine_stream_t *stream) {
   buf_element_t *buf;
   void          *p;
 
-  if (stream->audio_thread) {
+  if (stream->audio_thread_created) {
     /* stream->audio_fifo->clear(stream->audio_fifo); */
 
     buf = stream->audio_fifo->buffer_pool_alloc (stream->audio_fifo);
     buf->type = BUF_CONTROL_QUIT;
     stream->audio_fifo->put (stream->audio_fifo, buf);
     
-    pthread_join (stream->audio_thread, &p); 
+    pthread_join (stream->audio_thread, &p);
+    stream->audio_thread_created = 0;
   }
     
   stream->audio_fifo->dispose (stream->audio_fifo);
-- 
cgit v1.2.3