diff options
| author | LarsAC <LarsAC@e10066b5-e1e2-0310-b819-94efdf66514b> | 2005-01-23 19:51:57 +0000 |
|---|---|---|
| committer | LarsAC <LarsAC@e10066b5-e1e2-0310-b819-94efdf66514b> | 2005-01-23 19:51:57 +0000 |
| commit | eac0a186e08b2b09a0d2c852f93691f2ed867784 (patch) | |
| tree | c44395436db633a8d65e111b2ecc89ad0b7a325f /muggle-plugin | |
| parent | 006082d467772ad8b1ca3b9f763a205db3f5e067 (diff) | |
| download | vdr-plugin-muggle-eac0a186e08b2b09a0d2c852f93691f2ed867784.tar.gz vdr-plugin-muggle-eac0a186e08b2b09a0d2c852f93691f2ed867784.tar.bz2 | |
Minor bugfixes
git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk@394 e10066b5-e1e2-0310-b819-94efdf66514b
Diffstat (limited to 'muggle-plugin')
| -rw-r--r-- | muggle-plugin/Makefile | 6 | ||||
| -rw-r--r-- | muggle-plugin/README | 2 | ||||
| -rw-r--r-- | muggle-plugin/vdr_setup.c | 13 |
3 files changed, 19 insertions, 2 deletions
diff --git a/muggle-plugin/Makefile b/muggle-plugin/Makefile index 9213ab8..3e962b6 100644 --- a/muggle-plugin/Makefile +++ b/muggle-plugin/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/muggle-plugin/README b/muggle-plugin/README index ff5e903..ed769c0 100644 --- a/muggle-plugin/README +++ b/muggle-plugin/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/muggle-plugin/vdr_setup.c b/muggle-plugin/vdr_setup.c index 8e281cd..2239191 100644 --- a/muggle-plugin/vdr_setup.c +++ b/muggle-plugin/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 = ""; |