0.8.1

COMMANDS

@@ -45,7 +45,7 @@ kill
 	kill mpd
 
 listall <string directory>
-	lists all songs in _directory_ (recursively)
+	lists all songs and directories in _directory_ (recursively)
 	_directory_ is optional
 
 load <string name>

ChangeLog

+ver 0.8.1 (2003/7/15)
+1) FreeBSD fixes
+2) Fix for rare segfault when updating
+3) Fix bug where client was being hungup on when done playing current song
+4) Fix bug when playing flac's where it incorrectly reports an error
+5) Make stop playlist on error configurable
+6) Configure checks for installed libmad and libid3tag and uses those if found
+7) Use buffer->finished in *_decode's instead of depending on catching signals
+
 ver 0.8.0 (2003/7/6)
 1) Flac support
 2) Make playlist max length configurable

Makefile.am

 bin_PROGRAMS = mpd
-SUBDIRS = libid3tag libmad
+SUBDIRS = $(ID3_SUBDIR) $(MAD_SUBDIR)
 pkgdata_DATA = mpdconf.example README INSTALL
 EXTRA_DIST = COMMANDS UPGRADING $(pkgdata_DATA)
 mpd_headers = buffer2array.h interface.h command.h playlist.h ls.h \
@@ -11,7 +11,4 @@ mpd_SOURCES = main.c buffer2array.c interface.c command.c playlist.c ls.c \
 	tag.c player.c listen.c conf.c ogg_decode.c volume.c mp3_decode.c \
 	audio.c buffer.c stats.c myfprintf.c $(mpd_headers)
 
-MAD_LIB = libmad/libmad.la
-ID3_LIB = libid3tag/libid3tag.la
-
-mpd_LDADD = $(MAD_LIB) $(ID3_LIB)
+mpd_LDADD = $(ID3_LIB) $(MAD_LIB)

Makefile.in

@@ -76,11 +76,15 @@ CCASFLAGS = @CCASFLAGS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 ECHO = @ECHO@
+ID3_LIB = @ID3_LIB@
+ID3_SUBDIR = @ID3_SUBDIR@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@
 LIBFLAC_LIBS = @LIBFLAC_LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
+MAD_LIB = @MAD_LIB@
+MAD_SUBDIR = @MAD_SUBDIR@
 OBJDUMP = @OBJDUMP@
 OGG_CFLAGS = @OGG_CFLAGS@
 OGG_LIBS = @OGG_LIBS@
@@ -96,7 +100,7 @@ am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@
 bin_PROGRAMS = mpd
-SUBDIRS = libid3tag libmad
+SUBDIRS = $(ID3_SUBDIR) $(MAD_SUBDIR)
 pkgdata_DATA = mpdconf.example README INSTALL
 EXTRA_DIST = COMMANDS UPGRADING $(pkgdata_DATA)
 mpd_headers = buffer2array.h interface.h command.h playlist.h ls.h \
@@ -110,10 +114,7 @@ mpd_SOURCES = main.c buffer2array.c interface.c command.c playlist.c ls.c \
 	audio.c buffer.c stats.c myfprintf.c $(mpd_headers)
 
 
-MAD_LIB = libmad/libmad.la
-ID3_LIB = libid3tag/libid3tag.la
-
-mpd_LDADD = $(MAD_LIB) $(ID3_LIB)
+mpd_LDADD = $(ID3_LIB) $(MAD_LIB)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -132,7 +133,7 @@ am_mpd_OBJECTS = main.$(OBJEXT) buffer2array.$(OBJEXT) \
 	buffer.$(OBJEXT) stats.$(OBJEXT) myfprintf.$(OBJEXT) \
 	$(am__objects_1)
 mpd_OBJECTS = $(am_mpd_OBJECTS)
-mpd_DEPENDENCIES = libmad/libmad.la libid3tag/libid3tag.la
+mpd_DEPENDENCIES =
 mpd_LDFLAGS =
 
 DEFS = @DEFS@

README

@@ -3,7 +3,7 @@
                         http://musicpd.sourceforge.net
 
 A daemon for playing music (currently mp3 and ogg vorbis).  Music is played
-through the server's audio device.  The daemon stores info about all availabe
+through the server's audio device.  The daemon stores info about all available
 music, and this info can be easily searched and retrieved.  Player control, info
 retrieval, and playlist management can all be managed remotely.
 

buffer.c

@@ -20,6 +20,7 @@
 #include "command.h"
 #include "conf.h"
 
+#include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <stdio.h>

buffer.h

@@ -31,6 +31,7 @@ typedef struct _Buffer {
 	int begin;
 	int end;
 	int wrap;
+	int finished;
 } Buffer;
 
 void initBuffer();

command.c

@@ -359,7 +359,7 @@ int processCommand(FILE * fp, int argArrayLength, char ** argArray) {
 			return -1;
 		}
 		if(argArrayLength==2) directory = argArray[1];
-		return printAllSongFilenamesInDirectory(fp,directory);
+		printAllIn(fp,directory);
 	}
 	else if(0==strcmp(argArray[0],COMMAND_STATS)) {
 		if(argArrayLength!=1) {

conf.c

@@ -28,7 +28,7 @@
 
 #define MAX_STRING_SIZE	MAXPATHLEN+80
 
-#define CONF_NUMBER_OF_PARAMS	10
+#define CONF_NUMBER_OF_PARAMS	11
 #define CONF_NUMBER_OF_PATHS	4
 #define CONF_NUMBER_OF_REQUIRED	5
 
@@ -37,6 +37,7 @@
 #define CONF_MAX_CONNECTIONS_DEFAULT		"5"
 #define CONF_MAX_PLAYLIST_LENGTH_DEFAULT	"4096"
 #define CONF_BUFFER_BEFORE_PLAY_DEFAULT		"25%"
+#define CONF_STOP_ON_ERROR_DEFAULT		"yes"
 
 char conf_strings[CONF_NUMBER_OF_PARAMS][24] = {
 	"port",
@@ -48,7 +49,8 @@ char conf_strings[CONF_NUMBER_OF_PARAMS][24] = {
 	"mixer_device",
 	"max_connections",
 	"max_playlist_length",
-	"buffer_before_play"
+	"buffer_before_play",
+	"stop_on_error"
 };
 
 int conf_absolutePaths[CONF_NUMBER_OF_PATHS] = {
@@ -79,6 +81,7 @@ void initConf() {
 	conf_params[CONF_MAX_CONNECTIONS] = strdup(CONF_MAX_CONNECTIONS_DEFAULT);
 	conf_params[CONF_MAX_PLAYLIST_LENGTH] = strdup(CONF_MAX_PLAYLIST_LENGTH_DEFAULT);
 	conf_params[CONF_BUFFER_BEFORE_PLAY] = strdup(CONF_BUFFER_BEFORE_PLAY_DEFAULT);
+	conf_params[CONF_STOP_ON_ERROR] = strdup(CONF_STOP_ON_ERROR_DEFAULT);
 }
 
 char ** readConf(char * file) {

conf.h

@@ -29,6 +29,7 @@
 #define CONF_MAX_CONNECTIONS		7
 #define CONF_MAX_PLAYLIST_LENGTH	8
 #define CONF_BUFFER_BEFORE_PLAY		9
+#define CONF_STOP_ON_ERROR		10
 
 /* do not free the return value, it is a static variable */
 char ** readConf(char * file);

configure.in

 AC_INIT(main.c)
-AM_INIT_AUTOMAKE(mpd, 0.8.0)
-AC_CONFIG_SUBDIRS(libid3tag libmad)
+AM_INIT_AUTOMAKE(mpd, 0.8.1)
 
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -9,15 +8,63 @@ AC_PROG_LIBTOOL
 dnl MAD wants this stuff
 AC_SUBST(CCAS)
 AC_SUBST(CCASFLAGS)
+AC_SUBST(MAD_SUBDIR)
+AC_SUBST(MAD_LIB)
+AC_SUBST(ID3_SUBDIR)
+AC_SUBST(ID3_LIB)
 
 set -- $CFLAGS
 CFLAGS="-Wall $CFLAGS"
 
 AC_ARG_ENABLE(ogg,[  --disable-ogg     disable ogg support],,enable_ogg=yes)
-AC_ARG_ENABLE(flac,[  --disable-flac   disable flac support],,enable_flac=yes)
+AC_ARG_ENABLE(flac,[  --disable-flac    disable flac support],,enable_flac=yes)
+AC_ARG_ENABLE(mp3,[  --disable-mp3     disable mp3 support],,enable_mp3=yes)
+AC_ARG_ENABLE(mpd_mad,[  --enable-mpd-mad     use mpd libmad],use_mpd_mad=yes,)
+AC_ARG_ENABLE(id3,[  --disable-id3     disable id3 support],,enable_id3=yes)
+AC_ARG_ENABLE(mpd_id3tag,[  --enable-mpd-id3tag    use mpd libid3tag],use_mpd_id3tag=yes,)
 
 XIPH_PATH_AO(LIBS="$LIBS $AO_LIBS" CFLAGS="$CFLAGS $AO_CFLAGS",AC_MSG_ERROR(Must have libao installed!!!))
-AC_CHECK_HEADER(sys/soundcard.h,CFLAGS="$CFLAGS",[CFLAGS="$CFLAGS -DNO_LINUX_OSS_MIXER";AC_MSG_WARN(Soundcard headers not found -- disabling mixer)])
+AC_CHECK_HEADER(sys/soundcard.h,CFLAGS="$CFLAGS",[CFLAGS="$CFLAGS -DNO_OSS_MIXER";AC_MSG_WARN(Soundcard headers not found -- disabling mixer)])
+
+ID3_SUBDIR=""
+
+if test x$enable_id3 = xyes; then
+	if test x$use_mpd_id3tag = xyes; then
+		ID3_SUBDIR="libid3tag"
+	else
+		oldcflags=$CFLAGS
+		CFLAGS="$CFLAGS -lz"
+		AC_CHECK_LIB(id3tag,id3_file_open,[ID3_LIB="-lid3tag -lz";
+     			use_libid3tag=yes],
+			[use_libid3tag=no;use_mpd_id3tag=yes])
+		CFLAGS=$oldcflags
+	fi
+	if test x$use_mpd_id3tag = xyes; then
+		CFLAGS="$CFLAGS -DUSE_MPD_ID3TAG"
+		ID3_LIB="libid3tag/libid3tag.la"
+		ID3_SUBDIR="libid3tag"
+		AC_CONFIG_SUBDIRS(libid3tag)
+	fi
+	CFLAGS="$CFLAGS -DHAVE_ID3TAG"
+fi
+
+MAD_SUBDIR=""
+
+if test x$enable_mp3 = xyes; then
+	if test x$use_mpd_mad = xyes; then
+		MAD_SUBDIR="libmad"
+	else
+		AC_CHECK_LIB(mad,mad_stream_init,[MAD_LIB=-lmad;use_libmad=yes],
+     			[use_libmad=no;use_mpd_mad=yes])
+	fi
+	if test x$use_mpd_mad = xyes; then
+		CFLAGS="$CFLAGS -DUSE_MPD_MAD"
+		MAD_LIB="libmad/libmad.la"
+		MAD_SUBDIR="libmad"
+		AC_CONFIG_SUBDIRS(libmad)
+	fi
+	CFLAGS="$CFLAGS -DHAVE_MAD"
+fi
 
 if test x$enable_ogg = xyes; then
 	XIPH_PATH_OGG(LIBS="$LIBS $OGG_LIBS" CFLAGS="$CFLAGS $OGG_CFLAGS" enable_vorbistest=no,enable_ogg=no)

directory.c

@@ -358,7 +358,7 @@ void writeDirectoryInfo(FILE * fp, Directory * directory) {
 	while(node!=NULL) {
 		subDirectory = (Directory *)node->data;
 		fprintf(fp,"%s%s\n",DIRECTORY_DIR,node->key);
-		fprintf(fp,"%s%li\n",DIRECTORY_MTIME,subDirectory->mtime);
+		fprintf(fp,"%s%li\n",DIRECTORY_MTIME,(long)subDirectory->mtime);
 		writeDirectoryInfo(fp,subDirectory);
 		node = node->nextNode;
 	}
@@ -468,11 +468,13 @@ int updateMp3Directory(FILE * fp) {
 	return 0;
 }
 
-void printAllSongFilenamesInSubDirectory(FILE * fp, Directory * directory) {
+void printAllInSubDirectory(FILE * fp, Directory * directory) {
 	ListNode * node = directory->songs->firstNode;
 	Song * song;
 	Directory * dir;
 
+	myfprintf(fp,"directory: %s\n",directory->name);
+
 	while(node!=NULL) {
 		song = (Song *)node->data;
 		myfprintf(fp,"file: %s\n",song->file);
@@ -483,20 +485,25 @@ void printAllSongFilenamesInSubDirectory(FILE * fp, Directory * directory) {
 
 	while(node!=NULL) {
 		dir = (Directory *)node->data;
-		printAllSongFilenamesInSubDirectory(fp,dir);
+		printAllInSubDirectory(fp,dir);
 		node = node->nextNode;
 	}
 }
 
-int printAllSongFilenamesInDirectory(FILE * fp, char * name) {
+int printAllIn(FILE * fp, char * name) {
 	Directory * directory;
 	
 	if((directory = getDirectory(name))==NULL) {
-		myfprintf(fp,"%s: directory not found\n",COMMAND_RESPOND_ERROR);
+		Song * song;
+		if((song = getSong(name))) {
+			myfprintf(fp,"file: %s\n",song->file);
+			return 0;
+		}
+		myfprintf(fp,"%s: directory or file not found\n",COMMAND_RESPOND_ERROR);
 		return -1;
 	}
 
-	printAllSongFilenamesInSubDirectory(fp,directory);
+	printAllInSubDirectory(fp,directory);
 
 	return 0;
 }

directory.h

@@ -40,7 +40,7 @@ size_t getDirectoryLine(char ** buffer, int * size, FILE * fp);
 
 int updateMp3Directory(FILE * fp);
 
-int printAllSongFilenamesInDirectory(FILE * fp, char * dirname);
+int printAllIn(FILE * fp, char * name);
 
 Song * getSong(char * file);
 

flac_decode.c

@@ -63,6 +63,8 @@ int flac_decode_pid = 0;
 int flac_decode_done = 0;
 ao_device * flac_device = NULL;
 
+/* this code is based on flac123, from flac-tools */
+
 void flacPlayfile(const char * file, Buffer * cb, ao_sample_format * format);
 void flacError(const FLAC__FileDecoder *, FLAC__StreamDecoderErrorStatus, void *);
 void flacMetadata(const FLAC__FileDecoder *, const FLAC__StreamMetadata *, void *);
@@ -202,25 +204,24 @@ int flac_decode(char * file, FILE * in, FILE * out) {
 	
 	sa.sa_flags = 0;
 	sigemptyset(&sa.sa_mask);
+	sa.sa_handler = SIG_IGN;
+	sigaction(SIGPIPE,&sa,NULL);
+	sa.sa_handler = flac_decode_parentSigHandler;
+	sigaction(SIGCHLD,&sa,NULL);
+	sigaction(SIGTERM,&sa,NULL);
 
 	cb = getBuffer();
 	
 	cb->begin = 0;
 	cb->end = 0;
 	cb->wrap = 0;
+	cb->finished = 0;
 
 	if(flac_getAoDataAndTime(file,&format,&total_time)<0) {
 		fprintf(stderr,"%s \"%s\" doesn't seem to be a flac\n",COMMAND_RESPOND_ERROR,file);
 		return PLAYER_EXIT_ERROR_FILE;
 	}
 
-	sa.sa_handler = SIG_IGN;
-	sigaction(SIGPIPE,&sa,NULL);
-	sa.sa_handler = flac_decode_parentSigHandler;
-	sigaction(SIGCHLD,&sa,NULL);
-	sa.sa_handler = flac_decode_parentSigHandler;
-	sigaction(SIGTERM,&sa,NULL);
-
 	fflush(NULL);
 
 	flac_decode_pid = fork();
@@ -232,13 +233,7 @@ int flac_decode(char * file, FILE * in, FILE * out) {
 
 		flacPlayFile(file,cb,&format);
 
-		while(cb->begin==cb->end && cb->wrap) usleep(100);
-		cb->times[cb->end] = -1;
-		cb->end++;
-		if(cb->end>=BUFFERED_CHUNKS) {
-			cb->end = 0;
-			cb->wrap = 1;
-		}
+		cb->finished = 1;
 
 		exit(0);
 
@@ -281,19 +276,34 @@ int flac_decode(char * file, FILE * in, FILE * out) {
 		fprintf(out,"%s %f %f\n",PLAYER_TIME,last_tell,total_time);
 		fflush(out);
 
-		while(flac_decode_pid>0 && !cb->wrap && cb->end-cb->begin<buffered_before_play) {
+		while(flac_decode_pid>0 && !cb->wrap && cb->end-cb->begin<buffered_before_play && !cb->finished) {
 			usleep(1000);
 		}
 		
 		while(!quit) {
-			if((cb->begin!=cb->end || cb->wrap) && !pause) {
+			if(pause || checkInput%CHECK_INPUT_FREQ==0) {
+				FD_ZERO(&fds);
+				FD_SET(fileno(in),&fds);
+				fflush(in);
+				if(select(fileno(in)+1,&fds,NULL,NULL,&tv)) {
+					myFgets(input,INPUT_BUFFER_SIZE,in);
+					if(strcasecmp(PLAYER_PAUSE,input)==0) {
+						fprintf(out,"%s\n",PLAYER_PAUSE_GOT);
+						fflush(out);
+						pause = !pause;
+					}
+				}
+				checkInput = 1;
+			}
+			checkInput++;
+			if(pause) usleep(100);
+			else if(cb->begin!=cb->end || cb->wrap) {
 				if(currentPlayChunk==0) elapsed = cb->times[cb->begin];
 				ao_play(flac_device,cb->chunks[cb->begin]+currentPlayChunk*PLAY_SIZE,PLAY_SIZE);
 				currentPlayChunk++;
 				if(currentPlayChunk>=playsPerChunk) {
 					currentPlayChunk=0;
 					cb->begin++;
-					if(cb->times[cb->begin]<0) quit = 1;
 					if(cb->begin>=BUFFERED_CHUNKS) {
 						cb->begin = 0;
 						cb->wrap = 0;
@@ -305,25 +315,10 @@ int flac_decode(char * file, FILE * in, FILE * out) {
 					fflush(out);
 				}
 			}
-			else if(flac_decode_pid<=0 && (cb->begin==cb->end && !cb->wrap)) {
+			else if(flac_decode_pid<=0 || cb->finished) {
 				quit = 1;
 			}
 			else usleep(200);
-			if(pause || checkInput%CHECK_INPUT_FREQ==0) {
-				FD_ZERO(&fds);
-				FD_SET(fileno(in),&fds);
-				fflush(in);
-				if(select(fileno(in)+1,&fds,NULL,NULL,&tv)) {
-					myFgets(input,INPUT_BUFFER_SIZE,in);
-					if(strcasecmp(PLAYER_PAUSE,input)==0) {
-						fprintf(out,"%s\n",PLAYER_PAUSE_GOT);
-						fflush(out);
-						pause = !pause;
-					}
-				}
-				checkInput = 1;
-			}
-			checkInput++;
 		}
 
 		pid = flac_decode_pid;

install-sh

 #!/bin/sh
 #
 # install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
 #
-# Copyright 1991 by the Massachusetts Institute of Technology
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
 #
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it

interface.c

@@ -64,7 +64,7 @@ void openInterface(Interface * interface, int fd) {
 	interface->bufferLength = 0;
 	interface->fd = fd;
 	fcntl(interface->fd,F_SETFL,O_NONBLOCK);
-	interface->fp = fdopen(fd,"w");
+	interface->fp = fdopen(fd,"rw");
 	interface->open = 1;
 	interface->lastTime = time(NULL);
 	interface->commandList = NULL;
@@ -78,7 +78,7 @@ void closeInterface(Interface * interface) {
 
 	interface->open = 0;
 
-	if(fclose(interface->fp)) {
+	if(close(interface->fd)) {
 		fprintf(stderr,"Error closing file pointer\n");
 	}
 
@@ -92,7 +92,7 @@ void openAInterface(int fd) {
 	for(i=0;i<interface_max_connections && interfaces[i].open;i++);
 
 	if(i==interface_max_connections) {
-		FILE * fp = fdopen(fd,"w");
+		FILE * fp = fdopen(fd,"rw");
 		myfprintf(fp,"%s Max Connections Reached!\n",COMMAND_RESPOND_ERROR);
 		fclose(fp);
 		close(fd);
@@ -172,9 +172,7 @@ int interfaceReadInput(Interface * interface) {
 		}
 		return ret;
 	}
-	else {
-		closeInterface(interface);
-	}
+	else closeInterface(interface);
 
 	return 1;
 }
@@ -191,17 +189,42 @@ void addInterfacesToFdSet(fd_set * fds) {
 	}
 }
 
+void closeNextErroredInterface() {
+	fd_set fds;
+	struct timeval tv;
+	int i;
+
+	tv.tv_sec = 0;
+	tv.tv_usec = 1000;
+
+	for(i=0;i<interface_max_connections;i++) {
+		if(interfaces[i].open) {
+			FD_ZERO(&fds);
+			FD_SET(interfaces[i].fd,&fds);
+			if(select(FD_SETSIZE,&fds,NULL,NULL,&tv)<0) {
+				closeInterface(&interfaces[i]);
+				return;
+			}
+		}
+	}
+}
+
 int readInputFromInterfaces() {
 	fd_set fds;
 	struct timeval tv;
 	int i;
+	int selret;
 
 	tv.tv_sec = 0;
 	tv.tv_usec = 1000;
 
 	addInterfacesToFdSet(&fds);
 
-	while(select(FD_SETSIZE,&fds,NULL,NULL,&tv)) {
+	while((selret = select(FD_SETSIZE,&fds,NULL,NULL,&tv))) {
+		if(selret<0) {
+			closeNextErroredInterface();
+			continue;
+		}
 		for(i=0;i<interface_max_connections;i++) {
 			if(interfaces[i].open && FD_ISSET(interfaces[i].fd,&fds)) {
 				if(COMMAND_RETURN_KILL==interfaceReadInput(&(interfaces[i]))) {
@@ -242,6 +265,8 @@ void initInterfaces() {
 void closeAllInterfaces() {
 	int i;
 
+	fflush(NULL);
+
 	for(i=0;i<interface_max_connections;i++) {
 		if(interfaces[i].open) {
 			closeInterface(&(interfaces[i]));

libid3tag/CHANGES

@@ -2,7 +2,7 @@
  libid3tag - ID3 tag manipulation library
  Copyright (C) 2000-2003 Underbit Technologies, Inc.
 
- $Id: CHANGES,v 1.2 2003/07/05 05:18:51 shank Exp $
+ $Id: CHANGES,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
 
 ===============================================================================
 

libid3tag/CREDITS

@@ -2,7 +2,7 @@
  libid3tag - ID3 tag manipulation library
  Copyright (C) 2000-2003 Underbit Technologies, Inc.
 
- $Id: CREDITS,v 1.2 2003/07/05 05:18:51 shank Exp $
+ $Id: CREDITS,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
 
 ===============================================================================
 

libid3tag/Makefile.am

@@ -16,7 +16,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ##
-## $Id: Makefile.am,v 1.3 2003/07/05 06:12:40 shank Exp $
+## $Id: Makefile.am,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
 ##
 
 ## Process this file with automake to produce Makefile.in

libid3tag/README

@@ -2,7 +2,7 @@
  libid3tag - ID3 tag manipulation library
  Copyright (C) 2000-2003 Underbit Technologies, Inc.
 
- $Id: README,v 1.2 2003/07/05 05:18:51 shank Exp $
+ $Id: README,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
 
 ===============================================================================
 

libid3tag/TODO

@@ -2,7 +2,7 @@
  libid3tag - ID3 tag manipulation library
  Copyright (C) 2000-2003 Underbit Technologies, Inc.
 
- $Id: TODO,v 1.2 2003/07/05 05:18:51 shank Exp $
+ $Id: TODO,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
 
 ===============================================================================
 

libid3tag/compat.gperf

@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: compat.gperf,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: compat.gperf,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libid3tag/compat.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: compat.h,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: compat.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBID3TAG_COMPAT_H

libid3tag/configure.ac

@@ -17,7 +17,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 dnl
-AC_REVISION([$Id: configure.ac,v 1.3 2003/07/05 05:39:48 shank Exp $])dnl
+AC_REVISION([$Id: configure.ac,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $])dnl
 
 dnl Process this file with autoconf to produce a configure script.
 

libid3tag/crc.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: crc.c,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: crc.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libid3tag/crc.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: crc.h,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: crc.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBID3TAG_CRC_H

libid3tag/debug.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: debug.c,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: debug.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libid3tag/debug.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: debug.h,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: debug.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBID3TAG_DEBUG_H

libid3tag/field.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: field.c,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: field.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libid3tag/field.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: field.h,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: field.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBID3TAG_FIELD_H

libid3tag/file.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: file.c,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: file.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libid3tag/file.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: file.h,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: file.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBID3TAG_FILE_H

libid3tag/frame.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: frame.c,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: frame.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libid3tag/frame.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: frame.h,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: frame.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBID3TAG_FRAME_H

libid3tag/frametype.gperf

@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: frametype.gperf,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: frametype.gperf,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libid3tag/frametype.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: frametype.h,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: frametype.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBID3TAG_FRAMETYPE_H

libid3tag/genre.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: genre.c,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: genre.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libid3tag/genre.dat

@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * Id: genre.dat.in,v 1.2 2003/07/05 05:18:51 shank Exp 
+ * Id: genre.dat.in,v 1.1.1.1 2003/07/15 15:51:33 shank Exp 
  */
 
 /*

libid3tag/genre.dat.in

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: genre.dat.in,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: genre.dat.in,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 /*

libid3tag/genre.dat.sed

@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# $Id: genre.dat.sed,v 1.2 2003/07/05 05:18:51 shank Exp $
+# $Id: genre.dat.sed,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
 #
 
 1i\

libid3tag/genre.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: genre.h,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: genre.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBID3TAG_GENRE_H

libid3tag/global.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: global.h,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: global.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBID3TAG_GLOBAL_H

libid3tag/id3tag.h

@@ -19,7 +19,7 @@
  * If you would like to negotiate alternate licensing terms, you may do
  * so by contacting: Underbit Technologies, Inc. <info@underbit.com>
  *
- * $Id: id3tag.h,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: id3tag.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBID3TAG_ID3TAG_H

libid3tag/latin1.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: latin1.c,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: latin1.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libid3tag/latin1.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: latin1.h,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: latin1.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBID3TAG_LATIN1_H

libid3tag/parse.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: parse.c,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: parse.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libid3tag/parse.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: parse.h,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: parse.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBID3TAG_PARSE_H

libid3tag/render.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: render.c,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: render.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libid3tag/render.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: render.h,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: render.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBID3TAG_RENDER_H

libid3tag/tag.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: tag.c,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: tag.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libid3tag/tag.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: tag.h,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: tag.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBID3TAG_TAG_H

libid3tag/ucs4.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: ucs4.c,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: ucs4.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libid3tag/ucs4.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: ucs4.h,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: ucs4.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBID3TAG_UCS4_H

libid3tag/utf16.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: utf16.c,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: utf16.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libid3tag/utf16.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: utf16.h,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: utf16.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBID3TAG_UTF16_H

libid3tag/utf8.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: utf8.c,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: utf8.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libid3tag/utf8.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: utf8.h,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: utf8.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBID3TAG_UTF8_H

libid3tag/util.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: util.c,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: util.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libid3tag/util.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: util.h,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: util.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBID3TAG_UTIL_H

libid3tag/version.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: version.c,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: version.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libid3tag/version.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: version.h,v 1.2 2003/07/05 05:18:51 shank Exp $
+ * $Id: version.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBID3TAG_VERSION_H

libmad/CHANGES

@@ -2,7 +2,7 @@
  libmad - MPEG audio decoder library
  Copyright (C) 2000-2003 Underbit Technologies, Inc.
 
- $Id: CHANGES,v 1.1 2003/07/05 06:20:49 shank Exp $
+ $Id: CHANGES,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
 
 ===============================================================================
 

libmad/CREDITS

@@ -2,7 +2,7 @@
  libmad - MPEG audio decoder library
  Copyright (C) 2000-2003 Underbit Technologies, Inc.
 
- $Id: CREDITS,v 1.1 2003/07/05 06:20:50 shank Exp $
+ $Id: CREDITS,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
 
 ===============================================================================
 

libmad/D.dat

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: D.dat,v 1.2 2003/07/05 06:20:50 shank Exp $
+ * $Id: D.dat,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 /*

libmad/Makefile.am

@@ -16,7 +16,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ##
-## $Id: Makefile.am,v 1.3 2003/07/05 06:20:50 shank Exp $
+## $Id: Makefile.am,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
 ##
 
 ## Process this file with automake to produce Makefile.in

libmad/README

@@ -2,7 +2,7 @@
  libmad - MPEG audio decoder library
  Copyright (C) 2000-2003 Underbit Technologies, Inc.
 
- $Id: README,v 1.1 2003/07/05 06:20:50 shank Exp $
+ $Id: README,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
 
 ===============================================================================
 

libmad/TODO

@@ -2,7 +2,7 @@
  libmad - MPEG audio decoder library
  Copyright (C) 2000-2003 Underbit Technologies, Inc.
 
- $Id: TODO,v 1.1 2003/07/05 06:20:50 shank Exp $
+ $Id: TODO,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
 
 ===============================================================================
 

libmad/bit.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: bit.c,v 1.2 2003/07/05 06:20:50 shank Exp $
+ * $Id: bit.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libmad/bit.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: bit.h,v 1.2 2003/07/05 06:20:50 shank Exp $
+ * $Id: bit.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBMAD_BIT_H

libmad/configure.ac

@@ -17,7 +17,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 dnl
-AC_REVISION([$Id: configure.ac,v 1.1 2003/07/05 06:20:51 shank Exp $])dnl
+AC_REVISION([$Id: configure.ac,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $])dnl
 
 dnl Process this file with autoconf to produce a configure script.
 

libmad/decoder.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: decoder.c,v 1.2 2003/07/05 06:20:51 shank Exp $
+ * $Id: decoder.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libmad/decoder.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: decoder.h,v 1.2 2003/07/05 06:20:51 shank Exp $
+ * $Id: decoder.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBMAD_DECODER_H

libmad/fixed.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: fixed.c,v 1.2 2003/07/05 06:20:51 shank Exp $
+ * $Id: fixed.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libmad/fixed.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: fixed.h,v 1.2 2003/07/05 06:20:52 shank Exp $
+ * $Id: fixed.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBMAD_FIXED_H

libmad/frame.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: frame.c,v 1.2 2003/07/05 06:20:52 shank Exp $
+ * $Id: frame.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libmad/frame.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: frame.h,v 1.2 2003/07/05 06:20:52 shank Exp $
+ * $Id: frame.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBMAD_FRAME_H

libmad/global.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: global.h,v 1.2 2003/07/05 06:20:52 shank Exp $
+ * $Id: global.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBMAD_GLOBAL_H

libmad/huffman.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: huffman.c,v 1.2 2003/07/05 06:20:52 shank Exp $
+ * $Id: huffman.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libmad/huffman.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: huffman.h,v 1.2 2003/07/05 06:20:52 shank Exp $
+ * $Id: huffman.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBMAD_HUFFMAN_H

libmad/imdct_l_arm.S

@@ -22,7 +22,7 @@
 *
 *****************************************************************************
 *
-* $Id: imdct_l_arm.S,v 1.2 2003/07/05 06:20:52 shank Exp $
+* $Id: imdct_l_arm.S,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
 *
 * 2001/03/24:  Andre McCurdy <armccurdy@yahoo.co.uk>
 *   - Corrected PIC unsafe loading of address of 'imdct36_long_karray'

libmad/imdct_s.dat

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: imdct_s.dat,v 1.2 2003/07/05 06:20:52 shank Exp $
+ * $Id: imdct_s.dat,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
   /*  0 */  {  MAD_F(0x09bd7ca0) /*  0.608761429 */,

libmad/layer12.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: layer12.c,v 1.2 2003/07/05 06:20:52 shank Exp $
+ * $Id: layer12.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libmad/layer12.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: layer12.h,v 1.2 2003/07/05 06:20:52 shank Exp $
+ * $Id: layer12.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBMAD_LAYER12_H

libmad/layer3.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: layer3.c,v 1.2 2003/07/05 06:20:52 shank Exp $
+ * $Id: layer3.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifdef HAVE_CONFIG_H

libmad/layer3.h

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: layer3.h,v 1.2 2003/07/05 06:20:53 shank Exp $
+ * $Id: layer3.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # ifndef LIBMAD_LAYER3_H

libmad/mad.h

@@ -33,7 +33,7 @@ extern "C" {
 # define SIZEOF_LONG_LONG 8
 
 
-/* Id: version.h,v 1.2 2003/07/05 06:20:55 shank Exp */
+/* Id: version.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp */
 
 # ifndef LIBMAD_VERSION_H
 # define LIBMAD_VERSION_H
@@ -62,7 +62,7 @@ extern char const mad_build[];
 
 # endif
 
-/* Id: fixed.h,v 1.2 2003/07/05 06:20:52 shank Exp */
+/* Id: fixed.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp */
 
 # ifndef LIBMAD_FIXED_H
 # define LIBMAD_FIXED_H
@@ -528,7 +528,7 @@ mad_fixed_t mad_f_div(mad_fixed_t, mad_fixed_t);
 
 # endif
 
-/* Id: bit.h,v 1.2 2003/07/05 06:20:50 shank Exp */
+/* Id: bit.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp */
 
 # ifndef LIBMAD_BIT_H
 # define LIBMAD_BIT_H
@@ -557,7 +557,7 @@ unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short);
 
 # endif
 
-/* Id: timer.h,v 1.2 2003/07/05 06:20:55 shank Exp */
+/* Id: timer.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp */
 
 # ifndef LIBMAD_TIMER_H
 # define LIBMAD_TIMER_H
@@ -639,7 +639,7 @@ void mad_timer_string(mad_timer_t, char *, char const *,
 
 # endif
 
-/* Id: stream.h,v 1.2 2003/07/05 06:20:55 shank Exp */
+/* Id: stream.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp */
 
 # ifndef LIBMAD_STREAM_H
 # define LIBMAD_STREAM_H
@@ -727,7 +727,7 @@ char const *mad_stream_errorstr(struct mad_stream const *);
 
 # endif
 
-/* Id: frame.h,v 1.2 2003/07/05 06:20:52 shank Exp */
+/* Id: frame.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp */
 
 # ifndef LIBMAD_FRAME_H
 # define LIBMAD_FRAME_H
@@ -824,7 +824,7 @@ void mad_frame_mute(struct mad_frame *);
 
 # endif
 
-/* Id: synth.h,v 1.2 2003/07/05 06:20:55 shank Exp */
+/* Id: synth.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp */
 
 # ifndef LIBMAD_SYNTH_H
 # define LIBMAD_SYNTH_H
@@ -873,7 +873,7 @@ void mad_synth_frame(struct mad_synth *, struct mad_frame const *);
 
 # endif
 
-/* Id: decoder.h,v 1.2 2003/07/05 06:20:51 shank Exp */
+/* Id: decoder.h,v 1.1.1.1 2003/07/15 15:51:33 shank Exp */
 
 # ifndef LIBMAD_DECODER_H
 # define LIBMAD_DECODER_H

libmad/mad.h.sed

@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# $Id: mad.h.sed,v 1.2 2003/07/05 06:20:53 shank Exp $
+# $Id: mad.h.sed,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
 #
 
 /^\/\*$/{

libmad/minimad.c

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: minimad.c,v 1.1 2003/07/05 06:20:53 shank Exp $
+ * $Id: minimad.c,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 # include <stdio.h>

libmad/qc_table.dat

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: qc_table.dat,v 1.2 2003/07/05 06:20:53 shank Exp $
+ * $Id: qc_table.dat,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 /*

libmad/rq_table.dat

@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: rq_table.dat,v 1.2 2003/07/05 06:20:53 shank Exp $
+ * $Id: rq_table.dat,v 1.1.1.1 2003/07/15 15:51:33 shank Exp $
  */
 
 /*