release candidate #1

README

@@ -1,5 +1,5 @@
-Introduction
-------------
+Description
+-----------
 AdPlay/Linux is AdPlug's Linux console-based frontend.
 
 Prerequisites
@@ -10,7 +10,6 @@ program:
 Library			Version
 -------			-------
 glibc				>= 2.1
-pthread			>= 0.8
 adplug			>= 1.1
 
 Installation
@@ -21,9 +20,12 @@ make
 
 This should build the adplay executable.
 
-Copy the adplay executable somewhere suitable into your directory structure,
-preferrably somewhere in your path, like /usr/local/bin. This should be done
-automatically in future.
+To install, do as superuser:
+
+make install
+
+This places the executable into /usr/local/bin. You can modify the target path
+by altering the makefile.
 
 After that, you can do as normal user:
 
@@ -36,12 +38,18 @@ make distclean
 to remove all files created at compile time or even eventually additional
 created files.
 
+If you later wish to uninstall AdPlay, you can do as superuser:
+
+make uninstall
+
+to remove the executable from /usr/local/bin.
+
 Usage
 -----
 Start adplay with at least one file to be played as parameter and you should
 be set. Additional commandline parameters are explained by typing:
 
 adplay --help
 
-That's all for now. I'll work out this doc more completely, when it's time to
-make a release.
+That's all for now. A more detailed doc will follow when i get the time to
+write one. Any help is greatly appreciated!

adplay.cpp

@@ -25,11 +25,10 @@
 #include <fcntl.h>
 #include <sys/soundcard.h>
 #include <getopt.h>
-#include <pthread.h>
 #include <adplug/adplug.h>
 #include <adplug/emuopl.h>
 
-#define VERSION	"AdPlay/Linux v1.0, (c) 2001 Simon Peter <[email protected]>, et al."
+#define VERSION	"AdPlay/Linux 1.0, (c) 2001 Simon Peter <[email protected]>"
 #define USAGE	"[OPTION]... FILE..."
 
 // defaults
@@ -38,20 +37,23 @@
 #define CHANNELS	1		// number of channels
 #define BITS		16		// bit depth
 #define DEVICE		"/dev/dsp"	// audio device file
-#define ENDLESS		false		// play endlessly?
+#define ENDLESS		true		// play endlessly
 #define SHOWINSTS	false		// show instruments
+#define SONGINFO	false		// show song info
+#define SONGMESSAGE	false		// show song message
+#define SUBSONG		0		// default subsong
 
 CAdPlug	adplug;				// global AdPlug object
 CPlayer *p;				// global player object
 CEmuopl	*opl;				// global emulator object
-float	decode_pos_ms;			// current decode position in ms
 int	audio_fd;			// audio device file
 char	*prgname;			// program executable name
 
 // configuration variables
-int	buf_size=BUF_SIZE,freq=FREQ,channels=CHANNELS,bits=BITS;
-char	*device=DEVICE;
-bool	endless=ENDLESS,showinsts=SHOWINSTS;
+int		buf_size=BUF_SIZE,freq=FREQ,channels=CHANNELS,bits=BITS;
+unsigned int	subsong=SUBSONG;
+char		*device=DEVICE;
+bool		endless=ENDLESS,showinsts=SHOWINSTS,songinfo=SONGINFO,songmessage=SONGMESSAGE;
 
 #ifndef min
 #define min(a,b) (((a) < (b)) ? (a) : (b))
@@ -69,68 +71,59 @@ void display_help()
 	display_usage();
 	cout << "Playback known filetypes of given FILEs." << endl << endl <<
 		"  -8, --8bit		8-bit replay" << endl <<
+		"      --16bit		16-bit replay" << endl <<
 		"  -f, --freq=FREQ	set frequency to FREQ" << endl <<
-		"  -s, --stereo		stereo playback" << endl <<
+		"      --stereo		stereo playback" << endl <<
+		"      --mono		mono playback" << endl <<
 		"  -b, --buffer=SIZE	set buffer size to SIZE" << endl <<
 		"  -d, --device=FILE	set sound device file to FILE" << endl <<
 		"  -i, --instruments	display instrument names" << endl <<
+		"  -r, --realtime	display realtime song info" << endl <<
+		"  -m, --message		display song message" << endl <<
+		"  -s, --subsong=N	play subsong number N" << endl <<
+		"  -o, --once		play only once, don't loop" << endl <<
 		"      --help		display this help and exit" << endl <<
 		"      --version		output version information and exit" << endl;
 }
 
-void *replay_thread(void *killswitch)
-{
-	char	*pos,*audiobuf;
-	long	i,towrite,minicnt=0;
-	bool	playing=true;
-
-	audiobuf = new char [buf_size * getsampsize()];
-	while((playing || endless) && !(*(bool *)killswitch)) {
-		towrite = buf_size; pos = audiobuf;
-		while(towrite > 0) {
-			while(minicnt < 0)
-			{
-				minicnt += freq;
-				playing = p->update();
-				decode_pos_ms += 1000/p->getrefresh();
-			}
-			i = min(towrite,(long)(minicnt/p->getrefresh()+4)&~3);
-			opl->update((short *)pos, i);
-			pos += i * 2; towrite -= i;
-			minicnt -= (long)(p->getrefresh()*i);
-		}
-		write(audio_fd, audiobuf, buf_size*getsampsize());
-	}
-	delete [] audiobuf;
-	return 0;
-}
-
 int parse_options(int argc, char *argv[])
 {
 	int		option;
 	struct option	opts[]={
 		{"8bit",no_argument,NULL,'8'},		// 8-bit replay
+		{"16bit",no_argument,NULL,'1'},		// 16-bit replay
 		{"freq",required_argument,NULL,'f'},	// set frequency
-		{"stereo",no_argument,NULL,'s'},	// stereo replay
+		{"stereo",no_argument,NULL,'3'},	// stereo replay
+		{"mono",no_argument,NULL,'2'},		// mono replay
 		{"buffer",required_argument,NULL,'b'},	// buffer size
 		{"device",required_argument,NULL,'d'},	// device file
 		{"instruments",no_argument,NULL,'i'},	// show instruments
+		{"realtime",no_argument,NULL,'r'},	// realtime song info
+		{"message",no_argument,NULL,'m'},	// song message
+		{"subsong",no_argument,NULL,'s'},	// play subsong
+		{"once",no_argument,NULL,'o'},		// don't loop
 		{"help",no_argument,NULL,'h'},		// display help
 		{"version",no_argument,NULL,'v'},	// version information
 		{0,0,0,0}				// end of options
 	};
 
-	while((option=getopt_long(argc,argv,"8f:sb:d:i",opts,NULL)) != -1)
+	while((option=getopt_long(argc,argv,"8f:b:d:irms:o",opts,NULL)) != -1)
 		switch(option) {
 		case '8':
 			bits = 8;
 			break;
+		case '1':
+			bits = 16;
+			break;
 		case 'f':
 			freq = atoi(optarg);
 			break;
-		case 's':
+		case '3':
 			channels = 2;
 			break;
+		case '2':
+			channels = 1;
+			break;
 		case 'b':
 			buf_size = atoi(optarg);
 			break;
@@ -140,6 +133,18 @@ int parse_options(int argc, char *argv[])
 		case 'i':
 			showinsts = true;
 			break;
+		case 'r':
+			songinfo = true;
+			break;
+		case 'm':
+			songmessage = true;
+			break;
+		case 's':
+			subsong = atoi(optarg);
+			break;
+		case 'o':
+			endless = false;
+			break;
 		case 'h':
 			display_help();
 			exit(0);
@@ -156,51 +161,67 @@ int parse_options(int argc, char *argv[])
 		exit(1);
 	}
 
+	if(argc - optind > 1)
+		endless = false;
+
 	return optind;
 }
 
 void play(char *fn)
 {
-	pthread_t	th;
-	bool		killswitch=false;
-	char		inkey;
-	unsigned int	i;
+	char	*pos,*audiobuf;
+	long	i,towrite,minicnt=0;
+	bool	playing=true;
 
 	if(!(p = adplug.factory(fn, opl))) {
 		cout << prgname << ": " << fn << ": Unknown filetype" << endl;
 		return;
 	}
-
-	pthread_create(&th,NULL,replay_thread,&killswitch);
+	p->rewind(subsong);
 
 	cout << "Playing '" << fn << "'..." << endl <<
-		"Type : " << p->gettype() << endl <<
-		"Title: " << p->gettitle() << endl;
+		"Type  : " << p->gettype() << endl <<
+		"Title : " << p->gettitle() << endl <<
+		"Author: " << p->getauthor() << endl << endl;
 
 	// display instruments
 	if(showinsts) {
 		cout << "Instrument names:" << endl;
-		for(i=0;i<p->getinstruments();i++)
+		for(i=0;i<(long)p->getinstruments();i++)
 			cout << i << ": " << p->getinstrument(i) << endl;
 		cout << endl;
 	}
 
-	do {
-		inkey = getchar();
-		switch(inkey) {
-		case 'f':	// fast forward
-			break;
+	// display song message
+	if(songmessage) {
+		cout << "Song message:" << endl;
+		cout << p->getdesc() << endl << endl;
+	}
+
+	audiobuf = new char [buf_size * getsampsize];
+	while(playing || endless) {
+		if(songinfo) {	// display song info
+			printf("Subsong: %d/%d, Order: %d/%d, Pattern: %d/%d, Row: %d, Speed: %d, Timer: %.2fHz     \r",
+				subsong,p->getsubsongs()-1,p->getorder(),p->getorders(),p->getpattern(),
+				p->getpatterns(),p->getrow(),p->getspeed(),p->getrefresh());
 		}
-	} while(inkey != '\n' && inkey != 'q');
 
-	killswitch = true;
-	pthread_join(th, NULL);
-	delete p;
-	if(inkey == 'q') {
-		delete opl;
-		close(audio_fd);
-		exit(0);
+		towrite = buf_size; pos = audiobuf;
+		while(towrite > 0) {
+			while(minicnt < 0)
+			{
+				minicnt += freq;
+				playing = p->update();
+			}
+			i = min(towrite,(long)(minicnt/p->getrefresh()+4)&~3);
+			opl->update((short *)pos, i);
+			pos += i * getsampsize; towrite -= i;
+			minicnt -= (long)(p->getrefresh()*i);
+		}
+		write(audio_fd, audiobuf, buf_size*getsampsize);
 	}
+	delete [] audiobuf;
+	delete p;
 }
 
 int main(int argc, char *argv[])
@@ -216,13 +237,13 @@ int main(int argc, char *argv[])
 		perror(device);
 		exit(1);
 	}
-	format = (bits == 16 ? AFMT_S16_LE : AFMT_S16_LE);
+	format = (bits == 16 ? AFMT_S16_LE : AFMT_S8);
 	ioctl(audio_fd, SNDCTL_DSP_SETFMT, &format);
 	ioctl(audio_fd, SNDCTL_DSP_CHANNELS, &channels);
 	ioctl(audio_fd, SNDCTL_DSP_SPEED, &freq);
 
 	// main loop
-	opl = new CEmuopl(freq,bits == 16 ? true : false,channels == 2 ? true : false);
+	opl = new CEmuopl(freq,bits == 16,channels == 2);
 	for(i=optind;i<argc;i++) {
 		opl->init();
 		play(argv[i]);

makefile

@@ -1,14 +1,16 @@
 # Makefile for AdPlay/Linux, (c) 2001 Simon Peter <[email protected]>
 
-CXX		= c++
-CXXFLAGS	= -Wall
-CPPFLAGS	= 
-LDFLAGS		= -lpthread -ladplug
+CXX = c++
+INSTALL = install
 
-SRCS		= adplay.cpp makefile
-AUX		= README COPYING
+CXXFLAGS = -Wall
+LDFLAGS = -ladplug
 
-distname	= adplay-1.0
+SRCS = adplay.cpp makefile
+AUX = README COPYING
+
+distname = adplay-1.0
+bindir = /usr/local/bin
 
 all: adplay
 
@@ -17,11 +19,17 @@ clean:
 
 distclean: clean
 
+install: all
+	$(INSTALL) adplay $(bindir)
+
+uninstall:
+	rm $(bindir)/adplay
+
 dist:
 	-rm -rf $(distname)
 	mkdir $(distname)
 	cp $(SRCS) $(AUX) $(distname)
-	tar cfz $(distname).tar.gz $(distname)
+	tar cfj $(distname).tar.bz2 $(distname)
 	rm -rf $(distname)
 
 adplay: adplay.cpp