changeset 1404:ab7d89bb8fcb

Switched to new threading model
author Christian Birchinger <joker@netswarm.net>
date Sat, 04 Aug 2007 21:37:11 +0200
parents d7a0b7f3b8c0
children 48e73f07ec9b
files src/vtx/vtx.c
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/vtx/vtx.c	Sat Aug 04 18:51:04 2007 +0200
+++ b/src/vtx/vtx.c	Sat Aug 04 21:37:11 2007 +0200
@@ -169,6 +169,9 @@
 	{
 	  playback->output->buffer_free ();
 	  playback->output->buffer_free ();
+	  while (playback->output->buffer_playing())
+	    g_usleep(10000);
+	  playback->playing = 0;
 	}
     
       /* jump to time in seek_to (in seconds) */
@@ -179,10 +182,7 @@
 	  seek_to = -1;
 	}
     }
-
-  /* close sound and release vtx file must be done in vtx_stop() */
-  g_thread_exit (NULL);
-
+  ayemu_vtx_free (&vtx);
   return NULL;
 }
 
@@ -229,7 +229,8 @@
       bmp_title_input_free(ti);
 
       playback->playing = TRUE;
-      play_thread = g_thread_create (play_loop, playback, TRUE, NULL);
+      play_thread = g_thread_self();
+      play_loop(playback);
     }
 }