diff options
| author | Gene Z. Ragan <gzr@eazel.com> | 2001-03-27 23:40:29 +0000 |
|---|---|---|
| committer | Gene Ragan <gzr@src.gnome.org> | 2001-03-27 23:40:29 +0000 |
| commit | f05da143f070ecdedec3614b79b78f2d237825bd (patch) | |
| tree | ce24b964ddddb0ca40fd96c9d4db62b33026711e | |
| parent | cdad65e1098710b42cd33681e466e0ccdd65cca1 (diff) | |
| download | nautilus-f05da143f070ecdedec3614b79b78f2d237825bd.tar.gz | |
Use the proper automake defined conditional to enable audio cd mounting.
2001-03-27 Gene Z. Ragan <gzr@eazel.com>
Use the proper automake defined conditional to
enable audio cd mounting.
* libnautilus-extensions/nautilus-volume-monitor.c:
(get_removable_volumes), (get_current_mount_list):
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-volume-monitor.c | 20 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-volume-monitor.c | 20 |
3 files changed, 38 insertions, 10 deletions
@@ -1,3 +1,11 @@ +2001-03-27 Gene Z. Ragan <gzr@eazel.com> + + Use the proper automake defined conditional to + enable audio cd mounting. + + * libnautilus-extensions/nautilus-volume-monitor.c: + (get_removable_volumes), (get_current_mount_list): + 2001-03-27 Eskil Heyn Olsen <eskil@eazel.com> Clone now basically works. It will however almost always crash diff --git a/libnautilus-extensions/nautilus-volume-monitor.c b/libnautilus-extensions/nautilus-volume-monitor.c index 8055b44cd..379ba433b 100644 --- a/libnautilus-extensions/nautilus-volume-monitor.c +++ b/libnautilus-extensions/nautilus-volume-monitor.c @@ -85,7 +85,8 @@ #define setmntent(f,m) fopen(f,m) #endif -#ifdef HAVE_CDDA +#ifdef HAVE_CDDA_INTERFACE_H +#ifdef HAVE_CDDA_PARANOIA_H #define size16 short #define size32 int @@ -105,6 +106,7 @@ char **broken_header_fix = strerror_tr; #endif +#endif #define CHECK_STATUS_INTERVAL 2000 @@ -168,10 +170,12 @@ static void free_mount_list (GList *mount_list); static GList *get_removable_volumes (void); static GHashTable *create_readable_mount_point_name_table (void); -#ifdef HAVE_CDDA +#ifdef HAVE_CDDA_INTERFACE_H +#ifdef HAVE_CDDA_PARANOIA_H static cdrom_drive *open_cdda_device (GnomeVFSURI *uri); static gboolean locate_audio_cd (void); #endif +#endif #ifdef SOLARIS_MNT static int get_cdrom_type_solaris (const char *vol_dev_path, @@ -389,10 +393,12 @@ get_removable_volumes (void) fclose (file); -#ifdef HAVE_CDDA +#ifdef HAVE_CDDA_INTERFACE_H +#ifdef HAVE_CDDA_PARANOIA_H volume = create_volume (CD_AUDIO_PATH, CD_AUDIO_PATH, CDDA_SCHEME); volumes = mount_volume_add_filesystem (volume, volumes); #endif +#endif /* Move all floppy mounts to top of list */ return g_list_sort (g_list_reverse (volumes), (GCompareFunc) floppy_sort); @@ -989,7 +995,8 @@ get_current_mount_list (void) fclose (fh); } -#ifdef HAVE_CDDA +#ifdef HAVE_CDDA_INTERFACE_H +#ifdef HAVE_CDDA_PARANOIA_H /* CD Audio tricks */ if (locate_audio_cd ()) { volume = create_volume (CD_AUDIO_PATH, CD_AUDIO_PATH, CDDA_SCHEME); @@ -997,6 +1004,7 @@ get_current_mount_list (void) current_mounts = mount_volume_add_filesystem (volume, current_mounts); } #endif +#endif return current_mounts; } @@ -1902,7 +1910,8 @@ nautilus_volume_monitor_get_mount_name_for_display (NautilusVolumeMonitor *monit } } -#ifdef HAVE_CDDA +#ifdef HAVE_CDDA_INTERFACE_H +#ifdef HAVE_CDDA_PARANOIA_H static cdrom_drive * open_cdda_device (GnomeVFSURI *uri) @@ -1969,3 +1978,4 @@ locate_audio_cd (void) { } #endif +#endif diff --git a/libnautilus-private/nautilus-volume-monitor.c b/libnautilus-private/nautilus-volume-monitor.c index 8055b44cd..379ba433b 100644 --- a/libnautilus-private/nautilus-volume-monitor.c +++ b/libnautilus-private/nautilus-volume-monitor.c @@ -85,7 +85,8 @@ #define setmntent(f,m) fopen(f,m) #endif -#ifdef HAVE_CDDA +#ifdef HAVE_CDDA_INTERFACE_H +#ifdef HAVE_CDDA_PARANOIA_H #define size16 short #define size32 int @@ -105,6 +106,7 @@ char **broken_header_fix = strerror_tr; #endif +#endif #define CHECK_STATUS_INTERVAL 2000 @@ -168,10 +170,12 @@ static void free_mount_list (GList *mount_list); static GList *get_removable_volumes (void); static GHashTable *create_readable_mount_point_name_table (void); -#ifdef HAVE_CDDA +#ifdef HAVE_CDDA_INTERFACE_H +#ifdef HAVE_CDDA_PARANOIA_H static cdrom_drive *open_cdda_device (GnomeVFSURI *uri); static gboolean locate_audio_cd (void); #endif +#endif #ifdef SOLARIS_MNT static int get_cdrom_type_solaris (const char *vol_dev_path, @@ -389,10 +393,12 @@ get_removable_volumes (void) fclose (file); -#ifdef HAVE_CDDA +#ifdef HAVE_CDDA_INTERFACE_H +#ifdef HAVE_CDDA_PARANOIA_H volume = create_volume (CD_AUDIO_PATH, CD_AUDIO_PATH, CDDA_SCHEME); volumes = mount_volume_add_filesystem (volume, volumes); #endif +#endif /* Move all floppy mounts to top of list */ return g_list_sort (g_list_reverse (volumes), (GCompareFunc) floppy_sort); @@ -989,7 +995,8 @@ get_current_mount_list (void) fclose (fh); } -#ifdef HAVE_CDDA +#ifdef HAVE_CDDA_INTERFACE_H +#ifdef HAVE_CDDA_PARANOIA_H /* CD Audio tricks */ if (locate_audio_cd ()) { volume = create_volume (CD_AUDIO_PATH, CD_AUDIO_PATH, CDDA_SCHEME); @@ -997,6 +1004,7 @@ get_current_mount_list (void) current_mounts = mount_volume_add_filesystem (volume, current_mounts); } #endif +#endif return current_mounts; } @@ -1902,7 +1910,8 @@ nautilus_volume_monitor_get_mount_name_for_display (NautilusVolumeMonitor *monit } } -#ifdef HAVE_CDDA +#ifdef HAVE_CDDA_INTERFACE_H +#ifdef HAVE_CDDA_PARANOIA_H static cdrom_drive * open_cdda_device (GnomeVFSURI *uri) @@ -1969,3 +1978,4 @@ locate_audio_cd (void) { } #endif +#endif |