rpms/sound-juicer/devel sj-handle-uris.patch, NONE, 1.1 sound-juicer.spec, 1.95, 1.96
Bastien Nocera (hadess)
fedora-extras-commits at redhat.com
Tue Apr 29 15:11:28 UTC 2008
Author: hadess
Update of /cvs/pkgs/rpms/sound-juicer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20345
Modified Files:
sound-juicer.spec
Added Files:
sj-handle-uris.patch
Log Message:
* Tue Apr 29 2008 - Bastien Nocera <bnocera at redhat.com> - 2.22.0-3
- Handle URIs from gvfs
sj-handle-uris.patch:
--- NEW FILE sj-handle-uris.patch ---
Index: src/sj-main.c
===================================================================
--- src/sj-main.c (revision 2168)
+++ src/sj-main.c (working copy)
@@ -1576,12 +1576,13 @@
GnomeProgram *program;
GError *error = NULL;
GtkTreeSelection *selection;
- char *device = NULL;
+ char *device = NULL, **uris = NULL;
GOptionContext *ctx;
const GOptionEntry entries[] = {
{ "auto-start", 'a', 0, G_OPTION_ARG_NONE, &autostart, N_("Start extracting immediately"), NULL },
{ "play", 'p', 0, G_OPTION_ARG_NONE, &autoplay, N_("Start playing immediately"), NULL},
{ "device", 'd', 0, G_OPTION_ARG_FILENAME, &device, N_("What CD device to read"), N_("DEVICE") },
+ { G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &uris, N_("URI to the CD device to read"), NULL },
{ NULL }
};
@@ -1803,10 +1804,26 @@
eject_changed_cb (gconf_client, -1, gconf_client_get_entry (gconf_client, GCONF_EJECT, NULL, TRUE, NULL), NULL);
open_changed_cb (gconf_client, -1, gconf_client_get_entry (gconf_client, GCONF_OPEN, NULL, TRUE, NULL), NULL);
audio_volume_changed_cb (gconf_client, -1, gconf_client_get_entry (gconf_client, GCONF_AUDIO_VOLUME, NULL, TRUE, NULL), NULL);
- if (device == NULL) {
+ if (device == NULL && uris == NULL) {
device_changed_cb (gconf_client, -1, gconf_client_get_entry (gconf_client, GCONF_DEVICE, NULL, TRUE, NULL), GINT_TO_POINTER (TRUE));
} else {
- set_device (device, TRUE);
+ if (device)
+ set_device (device, TRUE);
+ else {
+ char *d;
+
+ /* Mash up the CDDA URIs into a device path */
+ if (g_str_has_prefix (uris[0], "cdda://")) {
+ guint len;
+ d = g_strdup_printf ("/dev/%s", uris[0] + strlen ("cdda://"));
+ len = strlen (d);
+ d[len - 1] = '\0';
+ set_device (d, TRUE);
+ g_free (d);
+ } else {
+ device_changed_cb (gconf_client, -1, gconf_client_get_entry (gconf_client, GCONF_DEVICE, NULL, TRUE, NULL), GINT_TO_POINTER (TRUE));
+ }
+ }
}
if (sj_extractor_supports_encoding (&error) == FALSE) {
Index: data/sound-juicer.desktop.in.in
===================================================================
--- data/sound-juicer.desktop.in.in (revision 2168)
+++ data/sound-juicer.desktop.in.in (working copy)
@@ -2,7 +2,7 @@
Encoding=UTF-8
_Name=Audio CD Extractor
_Comment=Copy music from your CDs
-Exec=sound-juicer
+Exec=sound-juicer %u
Icon=sound-juicer
StartupNotify=true
MimeType=x-content/audio-cdda;
Index: sound-juicer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- sound-juicer.spec 12 Mar 2008 19:52:11 -0000 1.95
+++ sound-juicer.spec 29 Apr 2008 15:10:51 -0000 1.96
@@ -13,7 +13,7 @@
Name: sound-juicer
Summary: Clean and lean CD ripper
Version: 2.22.0
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: Applications/Multimedia
Source: http://download.gnome.org/sources/sound-juicer/2.22/%{name}-%{version}.tar.bz2
@@ -48,11 +48,15 @@
ExcludeArch: s390 s390x
+# http://bugzilla.gnome.org/show_bug.cgi?id=530423
+Patch0: sj-handle-uris.patch
+
%description
GStreamer-based CD ripping tool. Saves audio CDs to Ogg/vorbis.
%prep
%setup -q
+%patch0 -p0 -b .gvfs
%build
# work around a gstreamer problem where it
@@ -121,6 +125,9 @@
%{_mandir}/man1/*
%changelog
+* Tue Apr 29 2008 - Bastien Nocera <bnocera at redhat.com> - 2.22.0-3
+- Handle URIs from gvfs
+
* Wed Mar 12 2008 - Bastien Nocera <bnocera at redhat.com> - 2.22.0-2
- Remove the ExcludeArch
More information about the fedora-extras-commits
mailing list