/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include <vlc/vlc.h>
-#include "charset.h"
+#include <vlc_common.h>
+#include <vlc_access.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
#include <errno.h>
-
-#ifdef HAVE_SYS_IOCTL_H
-# include <sys/ioctl.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
#endif
#if defined( SYS_BSDI )
#elif defined( WIN32 )
# include <windows.h>
# include <winioctl.h>
-#else
+#elif defined (__linux__)
+# include <sys/ioctl.h>
# include <linux/cdrom.h>
+#else
+# error FIXME
#endif
#include "cdrom_internals.h"
#include "cdrom.h"
+#include <vlc_charset.h>
/*****************************************************************************
* ioctl_Open: Opens a VCD device or file and returns an opaque handle
*/
p_vcddev = (vcddev_t *)malloc( sizeof(vcddev_t) );
if( p_vcddev == NULL )
- {
- msg_Err( p_this, "out of memory" );
return NULL;
- }
p_vcddev->i_vcdimage_handle = -1;
p_vcddev->psz_dev = NULL;
b_is_file = 1;
*****************************************************************************/
void ioctl_Close( vlc_object_t * p_this, vcddev_t *p_vcddev )
{
- if( p_vcddev->psz_dev ) free( p_vcddev->psz_dev );
+ free( p_vcddev->psz_dev );
if( p_vcddev->i_vcdimage_handle != -1 )
{
{
*pp_sectors = malloc( (i_tracks + 1) * sizeof(int) );
if( *pp_sectors == NULL )
- {
- msg_Err( p_this, "out of memory" );
return 0;
- }
memcpy( *pp_sectors, p_vcddev->p_sectors,
(i_tracks + 1) * sizeof(int) );
}
*pp_sectors = malloc( (i_tracks + 1) * sizeof(int) );
if( *pp_sectors == NULL )
{
- msg_Err( p_this, "out of memory" );
darwin_freeTOC( pTOC );
return 0;
}
{
HANDLE hEvent;
struct SRB_ExecSCSICmd ssc;
- byte_t p_tocheader[ 4 ];
+ uint8_t p_tocheader[ 4 ];
/* Create the transfer completion event */
hEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
if( pp_sectors )
{
int i, i_toclength;
- byte_t *p_fulltoc;
+ uint8_t *p_fulltoc;
i_toclength = 4 /* header */ + p_tocheader[0] +
((unsigned int)p_tocheader[1] << 8);
if( *pp_sectors == NULL || p_fulltoc == NULL )
{
- if( *pp_sectors ) free( *pp_sectors );
- if( p_fulltoc ) free( p_fulltoc );
- msg_Err( p_this, "out of memory" );
+ free( *pp_sectors );
+ free( p_fulltoc );
CloseHandle( hEvent );
return 0;
}
*pp_sectors = malloc( (i_tracks + 1) * sizeof(int) );
if( *pp_sectors == NULL )
- {
- msg_Err( p_this, "out of memory" );
return 0;
- }
for( i = 0 ; i <= i_tracks ; i++ )
{
*pp_sectors = malloc( (i_tracks + 1) * sizeof(int) );
if( *pp_sectors == NULL )
- {
- msg_Err( p_this, "out of memory" );
- return NULL;
- }
+ return 0;
toc_entries.address_format = CD_LBA_FORMAT;
toc_entries.starting_track = 0;
malloc( toc_entries.data_len );
if( toc_entries.data == NULL )
{
- msg_Err( p_this, "out of memory" );
free( *pp_sectors );
return 0;
}
*pp_sectors = malloc( (i_tracks + 1) * sizeof(int) );
if( *pp_sectors == NULL )
- {
- msg_Err( p_this, "out of memory" );
return 0;
- }
/* Fill the p_sectors structure with the track/sector matches */
for( i = 0 ; i <= i_tracks ; i++ )
* ioctl_ReadSector: Read VCD or CDDA sectors
****************************************************************************/
int ioctl_ReadSectors( vlc_object_t *p_this, const vcddev_t *p_vcddev,
- int i_sector, byte_t * p_buffer, int i_nb, int i_type )
+ int i_sector, uint8_t *p_buffer, int i_nb, int i_type )
{
- byte_t *p_block;
+ uint8_t *p_block;
int i;
if( i_type == VCD_TYPE ) p_block = malloc( VCD_SECTOR_SIZE * i_nb );
char *p_pos;
char *psz_vcdfile = NULL;
char *psz_cuefile = NULL;
- FILE *cuefile;
+ FILE *cuefile = NULL;
char line[1024];
+ bool b_found = false;
/* Check if we are dealing with a .cue file */
p_pos = strrchr( psz_dev, '.' );
if( p_pos && !strcmp( p_pos, ".cue" ) )
{
+ /* psz_dev must be the cue file. Let's assume there's a .bin
+ * file with the same filename */
+ psz_vcdfile = malloc( p_pos - psz_dev + 5 /* ".bin" */ );
+ strncpy( psz_vcdfile, psz_dev, p_pos - psz_dev );
+ strcpy( psz_vcdfile + (p_pos - psz_dev), ".bin");
psz_cuefile = strdup( psz_dev );
}
else
psz_cuefile = malloc( strlen(psz_dev) + 5 /* ".cue" */ );
sprintf( psz_cuefile, "%s.cue", psz_dev );
}
+ /* If we need to look up the .cue file, then we don't have to look for the vcd */
+ psz_vcdfile = strdup( psz_dev );
}
/* Open the cue file and try to parse it */
msg_Dbg( p_this,"trying .cue file: %s", psz_cuefile );
cuefile = utf8_fopen( psz_cuefile, "rt" );
- if( cuefile && fscanf( cuefile, "FILE %c", line ) &&
- fgets( line, 1024, cuefile ) )
+ if( cuefile == NULL )
{
- p_pos = strchr( line, '"' );
- if( p_pos )
- {
- *p_pos = 0;
+ i_ret = -1;
+ msg_Dbg( p_this, "could not find .cue file" );
+ goto error;
+ }
- /* Take care of path standardization */
- if( *line != '/' && ((p_pos = strrchr( psz_cuefile, '/' ))
- || (p_pos = strrchr( psz_cuefile, '\\' ) )) )
- {
- psz_vcdfile = malloc( strlen(line) +
+ msg_Dbg( p_this,"guessing vcd image file: %s", psz_vcdfile );
+ p_vcddev->i_vcdimage_handle = utf8_open( psz_vcdfile,
+ O_RDONLY | O_NONBLOCK | O_BINARY, 0666 );
+
+ while( fgets( line, 1024, cuefile ) && !b_found )
+ {
+ /* We have a cue file, but no valid vcd file yet */
+ char filename[1024];
+ char type[16];
+ int i_temp = sscanf( line, "FILE \"%1023[^\"]\" %15s", filename, type );
+ *p_pos = 0;
+ switch( i_temp )
+ {
+ case 2:
+ msg_Dbg( p_this, "the cue file says the data file is %s", type );
+ if( strcasecmp( type, "BINARY" ) )
+ goto error; /* Error if not binary, otherwise treat as case 1 */
+ case 1:
+ if( p_vcddev->i_vcdimage_handle == -1 )
+ {
+ msg_Dbg( p_this, "we could not find the data file, but we found a new path" );
+ free( psz_vcdfile);
+ if( *filename != '/' && ((p_pos = strrchr( psz_cuefile, '/' ))
+ || (p_pos = strrchr( psz_cuefile, '\\' ) )) )
+ {
+ psz_vcdfile = malloc( strlen(filename) +
(p_pos - psz_cuefile + 1) + 1 );
- strncpy( psz_vcdfile, psz_cuefile, (p_pos - psz_cuefile + 1) );
- strcpy( psz_vcdfile + (p_pos - psz_cuefile + 1), line );
- }
- else psz_vcdfile = strdup( line );
+ strncpy( psz_vcdfile, psz_cuefile, (p_pos - psz_cuefile + 1) );
+ strcpy( psz_vcdfile + (p_pos - psz_cuefile + 1), filename );
+ } else psz_vcdfile = strdup( filename );
+ msg_Dbg( p_this,"using vcd image file: %s", psz_vcdfile );
+ p_vcddev->i_vcdimage_handle = utf8_open( psz_vcdfile,
+ O_RDONLY | O_NONBLOCK | O_BINARY, 0666 );
+ }
+ b_found = true;
+ default:
+ break;
}
}
- if( psz_vcdfile )
+ if( p_vcddev->i_vcdimage_handle == -1)
{
- msg_Dbg( p_this,"using vcd image file: %s", psz_vcdfile );
- p_vcddev->i_vcdimage_handle = open( psz_vcdfile,
- O_RDONLY | O_NONBLOCK | O_BINARY );
- i_ret = (p_vcddev->i_vcdimage_handle == -1) ? -1 : 0;
+ i_ret = -1;
+ goto error;
}
+ else i_ret = 0;
/* Try to parse the i_tracks and p_sectors info so we can just forget
* about the cuefile */
}
+error:
if( cuefile ) fclose( cuefile );
- if( psz_cuefile ) free( psz_cuefile );
- if( psz_vcdfile ) free( psz_vcdfile );
+ free( psz_cuefile );
+ free( psz_vcdfile );
return i_ret;
}
else
return;
- if( p_vcddev->p_sectors )
- free( p_vcddev->p_sectors );
+ free( p_vcddev->p_sectors );
}
#if defined( __APPLE__ )
}
/* get service iterator for the device */
- if( ( ret = IOServiceGetMatchingServices(
+ if( ( ret = IOServiceGetMatchingServices(
port, IOBSDNameMatching( port, 0, psz_devname ),
&iterator ) ) != KERN_SUCCESS )
{
service = IOIteratorNext( iterator );
IOObjectRelease( iterator );
- /* search for kIOCDMediaClass */
+ /* search for kIOCDMediaClass */
while( service && !IOObjectConformsTo( service, kIOCDMediaClass ) )
{
- if( ( ret = IORegistryEntryGetParentIterator( service,
+ if( ( ret = IORegistryEntryGetParentIterator( service,
kIOServicePlane, &iterator ) ) != KERN_SUCCESS )
{
msg_Err( p_this, "IORegistryEntryGetParentIterator: 0x%08x", ret );
}
CFRelease( properties );
- IOObjectRelease( service );
+ IOObjectRelease( service );
- return( pTOC );
+ return( pTOC );
}
/****************************************************************************
- * darwin_getNumberOfTracks: get number of tracks in TOC
+ * darwin_getNumberOfTracks: get number of tracks in TOC
****************************************************************************/
static int darwin_getNumberOfTracks( CDTOC *pTOC, int i_descriptors )
{
u_char track;
- int i, i_tracks = 0;
+ int i, i_tracks = 0;
CDTOCDescriptor *pTrackDescriptors = NULL;
pTrackDescriptors = (CDTOCDescriptor *)pTOC->descriptors;
if( track > CD_MAX_TRACK_NO || track < CD_MIN_TRACK_NO )
continue;
- i_tracks++;
+ i_tracks++;
}
return( i_tracks );
hASPI = LoadLibrary( "wnaspi32.dll" );
if( hASPI != NULL )
{
- (FARPROC) lpGetSupport = GetProcAddress( hASPI,
- "GetASPI32SupportInfo" );
- (FARPROC) lpSendCommand = GetProcAddress( hASPI,
- "SendASPI32Command" );
+ lpGetSupport = (void *)GetProcAddress( hASPI, "GetASPI32SupportInfo" );
+ lpSendCommand = (void *)GetProcAddress( hASPI, "SendASPI32Command" );
}
if( hASPI == NULL || lpGetSupport == NULL || lpSendCommand == NULL )
projects / vlc / blobdiff