claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Was passing in the wrong pointer (p_cdio instead of p_env)

Browse Source
This commit is contained in:
rocky
2004-08-05 02:58:46 +00:00
parent 62d49b41f5
commit f9fe21cb6a
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/MSWindows/aspi32.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: aspi32.c,v 1.46 2004/07/29 04:14:44 rocky Exp $ $Id: aspi32.c,v 1.47 2004/08/05 02:58:46 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: aspi32.c,v 1.46 2004/07/29 04:14:44 rocky Exp $"; static const char _rcsid[] = "$Id: aspi32.c,v 1.47 2004/08/05 02:58:46 rocky Exp $";
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -771,7 +771,7 @@ wnaspi32_eject_media (void *user_data) {
bool bool
init_cdtext_aspi (_img_private_t *p_env) init_cdtext_aspi (_img_private_t *p_env)
{ {
return scsi_mmc_init_cdtext_private( p_env->gen.cdio, return scsi_mmc_init_cdtext_private( p_env,
&run_scsi_cmd_aspi, &run_scsi_cmd_aspi,
set_cdtext_field_win32 set_cdtext_field_win32
); );

6
lib/MSWindows/win32_ioctl.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: win32_ioctl.c,v 1.33 2004/07/29 04:14:44 rocky Exp $ $Id: win32_ioctl.c,v 1.34 2004/08/05 02:58:46 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -26,7 +26,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.33 2004/07/29 04:14:44 rocky Exp $"; static const char _rcsid[] = "$Id: win32_ioctl.c,v 1.34 2004/08/05 02:58:46 rocky Exp $";
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -513,7 +513,7 @@ read_toc_win32ioctl (_img_private_t *env)
bool bool
init_cdtext_win32ioctl (_img_private_t *p_env) init_cdtext_win32ioctl (_img_private_t *p_env)
{ {
return scsi_mmc_init_cdtext_private( p_env->gen.cdio, return scsi_mmc_init_cdtext_private( p_env,
&run_scsi_cmd_win32ioctl, &run_scsi_cmd_win32ioctl,
set_cdtext_field_win32 set_cdtext_field_win32
); );

3
lib/scsi_mmc.c
View File

@@ -1,6 +1,6 @@
/* Common SCSI Multimedia Command (MMC) routines. /* Common SCSI Multimedia Command (MMC) routines.
$Id: scsi_mmc.c,v 1.19 2004/08/01 11:28:00 rocky Exp $ $Id: scsi_mmc.c,v 1.20 2004/08/05 02:58:46 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -510,6 +510,7 @@ scsi_mmc_init_cdtext_private ( void *p_user_data,
/* Operation code */ /* Operation code */
CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_READ_TOC); CDIO_MMC_SET_COMMAND(cdb.field, CDIO_MMC_GPCMD_READ_TOC);
cdb.field[1] = CDIO_CDROM_MSF;
/* Format */ /* Format */
cdb.field[2] = CDIO_MMC_READTOC_FMT_CDTEXT; cdb.field[2] = CDIO_MMC_READTOC_FMT_CDTEXT;