--- wmcdplay-1.0beta1.orig/Imakefile +++ wmcdplay-1.0beta1/Imakefile @@ -5,4 +5,4 @@ SRCS = wmcdplay.cc OBJS = wmcdplay.o -ComplexProgramTarget(wmcdplay) +ComplexProgramTargetNoMan(wmcdplay) --- wmcdplay-1.0beta1.orig/wmcdplay.cc +++ wmcdplay-1.0beta1/wmcdplay.cc @@ -20,7 +20,7 @@ #define CLASS "WMCDPlay" // User defines - custom -#define SYSARTDIR "/usr/X11R6/lib/X11/wmcdplay/" +#define SYSARTDIR "/usr/share/wmcdplay/" #define CDDEV "/dev/cdrom" #define BACKCOLOR "#282828" #define LEDCOLOR "green" @@ -81,6 +81,7 @@ 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; @@ -226,7 +227,7 @@ } } 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); @@ -364,6 +365,7 @@ 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"); @@ -391,6 +393,13 @@ } continue; } + if(strcmp(argv[i], "-i")==0){ + if(igetTrackLen(cdctl->getStatusTrack())-pos; if(tdisplay==1) @@ -623,7 +632,7 @@ 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, artfilen); + fprintf(stderr,"%s : Tried to find artwork file, but failed.\n", NAME); return false; } } --- wmcdplay-1.0beta1.orig/debian/README.debian +++ wmcdplay-1.0beta1/debian/README.debian @@ -0,0 +1,8 @@ +wmcdplay for DEBIAN +------------------- + +This is Debian GNU/Linux's prepackaged version of wmcdplay, a very +flexible CD player designed with NeXTStep/OpenStep in mind. + +Neale Pickett Thu, 18 Feb 1999 16:18:29 -0700 + --- wmcdplay-1.0beta1.orig/debian/dirs +++ wmcdplay-1.0beta1/debian/dirs @@ -0,0 +1,4 @@ +usr/share/doc/wmcdplay +usr/lib/menu +usr/share/wmcdplay +usr/bin --- wmcdplay-1.0beta1.orig/debian/docs +++ wmcdplay-1.0beta1/debian/docs @@ -0,0 +1,2 @@ +README +ARTWORK --- wmcdplay-1.0beta1.orig/debian/menu +++ wmcdplay-1.0beta1/debian/menu @@ -0,0 +1,2 @@ +?package(wmcdplay):needs="x11" section="Apps/Sound"\ + title="WMCDplay" command="wmcdplay" --- wmcdplay-1.0beta1.orig/debian/control +++ wmcdplay-1.0beta1/debian/control @@ -0,0 +1,18 @@ +Source: wmcdplay +Section: sound +Priority: optional +Build-Depends: debhelper, xutils, xlibs-dev +Maintainer: John H. Robinson, IV +Standards-Version: 3.6.1.1 + +Package: wmcdplay +Architecture: any +Section: sound +Priority: optional +Depends: ${shlibs:Depends} +Suggests: wmaker +Description: A CD player based on ascd designed for WindowMaker + There's nothing in the program that makes it *require* WindowMaker, + except maybe the look. It's extremely customizable, provides great + control, and runs on a 64x64 window. You can get it too look almost + like anything, provided of course you READ the documentation. --- wmcdplay-1.0beta1.orig/debian/rules +++ wmcdplay-1.0beta1/debian/rules @@ -0,0 +1,60 @@ +#!/usr/bin/make -f +# This is a -*- makefile -*- +# Modified from the sample debian/rules that uses debhelper. +# GNU copyright 1998 by Marcelo Magallon. +# GNU copyright 1997 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +build: build-stamp +build-stamp: + dh_testdir + xmkmf -a + perl -pi -e 's/-DX_LOCALE//g;' Makefile + $(MAKE) CC=c++ CXXDEBUGFLAGS="-g -O2" + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + -$(MAKE) clean + -rm Makefile + dh_clean + +# Build architecture-independent files here. +binary-indep: build +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build +# dh_testversion + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + install -s -m 0755 wmcdplay `pwd`/debian/tmp/usr/bin/wmcdplay + install -m 0644 XPM/*.art `pwd`/debian/tmp/usr/share/wmcdplay +# ( cd XPM ; tar cf - . ) | \ +# ( cd debian/tmp/usr/share/wmcdplay/ ; tar xvf - ) +# mv debian/tmp/usr/share/wmcdplay/*.art \ +# debian/tmp/usr/share/wmcdplay + dh_installdocs + dh_installmenu + dh_installman debian/wmcdplay.1x + dh_installchangelogs + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary --- wmcdplay-1.0beta1.orig/debian/changelog +++ wmcdplay-1.0beta1/debian/changelog @@ -0,0 +1,91 @@ +wmcdplay (1.0beta1-9) unstable; urgency=low + + * New Maintainer + * New standards version + * Added menu entry + * Created man page + + -- John H. Robinson, IV Tue, 17 Aug 2004 23:57:31 -0700 + +wmcdplay (1.0beta1-8) unstable; urgency=high + + * Changed Imakefile to use ComplexProgramTargetNoMan rather + than ComplexProgramTarget (Closes: #123732) + * Added a menu entry for Window Maker. + + -- Anthony Wong Sat, 12 Jan 2002 13:04:25 +0800 + +wmcdplay (1.0beta1-7) unstable; urgency=low + + * New maintainer (Closes: #73008) + * Moved the program from /usr/X11R6/bin to /usr/bin + * Cleaned up Build-Depends to suit the current X packaging scheme. + + -- Anthony Wong Sun, 14 Jan 2001 11:52:45 +0800 + +wmcdplay (1.0beta1-6) unstable; urgency=low + + * Orphaning the package + + -- Sean 'Shaleh' Perry Sun, 27 Aug 2000 23:01:10 -0700 + +wmcdplay (1.0beta1-5) unstable; urgency=low + + * Bug fix release + * Closes: #51168, #59778 + + -- Sean 'Shaleh' Perry Tue, 18 Jul 2000 12:32:12 -0700 + +wmcdplay (1.0beta1-4) unstable; urgency=low + + * New maintainer + + -- Sean E. Perry Fri, 3 Sep 1999 16:38:14 -0700 + +wmcdplay (1.0beta1-3) unstable; urgency=low + + * New maintainer + + -- Neale Pickett Thu, 18 Feb 1999 16:18:29 -0700 + +wmcdplay (1.0beta1-2) unstable; urgency=low + + * wmcdplay.cc: modified the location of system art files to reflect + placement on Debian's package. + * wmcdplay.cc: modified default value for cd polling interval (from + about 1 second to about 5 seconds) (closes: bug#25121) + * wmcdplay.cc: added -i switch to let user specify the cd polling + interval (sent upstream) + * Ekkehard Kraemer has confirmed that previous release fixed reported + bug, re: "wmcdplay doesn't work" (closes: bug#25535) + + -- Marcelo E. Magallon Sun, 11 Oct 1998 14:27:49 -0600 + +wmcdplay (1.0beta1-1) unstable; urgency=low + + * New upstream version + * debian/rules: nukes -DX_LOCALE from Makefile + * debian/rules: now calls $(MAKE) CC=c++ CXXDEBUGFLAGS="-g -O2" + * Artwork is now installed in /usr/share/wmcdplay + + -- Marcelo E. Magallon Sun, 4 Oct 1998 20:36:12 -0600 + +wmcdplay (0.8-1) unstable; urgency=low + + * New upstream version + * Added CC = c++ to Imakefile (there's something weird going on, cause + the upstream author doesn't need this) + * Uploaded to master + + -- Marcelo E. Magallon Sat, 9 May 1998 21:41:16 -0600 + +wmcdplay (0.7-1) unstable; urgency=low + + * Initial release + * Modified Imakefile to include CC = c++, otherwise, it won't build. + + -- Marcelo E. Magallon Wed, 8 Apr 1998 18:55:39 -0600 + +Local variables: +mode: debian-changelog +End: --- wmcdplay-1.0beta1.orig/debian/wmcdplay.1x +++ wmcdplay-1.0beta1/debian/wmcdplay.1x @@ -0,0 +1,57 @@ +.TH WMCDplay 1x "August 17, 2004" +.SH NAME +wmcdplay \- A cd player designed for WindowMaker +.SH SYNOPSIS +.B wmcdplay +.RI [ options ] +.br +.SH DESCRIPTION +A skinable CD player for the Window Maker dock. +.SH OPTIONS +.TP +\fB\-h\fR | \fB\-help\fR | \fB\-\-help\fR +display this help screen +.TP +\fB\-w\fR +use WithdrawnState (for WindowMaker) +.TP +\fB\-s\fR +shaped window +.TP +\fB\-a\fR +use smaller window (for AfterStep Wharf) +.TP +\fB\-f\fR artwork_file +load the specified artwork file +.TP +\fB\-t\fR track_selection +set track selection (between 0 and 4) +.TP +\fB\-v\fR volume +set the cdrom volume (between 0 and 255) +.TP +\fB\-i\fR interval +interval in 1/20 seconds between cd polls when empty +.TP +\fB\-l\fR led_color +use the specified color for led displays +.TP +\fB\-b\fR back_color +use the specified color for backgrounds +.TP +\fB\-d\fR cd_device +use specified device +.TP +\fB\-position\fR position +set window position +.TP +\fB\-display\fR display +select target display +.SH SEE ALSO +.BR X (1x) +.SH AUTHOR +wmcdplay was written by Sam Hawker + +This manual page was written by John H. Robinson, IV , +for the Debian GNU/Linux system (but may be used by others). +.\" vim:syn=nroff --- wmcdplay-1.0beta1.orig/debian/copyright +++ wmcdplay-1.0beta1/debian/copyright @@ -0,0 +1,13 @@ +This package was debianized by Marcelo E. Magallon + on Sun, 25 Jan 1998 11:00:00 -0600 + +It was downloaded from http://www.geocities.com/SiliconValley/Vista/2471/wmcdplay.html + + +The author, Sam Hawker, shawkie@ultraviolet.org, states this software +is freely distributable and supplied without warranty (express or +otherwise). + +You are free to distribute this software under the terms of the GNU General +Public License. On Debian systems, the complete text of the GNU General Public +License can be found in /usr/share/common-licenses/GPL file. --- wmcdplay-1.0beta1.orig/cdctl.h +++ wmcdplay-1.0beta1/cdctl.h @@ -85,7 +85,7 @@ 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,9 +213,19 @@ 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=stop)){ status_state=ssPlaying; selecttrack(); +/* +cout << "Play track " << status_track << endl; +cout << "=============" << endl; +*/ doStatus(); return; }