diff options
| -rw-r--r-- | src/input/input_vcd.c | 4 | ||||
| -rw-r--r-- | src/input/vcd/libcdio/_cdio_osx.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c index 49895e67b..eed5e2796 100644 --- a/src/input/input_vcd.c +++ b/src/input/input_vcd.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_vcd.c,v 1.75 2004/07/20 00:50:11 rockyb Exp $ + * $Id: input_vcd.c,v 1.76 2004/10/20 05:04:00 athp Exp $ * */ @@ -636,7 +636,7 @@ static void vcd_offset_to_time (off_t offset, uint8_t *min, uint8_t *sec, } -#if defined (__linux__) || defined(__sun) +#if defined (__linux__) || defined(__sun) || defined(HOST_OS_DARWIN) static off_t vcd_plugin_seek (input_plugin_t *this_gen, off_t offset, int origin) { diff --git a/src/input/vcd/libcdio/_cdio_osx.c b/src/input/vcd/libcdio/_cdio_osx.c index 887eb00bf..3e479f76d 100644 --- a/src/input/vcd/libcdio/_cdio_osx.c +++ b/src/input/vcd/libcdio/_cdio_osx.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_osx.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $ + $Id: _cdio_osx.c,v 1.3 2004/10/20 05:04:00 athp Exp $ Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> from vcdimager code: @@ -33,7 +33,7 @@ # include "config.h" #endif -static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.2 2004/04/11 12:20:31 miguelfreitas Exp $"; +static const char _rcsid[] = "$Id: _cdio_osx.c,v 1.3 2004/10/20 05:04:00 athp Exp $"; #include <cdio/sector.h> #include <cdio/util.h> @@ -703,7 +703,7 @@ cdio_get_devices_osx(void) return( nil ); } - CFDictionarySetValue( classes_to_match, CFSTR(kIOMediaEjectable), + CFDictionarySetValue( classes_to_match, CFSTR(kIOMediaEjectableKey), kCFBooleanTrue ); kern_result = IOServiceGetMatchingServices( master_port, @@ -724,7 +724,7 @@ cdio_get_devices_osx(void) do { str_bsd_path = IORegistryEntryCreateCFProperty( next_media, - CFSTR( kIOBSDName ), + CFSTR( kIOBSDNameKey ), kCFAllocatorDefault, 0 ); if( str_bsd_path == NULL ) @@ -785,7 +785,7 @@ cdio_get_default_device_osx(void) return( nil ); } - CFDictionarySetValue( classes_to_match, CFSTR(kIOMediaEjectable), + CFDictionarySetValue( classes_to_match, CFSTR(kIOMediaEjectableKey), kCFBooleanTrue ); kern_result = IOServiceGetMatchingServices( master_port, @@ -806,7 +806,7 @@ cdio_get_default_device_osx(void) do { str_bsd_path = IORegistryEntryCreateCFProperty( next_media, - CFSTR( kIOBSDName ), + CFSTR( kIOBSDNameKey ), kCFAllocatorDefault, 0 ); if( str_bsd_path == NULL ) |