diff options
| author | garbled <garbled@pkgsrc.org> | 1998-08-23 06:47:02 +0000 |
|---|---|---|
| committer | garbled <garbled@pkgsrc.org> | 1998-08-23 06:47:02 +0000 |
| commit | 8886740bfeaea007e181daee92e344911de98552 (patch) | |
| tree | c21ef335b45179f47a07a169661b381a5010506b /audio/xcdplayer | |
| parent | 012b3eb126834255cd42695d8344d10ef1e16594 (diff) | |
| download | pkgsrc-8886740bfeaea007e181daee92e344911de98552.tar.gz | |
Fixing build on alpha. fixes PR 5815 (Tim Rightnour)
Diffstat (limited to 'audio/xcdplayer')
| -rw-r--r-- | audio/xcdplayer/files/cdrom_freebsd.c | 17 | ||||
| -rw-r--r-- | audio/xcdplayer/files/cdrom_freebsd.h | 3 |
2 files changed, 10 insertions, 10 deletions
diff --git a/audio/xcdplayer/files/cdrom_freebsd.c b/audio/xcdplayer/files/cdrom_freebsd.c index 756d9c0d9ac..ac89df7cf29 100644 --- a/audio/xcdplayer/files/cdrom_freebsd.c +++ b/audio/xcdplayer/files/cdrom_freebsd.c @@ -1,5 +1,4 @@ -/* $NetBSD: cdrom_freebsd.c,v 1.3 1998/08/07 10:36:19 agc Exp $ */ - +$NetBSD: cdrom_freebsd.c,v 1.4 1998/08/23 06:47:02 garbled Exp $ /* * Copyright (C) 1990 Regents of the University of California. * @@ -32,8 +31,8 @@ static int c; # include "debug.h" # include "cdrom_freebsd.h" +# include "app.h" -extern char *device; #ifdef __NetBSD__ static char cdrom[] = "/dev/rcd0d"; static char cdrom1[] = "/dev/rmcd0d"; @@ -48,6 +47,8 @@ FILE *disc_info = NULL; static int cdrom_fd = -1; +extern AppData app_data; + get_stored_info() { int i,n; @@ -67,8 +68,8 @@ get_stored_info() n = n / cdi.maxtrack; disc_title = NULL; - if (cdInfoDir != NULL) - sprintf(info_filename, "%s/cd.%d", cdInfoDir, n); + if (app_data.cdInfoDir != NULL) + sprintf(info_filename, "%s/cd.%d", app_data.cdInfoDir, n); else sprintf(info_filename, "cd.%d", n); @@ -101,9 +102,9 @@ cdrom_open() { if (cdrom_fd != -1) return(cdi.curtrack); - if (device != NULL) { - if ((cdrom_fd = open(device, O_RDONLY)) == -1) { - perror(device); + if (app_data.device != NULL) { + if ((cdrom_fd = open(app_data.device, O_RDONLY)) == -1) { + perror(app_data.device); return(-1); } } else { diff --git a/audio/xcdplayer/files/cdrom_freebsd.h b/audio/xcdplayer/files/cdrom_freebsd.h index 5ba6a49c552..1168ee03d9b 100644 --- a/audio/xcdplayer/files/cdrom_freebsd.h +++ b/audio/xcdplayer/files/cdrom_freebsd.h @@ -1,5 +1,4 @@ -/* $NetBSD: cdrom_freebsd.h,v 1.2 1998/08/07 10:36:19 agc Exp $ */ - +$NetBSD: cdrom_freebsd.h,v 1.3 1998/08/23 06:47:03 garbled Exp $ /* * Copyright (C) 1990 Regents of the University of California. * |