Index: Makefile
===================================================================
RCS file: /mnt/kens/cvsroot/kens/c/cmp3-kenrevs/Makefile,v
retrieving revision 1.1
diff -c -r1.1 Makefile
*** Makefile	2001/06/13 20:13:34	1.1
--- Makefile	2001/07/01 00:43:54
***************
*** 3,8 ****
--- 3,9 ----
  #
  #  initial_directory is now set in the config file
  mpg123_location   := "mpg123"
+ ogg123_location   := "ogg123"
  install_directory := "$(HOME)/bin"
  
  #
***************
*** 17,24 ****
  ## An ass repository is a nice thing to have. See README
  ass_repository := "$(HOME)/.cmp3ass"
  
! ## Define this for bufferring or add other parameters to mpg123
  mpg123_params := -b 320
  
  # You need debugging info? Uncomment this and check /tmp/cmp3log
  #debugging := 1
--- 18,26 ----
  ## An ass repository is a nice thing to have. See README
  ass_repository := "$(HOME)/.cmp3ass"
  
! ## Define this for bufferring or add other parameters to mpg123 and ogg123
  mpg123_params := -b 320
+ ogg123_params := -d oss
  
  # You need debugging info? Uncomment this and check /tmp/cmp3log
  #debugging := 1
***************
*** 30,38 ****
  #  Please don't change these if you want it to work properly
  #
  
! VERSION="2.0pre5"
  PARAMS= -DCMP3_VER="\$(VERSION)\" -DEXEC_LOC="\$(mpg123_location)\" \
! 	-DCMP3_CONFIG="\$(config_file)\"
  RNMP3PARAMS= -DVERSION="\$(VERSION)\"
  # Something for me and my cd changer, you definately don't want it as it
  # stands. Change the code to do something else you want it to do...
--- 32,40 ----
  #  Please don't change these if you want it to work properly
  #
  
! VERSION="2.0pre5-kr1"
  PARAMS= -DCMP3_VER="\$(VERSION)\" -DEXEC_LOC="\$(mpg123_location)\" \
! 	-DCMP3_CONFIG="\$(config_file)\" -DOGG_LOC="\$(ogg123_location)\" 
  RNMP3PARAMS= -DVERSION="\$(VERSION)\"
  # Something for me and my cd changer, you definately don't want it as it
  # stands. Change the code to do something else you want it to do...
***************
*** 52,57 ****
--- 54,60 ----
  endif
  ifdef mpg123_params
  PARAMS += -DEXEC_PARAMS="$(foreach token, $(mpg123_params),\"$(token)\",)"
+ PARAMS += -DOGG_PARAMS="$(foreach token, $(ogg123_params),\"$(token)\",)"
  else
  PARAMS += -DEXEC_PARAMS=\"\",
  endif
Index: cmp3fileio.c
===================================================================
RCS file: /mnt/kens/cvsroot/kens/c/cmp3-kenrevs/cmp3fileio.c,v
retrieving revision 1.1
diff -c -r1.1 cmp3fileio.c
*** cmp3fileio.c	2001/06/13 20:13:14	1.1
--- cmp3fileio.c	2001/06/30 23:55:09
***************
*** 94,99 ****
--- 94,100 ----
              ll_addlast(list_left, &leftentry);
          } else
              if ((Strcmp(dname+(strlen(dname)-4),".mp3") == 0) ||
+ 				(Strcmp(dname+(strlen(dname)-4),".ogg") == 0) ||
                  isPlaylist(dname))
              {
                  rightentry.name = dname;
Index: cmp3main.c
===================================================================
RCS file: /mnt/kens/cvsroot/kens/c/cmp3-kenrevs/cmp3main.c,v
retrieving revision 1.1
diff -c -r1.1 cmp3main.c
*** cmp3main.c	2001/06/13 20:13:16	1.1
--- cmp3main.c	2001/06/30 23:33:20
***************
*** 627,632 ****
--- 627,633 ----
      if (!Strcmp(argv[1], "version")) {
          printf("Cmp3 %s - %s\n\n", CMP3_VER, CMP3_COOLLINE);
          printf("mpg123 located at %s\n", EXEC_LOC);
+         printf("ogg123 located at %s\n", OGG_LOC);
  #ifdef ASS_LOC
          printf("Ass repository located at %s\n", ASS_LOC);
  #endif /* ASS_LOC */
***************
*** 797,800 ****
      }
  }
  
! /* EOF */
\ No newline at end of file
--- 798,801 ----
      }
  }
  
! /* EOF */
Index: cmp3manager.c
===================================================================
RCS file: /mnt/kens/cvsroot/kens/c/cmp3-kenrevs/cmp3manager.c,v
retrieving revision 1.1
diff -c -r1.1 cmp3manager.c
*** cmp3manager.c	2001/06/13 20:13:17	1.1
--- cmp3manager.c	2001/07/01 00:44:33
***************
*** 55,60 ****
--- 55,64 ----
      exit(0);
  }
  
+ /****************************************** 
+ 	LISTNEXT
+ 	plays the next file in the list. 
+ *******************************************/
  void listnext(int signum)
  {
      int pid;
***************
*** 110,119 ****
                  fclose(stderr);
              }
  
!             returned = execlp(EXEC_LOC,
!                               "mpg123",
!                               EXEC_PARAMS
!                               shmptr->plhead, 0);
  
              if (returned != 0) {
                  fprintf(debugfile, "execlp failed on %s with errno = %d\n",
--- 114,135 ----
                  fclose(stderr);
              }
  
! 			/* check for file type, launch either mpg123 or ogg123 */
! 			if (Strcmp(shmptr->plhead+(strlen(shmptr->plhead)-4),".mp3") == 0){
! 				returned = execlp(EXEC_LOC,
! 								  "mpg123",
! 								  EXEC_PARAMS
! 								  shmptr->plhead, 0);
! 			} else if (Strcmp(shmptr->plhead+(strlen(shmptr->plhead)-4),".ogg") == 0){
! 				returned = execlp(OGG_LOC,
! 								  "ogg123",
! 								  OGG_PARAMS
! 								  shmptr->plhead, 0);
! 
! 			} else {
!                 fprintf(debugfile, "listnext: %s is not an mp3 or ogg file\n",
!                     shmptr->plhead);
! 			}
  
              if (returned != 0) {
                  fprintf(debugfile, "execlp failed on %s with errno = %d\n",