the long-awaited video_out changes, not completely debuged (races)

- pts are 64 bit now
- scr and video_out-loop run all the time
- video_out cleanups
- metronom cleanups
- buffer type BUF_CONTROL_DISCONTINUITY is used internally now,
  input plugins should no longer send this one
- support for individual frame durations
- using nano-/usleep instead of itimer (simpler code, maybe this will
  help freebsd)

CVS patchset: 1487
CVS date: 2002/02/09 07:13:22

1 files changed, 2 insertions, 15 deletions

diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index fa6a3582b..169919f2b 100644
--- a/src/xine-engine/audio_decoder.c
+++ b/src/xine-engine/audio_decoder.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: audio_decoder.c,v 1.57 2001/12/11 15:30:06 miguelfreitas Exp $
+ * $Id: audio_decoder.c,v 1.58 2002/02/09 07:13:24 guenter Exp $
  *
  *
  * functions that implement audio decoding
@@ -81,14 +81,12 @@ void *audio_decoder_loop (void *this_gen) {
       this->audio_finished = 0;
       pthread_mutex_unlock (&this->finished_lock);
 
-      this->metronom->audio_stream_start (this->metronom);
+      this->metronom->expect_audio_discontinuity (this->metronom);
       
       break;
       
     case BUF_CONTROL_END:
 
-      this->metronom->audio_stream_end (this->metronom);
-      
       if (this->cur_audio_decoder_plugin) {
 	this->cur_audio_decoder_plugin->close (this->cur_audio_decoder_plugin);
 	this->cur_audio_decoder_plugin = NULL;
@@ -124,23 +122,12 @@ void *audio_decoder_loop (void *this_gen) {
       running = 0;
       break;
 
-    case BUF_VIDEO_FILL:
-      break;
-
     case BUF_CONTROL_NOP:
       break;
 
     case BUF_CONTROL_DISCONTINUITY:
-      printf ("audio_decoder: BUF_CONTROL_DISCONTINUITY is deprecated\n");
-      break;
-
-    case BUF_CONTROL_AVSYNC_RESET:
       printf ("audio_decoder: discontinuity ahead\n");
 
-      if (this->cur_audio_decoder_plugin) {
-	this->cur_audio_decoder_plugin->reset (this->cur_audio_decoder_plugin);
-      }
-
       this->metronom->expect_audio_discontinuity (this->metronom);
       break;