[xiph-cvs] cvs commit: vorbis-tools/ogg123 buffer.c ogg123.c

[Kenneth C. Arnold]

kcarnold    01/08/31 11:19:59

  Modified:    ogg123   Tag: kcarnold_work buffer.c ogg123.c
  Log:
  Status and potentially listener's ears (channel data would get offset)
  fixed when skipping file and generally any other EOS, flush condition.

Revision  Changes    Path
No                   revision

No                   revision

1.7.2.23  +4 -1      vorbis-tools/ogg123/buffer.c

Index: buffer.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/buffer.c,v
retrieving revision 1.7.2.22
retrieving revision 1.7.2.23
diff -u -r1.7.2.22 -r1.7.2.23
--- buffer.c	2001/08/31 18:01:12	1.7.2.22
+++ buffer.c	2001/08/31 18:19:57	1.7.2.23
@@ -11,7 +11,7 @@
  *                                                                  *
  ********************************************************************
 
- last mod: $Id: buffer.c,v 1.7.2.22 2001/08/31 18:01:12 kcarnold Exp $
+ last mod: $Id: buffer.c,v 1.7.2.23 2001/08/31 18:19:57 kcarnold Exp $
 
  ********************************************************************/
 
@@ -165,6 +165,9 @@
           Prebuffer (buf);
           SignalAll(buf);
           buf->FlushPending = 0;
+	  if (buf->eos)
+	    buf->write_func (buf->writer, 0, 0, buf->data, buf->eos);
+	  buf->eos = 0;
           LOCK_MUTEX (buf->SizeMutex);
         }
 

1.39.2.28 +4 -2      vorbis-tools/ogg123/ogg123.c

Index: ogg123.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/ogg123.c,v
retrieving revision 1.39.2.27
retrieving revision 1.39.2.28
diff -u -r1.39.2.27 -r1.39.2.28
--- ogg123.c	2001/08/31 18:01:12	1.39.2.27
+++ ogg123.c	2001/08/31 18:19:57	1.39.2.28
@@ -14,7 +14,7 @@
  *                                                                  *
  ********************************************************************
 
- last mod: $Id: ogg123.c,v 1.39.2.27 2001/08/31 18:01:12 kcarnold Exp $
+ last mod: $Id: ogg123.c,v 1.39.2.28 2001/08/31 18:19:57 kcarnold Exp $
 
  ********************************************************************/
 
@@ -774,8 +774,10 @@
           skipfile_requested = 0;
           signal(SIGALRM,signal_activate_skipfile);
           alarm(Options.playOpts.delay);
-	  if (Options.outputOpts.buffer)
+	  if (Options.outputOpts.buffer) {
+	    buffer_MarkEOS (Options.outputOpts.buffer);
             buffer_flush (Options.outputOpts.buffer);
+	  }
           break;
         }
 

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.