| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209 |
- $OpenBSD: patch-internals_c,v 1.3 2017/04/19 15:26:59 espie Exp $
- --- internals.c.orig Tue Jan 12 19:59:45 1993
- +++ internals.c Wed Apr 19 17:25:18 2017
- @@ -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,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) ||
- @@ -77,13 +81,13 @@ cdrom_get_curtime() {
- }
-
-
- +static void update_track();
- /*
- * we poll the cd-rom drive every TIMER_PERIOD milliseconds to see where
- * it is and if it's on a new track, and update the label widget.
- */
- void
- cdrom_timer_on() {
- - static void update_track();
-
- if (cdi.state & CDROM_STATE_PLAY)
- ivid = XtAppAddTimeOut(appc, TIMER_PERIOD, update_track, NULL);
- @@ -170,7 +174,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 +199,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 +211,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 +226,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 +277,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 +307,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 +334,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 +348,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 +362,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 +415,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 */
- @@ -557,7 +559,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 +576,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) {
- @@ -662,7 +664,7 @@ update_track(data, id)
- cdi.state &= ~CDROM_STATE_STOP;
- }
- ivid = XtAppAddTimeOut(appc,
- - (int)(scanPauseInterval * 1000.0),
- + (int)(app_data.scanPauseInterval * 1000.0),
- update_track, NULL);
- }
- else
- @@ -679,7 +681,7 @@ update_track(data, id)
- }
-
- ivid = XtAppAddTimeOut(appc,
- - (int)(scanPauseInterval * 1000.0),
- + (int)(app_data.scanPauseInterval * 1000.0),
- update_track, NULL);
- }
- else
|
