comparison src/cdrom/macosx/SDL_syscdrom.c @ 4190:386181851388 SDL-1.2

Fixed CD-ROM code to work with Mac OS X 10.6 SDK and 64-bit targets.
author Ryan C. Gordon <icculus@icculus.org>
date Sat, 12 Sep 2009 15:06:16 +0000
parents a1b03ba2fcd0
children
comparison
equal deleted inserted replaced
4189:95213cf5efcc 4190:386181851388
261 } 261 }
262 262
263 /* Get the Unix disk name of the volume */ 263 /* Get the Unix disk name of the volume */
264 static const char *SDL_SYS_CDName (int drive) 264 static const char *SDL_SYS_CDName (int drive)
265 { 265 {
266 /*
267 * !!! FIXME: PBHGetVolParmsSync() is gone in 10.6,
268 * !!! FIXME: replaced with FSGetVolumeParms(), which
269 * !!! FIXME: isn't available before 10.5. :/
270 */
271 return "Mac OS X CD-ROM Device";
272
273 #if 0
266 OSStatus err = noErr; 274 OSStatus err = noErr;
267 HParamBlockRec pb; 275 HParamBlockRec pb;
268 GetVolParmsInfoBuffer volParmsInfo; 276 GetVolParmsInfoBuffer volParmsInfo;
269 277
270 if (fakeCD) 278 if (fakeCD)
280 SDL_SetError ("PBHGetVolParmsSync returned %d", err); 288 SDL_SetError ("PBHGetVolParmsSync returned %d", err);
281 return NULL; 289 return NULL;
282 } 290 }
283 291
284 return volParmsInfo.vMDeviceID; 292 return volParmsInfo.vMDeviceID;
293 #endif
285 } 294 }
286 295
287 /* Open the "device" */ 296 /* Open the "device" */
288 static int SDL_SYS_CDOpen (int drive) 297 static int SDL_SYS_CDOpen (int drive)
289 { 298 {