This is a patch file for "mp3blaster" 3.2.5. It contains Debian patch- es extracted originally from: http://ftp.debian.org/debian/pool/main/m/\ mp3blaster/mp3blaster_3.2.5-3.debian.tar.gz This patch file may include trailing empty lines and/or trailing lines that consist solely of whitespace. If you edit this file, use software that preserves lines of this type, or you may break the patch. --- mp3blaster-3.2.5.old/mp3blaster.1 +++ mp3blaster-3.2.5/mp3blaster.1 @@ -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. --- mp3blaster-3.2.5.old/mpegsound/mpegsound.h +++ mp3blaster-3.2.5/mpegsound/mpegsound.h @@ -13,7 +13,7 @@ #include #include #ifdef HAVE_BOOL_H -#include +//#include #endif #ifdef LIBPTH # include @@ -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); --- mp3blaster-3.2.5.old/mpegsound/oggplayer.cc +++ mp3blaster-3.2.5/mpegsound/oggplayer.cc @@ -7,7 +7,7 @@ #ifdef INCLUDE_OGG #ifdef HAVE_BOOL_H -#include +//#include #endif #include #include @@ -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; @@ -32,6 +36,7 @@ { ov_clear(of); delete of; + of = NULL; } } @@ -127,6 +132,8 @@ { if (of) ov_clear(of); + delete of; + of = NULL; } void Oggplayer::setforcetomono(short flag) --- mp3blaster-3.2.5.old/mpegsound/rawtofile.cc +++ mp3blaster-3.2.5/mpegsound/rawtofile.cc @@ -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. --- mp3blaster-3.2.5.old/nmixer.1 +++ mp3blaster-3.2.5/nmixer.1 @@ -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 --- mp3blaster-3.2.5.old/src/global.cc +++ mp3blaster-3.2.5/src/global.cc @@ -371,7 +371,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; --- mp3blaster-3.2.5.old/src/main.cc +++ mp3blaster-3.2.5/src/main.cc @@ -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); } } @@ -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); --- mp3blaster-3.2.5.old/src/splay.cc +++ mp3blaster-3.2.5/src/splay.cc @@ -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);