* Preamble
*****************************************************************************/
#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_access.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <errno.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-#ifdef HAVE_FCNTL_H
+#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif
#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 "charset.h"
+#include <vlc_charset.h>
/*****************************************************************************
* ioctl_Open: Opens a VCD device or file and returns an opaque handle
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 );
-
- if( p_vcddev->i_vcdimage_handle == -1 &&
+
+ if( p_vcddev->i_vcdimage_handle == -1 &&
fscanf( cuefile, "FILE %c", line ) &&
fgets( line, 1024, cuefile ) )
{
}
/* 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 );