Minor bugfixes

git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@394 e10066b5-e1e2-0310-b819-94efdf66514b

3 files changed, 19 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 9213ab8..3e962b6 100644
--- a/Makefile
+++ b/Makefile
@@ -44,16 +44,17 @@ PACKAGE = vdr-$(ARCHIVE)
 INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include -I$(DVBDIR)/include \
 	-I/usr/include/mysql/ -I/usr/include/taglib
 
-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DHAVE_VORBISFILE -DHAVE_FLAC
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' # -DHAVE_VORBISFILE -DHAVE_FLAC
 
 MIFLAGS += -I/usr/include/taglib -lmysqlclient
+
 ### The object files (add further files here):
 
 OBJS = $(PLUGIN).o i18n.o mg_valmap.o mg_order.o mg_db.o mg_actions.o vdr_menu.o mg_tools.o \
 	vdr_decoder_mp3.o vdr_stream.o vdr_decoder.o vdr_player.o \
 	vdr_setup.o vdr_decoder_ogg.o vdr_decoder_flac.o
 
-LIBS = -lmad -lmysqlclient -lvorbisfile -lvorbis -lFLAC++
+LIBS = -lmad -lmysqlclient # -lvorbisfile -lvorbis -lFLAC++
 MILIBS = -lmysqlclient -ltag
 
 ### Targets:
@@ -80,6 +81,7 @@ libvdr-$(PLUGIN).so: $(OBJS)
 
 mugglei: mg_tools.o mugglei.o
 	$(CXX) $(CXXFLAGS) $^ $(MILIBS) -o $@
+
 install:
 	@cp ../../lib/libvdr-muggle*.so.* /usr/lib/vdr/
 	@cp mugglei /usr/local/bin/
diff --git a/README b/README
index ff5e903..ed769c0 100644
--- a/README
+++ b/README
@@ -73,6 +73,8 @@ Establish a symlink as you would for other plugins:
    ln -s muggle-0.1.1 muggle
 \endverbatim
 
+Adapt the Makefile to your system. Define HAVE_VORBIS and/or HAVE_FLAC and adapt the LIBS variable accordingly.
+
 Within the VDR main directory (e.g. /usr/local/src/VDR) issue
 
 \verbatim
diff --git a/vdr_setup.c b/vdr_setup.c
index 8e281cd..2239191 100644
--- a/vdr_setup.c
+++ b/vdr_setup.c
@@ -25,6 +25,7 @@
 mgSetup the_setup;
 
 std::string GdFindFile( std::string mp3file, std::string ToplevelDir );
+char *readline(FILE *f);
 
 // --- mgMenuSetup -----------------------------------------------------------
 
@@ -107,6 +108,18 @@ mgSetup::getFilename( std::string basename )
 
 #define FINDCMD      "cd '%s' && find -follow -name '%s' 2> /dev/null"
 
+char *readline(FILE *f)
+{
+  static char buffer[MAXPARSEBUFFER];
+  if (fgets(buffer, sizeof(buffer), f) > 0) {
+     int l = strlen(buffer) - 1;
+     if (l >= 0 && buffer[l] == '\n')
+        buffer[l] = 0;
+     return buffer;
+     }
+  return NULL;
+}
+
 std::string GdFindFile( std::string mp3file, std::string tld )
 {
   std::string fullname = "";