$NetBSD: patch-ai,v 1.1 1998/08/23 06:49:29 garbled Exp $ --- internals.c.orig Tue Jan 12 11:59:45 1993 +++ internals.c Wed Jul 22 21:35:54 1998 @@ -24,2 +24,5 @@ # include "cdrom_globs.h" +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) +# include "cdrom_freebsd.h" +#endif #ifdef sun @@ -31,3 +34,3 @@ - +static void scan_update(); static XtIntervalId ivid = -1; @@ -38,2 +41,3 @@ +extern AppData app_data; @@ -172,3 +176,2 @@ int curtrack; - extern void scan_update(); @@ -198,3 +201,3 @@ ((start_addr.minute * 60) + start_addr.second - - scanSkipInterval)) || + app_data.scanSkipInterval)) || ((cdi.state & CDROM_STATE_PAUSE) && @@ -202,3 +205,3 @@ ((start_addr.minute * 60) + start_addr.second - - pauseSkipInterval))) + app_data.pauseSkipInterval))) { @@ -210,5 +213,5 @@ 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; } @@ -225,5 +228,5 @@ 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; } @@ -276,3 +279,3 @@ scanivid = XtAppAddTimeOut(appc, - (int)(pausePauseInterval * 1000.0), + (int)(app_data.pausePauseInterval * 1000.0), scan_update, NULL); @@ -306,3 +309,2 @@ int curtrack; - extern void scan_update(); @@ -334,3 +336,3 @@ ((start_addr.minute * 60) + start_addr.second + - scanSkipInterval)) || + app_data.scanSkipInterval)) || ((cdi.state & CDROM_STATE_PAUSE) && @@ -338,3 +340,3 @@ ((start_addr.minute * 60) + start_addr.second + - pauseSkipInterval))) + app_data.pauseSkipInterval))) { @@ -348,5 +350,5 @@ 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; } @@ -362,5 +364,5 @@ 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; } @@ -415,3 +417,3 @@ scanivid = XtAppAddTimeOut(appc, - (int)(pausePauseInterval * 1000.0), + (int)(app_data.pausePauseInterval * 1000.0), scan_update, NULL); @@ -559,3 +561,3 @@ ivid = XtAppAddTimeOut(appc, - (int)(scanPauseInterval * 1000.0), + (int)(app_data.scanPauseInterval * 1000.0), scan_update, NULL); @@ -576,3 +578,3 @@ ivid = XtAppAddTimeOut(appc, - (int)(scanPauseInterval * 1000.0), + (int)(app_data.scanPauseInterval * 1000.0), scan_update, NULL); @@ -664,3 +666,3 @@ ivid = XtAppAddTimeOut(appc, - (int)(scanPauseInterval * 1000.0), + (int)(app_data.scanPauseInterval * 1000.0), update_track, NULL); @@ -681,3 +683,3 @@ ivid = XtAppAddTimeOut(appc, - (int)(scanPauseInterval * 1000.0), + (int)(app_data.scanPauseInterval * 1000.0), update_track, NULL);