diff -Naur music-0.2.0.orig/mplayer.c music-0.2.0/mplayer.c --- music-0.2.0.orig/mplayer.c 2008-01-06 16:31:48.000000000 +0100 +++ music-0.2.0/mplayer.c 2008-01-06 16:36:16.000000000 +0100 @@ -824,7 +824,7 @@ { if(!CheckVDRVersion(1,1,16,"mplayer")) return false; i18n_name=Name(); - MPlaySources.Load(AddDirectory(ConfigDirectory(sourcesSub),"mplayersources.conf")); + MPlaySources.Load(AddDirectory(ConfigDirectory( "mplayer"),"mplayersources.conf")); if(MPlaySources.Count()<1) { esyslog("ERROR: you must have defined at least one source in mplayersources.conf"); fprintf(stderr,"No source(s) defined in mplayersources.conf\n"); diff -Naur music-0.2.0.orig/music/data/musiccmds.dat music-0.2.0/music/data/musiccmds.dat --- music-0.2.0.orig/music/data/musiccmds.dat 2008-01-06 16:31:48.000000000 +0100 +++ music-0.2.0/music/data/musiccmds.dat 2008-01-06 16:34:33.000000000 +0100 @@ -39,19 +39,19 @@ ########################################################################################################################################################### # ---- EIGENE KOMMANDOS ---------------------------------------------------------------------------------------------------------- : echo -Speichere aktuelle Abspielliste permanent? : /etc/vdr/plugins/music/scripts/music_savepl.sh; -Speichere aktuelles Suchergebnis permanent? : /etc/vdr/plugins/music/scripts/music_savesl.sh; -Kopiere Track zu CopyDir? : /etc/vdr/plugins/music/scripts/music_copytrack.sh -Lösche ausgewähltes Verzeichnis komplett? : screen -A -m -d -S deletecopydir /etc/vdr/plugins/music/scripts/music_deletecopydir.sh +Speichere aktuelle Abspielliste permanent? : /usr/share/vdr/music/scripts/music_savepl.sh; +Speichere aktuelles Suchergebnis permanent? : /usr/share/vdr/music/scripts/music_savesl.sh; +Kopiere Track zu CopyDir? : /usr/share/vdr/music/scripts/music_copytrack.sh +Lösche ausgewähltes Verzeichnis komplett? : screen -A -m -d -S deletecopydir /usr/share/vdr/music/scripts/music_deletecopydir.sh -------------------------------------------------------------------------------------------------------------------------------- : echo CD auswerfen? : /usr/bin/eject /dev/hdc; CD einziehen? : /usr/bin/eject -t /dev/hdc; -CD Disk Info? : /usr/bin/eject -t /dev/hdc; /etc/vdr/plugins/music/scripts/music_cddiskinfo.sh; -CD Disk loeschen? : screen -A -m -d -S cdblank /etc/vdr/plugins/music/scripts/music_cdblank.sh; -Abgespeicherte Playliste als Audio-CD brennen? : screen -A -m -d -S cdburn /etc/vdr/plugins/music/scripts/music_burnaudiocd.sh -Abgespeicherte Playliste als MP3-Daten-CD brennen?: screen -A -m -d -S mp3burn /etc/vdr/plugins/music/scripts/music_burnmp3cd.sh -Tracks der abgespeicherten Playliste kopieren? : screen -A -m -d -S copyall /etc/vdr/plugins/music/scripts/music_copyall.sh +CD Disk Info? : /usr/bin/eject -t /dev/hdc; /usr/share/vdr/music/scripts/music_cddiskinfo.sh; +CD Disk loeschen? : screen -A -m -d -S cdblank /usr/share/vdr/music/scripts/music_cdblank.sh; +Abgespeicherte Playliste als Audio-CD brennen? : screen -A -m -d -S cdburn /usr/share/vdr/music/scripts/music_burnaudiocd.sh +Abgespeicherte Playliste als MP3-Daten-CD brennen?: screen -A -m -d -S mp3burn /usr/share/vdr/music/scripts/music_burnmp3cd.sh +Tracks der abgespeicherten Playliste kopieren? : screen -A -m -d -S copyall /usr/share/vdr/music/scripts/music_copyall.sh -------------------------------------------------------------------------------------------------------------------------------- : echo Hilfe : cat /etc/vdr/plugins/music/data/help.dat; Check Path : echo $PATH; -Neue Themedatei erstellen : /etc/vdr/plugins/music/scripts/music_createtheme.sh; +Neue Themedatei erstellen : /usr/share/vdr/music/scripts/music_createtheme.sh; diff -Naur music-0.2.0.orig/music/data/webstreams.dat music-0.2.0/music/data/webstreams.dat --- music-0.2.0.orig/music/data/webstreams.dat 2008-01-06 16:31:48.000000000 +0100 +++ music-0.2.0/music/data/webstreams.dat 2008-01-06 16:42:26.000000000 +0100 @@ -1,25 +1,25 @@ #-------------------------------------------------------------------------------------------------------------------------------- : echo # UPDATE WEBSTREAMS #-------------------------------------------------------------------------------------------------------------------------------- : echo -TIP: -Change ../music/data/webstreams.dat with your editor. -Maybe you can uncomment the lines too. -After that, delete these lines +# TIP: +# Change ../music/data/webstreams.dat with your editor. +# Maybe you can uncomment the lines too. +# After that, delete these lines #---- Top Streams ---------------------------------------------------------------------------- : echo - * Genre Top 10 *? : echo "/VDR/bin/shout2vdr.sh 'TopTen'" | at now; + * Genre Top 10 *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'TopTen'" | at now; #---- Electronic ---------------------------------------------------------------------------- : echo - * Genre Dance *? : echo "/VDR/bin/shout2vdr.sh 'Disco'" | at now; - * Genre Club *? : echo "/VDR/bin/shout2vdr.sh 'Club'" | at now; - * Genre House *? : echo "/VDR/bin/shout2vdr.sh 'House'" | at now; - * Genre Trance *? : echo "/VDR/bin/shout2vdr.sh 'Trance'" | at now; - * Genre Techno *? : echo "/VDR/bin/shout2vdr.sh 'Techno'" | at now; + * Genre Dance *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Disco' | at now; + * Genre Club *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Club'" | at now; + * Genre House *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'House'" | at now; + * Genre Trance *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Trance'" | at now; + * Genre Techno *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Techno'" | at now; #---- Pop/Rock ---------------------------------------------------------------------------- : echo - * Genre Top 40 *? : echo "/VDR/bin/shout2vdr.sh 'Top 40'" | at now; - * Genre Metal Rock *? : echo "/VDR/bin/shout2vdr.sh 'Metal'" | at now; - * Genre Rock *? : echo "/VDR/bin/shout2vdr.sh 'Rock'" | at now; - * Genre Pop *? : echo "/VDR/bin/shout2vdr.sh 'Pop'" | at now; - * Genre 80s *? : echo "/VDR/bin/shout2vdr.sh '80s'" | at now; - * Genre Oldies *? : echo "/VDR/bin/shout2vdr.sh 'Oldies'" | at now; - * Genre Classic Rock/Pop *? : echo "/VDR/bin/shout2vdr.sh 'Classic'" | at now; + * Genre Top 40 *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Top 40'" | at now; + * Genre Metal Rock *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Metal'" | at now; + * Genre Rock *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Rock'" | at now; + * Genre Pop *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Pop'" | at now; + * Genre 80s *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr '80s'" | at now; + * Genre Oldies *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Oldies'" | at now; + * Genre Classic Rock/Pop *? : echo "/usr/share/vdr/shoutcast2vdr/shoutcast2vdr 'Classic'" | at now; #-------------------------------------------------------------------------------------------------------------------------------- : echo diff -Naur music-0.2.0.orig/music/musicsources.conf music-0.2.0/music/musicsources.conf --- music-0.2.0.orig/music/musicsources.conf 2008-01-06 16:31:48.000000000 +0100 +++ music-0.2.0/music/musicsources.conf 2008-01-06 16:45:20.000000000 +0100 @@ -1,3 +1,3 @@ -/vdr_daten/mp3;Lokale Musik;0;*.mp3/*.ogg/*.wav/*.MP3/*.OGG/*.WAV/*.m3u/*.M3U/*.pls/*.PLS +/mnt/music;Lokale Musik;0;*.mp3/*.ogg/*.wav/*.MP3/*.OGG/*.WAV/*.m3u/*.M3U/*.pls/*.PLS /mnt/cdfs;CD-Rom;1;*.mp3/*.wav/*.MP3/*.WAV/*.m3u/*.M3U/*.pls/*.PLS /media/usbstick;USB-Stick;1;*.mp3/*.ogg/*.wav/*.MP3/*.OGG/*.WAV/*.m3u/*.M3U/*.pls/*.PLS diff -Naur music-0.2.0.orig/music/scripts/music_savepl.sh music-0.2.0/music/scripts/music_savepl.sh --- music-0.2.0.orig/music/scripts/music_savepl.sh 2008-01-06 16:31:48.000000000 +0100 +++ music-0.2.0/music/scripts/music_savepl.sh 2008-01-06 16:44:09.000000000 +0100 @@ -23,7 +23,7 @@ # # DATE=`date +%Y%m%d_%T` -TARGETDIR="/vdr_daten/mp3" +TARGETDIR="/mnt/music" SOURCE="$TARGETDIR/@current.m3u" TARGET="$TARGETDIR/current-$DATE.m3u" # diff -Naur music-0.2.0.orig/music/data/user.dat music-0.2.0/music/data/user.dat --- music-0.2.0.orig/music/data/user.dat 2008-01-06 17:14:05.000000000 +0100 +++ music-0.2.0/music/data/user.dat 2008-01-06 17:14:23.000000000 +0100 @@ -3,11 +3,3 @@ User2 User3 User4 - -TIP: -Edit ../music/data/user.dat with your editor -Music will do the rest for you :D -Keep care that an user "admin" exists -otherwise you cant do some operations. -Dont forget to delete this lines. -After that , delete these lines.