Add common routine for setting track flags.

This commit is contained in:
rocky
2005-01-01 15:08:48 +00:00
parent 4b4108ed27
commit 6c20c2ee86
7 changed files with 37 additions and 55 deletions

View File

@@ -1,5 +1,5 @@
/*
$Id: aspi32.c,v 1.2 2005/01/01 04:17:41 rocky Exp $
$Id: aspi32.c,v 1.3 2005/01/01 15:08:48 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h"
#endif
static const char _rcsid[] = "$Id: aspi32.c,v 1.2 2005/01/01 04:17:41 rocky Exp $";
static const char _rcsid[] = "$Id: aspi32.c,v 1.3 2005/01/01 15:08:48 rocky Exp $";
#include <cdio/cdio.h>
#include <cdio/sector.h>
@@ -712,16 +712,7 @@ read_toc_aspi (_img_private_t *p_env)
(int)p_fulltoc[ i_index+3 ];
p_env->tocent[i].Control = (UCHAR)p_fulltoc[ 1 + 8 * i ];
p_env->gen.track_flags[j].preemphasis =
p_env->tocent[i].Control & 0x1
? CDIO_TRACK_FLAG_TRUE : CDIO_TRACK_FLAG_FALSE;
p_env->gen.track_flags[j].copy_permit =
p_env->tocent[i].Control & 0x2
? CDIO_TRACK_FLAG_TRUE : CDIO_TRACK_FLAG_FALSE;
p_env->gen.track_flags[j].channels =
p_env->tocent[i].Control & 0x8 ? 4 : 2;
set_track_flags(&(p_env->gen.track_flags[j]), p_env->tocent[i].Control);
cdio_debug( "p_sectors: %i %lu",
i, (unsigned long int) p_env->tocent[i].start_lsn );

View File

@@ -1,5 +1,5 @@
/*
$Id: win32_ioctl.c,v 1.2 2005/01/01 04:17:41 rocky Exp $
$Id: win32_ioctl.c,v 1.3 2005/01/01 15:08:48 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -26,7 +26,7 @@
# include "config.h"
#endif
static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.2 2005/01/01 04:17:41 rocky Exp $";
static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.3 2005/01/01 15:08:48 rocky Exp $";
#ifdef HAVE_WIN32_CDROM
@@ -619,16 +619,8 @@ read_fulltoc_win32mmc (_img_private_t *p_env)
cdrom_toc_full.TrackData[i].Control;
p_env->tocent[j-1].Format = i_track_format;
p_env->gen.track_flags[j].preemphasis =
cdrom_toc_full.TrackData[i].Control & 0x1
? CDIO_TRACK_FLAG_TRUE : CDIO_TRACK_FLAG_FALSE;
p_env->gen.track_flags[j].copy_permit =
cdrom_toc_full.TrackData[i].Control & 0x2
? CDIO_TRACK_FLAG_TRUE : CDIO_TRACK_FLAG_FALSE;
p_env->gen.track_flags[j].channels =
cdrom_toc_full.TrackData[i].Control & 0x8 ? 4 : 2;
set_track_flags(&(p_env->gen.track_flags[j]),
p_env->tocent[j-1].Control);
cdio_debug("p_sectors: %i, %lu", i,
(unsigned long int) (p_env->tocent[i].start_lsn));