4 files changed, 12 insertions, 34 deletions
diff --git a/ext/aalib/gstaasink.c b/ext/aalib/gstaasink.c
index 1f817fab..83d9687f 100644
--- a/ext/aalib/gstaasink.c
+++ b/ext/aalib/gstaasink.c
@@ -328,19 +328,17 @@ gst_aasink_chain (GstPad *pad, GstBuffer *buf)
   		    aa_imgwidth (aasink->context),	/* dw */
   		    aa_imgheight (aasink->context));	/* dh */
 
-  if (!GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLUSH)) {
-    GST_DEBUG (0,"videosink: clock wait: %llu\n", GST_BUFFER_TIMESTAMP(buf));
+  GST_DEBUG (0,"videosink: clock wait: %llu\n", GST_BUFFER_TIMESTAMP(buf));
 
-    jitter = gst_clock_current_diff(aasink->clock, GST_BUFFER_TIMESTAMP (buf));
+  jitter = gst_clock_current_diff(aasink->clock, GST_BUFFER_TIMESTAMP (buf));
 
-    if (jitter > 500000 || jitter < -500000)
-    {
-      GST_DEBUG (0, "jitter: %lld\n", jitter);
-      gst_clock_set (aasink->clock, GST_BUFFER_TIMESTAMP (buf));
-    }
-    else {
-      gst_clock_wait(aasink->clock, GST_BUFFER_TIMESTAMP(buf), GST_OBJECT(aasink));
-    }
+  if (jitter > 500000 || jitter < -500000)
+  {
+    GST_DEBUG (0, "jitter: %lld\n", jitter);
+    gst_clock_set (aasink->clock, GST_BUFFER_TIMESTAMP (buf));
+  }
+  else {
+    gst_clock_wait(aasink->clock, GST_BUFFER_TIMESTAMP(buf), GST_OBJECT(aasink));
   }
 
   aa_render (aasink->context, &aasink->ascii_parms, 
diff --git a/ext/mikmod/drv_gst.c b/ext/mikmod/drv_gst.c
index 1869c8c6..042c5085 100644
--- a/ext/mikmod/drv_gst.c
+++ b/ext/mikmod/drv_gst.c
@@ -46,7 +46,7 @@ GstBuffer *outdata;
 
   if ( need_sync == 1 )
   {
-    GST_BUFFER_FLAG_SET (outdata, GST_BUFFER_FLUSH);
+    /* FIXME, send a flush event or something */
     need_sync = 0 ;
   }
   gst_pad_push( srcpad, outdata );
diff --git a/ext/mikmod/gstmikmod.c b/ext/mikmod/gstmikmod.c
index adca578b..a2b5038d 100644
--- a/ext/mikmod/gstmikmod.c
+++ b/ext/mikmod/gstmikmod.c
@@ -411,8 +411,8 @@ gst_mikmod_loop (GstElement *element)
       gst_element_yield (element);
     }
     else {
-      gst_element_set_state (GST_ELEMENT (mikmod), GST_STATE_PAUSED);
-      gst_pad_push (mikmod->srcpad, gst_event_new (GST_EVENT_EOS));
+      gst_element_set_eos (GST_ELEMENT (mikmod));
+      gst_pad_push (mikmod->srcpad, GST_BUFFER (gst_event_new (GST_EVENT_EOS)));
     }
 
   } 
diff --git a/ext/mikmod/mikmod_reader.c b/ext/mikmod/mikmod_reader.c
index 97cf70c4..b850f502 100644
--- a/ext/mikmod/mikmod_reader.c
+++ b/ext/mikmod/mikmod_reader.c
@@ -28,21 +28,9 @@ GST_READER *gst_reader;
 
   gst_reader = ( GST_READER * ) reader;
        
-  /*tmp->mik->Buffer = gst_pad_pullregion( tmp->mik->sinkpad, GST_REGION_OFFSET_LEN, tmp->offset, size );*/
-
   memcpy( ptr, GST_BUFFER_DATA( gst_reader->mik->Buffer ) + gst_reader->offset, size);
   gst_reader->offset = gst_reader->offset + size;   
 
-/*  if ( GST_BUFFER_SIZE( tmp->mik->Buffer ) != size )
-    tmp->eof = 1;
-  else
-    tmp->eof = 0;
-        
-  if (GST_BUFFER_FLAG_IS_SET (tmp->mik->Buffer, GST_BUFFER_FLUSH))        
-  	need_sync = 1;
-        
-  gst_buffer_unref( tmp->mik->Buffer );*/
-
   return 1;
 }
 
@@ -54,17 +42,9 @@ int res;
 
   gst_reader = ( GST_READER * ) reader;
         
-  /*tmp->mik->Buffer = gst_pad_pullregion( tmp->mik->sinkpad, GST_REGION_OFFSET_LEN, tmp->offset, 1 );*/  
   res = *( GST_BUFFER_DATA( gst_reader->mik->Buffer ) + gst_reader->offset );
   gst_reader->offset += 1;
         
-/*  if ( GST_BUFFER_SIZE( tmp->mik->Buffer ) != 1 )
-    tmp->eof = 1;
-  else
-    tmp->eof = 0;
-    
-  gst_buffer_unref( tmp->mik->Buffer );*/
-
   return res;
 }