head 1.6; access; symbols pkgsrc-2026Q1:1.6.0.118 pkgsrc-2026Q1-base:1.6 pkgsrc-2025Q4:1.6.0.116 pkgsrc-2025Q4-base:1.6 pkgsrc-2025Q3:1.6.0.114 pkgsrc-2025Q3-base:1.6 pkgsrc-2025Q2:1.6.0.112 pkgsrc-2025Q2-base:1.6 pkgsrc-2025Q1:1.6.0.110 pkgsrc-2025Q1-base:1.6 pkgsrc-2024Q4:1.6.0.108 pkgsrc-2024Q4-base:1.6 pkgsrc-2024Q3:1.6.0.106 pkgsrc-2024Q3-base:1.6 pkgsrc-2024Q2:1.6.0.104 pkgsrc-2024Q2-base:1.6 pkgsrc-2024Q1:1.6.0.102 pkgsrc-2024Q1-base:1.6 pkgsrc-2023Q4:1.6.0.100 pkgsrc-2023Q4-base:1.6 pkgsrc-2023Q3:1.6.0.98 pkgsrc-2023Q3-base:1.6 pkgsrc-2023Q2:1.6.0.96 pkgsrc-2023Q2-base:1.6 pkgsrc-2023Q1:1.6.0.94 pkgsrc-2023Q1-base:1.6 pkgsrc-2022Q4:1.6.0.92 pkgsrc-2022Q4-base:1.6 pkgsrc-2022Q3:1.6.0.90 pkgsrc-2022Q3-base:1.6 pkgsrc-2022Q2:1.6.0.88 pkgsrc-2022Q2-base:1.6 pkgsrc-2022Q1:1.6.0.86 pkgsrc-2022Q1-base:1.6 pkgsrc-2021Q4:1.6.0.84 pkgsrc-2021Q4-base:1.6 pkgsrc-2021Q3:1.6.0.82 pkgsrc-2021Q3-base:1.6 pkgsrc-2021Q2:1.6.0.80 pkgsrc-2021Q2-base:1.6 pkgsrc-2021Q1:1.6.0.78 pkgsrc-2021Q1-base:1.6 pkgsrc-2020Q4:1.6.0.76 pkgsrc-2020Q4-base:1.6 pkgsrc-2020Q3:1.6.0.74 pkgsrc-2020Q3-base:1.6 pkgsrc-2020Q2:1.6.0.70 pkgsrc-2020Q2-base:1.6 pkgsrc-2020Q1:1.6.0.50 pkgsrc-2020Q1-base:1.6 pkgsrc-2019Q4:1.6.0.72 pkgsrc-2019Q4-base:1.6 pkgsrc-2019Q3:1.6.0.68 pkgsrc-2019Q3-base:1.6 pkgsrc-2019Q2:1.6.0.66 pkgsrc-2019Q2-base:1.6 pkgsrc-2019Q1:1.6.0.64 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.6.0.62 pkgsrc-2018Q4-base:1.6 pkgsrc-2018Q3:1.6.0.60 pkgsrc-2018Q3-base:1.6 pkgsrc-2018Q2:1.6.0.58 pkgsrc-2018Q2-base:1.6 pkgsrc-2018Q1:1.6.0.56 pkgsrc-2018Q1-base:1.6 pkgsrc-2017Q4:1.6.0.54 pkgsrc-2017Q4-base:1.6 pkgsrc-2017Q3:1.6.0.52 pkgsrc-2017Q3-base:1.6 pkgsrc-2017Q2:1.6.0.48 pkgsrc-2017Q2-base:1.6 pkgsrc-2017Q1:1.6.0.46 pkgsrc-2017Q1-base:1.6 pkgsrc-2016Q4:1.6.0.44 pkgsrc-2016Q4-base:1.6 pkgsrc-2016Q3:1.6.0.42 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.40 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.38 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.36 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.6.0.34 pkgsrc-2015Q3-base:1.6 pkgsrc-2015Q2:1.6.0.32 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.6.0.30 pkgsrc-2015Q1-base:1.6 pkgsrc-2014Q4:1.6.0.28 pkgsrc-2014Q4-base:1.6 pkgsrc-2014Q3:1.6.0.26 pkgsrc-2014Q3-base:1.6 pkgsrc-2014Q2:1.6.0.24 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.22 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.20 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.18 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.16 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.6.0.14 pkgsrc-2013Q1-base:1.6 pkgsrc-2012Q4:1.6.0.12 pkgsrc-2012Q4-base:1.6 pkgsrc-2012Q3:1.6.0.10 pkgsrc-2012Q3-base:1.6 pkgsrc-2012Q2:1.6.0.8 pkgsrc-2012Q2-base:1.6 pkgsrc-2012Q1:1.6.0.6 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.4 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.2 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.5.0.44 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.42 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.40 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.38 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.36 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.34 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.32 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.30 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.28 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.26 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.24 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.22 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.20 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.18 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.16 pkgsrc-2008Q1:1.5.0.14 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.12 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.10 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.8 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.6 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.4 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.2 pkgsrc-2006Q3-base:1.5 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.6 date 2011.09.12.06.50.00; author dholland; state Exp; branches; next 1.5; 1.5 date 2006.08.12.14.51.39; author darcy; state Exp; branches; next 1.4; 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.43; author tron; state Exp; branches; next 1.2; 1.2 date 99.09.06.16.36.33; 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.6 log @Fix mismatched return statements, which clang dislikes @ text @$NetBSD: patch-ah,v 1.5 2006/08/12 14:51:39 darcy Exp $ - support cdrom access on BSDs - get function decls out of function bodies, which gcc dislikes - fix mismatched return statements, which clang dislikes - ...more (?) --- internals.c.orig 1993-01-12 18:59:45.000000000 +0000 +++ internals.c @@@@ -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,13 +32,14 @@@@ # include "cdrom_sgi.h" #endif - +static void scan_update(); static XtIntervalId ivid = -1; static XtIntervalId scanivid = -1; static XtIntervalId stativid = -1; static unsigned int timer_mod = 1000 / TIMER_PERIOD; unsigned int timer_fsecs; +extern AppData app_data; int cdrom_get_curtime() { @@@@ -46,7 +50,7 @@@@ cdrom_get_curtime() { if (cdrom_open() == -1) { debug_printf(1, "cdrom_get_curtime: error from cdrom_open\n"); - return; + return 0; } switch (cdrom_status()) { @@@@ -54,7 +58,7 @@@@ cdrom_get_curtime() { case CDROM_PLAYING: if (cdrom_get_curmsf(&curmsf) == -1) { debug_printf(1, "get_curtime: error reading location\n"); - return; + return 0; } if (((curtrack = cdrom_get_curtrack()) == -1) || @@@@ -76,6 +80,170 @@@@ cdrom_get_curtime() { } } +/* + * called by update_track when the cd has hit + * the end of the track or the disc. + */ +static void +cdrom_atend() { + cdrom_timer_off(); + leds_stop(); + debug_printf(1, "cdrom_atend: at end\n"); + +#ifdef sgi + /* Force a stop to kill the child (if any). + * This is due to some sort of weirdness when the SGI runs off the + * disc during a CDreadda(). + */ + if (cdi.scsi_audio) { + cdrom_stop(); + } +#endif + if (cdi.state & CDROM_STATE_SHUFFLE) { + + if (cdi.currand == cdi.ntracks) { + if ((cdi.state & CDROM_STATE_CYCLE) == 0) { + debug_printf(1, "cdrom_atend: shuffle done\n"); + + cdrom_reset(); + return; + } + + debug_printf(1, "cdrom_atend: shuffle cycling\n"); + shuffle_setup(); + } + + cdi.curtrack = shuffle_next_track(); + } + else if (cdi.state & CDROM_STATE_PROGRAM) { + if ((cdi.curtrack = program_goto_next_track()) == 0) + { + if (cdi.state & CDROM_STATE_CYCLE) + { + debug_printf(1, "cdrom_atend: cycling program\n"); + cdi.curtrack = program_resume(); + timer_fsecs = 0; + cdi.duration = 0; + timer_button_update(); + + (void) cdrom_play(); + } + else + { + debug_printf(1, "cdrom_atend: all done\n"); + cdrom_reset(); + } + return; + } + } + + else if ((cdi.curtrack < cdi.maxtrack) && (cdi.curtrack != 0)) { + debug_printf(1, "cdrom_atend: continuing\n"); + cdi.curtrack++; + } + else if (cdi.state & CDROM_STATE_CYCLE) { + debug_printf(1, "cdrom_atend: cycling\n"); + cdi.curtrack = cdi.mintrack; + } + else { + debug_printf(1, "cdrom_atend: all done\n"); + buttons_reset(); + cdrom_reset(); + return; + } + + timer_fsecs = 0; + cdi.duration = 0; + timer_button_update(); + + (void) cdrom_play(); +} + +/* + * update_track is called when the timeout fires; it updates curtrack and + * calls the label update routine. + */ +/*ARGSUSED*/ +static void +update_track(data, id) + XtPointer *data; + XtIntervalId *id; +{ + unsigned int curtrack; + Arg args[1]; + Boolean state; + + extern Widget rew_button_widget; + extern Widget ff_button_widget; +#ifdef sgi + + int vol; +#endif + + if ((curtrack = cdrom_get_curtrack()) != cdi.curtrack) { + if (curtrack == 0) { + cdrom_atend(); + + return; + } + + timer_fsecs = 0; + cdi.duration = 0; + timer_button_update(); + + cdi.curtrack = curtrack; + track_button_update(); + } + +#ifdef sgi + /* Update the volume control */ + if ((vol = cdrom_get_volume()) != 0) { + set_volume(vol); + } +#endif + + XtSetArg(args[0], XtNstate, &state); + XtGetValues(rew_button_widget, args, 1); + if (state == True) + { + cdrom_rewind(); + leds_update(BACKWARDS); + if (cdi.state & CDROM_STATE_PAUSE) { + if (cdrom_pause() != -1) + cdi.state &= ~CDROM_STATE_STOP; + } + ivid = XtAppAddTimeOut(appc, + (int)(app_data.scanPauseInterval * 1000.0), + update_track, NULL); + } + else + { + leds_update(FORWARDS); + XtSetArg(args[0], XtNstate, &state); + XtGetValues(ff_button_widget, args, 1); + if (state == True) + { + cdrom_ff(); + if (cdi.state & CDROM_STATE_PAUSE) { + if (cdrom_pause() != -1) + cdi.state &= ~CDROM_STATE_STOP; + } + + ivid = XtAppAddTimeOut(appc, + (int)(app_data.scanPauseInterval * 1000.0), + update_track, NULL); + } + else + { + if ((timer_fsecs++ % timer_mod) == 0) { + timer_button_update(); + } + ivid = XtAppAddTimeOut(appc, TIMER_PERIOD, + update_track, NULL); + } + } +} + /* * we poll the cd-rom drive every TIMER_PERIOD milliseconds to see where @@@@ -83,8 +251,6 @@@@ cdrom_get_curtime() { */ void cdrom_timer_on() { - static void update_track(); - if (cdi.state & CDROM_STATE_PLAY) ivid = XtAppAddTimeOut(appc, TIMER_PERIOD, update_track, NULL); } @@@@ -170,7 +336,6 @@@@ cdrom_rewind () { struct msf track_start; struct msf start_addr, end_addr; int curtrack; - extern void scan_update(); if (cdrom_get_curmsf(&start_addr) == -1) { debug_printf(1, "rew: error reading location\n"); @@@@ -196,11 +361,11 @@@@ cdrom_rewind () { if (((cdi.state & CDROM_STATE_PLAY) && ((track_start.minute * 60) + track_start.second) >= ((start_addr.minute * 60) + start_addr.second - - scanSkipInterval)) || + app_data.scanSkipInterval)) || ((cdi.state & CDROM_STATE_PAUSE) && ((track_start.minute * 60) + track_start.second) >= ((start_addr.minute * 60) + start_addr.second - - pauseSkipInterval))) + app_data.pauseSkipInterval))) { start_addr = track_start; start_addr.second++; /* guarantee we never back up too far */ @@@@ -208,9 +373,9 @@@@ cdrom_rewind () { else { if (cdi.state & CDROM_STATE_PAUSE) { - start_addr.second -= pauseSkipInterval; + start_addr.second -= app_data.pauseSkipInterval; } else if (cdi.state & CDROM_STATE_PLAY) { - start_addr.second -= scanSkipInterval; + start_addr.second -= app_data.scanSkipInterval; } if ((char) start_addr.second < 0) { @@@@ -223,9 +388,9 @@@@ cdrom_rewind () { else /* normal case */ { if (cdi.state & CDROM_STATE_PAUSE) { - start_addr.second -= pauseSkipInterval; + start_addr.second -= app_data.pauseSkipInterval; } else if (cdi.state & CDROM_STATE_PLAY) { - start_addr.second -= scanSkipInterval; + start_addr.second -= app_data.scanSkipInterval; } if ((char) start_addr.second < 0) { @@@@ -274,7 +439,7 @@@@ cdrom_rewind () { { if (scanivid == -1) scanivid = XtAppAddTimeOut(appc, - (int)(pausePauseInterval * 1000.0), + (int)(app_data.pausePauseInterval * 1000.0), scan_update, NULL); cdi.state &= ~CDROM_STATE_PAUSE; /* allow timer to change */ @@@@ -304,7 +469,6 @@@@ cdrom_ff () { struct msf start_addr, end_addr, next_start; char t; int curtrack; - extern void scan_update(); if (cdrom_get_curmsf(&start_addr) == -1) { debug_printf(1, "ff: error reading location\n"); @@@@ -332,11 +496,11 @@@@ cdrom_ff () { if (((cdi.state & CDROM_STATE_PLAY) && ((next_start.minute * 60) + next_start.second) <= ((start_addr.minute * 60) + start_addr.second + - scanSkipInterval)) || + app_data.scanSkipInterval)) || ((cdi.state & CDROM_STATE_PAUSE) && ((next_start.minute * 60) + next_start.second) <= ((start_addr.minute * 60) + start_addr.second + - pauseSkipInterval))) + app_data.pauseSkipInterval))) { /* start at end of current track */ @@@@ -346,9 +510,9 @@@@ cdrom_ff () { else { if (cdi.state & CDROM_STATE_PAUSE) { - start_addr.second += pauseSkipInterval; + start_addr.second += app_data.pauseSkipInterval; } else if (cdi.state & CDROM_STATE_PLAY) { - start_addr.second += scanSkipInterval; + start_addr.second += app_data.scanSkipInterval; } if (start_addr.second >= 60) { @@@@ -360,9 +524,9 @@@@ cdrom_ff () { else { if (cdi.state & CDROM_STATE_PAUSE) { - start_addr.second += pauseSkipInterval; + start_addr.second += app_data.pauseSkipInterval; } else if (cdi.state & CDROM_STATE_PLAY) { - start_addr.second += scanSkipInterval; + start_addr.second += app_data.scanSkipInterval; } if (start_addr.second >= 60) { @@@@ -413,7 +577,7 @@@@ cdrom_ff () { { if (scanivid == -1) scanivid = XtAppAddTimeOut(appc, - (int)(pausePauseInterval * 1000.0), + (int)(app_data.pausePauseInterval * 1000.0), scan_update, NULL); cdi.state &= ~CDROM_STATE_PAUSE; /* allow timer to change */ @@@@ -435,85 +599,6 @@@@ cdrom_ff () { /* - * called by update_track when the cd has hit - * the end of the track or the disc. - */ -static void -cdrom_atend() { - cdrom_timer_off(); - leds_stop(); - debug_printf(1, "cdrom_atend: at end\n"); - -#ifdef sgi - /* Force a stop to kill the child (if any). - * This is due to some sort of weirdness when the SGI runs off the - * disc during a CDreadda(). - */ - if (cdi.scsi_audio) { - cdrom_stop(); - } -#endif - if (cdi.state & CDROM_STATE_SHUFFLE) { - - if (cdi.currand == cdi.ntracks) { - if ((cdi.state & CDROM_STATE_CYCLE) == 0) { - debug_printf(1, "cdrom_atend: shuffle done\n"); - - cdrom_reset(); - return; - } - - debug_printf(1, "cdrom_atend: shuffle cycling\n"); - shuffle_setup(); - } - - cdi.curtrack = shuffle_next_track(); - } - else if (cdi.state & CDROM_STATE_PROGRAM) { - if ((cdi.curtrack = program_goto_next_track()) == 0) - { - if (cdi.state & CDROM_STATE_CYCLE) - { - debug_printf(1, "cdrom_atend: cycling program\n"); - cdi.curtrack = program_resume(); - timer_fsecs = 0; - cdi.duration = 0; - timer_button_update(); - - (void) cdrom_play(); - } - else - { - debug_printf(1, "cdrom_atend: all done\n"); - cdrom_reset(); - } - return; - } - } - - else if ((cdi.curtrack < cdi.maxtrack) && (cdi.curtrack != 0)) { - debug_printf(1, "cdrom_atend: continuing\n"); - cdi.curtrack++; - } - else if (cdi.state & CDROM_STATE_CYCLE) { - debug_printf(1, "cdrom_atend: cycling\n"); - cdi.curtrack = cdi.mintrack; - } - else { - debug_printf(1, "cdrom_atend: all done\n"); - buttons_reset(); - cdrom_reset(); - return; - } - - timer_fsecs = 0; - cdi.duration = 0; - timer_button_update(); - - (void) cdrom_play(); -} - -/* * scan_update is called when the scan timeout fires; it updates the timer * and calls the label update routine. */ @@@@ -557,7 +642,7 @@@@ scan_update(data, id) cdi.state &= ~CDROM_STATE_STOP; } ivid = XtAppAddTimeOut(appc, - (int)(scanPauseInterval * 1000.0), + (int)(app_data.scanPauseInterval * 1000.0), scan_update, NULL); } else @@@@ -574,7 +659,7 @@@@ scan_update(data, id) } ivid = XtAppAddTimeOut(appc, - (int)(scanPauseInterval * 1000.0), + (int)(app_data.scanPauseInterval * 1000.0), scan_update, NULL); } else if (scanivid != -1) { @@@@ -607,89 +692,3 @@@@ update_status(data, id) /* Reset timer */ stativid = XtAppAddTimeOut(appc, 1000, update_status, NULL); } - -/* - * update_track is called when the timeout fires; it updates curtrack and - * calls the label update routine. - */ -/*ARGSUSED*/ -static void -update_track(data, id) - XtPointer *data; - XtIntervalId *id; -{ - unsigned int curtrack; - Arg args[1]; - Boolean state; - - extern Widget rew_button_widget; - extern Widget ff_button_widget; -#ifdef sgi - - int vol; -#endif - - if ((curtrack = cdrom_get_curtrack()) != cdi.curtrack) { - if (curtrack == 0) { - cdrom_atend(); - - return; - } - - timer_fsecs = 0; - cdi.duration = 0; - timer_button_update(); - - cdi.curtrack = curtrack; - track_button_update(); - } - -#ifdef sgi - /* Update the volume control */ - if ((vol = cdrom_get_volume()) != 0) { - set_volume(vol); - } -#endif - - XtSetArg(args[0], XtNstate, &state); - XtGetValues(rew_button_widget, args, 1); - if (state == True) - { - cdrom_rewind(); - leds_update(BACKWARDS); - if (cdi.state & CDROM_STATE_PAUSE) { - if (cdrom_pause() != -1) - cdi.state &= ~CDROM_STATE_STOP; - } - ivid = XtAppAddTimeOut(appc, - (int)(scanPauseInterval * 1000.0), - update_track, NULL); - } - else - { - leds_update(FORWARDS); - XtSetArg(args[0], XtNstate, &state); - XtGetValues(ff_button_widget, args, 1); - if (state == True) - { - cdrom_ff(); - if (cdi.state & CDROM_STATE_PAUSE) { - if (cdrom_pause() != -1) - cdi.state &= ~CDROM_STATE_STOP; - } - - ivid = XtAppAddTimeOut(appc, - (int)(scanPauseInterval * 1000.0), - update_track, NULL); - } - else - { - if ((timer_fsecs++ % timer_mod) == 0) { - timer_button_update(); - } - ivid = XtAppAddTimeOut(appc, TIMER_PERIOD, - update_track, NULL); - } - } -} - @ 1.5 log @Rearrange position of some static functions to allow them to self-define and compile under GCC-4. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.4 2005/12/11 20:48:46 joerg Exp $ d3 6 a8 1 --- internals.c.orig Tue Jan 12 19:59:45 1993 d36 18 @ 1.4 log @DragonFly support. XXX Is sys/buf.h needed at all in cdrom_freebsd.c? @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.3 1999/09/06 16:37:43 tron Exp $ d4 1 a4 1 +++ internals.c Mon Sep 6 18:37:05 1999 d31 181 a211 1 @@@@ -170,7 +174,6 @@@@ d219 1 a219 1 @@@@ -196,11 +199,11 @@@@ d233 1 a233 1 @@@@ -208,9 +211,9 @@@@ d245 1 a245 1 @@@@ -223,9 +226,9 @@@@ d257 1 a257 1 @@@@ -274,7 +277,7 @@@@ d266 1 a266 1 @@@@ -304,7 +307,6 @@@@ d274 1 a274 1 @@@@ -332,11 +334,11 @@@@ d288 1 a288 1 @@@@ -346,9 +348,9 @@@@ d300 1 a300 1 @@@@ -360,9 +362,9 @@@@ d312 1 a312 1 @@@@ -413,7 +415,7 @@@@ d321 87 a407 1 @@@@ -557,7 +559,7 @@@@ d416 1 a416 1 @@@@ -574,7 +576,7 @@@@ d425 59 a483 4 @@@@ -662,7 +664,7 @@@@ cdi.state &= ~CDROM_STATE_STOP; } ivid = XtAppAddTimeOut(appc, d485 16 a500 8 + (int)(app_data.scanPauseInterval * 1000.0), update_track, NULL); } else @@@@ -679,7 +681,7 @@@@ } ivid = XtAppAddTimeOut(appc, d502 13 a514 4 + (int)(app_data.scanPauseInterval * 1000.0), update_track, NULL); } else @ 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 +++ internals.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 7 a7 4 $NetBSD$ --- cdrom_callb.c.orig Tue Jan 12 11:59:48 1993 +++ cdrom_callb.c Wed Jul 22 21:25:45 1998 @@@@ -24,2 +24,5 @@@@ d13 13 a25 1 @@@@ -31,2 +34,4 @@@@ d28 105 a132 6 + void cdrom_new_disc(); @@@@ -289,3 +294,3 @@@@ */ - if (cdi.duration < replayThreshold) + if (cdi.duration < app_data.replayThreshold) d134 43 @