debian/0000755000000000000000000000000011640174216007170 5ustar debian/rules0000755000000000000000000000110111640174210010233 0ustar #!/usr/bin/make -f DESTDIR=debian/mp3blaster DEB_COMPRESS_EXCLUDE=commands.txt %: dh $@ .PHONY: override_dh_auto_configure override_dh_auto_configure: aclocal autoheader automake --add-missing autoconf dh_auto_configure -- --datadir=/usr/share/doc --with-sdl .PHONY: override_dh_installdocs override_dh_installdocs: rm $(DESTDIR)/usr/share/man/man1/splay.1 rm $(DESTDIR)/usr/bin/splay dh_installdocs doc/commands.txt dh_installexamples doc/charmap doc/sample.mp3blasterrc install -m 644 nmixer/ChangeLog \ $(DESTDIR)/usr/share/doc/mp3blaster/changelog.nmixer debian/changelog0000644000000000000000000002606611640174213011051 0ustar mp3blaster (1:3.2.5-3ubuntu1) oneiric; urgency=low * Add SDL output support (LP: #752091). -- Sebastian Stein Tue, 27 Sep 2011 00:11:23 +0200 mp3blaster (1:3.2.5-3) unstable; urgency=low * Switch to dpkg-source 3.0 (quilt) format * Bump Standards version to 3.8.4 -- Jochen Friedrich Wed, 02 Jun 2010 19:18:31 +0200 mp3blaster (1:3.2.5-2) unstable; urgency=low * Fix lintian warnings o Add README.source o Fix build depends on debhelper * Fix eglibc support (Closes: #551625). Thanks to Simon Olofsson for the patch. -- Jochen Friedrich Mon, 19 Oct 2009 18:22:13 +0200 mp3blaster (1:3.2.5-1) unstable; urgency=low * Ack NMU * New upstream release o minor compilation fixes from freebsd ports maintainer Roman Bogorodskiy o Fixed bug in buffering code when using SDL as audio output; this fixes possible hickups in such cases. o When changing back directories in the file browser, jump to the position in the file list the user came from. o Reduced number of warnings using newer g++ versions * Bump Standards version to 3.8.3 * Add Homepage to control * Change build system to debhelper 7 -- Jochen Friedrich Wed, 02 Sep 2009 16:21:58 +0200 mp3blaster (1:3.2.3-3.1) unstable; urgency=medium * Non-maintainer upload. * Fix FTBFS with GCC 4.3 (Closes: #417433). -- Luk Claes Thu, 13 Mar 2008 22:47:37 +0000 mp3blaster (1:3.2.3-3) unstable; urgency=low * Disable USLEEP in play_list(). This change between 3.2.2 and 3.2.3 seems to be the cause for stuttering sound (Closes: #385738) -- Jochen Friedrich Mon, 27 Nov 2006 17:25:49 +0100 mp3blaster (1:3.2.3-2) unstable; urgency=low * Fix compiler options (Closes: #385738) * Add patches for man pages (Closes: #302668, #302670) * Update watch file for SourceForge support -- Jochen Friedrich Fri, 24 Nov 2006 17:12:07 +0100 mp3blaster (1:3.2.3-1) unstable; urgency=low * New upstream release o Fixed parallel build bug, make -j now works o Fixed typos in CharsetMap documentation o Implemented screen resizing (Closes: #142824) o Fixed a race condition which caused 100% CPU consumption at the end of each played song * Bumped standards version to 3.7.2 * Add patch from Petr Salinger Mon, 14 Aug 2006 12:31:09 +0200 mp3blaster (1:3.2.2-1) unstable; urgency=low * New upstream version. mp3blaster is now on sourceforge.net * Converted to cdbs build system -- Jochen Friedrich Thu, 20 Apr 2006 15:41:25 +0200 mp3blaster (1:3.2.0-7) unstable; urgency=high * Rebuild against the new libsidplay as part of the C++ ABI transition (Closes: #324915). Urgency high because of simple recompile. Thanks to Roger Leigh * Bump up Standards Version to 3.6.2 -- Jochen Friedrich Fri, 26 Aug 2005 20:01:33 +0200 mp3blaster (1:3.2.0-6) unstable; urgency=low * Added watch file * Removed maintainer scripts as debhelper is taking care of everything * Fixed menu syntax * Fix endianess problem in oggplayer. Thanks to Tim Weippert for the patch (Closes: #192313) -- Jochen Friedrich Tue, 3 Aug 2004 22:22:54 +0200 mp3blaster (1:3.2.0-5) unstable; urgency=low * New Maintainer (Closes: #236381) * Fixed Ogg Vorbis file handle (Closes: #146811) -- Jochen Friedrich Sun, 7 Mar 2004 22:12:43 +0100 mp3blaster (1:3.2.0-4) unstable; urgency=low * Set maintainer to the Debian QA Group , as I'm leaving the project. Kudos to all who remain and those that will still come. -- Carlos Laviola Fri, 5 Mar 2004 18:02:33 -0300 mp3blaster (1:3.2.0-3) unstable; urgency=low * debian/copyright: inform current and past maintainers and source code availability. (Closes: #226803) * Hardcoded MP3BLASTER_DOCDIR to point to /usr/share/doc/mp3blaster, thus correctly showing the help file. (Closes: #226926) * Package now has a audio/mpeg MIME entry. (Closes: #223006) * Forgot to close a bug related to 223033. (Closes: #234257) * Bumped Standards-Version up to 3.6.1. -- Carlos Laviola Mon, 1 Mar 2004 12:42:48 -0300 mp3blaster (1:3.2.0-2) unstable; urgency=low * Acknowledging NMUs. (Closes: #177352, #178902, #180668, #185002, #223033) * Brian Boucheron has written a manpage for mp3tag. Thanks, Brian. (Closes: #97979) -- Carlos Laviola Sun, 29 Feb 2004 19:38:35 -0300 mp3blaster (1:3.2.0-1.1) unstable; urgency=low * Non-Maintainer Upload. * Remove `automaken' from build-deps, ran `autoreconf -f -i' in the root directory instead, which fixes FTBFS problems. (Closes: #223033) -- Steinar H. Gunderson Sun, 15 Feb 2004 21:35:35 +0100 mp3blaster (1:3.2.0-1) unstable; urgency=low * New upstream release -- Carlos Laviola Sat, 6 Dec 2003 18:16:31 -0200 mp3blaster (1:3.1.3-2.2) unstable; urgency=low * NMU * Recompiled against libvorbis-dev >= 1.0.0-3 (Closes: #185002) -- Andrew Suffield Thu, 10 Apr 2003 13:30:40 +0100 mp3blaster (1:3.1.3-2.1) unstable; urgency=low * Non Maintainer Upload * Recompiled with newer libsidplay (Closes: #177352, #178902, #180668) * Replaced build depend on automake1.4 by automaken -- Julien LEMOINE Wed, 5 Mar 2003 11:55:02 +0100 mp3blaster (1:3.1.3-1) unstable; urgency=low * New upstream release. -- Carlos Laviola Sat, 14 Dec 2002 02:46:24 -0200 mp3blaster (1:3.1.2-2) unstable; urgency=low * Rebuilt against the new libsidplay1* packages, to straighten up the dependencies field. -- Carlos Laviola Fri, 6 Sep 2002 12:38:39 -0300 mp3blaster (1:3.1.2-1) unstable; urgency=low * New upstream release. -- Carlos Laviola Tue, 3 Sep 2002 22:56:47 -0300 mp3blaster (1:3.1.1-4) unstable; urgency=low * Tweaked the source a bit so mp3blaster's help works again. Uncompressed commands.txt for now. (Closes: #158595) -- Carlos Laviola Thu, 29 Aug 2002 23:46:08 -0300 mp3blaster (1:3.1.1-3) unstable; urgency=low * Moved everything from /usr/share/mp3blaster to places where users would expect to find what was in the former place. (Closes: #155858) -- Carlos Laviola Thu, 29 Aug 2002 23:46:05 -0300 mp3blaster (1:3.1.1-2) unstable; urgency=low * Rebuilt against the new Ogg Vorbis (1.0.0) libraries. (Closes: #154668) -- Carlos Laviola Mon, 29 Jul 2002 21:42:29 -0300 mp3blaster (1:3.1.1-1) unstable; urgency=low * New upstream release -- Carlos Laviola Sun, 17 Mar 2002 01:18:08 -0300 mp3blaster (1:3.1-1) unstable; urgency=low * New upstream release (Closes: #106745) -- Carlos Laviola Sun, 10 Mar 2002 19:36:07 -0300 mp3blaster (1:3.0-2) unstable; urgency=low * Applied patch from Matthew Wilcox to make mp3blaster build with g++ 3.0 again. Thanks, Matthew. (Closes: #132914) -- Carlos Laviola Sat, 9 Feb 2002 20:01:08 -0200 mp3blaster (1:3.0-1) unstable; urgency=low * New upstream release * This is a new stable version. If you are a non-x86 mp3blaster user, please give this new version a try and send in reports of success/failure; they'll be greatly appreciated. -- Carlos Laviola Thu, 11 Oct 2001 11:05:23 -0300 mp3blaster (1:2pre3.0p8-1) unstable; urgency=low * New upstream release * mp3blaster comes with Ogg Vorbis support now. (Closes: #79249) * Changed description of the package, to inform about this new feature. * Upped Standards-Version to 3.5.5. -- Carlos Laviola Wed, 20 Jun 2001 12:14:17 -0300 mp3blaster (1:2pre3.0p7-3) unstable; urgency=low * Changed my e-mail from claviola@ajato.com.br to claviola@debian.org in all my packages. -- Carlos Laviola Wed, 30 May 2001 16:36:27 -0300 mp3blaster (1:2pre3.0p7-2) unstable; urgency=low * New maintainer. (Closes: #96662) * Acking that this bug got fixed in a NMU. (Closes: #59564) * Linking mp3tag(1) to undocumented(7) while I write a manpage for it. -- Carlos Laviola Fri, 18 May 2001 22:41:06 -0300 mp3blaster (1:2pre3.0p7-1) frozen unstable; urgency=low * New upstream version (Closes: #68847) * Old beta-naming scheme broke cvs-buildpackage and IIRC something else too - changed it. Note this is pre 7, not patchlevel 7. * Package now builds with modern compilers (Closes: #93322) * Portability issues reported fixed upstream, let's hope they stay fixed (Closes: #51954, #67918) * Interface totally rewritten, cosmetic bugs "fixed" (Closes: #55493) * Orphaned the package as I no longer use it.. -- Joseph Carter Mon, 7 May 2001 07:20:37 -0700 mp3blaster (2-0b16-1.1) frozen unstable; urgency=high * Non-maintainer upload * Applied patch from Tomasz Wegrzanowski (fixes: Bug#59564) -- Martin Schulze Tue, 14 Mar 2000 11:45:43 +0100 mp3blaster (2-0b16-1) unstable; urgency=low * New upstream * Applied a portability patch for m68k (Closes: #52798) -- Joseph Carter Thu, 6 Jan 2000 01:22:55 -0800 mp3blaster (2-0b12-1) unstable; urgency=low * New upstream version -- Joseph Carter Thu, 9 Dec 1999 03:27:32 -0800 mp3blaster (2-0b11-1) unstable; urgency=low * New upstream version * May have trouble again on big-endian machines =< -- Joseph Carter Thu, 29 Jul 1999 02:17:31 -0700 mp3blaster (2-0b10-1) unstable; urgency=low * New Upstream Version * Applied patch for big-endian machines (Closes: #36522) * built with debhelper v2 and moved standards-version to 3.0.1 -- Joseph Carter Fri, 23 Jul 1999 22:22:45 -0700 mp3blaster (2-0b9-1) unstable; urgency=low * New Upstream -- Joseph Carter Fri, 21 May 1999 21:45:38 -0700 mp3blaster (2-0b8-2) unstable; urgency=low * /usr/doc/mp3blaster/examples now contains the contents of the id3scripts directory in the upstream package. Currently there's just a script in there showing you out to automate things with mp3tag -- Joseph Carter Mon, 26 Apr 1999 17:19:09 -0700 mp3blaster (2-0b8-1) unstable; urgency=low * New Upstream * Removed cruft from Debian patch * Now rely on DESTDIR to determine where things get installed * mp3blaster finally has a manpage! * updated description to mention the new mp3tag program -- Joseph Carter Tue, 20 Apr 1999 03:01:10 -0700 mp3blaster (2-0b6-1) unstable; urgency=low * Initial Release. -- Joseph Carter Sat, 10 Apr 1999 16:09:07 -0700 debian/control0000644000000000000000000000177211640174211010575 0ustar Source: mp3blaster Section: sound Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Jochen Friedrich Standards-Version: 3.8.4 Build-Depends: libncurses5-dev, libvorbis-dev (>= 1.0.0-3), debhelper (>= 7.0.50~), libsidplay1-dev (>= 1.36.59-3), libsdl1.2-dev, autoconf, automake Homepage: http://mp3blaster.sf.net Package: mp3blaster Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Full-screen console mp3 and Ogg Vorbis player mp3blaster is an interactive text-based mp3 and Ogg Vorbis player with a number of unique features. It supports multiple playlists allowing you to divide tracks into albums allowing great flexibility with the play order. . Also included are nmixer, a simple mixer utility based on the same code as the mixer used in mp3blaster and mp3tag, an id3 tag manipulation tool. . Starting with version 3.0pre8, mp3blaster supports the playback of Ogg Vorbis encoded audio as well. debian/clean0000644000000000000000000000030311247473500010172 0ustar Makefile.in mpegsound/Makefile.in nmixer/Makefile.in src/Makefile.in doc/Makefile.in doc/charmap/Makefile.in configure config.h.in config.h config.log config.status aclocal.m4 install-sh missing debian/source/0000755000000000000000000000000011401511132010453 5ustar debian/source/format0000644000000000000000000000001411401511132011661 0ustar 3.0 (quilt) debian/watch0000644000000000000000000000012511153462534010221 0ustar version=3 http://sf.net/mp3blaster/mp3blaster-([\d+\.]+|\d+)\.tar\.gz debian uupdate debian/mp3blaster.manpages0000644000000000000000000000003111153462534012755 0ustar debian/manpages/mp3tag.1 debian/mp3blaster.menu0000644000000000000000000000016311247475465012147 0ustar ?package(mp3blaster):needs="text" section="Applications/Sound"\ title="mp3blaster" command="/usr/bin/mp3blaster" debian/patches/0000755000000000000000000000000011267111014010607 5ustar debian/patches/08_fix_ftbfs_const_char.patch0000644000000000000000000000116511267111014016317 0ustar # # Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mp3blaster/+bug/452231 # Description: Fix a FTBFS when converting from 'const char*' to 'char*'. # diff -Nur -x '*.orig' -x '*~' mp3blaster/src/global.cc mp3blaster.new/src/global.cc --- mp3blaster/src/global.cc 2009-10-15 17:03:20.124589776 +0200 +++ mp3blaster.new/src/global.cc 2009-10-15 17:04:27.830949852 +0200 @@ -379,7 +379,7 @@ is_sid(const char *filename) { #ifdef HAVE_SIDPLAYER - char *ext = strrchr(filename, '.'); + const char *ext = strrchr(filename, '.'); if (ext) { if (!strcasecmp(ext, ".psid")) return 1; if (!strcasecmp(ext, ".sid")) return 1; debian/patches/series0000644000000000000000000000017211267111033012025 0ustar 02_bool.patch 03_endian.patch 04_memleak.patch 05_macro.patch 06_man.patch 07_fix_ogg.patch 08_fix_ftbfs_const_char.patch debian/patches/07_fix_ogg.patch0000644000000000000000000000121411154246306013566 0ustar Index: mp3blaster-3.2.5/src/main.cc =================================================================== --- mp3blaster-3.2.5.orig/src/main.cc 2009-03-06 17:18:05.000000000 +0100 +++ mp3blaster-3.2.5/src/main.cc 2009-03-06 17:18:07.000000000 +0100 @@ -1904,7 +1904,7 @@ stop_song(); //status => AC_NONE } else { //output buffer full, wait a bit. - USLEEP(10000); + // USLEEP(10000); } } else { /* TODO: different thread for status updates. Now, this function @@ -1913,7 +1913,7 @@ * costly as well.. */ update_play_display(); - USLEEP(10000); + // USLEEP(10000); } } debian/patches/06_man.patch0000644000000000000000000001163711154246315012730 0ustar Index: mp3blaster-3.2.5/nmixer.1 =================================================================== --- mp3blaster-3.2.5.orig/nmixer.1 2009-03-06 17:14:38.000000000 +0100 +++ mp3blaster-3.2.5/nmixer.1 2009-03-06 17:18:06.000000000 +0100 @@ -19,9 +19,10 @@ screen). The left and right arrow keys (or h and l resp.) change the volume for the currently highlighted device, and (if you're lucky), you can use home/end/PgUp/PgDn on the numerical keyboard to set left -and right volume independantly. You can also use 0..5 to set the +and right volume independently. You can also use 0..5 to set the volume to the position indicated by the numbers on top of the screen. -.PPIf a device can be recorded from, red brackets will be displayed under +.PP +If a device can be recorded from, red brackets will be displayed under the device's name. If it's selected as recording source, a red 'X' is displayed as well. You can set a recording device with the space bar. .PP Index: mp3blaster-3.2.5/mp3blaster.1 =================================================================== --- mp3blaster-3.2.5.orig/mp3blaster.1 2009-03-06 17:14:38.000000000 +0100 +++ mp3blaster-3.2.5/mp3blaster.1 2009-03-06 17:18:06.000000000 +0100 @@ -53,7 +53,7 @@ .B ALL file operations in mp3blaster!! (including reading and writing of playlists). Note that only users with uid 0 (i.e. root) can use this option (yet). This -feeature should be changed so it won't require root privileges. \fBOnly install it suid root if you trust all local users!!!!\fR. +feature should be changed so it won't require root privileges. \fBOnly install it suid root if you trust all local users!!!!\fR. .TP .B --config-file,-c= Use as config-file instead of ~/.mp3blasterrc @@ -79,7 +79,7 @@ all songs in random order. .TP .B --dont-quit,-q -Dont't quit after playing all command-line supplied mp3's (only makes sense +Don't quit after playing all command-line supplied mp3's (only makes sense in combination with --autolist or files from command-line) .TP .B --repeat/-R @@ -99,7 +99,7 @@ .TP .B --threads/-t= Numbers of threads to use for buffering. Range is 0..500 in increments of 50. -0 threads means no buffering (thus no hickup prevention). +0 threads means no buffering (thus no hiccup prevention). .TP .B --version,-v Displays mp3blaster's version number. @@ -133,7 +133,7 @@ .TP .B Main window This window is located directly underneath the info window. Its content is -usually determined by the mode mp3blater is in (see section PROGRAM MODES). +usually determined by the mode mp3blaster is in (see section PROGRAM MODES). If you're editing the playlist, the playlist is shown. In file manager mode, you will see the directory you're currently in. In help mode, the help text is being displayed. @@ -164,7 +164,7 @@ specific to playlist editing are listed in the keybindings window. The playlist consists of one or more \fBgroups\fR. Each group can have its own \fBgroupname\fR and can contain supported audio files. You can -toggle shuffle mode for each group independantly. Many users will simply +toggle shuffle mode for each group independently. Many users will simply use the single (root) group that mp3blaster starts with. In that case, shuffling all songs is simply a question of toggling the GroupShuffle mode (default keybinding: F7). @@ -236,12 +236,12 @@ mode: the playing mode. The reason for this was that it wasn't possible to edit a playlist and play mp3's at the same time. Since this is now possible, playing songs is possible in all program modes. Keybindings specific to -playback are always listed in the keybindins window. +playback are always listed in the keybindings window. .SH PLAYMODES -The order in which files are played in the playlist is determined by 2 +The order in which files are played in the playlist is determined by two settings: The global playback mode (displayed in the info window), and -each group's independant shuffle setting. The 'current group' in the global +each group's independent shuffle setting. The 'current group' in the global playback modes means: The group that is shown in the main window at the time the playlist was started. This is important, since it enables you to play a subsection of your playlist instead of playing the entire list. @@ -281,7 +281,7 @@ .TP \fBKeyword\fR = \fBValue1\fR, \fBValue2\fR .PP -Escape comma's in a value with a backslash (\,). If you want a litteral +Escape comma's in a value with a backslash (\,). If you want a literal backslash, escape it with another backslash (\\). Keywords are case-sensitive. .PP There are a few types of values: numbers, booleans, keybindings, colours, @@ -385,7 +385,7 @@ .TP \fBThreads\fR (number, range 50..500) Amount of threads to use for buffering. More threads means more buffering -(thus better hickup prevention) +(thus better hiccup prevention) .TP \fBWarnDelay\fR (number, obsolete) Time before a warning popup will disappear. Currently not in use. debian/patches/02_bool.patch0000644000000000000000000000156611154246333013104 0ustar Index: mp3blaster-3.2.5/mpegsound/oggplayer.cc =================================================================== --- mp3blaster-3.2.5.orig/mpegsound/oggplayer.cc 2009-03-06 17:14:38.000000000 +0100 +++ mp3blaster-3.2.5/mpegsound/oggplayer.cc 2009-03-06 17:18:33.000000000 +0100 @@ -7,7 +7,7 @@ #ifdef INCLUDE_OGG #ifdef HAVE_BOOL_H -#include +//#include #endif #include #include Index: mp3blaster-3.2.5/mpegsound/mpegsound.h =================================================================== --- mp3blaster-3.2.5.orig/mpegsound/mpegsound.h 2009-03-06 17:14:38.000000000 +0100 +++ mp3blaster-3.2.5/mpegsound/mpegsound.h 2009-03-06 17:18:26.000000000 +0100 @@ -13,7 +13,7 @@ #include #include #ifdef HAVE_BOOL_H -#include +//#include #endif #ifdef LIBPTH # include debian/patches/05_macro.patch0000644000000000000000000001204011154246321013237 0ustar Index: mp3blaster-3.2.5/mpegsound/rawtofile.cc =================================================================== --- mp3blaster-3.2.5.orig/mpegsound/rawtofile.cc 2009-03-06 17:14:38.000000000 +0100 +++ mp3blaster-3.2.5/mpegsound/rawtofile.cc 2009-03-06 17:18:05.000000000 +0100 @@ -60,7 +60,7 @@ // Rawplayer class Rawtofile::~Rawtofile() { - if (filetype == WAV) + if (filetype == ST_WAV) { off_t filelen = lseek(audiohandle, 0, SEEK_CUR); lseek(audiohandle, 0, SEEK_SET); @@ -110,10 +110,10 @@ return true; } -/* set type of file to write. Default: RAW (no header) */ +/* set type of file to write. Default: ST_RAW (no header) */ bool Rawtofile::setfiletype(soundtype filetype) { - if (filetype != RAW && filetype != WAV) + if (filetype != ST_RAW && filetype != ST_WAV) return false; this->filetype = filetype; @@ -121,13 +121,13 @@ } int Rawtofile::putblock_nt(void *buffer, int size) { - if (init_putblock && filetype != RAW) + if (init_putblock && filetype != ST_RAW) { int wordsize; wordsize = rawsamplesize; - if (filetype == WAV) + if (filetype == ST_WAV) { //initial datasize = 0...when all data is written, determine filesize //and rewrite the header. Index: mp3blaster-3.2.5/src/main.cc =================================================================== --- mp3blaster-3.2.5.orig/src/main.cc 2009-03-06 17:14:38.000000000 +0100 +++ mp3blaster-3.2.5/src/main.cc 2009-03-06 17:18:18.000000000 +0100 @@ -3644,7 +3644,7 @@ if (!(decoder = new Mpegfileplayer(Fileplayer::AUDIODRV_OSS)) || !decoder->openfile(file, - file2write, WAV) || !decoder->initialize(NULL)) + file2write, ST_WAV) || !decoder->initialize(NULL)) { sprintf(bla, "Decoding of %s failed.", selitems[i]); warning(bla); Index: mp3blaster-3.2.5/src/splay.cc =================================================================== --- mp3blaster-3.2.5.orig/src/splay.cc 2009-03-06 17:14:38.000000000 +0100 +++ mp3blaster-3.2.5/src/splay.cc 2009-03-06 17:18:05.000000000 +0100 @@ -84,7 +84,7 @@ player=new Mpegfileplayer(Fileplayer::AUDIODRV_OSS); if (!strcmp(splay_devicename, "-")) - didopen = player->openfile(filename, "/dev/stdout", WAV); + didopen = player->openfile(filename, "/dev/stdout", ST_WAV); else didopen = player->openfile(filename, splay_devicename); Index: mp3blaster-3.2.5/mpegsound/mpegsound.h =================================================================== --- mp3blaster-3.2.5.orig/mpegsound/mpegsound.h 2009-03-06 17:18:00.000000000 +0100 +++ mp3blaster-3.2.5/mpegsound/mpegsound.h 2009-03-06 17:18:05.000000000 +0100 @@ -164,7 +164,7 @@ }; #endif -enum soundtype { NONE, RAW, WAV }; +enum soundtype { ST_NONE, ST_RAW, ST_WAV }; typedef struct _waveheader { u_int32_t main_chunk; // 'RIFF' @@ -964,7 +964,7 @@ int geterrorcode(void) {return __errorcode;}; struct song_info getsonginfo() { return info;}; - virtual bool openfile(const char *filename, const char *device, soundtype write2file=NONE)=0; + virtual bool openfile(const char *filename, const char *device, soundtype write2file=ST_NONE)=0; virtual void closefile(void) =0; virtual void setforcetomono(short flag) =0; virtual void setdownfrequency(int) =0; @@ -986,7 +986,7 @@ protected: Fileplayer(); //thou shallt not instantiate fileplayer itself. - bool opendevice(const char *device, soundtype write2file=NONE); + bool opendevice(const char *device, soundtype write2file=ST_NONE); void set_driver(audiodriver_t driver); bool seterrorcode(int errorno){__errorcode=errorno;return false;}; Soundplayer *player; @@ -1012,7 +1012,7 @@ Wavefileplayer(audiodriver_t driver); ~Wavefileplayer(); - bool openfile(const char *filename, const char *device, soundtype write2file=NONE); + bool openfile(const char *filename, const char *device, soundtype write2file=ST_NONE); void closefile(void); void setforcetomono(short flag); void setdownfrequency(int value) { if (value); } @@ -1045,7 +1045,7 @@ Mpegfileplayer(audiodriver_t driver); ~Mpegfileplayer(); - bool openfile(const char *filename, const char *device, soundtype write2file=NONE); + bool openfile(const char *filename, const char *device, soundtype write2file=ST_NONE); void closefile(void); void setforcetomono(short flag); void set8bitmode() { if (server) server->set8bitmode(); } @@ -1093,7 +1093,7 @@ Oggplayer(audiodriver_t driver); ~Oggplayer(); - bool openfile(const char *filename, const char *device, soundtype write2file=NONE); + bool openfile(const char *filename, const char *device, soundtype write2file=ST_NONE); void closefile(void); void setforcetomono(short flag); void set8bitmode(); @@ -1140,7 +1140,7 @@ SIDfileplayer(audiodriver_t driver); ~SIDfileplayer(); - bool openfile(const char *filename, const char *device, soundtype write2file=NONE); + bool openfile(const char *filename, const char *device, soundtype write2file=ST_NONE); bool initialize(void *data) { if(data); return true; } void closefile(void); void setforcetomono(short flag); debian/patches/03_endian.patch0000644000000000000000000000071411154246330013377 0ustar Index: mp3blaster-3.2.5/mpegsound/oggplayer.cc =================================================================== --- mp3blaster-3.2.5.orig/mpegsound/oggplayer.cc 2009-03-06 17:18:00.000000000 +0100 +++ mp3blaster-3.2.5/mpegsound/oggplayer.cc 2009-03-06 17:18:30.000000000 +0100 @@ -18,7 +18,11 @@ { of = NULL; wordsize = 2; //2 bytes +#ifdef WORDS_BIGENDIAN + bigendian = 1; +#else bigendian = 0; +#endif signeddata = 1; mono = 0; downfreq = 0; debian/patches/04_memleak.patch0000644000000000000000000000074311154246325013563 0ustar Index: mp3blaster-3.2.5/mpegsound/oggplayer.cc =================================================================== --- mp3blaster-3.2.5.orig/mpegsound/oggplayer.cc 2009-03-06 17:18:03.000000000 +0100 +++ mp3blaster-3.2.5/mpegsound/oggplayer.cc 2009-03-06 17:18:04.000000000 +0100 @@ -36,6 +36,7 @@ { ov_clear(of); delete of; + of = NULL; } } @@ -131,6 +132,8 @@ { if (of) ov_clear(of); + delete of; + of = NULL; } void Oggplayer::setforcetomono(short flag) debian/mp3blaster.mime0000644000000000000000000000005111153462534012113 0ustar audio/mpeg; mp3blaster %s; needsterminal debian/mp3blaster.docs0000644000000000000000000000003111153462534012112 0ustar NEWS README AUTHORS TODO debian/compat0000644000000000000000000000000211247473431010372 0ustar 7 debian/copyright0000644000000000000000000000314311153462534011126 0ustar This is Debian GNU/Linux's prepackaged version of mp3blaster, an MPEG audio file player for Linux. This package was put together by Carlos Laviola , from the sources, which I obtained from (2-0b6-1 -> 1:2pre3.0p7-1): Modifications for Debian Copyright (C) 1999, 2000, 2001 Joseph Carter (1:2pre3.0p7-2 -> 1:3.2.0-4): Modifications for Debian Copyright (C) 2001, 2002, 2003, 2004 Carlos Laviola (1:3.2.0-5 -> onwards): Modifications for Debian Copyright (C) 2004 Jochen Friedrich Amongst several contributions from other Project members. mp3blaster is copyrighted: /* MP3Blaster - An Mpeg Audio-file player for Linux * Copyright (C) Bram Avontuur (brama@stack.nl) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ You should be able to find a copy of the GNU General Public License in /usr/share/common-licenses/GPL; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. debian/manpages/0000755000000000000000000000000011153462534010765 5ustar debian/manpages/mp3tag.10000644000000000000000000000437211153462534012250 0ustar .TH MP3TAG 1 "February 19, 2004" .SH NAME mp3tag \- view and manipulate ID3v1 tags. .SH SYNOPSIS .B mp3tag [ .BI \-s \ song ] [ .BI \-a \ artist ] [ .BI \-l \ album ] [ .BI \-y \ year ] [ .BI \-e \ comment ] [ .BI \-k \ track ] [ .BI \-g \ genre ] [ .B \-r ] .I file [ \fIfile\fR ... ] .SH "DESCRIPTION" This manual page briefly documents the \fBmp3tag\fR command. This manual page was written for the Debian GNU/Linux distribution because the original program does not have one. \fBmp3tag\fR is a program that allows you to both view and manipulate ID3v1 metadata tags. Running the command with just a filename will display the file's current tag. Setting some options will cause the tag to be updated and displayed. .SH OPTIONS .TP .BI \-a \ artist Set the artist name to \fIartist\fR. Strings over thirty characters are truncated. .TP .BI \-e \ comment Set the comment to \fIcomment\fR. Strings over thirty characters are truncated. .TP .BI \-g \ genre Set the genre to \fIgenre\fR. This is a single integer with a value of 0 to 254 corresponding to the appropriate Winamp compatible genre (use '\fB\-g\fR list' to list all supported genres). .TP .BI \-k \ track Set the track number to \fItrack\fR. This is a single integer with a value of 0 to 255. Specifying this field truncates the comment field to twenty-eight characters, as per the ID3v1.1 standard. .TP .BI \-l \ album Set the album name to \fIalbum\fR. Strings over thirty characters are truncated. .TP .B \-r Merge new tag with any preexisting tag in the file. .TP .BI \-s \ song Set the song name to \fIsong\fR. Strings over thirty characters are truncated. .TP .BI \-y \ year Set the year to \fIyear\fR. Strings over four characters are truncated. .SH EXAMPLES .TP Display foo.mp3's current ID3v1 info: \fBmp3tag\fR foo.mp3 .TP Set foo.mp3's artist to 'Bar', and album to 'Baz': \fBmp3tag\fR -a Bar -l Baz foo.mp3 .TP Set foo.mp3's year to 2001, merging it with any tag already present: \fBmp3tag\fR -y 2001 -r foo.mp3 .SH AUTHOR \fBmp3tag\fR was written by Bram Avontuur . This manual page was written by Brian Boucheron , for the Debian GNU/Linux distribution (but may be used by others). .SH "SEE ALSO" More info on ID3v1 can be found at . debian/mp3blaster.dirs0000644000000000000000000000003311153462534012125 0ustar usr/bin usr/share/man/man1