2010-05-17 04:31:11 -04:00
|
|
|
$OpenBSD: patch-cdrom_callb_c,v 1.3 2010/05/17 08:31:12 espie Exp $
|
2008-01-30 10:02:51 -05:00
|
|
|
--- cdrom_callb.c.orig Tue Jan 12 19:59:48 1993
|
2010-05-17 04:31:11 -04:00
|
|
|
+++ cdrom_callb.c Mon May 17 10:28:00 2010
|
|
|
|
|
@@ -19,9 +19,13 @@
|
|
|
|
|
# include <X11/Xaw/Toggle.h>
|
|
|
|
|
|
|
|
|
|
# include <stdio.h>
|
|
|
|
|
+# include <stdlib.h>
|
2003-08-24 18:15:55 -04:00
|
|
|
|
|
|
|
|
# include "debug.h"
|
|
|
|
|
# include "cdrom_globs.h"
|
|
|
|
|
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
|
|
|
|
|
+# include "cdrom_freebsd.h"
|
|
|
|
|
+#endif
|
|
|
|
|
#ifdef sun
|
|
|
|
|
# include "cdrom_sun.h"
|
|
|
|
|
#endif
|
2010-05-17 04:31:11 -04:00
|
|
|
@@ -29,6 +33,8 @@
|
2003-08-24 18:15:55 -04:00
|
|
|
# include "cdrom_sgi.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
+extern AppData app_data;
|
|
|
|
|
+
|
|
|
|
|
void cdrom_new_disc();
|
|
|
|
|
|
|
|
|
|
/*
|
2010-05-17 04:31:11 -04:00
|
|
|
@@ -287,7 +293,7 @@ cb_cdrom_previous(widget, client_data, call_data)
|
2003-08-24 18:15:55 -04:00
|
|
|
* if playing less than replayThreshold seconds, back up to
|
|
|
|
|
* previous track; otherwise start at beginning of current track:
|
|
|
|
|
*/
|
|
|
|
|
- if (cdi.duration < replayThreshold)
|
|
|
|
|
+ if (cdi.duration < app_data.replayThreshold)
|
|
|
|
|
{
|
|
|
|
|
if ((cdi.program != NULL) &&
|
|
|
|
|
(cdi.state & CDROM_STATE_PLAY) &&
|
