Remove cdplay, cdcontrol is superset of it

4 files changed, 3 insertions, 464 deletions

diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 888b591..9fc54fd 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.20 (Berkeley) 6/12/93
-#	$Id: Makefile,v 1.79 1996/01/27 17:57:15 joerg Exp $
+#	$Id: Makefile,v 1.80 1996/02/04 10:11:35 pst Exp $
 
 # XXX MISSING:		mkproto
 SUBDIR= ac accton adduser amd arp bootparamd cdcontrol chown chroot \
@@ -25,13 +25,13 @@ SUBDIR= ac accton adduser amd arp bootparamd cdcontrol chown chroot \
 SUBDIR+=IPXrouted
 
 .if   make(clean) || make(cleandir)
-SUBDIR+=apm apmconf bad144 cdplay config fdformat fdwrite \
+SUBDIR+=apm apmconf bad144 config fdformat fdwrite \
 	fdcontrol iostat kbdcontrol kbdmap lptcontrol mixer ncrcontrol \
 	qcamcontrol rtprio sgsc sicontrol spkrtest vidcontrol
 .elif ${MACHINE} == "hp300"
 SUBDIR+=config iostat
 .elif ${MACHINE} == "i386"
-SUBDIR+=apm apmconf bad144 cdplay config fdformat fdwrite fdcontrol iostat \
+SUBDIR+=apm apmconf bad144 config fdformat fdwrite fdcontrol iostat \
 	kbdcontrol kbdmap lptcontrol mixer ncrcontrol qcamcontrol \
 	rtprio sgsc sicontrol spkrtest vidcontrol
 .elif ${MACHINE} == "luna68k"
diff --git a/usr.sbin/cdplay/Makefile b/usr.sbin/cdplay/Makefile
deleted file mode 100644
index 7f3fdc1..0000000
--- a/usr.sbin/cdplay/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-PROG= cdplay
-
-.include <bsd.prog.mk>
diff --git a/usr.sbin/cdplay/cdplay.1 b/usr.sbin/cdplay/cdplay.1
deleted file mode 100644
index 724a898..0000000
--- a/usr.sbin/cdplay/cdplay.1
+++ /dev/null
@@ -1,112 +0,0 @@
-.Dd January 8, 1995
-.Dt CDPLAY 1
-.Os FreeBSD
-.Sh NAME
-.Nm cdplay
-.Nd Audio CD player
-.Sh SYNOPSIS
-.Nm cdplay
-.Op Ar device
-.Op Ar cmd
-.Sh DESCRIPTION
-.Nm cdplay
-is a program to control an audio CD player.  The
-.Ar device
-is a name such as cd0 or mcd0 and the optional
-.Ar cmd
-is one of the commands (and any arguments) from the
-.Nm
-command set.  The \fBhelp\fR command will give a complete listing.
-.Pp
-If the device not specified, the environment variable 
-.Ev CDPLAY
-will be used to find the cd device.
-.Pp
-Currently supported commands are as follows:
-.Bl -tag -width Cm
-.It Cm play first_track last_track
-Play from track 
-.Nm first_track
-to track 
-.Nm last_track. 
-The first track has number 1
-.Xr play 1
-.It Cm stop
-Stop playing. Do not stop the disc.
-.It Cm resume
-Resume playing. Used after the 
-.Nm pause
- command.
-.It Cm stop
-Stop the disc.
-.It Cm eject
-Eject the disc.
-.It Cm setvol left_channel right_channel
-Set the volume of left channel to 
-.Nm left_channel
-and the volume of right channel to 
-.Nm right_channel. 
-Allowed values are in the range 0-255. 
-.It Cm getvol
-Print the current values of the volume for left and right channels.
-.It Cm msfplay start_m start_s start_f end_m end_s end_f
-Play from the absolute address
-(MSF) defined by 
-.Nm start_m
-in minutes, 
-.Nm start_s,
-in seconds and 
-.Nm start_f
-(frame number) to the absolute address defined by
-.Nm end_m
-in minutes, 
-.Nm end_s,
-in seconds and 
-.Nm end_f
-(frame number). Minutes are in the range 0-99. Seconds are in the range 0-59.
-Frame numbers are in the range 0-74
-.It Cm  status
-Print the status of the CD player. The first number has the following meaning: 
-.sp
-.Nm 17
-Audio play operation in progress
-.br           
-.Nm 18
-Audio play operation paused 
-.br           
-.Nm 19
-Audio play operation successfully completed
-.br           
-.Nm 20
-Audio play operation stopped due to error
-.br           
-.Nm 21
-No current audio status to return 
-.sp
-The other numbers are the current MSF address (minute, second, frame)
-.It Cm tochdr
-Print the first and last track numbers and length.
-.It Cm tocentry
-Print the table of contents (TOC) of the disc on the form
-.br 
-.Nm track-number minute second frame 
-where 
-.NM minute, second
-and 
-.Nm frame
-represent the absolute address of the track.
-.br
-The track numbered 255 gives the absolute address of the end of the disc.
-.It Cm  quit
-Quit the program
-.Sh FILES
-.Bl -tag -width /dev/rmcd0c -compact
-.It Pa /dev/rcd0c
-.It Pa /dev/rmcd0c
-.El
-.Sh AUTHOR
-Jean-Marc Zucconi
-.Sh HISTORY
-The
-.Nm cdplay
-command appeared in FreeBSD 2.0
diff --git a/usr.sbin/cdplay/cdplay.c b/usr.sbin/cdplay/cdplay.c
deleted file mode 100644
index 947b453..0000000
--- a/usr.sbin/cdplay/cdplay.c
+++ /dev/null
@@ -1,346 +0,0 @@
-/* Non-X based CD player by Jean-Marc Zucconi */
-/* Modifications by Andrey A. Chernov         */
-/* More modifications by Jordan Hubbard */
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/file.h>
-#include <sys/cdio.h>
-#include <sys/ioctl.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-struct cd_toc_entry toc_buffer[100];
-
-int cd_fd = -1;
-int standalone;
-
-char *cmd, *cdname;
-
-int cdpause (void);
-int resume (void);
-int stop (void);
-int eject (void);
-int reset (void);
-int setdebug (void);
-int clrdebug (void);
-int getvol (int  *l, int *r);
-int input (void);
-int setvol (int, int);
-int read_toc_header (struct ioc_toc_header *);
-int read_toc_entrys (int);
-int play_msf (int, int, int, int, int, int);
-int play_track (int, int);
-int get_vol (int *, int *);
-int status (int *, int *, int *, int *);
-int runcmd(char *cmd);
-void open_cd (void);
-
-int
-main (int argc, char **argv)
-{
-    switch (argc) {
-    case 3:
-	standalone = -1;
-	cdname = argv[1];
-	return runcmd(argv[2]);
-	
-    case 2:
-	cdname = argv[1];
-	break;
-
-    case 1:
-	if ((cdname = getenv("CDPLAY")) != NULL)
-	    /* Break if CDPLAY is set */
-	    break;
-
-    default:
-	fprintf(stderr,
-		"Usage: cdplay <cd> [cmd]\n"
-		"Where <cd> is device name such as cd0 or mcd0 and [cmd] is an\n"
-		"optional command from the cdplay command set.  Use `help' for a list\n");
-	return 1;
-    }
-
-    standalone = isatty (0);
-    while (input()) {
-	if (runcmd(cmd) == -127)
-	    break;
-	fflush (stdout);
-    }
-    return 0;
-}
-
-#define command(s) strncmp(cmd,s,strlen(s))==0
-
-int
-runcmd(char *cmd)
-{
-    int rc;
-
-    if (command ("quit"))
-	rc = -127;
-    else if (command ("help")) {
-	printf("play <start_trk> <end_trk>, reset, pause, resume, stop, setdebug, clrdebug\n"
-	       "eject, setvol <l> <r>, getvol, tochdr, msfplay <m1> <s1> <f1> <m2> <s2> <f2>,\n"
-	       "tocentry, status, quit, help\n");
-	rc = 1;
-    }
-    else {
-	open_cd ();
-	if (command ("play")) {
-	    int start, end;
-	    sscanf (cmd+4, "%d%d", &start, &end);
-	    rc = play_track (start, end);
-	}
-	else if (command ("reset"))
-	    rc = reset ();
-	else if (command ("pause"))
-	    rc = cdpause ();
-	else if (command ("resume"))
-	    rc = resume ();
-	else if (command ("stop"))
-	    rc = stop ();
-	else if (command ("setdebug"))
-	    rc = setdebug ();
-	else if (command ("clrdebug"))
-	    rc = clrdebug ();
-	else if (command ("eject")) {
-	    rc = eject ();
-	}
-	else if (command ("setvol")) {
-	    int l, r;
-	    sscanf (cmd+6, "%d %d", &l, &r);
-	    rc = setvol (l, r);
-	}
-	else if (command ("getvol")) {
-	    int r, l;
-	    rc = getvol (&l, &r);
-	    if (rc > -1)
-		printf ("%d %d\n", l, r);
-	}
-	else if (command ("tochdr")) {
-	    struct ioc_toc_header h;
-	    rc = read_toc_header (&h);
-	    if (rc > -1) {
-		if (standalone)
-		    printf("start end length\n");
-		printf ("%d %d %d\n", h.starting_track, h.ending_track, h.len);
-	    }
-	}
-	else if (command ("msfplay")) {
-	    int m1, m2, s1, s2, f1, f2;
-	    sscanf(cmd+7, "%d%d%d%d%d%d", &m1, &s1, &f1, &m2, &s2, &f2);
-	    rc = play_msf (m1, s1, f1, m2, s2, f2);
-	}
-	else if (command ("tocentry")) {
-	    struct ioc_toc_header h;
-	    int i, n;
-	    rc = read_toc_header (&h);
-	    if (rc > -1) {
-		n =  h.ending_track - h.starting_track + 1;
-		rc = read_toc_entrys ((n+1)*sizeof(struct cd_toc_entry));
-		if (standalone)
-		    printf("track minute second frame\n");
-		for (i = 0; i <= n; i++)
-		    printf ("%5d %6d %6d %5d\n", toc_buffer[i].track, toc_buffer[i].addr.msf.minute,
-			    toc_buffer[i].addr.msf.second, toc_buffer[i].addr.msf.frame);
-	    }
-	}
-	else if (command ("status")) {
-	    int trk, m, s, f;
-	    rc = status (&trk, &m, &s, &f);
-	    if (standalone)
-		printf("status track minute second frame\n");
-	    printf ("%d %02d %d %d %d\n", rc, trk, m, s, f);
-	}
-	else {
-	    printf("No such command, enter 'help' for command list\n");
-	    rc = 1;
-	}
-	if (rc < 0) {
-	    if (standalone)
-		perror("cdplay");
-	}
-	if (standalone < 0 || rc < 0) {
-	    close (cd_fd);
-	    cd_fd = -1;
-	}
-    }
-    return rc;
-}
-
-int
-play_track (int start, int end)
-{
-    struct ioc_play_track t;
-
-    t.start_track = start;
-    t.start_index = 1;
-    t.end_track = end;
-    t.end_index = 1;
-    return ioctl (cd_fd, CDIOCPLAYTRACKS, &t);
-}
-
-int
-reset ()
-{
-    return ioctl (cd_fd, CDIOCRESET);
-}
-
-int
-cdpause ()
-{
-    return ioctl (cd_fd, CDIOCPAUSE);
-}
-
-int
-setdebug ()
-{
-    return (ioctl (cd_fd, CDIOCSETDEBUG));
-}
-
-int
-clrdebug ()
-{
-    return (ioctl (cd_fd, CDIOCCLRDEBUG));
-}
-
-int
-resume ()
-{
-    return (ioctl (cd_fd, CDIOCRESUME));
-}
-
-int
-stop ()
-{
-    return ioctl (cd_fd, CDIOCSTOP);
-}
-
-int
-eject ()
-{
-    (void) ioctl (cd_fd, CDIOCALLOW);
-    return ioctl (cd_fd, CDIOCEJECT);
-}
-
-int
-setvol (int l, int r)
-{
-    struct ioc_vol v;
-
-    v.vol[0] = l;
-    v.vol[1] = r;
-    v.vol[2] = 0;
-    v.vol[3] = 0;
-    return ioctl (cd_fd, CDIOCSETVOL, &v);
-}
-
-int
-getvol (int  *l, int *r)
-{
-    struct ioc_vol v;
-    if (ioctl (cd_fd, CDIOCGETVOL, &v) < 0)
-	return -1;
-    *l = v.vol[0];
-    *r = v.vol[1];
-    return 0;
-}
-
-int
-read_toc_header (struct ioc_toc_header *h)
-{
-    return ioctl (cd_fd, CDIOREADTOCHEADER, (char *) h);
-}
-
-int
-read_toc_entrys (int len)
-{
-    struct ioc_read_toc_entry t;
-
-    t.address_format = CD_MSF_FORMAT;
-    t.starting_track = 0;
-    t.data_len = len;
-    t.data = toc_buffer;
-    return ioctl (cd_fd, CDIOREADTOCENTRYS, (char *) &t);
-}
-
-int
-play_msf (int start_m, int start_s, int start_f,
-	  int end_m, int end_s, int end_f)
-{
-    struct ioc_play_msf a;
-
-    a.start_m = start_m;
-    a.start_s = start_s;
-    a.start_f = start_f;
-    a.end_m = end_m;
-    a.end_s = end_s;
-    a.end_f = end_f;
-    return ioctl (cd_fd, CDIOCPLAYMSF, (char *) &a);
-}
-
-int
-status (int *trk, int *min, int *sec, int *frame)
-{
-    struct ioc_read_subchannel s;
-    struct cd_sub_channel_info data;
-    bzero(&s, sizeof(s));
-    s.data = &data;
-    s.data_len = sizeof (data);
-    s.address_format = CD_MSF_FORMAT;
-    s.data_format = CD_CURRENT_POSITION;
-    open_cd ();
-    if (ioctl (cd_fd, CDIOCREADSUBCHANNEL, (char *) &s) < 0)
-	    return -1;
-    *trk = s.data->what.position.track_number;
-    *min = s.data->what.position.reladdr.msf.minute;
-    *sec = s.data->what.position.reladdr.msf.second;
-    *frame = s.data->what.position.reladdr.msf.frame;
-    return s.data->header.audio_status;
-}
-
-int
-input ()
-{
-    static char buf[80];
-    int l;
-
-    if (standalone)
-	fprintf (stderr, "CD>");
-    cmd = fgets (buf, sizeof(buf), stdin);
-    if (cmd == NULL)
-	return 0;
-    l = strlen(cmd);
-    if (l > 0 && cmd[l-1] == '\n')
-	cmd[l-1] = '\0';
-    return 1;
-}
-
-void
-open_cd ()
-{
-    int trk, m, s, f;
-    extern int errno;
-    char devbuf[20];
-
-    if (cd_fd > -1)
-	return;
-    sprintf(devbuf, "/dev/r%sc", cdname);
-    cd_fd = open (devbuf, O_RDONLY);
-    if (cd_fd < 0) {
-	if (errno == ENXIO) {
-	    /* open says 'Device not configured if there is no cd in */
-	    fprintf(stderr, "open: No cd in\n");
-	    return;
-	}
-	perror(devbuf);
-	exit (1);
-    }
-    if (status (&trk, &m, &s, &f) < 0 ) {
-	close (cd_fd);
-	cd_fd = -1;
-    }
-}