shithub: qk2

Download patch

ref: 4a30ac49c9338a034b76363300cae13330327837
parent: 6cf736d1ac86a82f8cb947abd1f6b007af4ff046
author: qwx <>
date: Fri Jun 1 08:32:44 EDT 2018

cd: preliminary implementation

--- a/cd.c
+++ b/cd.c
@@ -1,415 +1,201 @@
 #include <u.h>
 #include <libc.h>
 #include <stdio.h>
+#include <thread.h>
+#include <regexp.h>
 #include "dat.h"
 #include "fns.h"
 
-qboolean cdValid = false;
-qboolean playing = false;
-qboolean wasPlaying = false;
-qboolean initialized = false;
-qboolean enabled = true;
-qboolean playLooping = false;
-float cdvolume;
-byte remap[100];
-byte playTrack;
-byte maxTrack;
-int cdfile = -1;
+static int cdread, cdloop, cdvol;
+static int ntrk, trk, chtrk;
+static char trtype;
+static int ctid = -1;
+static Reprog *pat;
+static cvar_t *ccdvol;
 
-cvar_t	*cd_volume;
-cvar_t *cd_nocd;
-cvar_t *cd_dev;
-
-
-void CDAudio_Eject(void)
+static int
+cdinfo(void)
 {
-	if (cdfile == -1 || !enabled)
-		return;
+	int fd, i, n;
+	Dir *d;
 
-	Com_DPrintf("CDAudio_Eject: PORTME\n");
-	/*
-	if ( ioctl(cdfile, CDROMEJECT) == -1 ) 
-		Com_DPrintf("ioctl cdromeject failed\n");
-	*/
-}
+	ntrk = 0;
 
-void CDAudio_CloseDoor(void)
-{
-	if (cdfile == -1 || !enabled)
-		return;
-
-	Com_DPrintf("CDAudio_CloseDoor: PORTME\n");
-	/*
-	if ( ioctl(cdfile, CDROMCLOSETRAY) == -1 ) 
-		Com_DPrintf("ioctl cdromclosetray failed\n");
-	*/
-}
-
-int CDAudio_GetAudioDiskInfo(void)
-{
-	cdValid = false;
-	Com_DPrintf("CDAudio_GetAudioDiskInfo: PORTME\n");
-	return -1;
-
-	/*
-	struct cdrom_tochdr tochdr;
-
-	if ( ioctl(cdfile, CDROMREADTOCHDR, &tochdr) == -1 ) 
-	{
-		Com_DPrintf("ioctl cdromreadtochdr failed\n");
+	if((fd = open("/mnt/cd", OREAD)) < 0)
+		goto err;
+	if((n = dirreadall(fd, &d)) < 0)
+		goto err;
+	close(fd);
+	for(i = 0; i < n; i++)
+		if(regexec(pat, d[i].name, nil, 0)){
+			if(!trtype)
+				trtype = d[i].name[0];
+			ntrk++;
+		}
+	free(d);
+	if(ntrk < 1)
 		return -1;
-	}
-
-	if (tochdr.cdth_trk0 < 1)
-	{
-		Com_DPrintf("CDAudio: no music tracks\n");
-		return -1;
-	}
-
-	cdValid = true;
-	maxTrack = tochdr.cdth_trk1;
 	return 0;
-	*/
-}
 
-void CDAudio_Pause(void)
-{
-	if (cdfile == -1 || !enabled)
-		return;
-	if (!playing)
-		return;
-
-	Com_DPrintf("CDAudio_GetAudioDiskInfo: PORTME\n");
-
-	/*
-	if ( ioctl(cdfile, CDROMPAUSE) == -1 ) 
-		Com_DPrintf("ioctl cdrompause failed\n");
-
-	wasPlaying = playing;
-	playing = false;
-	*/
+err:
+	close(fd);
+	fprint(2, "cdinfo: %r\n");
+	return -1;
 }
 
-void CDAudio_Play(int track, qboolean looping)
+static void
+cproc(void *)
 {
-	if (cdfile == -1 || !enabled)
-		return;
-	if (!cdValid)
-	{
-		CDAudio_GetAudioDiskInfo();
-		if (!cdValid)
-			return;
-	}
+	int a, n, afd, fd;
+	char s[24];
+	uchar buf[Nsbuf];
+	short *p, *e;
 
-	track = remap[track];
-	if (track < 1 || track > maxTrack)
-	{
-		Com_DPrintf("CDAudio: Bad track number %u.\n", track);
+	if((afd = open("/dev/audio", OWRITE)) < 0)
 		return;
+	fd = -1;
+	for(;;){
+		if(chtrk > 0){
+			close(fd);
+			trk = chtrk;
+			snprint(s, sizeof s, "/mnt/cd/%c%03ud", trtype, trk);
+			if((fd = open(s, OREAD)) < 0)
+				fprint(2, "cproc: %r");
+			chtrk = 0;
+		}
+		if(!cdread || fd < 0){
+			sleep(1);
+			continue;
+		}
+		if((n = read(fd, buf, sizeof buf)) < 0)
+			break;
+		if(n == 0){
+			if(cdloop)
+				seek(fd, 0, 0);
+			else{
+				close(fd);
+				fd = -1;
+			}
+			continue;
+		}
+		p = (short *)buf;
+		e = (short *)(buf+sizeof buf);
+		while(p < e){
+			a = *p * cdvol >> 8;
+			if(a < (short)0x8000)
+				a = 0x8000;
+			*p++ = a;
+		}
+		if(write(afd, buf, n) != n)
+			break;
 	}
+}
 
-	USED(looping);
-	Com_DPrintf("CDAudio_Play: PORTME\n");
-
-	/*
-	struct cdrom_tocentry entry;
-	struct cdrom_ti ti;
-
-	// don't try to play a non-audio track
-	entry.cdte_track = track;
-	entry.cdte_format = CDROM_MSF;
-	if ( ioctl(cdfile, CDROMREADTOCENTRY, &entry) == -1 )
-	{
-		Com_DPrintf("ioctl cdromreadtocentry failed\n");
+void
+CDAudio_Play(int nt, qboolean loop)
+{
+	if(ctid < 0)
 		return;
-	}
-	if (entry.cdte_ctrl == CDROM_DATA_TRACK)
-	{
-		Com_Printf("CDAudio: track %i is not audio\n", track);
+	nt -= 1;	/* d001 was assumed part of the track list */
+	if(nt < 1 || nt > ntrk){
+		Com_Printf("cd: invalid track number %d\n", nt);
 		return;
 	}
 
-	if (playing)
-	{
-		if (playTrack == track)
-			return;
-		CDAudio_Stop();
-	}
-
-	ti.cdti_trk0 = track;
-	ti.cdti_trk1 = track;
-	ti.cdti_ind0 = 1;
-	ti.cdti_ind1 = 99;
-	if ( ioctl(cdfile, CDROMPLAYTRKIND, &ti) == -1 ) 
-	{
-		Com_DPrintf("ioctl cdromplaytrkind failed\n");
-		return;
-	}
-	if ( ioctl(cdfile, CDROMRESUME) == -1 ) 
-		Com_DPrintf("ioctl cdromresume failed\n");
-
-	playLooping = looping;
-	playTrack = track;
-	playing = true;
-
-	if (cd_volume->value == 0.0)
-		CDAudio_Pause ();
-	*/
+	chtrk = nt;
+	cdloop = loop;
+	if(cdvol > 0)
+		cdread = 1;
 }
 
-
-void CDAudio_Stop(void)
+void
+CDAudio_Stop(void)
 {
-	if (cdfile == -1 || !enabled)
-		return;
-	if (!playing)
-		return;
-
-	Com_DPrintf("CDAudio_Stop: PORTME\n");
-
-	/*
-	if ( ioctl(cdfile, CDROMSTOP) == -1 )
-		Com_DPrintf("ioctl cdromstop failed (%d)\n", errno);
-
-	wasPlaying = false;
-	playing = false;
-	*/
+	cdread = 0;
+	cdloop = 0;
 }
 
-void CDAudio_Resume(void)
+void
+CDAudio_Pause(void)
 {
-	if (cdfile == -1 || !enabled)
-		return;
-	if (!cdValid)
-		return;
-	if (!wasPlaying)
-		return;
+	cdread = 0;
+}
 
-	Com_DPrintf("CDAudio_Stop: PORTME\n");
-
-	/*
-	if ( ioctl(cdfile, CDROMRESUME) == -1 ) 
-		Com_DPrintf("ioctl cdromresume failed\n");
-	playing = true;
-	*/
+void
+CDAudio_Resume(void)
+{
+	cdread = 1;
 }
 
-static void CD_f (void)
+void
+CD_f(void)
 {
-	char	*command;
-	int n, ret;
+	char *cmd;
 
-	if (Cmd_Argc() < 2)
+	if(Cmd_Argc() < 2)
 		return;
-
-	command = Cmd_Argv (1);
-
-	if (cistrcmp(command, "on") == 0)
-	{
-		enabled = true;
+	cmd = Cmd_Argv(1);
+	if(cistrcmp(cmd, "play") == 0){
+		CDAudio_Play(atoi(Cmd_Argv(2)), false);
 		return;
-	}
-
-	if (cistrcmp(command, "off") == 0)
-	{
-		if (playing)
-			CDAudio_Stop();
-		enabled = false;
+	}else if(cistrcmp(cmd, "loop") == 0){
+		CDAudio_Play(atoi(Cmd_Argv(2)), true);
 		return;
-	}
-
-	if (cistrcmp(command, "reset") == 0)
-	{
-		enabled = true;
-		if (playing)
-			CDAudio_Stop();
-		for (n = 0; n < 100; n++)
-			remap[n] = n;
-		CDAudio_GetAudioDiskInfo();
-		return;
-	}
-
-	if (cistrcmp(command, "remap") == 0)
-	{
-		ret = Cmd_Argc() - 2;
-		if (ret <= 0)
-		{
-			for (n = 1; n < 100; n++)
-				if (remap[n] != n)
-					Com_Printf("  %u -> %u\n", n, remap[n]);
-			return;
-		}
-		for (n = 1; n <= ret; n++)
-			remap[n] = atoi(Cmd_Argv (n+1));
-		return;
-	}
-
-	if (cistrcmp(command, "close") == 0)
-	{
-		CDAudio_CloseDoor();
-		return;
-	}
-
-	if (!cdValid)
-	{
-		CDAudio_GetAudioDiskInfo();
-		if (!cdValid)
-		{
-			Com_Printf("No CD in player.\n");
-			return;
-		}
-	}
-
-	if (cistrcmp(command, "play") == 0)
-	{
-		CDAudio_Play((byte)atoi(Cmd_Argv (2)), false);
-		return;
-	}
-
-	if (cistrcmp(command, "loop") == 0)
-	{
-		CDAudio_Play((byte)atoi(Cmd_Argv (2)), true);
-		return;
-	}
-
-	if (cistrcmp(command, "stop") == 0)
-	{
+	}else if(cistrcmp(cmd, "stop") == 0){
 		CDAudio_Stop();
 		return;
-	}
-
-	if (cistrcmp(command, "pause") == 0)
-	{
+	}else if(cistrcmp(cmd, "pause") == 0){
 		CDAudio_Pause();
 		return;
-	}
-
-	if (cistrcmp(command, "resume") == 0)
-	{
+	}else if(cistrcmp(cmd, "resume") == 0){
 		CDAudio_Resume();
 		return;
-	}
-
-	if (cistrcmp(command, "eject") == 0)
-	{
-		if (playing)
-			CDAudio_Stop();
-		CDAudio_Eject();
-		cdValid = false;
+	}else if(cistrcmp(cmd, "info") == 0){
+		Com_Printf("track %d/%d; loop %d; vol %d\n", trk, ntrk, cdloop, cdvol);
 		return;
 	}
-
-	if (cistrcmp(command, "info") == 0)
-	{
-		Com_Printf("%u tracks\n", maxTrack);
-		if (playing)
-			Com_Printf("Currently %s track %u\n", playLooping ? "looping" : "playing", playTrack);
-		else if (wasPlaying)
-			Com_Printf("Paused %s track %u\n", playLooping ? "looping" : "playing", playTrack);
-		Com_Printf("Volume is %f\n", cdvolume);
-		return;
-	}
 }
 
-void CDAudio_Update(void)
+void
+CDAudio_Update(void)
 {
-	if (cdfile == -1 || !enabled)
-		return;
-	if (cd_volume && cd_volume->value != cdvolume)
-	{
-		if (cdvolume)
-		{
-			Cvar_SetValue ("cd_volume", 0.0);
-			cdvolume = cd_volume->value;
-			CDAudio_Pause ();
-		}
-		else
-		{
-			Cvar_SetValue ("cd_volume", 1.0);
-			cdvolume = cd_volume->value;
-			CDAudio_Resume ();
-		}
-	}
+	int v;
 
-	Com_DPrintf("CDAudio_Stop: PORTME\n");
-
-	/*
-	struct cdrom_subchnl subchnl;
-	static time_t lastchk;
-
-	if (playing && lastchk < time(NULL)) {
-		lastchk = time(NULL) + 2; //two seconds between chks
-		subchnl.cdsc_format = CDROM_MSF;
-		if (ioctl(cdfile, CDROMSUBCHNL, &subchnl) == -1 ) {
-			Com_DPrintf("ioctl cdromsubchnl failed\n");
-			playing = false;
-			return;
-		}
-		if (subchnl.cdsc_audiostatus != CDROM_AUDIO_PLAY &&
-			subchnl.cdsc_audiostatus != CDROM_AUDIO_PAUSED) {
-			playing = false;
-			if (playLooping)
-				CDAudio_Play(playTrack, true);
-		}
-	}
-	*/
+	if(ctid < 0)
+		return;
+	v = cdvol;
+	cdvol = ccdvol->value * 256;
+	if(v <= 0 && cdvol > 0)
+		cdread = 1;
+	else if(v > 0 && cdvol <= 0)
+		cdread = 0;
 }
 
-int CDAudio_Init(void)
+int
+CDAudio_Init(void)
 {
-	int i;
-	cvar_t	*cv;
-
-	cv = Cvar_Get ("nocdaudio", "0", CVAR_NOSET);
-	if (cv->value)
+	pat = regcomp("[au][0-9][0-9][0-9]");
+	if(cdinfo() < 0)
 		return -1;
+	ccdvol = Cvar_Get("cdvol", "1", CVAR_ARCHIVE);
+	if((ctid = proccreate(cproc, nil, 16384)) < 0)
+		sysfatal("proccreate: %r");
+	Cmd_AddCommand("cd", CD_f);
 
-	cd_nocd = Cvar_Get ("cd_nocd", "0", CVAR_ARCHIVE );
-	if ( cd_nocd->value)
-		return -1;
-
-	cd_volume = Cvar_Get ("cd_volume", "1", CVAR_ARCHIVE);
-
-	cd_dev = Cvar_Get("cd_dev", "/dev/cdrom", CVAR_ARCHIVE);
-
-	if((cdfile = open(cd_dev->string, OREAD)) < 0){
-		fprint(2, "CDAudio_Init: %r\n");
-		Com_Printf("CDAudio_Init: failed to open \"%s\"\n", cd_dev->string);
-		cdfile = -1;
-		return -1;
-	}
-
-	for (i = 0; i < 100; i++)
-		remap[i] = i;
-	initialized = true;
-	enabled = true;
-
-	if (CDAudio_GetAudioDiskInfo())
-	{
-		Com_Printf("CDAudio_Init: No CD in player.\n");
-		cdValid = false;
-	}
-
-	Cmd_AddCommand ("cd", CD_f);
-
 	Com_Printf("CD Audio Initialized\n");
-
 	return 0;
 }
 
-void CDAudio_Activate (qboolean active)
+void
+CDAudio_Shutdown(void)
 {
-	if (active)
-		CDAudio_Resume ();
-	else
-		CDAudio_Pause ();
-}
-
-void CDAudio_Shutdown(void)
-{
-	if (!initialized)
+	if(ctid < 0)
 		return;
+
 	CDAudio_Stop();
-	close(cdfile);
-	cdfile = -1;
+	postnote(PNPROC, ctid, "shutdown");
+	ctid = -1;
+	free(pat);
+	pat = nil;
+	cdread = cdloop = 0;
 }