diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | bitmap.c | 2 | ||||
| -rw-r--r-- | bitmap.h | 2 | ||||
| -rw-r--r-- | imagecache.h | 8 | ||||
| -rw-r--r-- | mg_selection.c | 1 |
5 files changed, 10 insertions, 7 deletions
@@ -202,13 +202,15 @@ i18n: $(I18Nmsgs) $(I18Npot) libvdr-$(PLUGIN).so: $(OBJS) $(MOBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) $(MOBJS) $(PLAYLIBS) $(MLIBS) $(SQLLIBS) -o $@ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) + chmod 644 $(LIBDIR)/$@.$(APIVERSION) mugglei: mg_tools.o mugglei.o $(DB_OBJ) mg_listitem.o mg_item.o mg_item_gd.o mg_valmap.o mg_setup.o $(CXX) $(CXXFLAGS) $^ $(MILIBS) $(SQLLIBS) -o $@ install: all @cp --remove-destination $(LIBDIR)/libvdr-muggle*.so.* \ - $(DESTDIR)/usr/lib/vdr/ + $(DESTDIR)$(PLUGINLIBDIR) + @chmod 644 $(DESTDIR)$(PLUGINLIBDIR)/libvdr-muggle*.so* @cp mugglei $(DESTDIR)$(BINDIR)/ @cp scripts/muggle-image-convert $(DESTDIR)$(BINDIR)/ @@ -103,7 +103,7 @@ cBitmap &cMP3Bitmap::Get(void) { upd = mDelay - diff; } - if (UpdateIn == 0 || UpdateIn > (uint)upd) + if (UpdateIn == 0 || UpdateIn > (unsigned int)upd) UpdateIn = upd; */ mCurrent = (mCurrent + 1) % mBitmaps.size(); @@ -58,7 +58,7 @@ class cBitmapCache: public cxCache<tBitmapSpec,cMP3Bitmap*> virtual void ResetObject(cMP3Bitmap *&Data); public: - cBitmapCache(uint MaxItems): cxCache<tBitmapSpec,cMP3Bitmap*>(MaxItems) {} + cBitmapCache(unsigned int MaxItems): cxCache<tBitmapSpec,cMP3Bitmap*>(MaxItems) {} virtual ~cBitmapCache() { Flush(); } }; diff --git a/imagecache.h b/imagecache.h index baeb3d0..4735061 100644 --- a/imagecache.h +++ b/imagecache.h @@ -19,21 +19,21 @@ private: item_map mItems; usage_list mUsage; - uint mMaxItems; + unsigned int 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 int 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 int Count(void) { return mUsage.size(); } }; template<class key_type, class data_type> @@ -43,7 +43,7 @@ inline bool cxCache<key_type, data_type>::Contains(const key_type &Key) } template<class key_type, class data_type> -cxCache<key_type, data_type>::cxCache(uint MaxItems) +cxCache<key_type, data_type>::cxCache(unsigned int MaxItems) { mMaxItems = MaxItems; } diff --git a/mg_selection.c b/mg_selection.c index dd729ee..ffaee1c 100644 --- a/mg_selection.c +++ b/mg_selection.c @@ -14,6 +14,7 @@ #include <sys/time.h> #include <sys/stat.h> #include <stdio.h> +#include <libintl.h> #include <assert.h> #include <cstring> |