Ignore info where session is 0. At least for now.
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
$Id: _cdio_osx.c,v 1.39 2004/06/17 03:24:39 rocky Exp $
|
$Id: _cdio_osx.c,v 1.40 2004/06/17 10:41:05 rocky Exp $
|
||||||
|
|
||||||
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
|
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
|
||||||
from vcdimager code:
|
from vcdimager code:
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.39 2004/06/17 03:24:39 rocky Exp $";
|
static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.40 2004/06/17 10:41:05 rocky Exp $";
|
||||||
|
|
||||||
#include <cdio/sector.h>
|
#include <cdio/sector.h>
|
||||||
#include <cdio/util.h>
|
#include <cdio/util.h>
|
||||||
@@ -381,7 +381,6 @@ _cdio_read_toc (_img_private_t *env)
|
|||||||
|
|
||||||
CDTOCDescriptor *pTrackDescriptors;
|
CDTOCDescriptor *pTrackDescriptors;
|
||||||
track_t i_track;
|
track_t i_track;
|
||||||
int i_session = -1;
|
|
||||||
|
|
||||||
env->pp_lba = malloc( TOTAL_TRACKS * sizeof(int) );
|
env->pp_lba = malloc( TOTAL_TRACKS * sizeof(int) );
|
||||||
if( env->pp_lba == NULL )
|
if( env->pp_lba == NULL )
|
||||||
@@ -400,9 +399,8 @@ _cdio_read_toc (_img_private_t *env)
|
|||||||
{
|
{
|
||||||
i_track = pTrackDescriptors[i].point;
|
i_track = pTrackDescriptors[i].point;
|
||||||
|
|
||||||
if ( -1 == i_session )
|
/* Skip information where session is 0. */
|
||||||
i_session = pTrackDescriptors[i].session;
|
if ( 0 == pTrackDescriptors[i].session )
|
||||||
else if (pTrackDescriptors[i].session != i_session)
|
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if( i_track == OSX_CDROM_LEADOUT_TRACK )
|
if( i_track == OSX_CDROM_LEADOUT_TRACK )
|
||||||
@@ -412,6 +410,7 @@ _cdio_read_toc (_img_private_t *env)
|
|||||||
if( i_track > CDIO_CD_MAX_TRACKS || i_track < CDIO_CD_MIN_TRACK_NO )
|
if( i_track > CDIO_CD_MAX_TRACKS || i_track < CDIO_CD_MIN_TRACK_NO )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
|
||||||
if (env->i_first_track > i_track)
|
if (env->i_first_track > i_track)
|
||||||
env->i_first_track = i_track;
|
env->i_first_track = i_track;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user