Muggle und Fritzbox Plugin

14 files changed, 464 insertions, 15 deletions

diff --git a/plugins/fritzbox/plugin.sh b/plugins/fritzbox/plugin.sh
index 7f55bcc..fa29ab8 100644
--- a/plugins/fritzbox/plugin.sh
+++ b/plugins/fritzbox/plugin.sh
@@ -10,9 +10,8 @@
 source ./../../x-vdr.conf
 source ./../../setup.conf
 source ./../../functions
-
-WEB="http://www.zulu-entertainment.de/files/vdr-fritzbox/vdr-fritzbox-1.1.4.tgz"
-VERSION="fritzbox-1.1.4"
+WEB="http://www.joachim-wilke.de/dl.htm?ct=gz&dir=vdr-fritz&file=vdr-fritzbox-1.3.2.tgz"
+VERSION="fritzbox-1.3.2"
 LINK="fritzbox"
 
 VAR=`basename $WEB`
diff --git a/plugins/muggle/Googlyrics2.Beta3.amarokscript.tar.gz b/plugins/muggle/Googlyrics2.Beta3.amarokscript.tar.gz
new file mode 100755
index 0000000..f652884
--- /dev/null
+++ b/plugins/muggle/Googlyrics2.Beta3.amarokscript.tar.gz
diff --git a/plugins/muggle/googlyrics b/plugins/muggle/googlyrics
new file mode 100755
index 0000000..59bba16
--- /dev/null
+++ b/plugins/muggle/googlyrics
@@ -0,0 +1,13 @@
+#!/bin/sh
+ # Googlyric2 Beta 3
+  if [ -f /usr/share/apps/amarok/scripts/Googlyrics2.Beta3.amarokscript.tar.gz ]; then
+    echo "Googlyrics vorhanden"
+  else
+  cd /usr/share/apps
+  mkdir amarok
+  mkdir amarok/scripts
+  cd /usr/share/apps/amarok/scripts/
+  wget http://quicode.com/Googlyrics2.Beta3.amarokscript.tar.gz
+  tar -xzf Googlyrics2.Beta3.amarokscript.tar.gz
+  fi
+
diff --git a/plugins/muggle/muggle-GetReplayMode.patch b/plugins/muggle/muggle-GetReplayMode.patch
new file mode 100644
index 0000000..2dce390
--- /dev/null
+++ b/plugins/muggle/muggle-GetReplayMode.patch
@@ -0,0 +1,47 @@
+diff --git a/mg_db_gd_mysql.c b/mg_db_gd_mysql.c
+index c067a81..a35eaa7 100644
+--- a/mg_db_gd_mysql.c
++++ b/mg_db_gd_mysql.c
+@@ -8,6 +8,7 @@
+ 
+ #include <cstring>
+ #include <string>
++#include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+diff --git a/pcmplayer.c b/pcmplayer.c
+index 162c654..2a51877 100644
+--- a/pcmplayer.c
++++ b/pcmplayer.c
+@@ -656,6 +656,17 @@ bool mgPCMPlayer::GetIndex (int &current, int &total, bool snaptoiframe) {
+ 	return false;
+ }
+ 
++bool mgPCMPlayer::GetReplayMode(bool &Play, bool &Forward, int &Speed) {
++  Speed = -1;
++  Forward = true;
++  switch(PlayMode()) {
++    case pmPlay:  Play = true; break;
++    default:  
++                  Play = false; break;
++  }
++  return true;
++}
++
+ void mgPCMPlayer::internShowMPGFile() {
+ 	if (!imagefile.size())
+ 		return;
+diff --git a/pcmplayer.h b/pcmplayer.h
+index ae6558b..1c4f80c 100644
+--- a/pcmplayer.h
++++ b/pcmplayer.h
+@@ -219,6 +219,7 @@ class mgPCMPlayer : public cPlayer, cThread
+ 
+ 		virtual bool GetIndex (int &Current, int &Total, bool SnapToIFrame = false);
+ 		//  bool GetPlayInfo(cMP3PlayInfo *rm); // LVW
++   virtual bool GetReplayMode(bool &Play, bool &Forward, int &Speed);
+ 
+ 		void ReloadPlaylist();
+ 		void NewPlaylist (mgSelection * plist);
+
diff --git a/plugins/muggle/muggle-fts.patch b/plugins/muggle/muggle-fts.patch
new file mode 100644
index 0000000..bd4fabe
--- /dev/null
+++ b/plugins/muggle/muggle-fts.patch
@@ -0,0 +1,11 @@
+--- Makefile	2009-10-03 19:16:26.000000000 +0200
++++ Makefile.muggle	2009-10-03 19:17:14.000000000 +0200
+@@ -80,6 +80,8 @@
+ 
+ ### Includes and Defines (add further entries here):
+ 
++FTWNOTWANTED = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 
++DEFINES := $(filter-out $(FTWNOTWANTED),$(DEFINES))
+ INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include \
+ 	$(shell taglib-config --cflags)
+ 
diff --git a/plugins/muggle/muggle-git b/plugins/muggle/muggle-git
new file mode 160000
+Subproject ebd28ada087ab1a099f0694feb8b23ab4cd0bc2
diff --git a/plugins/muggle/muggle-sqlite.diff b/plugins/muggle/muggle-sqlite.diff
new file mode 100755
index 0000000..f709d52
--- /dev/null
+++ b/plugins/muggle/muggle-sqlite.diff
@@ -0,0 +1,14 @@
+--- Makefile.orig
++++ Makefile
+@@ -24,9 +24,9 @@
+ 
+ # Define what database you want to use, one of MySQL (HAVE_MYSQL=1),
+ # PostgreSQL (HAVE_PG=1) or SQLite (HAVE_SQLITE=1).  Default is MySQL.
+-#HAVE_SQLITE = 1
++HAVE_SQLITE = 1
+ #HAVE_PG = 1
+-HAVE_MYSQL = 1
++#HAVE_MYSQL = 1
+ 
+ ### The version number of this plugin (taken from the main source file):
+ 
diff --git a/plugins/muggle/muggle_plugin_patch.diff b/plugins/muggle/muggle_plugin_patch.diff
new file mode 100755
index 0000000..05fc079
--- /dev/null
+++ b/plugins/muggle/muggle_plugin_patch.diff
@@ -0,0 +1,37 @@
+--- plugin.sh.orig	2009-01-18 13:36:12.000000000 +0100
++++ plugin.sh	2009-01-19 17:46:00.000000000 +0100
+@@ -11,8 +11,8 @@
+ source ./../../setup.conf
+ source ./../../functions
+ 
+-WEB="http://projects.vdr-developer.org/attachments/download/35/vdr-muggle-0.2.2.tgz"
+-VERSION="muggle-0.2.2"
++WEB="http://projects.vdr-developer.org/attachments/download/53/vdr-muggle-0.2.3.tgz"
++VERSION="muggle-0.2.3"
+ LINK="muggle"
+ 
+ VAR=`basename $WEB`
+@@ -43,6 +43,23 @@
+ 
+   apt_install "libmad0-dev libtag1-dev libvorbis-dev"
+   apt_install "libwrap0-dev"
++  # Googlyric2 Beta 3 und Python
++  apt_install "python"
++  if [ -f /usr/share/apps/amarok/scripts/Googlyrics2.Beta3.amarokscript.tar.gz ]; then
++    echo "Googlyrics vorhanden"
++  else 
++    cd /usr/share/apps
++    mkdir amarok
++    mkdir amarok/scripts
++    cd /usr/share/apps/amarok/scripts/
++    wget http://quicode.com/Googlyrics2.Beta3.amarokscript.tar.gz
++    tar -xzf Googlyrics2.Beta3.amarokscript.tar.gz
++  fi  
++  mkdir $VDRCONFDIR/plugins/$LINK
++  mkdir $VDRCONFDIR/plugins/$LINK/scripts
++  cp -f $SOURCEDIR/VDR/PLUGINS/src/$LINK/scripts/* $VDRCONFDIR/plugins/$LINK/scripts
++  chmod 0755 $VDRCONFDIR/plugins/$LINK/scripts/muggle_getlyrics
++  chmod 0755 $VDRCONFDIR/plugins/$LINK/scripts/*.py
+ 
+   # scripts
+   if [ -f $DIR/muggle-image-convert ]; then
diff --git a/plugins/muggle/patches/fts.h.patch b/plugins/muggle/patches/fts.h.patch
new file mode 100644
index 0000000..4f707b8
--- /dev/null
+++ b/plugins/muggle/patches/fts.h.patch
@@ -0,0 +1,132 @@
+diff -Nru muggle-0.2.3/common.h muggle-0.2.3-fixed/common.h
+--- muggle-0.2.3/common.h	2009-01-15 16:01:23.000000000 +0100
++++ muggle-0.2.3-fixed/common.h	2010-04-22 03:02:53.000000000 +0200
+@@ -25,7 +25,7 @@
+ #ifndef APIVERSNUM
+ #include <vdr/config.h>
+ #endif
+-#include "config.h"
++//#include "config.h"
+ 
+ #if APIVERSNUM >= 10313
+ #define SLEEP(x) cCondWait::SleepMs(x)
+diff -Nru muggle-0.2.3/config.c muggle-0.2.3-fixed/config.c
+--- muggle-0.2.3/config.c	1970-01-01 01:00:00.000000000 +0100
++++ muggle-0.2.3-fixed/config.c	2010-04-22 02:59:40.000000000 +0200
+@@ -0,0 +1,71 @@
++#include <vdr/thread.h>
++#include "config.h"
++
++#if VDRVERSNUM >=10712
++
++// --- cCommand --------------------------------------------------------------
++
++char *cCommand::result = NULL;
++
++cCommand::cCommand(void)
++{
++  title = command = NULL;
++  confirm = false;
++}
++
++cCommand::~cCommand()
++{
++  free(title);
++  free(command);
++}
++
++bool cCommand::Parse(const char *s)
++{
++  const char *p = strchr(s, ':');
++  if (p) {
++     int l = p - s;
++     if (l > 0) {
++        title = MALLOC(char, l + 1);
++        stripspace(strn0cpy(title, s, l + 1));
++        if (!isempty(title)) {
++           int l = strlen(title);
++           if (l > 1 && title[l - 1] == '?') {
++              confirm = true;
++              title[l - 1] = 0;
++              }
++           command = stripspace(strdup(skipspace(p + 1)));
++           return !isempty(command);
++           }
++        }
++     }
++  return false;
++}
++
++const char *cCommand::Execute(const char *Parameters)
++{
++  free(result);
++  result = NULL;
++  cString cmdbuf;
++  if (Parameters)
++     cmdbuf = cString::sprintf("%s %s", command, Parameters);
++  const char *cmd = *cmdbuf ? *cmdbuf : command;
++  dsyslog("executing command '%s'", cmd);
++  cPipe p;
++  if (p.Open(cmd, "r")) {
++     int l = 0;
++     int c;
++     while ((c = fgetc(p)) != EOF) {
++           if (l % 20 == 0)
++              result = (char *)realloc(result, l + 21);
++           result[l++] = char(c);
++           }
++     if (result)
++        result[l] = 0;
++     p.Close();
++     }
++  else
++     esyslog("ERROR: can't open pipe for command '%s'", cmd);
++  return result;
++}
++
++#endif
+diff -Nru muggle-0.2.3/config.h muggle-0.2.3-fixed/config.h
+--- muggle-0.2.3/config.h	2009-01-15 16:01:23.000000000 +0100
++++ muggle-0.2.3-fixed/config.h	2010-04-22 03:00:40.000000000 +0200
+@@ -58,3 +58,25 @@
+ // is closed again.
+ #define SELECTHIDE_TIMEOUT 3
+ #endif							 //___CONFIG_H
++
++#if VDRVERSNUM >=10712
++
++// --- cCommands -------------------------------------------------------------------
++class cCommand : public cListObject {
++private:
++  char *title;
++  char *command;
++  bool confirm;
++  static char *result;
++public:
++  cCommand(void);
++  virtual ~cCommand();
++  bool Parse(const char *s);
++  const char *Title(void) { return title; }
++  bool Confirm(void) { return confirm; }
++  const char *Execute(const char *Parameters = NULL);
++  };
++
++class cCommands : public cConfig<cCommand> {};
++
++#endif
+diff -Nru muggle-0.2.3/Makefile muggle-0.2.3-fixed/Makefile
+--- muggle-0.2.3/Makefile	2009-01-15 16:01:23.000000000 +0100
++++ muggle-0.2.3-fixed/Makefile	2010-04-22 03:48:12.000000000 +0200
+@@ -91,7 +91,7 @@
+ OBJS = $(PLUGIN).o mg_valmap.o mg_thread_sync.o \
+ 	mg_item.o mg_item_gd.o mg_listitem.o mg_selection.o mg_sel_gd.o vdr_actions.o mg_menu.o vdr_menu.o mg_tools.o \
+ 	vdr_decoder_mp3.o vdr_stream.o vdr_decoder.o vdr_player.o \
+-	vdr_setup.o mg_setup.o mg_incremental_search.o mg_image_provider.o \
++	config.o vdr_setup.o mg_setup.o mg_incremental_search.o mg_image_provider.o \
+ 	mg_skin.o quantize.o mg_playcommands.o pcmplayer.o \
+ 	lyrics.o bitmap.o imagecache.o
+ 
+Dateien muggle-0.2.3/po/de.mo und muggle-0.2.3-fixed/po/de.mo sind verschieden.
+Dateien muggle-0.2.3/po/fi.mo und muggle-0.2.3-fixed/po/fi.mo sind verschieden.
+Dateien muggle-0.2.3/po/fr.mo und muggle-0.2.3-fixed/po/fr.mo sind verschieden.
+Dateien muggle-0.2.3/po/it.mo und muggle-0.2.3-fixed/po/it.mo sind verschieden.
diff --git a/plugins/muggle/patches/muggle-server.diff b/plugins/muggle/patches/muggle-server.diff
new file mode 100755
index 0000000..71a33fe
--- /dev/null
+++ b/plugins/muggle/patches/muggle-server.diff
@@ -0,0 +1,11 @@
+--- Makefile.org	2007-03-27 20:14:55.000000000 +0200
++++ Makefile	2007-03-24 09:20:58.000000000 +0100
+@@ -20,7 +20,7 @@
+ 
+ #if you do not want to compile in code for embedded mysql,
+ #define this:
+-#HAVE_ONLY_SERVER=1
++HAVE_ONLY_SERVER=1
+ 
+ # Define what database you want to use, one of MySQL (HAVE_MYSQL=1),
+ # PostgreSQL (HAVE_PG=1) or SQLite (HAVE_SQLITE=1).  Default is MySQL.
diff --git a/plugins/muggle/patches/vdr-muggle-0.2.3-gcc44.patch b/plugins/muggle/patches/vdr-muggle-0.2.3-gcc44.patch
new file mode 100644
index 0000000..3045d1b
--- /dev/null
+++ b/plugins/muggle/patches/vdr-muggle-0.2.3-gcc44.patch
@@ -0,0 +1,64 @@
+diff -ruN muggle-0.2.3.orig/mg_db.c muggle-0.2.3/mg_db.c
+--- muggle-0.2.3.orig/mg_db.c	2009-01-15 16:01:23.000000000 +0100
++++ muggle-0.2.3/mg_db.c	2009-03-31 15:18:32.133400460 +0200
+@@ -1140,7 +1140,7 @@
+ 	if (genre1.empty()) {
+ 		genre1 = m_TCON.toCString(the_setup.utf8);
+ 		const char *tcon=genre1.c_str();
+-		char *rparen=strchr(tcon,')');
++		char *rparen=strchr(strdup(tcon),')');
+ 		if (tcon[0]=='(' && rparen) {
+ 			*rparen=0;
+ 			genre1 = m_GenreIds[tcon+1];
+diff -ruN muggle-0.2.3.orig/mg_image_provider.c muggle-0.2.3/mg_image_provider.c
+--- muggle-0.2.3.orig/mg_image_provider.c	2009-01-15 16:01:23.000000000 +0100
++++ muggle-0.2.3/mg_image_provider.c	2009-03-31 15:15:09.648153178 +0200
+@@ -39,7 +39,8 @@
+ 		return (FALSE);
+ 	}
+ 	else {
+-		char *ext = rindex( entry->d_name, '.' );
++		char *dname = strdup(entry->d_name);
++		char *ext = rindex( dname, '.' );
+ 
+ 		if( ext ) {
+ 			if( !strcmp( ext, ".jpg" ) || !strcmp( ext, ".png" ) || !strcmp( ext, ".JPG" ) || !strcmp( ext, ".PNG" ) ) {
+diff -ruN muggle-0.2.3.orig/mg_tools.c muggle-0.2.3/mg_tools.c
+--- muggle-0.2.3.orig/mg_tools.c	2009-01-15 16:01:23.000000000 +0100
++++ muggle-0.2.3/mg_tools.c	2009-03-31 15:11:59.913150640 +0200
+@@ -170,9 +170,10 @@
+ 
+ char *
+ extension(const char *filename) {
+-	char *dot = strrchr(filename,'.');
++	char *fname = strdup(filename);
++	char *dot = strrchr(fname,'.');
+ 	if (!dot)
+-		dot = strrchr(filename,0)-1;
++		dot = strrchr(fname,0)-1;
+ 	return dot+1;
+ }
+ 
+@@ -209,9 +210,9 @@
+ }
+ 
+ bool mkdir_p(const char *s) {
+-	char *slash=strrchr(s,'/');
+-	if (!slash) return false;
+ 	char *sc = strdup(s);
++	char *slash=strrchr(sc,'/');
++	if (!slash) return false;
+ 	*strrchr(sc,'/')=0;	// cut off the filename
+ 	char *p = sc;
+ 	int mode;
+diff -ruN muggle-0.2.3.orig/mg_tools.h muggle-0.2.3/mg_tools.h
+--- muggle-0.2.3.orig/mg_tools.h	2009-01-15 16:01:23.000000000 +0100
++++ muggle-0.2.3/mg_tools.h	2009-03-31 14:57:30.649150865 +0200
+@@ -14,6 +14,7 @@
+ #ifndef _MUGGLE_TOOLS_H
+ #define _MUGGLE_TOOLS_H
+ 
++#include <cstdarg>
+ #include <iostream>
+ #include <sstream>
+ #include <string>
diff --git a/plugins/muggle/plugin.sh b/plugins/muggle/plugin.sh
index e4d15ed..9257358 100644
--- a/plugins/muggle/plugin.sh
+++ b/plugins/muggle/plugin.sh
@@ -2,7 +2,7 @@
 
 # x-vdr (Installations-Skript fuer einen VDR mit Debian als Basis)
 # von Marc Wernecke - www.zulu-entertainment.de
-# 23.01.2009
+# 09.01.2009
 #
 # vdr-muggle
 
@@ -11,8 +11,8 @@ source ./../../x-vdr.conf
 source ./../../setup.conf
 source ./../../functions
 
-WEB="http://projects.vdr-developer.org/attachments/download/53/vdr-muggle-0.2.3.tgz"
-VERSION="muggle-0.2.3"
+WEB="http://projects.vdr-developer.org/attachments/download/35/vdr-muggle-0.2.3.tgz"
+VERSION="muggle-git"
 LINK="muggle"
 
 VAR=`basename $WEB`
@@ -29,38 +29,44 @@ function clean_plugin() {
 
 # plugin installieren
 function install_plugin() {
-  download_plugin
-  extract_plugin
+ cd $DIR
+    rm -rf muggle $VERSION
+    mv -f muggle $VERSION
+    git clone git://projects.vdr-developer.org/vdr-plugin-muggle.git muggle-git
+    cp -R $VERSION $SOURCEDIR/VDR/PLUGINS/src
+#  download_plugin
+#  extract_plugin
   cd $SOURCEDIR/VDR/PLUGINS/src
   rm -f $LINK
   ln -vfs $VERSION $LINK
   patch_plugin
 
   ## plugin specials - start ##
-  apt_install "sqlite3 libsqlite3-dev"
+#  apt_install "sqlite3 libsqlite3-dev"
   # oder Patch entfernen und...
-#  apt_install "libmysqlclient15-dev mysql-server mysql-client"
+  apt_install "libmysqlclient15-dev mysql-server mysql-client"
 
   apt_install "libmad0-dev libtag1-dev libvorbis-dev"
   apt_install "libwrap0-dev"
   # Googlyric2 Beta 3 und Python
   apt_install "python"
-  if [ -f /usr/share/apps/amarok/scripts/Googlyrics2.Beta3.amarokscript.tar.gz ]; then
+  if [ -f /usr/share/apps/amarok/scripts/Googlyrics2.Beta3.amarokscript.tar.gz ]
+ then
     echo "Googlyrics vorhanden"
-  else
+  else 
     cd /usr/share/apps
     mkdir amarok
     mkdir amarok/scripts
     cd /usr/share/apps/amarok/scripts/
     wget http://quicode.com/Googlyrics2.Beta3.amarokscript.tar.gz
     tar -xzf Googlyrics2.Beta3.amarokscript.tar.gz
-  fi
+  fi  
   mkdir $VDRCONFDIR/plugins/$LINK
   mkdir $VDRCONFDIR/plugins/$LINK/scripts
   cp -f $SOURCEDIR/VDR/PLUGINS/src/$LINK/scripts/* $VDRCONFDIR/plugins/$LINK/scripts
   chmod 0755 $VDRCONFDIR/plugins/$LINK/scripts/muggle_getlyrics
   chmod 0755 $VDRCONFDIR/plugins/$LINK/scripts/*.py
-
+  
   # scripts
   if [ -f $DIR/muggle-image-convert ]; then
     cp -f $DIR/muggle-image-convert $VDRBINDIR
@@ -72,7 +78,7 @@ function install_plugin() {
 }
 
 # plugin commands
-if [ $# \> 0 ]; then
+  if [ $# \> 0 ]; then
   cmd=$1
   cmd_plugin
 else
diff --git a/plugins/muggle/plugin.sh.orig b/plugins/muggle/plugin.sh.orig
new file mode 100755
index 0000000..65a4eb5
--- /dev/null
+++ b/plugins/muggle/plugin.sh.orig
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+# x-vdr (Installations-Skript fuer einen VDR mit Debian als Basis)
+# von Marc Wernecke - www.zulu-entertainment.de
+# 09.01.2009
+#
+# vdr-muggle
+
+# defaults
+source ./../../x-vdr.conf
+source ./../../setup.conf
+source ./../../functions
+
+WEB="http://projects.vdr-developer.org/attachments/download/53/vdr-muggle-0.2.3.tgz"
+VERSION="muggle-0.2.3"
+LINK="muggle"
+
+VAR=`basename $WEB`
+DIR=`pwd`
+
+# plugin entfernen
+function clean_plugin() {
+  cd $SOURCEDIR/VDR/PLUGINS/src
+  rm -rf $LINK*
+  rm -f $VDRLIBDIR/libvdr-$LINK*
+  rm -f $VDRBINDIR/image_convert.sh
+  log "cleaning $LINK"
+}
+
+# plugin installieren
+function install_plugin() {
+  download_plugin
+  extract_plugin
+  cd $SOURCEDIR/VDR/PLUGINS/src
+  rm -f $LINK
+  ln -vfs $VERSION $LINK
+  patch_plugin
+
+  ## plugin specials - start ##
+#  apt_install "sqlite3 libsqlite3-dev"
+  # oder Patch entfernen und...
+  apt_install "libmysqlclient15-dev mysql-server mysql-client"
+
+  apt_install "libmad0-dev libtag1-dev libvorbis-dev"
+  apt_install "libwrap0-dev"
+  # Googlyric2 Beta 3 und Python
+  apt_intall "python"
+  if [ -f /usr/share/apps/amarok/scripts/Googlyrics2.Beta3.amarokscript.tar.gz ]; then
+    echo "Googlyrics vorhanden"
+  else 
+    cd /usr/share/apps
+    mkdir amarok
+    mkdir amarok/scripts
+    cd /usr/share/apps/amarok/scripts/
+    wget http://quicode.com/Googlyrics2.Beta3.amarokscript.tar.gz
+    tar -xzf Googlyrics2.Beta3.amarokscript.tar.gz
+  fi  
+  mkdir $VDRCONFDIR/plugins/$LINK
+  mkdir $VDRCONFDIR/plugins/$LINK/scripts
+  cp -f $SOURCEDIR/VDR/PLUGINS/src/$LINK/scripts/* $VDRCONFDIR/plugins/$LINK/scripts
+  chmod 0755 $VDRCONFDIR/plugins/$LINK/scripts/muggle_getlyrics
+  chmod 0755 $VDRCONFDIR/plugins/$LINK/scripts/*.py
+  
+  # scripts
+  if [ -f $DIR/muggle-image-convert ]; then
+    cp -f $DIR/muggle-image-convert $VDRBINDIR
+  else
+    cp -f $SOURCEDIR/VDR/PLUGINS/src/$LINK/scripts/muggle-image-convert $VDRBINDIR
+  fi
+  chmod 0755 $VDRBINDIR/muggle-image-convert
+  ## plugin specials - ende ##
+}
+
+# plugin commands
+  if [ $# \> 0 ]; then
+  cmd=$1
+  cmd_plugin
+else
+  install_plugin
+  log "install-plugin fuer $VERSION ist fertig"
+fi
+
+exit 0
diff --git a/plugins/muggle/plugin.sh.rej b/plugins/muggle/plugin.sh.rej
new file mode 100755
index 0000000..9f6ca03
--- /dev/null
+++ b/plugins/muggle/plugin.sh.rej
@@ -0,0 +1,32 @@
+***************
+*** 43,65 ****
+  
+    apt_install "libmad0-dev libtag1-dev libvorbis-dev"
+    apt_install "libwrap0-dev"
+-   # Googlyric2 Beta 3 und Python
+-   apt_install "python"
+-   if [ -f /usr/share/apps/amarok/scripts/Googlyrics2.Beta3.amarokscript.tar.gz ]; then
+-     echo "Googlyrics vorhanden"
+-   else 
+-     cd /usr/share/apps
+-     mkdir amarok
+-     mkdir amarok/scripts
+-     cd /usr/share/apps/amarok/scripts/
+-     wget http://quicode.com/Googlyrics2.Beta3.amarokscript.tar.gz
+-     tar -xzf Googlyrics2.Beta3.amarokscript.tar.gz
+-   fi  
+-   mkdir $VDRCONFDIR/plugins/$LINK
+-   mkdir $VDRCONFDIR/plugins/$LINK/scripts
+-   cp -f $SOURCEDIR/VDR/PLUGINS/src/$LINK/scripts/* $VDRCONFDIR/plugins/$LINK/scripts
+-   chmod 0755 $VDRCONFDIR/plugins/$LINK/scripts/muggle_getlyrics
+-   chmod 0755 $VDRCONFDIR/plugins/$LINK/scripts/*.py
+  
+    # scripts
+    if [ -f $DIR/muggle-image-convert ]; then
+--- 43,48 ----
+  
+    apt_install "libmad0-dev libtag1-dev libvorbis-dev"
+    apt_install "libwrap0-dev"
+  
+    # scripts
+    if [ -f $DIR/muggle-image-convert ]; then