filename | src/gdrom/gdrom.c |
changeset | 1109:700c5ab26a63 |
prev | 1101:78e762cec843 |
next | 1296:30ecee61f811 |
author | nkeynes |
date | Mon Mar 05 11:41:03 2012 +1000 (12 years ago) |
permissions | -rw-r--r-- |
last change | Small cleanups: Refactor the post-windowing setup into gl_init_driver() in video_gl.c Move gl_sl.c into src/drivers and tidy up a bit. Fix OS X compiling plugins with -mdynamic-no-pic |
file | annotate | diff | log | raw |
1.1 --- a/src/gdrom/gdrom.c Tue Feb 16 09:29:39 2010 +10001.2 +++ b/src/gdrom/gdrom.c Mon Mar 05 11:41:03 2012 +10001.3 @@ -28,6 +28,7 @@1.4 #include "gdrom/gdrom.h"1.5 #include "gdrom/packet.h"1.6 #include "bootstrap.h"1.7 +#include "loader.h"1.8 #include "drivers/cdrom/cdrom.h"1.10 #define GDROM_LBA_OFFSET 1501.11 @@ -58,9 +59,12 @@1.12 }1.13 }1.15 -gboolean gdrom_mount_image( const gchar *filename )1.16 +gboolean gdrom_mount_image( const gchar *filename, ERROR *err )1.17 {1.18 - cdrom_disc_t disc = cdrom_disc_open(filename, NULL);1.19 + cdrom_disc_t disc = cdrom_disc_open(filename, err);1.20 + if( disc == NULL && err->code == LX_ERR_FILE_UNKNOWN ) {1.21 + disc = cdrom_wrap_magic( CDROM_DISC_XA, filename, err );1.22 + }1.23 if( disc != NULL ) {1.24 gdrom_mount_disc( disc );1.25 return TRUE;
.