race condition / stability fixes provided by Miguel Freitas <miguel@cetuc.puc-rio.br> - great stuff\! :-)

CVS patchset: 562
CVS date: 2001/09/04 16:19:27

1 files changed, 9 insertions, 5 deletions

diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c
index bfe3d5393..098ee1553 100644
--- a/src/xine-engine/metronom.c
+++ b/src/xine-engine/metronom.c
@@ -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: metronom.c,v 1.23 2001/08/28 22:52:57 f1rmb Exp $
+ * $Id: metronom.c,v 1.24 2001/09/04 16:19:27 guenter Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -248,7 +248,8 @@ static void metronom_video_stream_start (metronom_t *this) {
   this->video_stream_starting     = 1;
 
   if (this->have_audio) {
-    while (!this->audio_stream_running) {
+    /*while (!this->audio_stream_running) {*/
+    if (!this->audio_stream_running) {
       printf ("metronom: waiting for audio to start...\n");
       pthread_cond_wait (&this->audio_started, &this->lock);
     }
@@ -278,7 +279,8 @@ static void metronom_video_stream_end (metronom_t *this) {
   this->video_stream_running = 0;
 
   if (this->have_audio) {
-    while (this->audio_stream_running) {
+    /* while (this->audio_stream_running) { */
+    if (this->audio_stream_running) {
       printf ("metronom: waiting for audio to end...\n");
       pthread_cond_wait (&this->audio_ended, &this->lock);
     }
@@ -314,7 +316,8 @@ static void metronom_audio_stream_start (metronom_t *this) {
   this->audio_stream_running      = 1;
   this->audio_stream_starting     = 1;
 
-  while (!this->video_stream_running) {
+  /*while (!this->video_stream_running) { */
+  if (!this->video_stream_running) {
     printf ("metronom: waiting for video to start...\n");
     pthread_cond_wait (&this->video_started, &this->lock);
   }
@@ -341,7 +344,8 @@ static void metronom_audio_stream_end (metronom_t *this) {
 
   this->audio_stream_running = 0;
 
-  while (this->video_stream_running) {
+  /* while (this->video_stream_running) { */
+  if (this->video_stream_running) {
     printf ("waiting for video to end...\n");
     pthread_cond_wait (&this->video_ended, &this->lock);
   }