diff options
Diffstat (limited to 'audio/xcdplayer/patches/patch-ae')
| -rw-r--r-- | audio/xcdplayer/patches/patch-ae | 188 |
1 files changed, 32 insertions, 156 deletions
diff --git a/audio/xcdplayer/patches/patch-ae b/audio/xcdplayer/patches/patch-ae index 4cca78807ac..3cf9810da68 100644 --- a/audio/xcdplayer/patches/patch-ae +++ b/audio/xcdplayer/patches/patch-ae @@ -1,156 +1,32 @@ -$NetBSD: patch-ae,v 1.1 1998/08/23 06:49:29 garbled Exp $ -*** XCdplayer.ad Tue Jan 12 10:59:41 1993 ---- /users/swallace/work/xcdplayer/XCdplayer.ad Wed Feb 23 07:36:31 1994 -*************** -*** 19,29 **** - - XCdplayer*logoLabel.foreground: Gold - XCdplayer*logoLabel.background: Black -- XCdplayer*icon*foreground: Gold - - XCdplayer*versionLabel.Font: -misc-fixed-medium-r-normal--8-* - XCdplayer*versionLabel.foreground: Black -! XCdplayer*versionLabel.width: 130 - XCdplayer*versionLabel.fromHoriz: logoLabel - - ! replayThreshold is the number of seconds that must be played before the ---- 19,28 ---- - - XCdplayer*logoLabel.foreground: Gold - XCdplayer*logoLabel.background: Black - - XCdplayer*versionLabel.Font: -misc-fixed-medium-r-normal--8-* - XCdplayer*versionLabel.foreground: Black -! XCdplayer*versionLabel.width: 110 - XCdplayer*versionLabel.fromHoriz: logoLabel - - ! replayThreshold is the number of seconds that must be played before the -*************** -*** 33,48 **** - - ! scanSkipInterval is the number of seconds skipped at each fast-forward or - ! reverse. -! XCdplayer*scanSkipInterval: 3 - ! pauseSkipInterval is the number of seconds skipped at each fast-forward or - ! reverse if the CD is paused. -! XCdplayer*pauseSkipInterval: 15 - - ! scanPauseInterval is the number of seconds between each fast_forward or - ! reverse while holding down the buttons. (Sun CDs have a dreadfully long - ! start-up time for the audio to actually become audible, so "hearing the - ! track" while scanning isn't very feasible.) -! XCdplayer*scanPauseInterval: 0.062 - ! pausePauseInterval does the same thing when the disc is paused. - XCdplayer*pausePauseInterval: 0.5 - ---- 32,47 ---- - - ! scanSkipInterval is the number of seconds skipped at each fast-forward or - ! reverse. -! XCdplayer*scanSkipInterval: 5 - ! pauseSkipInterval is the number of seconds skipped at each fast-forward or - ! reverse if the CD is paused. -! XCdplayer*pauseSkipInterval: 20 - - ! scanPauseInterval is the number of seconds between each fast_forward or - ! reverse while holding down the buttons. (Sun CDs have a dreadfully long - ! start-up time for the audio to actually become audible, so "hearing the - ! track" while scanning isn't very feasible.) -! XCdplayer*scanPauseInterval: 0.25 - ! pausePauseInterval does the same thing when the disc is paused. - XCdplayer*pausePauseInterval: 0.5 - -*************** -*** 56,62 **** - XCdplayer*Viewport.allowHoriz: True - XCdplayer*Viewport.useBottom: True - XCdplayer*Viewport.forceBars: False -! XCdplayer*Viewport.width: 188 - XCdplayer*Viewport.height: 30 - XCdplayer*Viewport*thickness: 8 - XCdplayer*Viewport.resizable: False ---- 55,61 ---- - XCdplayer*Viewport.allowHoriz: True - XCdplayer*Viewport.useBottom: True - XCdplayer*Viewport.forceBars: False -! XCdplayer*Viewport.width: 160 - XCdplayer*Viewport.height: 30 - XCdplayer*Viewport*thickness: 8 - XCdplayer*Viewport.resizable: False -*************** -*** 88,98 **** - XCdplayer*Toggle.right: ChainLeft - XCdplayer*Toggle.background: Ivory - -! XCdplayer*ledsLabel.horizDistance: 20 - XCdplayer*ledsLabel.fromVert: versionLabel - XCdplayer*ledsLabel.fromHoriz: logoLabel - -! XCdplayer*trackButton.horizDistance: 8 - XCdplayer*trackButton.fromVert: versionLabel - XCdplayer*trackButton.fromHoriz: ledsLabel - XCdplayer*trackButton.borderWidth: 2 ---- 87,97 ---- - XCdplayer*Toggle.right: ChainLeft - XCdplayer*Toggle.background: Ivory - -! XCdplayer*ledsLabel.horizDistance: 4 - XCdplayer*ledsLabel.fromVert: versionLabel - XCdplayer*ledsLabel.fromHoriz: logoLabel - -! XCdplayer*trackButton.horizDistance: 4 - XCdplayer*trackButton.fromVert: versionLabel - XCdplayer*trackButton.fromHoriz: ledsLabel - XCdplayer*trackButton.borderWidth: 2 -*************** -*** 108,134 **** - XCdplayer*timerButton.left: ChainRight - XCdplayer*timerButton.right: ChainRight - -! XCdplayer*volumeScrollbar.horizDistance:8 - XCdplayer*volumeScrollbar.fromHoriz: logoLabel - XCdplayer*volumeScrollbar.fromVert: trackButton - XCdplayer*volumeScrollbar.orientation: horizontal -! XCdplayer*volumeScrollbar.length: 120 - XCdplayer*volumeScrollbar.right: ChainRight - XCdplayer*volumeScrollbar.left: ChainRight - XCdplayer*volumeScrollbar.background: green - XCdplayer*volumeScrollbar.foreground: white -! XCdplayer*volumeScrollbar.thumb: black - - XCdplayer*titleBarViewport.fromVert: volumeScrollbar -- XCdplayer*titleBarViewport.forceBars: true - XCdplayer*titleBar.borderwidth: 0 - XCdplayer*titleBar.highlightThickness: 1 - XCdplayer*titleBar.foreground: Red - XCdplayer*titleBar.background: Ivory -- -- XCdplayer*titleDialog.Text.translations:#override\ -- <Key>Return: done() -- - XCdplayer*buttonsForm.fromVert: logoForm - XCdplayer*buttonsForm.borderWidth: 1 - ---- 107,128 ---- - XCdplayer*timerButton.left: ChainRight - XCdplayer*timerButton.right: ChainRight - -! XCdplayer*volumeScrollbar.horizDistance:4 - XCdplayer*volumeScrollbar.fromHoriz: logoLabel - XCdplayer*volumeScrollbar.fromVert: trackButton - XCdplayer*volumeScrollbar.orientation: horizontal -! XCdplayer*volumeScrollbar.length: 93 - XCdplayer*volumeScrollbar.right: ChainRight - XCdplayer*volumeScrollbar.left: ChainRight - XCdplayer*volumeScrollbar.background: green - XCdplayer*volumeScrollbar.foreground: white -! XCdplayer*volumeScrollbar.thumb: black - - XCdplayer*titleBarViewport.fromVert: volumeScrollbar - XCdplayer*titleBar.borderwidth: 0 - XCdplayer*titleBar.highlightThickness: 1 - XCdplayer*titleBar.foreground: Red - XCdplayer*titleBar.background: Ivory - XCdplayer*buttonsForm.fromVert: logoForm - XCdplayer*buttonsForm.borderWidth: 1 - +$NetBSD + +--- cdrom_callb.c.orig Tue Jan 12 19:59:48 1993 ++++ cdrom_callb.c Mon Sep 6 18:22:06 1999 +@@ -22,6 +22,9 @@ + + # 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 +@@ -29,6 +32,8 @@ + # include "cdrom_sgi.h" + #endif + ++extern AppData app_data; ++ + void cdrom_new_disc(); + + /* +@@ -287,7 +292,7 @@ + * 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) && |