[xiph-cvs] cvs commit: paranoia-III/interface common_interface.c

[Monty]

xiphmont    02/11/28 02:07:42

  Modified:    interface common_interface.c
  Log:
  Add another logic check for the Hannu FixupTOC code we cargo culted oh
  so many years ago.

Revision  Changes    Path
1.11      +4 -3      paranoia-III/interface/common_interface.c

Index: common_interface.c
===================================================================
RCS file: /usr/local/cvsroot/paranoia-III/interface/common_interface.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- common_interface.c	19 Apr 2000 22:41:04 -0000	1.10
+++ common_interface.c	28 Nov 2002 07:07:42 -0000	1.11
@@ -1,6 +1,6 @@
 /******************************************************************
  * CopyPolicy: GNU Public License 2 applies
- * Copyright (C) 1998 Monty xiphmont at mit.edu
+ * Copyright (C) 1998, 2002 Monty monty at xiph.org
  *
  * CDROM communication common to all interface methods is done here 
  * (mostly ioctl stuff, but not ioctls specific to the 'cooked'
@@ -168,7 +168,7 @@
 /************************************************************************/
 /* Here we fix up a couple of things that will never happen.  yeah,
    right.  The multisession stuff is from Hannu's code; it assumes it
-   knows the leasoud/leadin size. */
+   knows the leadoud/leadin size. */
 
 int FixupTOC(cdrom_drive *d,int tracks){
   struct cdrom_multisession ms_str;
@@ -223,7 +223,8 @@
       /* adjust end of last audio track to be in the first session */
       for (j = tracks-1; j >= 0; j--) {
         if (j > 0 && !IS_AUDIO(d,j) && IS_AUDIO(d,j-1)) {
-	  if (d->disc_toc[j].dwStartSector > ms_str.addr.lba - 11400) 
+	  if ((d->disc_toc[j].dwStartSector > ms_str.addr.lba - 11400) &&
+	      (ms_str.addr.lba - 11400 > d->disc_toc[j-1].dwStartSector))
             d->disc_toc[j].dwStartSector = ms_str.addr.lba - 11400;
           break;
         }

<p><p>--- >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.