1 | --- iodev/cdrom_osx.cc Sun Jun 23 22:19:44 2002 |
---|
2 | +++ iodev/cdrom_osx_monkey.cc Wed Oct 2 16:42:03 2002 |
---|
3 | @@ -312,7 +312,7 @@ |
---|
4 | } |
---|
5 | |
---|
6 | bool |
---|
7 | -cdrom_interface::insert_cdrom() |
---|
8 | +cdrom_interface::insert_cdrom(char *) |
---|
9 | { |
---|
10 | |
---|
11 | mach_port_t masterPort = NULL; |
---|
12 | --- iodev/cdrom_osx.cc Sun Nov 2 23:19:20 2003 |
---|
13 | +++ iodev/cdrom_osx_monkey.cc Sun Nov 2 23:20:19 2003 |
---|
14 | @@ -118,7 +118,7 @@ |
---|
15 | // which is true if the media is indeed ejectable. So add property |
---|
16 | // to CFDictionary for matching. |
---|
17 | CFDictionarySetValue( classesToMatch, |
---|
18 | - CFSTR( kIOMediaEjectable ), kCFBooleanTrue ); |
---|
19 | + CFSTR(kIOMediaEjectableKey), kCFBooleanTrue ); |
---|
20 | } |
---|
21 | kernResult = IOServiceGetMatchingServices( *masterPort, |
---|
22 | classesToMatch, mediaIterator ); |
---|
23 | @@ -143,7 +143,7 @@ |
---|
24 | { |
---|
25 | CFTypeRef deviceFilePathAsCFString; |
---|
26 | deviceFilePathAsCFString = IORegistryEntryCreateCFProperty( |
---|
27 | - nextMedia, CFSTR( kIOBSDName ), |
---|
28 | + nextMedia, CFSTR( kIOBSDNameKey ), |
---|
29 | kCFAllocatorDefault, 0 ); |
---|
30 | *deviceFilePath = '\0'; |
---|
31 | if ( deviceFilePathAsCFString ) |
---|