diff -c --recursive mpg123-0.59o/Makefile mpg123-0.59o_m/Makefile *** mpg123-0.59o/Makefile Sun Feb 8 19:23:04 1998 --- mpg123-0.59o_m/Makefile Sun Jul 12 23:56:03 1998 *************** *** 81,90 **** linux-alpha: $(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \ ! CFLAGS='-DLINUX -DOSS -Wall -O2 \ ! -fomit-frame-pointer -funroll-all-loops \ -finline-functions -ffast-math \ ! -Wall -O6 -DUSE_MMAP' \ mpg123-make linux-ppc: --- 81,90 ---- linux-alpha: $(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \ ! CFLAGS='-DLINUX -DOSS -DREAL_IS_FLOAT -Wall -DREAD_MMAP \ ! -fomit-frame-pointer -funroll-loops \ -finline-functions -ffast-math \ ! -Wall -O3' \ mpg123-make linux-ppc: *************** *** 108,114 **** @ $(MAKE) FRONTEND=sajberplay-make linux-frontend linux-tk3play: ! @ $(MAKE) FRONTEND=mpg123m-make linux-frontend linux-frontend: $(MAKE) CC=gcc LDFLAGS= \ --- 108,123 ---- @ $(MAKE) FRONTEND=sajberplay-make linux-frontend linux-tk3play: ! @ $(MAKE) FRONTEND=mpg123m-make linux-alpha-front ! ! linux-alpha-front: ! $(MAKE) CC=gcc LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o control.o control_tk3play.o' \ ! CFLAGS='-DLINUX -DOSS -DREAL_IS_FLOAT -Wall -DREAD_MMAP \ ! -DFRONTEND \ ! -fomit-frame-pointer -funroll-loops \ ! -finline-functions -ffast-math \ ! -Wall -O3' \ ! $(FRONTEND) linux-frontend: $(MAKE) CC=gcc LDFLAGS= \ Only in mpg123-0.59o_m: README.alpha diff -c --recursive mpg123-0.59o/common.c mpg123-0.59o_m/common.c *** mpg123-0.59o/common.c Wed Feb 11 22:36:25 1998 --- mpg123-0.59o_m/common.c Wed Oct 21 23:19:12 1998 *************** *** 4,9 **** --- 4,10 ---- #include #include + #include #include #ifdef READ_MMAP *************** *** 911,916 **** --- 912,919 ---- void open_stream(char *bs_filenam,int fd) { int i; + int flen; + struct stat s; filept_opened = 1; if (!bs_filenam) { *************** *** 927,935 **** perror (bs_filenam); exit(1); } for(i=0;;i++) { ! readers[i].filelen = -1; if(!readers[i].init) { rd = &readers[i]; break; --- 930,944 ---- perror (bs_filenam); exit(1); } + if(fstat(filept, &s) == -1) { + fprintf(stderr, "Error: fstat failed\n"); + flen = -1; + } else { + flen = s.st_size; + } for(i=0;;i++) { ! readers[i].filelen = flen; if(!readers[i].init) { rd = &readers[i]; break; *************** *** 1142,1148 **** fprintf(stderr,"Time: %3.2f [%3.2f], ",tim1,tim2); if(param.usebuffer) ! fprintf(stderr,"[%8d] ",buffsize); } int get_songlen(struct frame *fr,int no) --- 1151,1157 ---- fprintf(stderr,"Time: %3.2f [%3.2f], ",tim1,tim2); if(param.usebuffer) ! fprintf(stderr,"[%8d] ",(int)buffsize); } int get_songlen(struct frame *fr,int no) diff -c --recursive mpg123-0.59o/control.c mpg123-0.59o_m/control.c *** mpg123-0.59o/control.c Sat Jan 24 15:47:47 1998 --- mpg123-0.59o_m/control.c Wed Oct 21 23:41:32 1998 *************** *** 14,23 **** #ifndef WIN32 #include #endif ! /* */ #ifndef WIN32 #include "jukebox/controldata.h" #endif #include "mpg123.h" --- 14,24 ---- #ifndef WIN32 #include #endif ! #include #ifndef WIN32 #include "jukebox/controldata.h" + #include #endif #include "mpg123.h" diff -c --recursive mpg123-0.59o/control_tk3play.c mpg123-0.59o_m/control_tk3play.c *** mpg123-0.59o/control_tk3play.c Sat Jan 24 16:13:26 1998 --- mpg123-0.59o_m/control_tk3play.c Wed Oct 21 23:42:37 1998 *************** *** 341,352 **** } } ! if (param.halfspeed) if (hp--) { framecnt--; } else hp = param.halfspeed - 1; if (rewindspeed && (framecnt>1)) { rd->back_frame(fr,rewindspeed+1); --- 341,353 ---- } } ! if (param.halfspeed) { if (hp--) { framecnt--; } else hp = param.halfspeed - 1; + } if (rewindspeed && (framecnt>1)) { rd->back_frame(fr,rewindspeed+1); Only in mpg123-0.59o: mpg123.1 diff -c --recursive mpg123-0.59o/mpg123.c mpg123-0.59o_m/mpg123.c *** mpg123-0.59o/mpg123.c Wed Feb 11 22:15:08 1998 --- mpg123-0.59o_m/mpg123.c Mon Jul 13 15:17:30 1998 *************** *** 14,20 **** #include #endif ! /* #define SET_PRIO */ #include "mpg123.h" #include "getlopt.h" --- 14,20 ---- #include #endif ! #define SET_PRIO #include "mpg123.h" #include "getlopt.h" *************** *** 639,645 **** } } ! void main(int argc, char *argv[]) { int result; unsigned long frameNum = 0; --- 639,645 ---- } } ! int main(int argc, char *argv[]) { int result; unsigned long frameNum = 0; *************** *** 655,661 **** #endif if(sizeof(short) != 2) { ! fprintf(stderr,"Ouch SHORT has size of %d bytes (required: '2')\n",sizeof(short)); exit(1); } --- 655,661 ---- #endif if(sizeof(short) != 2) { ! fprintf(stderr,"Ouch SHORT has size of %d bytes (required: '2')\n",(int)sizeof(short)); exit(1); }