[MPlayer-cvslog] Proposed rollback of r26345

[Reimar Döffinger]

On Sat, Feb 21, 2009 at 01:14:44PM +0100, Milan Jurik wrote:
> finally I had time to investigate why there is broken seek in MPlayer
> svn on Solaris Express/OpenSolaris with Sunaudio for many months. After
> seek in file (with keyboard or in GUI) MPlayer is not able to continue
> in playing, playing hangs.

Sorry, I already had a patch lying around I just forgot about it.
Could you test it?
-------------- next part --------------
Index: libao2/ao_sun.c
===================================================================
--- libao2/ao_sun.c	(revision 28590)
+++ libao2/ao_sun.c	(working copy)
@@ -584,15 +584,8 @@
     ao_data.bps = byte_per_sec = bytes_per_sample * ao_data.samplerate;
     ao_data.outburst = byte_per_sec > 100000 ? 16384 : 8192;
 
-    AUDIO_INITINFO(&info);
-    info.play.samples = 0;
-    info.play.eof = 0;
-    info.play.error = 0;
-    ioctl (audio_fd, AUDIO_SETINFO, &info);
+    reset();
 
-    queued_bursts = 0;
-    queued_samples = 0;
-
     return 1;
 }
 
@@ -609,6 +602,13 @@
 // stop playing and empty buffers (for seeking/pause)
 static void reset(void){
     flush_audio(audio_fd);
+
+    AUDIO_INITINFO(&info);
+    info.play.samples = 0;
+    info.play.eof = 0;
+    info.play.error = 0;
+    ioctl(audio_fd, AUDIO_SETINFO, &info);
+
     queued_bursts = 0;
     queued_samples = 0;
 }