diff -Nru vdr-plugin-music-0.9.1~testing/data.c vdr-plugin-music-0.9.2~testing/data.c --- vdr-plugin-music-0.9.1~testing/data.c 2009-10-30 12:35:46.000000000 +0000 +++ vdr-plugin-music-0.9.2~testing/data.c 2009-12-29 12:37:47.000000000 +0000 @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -84,6 +85,18 @@ return true; } + +char *aprintf(const char *fmt, ...) +{ + va_list ap; + va_start(ap,fmt); + char *str=0; + if(vasprintf(&str, fmt, ap)<0); + va_end(ap); + return str; +} + + // -- cScanDir -------------------------------------------------------------- bool cScanDir::ScanDir(cFileSource *src, const char *subdir, eScanType type, const char * const *spec, const char * const *excl, bool recursiv) @@ -113,11 +126,9 @@ } if(S_ISDIR(st.st_mode)) { if(type==stFile && recursiv) { - char *s; - asprintf(&s,subdir ? "%2$s/%1$s":"%s",e->d_name,subdir); - res=ScanDir(src,s,type,spec,excl,recursiv); + char *s=aprintf(subdir ? "%2$s/%1$s":"%s",e->d_name,subdir); + ScanDir(src,s,type,spec,excl,recursiv); free(s); - if(!res) break; continue; } if(type!=stDir) continue; diff -Nru vdr-plugin-music-0.9.1~testing/debian/changelog vdr-plugin-music-0.9.2~testing/debian/changelog --- vdr-plugin-music-0.9.1~testing/debian/changelog 2009-12-31 14:48:12.000000000 +0000 +++ vdr-plugin-music-0.9.2~testing/debian/changelog 2009-12-31 14:48:12.000000000 +0000 @@ -1,3 +1,9 @@ +vdr-plugin-music (0.9.2~testing-1tvt1) karmic; urgency=low + + * new upstream release + + -- Holger Schvestka Thu, 31 Dec 2009 15:39:53 +0100 + vdr-plugin-music (0.9.1~testing-3tvt1) karmic; urgency=low * Initial release diff -Nru vdr-plugin-music-0.9.1~testing/decoder-mp3.c vdr-plugin-music-0.9.2~testing/decoder-mp3.c --- vdr-plugin-music-0.9.1~testing/decoder-mp3.c 2008-02-20 14:05:00.000000000 +0000 +++ vdr-plugin-music-0.9.2~testing/decoder-mp3.c 2009-12-31 13:09:29.000000000 +0000 @@ -625,10 +625,18 @@ if(!ucs4) return; if(!strcmp(id,ID3_FRAME_GENRE)) ucs4=id3_genre_name(ucs4); +/* id3_latin1_t *latin1=id3_ucs4_latin1duplicate(ucs4); if(!latin1) return; data=strdup((char *)latin1); free(latin1); +*/ + id3_utf8_t *utf8=id3_ucs4_utf8duplicate(ucs4); + if(!utf8) return; + data=strdup((char *)utf8); + free(utf8); + + } } @@ -638,7 +646,7 @@ unsigned int i; const id3_ucs4_t *ucs4; const struct id3_frame *frame; - id3_latin1_t *latin1; +// id3_latin1_t *latin1; i=0; while ((frame=id3_tag_findframe(tag,ID3_FRAME_COMMENT,i++))) { ucs4=id3_field_getstring(id3_frame_field(frame,2)); @@ -646,10 +654,18 @@ if (*ucs4) continue; ucs4=id3_field_getfullstring(id3_frame_field(frame,3)); assert(ucs4); + +/* latin1=id3_ucs4_latin1duplicate(ucs4); if(!latin1) return; data=strdup((char *)latin1); free(latin1); +*/ + id3_utf8_t *utf8=id3_ucs4_utf8duplicate(ucs4); + if(!utf8) return; + data=strdup((char *)utf8); + free(utf8); + break; } } diff -Nru vdr-plugin-music-0.9.1~testing/menubrowse.c vdr-plugin-music-0.9.2~testing/menubrowse.c --- vdr-plugin-music-0.9.1~testing/menubrowse.c 2009-12-25 01:11:58.000000000 +0000 +++ vdr-plugin-music-0.9.2~testing/menubrowse.c 2009-12-29 12:22:20.000000000 +0000 @@ -496,10 +496,10 @@ { switch(num) { case 1: - SetHelp(trVDR(BUTTON"Edit"), tr("Source"), tr("Browse"), ">>"); + SetHelp(trVDR("Button$Edit"), tr("Source"), tr("Browse"), ">>"); break; case 2: - SetHelp("<<", trVDR(BUTTON"New"), trVDR(BUTTON"Delete"), ">>"); + SetHelp("<<", trVDR("Button$New"), trVDR("Button$Delete"), ">>"); break; case 3: SetHelp("<<", tr("Convert"), NULL, tr("Rename")); @@ -723,4 +723,3 @@ } return state; } - diff -Nru vdr-plugin-music-0.9.1~testing/music/themes/current.colors vdr-plugin-music-0.9.2~testing/music/themes/current.colors --- vdr-plugin-music-0.9.1~testing/music/themes/current.colors 2009-12-24 21:11:15.000000000 +0000 +++ vdr-plugin-music-0.9.2~testing/music/themes/current.colors 2009-12-24 21:18:20.000000000 +0000 @@ -1,7 +1,7 @@ -MORONIMO-FF_LOW -## +OSD_MORONIMO-FF_SD Good for unmodded FF-Card and PAL resolution - Disable "Use one 256 color area" for fast Visualization +## +## ## ## LINE "MUST" END WITH THE COLORVALUE AND WITHOUT SPACES ## 0xAARRGGBB diff -Nru vdr-plugin-music-0.9.1~testing/music/themes/mpeg_AMP-TURNTABLE_HD.theme vdr-plugin-music-0.9.2~testing/music/themes/mpeg_AMP-TURNTABLE_HD.theme --- vdr-plugin-music-0.9.1~testing/music/themes/mpeg_AMP-TURNTABLE_HD.theme 1970-01-01 01:00:00.000000000 +0100 +++ vdr-plugin-music-0.9.2~testing/music/themes/mpeg_AMP-TURNTABLE_HD.theme 2009-12-25 01:00:54.000000000 +0000 @@ -0,0 +1,277 @@ + MPEG_AMP-TURNTABLE_HD +# +# +## GENERAL + .isOSDTheme. =0 + .isHDTheme. =1 + .OSDAlpha. =255 + .roundedCorner. =0 + .drawBars. =0 + .drawButtons. =0 + .ff_compat. =0 + .isMpeg. =1 + .symrect. =0 + .localbackground. =/themes/mpegs/amp_turntable.mpg + .streambackground. =/themes/mpegs/amp_turntable.mpg + .localcover. =/music-headphone.png + .streamcover. =/music-mixer.png + .osdbackground. = + .osdbackgroundcolor. = + .symbolxy. = + .trackcount. =18 + .osdheight. =1080 + .osdwidth. =1920 + .osdtop. =35 + .osdleft. =0 + .fontheight. =40 + .smallfontheight. =33 +# + .UseOneArea. =1 +# +## AREAS colors + .OneAreaDepth. =8 + .topdepth. =2 + .coverdepth. =4 + .trackinfodepth. =2 + .statusdepth. =2 + .tracksdepth. =2 + .symboldepth. =2 + .buttondepth. =4 +# +# +## AREAS size + .area_toph. =52 + .area_coverw. =170 + .area_coverh. =196 + .area_infoh. =284 + .area_listh. =407 + .area_symbolh. =476 +# +# +## POSITIONS + .coverbgx. =42 + .coverbgy. =74 + .coverbgx2. =176 + .coverbgy2. =202 + .coverelipser. =11 +# + .coverx. =100 + .covery. =0 + .coverw. =160 + .coverh. =160 + .covercolor. =14 +# + .bigcoverx. =430 + .bigcovery. =64 + .bigcoverw. =1000 + .bigcoverh. =768 + .bigcovercolor. =252 + .bigcoverdepth. =8 +# +##//artistfield + .artistx. =305 + .artisty. =0 + .artistw. =1190 + .albumx. =305 + .albumy. =40 + .albumw. =1190 + .genrex. =1500 + .genrey. =0 + .genrew. =400 + .yearx. =1500 + .yeary. =40 + .yearw. =400 + .ratingx. =1500 + .ratingy. =120 + .ratingw. =200 +# +##//statusfield + .statusx. =1620 + .statusy. =954 + .statusw. =200 +# +##//infofield + .modex. =100 + .modey. =954 + .modew. =400 + .numberx. =1428 + .numbery. =954 + .numberw. =170 + .timex. =510 + .timey. =954 + .timew. =70 + .progressx. =582 + .progressy. =969 + .progressh. =4 + .progressw. =750 + .totalx. =1345 + .totaly. =954 + .totalw. =65 +# +##//tracklist + .titlex. =305 + .titley. =120 + .titlew. =995 + .tracksx. =650 + .tracksy. =260 + .tracksw. =840 + .ratesmx. =1500 + .ratesmy. =260 + .ratesmw. =50 +# +##//symbols + .shufflex. =370 + .shuffley. =998 + .loopx. =449 + .loopy. =998 + .recordx. =530 + .recordy. =998 + .lyricsx. =1290 + .lyricsy. =998 + .copyx. =1373 + .copyy. =998 + .shutdownx. =1450 + .shutdowny. =998 + .timerx. =1525 + .timery. =998 + .mutex. =610 + .mutey. =1002 + .volbarx. =663 + .volbary. =1018 + .volbarw. =596 + .volbarh. =4 +# +##//buttons +## taCenter = 0 , taLeft = 1 , taRight = 2 + .buttontop. =818 + .buttonalign. =1 + .buttontext1posx. =66 + .buttontext2posx. =230 + .buttontext3posx. =1610 + .buttontext4posx. =1750 + .buttontext1posy. =998 + .buttontext2posy. =998 + .buttontext3posy. =998 + .buttontext4posy. =998 + .button1w. =150 + .button2w. =150 + .button3w. =150 + .button4w. =150 +# +##//elipse + .elipseredx. =50 + .elipseredy. =0 + .elipsegreenx. =336 + .elipsegreeny. =0 + .elipseyellowx. =642 + .elipseyellowy. =0 + .elipsebluex. =960 + .elipsebluey. =0 + .elipseh. =12 +## +######################################################### +## GENERATED ## +######################################################### +## +## LINE "MUST" END WITH THE COLORVALUE AND WITHOUT SPACES +## 0xAARRGGBB +# +# +## BACKGROUND + .clrBG. =0x0A000000 +# +## TOP: 2 colors + .clrTopBG. =0x0A000000 + .clrTopFG. =0x0A000000 +# +## COVER: 2 colors + .clrCoverBG. =0x0A000000 + .clrCoverBar. =0x0A000000 +# +## ARTIST, RATING: 3 colors + .clrArtistBG. =0x0A000000 + .clrArtistFG. =0xFF445EB1 + .clrRatingFG. =0xFFC6C6C6 +# +## PLAYSTATUS: 4 colors + .clrPlayStatusBG. =0x0A000000 + .clrPlayStatusFG. =0xFF0100D2 + .clrInfoBG. =0x0A000000 + .clrInfoFG. =0xFF0100D2 + .clrProgressbarBG. =0x0A000000 + .clrProgressbarFG. =0xFF0100D2 +# +## TRACKLIST: 3 colors + .clrListTitle. =0xFFC6C6C6 + .clrListBG. =0x0A000000 + .clrListFG. =0xFFB5B5B5 + .clrListRating. =0xFFC6C6C6 +# +## SYMBOLS: 3 colors + .clrSymbolBG. =0x0A000000 + .clrSymbolFG. =0x4BB5B5B5 + .clrSymbolActive. =0xFF0100D2 + .clrRecordingActive. =0xFF0100D2 + .clrVolumeActive. =0xFF0100D2 + .clrVolumeProgressbarBG. =0x0A000000 + .clrVolumeProgressbarFG. =0xFF0100D2 +# +## STATUSBAR: 6 colors + .clrStatusBG. =0x0A000000 + .clrStatusFG1. =0x4BB5B5B5 + .clrStatusFG2. =0x4BB5B5B5 + .clrStatusFG3. =0x4BB5B5B5 + .clrStatusFG4. =0x4BB5B5B5 + .clrStatusRed. =0x0A000000 + .clrStatusGreen. =0x0A000000 + .clrStatusYellow. =0x0A000000 + .clrStatusBlue. =0x0A000000 +# +## TRACKLIST_TAB + .Tracklist_tab1. =6 + .Tracklist_tab2. =9 + .Tracklist_tab3. =1 + .Tracklist_tab4. =29 +# +## SEARCHLIST_TAB + .Searchlist_tab1. =3 + .Searchlist_tab2. =7 + .Searchlist_tab3. =8 + .Searchlist_tab4. =26 +# +## FONTS + .FONTBUTTON. =0 + .FONTBUTTONNAME. =VDRSymbols Sans:Book + .FONTBUTTONSIZE. =24 + + .FONTGENRE. =0 + .FONTGENRENAME. =VDRSymbols Sans:Bold + .FONTGENRESIZE. =26 + + .FONTINFO. =0 + .FONTINFONAME. =VDRSymbols Sans:Book + .FONTINFOSIZE. =22 + + .FONTINTERPRET. =0 + .FONTINTERPRETNAME. =VDRSymbols Sans:Bold + .FONTINTERPRETSIZE. =30 + + .FONTLIST. =0 + .FONTLISTNAME. =VDRSymbols Sans:Book + .FONTLISTSIZE. =28 + + .FONTSTATUS. =0 + .FONTSTATUSNAME. =VDRSymbols Sans:Book + .FONTSTATUSSIZE. =24 + + .FONTSYMBOL. =0 + .FONTSYMBOLNAME. =VDRMusicSymbols:Regular + .FONTSYMBOLSIZE. =24 + + .FONTTITLE. =0 + .FONTTITLENAME. =VDRSymbols Sans:Bold + .FONTTITLESIZE. =35 + + .FONTTOP. =0 + .FONTTOPNAME. =VDRSymbols Sans:Book + .FONTTOPSIZE. =18 diff -Nru vdr-plugin-music-0.9.1~testing/music/themes/mpeg_EISBAER_HD.theme vdr-plugin-music-0.9.2~testing/music/themes/mpeg_EISBAER_HD.theme --- vdr-plugin-music-0.9.1~testing/music/themes/mpeg_EISBAER_HD.theme 1970-01-01 01:00:00.000000000 +0100 +++ vdr-plugin-music-0.9.2~testing/music/themes/mpeg_EISBAER_HD.theme 2009-12-29 11:22:57.000000000 +0000 @@ -0,0 +1,277 @@ + MPEG_EISBAER_HD +# +# +## GENERAL + .isOSDTheme. =1 + .isHDTheme. =1 + .OSDAlpha. =175 + .roundedCorner. =0 + .drawBars. =0 + .drawButtons. =0 + .ff_compat. =0 + .isMpeg. =1 + .symrect. =0 + .localbackground. =/themes/mpegs/eisbaer.mpg + .streambackground. =/themes/mpegs/eisbaer.mpg + .localcover. =/music-headphone.png + .streamcover. =/music-mixer.png + .osdbackground. =/themes/osd/evora-black-hd.png + .osdbackgroundcolor. =150 + .symbolxy. = + .trackcount. =4 + .osdheight. =960 + .osdwidth. =1800 + .osdtop. =82 + .osdleft. =52 + .fontheight. =50 + .smallfontheight. =42 +# + .UseOneArea. =1 +# +## AREAS colors + .OneAreaDepth. =8 + .topdepth. =2 + .coverdepth. =4 + .trackinfodepth. =2 + .statusdepth. =2 + .tracksdepth. =2 + .symboldepth. =4 + .buttondepth. =4 +# +# +## AREAS size + .area_toph. =52 + .area_coverw. =170 + .area_coverh. =196 + .area_infoh. =284 + .area_listh. =407 + .area_symbolh. =476 +# +# +## POSITIONS + .coverbgx. =42 + .coverbgy. =74 + .coverbgx2. =176 + .coverbgy2. =202 + .coverelipser. =11 +# + .coverx. =58 + .covery. =73 + .coverw. =300 + .coverh. =300 + .covercolor. =14 +# + .bigcoverx. =0 + .bigcovery. =0 + .bigcoverw. =1800 + .bigcoverh. =960 + .bigcovercolor. =252 + .bigcoverdepth. =8 +# +##//artistfield + .artistx. =396 + .artisty. =75 + .artistw. =1340 + .albumx. =396 + .albumy. =144 + .albumw. =1340 + .genrex. =396 + .genrey. =198 + .genrew. =1340 + .yearx. =396 + .yeary. =252 + .yearw. =1340 + .ratingx. =396 + .ratingy. =320 + .ratingw. =1340 +# +##//statusfield + .statusx. =60 + .statusy. =446 + .statusw. =300 +# +##//infofield + .modex. =396 + .modey. =400 + .modew. =1340 + .numberx. =396 + .numbery. =446 + .numberw. =1340 + .timex. =396 + .timey. =492 + .timew. =120 + .progressx. =520 + .progressy. =506 + .progressh. =14 + .progressw. =1092 + .totalx. =1616 + .totaly. =492 + .totalw. =120 +# +##//tracklist + .titlex. =60 + .titley. =556 + .titlew. =1680 + .tracksx. =60 + .tracksy. =608 + .tracksw. =1430 + .ratesmx. =1526 + .ratesmy. =608 + .ratesmw. =0 +# +##//symbols + .shufflex. =60 + .shuffley. =800 + .loopx. =114 + .loopy. =800 + .recordx. =168 + .recordy. =800 + .lyricsx. =222 + .lyricsy. =800 + .copyx. =276 + .copyy. =800 + .shutdownx. =330 + .shutdowny. =800 + .timerx. =384 + .timery. =800 + .mutex. =1242 + .mutey. =800 + .volbarx. =1300 + .volbary. =818 + .volbarw. =440 + .volbarh. =10 +# +##//buttons +## taCenter = 0 , taLeft = 1 , taRight = 2 + .buttontop. =477 + .buttonalign. =0 + .buttontext1posx. =44 + .buttontext2posx. =482 + .buttontext3posx. =920 + .buttontext4posx. =1358 + .buttontext1posy. =886 + .buttontext2posy. =886 + .buttontext3posy. =886 + .buttontext4posy. =886 + .button1w. =400 + .button2w. =400 + .button3w. =400 + .button4w. =400 +# +##//elipse + .elipseredx. =30 + .elipseredy. =485 + .elipsegreenx. =180 + .elipsegreeny. =485 + .elipseyellowx. =330 + .elipseyellowy. =485 + .elipsebluex. =480 + .elipsebluey. =485 + .elipseh. =12 +## +######################################################### +## GENERATED ## +######################################################### +## +## LINE "MUST" END WITH THE COLORVALUE AND WITHOUT SPACES +## 0xAARRGGBB +# +# +## BACKGROUND + .clrBG. =0xFF000000 +# +## TOP: 2 colors + .clrTopBG. =0xFF000000 + .clrTopFG. =0xFF023971 +# +## COVER: 2 colors + .clrCoverBG. =0xB0000000 + .clrCoverBar. =0xB0000000 +# +## ARTIST, RATING: 3 colors + .clrArtistBG. =0xB0000000 + .clrArtistFG. =0xFFFFFFFF + .clrRatingFG. =0xFFFF4444 +# +## PLAYSTATUS: 4 colors + .clrPlayStatusBG. =0xB0000000 + .clrPlayStatusFG. =0xFF707070 + .clrInfoBG. =0xB0000000 + .clrInfoFG. =0xFF24516E + .clrProgressbarBG. =0xFF303030 + .clrProgressbarFG. =0xFF577000 +# +## TRACKLIST: 3 colors + .clrListTitle. =0xFFFFFFFF + .clrListBG. =0xB0000000 + .clrListFG. =0xFF24516E + .clrListRating. =0xFF505050 +# +## SYMBOLS: 3 colors + .clrSymbolBG. =0xB0000000 + .clrSymbolFG. =0xFF303030 + .clrSymbolActive. =0xFF707070 + .clrRecordingActive. =0xFFFF0000 + .clrVolumeActive. =0xFF303030 + .clrVolumeProgressbarBG. =0xFF303030 + .clrVolumeProgressbarFG. =0xFF707070 +# +## STATUSBAR: 6 colors + .clrStatusBG. =0xB0000000 + .clrStatusFG1. =0xFF505050 + .clrStatusFG2. =0xFF505050 + .clrStatusFG3. =0xFF505050 + .clrStatusFG4. =0xFF505050 + .clrStatusRed. =0xFF992900 + .clrStatusGreen. =0xFF6CB752 + .clrStatusYellow. =0xFFCE7B00 + .clrStatusBlue. =0xFF52B3B7 +# +## TRACKLIST_TAB + .Tracklist_tab1. =6 + .Tracklist_tab2. =9 + .Tracklist_tab3. =1 + .Tracklist_tab4. =29 +# +## SEARCHLIST_TAB + .Searchlist_tab1. =3 + .Searchlist_tab2. =7 + .Searchlist_tab3. =8 + .Searchlist_tab4. =26 +# +## FONTS + .FONTBUTTON. =0 + .FONTBUTTONNAME. =VDRSymbols Sans:Book + .FONTBUTTONSIZE. =27 + + .FONTGENRE. =0 + .FONTGENRENAME. =VDRSymbols Sans:Book + .FONTGENRESIZE. =36 + + .FONTINFO. =0 + .FONTINFONAME. =VDRSymbols Sans:Book + .FONTINFOSIZE. =32 + + .FONTINTERPRET. =0 + .FONTINTERPRETNAME. =VDRSymbols Sans:Book + .FONTINTERPRETSIZE. =44 + + .FONTLIST. =0 + .FONTLISTNAME. =VDRSymbols Sans:Book + .FONTLISTSIZE. =27 + + .FONTSTATUS. =0 + .FONTSTATUSNAME. =VDRSymbols Sans:Book + .FONTSTATUSSIZE. =32 + + .FONTSYMBOL. =0 + .FONTSYMBOLNAME. =VDRMusicSymbols:Regular + .FONTSYMBOLSIZE. =44 + + .FONTTITLE. =0 + .FONTTITLENAME. =VDRSymbols Sans:Book + .FONTTITLESIZE. =40 + + .FONTTOP. =0 + .FONTTOPNAME. =VDRSymbols Sans:Book + .FONTTOPSIZE. =22 diff -Nru vdr-plugin-music-0.9.1~testing/music/themes/mpeg_EVORA-PEARLHD-BLACK_HD.theme vdr-plugin-music-0.9.2~testing/music/themes/mpeg_EVORA-PEARLHD-BLACK_HD.theme --- vdr-plugin-music-0.9.1~testing/music/themes/mpeg_EVORA-PEARLHD-BLACK_HD.theme 1970-01-01 01:00:00.000000000 +0100 +++ vdr-plugin-music-0.9.2~testing/music/themes/mpeg_EVORA-PEARLHD-BLACK_HD.theme 2009-12-29 23:26:58.000000000 +0000 @@ -0,0 +1,277 @@ + MPEG_EVORA-PEARLHD-BLACK_HD +# +# +## GENERAL + .isOSDTheme. =1 + .isHDTheme. =1 + .OSDAlpha. =175 + .roundedCorner. =0 + .drawBars. =0 + .drawButtons. =0 + .ff_compat. =0 + .isMpeg. =1 + .symrect. =0 + .localbackground. =/themes/mpegs/evora.mpg + .streambackground. =/themes/mpegs/evora.mpg + .localcover. =/music-headphone.png + .streamcover. =/music-mixer.png + .osdbackground. =/themes/osd/evora-black-hd.png + .osdbackgroundcolor. =150 + .symbolxy. = + .trackcount. =4 + .osdheight. =960 + .osdwidth. =1800 + .osdtop. =82 + .osdleft. =52 + .fontheight. =50 + .smallfontheight. =42 +# + .UseOneArea. =1 +# +## AREAS colors + .OneAreaDepth. =8 + .topdepth. =2 + .coverdepth. =4 + .trackinfodepth. =2 + .statusdepth. =2 + .tracksdepth. =2 + .symboldepth. =4 + .buttondepth. =4 +# +# +## AREAS size + .area_toph. =52 + .area_coverw. =170 + .area_coverh. =196 + .area_infoh. =284 + .area_listh. =407 + .area_symbolh. =476 +# +# +## POSITIONS + .coverbgx. =42 + .coverbgy. =74 + .coverbgx2. =176 + .coverbgy2. =202 + .coverelipser. =11 +# + .coverx. =58 + .covery. =73 + .coverw. =300 + .coverh. =300 + .covercolor. =14 +# + .bigcoverx. =0 + .bigcovery. =0 + .bigcoverw. =1800 + .bigcoverh. =960 + .bigcovercolor. =252 + .bigcoverdepth. =8 +# +##//artistfield + .artistx. =396 + .artisty. =75 + .artistw. =1340 + .albumx. =396 + .albumy. =144 + .albumw. =1340 + .genrex. =396 + .genrey. =198 + .genrew. =1340 + .yearx. =396 + .yeary. =252 + .yearw. =1340 + .ratingx. =396 + .ratingy. =320 + .ratingw. =1340 +# +##//statusfield + .statusx. =60 + .statusy. =446 + .statusw. =300 +# +##//infofield + .modex. =396 + .modey. =400 + .modew. =1340 + .numberx. =396 + .numbery. =446 + .numberw. =1340 + .timex. =396 + .timey. =492 + .timew. =120 + .progressx. =520 + .progressy. =506 + .progressh. =14 + .progressw. =1092 + .totalx. =1616 + .totaly. =492 + .totalw. =120 +# +##//tracklist + .titlex. =60 + .titley. =556 + .titlew. =1680 + .tracksx. =60 + .tracksy. =608 + .tracksw. =1430 + .ratesmx. =1526 + .ratesmy. =608 + .ratesmw. =0 +# +##//symbols + .shufflex. =60 + .shuffley. =800 + .loopx. =114 + .loopy. =800 + .recordx. =168 + .recordy. =800 + .lyricsx. =222 + .lyricsy. =800 + .copyx. =276 + .copyy. =800 + .shutdownx. =330 + .shutdowny. =800 + .timerx. =384 + .timery. =800 + .mutex. =1242 + .mutey. =800 + .volbarx. =1300 + .volbary. =818 + .volbarw. =440 + .volbarh. =10 +# +##//buttons +## taCenter = 0 , taLeft = 1 , taRight = 2 + .buttontop. =477 + .buttonalign. =0 + .buttontext1posx. =44 + .buttontext2posx. =482 + .buttontext3posx. =920 + .buttontext4posx. =1358 + .buttontext1posy. =886 + .buttontext2posy. =886 + .buttontext3posy. =886 + .buttontext4posy. =886 + .button1w. =400 + .button2w. =400 + .button3w. =400 + .button4w. =400 +# +##//elipse + .elipseredx. =30 + .elipseredy. =485 + .elipsegreenx. =180 + .elipsegreeny. =485 + .elipseyellowx. =330 + .elipseyellowy. =485 + .elipsebluex. =480 + .elipsebluey. =485 + .elipseh. =12 +## +######################################################### +## GENERATED ## +######################################################### +## +## LINE "MUST" END WITH THE COLORVALUE AND WITHOUT SPACES +## 0xAARRGGBB +# +# +## BACKGROUND + .clrBG. =0xFF000000 +# +## TOP: 2 colors + .clrTopBG. =0xFF000000 + .clrTopFG. =0xFF023971 +# +## COVER: 2 colors + .clrCoverBG. =0xB0000000 + .clrCoverBar. =0xB0000000 +# +## ARTIST, RATING: 3 colors + .clrArtistBG. =0xB0000000 + .clrArtistFG. =0xFFFFFFFF + .clrRatingFG. =0xFFD9E765 +# +## PLAYSTATUS: 4 colors + .clrPlayStatusBG. =0xB0000000 + .clrPlayStatusFG. =0xFF707070 + .clrInfoBG. =0xB0000000 + .clrInfoFG. =0xFF24516E + .clrProgressbarBG. =0xFF303030 + .clrProgressbarFG. =0xFF577000 +# +## TRACKLIST: 3 colors + .clrListTitle. =0xFFFFFFFF + .clrListBG. =0xB0000000 + .clrListFG. =0xFF24516E + .clrListRating. =0xFF505050 +# +## SYMBOLS: 3 colors + .clrSymbolBG. =0xB0000000 + .clrSymbolFG. =0xFF303030 + .clrSymbolActive. =0xFF707070 + .clrRecordingActive. =0xFFFF0000 + .clrVolumeActive. =0xFF303030 + .clrVolumeProgressbarBG. =0xFF303030 + .clrVolumeProgressbarFG. =0xFF707070 +# +## STATUSBAR: 6 colors + .clrStatusBG. =0xB0000000 + .clrStatusFG1. =0xFF505050 + .clrStatusFG2. =0xFF505050 + .clrStatusFG3. =0xFF505050 + .clrStatusFG4. =0xFF505050 + .clrStatusRed. =0xFF992900 + .clrStatusGreen. =0xFF6CB752 + .clrStatusYellow. =0xFFCE7B00 + .clrStatusBlue. =0xFF52B3B7 +# +## TRACKLIST_TAB + .Tracklist_tab1. =6 + .Tracklist_tab2. =9 + .Tracklist_tab3. =1 + .Tracklist_tab4. =29 +# +## SEARCHLIST_TAB + .Searchlist_tab1. =3 + .Searchlist_tab2. =7 + .Searchlist_tab3. =8 + .Searchlist_tab4. =26 +# +## FONTS + .FONTBUTTON. =0 + .FONTBUTTONNAME. =VDRSymbols Sans:Book + .FONTBUTTONSIZE. =27 + + .FONTGENRE. =0 + .FONTGENRENAME. =VDRSymbols Sans:Book + .FONTGENRESIZE. =36 + + .FONTINFO. =0 + .FONTINFONAME. =VDRSymbols Sans:Book + .FONTINFOSIZE. =32 + + .FONTINTERPRET. =0 + .FONTINTERPRETNAME. =VDRSymbols Sans:Book + .FONTINTERPRETSIZE. =44 + + .FONTLIST. =0 + .FONTLISTNAME. =VDRSymbols Sans:Book + .FONTLISTSIZE. =27 + + .FONTSTATUS. =0 + .FONTSTATUSNAME. =VDRSymbols Sans:Book + .FONTSTATUSSIZE. =32 + + .FONTSYMBOL. =0 + .FONTSYMBOLNAME. =VDRMusicSymbols:Regular + .FONTSYMBOLSIZE. =44 + + .FONTTITLE. =0 + .FONTTITLENAME. =VDRSymbols Sans:Book + .FONTTITLESIZE. =40 + + .FONTTOP. =0 + .FONTTOPNAME. =VDRSymbols Sans:Book + .FONTTOPSIZE. =22 Binary files /tmp/6IQnwZXxGt/vdr-plugin-music-0.9.1~testing/music/themes/mpegs/amp_turntable.mpg and /tmp/gTLQIODxKX/vdr-plugin-music-0.9.2~testing/music/themes/mpegs/amp_turntable.mpg differ Binary files /tmp/6IQnwZXxGt/vdr-plugin-music-0.9.1~testing/music/themes/mpegs/eisbaer.mpg and /tmp/gTLQIODxKX/vdr-plugin-music-0.9.2~testing/music/themes/mpegs/eisbaer.mpg differ Binary files /tmp/6IQnwZXxGt/vdr-plugin-music-0.9.1~testing/music/themes/mpegs/evora.mpg and /tmp/gTLQIODxKX/vdr-plugin-music-0.9.2~testing/music/themes/mpegs/evora.mpg differ diff -Nru vdr-plugin-music-0.9.1~testing/music/visual/themes/current.vis vdr-plugin-music-0.9.2~testing/music/visual/themes/current.vis --- vdr-plugin-music-0.9.1~testing/music/visual/themes/current.vis 1970-01-01 01:00:00.000000000 +0100 +++ vdr-plugin-music-0.9.2~testing/music/visual/themes/current.vis 2009-12-29 22:11:31.000000000 +0000 @@ -0,0 +1,27 @@ +Description: 16-Band-stereo +# Example: +# 4 Visualization : ID +# 2 ChannelsSA : 1=mono 2=stereo +# 30 BandsSA : How much bands per channel +# FF000000 ClrBarColor : color of bar +# e2_SAHorz.png Coverpicture : background +# +# + .ID. =3 + .CHANNEL. =2 + .BARS. =1 + .CHANNEL1LEFT. =38 + .CHANNEL2LEFT. =98 + .BARWIDTH. =4 + .COLOR. =0xFF000000 + .BACKGROUND. =e2_SAVol2.png +# +# + .HD_ID. =3 + .HD_CHANNEL. =2 + .HD_BARS. =1 + .HD_CHANNEL1LEFT. =96 + .HD_CHANNEL2LEFT. =248 + .HD_BARWIDTH. =70 + .HD_COLOR. =0xFF000000 + .HD_BACKGROUND. =e2_SAVol2.png diff -Nru vdr-plugin-music-0.9.1~testing/music.c vdr-plugin-music-0.9.2~testing/music.c --- vdr-plugin-music-0.9.1~testing/music.c 2009-12-25 22:45:24.000000000 +0000 +++ vdr-plugin-music-0.9.2~testing/music.c 2009-12-31 13:50:23.000000000 +0000 @@ -28,7 +28,7 @@ const char *sourcesSub=0; const char *instantplay=0; -static const char *VERSION = "0.9.1-testing"; +static const char *VERSION = "0.9.2-testing"; static const char *DESCRIPTION = trNOOP("MP3-/Audioplayer"); static const char *MAINMENUENTRY = trNOOP("Musicplayer HD");