patch-cdrom_callb_c 943 B

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