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

Compilation fixes for Win32 and cd-text breakage.

Browse Source
This commit is contained in:
rocky
2004-08-10 03:44:55 +00:00
parent f744916699
commit f989d329a7
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/MSWindows/win32.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: win32.c,v 1.41 2004/08/10 03:03:27 rocky Exp $ $Id: win32.c,v 1.42 2004/08/10 03:44:55 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -26,7 +26,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: win32.c,v 1.41 2004/08/10 03:03:27 rocky Exp $"; static const char _rcsid[] = "$Id: win32.c,v 1.42 2004/08/10 03:44:55 rocky Exp $";
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/sector.h> #include <cdio/sector.h>
@@ -498,7 +498,7 @@ _get_cdtext_win32 (void *user_data, track_t i_track)
return NULL; return NULL;
if (!p_env->gen.b_cdtext_init) if (!p_env->gen.b_cdtext_init)
init_cdtext_generic(p_env); init_cdtext_generic( &(p_env->gen) );
if (!p_env->gen.b_cdtext_init) return NULL; if (!p_env->gen.b_cdtext_init) return NULL;

5
lib/MSWindows/win32.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: win32.h,v 1.20 2004/08/10 03:03:27 rocky Exp $ $Id: win32.h,v 1.21 2004/08/10 03:44:56 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -43,6 +43,9 @@ typedef struct {
access_mode_t access_mode; access_mode_t access_mode;
/* Some of the more OS specific things. */ /* Some of the more OS specific things. */
/* Entry info for each track, add 1 for leadout. */
track_info_t tocent[CDIO_CD_MAX_TRACKS+1];
HANDLE h_device_handle; /* device descriptor */ HANDLE h_device_handle; /* device descriptor */
long hASPI; long hASPI;
short i_sid; short i_sid;

5
src/util.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: util.c,v 1.20 2004/08/10 02:29:46 rocky Exp $ $Id: util.c,v 1.21 2004/08/10 03:44:56 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -340,7 +340,8 @@ print_mmc_drive_features(CdIo *p_cdio)
case CDIO_MMC_FEATURE_DVD_CSS: case CDIO_MMC_FEATURE_DVD_CSS:
printf("Ability to perform DVD CSS/CPPM authentication and" printf("Ability to perform DVD CSS/CPPM authentication and"
" RPC\n"); " RPC\n");
#if 0 #if 1
printf("\tp[2] %x\n", p[2]);
printf("\tMedium does%s have Content Scrambling (CSS/CPPM)\n", printf("\tMedium does%s have Content Scrambling (CSS/CPPM)\n",
(p[2] & 1) ? "": "not "); (p[2] & 1) ? "": "not ");
#endif #endif