diff -Nru music-0.4.0-b3/commands.c music-0.4.0-b3-Fix/commands.c --- music-0.4.0-b3/commands.c 2008-05-06 22:14:00.000000000 +0200 +++ music-0.4.0-b3-Fix/commands.c 2008-09-07 20:27:30.000000000 +0200 @@ -1114,18 +1114,17 @@ } // ------------------ STARTRECORD -----------------------// + void cMP3Commands::StartRecord(void) { - FILE *recordcmd; char *buffer; std::string lingual; d(printf("music: command: Started Recording\n")); asprintf(&buffer, "streamripper %s -d '%s' -w %s/%s/data/parse_rules.txt %s &", urlname, MP3Setup.RecordDir, config, langdir, MP3Setup.RecordOpts); - recordcmd = popen(buffer, "r"); + SystemExec(buffer); d(printf("music: command: Executed '%s'\n", buffer)); - pclose(recordcmd); - + free(buffer); MP3Setup.RecordStream = 1; } diff -Nru music-0.4.0-b3/config.c music-0.4.0-b3-Fix/config.c --- music-0.4.0-b3/config.c 2008-05-07 00:34:00.000000000 +0200 +++ music-0.4.0-b3-Fix/config.c 2008-09-07 20:26:21.000000000 +0200 @@ -4,6 +4,7 @@ * */ +#include #include #include "config.h" @@ -153,7 +154,7 @@ const cFont *cMusicConfig::GetFont(int id, const cFont *pFontCur) { const cFont *res = NULL; - if(::Setup.UseSmallFont == 1) { + if((::Setup.UseSmallFont == 1)||(::Setup.UseSmallFont == 2)) { if (allFonts[id].VdrId == FONT_TRUETYPE) { if(pFontCur) return pFontCur; diff -Nru music-0.4.0-b3/icons.c music-0.4.0-b3-Fix/icons.c --- music-0.4.0-b3/icons.c 2008-05-06 14:18:00.000000000 +0200 +++ music-0.4.0-b3-Fix/icons.c 2008-09-07 20:24:14.000000000 +0200 @@ -1,3 +1,4 @@ +#include #include #include #include "icons.h" diff -Nru music-0.4.0-b3/imagecache.h music-0.4.0-b3-Fix/imagecache.h --- music-0.4.0-b3/imagecache.h 2008-02-20 15:05:00.000000000 +0100 +++ music-0.4.0-b3-Fix/imagecache.h 2008-09-07 20:24:14.000000000 +0200 @@ -19,21 +19,21 @@ item_map mItems; usage_list mUsage; - uint mMaxItems; + unsigned mMaxItems; protected: virtual void DeleteObject(const key_type &Key, data_type &Data) = 0; virtual void ResetObject(data_type &Data) = 0; public: - cxCache(uint MaxItems); + cxCache(unsigned MaxItems); virtual ~cxCache(); void Reset(void); void Flush(void); bool Contains(const key_type &Key); data_type &operator[](const key_type &Key); - uint Count(void) { return mUsage.size(); } + unsigned Count(void) { return mUsage.size(); } }; template @@ -43,7 +43,7 @@ } template -cxCache::cxCache(uint MaxItems) +cxCache::cxCache(unsigned MaxItems) { mMaxItems = MaxItems; } diff -Nru music-0.4.0-b3/Makefile music-0.4.0-b3-Fix/Makefile --- music-0.4.0-b3/Makefile 2008-05-31 00:53:40.000000000 +0200 +++ music-0.4.0-b3-Fix/Makefile 2008-09-07 20:24:14.000000000 +0200 @@ -9,7 +9,6 @@ # Default Imlib2, otherwise uncomment, !! GraphTFT user should uncomment this !! HAVE_MAGICK=1 -MAGICKDIR=/usr/include/ImageMagick # Uncomment if you have a modded FF-Card or softdecoder #HAVE_OSDMOD=1 @@ -131,7 +130,7 @@ #endif ifdef HAVE_MAGICK - INCLUDES += -I$(MAGICKDIR) + INCLUDES += $(shell Magick++-config --cflags) LIBS += $(shell Magick++-config --libs) DEFINES += -DHAVE_MAGICK else