head 1.4; access; symbols pkgsrc-2023Q4:1.4.0.150 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.148 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.146 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.144 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.142 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.140 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.138 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.136 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.134 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.132 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.130 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.128 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.126 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.124 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.120 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.100 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.122 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.118 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.116 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.114 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.112 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.110 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.108 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.106 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.104 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.102 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.98 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.96 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.94 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.92 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.90 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.88 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.86 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.84 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.82 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.80 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.78 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.76 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.74 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.72 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.70 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.68 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.66 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.64 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.62 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.60 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.58 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.56 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.54 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.52 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.50 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.48 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.46 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.44 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.42 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.40 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.38 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.36 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.34 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.32 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.30 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.28 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.26 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.24 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.22 pkgsrc-2008Q1:1.4.0.20 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.18 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.16 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.14 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.12 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.10 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.8 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.6 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.4 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.2 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.3.0.24 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.22 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.20 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.18 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.16 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.14 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.12 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.10 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.3.0.6 netbsd-1-6-1-base:1.3 netbsd-1-6:1.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3 netbsd-1-5-PATCH001:1.3 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3 netbsd-1-4-PATCH002:1.3 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.1 netbsd-1-4-RELEASE:1.1 netbsd-1-3-PATCH003:1.1; locks; strict; comment @# @; 1.4 date 2005.12.11.20.48.46; author joerg; state Exp; branches; next 1.3; 1.3 date 99.09.06.16.37.42; author tron; state Exp; branches; next 1.2; 1.2 date 99.09.06.16.36.32; author tron; state Exp; branches; next 1.1; 1.1 date 98.08.23.06.49.29; author garbled; state Exp; branches; next ; desc @@ 1.4 log @DragonFly support. XXX Is sys/buf.h needed at all in cdrom_freebsd.c? @ text @$NetBSD: patch-ae,v 1.3 1999/09/06 16:37:42 tron Exp $ --- cdrom_callb.c.orig Tue Jan 12 19:59:48 1993 +++ cdrom_callb.c Mon Sep 6 18:37:05 1999 @@@@ -22,6 +22,9 @@@@ # include "debug.h" # include "cdrom_globs.h" +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) +# 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) && @ 1.3 log @Fix RCS Ids. @ text @d1 1 a1 1 $NetBSD$ d9 1 a9 1 +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) @ 1.2 log @Convert patches to unified output format. @ text @d1 1 a1 1 $NetBSD d4 1 a4 1 +++ cdrom_callb.c Mon Sep 6 18:22:06 1999 @ 1.1 log @Added and fixed patches to allow build on alpha. Closes PR 5815 (Tim Rightnour) @ text @d1 32 a32 156 $NetBSD$ *** 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\ - 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 @