From c8a6536656c70d6fa62f7a3cb4484f45688679c8 Mon Sep 17 00:00:00 2001 From: "SND\\weimingzhi_cp" Date: Sat, 17 Jul 2010 03:01:36 +0000 Subject: git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@54824 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- ChangeLog | 6 ++++++ macosx/plugins/CDDeviceInterface/src/PlugCD.c | 5 ++++- plugins/dfcdrom/cdr-libcdio.c | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d20fecd..895f75b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +July 17, 2010 Wei Mingzhi + + * plugins/dfcdrom/cdr-libcdio.c: Include libcdio headers before cdr.h. + * macosx/plugins/CDDeviceInterface/src/PlugCD.c: Check for kIODVDMediaClass + as well (MIGHT fix the "Can't check CD-ROM" issue, cannot test). + July 15, 2010 Wei Mingzhi * plugins/dfcdrom/cdr-libcdio.c: Force CAM access mode on FreeBSD. diff --git a/macosx/plugins/CDDeviceInterface/src/PlugCD.c b/macosx/plugins/CDDeviceInterface/src/PlugCD.c index b9d770dd..1e3a613e 100644 --- a/macosx/plugins/CDDeviceInterface/src/PlugCD.c +++ b/macosx/plugins/CDDeviceInterface/src/PlugCD.c @@ -94,7 +94,10 @@ kern_return_t FindEjectableCDMedia( io_iterator_t *mediaIterator, mach_port_t *m return kernResult; } // CD media are instances of class kIOCDMediaClass. - classesToMatch = IOServiceMatching( kIOCDMediaClass ); + classesToMatch = IOServiceMatching( kIOCDMediaClass ); + if ( classesToMatch == NULL ) + classesToMatch = IOServiceMatching( kIODVDMediaClass ); + if ( classesToMatch == NULL ) printf( "IOServiceMatching returned a NULL dictionary.\n" ); else diff --git a/plugins/dfcdrom/cdr-libcdio.c b/plugins/dfcdrom/cdr-libcdio.c index 4f7c5ed6..738d2031 100644 --- a/plugins/dfcdrom/cdr-libcdio.c +++ b/plugins/dfcdrom/cdr-libcdio.c @@ -21,11 +21,11 @@ #ifdef USE_LIBCDIO -#include "cdr.h" - #include #include +#include "cdr.h" + static CdIo_t *cdHandle = NULL; static void SetSpeed(int speed) { -- cgit v1.2.3