aboutsummaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authoralane <alane@FreeBSD.org>2002-07-24 16:10:02 +0800
committeralane <alane@FreeBSD.org>2002-07-24 16:10:02 +0800
commit16dadf33b192f3ed19714481f72e2a1c32aa3840 (patch)
tree17a66b41499039969d6b60f567906e0224b5153b /audio
parent82090e7c17bde0a52de0b0a04293956c90a6fdf4 (diff)
downloadfreebsd-ports-gnome-16dadf33b192f3ed19714481f72e2a1c32aa3840.tar.gz
freebsd-ports-gnome-16dadf33b192f3ed19714481f72e2a1c32aa3840.tar.zst
freebsd-ports-gnome-16dadf33b192f3ed19714481f72e2a1c32aa3840.zip
1. Revised poll interval patch to prepare for integration into main source.
2. Patched bug in expansion of %i config escape sequence (discid).
Diffstat (limited to 'audio')
-rw-r--r--audio/grip/files/patch-src-grip.c28
-rw-r--r--audio/grip/files/patch-src-rip.c11
2 files changed, 32 insertions, 7 deletions
diff --git a/audio/grip/files/patch-src-grip.c b/audio/grip/files/patch-src-grip.c
index 8b0eaa508cf7..352d21153f34 100644
--- a/audio/grip/files/patch-src-grip.c
+++ b/audio/grip/files/patch-src-grip.c
@@ -1,6 +1,19 @@
--- src/grip.c.orig Sun Mar 10 21:59:44 2002
-+++ src/grip.c Wed May 29 21:57:19 2002
-@@ -144,7 +144,7 @@
++++ src/grip.c Wed Jul 24 01:32:08 2002
+@@ -40,6 +40,12 @@
+ #include "xpm.h"
+ #include "parsecfg.h"
+
++#ifdef __FreeBSD__
++#define CD_POLL_SECS 15
++#else
++#define CD_POLL_SECS 1
++#endif
++
+ static void ReallyDie(gint reply,gpointer data);
+ static void DoHelp(GtkWidget *widget,gpointer data);
+ static void MakeHelpPage(GripInfo *ginfo);
+@@ -144,7 +150,7 @@
app=gnome_app_new(PACKAGE,_("Grip"));
@@ -9,29 +22,30 @@
gtk_object_set_user_data(GTK_OBJECT(app),(gpointer)ginfo);
-@@ -511,8 +511,10 @@
+@@ -511,8 +517,10 @@
if(ginfo->rewinding) Rewind(ginfo);
#ifdef GRIPCD
- if(!ginfo->have_disc)
- CheckNewDisc(ginfo);
-+ if (!(time(0) % 10)) {
++ if (!(time(0) % CD_POLL_SECS)) {
+ if(!ginfo->have_disc)
+ CheckNewDisc(ginfo);
+ }
if(ginfo->auto_eject_countdown && !(--ginfo->auto_eject_countdown))
EjectDisc(&(ginfo->disc));
-@@ -522,8 +524,10 @@
+@@ -522,9 +530,10 @@
if(ginfo->ripping|ginfo->encoding) UpdateRipProgress(ginfo);
if(!ginfo->ripping) {
- if(!ginfo->have_disc)
- CheckNewDisc(ginfo);
-+ if (!(time(0) % 10)) {
+-
++ if (!(time(0) % CD_POLL_SECS)) {
+ if(!ginfo->have_disc)
+ CheckNewDisc(ginfo);
+ }
-
UpdateDisplay(ginfo);
}
+ #endif
diff --git a/audio/grip/files/patch-src-rip.c b/audio/grip/files/patch-src-rip.c
new file mode 100644
index 000000000000..0b8ad78e026a
--- /dev/null
+++ b/audio/grip/files/patch-src-rip.c
@@ -0,0 +1,11 @@
+--- src/rip.c.orig Fri Apr 12 11:53:29 2002
++++ src/rip.c Wed Jul 24 01:49:30 2002
+@@ -980,7 +980,7 @@
+ else strncpy(res,_("NoTitle"),PATH_MAX);
+ break;
+ case 'i':
+- g_snprintf(res,PATH_MAX,"%02x",enc_track->discid);
++ g_snprintf(res,PATH_MAX,"%08x",enc_track->discid);
+ *munge=FALSE;
+ break;
+ case 'y':