diff options
Diffstat (limited to 'patches/mpg123/mpg123-ds-rcc.patch')
| -rw-r--r-- | patches/mpg123/mpg123-ds-rcc.patch | 151 |
1 files changed, 151 insertions, 0 deletions
diff --git a/patches/mpg123/mpg123-ds-rcc.patch b/patches/mpg123/mpg123-ds-rcc.patch new file mode 100644 index 0000000..bbfd104 --- /dev/null +++ b/patches/mpg123/mpg123-ds-rcc.patch @@ -0,0 +1,151 @@ +diff -dPNur mpg123-0.59r/common.c mpg123-0.59r-new/common.c +--- mpg123-0.59r/common.c 1999-06-15 23:24:19.000000000 +0200 ++++ mpg123-0.59r-new/common.c 2005-09-16 02:48:11.000000000 +0200 +@@ -15,6 +15,7 @@ + #endif + #endif + ++#include "rccpatch.h" + #include "mpg123.h" + #include "genre.h" + #include "common.h" +@@ -484,6 +485,8 @@ + char comment[31]={0,}; + char genre[31]={0,}; + ++ char *ctitle, *cartist, *calbum, *ccomment; ++ + if(param.quiet) + return; + +@@ -492,16 +495,26 @@ + strncpy(album,tag->album,30); + strncpy(year,tag->year,4); + strncpy(comment,tag->comment,30); ++ ++ ctitle = rccPatchRecode(title); ++ cartist = rccPatchRecode(artist); ++ calbum = rccPatchRecode(album); ++ ccomment = rccPatchRecode(comment); + +- if ( tag->genre <= sizeof(genre_table)/sizeof(*genre_table) ) { ++ if ( tag->genre < sizeof(genre_table)/sizeof(*genre_table) ) { + strncpy(genre, genre_table[tag->genre], 30); + } else { + strncpy(genre,"Unknown",30); + } + +- fprintf(stderr,"Title : %-30s Artist: %s\n",title,artist); +- fprintf(stderr,"Album : %-30s Year : %4s\n",album,year); +- fprintf(stderr,"Comment: %-30s Genre : %s\n",comment,genre); ++ fprintf(stderr,"Title : %-30s Artist: %s\n",ctitle?ctitle:title,cartist?cartist:artist); ++ fprintf(stderr,"Album : %-30s Year : %4s\n",calbum?calbum:album,year); ++ fprintf(stderr,"Comment: %-30s Genre : %s\n",ccomment?ccomment:comment,genre); ++ ++ if (ctitle) free(ctitle); ++ if (cartist) free(cartist); ++ if (calbum) free(calbum); ++ if (ccomment) free(ccomment); + } + + #if 0 +diff -dPNur mpg123-0.59r/Makefile mpg123-0.59r-new/Makefile +--- mpg123-0.59r/Makefile 1999-06-18 14:18:58.000000000 +0200 ++++ mpg123-0.59r-new/Makefile 2005-09-16 02:47:47.000000000 +0200 +@@ -554,12 +554,12 @@ + mpg123-make: + @ $(MAKE) CFLAGS='$(CFLAGS)' BINNAME=mpg123 mpg123 + +-mpg123: mpg123.o common.o $(OBJECTS) decode_2to1.o decode_4to1.o \ ++mpg123: mpg123.o rccpatch.o common.o $(OBJECTS) decode_2to1.o decode_4to1.o \ + tabinit.o audio.o layer1.o layer2.o layer3.o buffer.o \ + getlopt.o httpget.o xfermem.o equalizer.o \ + decode_ntom.o Makefile wav.o readers.o getbits.o \ + control_generic.o +- $(CC) $(CFLAGS) $(LDFLAGS) mpg123.o tabinit.o common.o layer1.o \ ++ $(CC) $(CFLAGS) $(LDFLAGS) -lrcc mpg123.o tabinit.o rccpatch.o common.o layer1.o \ + layer2.o layer3.o audio.o buffer.o decode_2to1.o equalizer.o \ + decode_4to1.o getlopt.o httpget.o xfermem.o decode_ntom.o \ + wav.o readers.o getbits.o control_generic.o \ +diff -dPNur mpg123-0.59r/mpg123.c mpg123-0.59r-new/mpg123.c +--- mpg123-0.59r/mpg123.c 1999-06-18 14:18:11.000000000 +0200 ++++ mpg123-0.59r-new/mpg123.c 2005-09-16 02:47:47.000000000 +0200 +@@ -32,6 +32,8 @@ + #include "buffer.h" + #include "term.h" + ++#include "rccpatch.h" ++ + #include "version.h" + + static void usage(char *dummy); +@@ -903,6 +905,8 @@ + exit(0); + } + #endif ++ ++ rccPatchInit(); + + while ((fname = get_next_file(argc, argv))) { + char *dirname, *filename; +@@ -1068,6 +1072,8 @@ + intflag = FALSE; + } + } ++ rccPatchFree(); ++ + #ifndef NOXFERMEM + if (param.usebuffer) { + buffer_end(); +diff -dPNur mpg123-0.59r/rccpatch.c mpg123-0.59r-new/rccpatch.c +--- mpg123-0.59r/rccpatch.c 1970-01-01 01:00:00.000000000 +0100 ++++ mpg123-0.59r-new/rccpatch.c 2005-09-16 02:47:47.000000000 +0200 +@@ -0,0 +1,40 @@ ++#include <librcc.h> ++ ++#define ID3_CLASS 0 ++#define OUT_CLASS 1 ++static rcc_class classes[] = { ++ { "id3", RCC_CLASS_STANDARD, NULL, NULL, "ID3 Encoding", 0 }, ++ { "out", RCC_CLASS_STANDARD, NULL, NULL, "Output Encoding", 0 }, ++ { NULL } ++}; ++ ++static int rcc_initialized = 0; ++ ++void rccPatchFree() { ++ if (rcc_initialized) { ++ rccFree(); ++ rcc_initialized = 0; ++ } ++} ++ ++void rccPatchInit() { ++ if (rcc_initialized) return; ++ rccInit(); ++ rccInitDefaultContext(NULL, 0, 0, classes, 0); ++ rccLoad(NULL, "xmms"); ++ rccInitDb4(NULL, NULL, 0); ++ rcc_initialized = 1; ++} ++ ++static void rccPatchTryInit() { ++ if (!rcc_initialized) { ++ rccPatchInit(); ++ if (rcc_initialized) atexit(rccPatchFree); ++ } ++} ++ ++char *rccPatchRecode(const char *str) { ++ char *res; ++ rccPatchTryInit(); ++ return rccRecode(NULL, ID3_CLASS, OUT_CLASS, str); ++} +diff -dPNur mpg123-0.59r/rccpatch.h mpg123-0.59r-new/rccpatch.h +--- mpg123-0.59r/rccpatch.h 1970-01-01 01:00:00.000000000 +0100 ++++ mpg123-0.59r-new/rccpatch.h 2005-09-16 02:47:47.000000000 +0200 +@@ -0,0 +1,4 @@ ++void rccPatchFree(); ++void rccPatchInit(); ++char *rccPatchRecode(const char *str); ++ |