Merge branch 'monkeyman'

10 files changed, 19 insertions, 20 deletions

diff --git a/xbmc/FileSystem/udf25.cpp b/xbmc/FileSystem/udf25.cpp
index 64e0d8de5e..ff47d4bdd5 100644
--- a/xbmc/FileSystem/udf25.cpp
+++ b/xbmc/FileSystem/udf25.cpp
@@ -1312,7 +1312,7 @@ int64_t udf25::Seek(HANDLE hFile, int64_t lOffset, int whence)
     break;
   }
 
-  if (bdfile->seek_pos > bdfile->filesize || bdfile->seek_pos < 0)
+  if (bdfile->seek_pos > bdfile->filesize)
   {
     bdfile->seek_pos = seek_pos;
     return bdfile->seek_pos;
diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp
index 182c1df1ac..2cec15dc5f 100644
--- a/xbmc/addons/Addon.cpp
+++ b/xbmc/addons/Addon.cpp
@@ -172,7 +172,7 @@ const CStdString TranslateType(const ADDON::TYPE &type, bool pretty/*=false*/)
   return "";
 }
 
-const TYPE TranslateType(const CStdString &string)
+TYPE TranslateType(const CStdString &string)
 {
   for (unsigned int index=0; index < sizeof(types)/sizeof(types[0]); ++index)
   {
diff --git a/xbmc/addons/Addon.h b/xbmc/addons/Addon.h
index 9767253553..0a04eeda58 100644
--- a/xbmc/addons/Addon.h
+++ b/xbmc/addons/Addon.h
@@ -41,7 +41,7 @@ namespace ADDON
 // utils
 const CStdString    TranslateType(const TYPE &type, bool pretty=false);
 const CStdString    GetIcon(const TYPE &type);
-const TYPE          TranslateType(const CStdString &string);
+      TYPE          TranslateType(const CStdString &string);
 const CStdString    UpdateVideoScraper(const CStdString &scraper);
 const CStdString    UpdateMusicScraper(const CStdString &scraper);
 
@@ -147,7 +147,7 @@ public:
   virtual CStdString GetString(uint32_t id);
 
   // properties
-  const TYPE Type() const { return m_props.type; }
+  TYPE Type() const { return m_props.type; }
   bool IsType(TYPE type) const { return type == m_props.type; }
   AddonProps Props() const { return m_props; }
   AddonProps& Props() { return m_props; }
@@ -165,7 +165,7 @@ public:
   const CStdString ChangeLog() const { return m_props.changelog; }
   const CStdString FanArt() const { return m_props.fanart; }
   const CStdString Icon() const;
-  const int Stars() const { return m_props.stars; }
+  int Stars() const { return m_props.stars; }
   const CStdString Disclaimer() const { return m_props.disclaimer; }
   const InfoMap &ExtraInfo() const { return m_props.extrainfo; }
   ADDONDEPS GetDeps();
diff --git a/xbmc/addons/IAddon.h b/xbmc/addons/IAddon.h
index 9ad6317943..5031a82a29 100644
--- a/xbmc/addons/IAddon.h
+++ b/xbmc/addons/IAddon.h
@@ -78,7 +78,7 @@ namespace ADDON
   public:
     virtual ~IAddon() {};
     virtual AddonPtr Clone(const AddonPtr& self) const =0;
-    virtual const TYPE Type() const =0;
+    virtual TYPE Type() const =0;
     virtual bool IsType(TYPE type) const =0;
     virtual AddonProps Props() const =0;
     virtual AddonProps& Props() =0;
@@ -96,7 +96,7 @@ namespace ADDON
     virtual const CStdString FanArt() const =0;
     virtual const CStdString Author() const =0;
     virtual const CStdString Icon() const =0;
-    virtual const int  Stars() const =0;
+    virtual int  Stars() const =0;
     virtual const CStdString Disclaimer() const =0;
     virtual const InfoMap &ExtraInfo() const =0;
     virtual bool HasSettings() =0;
diff --git a/xbmc/addons/Scraper.cpp b/xbmc/addons/Scraper.cpp
index bbba0350fe..4a60931399 100644
--- a/xbmc/addons/Scraper.cpp
+++ b/xbmc/addons/Scraper.cpp
@@ -72,7 +72,7 @@ const CStdString TranslateContent(const CONTENT_TYPE &type, bool pretty/*=false*
   return "";
 }
 
-const CONTENT_TYPE TranslateContent(const CStdString &string)
+CONTENT_TYPE TranslateContent(const CStdString &string)
 {
   for (unsigned int index=0; index < sizeof(content)/sizeof(content[0]); ++index)
   {
@@ -83,7 +83,7 @@ const CONTENT_TYPE TranslateContent(const CStdString &string)
   return CONTENT_NONE;
 }
 
-const TYPE ScraperTypeFromContent(const CONTENT_TYPE &content)
+TYPE ScraperTypeFromContent(const CONTENT_TYPE &content)
 {
   switch (content)
   {
diff --git a/xbmc/addons/Scraper.h b/xbmc/addons/Scraper.h
index e8b063677b..734149b05e 100644
--- a/xbmc/addons/Scraper.h
+++ b/xbmc/addons/Scraper.h
@@ -40,8 +40,8 @@ namespace ADDON
   typedef boost::shared_ptr<CScraper> ScraperPtr;
 
   const CStdString   TranslateContent(const CONTENT_TYPE &content, bool pretty=false);
-  const CONTENT_TYPE TranslateContent(const CStdString &string);
-  const TYPE         ScraperTypeFromContent(const CONTENT_TYPE &content);
+        CONTENT_TYPE TranslateContent(const CStdString &string);
+        TYPE         ScraperTypeFromContent(const CONTENT_TYPE &content);
 
   class CScraper : public CAddon
   {
diff --git a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
index c692832e42..54d70ec644 100644
--- a/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
+++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
@@ -489,7 +489,6 @@ extern "C"
       EmuFileObject* object = g_emuFileWrapper.RegisterFileObject(pFile);
       if (object == NULL)
       {
-        VERIFY(0);
         pFile->Close();
         delete pFile;
         return -1;
diff --git a/xbmc/karaoke/karaokelyricscdg.cpp b/xbmc/karaoke/karaokelyricscdg.cpp
index c8eb59b6b2..724a87d4e5 100644
--- a/xbmc/karaoke/karaokelyricscdg.cpp
+++ b/xbmc/karaoke/karaokelyricscdg.cpp
@@ -388,8 +388,8 @@ void CKaraokeLyricsCDG::cmdScroll( const char * data, bool copy )
     unsigned char temp[CDG_FULL_HEIGHT][CDG_FULL_WIDTH];
     int vInc = vScrollPixels + CDG_FULL_HEIGHT;
     int hInc = hScrollPixels + CDG_FULL_WIDTH;
-    int ri; // row index
-    int ci; // column index
+    unsigned int ri; // row index
+    unsigned int ci; // column index
 
     for (ri = 0; ri < CDG_FULL_HEIGHT; ++ri) 
     {
@@ -408,7 +408,7 @@ void CKaraokeLyricsCDG::cmdScroll( const char * data, bool copy )
         {
             for (ci = 0; ci < CDG_FULL_WIDTH; ++ci) 
             {
-                for (ri = 0; ri < vScrollPixels; ++ri) {
+                for (ri = 0; ri < (unsigned int)vScrollPixels; ++ri) {
                     temp[ri][ci] = colour;
                 }
             }
@@ -425,7 +425,7 @@ void CKaraokeLyricsCDG::cmdScroll( const char * data, bool copy )
         
         if (hScrollPixels > 0) 
         {
-            for (ci = 0; ci < hScrollPixels; ++ci) 
+            for (ci = 0; ci < (unsigned int)hScrollPixels; ++ci) 
             {
                 for (ri = 0; ri < CDG_FULL_HEIGHT; ++ri) {
                     temp[ri][ci] = colour;
diff --git a/xbmc/lib/libPython/XBPyThread.cpp b/xbmc/lib/libPython/XBPyThread.cpp
index 23fc7fe660..a267b6f8f7 100644
--- a/xbmc/lib/libPython/XBPyThread.cpp
+++ b/xbmc/lib/libPython/XBPyThread.cpp
@@ -337,7 +337,7 @@ void XBPyThread::Process()
     Py_XDECREF(pystring);
   }
 
-  PyObject *m = PyImport_AddModule("xbmc");
+  PyObject *m = PyImport_AddModule((char*)"xbmc");
   if(!m || PyObject_SetAttrString(m, (char*)"abortRequested", PyBool_FromLong(1)))
     CLog::Log(LOGERROR, "Scriptresult: failed to set abortRequested");
 
@@ -415,7 +415,7 @@ void XBPyThread::stop()
     PyThreadState* old = PyThreadState_Swap(m_threadState);
 
     PyObject *m;
-    m = PyImport_AddModule("xbmc");
+    m = PyImport_AddModule((char*)"xbmc");
     if(!m || PyObject_SetAttrString(m, (char*)"abortRequested", PyBool_FromLong(1)))
       CLog::Log(LOGERROR, "XBPyThread::stop - failed to set abortRequested");
 
diff --git a/xbmc/utils/PCMRemap.cpp b/xbmc/utils/PCMRemap.cpp
index e0de92fa91..fc39c4f5ff 100644
--- a/xbmc/utils/PCMRemap.cpp
+++ b/xbmc/utils/PCMRemap.cpp
@@ -164,10 +164,10 @@ static struct PCMMapInfo PCMDownmixTable[PCM_MAX_CH][PCM_MAX_MIX] =
 CPCMRemap::CPCMRemap() :
   m_inSet       (false),
   m_outSet      (false),
-  m_ignoreLayout(false),
   m_inChannels  (0),
   m_outChannels (0),
-  m_inSampleSize(0)
+  m_inSampleSize(0),
+  m_ignoreLayout(false)
 {
   Dispose();
 }