[Pkg-wmaker-commits] [wmcdplay] 10/79: Revert upstream files to .orig state.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmcdplay.

commit 2a50a979c1a79d462c4376989165c6cbffaacd98
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Tue Jul 29 11:59:01 2014 -0500

    Revert upstream files to .orig state.
---
 Imakefile   |  2 +-
 cdctl.h     | 12 +-----------
 wmcdplay.cc | 17 ++++-------------
 3 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/Imakefile b/Imakefile
index 96c573c..3dfc773 100644
--- a/Imakefile
+++ b/Imakefile
@@ -5,4 +5,4 @@ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB)
 SRCS = wmcdplay.cc
 OBJS = wmcdplay.o
 
-ComplexProgramTargetNoMan(wmcdplay)
+ComplexProgramTarget(wmcdplay)
diff --git a/cdctl.h b/cdctl.h
index a2f78ae..8710b6c 100644
--- a/cdctl.h
+++ b/cdctl.h
@@ -85,7 +85,7 @@ public:
       tracksel=tsRandom;
       tskOurPlay=false;
 
-      if((cdfdopen = (cdfd = open(device,O_RDONLY | O_NONBLOCK))) != -1) {
+      if(cdfdopen=(cdfd=open(device,O_RDONLY | O_NONBLOCK))!=-1){
          status_state=ssNoCD;
          status_track=0;
          status_pos=0;
@@ -213,19 +213,9 @@ public:
                    start = cd_trklist[status_track].track_start;
                    stop = start + cd_trklist[status_track].track_len - _CDCTL_SENSITIVITY;
                    now = ((sc.cdsc_absaddr.msf.minute) * 60 + sc.cdsc_absaddr.msf.second) * 75 + sc.cdsc_absaddr.msf.frame - CD_MSF_OFFSET;
-/*
-cout << "=============" << endl;
-cout << "start:" << start << endl;
-cout << "stop:" << stop << endl;
-cout << "now:" << now << endl;
-*/
 	           if(now>0 && (now<start || now>=stop)){
                       status_state=ssPlaying;
                       selecttrack();
-/*
-cout << "Play track " << status_track << endl;
-cout << "=============" << endl;
-*/
                       doStatus();
                       return;
                    }
diff --git a/wmcdplay.cc b/wmcdplay.cc
index 4bc5a32..7d205ac 100644
--- a/wmcdplay.cc
+++ b/wmcdplay.cc
@@ -20,7 +20,7 @@
 #define CLASS       "WMCDPlay"
 
 // User defines - custom
-#define SYSARTDIR   "/usr/share/wmcdplay/"
+#define SYSARTDIR   "/usr/X11R6/lib/X11/wmcdplay/"
 #define CDDEV       "/dev/cdrom"
 #define BACKCOLOR   "#282828"
 #define LEDCOLOR    "green"
@@ -81,7 +81,6 @@ bool artwrk=false;
 char artwrkf[256]="";
 int tsel=1;
 int vol=-1;         // -1 means don't set volume
-int uinterval_e=UINTERVAL_E;
 
 // X-Windows basics - standard
 Atom _XA_GNUSTEP_WM_FUNC;
@@ -227,7 +226,7 @@ int main(int argc, char **argv)
             }
          }
          ucount++;
-         if(ucount>=((mode==ssNoCD || mode==ssTrayOpen) ? uinterval_e : UINTERVAL_N))
+         if(ucount>=((mode==ssNoCD || mode==ssTrayOpen) ? UINTERVAL_E : UINTERVAL_N))
             checkStatus(false);
          XFlush(d_display);
          usleep(50000);
@@ -365,7 +364,6 @@ void scanArgs(int argc, char **argv){
          fprintf(stderr, "   -f artwork_file        load the specified artwork file\n");
          fprintf(stderr, "   -t track_selection     set track selection   (between 0 and 4)\n");
          fprintf(stderr, "   -v volume              set the cdrom volume  (between 0 and 255)\n");
-         fprintf(stderr, "   -i interval            interval in 1/20 seconds between cd polls when empty\n");
          fprintf(stderr, "   -l led_color           use the specified color for led displays\n");
          fprintf(stderr, "   -b back_color          use the specified color for backgrounds\n");
          fprintf(stderr, "   -d cd_device           use specified device  (rather than /dev/cdrom)\n");
@@ -393,13 +391,6 @@ void scanArgs(int argc, char **argv){
          }
          continue;
       }
-      if(strcmp(argv[i], "-i")==0){
-         if(i<argc-1){
-            i++;
-            sscanf(argv[i], "%i", &uinterval_e);
-         }
-         continue;
-      }
       if(strcmp(argv[i], "-f")==0){
          artwrk=true;
 	 if(i<argc-1){
@@ -485,7 +476,7 @@ void checkStatus(bool forced){
             drawText(art_ledpos[1][0], art_ledpos[1][1], trackstr);
       }
       if(mode==ssPlaying || mode==ssPaused || mode==ssStopped){
-         int remain = 0;
+         int remain;
          if(tdisplay==0)
             remain=cdctl->getTrackLen(cdctl->getStatusTrack())-pos;
          if(tdisplay==1)
@@ -632,7 +623,7 @@ bool readArtwork(char *artfilen){
          sprintf(artfilenbuf, "%s%s", SYSARTDIR, artfilen);
          artfile=fopen(artfilenbuf, "r");
          if(artfile==NULL){
-            fprintf(stderr,"%s : Tried to find artwork file, but failed.\n", NAME);
+            fprintf(stderr,"%s : Tried to find artwork file, but failed.\n", NAME, artfilen);
             return false;
          }
       }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmcdplay.git