diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-11-20 14:10:23 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-11-20 14:10:23 +0800 |
| commit | 40917931177fd93bf945e268c29e8a9e75fa9dcf (patch) | |
| tree | 1d02ae3f1db4c20eccfa7f213a20c1e9d2d2333e /sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c | |
| parent | 1ba805154e12d914256e13c73348a2efb94ad7d7 (diff) | |
| download | marcuscom-ports-40917931177fd93bf945e268c29e8a9e75fa9dcf.tar.gz marcuscom-ports-40917931177fd93bf945e268c29e8a9e75fa9dcf.tar.zst marcuscom-ports-40917931177fd93bf945e268c29e8a9e75fa9dcf.zip | |
Allow for both cdrecord-style and regular devices to exist side-by-side
for applications like sound-juicer. Also, add a runtime dependency on
cdrdao.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7940 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c')
| -rw-r--r-- | sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c | 51 |
1 files changed, 47 insertions, 4 deletions
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c index 9d3ce89ec..cb0cd120e 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c +++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c @@ -1,6 +1,32 @@ ---- src/nautilus-burn-drive.c.orig Thu Jul 13 22:51:49 2006 -+++ src/nautilus-burn-drive.c Thu Jul 13 22:52:25 2006 -@@ -806,7 +806,11 @@ nautilus_burn_drive_eject (NautilusBurnD +--- src/nautilus-burn-drive.c.orig Fri Sep 29 12:55:36 2006 ++++ src/nautilus-burn-drive.c Sun Nov 19 13:27:31 2006 +@@ -266,6 +266,25 @@ nautilus_burn_drive_get_device (Nautilus + } + + /** ++ * nautilus_burn_drive_get_cdrecord_device: ++ * @drive: #NautilusBurnDrive ++ * ++ * Get the name of the device associated with the drive suitable for ++ * user with cdrcord. ++ * ++ * Returns: device name. Must be not be freed. ++ * ++ * Since: 2.16 ++ **/ ++const char * ++nautilus_burn_drive_get_cdrecord_device (NautilusBurnDrive *drive) ++{ ++ g_return_val_if_fail (drive != NULL, NULL); ++ ++ return drive->priv->cdrecord_device; ++} ++ ++/** + * nautilus_burn_drive_get_drive_type: + * @drive: #NautilusBurnDrive + * +@@ -808,8 +827,12 @@ nautilus_burn_drive_eject (NautilusBurnD #ifdef USE_GNOME_MOUNT cmd = g_strdup_printf ("gnome-mount --eject --no-ui --device=%s", drive->priv->device); #else @@ -8,7 +34,24 @@ + cmd = g_strdup_printf ("cdcontrol -f %s eject", drive->priv->device); +#else cmd = g_strdup_printf ("eject %s", drive->priv->device); -+#endif #endif ++#endif res = g_spawn_command_line_sync (cmd, NULL, NULL, NULL, NULL); + g_free (cmd); +@@ -1021,6 +1044,7 @@ nautilus_burn_drive_finalize (GObject *o + g_free (drive->priv->write_speeds); + g_free (drive->priv->display_name); + g_free (drive->priv->device); ++ g_free (drive->priv->cdrecord_device); + + if (G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize != NULL) { + (* G_OBJECT_CLASS (nautilus_burn_drive_parent_class)->finalize) (object); +@@ -1038,6 +1062,7 @@ nautilus_burn_drive_init (NautilusBurnDr + drive->priv->max_speed_read = 0; + drive->priv->write_speeds = NULL; + drive->priv->device = NULL; ++ drive->priv->cdrecord_device = NULL; + } + + /** |