XBMC Media Center

Revision: 14227
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14227&view=rev
Author:   jmarshallnz
Date:     2008-07-18 23:17:17 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
fixed: Crash looking up fanart on root videodb folders.  Plus don't bother looking it up if we already have it.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileItem.cpp
    branches/linuxport/XBMC/xbmc/ThumbLoader.cpp

Modified: branches/linuxport/XBMC/xbmc/FileItem.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-07-18 21:41:39 UTC (rev 14226)
+++ branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-07-18 23:17:17 UTC (rev 14227)
@@ -2399,6 +2399,8 @@
 {
   if (IsVideoDb())
   {
+    if (!HasVideoInfoTag())
+      return; // nothing can be done
     CFileItem dbItem(m_bIsFolder ? GetVideoInfoTag()->m_strPath : GetVideoInfoTag()->m_strFileNameAndPath, m_bIsFolder);
     return dbItem.CacheVideoFanart();
   }
@@ -2445,7 +2447,11 @@
 {
   // get the locally cached thumb
   if (IsVideoDb())
+  {
+    if (!HasVideoInfoTag())
+      return "";
     return CFileItem::GetCachedVideoFanart(m_bIsFolder ? GetVideoInfoTag()->m_strPath : GetVideoInfoTag()->m_strFileNameAndPath);
+  }
   return CFileItem::GetCachedVideoFanart(m_strPath);
 }
 

Modified: branches/linuxport/XBMC/xbmc/ThumbLoader.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/ThumbLoader.cpp	2008-07-18 21:41:39 UTC (rev 14226)
+++ branches/linuxport/XBMC/xbmc/ThumbLoader.cpp	2008-07-18 23:17:17 UTC (rev 14227)
@@ -151,7 +151,7 @@
     }  
   }
 
-  if (!pItem->m_bIsFolder)
+  if (!pItem->HasProperty("fanart_image"))
   {
     pItem->CacheVideoFanart();
     if (CFile::Exists(pItem->GetCachedVideoFanart()))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14255
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14255&view=rev
Author:   elupus
Date:     2008-07-19 13:18:02 +0000 (Sat, 19 Jul 2008)

Log Message:
-----------
changed: removed unneccery code for directory mounting. if this causes 
issues for osx, let me know

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/Application.h

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-07-19 12:50:38 UTC (rev 14254)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-07-19 13:18:02 UTC (rev 14255)
@@ -324,17 +324,12 @@
 
   m_bPresentFrame = false;
   m_bPlatformDirectories = false;
-
-  m_logPath = NULL;
 }
 
 CApplication::~CApplication(void)
 {
   delete m_currentStack;
 
-  if (m_logPath)
-    delete[] m_logPath;
-
   if (m_frameMutex)
     SDL_DestroyMutex(m_frameMutex);
 
@@ -519,35 +514,10 @@
 #ifndef HAS_SDL
   HRESULT hr = S_OK;
 #endif
-  // map Q to home drive of xbe to load the config file
-  static CStdString strExecutablePath;
-  CUtil::GetHomePath(strExecutablePath);
 
-  // Check logpath...needs to be done before the first log to be meaningful.
-#ifdef _LINUX
-  if (m_bPlatformDirectories)
-  {
-    CStdString logDir = "/var/tmp/";
-    if (getenv("USER"))
-    {
-      logDir += getenv("USER");
-      logDir += "-";
-    }
-    g_stSettings.m_logFolder = logDir;
-  }
-  else
-  {
-    m_logPath = new char[MAX_PATH];
-    snprintf(m_logPath, MAX_PATH, "%s/", strExecutablePath.c_str());
-    g_stSettings.m_logFolder = m_logPath;
-  }
-#endif
-
   // Grab a handle to our thread to be used later in identifying the render thread.
   m_threadID = GetCurrentThreadId();
 
-  init_emu_environ();
-
 #ifndef _LINUX
   //floating point precision to 24 bits (faster performance)
   _controlfp(_PC_24, _MCW_PC);
@@ -558,8 +528,6 @@
   win32_exception::install_handler();
 #endif
 
-  CStdString strLogFile, strLogFileOld;
-
   CProfile *profile;
 
   // only the InitDirectories* for the current platform should return
@@ -579,9 +547,6 @@
     g_settings.m_vecProfiles.push_back(*profile);
     delete profile;
   }
-#ifndef _WIN32PC
-  InitDirectories();
-#endif
 
   CLog::Log(LOGNOTICE, "-----------------------------------------------------------------------");
 #if defined(_LINUX) && !defined(__APPLE__)
@@ -591,13 +556,16 @@
 #elif defined(_WIN32)
   CLog::Log(LOGNOTICE, "Starting XBMC, Platform: %s.  Built on %s (compiler %i)",g_sysinfo.GetKernelVersion().c_str(), __DATE__, _MSC_VER);
 #endif
-  CLog::Log(LOGNOTICE, "Q is mapped to: %s", strExecutablePath.c_str());
+  CLog::Log(LOGNOTICE, "Q is mapped to: %s", _P("Q:").c_str());
   char szXBEFileName[1024];
   CIoSupport::GetXbePath(szXBEFileName);
   CLog::Log(LOGNOTICE, "The executeable running is: %s", szXBEFileName);
-  CLog::Log(LOGNOTICE, "Log File is located: %s", strLogFile.c_str());
+  CLog::Log(LOGNOTICE, "Log File is located: %s", g_stSettings.m_logFolder.c_str());
   CLog::Log(LOGNOTICE, "-----------------------------------------------------------------------");
 
+  CStdString strExecutablePath;
+  CUtil::GetHomePath(strExecutablePath);
+
   // if we are running from DVD our UserData location will be TDATA
   if (CUtil::IsDVD(strExecutablePath))
   {
@@ -617,6 +585,10 @@
   g_xrandr.LoadCustomModeLinesToAllOutputs();
 #endif
 
+  // Init our DllLoaders emu env
+  init_emu_environ();
+
+
 #ifndef HAS_SDL
   CLog::Log(LOGNOTICE, "Setup DirectX");
   // Create the Direct3D object
@@ -925,20 +897,6 @@
   return CXBApplicationEx::Create(hWnd);
 }
 
-void CApplication::InitDirectories()
-{
-  if (m_bPlatformDirectories)
-    return;
-
-  CStdString strMnt = g_settings.GetUserDataFolder();
-  if (g_settings.GetUserDataFolder().Left(2).Equals("Q:"))
-  {
-    CUtil::GetHomePath(strMnt);
-    strMnt += g_settings.GetUserDataFolder().substr(2);
-  }
-  CIoSupport::RemapDriveLetter('T',(char*) strMnt.c_str());
-}
-
 CProfile* CApplication::InitDirectoriesLinux()
 {
 /*
@@ -982,6 +940,23 @@
 
   if (m_bPlatformDirectories)
   {
+    CStdString logDir = "/var/tmp/";
+    if (getenv("USER"))
+    {
+      logDir += getenv("USER");
+      logDir += "-";
+    }
+    g_stSettings.m_logFolder = logDir;
+  }
+  else
+  {
+    CStdString logDir = strExecutablePath;
+    CUtil::AddDirectorySeperator(logDir);
+    g_stSettings.m_logFolder = logDir;
+  }
+
+  if (m_bPlatformDirectories)
+  {
     CStdString str = INSTALL_PATH;
     CIoSupport::RemapDriveLetter('Q', (char*) str.c_str());
 
@@ -1113,6 +1088,7 @@
   }
   else
   {
+    CIoSupport::RemapDriveLetter('T', _P("Q:\\userdata").c_str());
     if (g_settings.m_vecProfiles.size()==0)
     {
       profile = new CProfile;

Modified: branches/linuxport/XBMC/xbmc/Application.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.h	2008-07-19 12:50:38 UTC (rev 14254)
+++ branches/linuxport/XBMC/xbmc/Application.h	2008-07-19 13:18:02 UTC (rev 14255)
@@ -262,8 +262,6 @@
 
   bool m_bPresentFrame;
 
-  char* m_logPath;
-
 #ifdef HAS_SDL
   int        m_frameCount;
   SDL_mutex* m_frameMutex;
@@ -295,7 +293,6 @@
 
   void SaveCurrentFileSettings();
 
-  void InitDirectories();
   CProfile* InitDirectoriesLinux();
   CProfile* InitDirectoriesOSX();
   CProfile* InitDirectoriesWin32();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14281
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14281&view=rev
Author:   yuvalt
Date:     2008-07-20 12:49:43 +0000 (Sun, 20 Jul 2008)

Log Message:
-----------
fix: remove HAS_MMS. MMS now works. finally.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileItem.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/FileFactory.cpp
    branches/linuxport/XBMC/xbmc/cores/PlayerCoreFactory.cpp

Modified: branches/linuxport/XBMC/xbmc/FileItem.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-07-20 09:09:31 UTC (rev 14280)
+++ branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-07-20 12:49:43 UTC (rev 14281)
@@ -1032,13 +1032,6 @@
       m_ref.Trim();
     }
 
-#ifdef HAS_MMS
-    if (m_strPath.Left(6).Equals("mms://"))
-    {
-      m_ref = "audio/x-ms-wma";
-    }
-#endif
-
     // if it's still empty set to an unknown type
     if( m_ref.IsEmpty() )
       m_ref = "application/octet-stream";

Modified: branches/linuxport/XBMC/xbmc/FileSystem/FileFactory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/FileFactory.cpp	2008-07-20 09:09:31 UTC (rev 14280)
+++ branches/linuxport/XBMC/xbmc/FileSystem/FileFactory.cpp	2008-07-20 12:49:43 UTC (rev 14281)
@@ -48,9 +48,7 @@
 #ifdef HAS_FILESYSTEM_SAP
 #include "SAPFile.h"
 #endif
-#ifdef HAS_MMS
 #include "FileMMS.h"
-#endif
 #include "FileZip.h"
 #include "FileRar.h"
 #include "FileMusicDatabase.h"
@@ -101,11 +99,7 @@
          ||  strProtocol == "ftpx"
          ||  strProtocol == "ftps") return new CFileCurl();
     else if (strProtocol == "upnp") return new CFileCurl();
-#ifndef HAS_MMS
-    else if (strProtocol == "mms") return new CFileCurl();
-#else
     else if (strProtocol == "mms") return new CFileMMS();
-#endif
     else if (strProtocol == "shout") return new CFileShoutcast();
     else if (strProtocol == "lastfm") return new CFileLastFM();
     else if (strProtocol == "tuxbox") return new CFileTuxBox();

Modified: branches/linuxport/XBMC/xbmc/cores/PlayerCoreFactory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/PlayerCoreFactory.cpp	2008-07-20 09:09:31 UTC (rev 14280)
+++ branches/linuxport/XBMC/xbmc/cores/PlayerCoreFactory.cpp	2008-07-20 12:49:43 UTC (rev 14281)
@@ -122,12 +122,10 @@
     vecCores.push_back(EPC_PAPLAYER);
   }
    
-#ifdef HAS_MMS
   if (url.GetProtocol().Equals("mms"))
   {
     vecCores.push_back(EPC_DVDPLAYER);    
   }
-#endif
 
   // dvdplayer can play standard rtsp streams
   if (url.GetProtocol().Equals("rtsp") 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14327
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14327&view=rev
Author:   spiff_
Date:     2008-07-21 14:39:36 +0000 (Mon, 21 Jul 2008)

Log Message:
-----------
changed: rename function

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileItem.cpp
    branches/linuxport/XBMC/xbmc/FileItem.h
    branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.cpp
    branches/linuxport/XBMC/xbmc/ThumbLoader.cpp
    branches/linuxport/XBMC/xbmc/VideoDatabase.cpp
    branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp

Modified: branches/linuxport/XBMC/xbmc/FileItem.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-07-21 14:33:30 UTC (rev 14326)
+++ branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-07-21 14:39:36 UTC (rev 14327)
@@ -2388,16 +2388,16 @@
 ///
 /// If a cached fanart image already exists, then we're fine.  Otherwise, we look for a local fanart.jpg
 /// and cache that image as our fanart.
-void CFileItem::CacheVideoFanart() const
+void CFileItem::CacheFanart() const
 {
   if (IsVideoDb())
   {
     if (!HasVideoInfoTag())
       return; // nothing can be done
     CFileItem dbItem(m_bIsFolder ? GetVideoInfoTag()->m_strPath : GetVideoInfoTag()->m_strFileNameAndPath, m_bIsFolder);
-    return dbItem.CacheVideoFanart();
+    return dbItem.CacheFanart();
   }
-  CStdString cachedFanart(GetCachedVideoFanart());
+  CStdString cachedFanart(GetCachedFanart());
   // First check for an already cached fanart image
   if (CFile::Exists(cachedFanart))
     return;
@@ -2436,19 +2436,19 @@
   pic.CacheImage(localFanart, cachedFanart);
 }
 
-CStdString CFileItem::GetCachedVideoFanart() const
+CStdString CFileItem::GetCachedFanart() const
 {
   // get the locally cached thumb
   if (IsVideoDb())
   {
     if (!HasVideoInfoTag())
       return "";
-    return CFileItem::GetCachedVideoFanart(m_bIsFolder ? GetVideoInfoTag()->m_strPath : GetVideoInfoTag()->m_strFileNameAndPath);
+    return CFileItem::GetCachedFanart(m_bIsFolder ? GetVideoInfoTag()->m_strPath : GetVideoInfoTag()->m_strFileNameAndPath);
   }
-  return CFileItem::GetCachedVideoFanart(m_strPath);
+  return CFileItem::GetCachedFanart(m_strPath);
 }
 
-CStdString CFileItem::GetCachedVideoFanart(const CStdString &path)
+CStdString CFileItem::GetCachedFanart(const CStdString &path)
 {
   // get the locally cached thumb
   Crc32 crc;

Modified: branches/linuxport/XBMC/xbmc/FileItem.h
===================================================================
--- branches/linuxport/XBMC/xbmc/FileItem.h	2008-07-21 14:33:30 UTC (rev 14326)
+++ branches/linuxport/XBMC/xbmc/FileItem.h	2008-07-21 14:39:36 UTC (rev 14327)
@@ -182,12 +182,12 @@
   CStdString GetCachedProfileThumb() const;
   CStdString GetCachedSeasonThumb() const;
   CStdString GetCachedActorThumb() const;
-  CStdString GetCachedVideoFanart() const;
-  static CStdString GetCachedVideoFanart(const CStdString &path);
+  CStdString GetCachedFanart() const;
+  static CStdString GetCachedFanart(const CStdString &path);
 
   // Sets the video thumb (cached first, else caches user thumb)
   void SetVideoThumb();
-  void CacheVideoFanart() const;
+  void CacheFanart() const;
 
   // Sets the cached thumb for the item if it exists
   void SetCachedVideoThumb();

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp	2008-07-21 14:33:30 UTC (rev 14326)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp	2008-07-21 14:39:36 UTC (rev 14327)
@@ -327,9 +327,9 @@
       m_movieItem->SetProperty("watchedepisodes", m_movieItem->GetVideoInfoTag()->m_playCount);
       m_movieItem->SetProperty("unwatchedepisodes", m_movieItem->GetVideoInfoTag()->m_iEpisode - m_movieItem->GetVideoInfoTag()->m_playCount);
       m_movieItem->GetVideoInfoTag()->m_playCount = (m_movieItem->GetVideoInfoTag()->m_iEpisode == m_movieItem->GetVideoInfoTag()->m_playCount) ? 1 : 0;
-      m_movieItem->CacheVideoFanart();
-      if (CFile::Exists(m_movieItem->GetCachedVideoFanart()))
-        m_movieItem->SetProperty("fanart_image",m_movieItem->GetCachedVideoFanart());
+      m_movieItem->CacheFanart();
+      if (CFile::Exists(m_movieItem->GetCachedFanart()))
+        m_movieItem->SetProperty("fanart_image",m_movieItem->GetCachedFanart());
     }
     else if (m_movieItem->GetVideoInfoTag()->m_iSeason > -1)
     {
@@ -815,7 +815,7 @@
   // delete the thumbnail if that's what the user wants, else overwrite with the
   // new thumbnail
   CFileItem item(*m_movieItem->GetVideoInfoTag());
-  CStdString cachedThumb(item.GetCachedVideoFanart());
+  CStdString cachedThumb(item.GetCachedFanart());
 
   if (result.Mid(0,15) == "thumb://FANART_")
   {

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.cpp	2008-07-21 14:33:30 UTC (rev 14326)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.cpp	2008-07-21 14:39:36 UTC (rev 14327)
@@ -385,8 +385,8 @@
         items.SetProperty("fanart_color1", details.m_fanart.GetColor(0));
         items.SetProperty("fanart_color2", details.m_fanart.GetColor(1));
         items.SetProperty("fanart_color3", details.m_fanart.GetColor(2));
-        showItem.CacheVideoFanart();
-        CStdString fanart(showItem.GetCachedVideoFanart());
+        showItem.CacheFanart();
+        CStdString fanart(showItem.GetCachedFanart());
         if (CFile::Exists(fanart))
           items.SetProperty("fanart_image", fanart);
 

Modified: branches/linuxport/XBMC/xbmc/ThumbLoader.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/ThumbLoader.cpp	2008-07-21 14:33:30 UTC (rev 14326)
+++ branches/linuxport/XBMC/xbmc/ThumbLoader.cpp	2008-07-21 14:39:36 UTC (rev 14327)
@@ -153,9 +153,9 @@
 
   if (!pItem->HasProperty("fanart_image"))
   {
-    pItem->CacheVideoFanart();
-    if (CFile::Exists(pItem->GetCachedVideoFanart()))
-      pItem->SetProperty("fanart_image",pItem->GetCachedVideoFanart());
+    pItem->CacheFanart();
+    if (CFile::Exists(pItem->GetCachedFanart()))
+      pItem->SetProperty("fanart_image",pItem->GetCachedFanart());
   }                          
 
 //  if (pItem->IsVideo() && !pItem->IsInternetStream())

Modified: branches/linuxport/XBMC/xbmc/VideoDatabase.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoDatabase.cpp	2008-07-21 14:33:30 UTC (rev 14326)
+++ branches/linuxport/XBMC/xbmc/VideoDatabase.cpp	2008-07-21 14:39:36 UTC (rev 14327)
@@ -4094,9 +4094,9 @@
         pItem->SetProperty("unwatchedepisodes", movie.m_iEpisode - movie.m_playCount);
         pItem->GetVideoInfoTag()->m_playCount = (movie.m_iEpisode == movie.m_playCount) ? 1 : 0;
         pItem->SetOverlayImage(CGUIListItem::ICON_OVERLAY_UNWATCHED,pItem->GetVideoInfoTag()->m_playCount > 0);
-        pItem->CacheVideoFanart();
-        if (CFile::Exists(pItem->GetCachedVideoFanart()))
-          pItem->SetProperty("fanart_image",pItem->GetCachedVideoFanart());
+        pItem->CacheFanart();
+        if (CFile::Exists(pItem->GetCachedFanart()))
+          pItem->SetProperty("fanart_image",pItem->GetCachedFanart());
         items.Add(pItem);
       }
       m_pDS->next();
@@ -6144,7 +6144,7 @@
   CFileItem item(strPath,bFolder);
   XFILE::CFile::Delete(item.GetCachedVideoThumb());
   if (bFolder)
-    XFILE::CFile::Delete(item.GetCachedVideoFanart());
+    XFILE::CFile::Delete(item.GetCachedFanart());
     
   // tell our GUI to completely reload all controls (as some of them
   // are likely to have had this image in use so will need refreshing)

Modified: branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp	2008-07-21 14:33:30 UTC (rev 14326)
+++ branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp	2008-07-21 14:39:36 UTC (rev 14327)
@@ -834,12 +834,12 @@
     {
       m_database.SetDetailsForMusicVideo(pItem->m_strPath, movieDetails);
     }
-    pItem->CacheVideoFanart();
+    pItem->CacheFanart();
     // get & save fanart image
-    if (!CFile::Exists(pItem->GetCachedVideoFanart()))
+    if (!CFile::Exists(pItem->GetCachedFanart()))
     {
-      if (!movieDetails.m_fanart.m_xml.IsEmpty() && !movieDetails.m_fanart.DownloadImage(pItem->GetCachedVideoFanart()))
-        CLog::Log(LOGERROR, "Failed to download fanart %s to %s", movieDetails.m_fanart.GetImageURL().c_str(), pItem->GetCachedVideoFanart().c_str());
+      if (!movieDetails.m_fanart.m_xml.IsEmpty() && !movieDetails.m_fanart.DownloadImage(pItem->GetCachedFanart()))
+        CLog::Log(LOGERROR, "Failed to download fanart %s to %s", movieDetails.m_fanart.GetImageURL().c_str(), pItem->GetCachedFanart().c_str());
     }
 
     // get & save thumbnail


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14328
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14328&view=rev
Author:   spiff_
Date:     2008-07-21 14:44:31 +0000 (Mon, 21 Jul 2008)

Log Message:
-----------
fixed: spelling typo, existance -> existence. thanks to riquedafreak

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/MultiPathDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/VirtualPathDirectory.cpp
    branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-07-21 14:39:36 UTC (rev 14327)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-07-21 14:44:31 UTC (rev 14328)
@@ -753,7 +753,7 @@
 #endif
 
   CStdString strHomePath = "Q:";
-  CLog::Log(LOGINFO, "Checking skinpath existance, and existence of keymap.xml:%s...", (strHomePath + "\\skin").c_str());
+  CLog::Log(LOGINFO, "Checking skinpath existence, and existence of keymap.xml:%s...", (strHomePath + "\\skin").c_str());
   CStdString keymapPath;
 
   keymapPath = g_settings.GetUserDataItem("Keymap.xml");

Modified: branches/linuxport/XBMC/xbmc/FileSystem/MultiPathDirectory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/MultiPathDirectory.cpp	2008-07-21 14:39:36 UTC (rev 14327)
+++ branches/linuxport/XBMC/xbmc/FileSystem/MultiPathDirectory.cpp	2008-07-21 14:44:31 UTC (rev 14328)
@@ -116,7 +116,7 @@
 
 bool CMultiPathDirectory::Exists(const char* strPath)
 {
-  CLog::Log(LOGDEBUG,"Testing Existance (%s)", strPath);
+  CLog::Log(LOGDEBUG,"Testing Existence (%s)", strPath);
 
   vector<CStdString> vecPaths;
   if (!GetPaths(strPath, vecPaths))
@@ -124,7 +124,7 @@
 
   for (unsigned int i = 0; i < vecPaths.size(); ++i)
   {
-    CLog::Log(LOGDEBUG,"Testing Existance (%s)", vecPaths[i].c_str());
+    CLog::Log(LOGDEBUG,"Testing Existence (%s)", vecPaths[i].c_str());
     if (CDirectory::Exists(vecPaths[i]))
       return true;
   }

Modified: branches/linuxport/XBMC/xbmc/FileSystem/VirtualPathDirectory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/VirtualPathDirectory.cpp	2008-07-21 14:39:36 UTC (rev 14327)
+++ branches/linuxport/XBMC/xbmc/FileSystem/VirtualPathDirectory.cpp	2008-07-21 14:44:31 UTC (rev 14328)
@@ -109,7 +109,7 @@
 
 bool CVirtualPathDirectory::Exists(const CStdString& strPath)
 {
-  CLog::Log(LOGDEBUG,"Testing Existance (%s)", strPath.c_str());
+  CLog::Log(LOGDEBUG,"Testing Existence (%s)", strPath.c_str());
   CMediaSource share;
   if (!GetMatchingSource(strPath, share))
     return false;
@@ -117,10 +117,10 @@
   unsigned int iFailures = 0;
   for (int i = 0; i < (int)share.vecPaths.size(); ++i)
   {
-    CLog::Log(LOGDEBUG,"Testing Existance (%s)", share.vecPaths[i].c_str());
+    CLog::Log(LOGDEBUG,"Testing Existence (%s)", share.vecPaths[i].c_str());
     if (!CDirectory::Exists(share.vecPaths[i]))
     {
-      CLog::Log(LOGERROR,"Error Testing Existance (%s)", share.vecPaths[i].c_str());
+      CLog::Log(LOGERROR,"Error Testing Existence (%s)", share.vecPaths[i].c_str());
       iFailures++;
     }
   }

Modified: branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp	2008-07-21 14:39:36 UTC (rev 14327)
+++ branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp	2008-07-21 14:44:31 UTC (rev 14328)
@@ -1016,7 +1016,7 @@
       else
         CUtil::ReplaceExtension(item->m_strPath, ".nfo", nfoFile);
 
-      // test file existance
+      // test file existence
       if (!nfoFile.IsEmpty() && !CFile::Exists(nfoFile))
         nfoFile.Empty();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14345
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14345&view=rev
Author:   kraqh3d
Date:     2008-07-21 23:44:02 +0000 (Mon, 21 Jul 2008)

Log Message:
-----------
fixed: the transition to PCRE added a few bugs to the video stacking; added: some simpler methods to get the captured expressions; removed: the old unsupported regexp code, so xbmc is totally reliant on PCRE.  (hopefully i didn't fsck up the linux or osx builds.)

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Util.cpp
    branches/linuxport/XBMC/xbmc/utils/RegExp.cpp
    branches/linuxport/XBMC/xbmc/utils/RegExp.h

Modified: branches/linuxport/XBMC/xbmc/Util.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Util.cpp	2008-07-21 23:27:12 UTC (rev 14344)
+++ branches/linuxport/XBMC/xbmc/Util.cpp	2008-07-21 23:44:02 UTC (rev 14345)
@@ -256,67 +256,82 @@
   CStdString strTestString;
   CRegExp reg;
 
-  //CLog::Log(LOGNOTICE, "GetVolumeFromFileName : 1 : " + strFileName);
-
+  CLog::Log(LOGDEBUG, "GetVolumeFromFileName:[%s]", strFileNameLower.c_str());
   for (unsigned int i = 0; i < regexps.size(); i++)
   {
     CStdString strRegExp = regexps[i];
     if (!reg.RegComp(strRegExp.c_str()))
     { // invalid regexp - complain in logs
-      CLog::Log(LOGERROR, "Invalid RegExp: %s.", regexps[i].c_str());
+      CLog::Log(LOGERROR, "Invalid RegExp:[%s]", regexps[i].c_str());
       continue;
     }
+    CLog::Log(LOGDEBUG, "Regexp:[%s]", regexps[i].c_str());
+
     int iFoundToken = reg.RegFind(strFileNameLower.c_str());
     if (iFoundToken >= 0)
-    { // found this token
+    {
       int iRegLength = reg.GetFindLen();
       int iCount = reg.GetSubCount();
-      //CLog::Log(LOGNOTICE, "GetVolumeFromFileName : 2 : " + strFileName + " : " + strRegExp + " : iRegLength=%i : iCount=%i", iRegLength, iCount);
-      if( 1 == iCount )
+
+      /*
+      reg.DumpOvector(LOGDEBUG);
+      CLog::Log(LOGDEBUG, "Subcount=%i", iCount);
+      for (int j = 0; j <= iCount; j++)
       {
-        char *pReplace = reg.GetReplaceString("\\1");
+        CStdString str = reg.GetMatch(j);
+        CLog::Log(LOGDEBUG, "Sub(%i):[%s]", j, str.c_str());
+      }
+      */
 
-        if (pReplace)
-        {
-          strVolumeNumber = pReplace;
-          free(pReplace);
+      // simple regexp, only the volume is captured
+      if (iCount == 1)
+      {
+        strVolumeNumber = reg.GetMatch(1);
+        if (strVolumeNumber.IsEmpty()) return false;
 
-          // remove the extension (if any).  We do this on the base filename, as the regexp
-          // match may include some of the extension (eg the "." in particular).
+        // Remove the extension (if any).  We do this on the base filename, as the regexp
+        // match may include some of the extension (eg the "." in particular).
+        // The extension will then be added back on at the end - there is no reason
+        // to clean it off here. It will be cleaned off during the display routine, if
+        // the settings to hide extensions are turned on.
+        CStdString strFileNoExt = strFileNameTemp;
+        RemoveExtension(strFileNoExt);
+        CStdString strFileExt = strFileNameTemp.Right(strFileNameTemp.length() - strFileNoExt.length());
+        CStdString strFileRight = strFileNoExt.Mid(iFoundToken + iRegLength);
+        strFileTitle = strFileName.Left(iFoundToken) + strFileRight + strFileExt;
+        
+        return true;
+      }
 
-          // the extension will then be added back on at the end - there is no reason
-          // to clean it off here. It will be cleaned off during the display routine, if
-          // the settings to hide extensions are turned on.
-          CStdString strFileNoExt = strFileNameTemp;
-          RemoveExtension(strFileNoExt);
-          CStdString strFileExt = strFileNameTemp.Right(strFileNameTemp.length() - strFileNoExt.length());
-          CStdString strFileRight = strFileNoExt.Mid(iFoundToken + iRegLength);
-          strFileTitle = strFileName.Left(iFoundToken) + strFileRight + strFileExt;
-          //CLog::Log(LOGNOTICE, "GetVolumeFromFileName : 3 : " + strFileName + " : " + strVolumeNumber + " : " + strFileTitle + " : " + strFileExt + " : " + strFileRight + " : " + strFileTitle);
-          return true;
-        }
-
-      }
-      else if( iCount > 1 )
+      // advanced regexp with prefix (1), volume (2), and suffix (3)
+      else if (iCount == 3)
       {
-        //Second Sub value contains the stacking
-        strVolumeNumber = strFileName.Mid(iFoundToken + reg.GetSubStart(2), reg.GetSubLenght(2));
+        // second subpatten contains the stacking volume
+        strVolumeNumber = reg.GetMatch(2);
+        if (strVolumeNumber.IsEmpty()) return false;
 
+        // everything before the regexp match
         strFileTitle = strFileName.Left(iFoundToken);
 
-        //First Sub value contains prefix
-        strFileTitle += strFileName.Mid(iFoundToken + reg.GetSubStart(1), reg.GetSubLenght(1));
+        // first subpattern contains prefix
+        strFileTitle += reg.GetMatch(1);
 
-        //Third Sub value contains suffix
-        strFileTitle += strFileName.Mid(iFoundToken + reg.GetSubStart(3), reg.GetSubLenght(3));
+        // third subpattern contains suffix
+        strFileTitle += reg.GetMatch(3);
+
+        // everything after the regexp match
         strFileTitle += strFileNameTemp.Mid(iFoundToken + iRegLength);
-        //CLog::Log(LOGNOTICE, "GetVolumeFromFileName : 4 : " + strFileName + " : " + strVolumeNumber + " : " + strFileTitle);
+
         return true;
       }
 
+      // unknown regexp format
+      else
+      {
+        CLog::Log(LOGERROR, "Incorrect movie stacking regexp format:[%s]", regexps[i]);
+      }
     }
   }
-  //CLog::Log(LOGNOTICE, "GetVolumeFromFileName : 5 : " + strFileName);
   return false;
 }
 

Modified: branches/linuxport/XBMC/xbmc/utils/RegExp.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/RegExp.cpp	2008-07-21 23:27:12 UTC (rev 14344)
+++ branches/linuxport/XBMC/xbmc/utils/RegExp.cpp	2008-07-21 23:44:02 UTC (rev 14345)
@@ -1,55 +1,29 @@
-////////////////////////////////////////////////////////////////////////
-// RegExp.cpp
-//
-// Changes by JM for XBMC:
-//  replaced all TCHAR with char
-//  replaced all new/delete's with malloc/free's.
-//
-// This code has been derived from work by Henry Spencer.
-// The main changes are
-// 1. All char variables and functions have been changed to char
-//    counterparts
-// 2. Added GetFindLen() & GetReplaceString() to enable search
-//    and replace operations.
-// 3. And of course, added the C++ Wrapper
-//
-// Comments from Russell Moss who posted UNICODE fixes to codeguru, herein adopted:
-// Both CRegExp::regnode and CRegExp::reginsert were leaving
-// 2 "locations" for a short.  In the case of UNICODE, a
-// char is a short so leaving room for a short is equivalent
-// to skipping only one char
-//
-//
-// The original copyright notice follows:
-//
-// Copyright (c) 1986, 1993, 1995 by University of Toronto.
-// Written by Henry Spencer.  Not derived from licensed software.
-//
-// Permission is granted to anyone to use this software for any
-// purpose on any computer system, and to redistribute it in any way,
-// subject to the following restrictions:
-//
-// 1. The author is not responsible for the consequences of use of
-// this software, no matter how awful, even if they arise
-// from defects in it.
-//
-// 2. The origin of this software must not be misrepresented, either
-// by explicit claim or by omission.
-//
-// 3. Altered versions must be plainly marked as such, and must not
-// be misrepresented (by explicit claim or omission) as being
-// the original software.
-//
-// 4. This notice must not be removed or altered.
-/////////////////////////////////////////////////////////////////////////////
+/*
+ *      Copyright (C) 2005-2008 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
 
 #include "stdafx.h"
 #include <stdlib.h>
 #include <string.h>
 #include "RegExp.h"
 
-#ifdef HAS_PCRE
-
 #if defined (_WIN32) || defined (__APPLE__)
 #include "lib/libpcre/pcre.h"
 #else
@@ -215,981 +189,31 @@
   return sReplaceStr;
 }
 
-#else // HAS_PCRE
-
-// definition number opnd? meaning
-#define END     0       // no   End of program.
-#define BOL     1       // no   Match beginning of line.
-#define EOL     2       // no   Match end of line.
-#define ANY     3       // no   Match any character.
-#define ANYOF   4       // str  Match any of these.
-#define ANYBUT  5       // str  Match any but one of these.
-#define BRANCH  6       // node Match this, or the next..\&.
-#define BACK    7       // no   "next" ptr points backward.
-#define EXACTLY 8       // str  Match this string.
-#define NOTHING 9       // no   Match empty string.
-#define STAR    10      // node Match this 0 or more times.
-#define PLUS    11      // node Match this 1 or more times.
-#define OPEN    20      // no   Sub-RE starts here.
-// OPEN+1 is number 1, etc.
-#define CLOSE  30       // no Analogous to OPEN.
-
-// Utility definitions.
-
-#define FAIL(m)   { regerror(m); return(NULL); }
-#define ISREPN(c) ((c) == '*' || (c) == '+' || (c) == '?')
-#define META      "^$.[()|?+*\\"
-
-// Flags to be passed up and down.
-
-#define HASWIDTH    01 // Known never to match null string.
-#define SIMPLE      02 // Simple enough to be STAR/PLUS operand.
-#define SPSTART     04 // Starts with * or +.
-#define WORST       0  // Worst case.
-
-int isdigit(char ch)
+CStdString CRegExp::GetMatch(int iSub /* = 0 */)
 {
-  if (ch >= '0' && ch <= '9') return 1;
-  return 0;
-}
+  if (iSub < 0 || iSub > m_iMatchCount)
+    return "";
 
-CRegExp::CRegExp()
-{
-  bCompiled = FALSE;
-  program = NULL;
-  sFoundText = NULL;
-
-  for( int i = 0; i < NSUBEXP; i++ )
-  {
-    startp[i] = NULL;
-    endp[i] = NULL;
-  }
+  int pos = m_iOvector[(iSub*2)];
+  int len = m_iOvector[(iSub*2)+1] - pos;
+  return m_subject.substr(pos, len);
 }
 
-CRegExp::~CRegExp()
+void CRegExp::DumpOvector(int iLog /* = LOGDEBUG */)
 {
-  if (program)
-    free(program);
-  if (sFoundText)
-    free(sFoundText);
-}
-
-
-CRegExp* CRegExp::RegComp(const char *exp)
-{
-  char *scan;
-  int flags;
-
-  if (exp == NULL)
-    return NULL;
-
-  bCompiled = TRUE;
-
-  // First pass: determine size, legality.
-  bEmitCode = FALSE;
-  regparse = (char *)exp;
-  regnpar = 1;
-  regsize = 0L;
-  regdummy[0] = NOTHING;
-  regdummy[1] = regdummy[2] = 0;
-  regcode = regdummy;
-  if (reg(0, &flags) == NULL)
-    return(NULL);
-
-  // Allocate space.
-  if (program)
-    free(program);
-  program = (char *)malloc(regsize*sizeof(char));
-  memset( program, 0, regsize * sizeof(char) );
-
-  if (program == NULL)
-    return NULL;
-
-  // Second pass: emit code.
-  bEmitCode = TRUE;
-  regparse = (char *)exp;
-  regnpar = 1;
-  regcode = program;
-  if (reg(0, &flags) == NULL)
-    return NULL;
-
-  // Dig out information for optimizations.
-  regstart = '\0';    // Worst-case defaults.
-  reganch = 0;
-  regmust = NULL;
-  regmlen = 0;
-  scan = program;    // First BRANCH.
-  if (OP(regnext(scan)) == END)
-  {
-    // Only one top-level choice.
-    scan = OPERAND(scan);
-
-    // Starting-point info.
-    if (OP(scan) == EXACTLY)
-      regstart = *OPERAND(scan);
-    else if (OP(scan) == BOL)
-      reganch = 1;
-
-    // If there's something expensive in the r.e., find the
-    // longest literal string that must appear and make it the
-    // regmust.  Resolve ties in favor of later strings, since
-    // the regstart check works with the beginning of the r.e.
-    // and avoiding duplication strengthens checking.  Not a
-    // strong reason, but sufficient in the absence of others.
-
-    if (flags&SPSTART)
-    {
-      LPTSTR longest = NULL;
-      size_t len = 0;
-
-      for (; scan != NULL; scan = regnext(scan))
-        if (OP(scan) == EXACTLY && strlen(OPERAND(scan)) >= len)
-        {
-          longest = OPERAND(scan);
-          len = strlen(OPERAND(scan));
-        }
-      regmust = longest;
-      regmlen = (int)len;
-    }
-  }
-
-  return this;
-}
-
-// reg - regular expression, i.e. main body or parenthesized thing
-//
-// Caller must absorb opening parenthesis.
-//
-// Combining parenthesis handling with the base level of regular expression
-// is a trifle forced, but the need to tie the tails of the branches to what
-// follows makes it hard to avoid.
-
-
-
-char *CRegExp::reg(int paren, int *flagp)
-{
-  char *ret = NULL;
-  char *br;
-  char *ender;
-  int parno = 0;
-  int flags;
-
-  *flagp = HASWIDTH;  // Tentatively.
-
-  if (paren)
-  {
-    // Make an OPEN node.
-    if (regnpar >= NSUBEXP)
-    {
-//      TRACE1("Too many (). NSUBEXP is set to %d\n", NSUBEXP );
-      return NULL;
-    }
-    parno = regnpar;
-    regnpar++;
-    ret = regnode((char)(OPEN+parno));
-  }
-
-  // Pick up the branches, linking them together.
-  br = regbranch(&flags);
-  if (br == NULL)
-    return(NULL);
-  if (paren)
-    regtail(ret, br);  // OPEN -> first.
-  else
-    ret = br;
-  *flagp &= ~(~flags&HASWIDTH);  // Clear bit if bit 0.
-  *flagp |= flags&SPSTART;
-  while (*regparse == '|') {
-    regparse++;
-    br = regbranch(&flags);
-    if (br == NULL)
-      return(NULL);
-    regtail(ret, br);  // BRANCH -> BRANCH.
-    *flagp &= ~(~flags&HASWIDTH);
-    *flagp |= flags&SPSTART;
-  }
-
-  // Make a closing node, and hook it on the end.
-  ender = regnode((char)((paren) ? CLOSE+parno : END));
-  regtail(ret, ender);
-
-  // Hook the tails of the branches to the closing node.
-  for (br = ret; br != NULL; br = regnext(br))
-    regoptail(br, ender);
-
-  // Check for proper termination.
-  if (paren && *regparse++ != ')')
-  {
-    printf("unterminated ()\n");
-    return NULL;
-  }
-  else if (!paren && *regparse != '\0')
-  {
-    if (*regparse == ')')
-    {
-      printf("unmatched ()\n");
-      return NULL;
-    }
-    else
-    {
-      printf("internal error: junk on end\n");
-      return NULL;
-    }
-    // NOTREACHED
-  }
-
-  return(ret);
-}
-
-
-
-
-//
-// regbranch - one alternative of an | operator
-//
-// Implements the concatenation operator.
-
-char *CRegExp::regbranch(int *flagp)
-{
-  char *ret;
-  char *chain;
-  char *latest;
-  int flags;
-  int c;
-
-  *flagp = WORST;        // Tentatively.
-
-  ret = regnode(BRANCH);
-  chain = NULL;
-  while ((c = *regparse) != '\0' && c != '|' && c != ')') {
-    latest = regpiece(&flags);
-    if (latest == NULL)
-      return(NULL);
-    *flagp |= flags&HASWIDTH;
-    if (chain == NULL)    // First piece.
-      *flagp |= flags&SPSTART;
-    else
-      regtail(chain, latest);
-    chain = latest;
-  }
-  if (chain == NULL)      // Loop ran zero times.
-    (void) regnode(NOTHING);
-
-  return(ret);
-}
-
-//
-// regpiece - something followed by possible [*+?]
-//
-// Note that the branching code sequences used for ? and the general cases
-// of * and + are somewhat optimized:  they use the same NOTHING node as
-// both the endmarker for their branch list and the body of the last branch.
-// It might seem that this node could be dispensed with entirely, but the
-// endmarker role is not redundant.
-
-char *CRegExp::regpiece(int *flagp)
-{
-  char *ret;
-  char op;
-  char *next;
-  int flags;
-
-  ret = regatom(&flags);
-  if (ret == NULL)
-    return(NULL);
-
-  op = *regparse;
-  if (!ISREPN(op)) {
-    *flagp = flags;
-    return(ret);
-  }
-
-  if (!(flags&HASWIDTH) && op != '?')
-  {
-    printf("*+ operand could be empty\n");
-    return NULL;
-  }
-
-  switch (op) {
-  case '*':  *flagp = WORST|SPSTART;      break;
-  case '+':  *flagp = WORST|SPSTART|HASWIDTH;  break;
-  case '?':  *flagp = WORST;        break;
-  }
-
-  if (op == '*' && (flags&SIMPLE))
-    reginsert(STAR, ret);
-  else if (op == '*') {
-    // Emit x* as (x&|), where & means "self".
-    reginsert(BRANCH, ret);    // Either x
-    regoptail(ret, regnode(BACK));  // and loop
-    regoptail(ret, ret);    // back
-    regtail(ret, regnode(BRANCH));  // or
-    regtail(ret, regnode(NOTHING));  // null.
-  } else if (op == '+' && (flags&SIMPLE))
-    reginsert(PLUS, ret);
-  else if (op == '+') {
-    // Emit x+ as x(&|), where & means "self".
-    next = regnode(BRANCH);    // Either
-    regtail(ret, next);
-    regtail(regnode(BACK), ret);  // loop back
-    regtail(next, regnode(BRANCH));  // or
-    regtail(ret, regnode(NOTHING));  // null.
-  } else if (op == '?') {
-    // Emit x? as (x|)
-    reginsert(BRANCH, ret);    // Either x
-    regtail(ret, regnode(BRANCH));  // or
-    next = regnode(NOTHING);    // null.
-    regtail(ret, next);
-    regoptail(ret, next);
-  }
-  regparse++;
-  if (ISREPN(*regparse))
-  {
-    printf("nested *?+\n");
-    return NULL;
-  }
-
-  return(ret);
-}
-
-//
-// regatom - the lowest level
-//
-// Optimization:  gobbles an entire sequence of ordinary characters so that
-// it can turn them into a single node, which is smaller to store and
-// faster to run.  Backslashed characters are exceptions, each becoming a
-// separate node; the code is simpler that way and it's not worth fixing.
-
-char *CRegExp::regatom(int *flagp)
-{
-  char *ret;
-  int flags;
-
-  *flagp = WORST;    // Tentatively.
-
-  switch (*regparse++) {
-  case '^':
-    ret = regnode(BOL);
-    break;
-  case '$':
-    ret = regnode(EOL);
-    break;
-  case '.':
-    ret = regnode(ANY);
-    *flagp |= HASWIDTH|SIMPLE;
-    break;
-  case '[': {
-    int range;
-    int rangeend;
-    int c;
-
-    if (*regparse == '^') {  // Complement of range.
-      ret = regnode(ANYBUT);
-      regparse++;
-    } else
-      ret = regnode(ANYOF);
-    if ((c = *regparse) == ']' || c == '-') {
-      regc((char)c);
-      regparse++;
-    }
-    while ((c = *regparse++) != '\0' && ( c != ']' || *(regparse-2) == '\\') ) {
-      if (c != '-' || *(regparse-2) == '\\')
-        regc((char)c);
-      else if ((c = *regparse) == ']' || c == '\0')
-        regc('-');
-      else
-      {
-        range = (unsigned) (char)*(regparse-2);
-        rangeend = (unsigned) (char)c;
-        if (range > rangeend)
-        {
-          printf("invalid [] range\n");
-          return NULL;
-        }
-        for (range++; range <= rangeend; range++)
-          regc((char)range);
-        regparse++;
-      }
-    }
-    regc('\0');
-    if (c != ']')
-    {
-      printf("unmatched []\n");
-      return NULL;
-    }
-    *flagp |= HASWIDTH|SIMPLE;
-    break;
-    }
-  case '(':
-    ret = reg(1, &flags);
-    if (ret == NULL)
-      return(NULL);
-    *flagp |= flags&(HASWIDTH|SPSTART);
-    break;
-  case '\0':
-  case '|':
-  case ')':
-    // supposed to be caught earlier
-    printf("internal error: \\0|) unexpected\n");
-    return NULL;
-    break;
-  case '?':
-  case '+':
-  case '*':
-    printf("?+* follows nothing\n");
-    return NULL;
-    break;
-  case '\\':
-    if (*regparse == '\0')
-    {
-      printf("trailing \\\n");
-      return NULL;
-    }
-    ret = regnode(EXACTLY);
-    regc(*regparse++);
-    regc('\0');
-    *flagp |= HASWIDTH|SIMPLE;
-    break;
-  default: {
-    size_t len;
-    char ender;
-
-    regparse--;
-    len = strcspn(regparse, META);
-    if (len == 0)
-    {
-      printf("internal error: strcspn 0\n");
-      return NULL;
-    }
-    ender = *(regparse+len);
-    if (len > 1 && ISREPN(ender))
-      len--;    // Back off clear of ?+* operand.
-    *flagp |= HASWIDTH;
-    if (len == 1)
-      *flagp |= SIMPLE;
-    ret = regnode(EXACTLY);
-    for (; len > 0; len--)
-      regc(*regparse++);
-    regc('\0');
-    break;
-    }
-  }
-
-  return(ret);
-}
-
-
-
-// reginsert - insert an operator in front of already-emitted operand
-//
-// Means relocating the operand.
-// Adopted UNICODE fixes by Russell Moss
-
-void CRegExp::reginsert(char op, char *opnd)
-{
-  char *place;
-
-  if (!bEmitCode) {
-    regsize += ( sizeof(short) + 2 - sizeof(char) ) ;
+  if (iLog < LOGDEBUG || iLog > LOGNONE)
     return;
-  }
 
-  (void) memmove(opnd+( sizeof(short) + 2 - sizeof(char) ), opnd, (size_t)((regcode - opnd)*sizeof(char)));
-  regcode += ( sizeof(short) + 2 - sizeof(char) ) ;
-
-  place = opnd;    // Op node, where operand used to be.
-  *place++ = op;
-  *place++ = '\0';
-#ifndef _UNICODE
-  *place++ = '\0';
-#endif // _UNICODE
-}
-
-//
-// regtail - set the next-pointer at the end of a node chain
-
-void CRegExp::regtail(char *p, char *val)
-{
-  char *scan;
-  char *temp;
-//  int offset;
-
-  if (!bEmitCode)
-    return;
-
-  // Find last node.
-  for (scan = p; (temp = regnext(scan)) != NULL; scan = temp)
-    continue;
-
-  *((short *)(scan+1)) = (short)((OP(scan) == BACK) ? scan - val : val - scan);
-}
-
-
-// regoptail - regtail on operand of first argument; nop if operandless
-
-void CRegExp::regoptail(char *p, char *val)
-{
-  // "Operandless" and "op != BRANCH" are synonymous in practice.
-  if (!bEmitCode || OP(p) != BRANCH)
-    return;
-  regtail(OPERAND(p), val);
-}
-
-
-// RegFind  - match a regexp against a string
-// Returns  - Returns position of regexp or -1
-//        if regular expression not found
-// Note    - The regular expression should have been
-//        previously compiled using RegComp
-int CRegExp::RegFind(const char *str)
-{
-  char *string = (char *)str;  // avert const poisoning
-  char *s;
-
-  // Delete any previously stored found string
-  if (sFoundText)
-    free(sFoundText);
-  sFoundText = NULL;
-
-  // Be paranoid.
-  if(string == NULL)
+  CStdString str = "{";
+  int size = GetSubCount(); // past the subpatterns is junk
+  for (int i = 0; i <= size; i++)
   {
-    printf("NULL argument to regexec\n");
-    return(-1);
+    CStdString t;
+    t.Format("[%i,%i]", m_iOvector[(i*2)], m_iOvector[(i*2)+1]);
+    if (i != size)
+      t += ",";
+    str += t;
   }
-
-  // Check validity of regex
-  if (!bCompiled)
-  {
-    printf("No regular expression provided yet.\n");
-    return(-1);
-  }
-
-  // If there is a "must appear" string, look for it.
-  if (regmust != NULL && strstr(string, regmust) == NULL)
-    return(-1);
-
-  // Mark beginning of line for ^
-  regbol = string;
-
-  // Simplest case:  anchored match need be tried only once.
-  if (reganch)
-  {
-    if( regtry(string) )
-    {
-      // Save the found substring in case we need it
-      sFoundText = (char *)malloc((GetFindLen()+1)*sizeof(char));
-      sFoundText[GetFindLen()] = '\0';
-      strncpy(sFoundText, string, GetFindLen() );
-
-      return 0;
-    }
-    //String not found
-    return -1;
-  }
-
-  // Messy cases:  unanchored match.
-  if (regstart != '\0')
-  {
-    // We know what char it must start with.
-    for (s = string; s != NULL && *s != '\0'; s = strchr(s+1, regstart)) // fixed by JM to include the *s != '\0'
-      if (regtry(s))
-      {
-        int nPos = s-str;
-
-        // Save the found substring in case we need it later
-        sFoundText = (char *)malloc((GetFindLen()+1)*sizeof(char));
-        sFoundText[GetFindLen()] = '\0';
-        strncpy(sFoundText, s, GetFindLen() );
-
-        return nPos;
-      }
-    return -1;
-  }
-  else
-  {
-    // We don't -- general case
-    for (s = string; !regtry(s); s++)
-      if (*s == '\0')
-        return(-1);
-
-    int nPos = s-str;
-
-    // Save the found substring in case we need it later
-    sFoundText = (char *)malloc((GetFindLen()+1)*sizeof(char));
-    sFoundText[GetFindLen()] = '\0';
-    strncpy(sFoundText, s, GetFindLen() );
-
-    return nPos;
-  }
-  // NOTREACHED
+  str += "}";
+  CLog::Log(iLog, "regexp ovector=%s", str.c_str());
 }
-
-
-// regtry - try match at specific point
-
-int  CRegExp::regtry(char *string)
-{
-  int i;
-  char **stp;
-  char **enp;
-
-  reginput = string;
-
-  stp = startp;
-  enp = endp;
-  for (i = NSUBEXP; i > 0; i--)
-  {
-    *stp++ = NULL;
-    *enp++ = NULL;
-  }
-  if (regmatch(program))
-  {
-    startp[0] = string;
-    endp[0] = reginput;
-    return(1);
-  }
-  else
-    return(0);
-}
-
-// regmatch - main matching routine
-//
-// Conceptually the strategy is simple:  check to see whether the current
-// node matches, call self recursively to see whether the rest matches,
-// and then act accordingly.  In practice we make some effort to avoid
-// recursion, in particular by going through "ordinary" nodes (that don't
-// need to know whether the rest of the match failed) by a loop instead of
-// by recursion.
-
-int  CRegExp::regmatch(char *prog)
-{
-  char *scan;  // Current node.
-  char *next;    // Next node.
-
-  for (scan = prog; scan != NULL; scan = next) {
-    next = regnext(scan);
-
-    switch (OP(scan)) {
-    case BOL:
-      if (reginput != regbol)
-        return(0);
-      break;
-    case EOL:
-      if (*reginput != '\0')
-        return(0);
-      break;
-    case ANY:
-      if (*reginput == '\0')
-        return(0);
-      reginput++;
-      break;
-    case EXACTLY: {
-      size_t len;
-      char *const opnd = OPERAND(scan);
-
-      // Inline the first character, for speed.
-      if (*opnd != *reginput)
-        return(0);
-      len = strlen(opnd);
-      if (len > 1 && strncmp(opnd, reginput, len) != 0)
-        return(0);
-      reginput += len;
-      break;
-      }
-    case ANYOF:
-      if (*reginput == '\0' ||
-          strchr(OPERAND(scan), *reginput) == NULL)
-        return(0);
-      reginput++;
-      break;
-    case ANYBUT:
-      if (*reginput == '\0' ||
-          strchr(OPERAND(scan), *reginput) != NULL)
-        return(0);
-      reginput++;
-      break;
-    case NOTHING:
-      break;
-    case BACK:
-      break;
-    case OPEN+1: case OPEN+2: case OPEN+3:
-    case OPEN+4: case OPEN+5: case OPEN+6:
-    case OPEN+7: case OPEN+8: case OPEN+9: {
-      const int no = OP(scan) - OPEN;
-      char *const input = reginput;
-
-      if (regmatch(next)) {
-        // Don't set startp if some later
-        // invocation of the same parentheses
-        // already has.
-
-        if (startp[no] == NULL)
-          startp[no] = input;
-        return(1);
-      } else
-        return(0);
-      break;
-      }
-    case CLOSE+1: case CLOSE+2: case CLOSE+3:
-    case CLOSE+4: case CLOSE+5: case CLOSE+6:
-    case CLOSE+7: case CLOSE+8: case CLOSE+9: {
-      const int no = OP(scan) - CLOSE;
-      char *const input = reginput;
-
-      if (regmatch(next)) {
-        // Don't set endp if some later
-        // invocation of the same parentheses
-        // already has.
-
-        if (endp[no] == NULL)
-          endp[no] = input;
-        return(1);
-      } else
-        return(0);
-      break;
-      }
-    case BRANCH: {
-      char *const save = reginput;
-
-      if (OP(next) != BRANCH)    // No choice.
-        next = OPERAND(scan);  // Avoid recursion.
-      else {
-        while (OP(scan) == BRANCH) {
-          if (regmatch(OPERAND(scan)))
-            return(1);
-          reginput = save;
-          scan = regnext(scan);
-        }
-        return(0);
-        // NOTREACHED
-      }
-      break;
-      }
-    case STAR:
-    case PLUS: {
-      const char nextch =
-        (OP(next) == EXACTLY) ? *OPERAND(next) : '\0';
-      size_t no;
-      char *const save = reginput;
-      const size_t min = (OP(scan) == STAR) ? 0 : 1;
-
-      for (no = regrepeat(OPERAND(scan)) + 1; no > min; no--) {
-        reginput = save + no - 1;
-        // If it could work, try it.
-        if (nextch == '\0' || *reginput == nextch)
-          if (regmatch(next))
-            return(1);
-      }
-      return(0);
-      break;
-      }
-    case END:
-      return(1);  // Success!
-      break;
-    default:
-      printf("regexp corruption\n");
-      return(0);
-      break;
-    }
-  }
-
-  // We get here only if there's trouble -- normally "case END" is
-  // the terminating point.
-
-  printf("corrupted pointers\n");
-  return(0);
-}
-
-
-// regrepeat - report how many times something simple would match
-
-size_t CRegExp::regrepeat(char *node)
-{
-  size_t count;
-  char *scan;
-  char ch;
-
-  switch (OP(node))
-  {
-  case ANY:
-    return(strlen(reginput));
-    break;
-  case EXACTLY:
-    ch = *OPERAND(node);
-    count = 0;
-    for (scan = reginput; *scan == ch; scan++)
-      count++;
-    return(count);
-    break;
-  case ANYOF:
-    return(strspn(reginput, OPERAND(node)));
-    break;
-  case ANYBUT:
-    return(strcspn(reginput, OPERAND(node)));
-    break;
-  default:    // Oh dear.  Called inappropriately.
-    printf("internal error: bad call of regrepeat\n");
-    return(0);  // Best compromise.
-    break;
-  }
-  // NOTREACHED
-}
-
-// regnext - dig the "next" pointer out of a node
-
-char *CRegExp::regnext(char *p)
-{
-  const short &offset = *((short*)(p+1));
-
-  if (offset == 0)
-    return(NULL);
-
-  return((OP(p) == BACK) ? p-offset : p+offset);
-}
-
-
-// GetValueCount - Get the number of subvalues available
-int CRegExp::GetSubCount()
-{
-  int i=0;
-  for(int no=1;no<NSUBEXP;no++)
-  {
-    if( startp[no] != NULL && endp[no] != NULL )
-      i++;
-    else
-      break;
-  }
-  return i;
-}
-
-int CRegExp::GetSubStart(int iSub)
-{
-  if( startp[iSub] != NULL )
-    return startp[iSub]-startp[0];
-  else
-    return 0;
-}
-
-int CRegExp::GetSubLenght(int iSub)
-{
-  if( startp[iSub] != NULL && endp[iSub] != NULL )
-    return endp[iSub]-startp[iSub];
-  else
-    return 0;
-}
-
-// GetReplaceString  - Converts a replace expression to a string
-// Returns      - Pointer to newly allocated string
-//            Caller is responsible for deleting it
-char* CRegExp::GetReplaceString( const char* sReplaceExp )
-{
-  char *src = (char *)sReplaceExp;
-  char *buf;
-  char c;
-  int no;
-  size_t len;
-
-  if( sReplaceExp == NULL || sFoundText == NULL )
-    return NULL;
-
-
-  // First compute the length of the string
-  int replacelen = 0;
-  while ((c = *src++) != '\0')
-  {
-    if (c == '&')
-      no = 0;
-    else if (c == '\\' && isdigit(*src))
-      no = *src++ - '0';
-    else
-      no = -1;
-
-    if (no < 0)
-    {
-      // Ordinary character.
-      if (c == '\\' && (*src == '\\' || *src == '&'))
-        c = *src++;
-      replacelen++;
-    }
-    else if (startp[no] != NULL && endp[no] != NULL &&
-          endp[no] > startp[no])
-    {
-      // Get tagged expression
-      len = endp[no] - startp[no];
-      replacelen += len;
-    }
-  }
-
-  // Now allocate buf
-  buf = (char *)malloc((replacelen + 1)*sizeof(char));
-  if( buf == NULL )
-    return NULL;
-
-  char* sReplaceStr = buf;
-
-  // Add null termination
-  buf[replacelen] = '\0';
-
-  // Now we can create the string
-  src = (char *)sReplaceExp;
-  while ((c = *src++) != '\0')
-  {
-    if (c == '&')
-      no = 0;
-    else if (c == '\\' && isdigit(*src))
-      no = *src++ - '0';
-    else
-      no = -1;
-
-    if (no < 0)
-    {
-      // Ordinary character.
-      if (c == '\\' && (*src == '\\' || *src == '&'))
-        c = *src++;
-      *buf++ = c;
-    }
-    else if (startp[no] != NULL && endp[no] != NULL &&
-          endp[no] > startp[no])
-    {
-      // Get tagged expression
-      len = endp[no] - startp[no];
-      int tagpos = startp[no] - startp[0];
-
-      strncpy(buf, sFoundText + tagpos, len);
-      buf += len;
-    }
-  }
-
-  return sReplaceStr;
-}
-
-//Here's a function that will do global search and replace using regular expressions. Note that the CStringEx class described in the earlier section is being used here. The main reason for using CStringEx is that it provides the Replace() function which makes our task easier.
-
-/*int RegSearchReplace( CStringEx& string, LPCTSTR sSearchExp,
-           LPCTSTR sReplaceExp )
-{
-  int nPos = 0;
-  int nReplaced = 0;
-  CRegExp r;
-  LPTSTR str = (LPTSTR)(LPCTSTR)string;
-
-  r.RegComp( sSearchExp );
-  while( (nPos = r.RegFind((LPTSTR)str)) != -1 )
-  {
-    nReplaced++;
-    char *pReplaceStr = r.GetReplaceString( sReplaceExp );
-
-    int offset = str-(LPCTSTR)string+nPos;
-    string.Replace( offset, r.GetFindLen(),
-        pReplaceStr );
-
-    // Replace might have caused a reallocation
-    str = (LPTSTR)(LPCTSTR)string + offset + strlen(pReplaceStr);
-    delete pReplaceStr;
-  }
-  return nReplaced;
-}*/
-
-#endif //HAS_PCRE
-

Modified: branches/linuxport/XBMC/xbmc/utils/RegExp.h
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/RegExp.h	2008-07-21 23:27:12 UTC (rev 14344)
+++ branches/linuxport/XBMC/xbmc/utils/RegExp.h	2008-07-21 23:44:02 UTC (rev 14345)
@@ -1,74 +1,35 @@
 #pragma once
+/*
+ *      Copyright (C) 2005-2008 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
 
-////////////////////////////////////////////////////////////////////////
-// RegExp.h
-//
-// Changes by JM for XBMC:
-//  replaced all TCHAR with char
-//  replaced all new/delete's with malloc/free's.
-//
-// This code has been derived from work by Henry Spencer.
-// The main changes are
-// 1. All char variables and functions have been changed to char
-//    counterparts
-// 2. Added GetFindLen() & GetReplaceString() to enable search
-//    and replace operations.
-// 3. And of course, added the C++ Wrapper
-//
-// Comments from Russell Moss who posted UNICODE fixes to codeguru, herein adopted:
-// Both CRegExp::regnode and CRegExp::reginsert were leaving
-// 2 "locations" for a short.  In the case of UNICODE, a
-// char is a short so leaving room for a short is equivalent
-// to skipping only one char
-//
-//
-// The original copyright notice follows:
-//
-// Copyright (c) 1986, 1993, 1995 by University of Toronto.
-// Written by Henry Spencer.  Not derived from licensed software.
-//
-// Permission is granted to anyone to use this software for any
-// purpose on any computer system, and to redistribute it in any way,
-// subject to the following restrictions:
-//
-// 1. The author is not responsible for the consequences of use of
-// this software, no matter how awful, even if they arise
-// from defects in it.
-//
-// 2. The origin of this software must not be misrepresented, either
-// by explicit claim or by omission.
-//
-// 3. Altered versions must be plainly marked as such, and must not
-// be misrepresented (by explicit claim or omission) as being
-// the original software.
-//
-// 4. This notice must not be removed or altered.
-/////////////////////////////////////////////////////////////////////////////
-
 #ifndef REGEXP_H
 #define REGEXP_H
 
-#define NSUBEXP  10
-
 #ifdef _XBOX
 #include <xtl.h>
 #endif
-#include <stdio.h>
 
-#define FALSE 0
-#define TRUE 1
-#ifndef NULL
-#define NULL 0
-#endif
-typedef char* LPTSTR;
-
-#ifndef HAS_PCRE
-#define HAS_PCRE
-#endif
-
-#ifdef HAS_PCRE
-
+#include <stdio.h>
 #include <string>
+
 namespace PCRE {
 #ifdef _WIN32
 #define PCRE_STATIC
@@ -100,9 +61,12 @@
 
     return (m_iOvector[1] - m_iOvector[0]);
   };
-  int GetSubCount() { return m_iMatchCount; }
-  int GetSubStart(int iSub) { return m_iOvector[iSub*2]; }
-  int GetSubLenght(int iSub) { return (m_iOvector[iSub*2+1] - m_iOvector[iSub*2+1]); }
+  int GetSubCount() { return m_iMatchCount - 1; } // PCRE returns the number of sub-patterns + 1
+  int GetSubStart(int iSub) { return m_iOvector[iSub*2] - m_iOvector[0]; } // normalized to match old engine
+  int GetSubLength(int iSub) { return (m_iOvector[(iSub*2)+1] - m_iOvector[(iSub*2)]); } // correct spelling
+  int GetSubLenght(int iSub) { return GetSubLength(iSub); }
+  CStdString GetMatch(int iSub = 0);
+  void DumpOvector(int iLog = LOGDEBUG);
 
 private:
   void Cleanup() { if (m_re) { PCRE::pcre_free(m_re); m_re = NULL; } }
@@ -116,96 +80,4 @@
   std::string m_subject;
 };
 
-#else // HAS_PCRE
-
-class CRegExp
-{
-public:
-  CRegExp();
-  ~CRegExp();
-
-  CRegExp *RegComp( const char *re );
-  int RegFind(const char *str);
-  char* GetReplaceString( const char* sReplaceExp );
-  int GetFindLen()
-  {
-    if( startp[0] == NULL || endp[0] == NULL )
-      return 0;
-
-      return (int)(endp[0] - startp[0]);
-  };
-  int GetSubCount();
-  int GetSubStart(int iSub);
-  int GetSubLenght(int iSub);
-
-private:
-  char *regnext(char *node);
-  void reginsert(char op, char *opnd);
-
-  int regtry(char *string);
-  int regmatch(char *prog);
-  size_t regrepeat(char *node);
-  char *reg(int paren, int *flagp);
-  char *regbranch(int *flagp);
-  void regtail(char *p, char *val);
-  void regoptail(char *p, char *val);
-  char *regpiece(int *flagp);
-  char *regatom(int *flagp);
-
-  // Inline functions
-private:
-  char OP(char *p) {return *p;};
-  char *OPERAND( char *p) {return (char*)((short *)(p+1)+1); };
-
-  // regc - emit (if appropriate) a byte of code
-  void regc(char b)
-  {
-    if (bEmitCode)
-      *regcode++ = b;
-    else
-      regsize++;
-  };
-
-  // regnode - emit a node
-  char * regnode(char op)
-  {
-    if (!bEmitCode) {
-      regsize += ( sizeof(short) + 2 - sizeof(char) ) ;
-      return regcode;
-    }
-
-    *regcode++ = op;
-    *regcode++ = '\0'; /* Null next pointer. */
-#ifndef _UNICODE
-    *regcode++ = '\0';
-#endif // _UNICODE
-
-    return regcode - (sizeof(short) + 2 - sizeof(char)) ;
-  };
-private:
-  bool bEmitCode;
-  bool bCompiled;
-  char *sFoundText;
-
-  char *startp[NSUBEXP];
-  char *endp[NSUBEXP];
-  char regstart;    // Internal use only.
-  char reganch;     // Internal use only.
-  char *regmust;    // Internal use only.
-  int regmlen;      // Internal use only.
-  char *program;    // Unwarranted chumminess with compiler.
-
-  char *regparse;   // Input-scan pointer.
-  int regnpar;      // () count.
-  char *regcode;    // Code-emit pointer; \xAEdummy = don't.
-  char regdummy[3]; // NOTHING, 0 next ptr
-  long regsize;     // Code size.
-
-  char *reginput;   // String-input pointer.
-  char *regbol;     // Beginning of input, for ^ check.
-};
-
-#endif // HAS_PCRE
-
-#endif
-
+#endif
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14372
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14372&view=rev
Author:   kraqh3d
Date:     2008-07-23 00:22:30 +0000 (Wed, 23 Jul 2008)

Log Message:
-----------
fixed: unshuffle playlists

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileSystem/PlaylistDirectory.cpp
    branches/linuxport/XBMC/xbmc/PlayList.cpp

Modified: branches/linuxport/XBMC/xbmc/FileSystem/PlaylistDirectory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/PlaylistDirectory.cpp	2008-07-22 23:39:08 UTC (rev 14371)
+++ branches/linuxport/XBMC/xbmc/FileSystem/PlaylistDirectory.cpp	2008-07-23 00:22:30 UTC (rev 14372)
@@ -57,7 +57,7 @@
   for (int i = 0; i < playlist.size(); ++i)
   {
     CFileItemPtr item = playlist[i];
-    item->m_iprogramCount = i;
+    //item->m_iprogramCount = i; // the programCount is set as items are added!
     items.Add(item);
   }
 

Modified: branches/linuxport/XBMC/xbmc/PlayList.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/PlayList.cpp	2008-07-22 23:39:08 UTC (rev 14371)
+++ branches/linuxport/XBMC/xbmc/PlayList.cpp	2008-07-23 00:22:30 UTC (rev 14372)
@@ -67,7 +67,7 @@
   else
     m_iPlayableItems++;
 
-  //CLog::Log(LOGDEBUG,"%s item:(%02i/%02i)[%s]", __FUNCTION__, iPosition, item.m_iprogramCount, item.m_strPath.c_str());
+  //CLog::Log(LOGDEBUG,"%s item:(%02i/%02i)[%s]", __FUNCTION__, iPosition, item->m_iprogramCount, item->m_strPath.c_str());
   if (iPosition == iOldSize)
     m_vecItems.push_back(item);
   else
@@ -143,7 +143,7 @@
     CFileItemPtr item = *it;
     if (item->m_iprogramCount > iOrder)
     {
-      //CLog::Log(LOGDEBUG,"%s fixing item at order %i", __FUNCTION__, item.m_iprogramCount);
+      //CLog::Log(LOGDEBUG,"%s fixing item at order %i", __FUNCTION__, item->m_iprogramCount);
       item->m_iprogramCount--;
     }
     ++it;
@@ -162,7 +162,7 @@
     CFileItemPtr item = *it;
     if (item->m_iprogramCount >= iOrder)
     {
-      //CLog::Log(LOGDEBUG,"%s fixing item at order %i", __FUNCTION__, item.m_iprogramCount);
+      //CLog::Log(LOGDEBUG,"%s fixing item at order %i", __FUNCTION__, item->m_iprogramCount);
       item->m_iprogramCount++;
     }
     ++it;
@@ -205,7 +205,7 @@
       return;
     if (iPosition < 0)
       iPosition = 0;
-    CLog::Log(LOGDEBUG,"%s :shuffling at pos:%i", __FUNCTION__, iPosition);
+    CLog::Log(LOGDEBUG,"%s shuffling at pos:%i", __FUNCTION__, iPosition);
 
     ivecItems it = m_vecItems.begin() + iPosition;
     random_shuffle(it, m_vecItems.end());
@@ -326,7 +326,7 @@
   if (!IsShuffled())
   {
     // swap the ordinals before swapping the items!
-    //CLog::Log(LOGDEBUG,"PLAYLIST swapping items at orders (%i, %i)",m_vecItems[position1].m_iprogramCount,m_vecItems[position2].m_iprogramCount);
+    //CLog::Log(LOGDEBUG,"PLAYLIST swapping items at orders (%i, %i)",m_vecItems[position1]->m_iprogramCount,m_vecItems[position2]->m_iprogramCount);
     std::swap(m_vecItems[position1]->m_iprogramCount, m_vecItems[position2]->m_iprogramCount);
   }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14374
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14374&view=rev
Author:   kraqh3d
Date:     2008-07-23 01:04:02 +0000 (Wed, 23 Jul 2008)

Log Message:
-----------
added: support for multi-file episodes. they will be stacked into a single item if season, episode, and *path* are identical, and sequentially based on a natural sort of the filenames.  if "Stack Duplicate TV Shows" is disabled, the multi-file episodes will be seen as duplicate entries.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/SortFileItem.cpp
    branches/linuxport/XBMC/xbmc/SortFileItem.h
    branches/linuxport/XBMC/xbmc/VideoDatabase.cpp
    branches/linuxport/XBMC/xbmc/VideoDatabase.h
    branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp
    branches/linuxport/XBMC/xbmc/VideoInfoScanner.h

Modified: branches/linuxport/XBMC/xbmc/SortFileItem.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/SortFileItem.cpp	2008-07-23 00:44:34 UTC (rev 14373)
+++ branches/linuxport/XBMC/xbmc/SortFileItem.cpp	2008-07-23 01:04:02 UTC (rev 14374)
@@ -279,10 +279,14 @@
   // sanity
   RETURN_IF_NULL(left,false); RETURN_IF_NULL(right,false);
 
-  // special items
+  // ignore the ".." item - that should always be on top
   if (left->IsParentFolder()) return true;
   if (right->IsParentFolder()) return false;
-  // only if they're both folders or both files do we do the full comparison
+
+  const CVideoInfoTag *lTag = left->GetVideoInfoTag();
+  const CVideoInfoTag *rTag = right->GetVideoInfoTag();
+
+  // episode number
   if (left->m_bIsFolder == right->m_bIsFolder)
   {
     // we calculate an offset number based on the episode's
@@ -295,15 +299,24 @@
     // or if a season has > 2^16-1 episodes strange things will happen (overflow)
     unsigned int il;
     unsigned int ir;
-    if (left->GetVideoInfoTag()->m_iSpecialSortEpisode > 0)
-      il = (left->GetVideoInfoTag()->m_iSpecialSortSeason<<24)+(left->GetVideoInfoTag()->m_iSpecialSortEpisode<<8)-(128-left->GetVideoInfoTag()->m_iEpisode);
+    if (lTag->m_iSpecialSortEpisode > 0)
+      il = (lTag->m_iSpecialSortSeason<<24)+(lTag->m_iSpecialSortEpisode<<8)-(128-lTag->m_iEpisode);
     else
-      il = (left->GetVideoInfoTag()->m_iSeason<<24)+(left->GetVideoInfoTag()->m_iEpisode<<8);
-    if (right->GetVideoInfoTag()->m_iSpecialSortEpisode > 0)
-      ir = (right->GetVideoInfoTag()->m_iSpecialSortSeason<<24)+(right->GetVideoInfoTag()->m_iSpecialSortEpisode<<8)-(128-right->GetVideoInfoTag()->m_iEpisode);
+      il = (lTag->m_iSeason<<24)+(lTag->m_iEpisode<<8);
+    if (rTag->m_iSpecialSortEpisode > 0)
+      ir = (rTag->m_iSpecialSortSeason<<24)+(rTag->m_iSpecialSortEpisode<<8)-(128-rTag->m_iEpisode);
     else
-      ir = (right->GetVideoInfoTag()->m_iSeason<<24)+(right->GetVideoInfoTag()->m_iEpisode<<8);
-    return il < ir;
+      ir = (rTag->m_iSeason<<24)+(rTag->m_iEpisode<<8);
+    if (il < ir) return true;
+    if (ir < il) return false;
+
+    // check filename as there can be duplicates now
+    CURL l(lTag->m_strFileNameAndPath);
+    CURL r(rTag->m_strFileNameAndPath);
+    return (StringUtils::AlphaNumericCompare(l.GetFileName(), r.GetFileName()) > 0);
+    int result = l.GetFileNameWithoutPath().CompareNoCase(r.GetFileNameWithoutPath());
+    if (result < 0) return true;
+    if (result > 0) return false;
   }
   return left->m_bIsFolder;
 }
@@ -313,23 +326,36 @@
   // sanity
   RETURN_IF_NULL(left,false); RETURN_IF_NULL(right,false);
 
-  // special items
+  // ignore the ".." item - that should always be on top
   if (left->IsParentFolder()) return true;
   if (right->IsParentFolder()) return false;
-  // only if they're both folders or both files do we do the full comparison
+
+  const CVideoInfoTag *lTag = left->GetVideoInfoTag();
+  const CVideoInfoTag *rTag = right->GetVideoInfoTag();
+
+  // episode
   if (left->m_bIsFolder == right->m_bIsFolder)
   {
     unsigned int il;
     unsigned int ir;
-    if (left->GetVideoInfoTag()->m_iSpecialSortEpisode > 0)
-      il = (left->GetVideoInfoTag()->m_iSpecialSortSeason<<24)+(left->GetVideoInfoTag()->m_iSpecialSortEpisode<<8)-(128-left->GetVideoInfoTag()->m_iEpisode);
+    if (lTag->m_iSpecialSortEpisode > 0)
+      il = (lTag->m_iSpecialSortSeason<<24)+(lTag->m_iSpecialSortEpisode<<8)-(128-lTag->m_iEpisode);
     else
-      il = (left->GetVideoInfoTag()->m_iSeason<<24)+(left->GetVideoInfoTag()->m_iEpisode<<8);
-    if (right->GetVideoInfoTag()->m_iSpecialSortEpisode > 0)
-      ir = (right->GetVideoInfoTag()->m_iSpecialSortSeason<<24)+(right->GetVideoInfoTag()->m_iSpecialSortEpisode<<8)-(128-right->GetVideoInfoTag()->m_iEpisode);
+      il = (lTag->m_iSeason<<24)+(lTag->m_iEpisode<<8);
+    if (rTag->m_iSpecialSortEpisode > 0)
+      ir = (rTag->m_iSpecialSortSeason<<24)+(rTag->m_iSpecialSortEpisode<<8)-(128-rTag->m_iEpisode);
     else
-      ir = (right->GetVideoInfoTag()->m_iSeason<<24)+(right->GetVideoInfoTag()->m_iEpisode<<8);
-    return il > ir;
+      ir = (rTag->m_iSeason<<24)+(rTag->m_iEpisode<<8);
+    if (il > ir) return true;
+    if (ir > il) return false;
+
+    // check filename as there can be duplicates now
+    CURL l(lTag->m_strFileNameAndPath);
+    CURL r(rTag->m_strFileNameAndPath);
+    return (StringUtils::AlphaNumericCompare(l.GetFileName(), r.GetFileName()) > 0);
+    int result = l.GetFileNameWithoutPath().CompareNoCase(r.GetFileNameWithoutPath());
+    if (result < 0) return true;
+    if (result > 0) return false;
   }
   return left->m_bIsFolder;
 }

Modified: branches/linuxport/XBMC/xbmc/SortFileItem.h
===================================================================
--- branches/linuxport/XBMC/xbmc/SortFileItem.h	2008-07-23 00:44:34 UTC (rev 14373)
+++ branches/linuxport/XBMC/xbmc/SortFileItem.h	2008-07-23 01:04:02 UTC (rev 14374)
@@ -153,7 +153,7 @@
   SORT_METHOD_STUDIO,
   SORT_METHOD_STUDIO_IGNORE_THE,
   SORT_METHOD_UNSORTED,
-  SORT_METHOD_MAX
+  SORT_METHOD_MAX,
 } SORT_METHOD;
 
 typedef enum {

Modified: branches/linuxport/XBMC/xbmc/VideoDatabase.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoDatabase.cpp	2008-07-23 00:44:34 UTC (rev 14373)
+++ branches/linuxport/XBMC/xbmc/VideoDatabase.cpp	2008-07-23 01:04:02 UTC (rev 14374)
@@ -1207,13 +1207,22 @@
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS.get()) return false;
     long lMovieId = GetMovieId(strFilenameAndPath);
-    return lMovieId != -1;
+    return (lMovieId > 0); // index of zero is also invalid
+
+    // work in progress
+    if (lMovieId > 0)
+    {
+      // get title.  if no title, the id was "deleted" for in-place update
+      CVideoInfoTag details;
+      GetMovieInfo(strFilenameAndPath, details, lMovieId);
+      if (!details.m_strTitle.IsEmpty()) return true;
+    }
+    return false;
   }
   catch (...)
   {
     CLog::Log(LOGERROR, "%s (%s) failed", __FUNCTION__, strFilenameAndPath.c_str());
   }
-
   return false;
 }
 
@@ -1224,14 +1233,22 @@
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS.get()) return false;
     long lTvShowId = GetTvShowId(strPath);
-    if ( lTvShowId < 0) return false;
-    return true;
+    return (lTvShowId > 0); // index of zero is also invalid
+
+    // work in progress
+    if (lTvShowId > 0)
+    {
+      // get title. if no title, the id was "deleted" for in-place update
+      CVideoInfoTag details;
+      GetTvShowInfo(strPath, details, lTvShowId);
+      if (!details.m_strTitle.IsEmpty()) return true;
+    }
+    return false;
   }
   catch (...)
   {
     CLog::Log(LOGERROR, "%s (%s) failed", __FUNCTION__, strPath.c_str());
   }
-
   return false;
 }
 
@@ -1242,14 +1259,22 @@
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS.get()) return false;
     long lEpisodeId = GetEpisodeId(strFilenameAndPath);
-    if ( lEpisodeId < 0) return false;
-    return true;
+    return (lEpisodeId > 0); // index of zero is also invalid
+
+    // work in progress
+    if (lEpisodeId > 0)
+    {
+      // get title.  if no title, the id was "deleted" for in-place update
+      CVideoInfoTag details;
+      GetEpisodeInfo(strFilenameAndPath, details, lEpisodeId);
+      if (!details.m_strTitle.IsEmpty()) return true;
+    }
+    return false;
   }
   catch (...)
   {
     CLog::Log(LOGERROR, "%s (%s) failed", __FUNCTION__, strFilenameAndPath.c_str());
   }
-
   return false;
 }
 
@@ -1260,18 +1285,27 @@
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS.get()) return false;
     long lMVideoId = GetMusicVideoId(strFilenameAndPath);
-    return lMVideoId != -1;
+    return (lMVideoId > 0); // index of zero is also invalid
+
+    // work in progress
+    if (lMVideoId > 0)
+    {
+      // get title.  if no title, the id was "deleted" for in-place update
+      CVideoInfoTag details;
+      GetMusicVideoInfo(strFilenameAndPath, details, lMVideoId);
+      if (!details.m_strTitle.IsEmpty()) return true;
+    }
+    return false;
   }
   catch (...)
   {
     CLog::Log(LOGERROR, "%s (%s) failed", __FUNCTION__, strFilenameAndPath.c_str());
   }
-
   return false;
 }
 
 void CVideoDatabase::DeleteDetailsForTvShow(const CStdString& strPath)
-{
+{// TODO: merge into DeleteTvShow
   try
   {
     if (NULL == m_pDB.get()) return ;
@@ -1586,24 +1620,28 @@
 {
   try
   {
+    CVideoInfoTag info = details;
+
     long lFileId = GetFileId(strFilenameAndPath);
     if (lFileId < 0)
       lFileId = AddFile(strFilenameAndPath);
     long lMovieId = GetMovieId(strFilenameAndPath);
     if (lMovieId > -1)
     {
-      DeleteMovie(strFilenameAndPath);
+      int count = GetPlayCount(VIDEODB_CONTENT_MOVIES, lMovieId);
+      if (count > 0)
+        info.m_playCount = count;
+      CLog::Log(LOGDEBUG,"Keeping playcount, %s = %i", info.m_strTitle.c_str(), info.m_playCount);
+      DeleteMovie(strFilenameAndPath, true); // true to keep the table entry
     }
     lMovieId = AddMovie(strFilenameAndPath);
     if (lMovieId < 0)
       return;
 
-//    BeginTransaction();
-
     vector<long> vecDirectors;
     vector<long> vecGenres;
     vector<long> vecStudios;
-    AddGenreAndDirectorsAndStudios(details,vecDirectors,vecGenres,vecStudios);
+    AddGenreAndDirectorsAndStudios(info,vecDirectors,vecGenres,vecStudios);
     
     for (unsigned int i = 0; i < vecGenres.size(); ++i)
       AddGenreToMovie(lMovieId, vecGenres[i]);
@@ -1615,10 +1653,10 @@
       AddStudioToMovie(lMovieId, vecStudios[i]);
 
     // add writers...
-    if (!details.m_strWritingCredits.IsEmpty())
+    if (!info.m_strWritingCredits.IsEmpty())
     {
       CStdStringArray writers;
-      StringUtils::SplitString(details.m_strWritingCredits, "/", writers);
+      StringUtils::SplitString(info.m_strWritingCredits, "/", writers);
       for (unsigned int i = 0; i < writers.size(); i++)
       {
         CStdString writer(writers[i]);
@@ -1629,7 +1667,7 @@
     }
 
     // add cast...
-    for (CVideoInfoTag::iCast it = details.m_cast.begin(); it != details.m_cast.end(); ++it)
+    for (CVideoInfoTag::iCast it = info.m_cast.begin(); it != info.m_cast.end(); ++it)
     {
       long lActor = AddActor(it->strName,it->thumbUrl.m_xml);
       AddActorToMovie(lMovieId, lActor, it->strRole);
@@ -1637,7 +1675,7 @@
 
     // update our movie table (we know it was added already above)
     // and insert the new row
-    CStdString sql = "update movie set " + GetValueString(details, VIDEODB_ID_MIN, VIDEODB_ID_MAX, DbMovieOffsets);
+    CStdString sql = "update movie set " + GetValueString(info, VIDEODB_ID_MIN, VIDEODB_ID_MAX, DbMovieOffsets);
     sql += FormatSQL(" where idMovie=%u", lMovieId);
     m_pDS->exec(sql.c_str());
   }
@@ -1767,8 +1805,6 @@
     if (lMVideoId < 0)
       return;
 
-//    BeginTransaction();
-
     vector<long> vecDirectors;
     vector<long> vecGenres;
     vector<long> vecStudios;
@@ -2108,7 +2144,7 @@
 }
 
 //********************************************************************************************************************************
-void CVideoDatabase::DeleteMovie(const CStdString& strFilenameAndPath)
+void CVideoDatabase::DeleteMovie(const CStdString& strFilenameAndPath, bool bKeepId /* = false */, bool bKeepThumb /* = false */)
 {
   try
   {
@@ -2120,10 +2156,6 @@
       return ;
     }
 
-    DeleteThumbForItem(strFilenameAndPath,false); 
-
-    ClearBookMarksOfFile(strFilenameAndPath);
-
     CStdString strSQL;
     strSQL=FormatSQL("delete from genrelinkmovie where idmovie=%i", lMovieId);
     m_pDS->exec(strSQL.c_str());
@@ -2137,12 +2169,32 @@
     strSQL=FormatSQL("delete from studiolinkmovie where idmovie=%i", lMovieId);
     m_pDS->exec(strSQL.c_str());
 
-    strSQL=FormatSQL("delete from movie where idmovie=%i", lMovieId);
-    m_pDS->exec(strSQL.c_str());
+    if (!bKeepThumb)
+      DeleteThumbForItem(strFilenameAndPath,false); 
 
-    strSQL=FormatSQL("delete from movielinktvshow where idmovie=%i", lMovieId);
-    m_pDS->exec(strSQL.c_str());
+    // keep the movie table entry, linking to tv shows, and bookmarks
+    // so we can update the data in place
+    // the ancilliary tables are still purged
+    if (!bKeepId)
+    {
+      ClearBookMarksOfFile(strFilenameAndPath);
 
+      strSQL=FormatSQL("delete from movie where idmovie=%i", lMovieId);
+      m_pDS->exec(strSQL.c_str());
+
+      strSQL=FormatSQL("delete from movielinktvshow where idmovie=%i", lMovieId);
+      m_pDS->exec(strSQL.c_str());
+    }
+    /*
+    // work in progress
+    else
+	  {
+      // clear the title
+      strSQL=FormatSQL("update movie set c%02d=NULL where idmovie=%i", VIDEODB_ID_TITLE, lMovieId);
+      m_pDS->exec(strSQL.c_str());
+	  }
+    */
+    
     CStdString strPath, strFileName;
     SplitPath(strFilenameAndPath,strPath,strFileName);
     InvalidatePathHash(strPath);
@@ -2153,7 +2205,7 @@
   }
 }
 
-void CVideoDatabase::DeleteTvShow(const CStdString& strPath)
+void CVideoDatabase::DeleteTvShow(const CStdString& strPath, bool bKeepId /* = false */, bool bKeepThumb /* = false */)
 {
   try
   {
@@ -2166,16 +2218,15 @@
       return ;
     }
 
-    DeleteThumbForItem(strPath,true);
+    BeginTransaction();
 
-    BeginTransaction();
     CStdString strSQL=FormatSQL("select tvshowlinkepisode.idepisode,path.strPath,files.strFileName from tvshowlinkepisode,path,files,episode where tvshowlinkepisode.idshow=%u and tvshowlinkepisode.idepisode=episode.idEpisode and episode.idFile=files.idFile and files.idPath=path.idPath",lTvShowId);
     m_pDS2->query(strSQL.c_str());
     while (!m_pDS2->eof())
     {
       CStdString strPath;
       CUtil::AddFileToFolder(m_pDS2->fv("path.strPath").get_asString(),m_pDS2->fv("files.strFilename").get_asString(),strPath);
-      DeleteEpisode(strPath,m_pDS2->fv(0).get_asLong());
+      DeleteEpisode(strPath,m_pDS2->fv(0).get_asLong(), bKeepId);
       m_pDS2->next();
     }
 
@@ -2191,12 +2242,28 @@
     strSQL=FormatSQL("delete from tvshowlinkpath where idshow=%u", lTvShowId);
     m_pDS->exec(strSQL.c_str());
 
-    strSQL=FormatSQL("delete from tvshow where idshow=%i", lTvShowId);
-    m_pDS->exec(strSQL.c_str());
+    if (!bKeepThumb)
+      DeleteThumbForItem(strPath,true);
 
-    strSQL=FormatSQL("delete from movielinktvshow where idshow=%i", lTvShowId);
-    m_pDS->exec(strSQL.c_str());
+    // keep tvshow table and movielink table so we can update data in place
+    if (!bKeepId)
+    {
+      strSQL=FormatSQL("delete from tvshow where idshow=%i", lTvShowId);
+      m_pDS->exec(strSQL.c_str());
 
+      strSQL=FormatSQL("delete from movielinktvshow where idshow=%i", lTvShowId);
+      m_pDS->exec(strSQL.c_str());
+    }
+    /*
+    // work in progress
+    else
+	  {
+      // clear the title
+      strSQL=FormatSQL("update tvshow set c%02d=NULL where idshow=%i", VIDEODB_ID_TV_TITLE, lTvShowId);
+      m_pDS->exec(strSQL.c_str());
+	  }
+    */
+
     InvalidatePathHash(strPath);
 
     CommitTransaction();
@@ -2207,7 +2274,7 @@
   }
 }
 
-void CVideoDatabase::DeleteEpisode(const CStdString& strFilenameAndPath, long lEpisodeId)
+void CVideoDatabase::DeleteEpisode(const CStdString& strFilenameAndPath, long lEpisodeId, bool bKeepId /* = false */, bool bKeepThumb /* = false */)
 {
   try
   {
@@ -2222,10 +2289,6 @@
       }
     }
 
-    DeleteThumbForItem(strFilenameAndPath,false); 
-
-    ClearBookMarksOfFile(strFilenameAndPath);
-
     CStdString strSQL;
     strSQL=FormatSQL("delete from actorlinkepisode where idepisode=%i", lEpisodeId);
     m_pDS->exec(strSQL.c_str());
@@ -2240,12 +2303,28 @@
     strSQL=FormatSQL("delete from tvshowlinkepisode where idepisode=%i", lEpisodeId);
     m_pDS->exec(strSQL.c_str());
 
-    strSQL=FormatSQL("delete from episode where idepisode=%i", lEpisodeId);
-    m_pDS->exec(strSQL.c_str());
+    if (!bKeepThumb)
+      DeleteThumbForItem(strFilenameAndPath,false); 
 
-    CStdString path;
-    GetFilePathById(idShow, path, VIDEODB_CONTENT_TVSHOWS);
-    InvalidatePathHash(path);
+    // keep episode table entry and bookmarks so we can update the data in place
+    // the ancilliary tables are still purged
+    if (!bKeepId)
+    {
+      ClearBookMarksOfFile(strFilenameAndPath);
+
+      strSQL=FormatSQL("delete from episode where idepisode=%i", lEpisodeId);
+      m_pDS->exec(strSQL.c_str());
+    }
+    /*
+    // work in progress
+    else
+	  {
+      // clear the title
+      strSQL=FormatSQL("update episode set c%02d=NULL where idepisode=%i", VIDEODB_ID_EPISODE_TITLE, lEpisodeId);
+      m_pDS->exec(strSQL.c_str());
+	  }
+    */
+
   }
   catch (...)
   {
@@ -2253,7 +2332,7 @@
   }
 }
 
-void CVideoDatabase::DeleteMusicVideo(const CStdString& strFilenameAndPath)
+void CVideoDatabase::DeleteMusicVideo(const CStdString& strFilenameAndPath, bool bKeepId /* = false */, bool bKeepThumb /* = false */)
 {
   try
   {
@@ -2265,8 +2344,6 @@
       return ;
     }
 
-    ClearBookMarksOfFile(strFilenameAndPath);
-
     CStdString strSQL;
     strSQL=FormatSQL("delete from genrelinkmusicvideo where idmvideo=%i", lMVideoId);
     m_pDS->exec(strSQL.c_str());
@@ -2280,9 +2357,28 @@
     strSQL=FormatSQL("delete from studiolinkmusicvideo where idmvideo=%i", lMVideoId);
     m_pDS->exec(strSQL.c_str());
 
-    strSQL=FormatSQL("delete from musicvideo where idmvideo=%i", lMVideoId);
-    m_pDS->exec(strSQL.c_str());
+    if (!bKeepThumb)
+      DeleteThumbForItem(strFilenameAndPath,false); 
 
+    // keep the music video table entry and bookmarks so we can update data in place
+    // the ancilliary tables are still purged
+    if (!bKeepId)
+    {
+      ClearBookMarksOfFile(strFilenameAndPath);
+
+      strSQL=FormatSQL("delete from musicvideo where idmvideo=%i", lMVideoId);
+      m_pDS->exec(strSQL.c_str());
+    }
+    /*
+    // work in progress
+    else
+	  {
+      // clear the title
+      strSQL=FormatSQL("update musicvideo set c%02d=NULL where idmvideo=%i", VIDEODB_ID_MUSICVIDEO_TITLE, lMVideoId);
+      m_pDS->exec(strSQL.c_str());
+	  }
+    */
+
     CStdString strPath, strFileName;
     SplitPath(strFilenameAndPath,strPath,strFileName);
     InvalidatePathHash(strPath);
@@ -4105,7 +4201,7 @@
     CLog::Log(LOGDEBUG,"Time to retrieve movies from dataset = %d",
               timeGetTime() - time);
     if (g_guiSettings.GetBool("videolibrary.removeduplicates"))
-      Stack(items);
+      Stack(items, VIDEODB_CONTENT_TVSHOWS);
 
     // cleanup
     m_pDS->close();
@@ -4118,7 +4214,7 @@
   return false;
 }
 
-void CVideoDatabase::Stack(CFileItemList& items, VIDEODB_CONTENT_TYPE type /* = VIDEODB_CONTENT_TVSHOWS */)
+void CVideoDatabase::Stack(CFileItemList& items, VIDEODB_CONTENT_TYPE type)
 {
   switch (type)
   {
@@ -4174,7 +4270,79 @@
       }
     }
     break;
+    case VIDEODB_CONTENT_EPISODES:
+    {
+      // sort by ShowTitle, Episode, Filename
+      items.Sort(SORT_METHOD_EPISODE, SORT_ORDER_ASC);
 
+      int i = 0;
+      while (i < items.Size())
+      {
+        CFileItemPtr pItem = items.Get(i);
+        CStdString strPath = pItem->GetVideoInfoTag()->m_strPath;
+        int iSeason = pItem->GetVideoInfoTag()->m_iSeason;
+        int iEpisode = pItem->GetVideoInfoTag()->m_iEpisode;
+        //CStdString strFanArt = pItem->GetProperty("fanart_image");
+
+        vector<CStdString> paths;
+        paths.push_back(pItem->GetVideoInfoTag()->m_strFileNameAndPath);
+        CLog::Log(LOGDEBUG, "Stack episode (%i,%i):[%s]", iSeason, iEpisode, paths[0].c_str());
+
+        int j = i + 1;
+        while (j < items.Size())
+        {
+          CFileItemPtr jItem = items.Get(j);
+          const CVideoInfoTag *jTag = jItem->GetVideoInfoTag();
+
+          CLog::Log(LOGDEBUG, " *testing (%i,%i):[%s]", jTag->m_iSeason, jTag->m_iEpisode, jTag->m_strFileNameAndPath.c_str());
+          // compare path, season, episode
+          if (
+            jTag &&
+            jTag->m_strPath.Equals(strPath) &&
+            jTag->m_iSeason == iSeason && 
+            jTag->m_iEpisode == iEpisode
+            )
+          {
+            paths.push_back(jTag->m_strFileNameAndPath);
+
+            // increment playcount
+            pItem->GetVideoInfoTag()->m_playCount += jTag->m_playCount;
+
+            /* episodes dont have fanart yet
+            // check for fanart if not already set
+            if (strFanArt.IsEmpty())
+              strFanArt = jItem->GetProperty("fanart_image");
+            */
+
+            // remove duplicate entry
+            jTag = NULL;
+            items.Remove(j);
+          }
+          // no match? exit loop
+          else
+            break;
+        }
+        // update playcount and fanart if we have a stacked entry
+        if (paths.size() > 1)
+        {
+          CStackDirectory dir;
+          CStdString strStack;
+          dir.ConstructStackPath(paths, strStack);
+          pItem->GetVideoInfoTag()->m_strFileNameAndPath = strStack;
+          
+          pItem->SetOverlayImage(CGUIListItem::ICON_OVERLAY_UNWATCHED, pItem->GetVideoInfoTag()->m_playCount > 0);
+
+          /* episodes dont have fanart yet
+          if (!strFanArt.IsEmpty())
+            pItem->SetProperty("fanart_image", strFanArt);
+          */
+        }
+        // increment i to j which is the next item
+        i = j;
+      }
+    }
+    break;
+
     // stack other types later
     default:
       break;
@@ -4269,6 +4437,8 @@
 
     CLog::Log(LOGDEBUG,"Time to retrieve movies from dataset = %d",
               timeGetTime() - time);
+    if (g_guiSettings.GetBool("videolibrary.removeduplicates"))
+      Stack(items, VIDEODB_CONTENT_EPISODES);
 
     // cleanup
     m_pDS->close();

Modified: branches/linuxport/XBMC/xbmc/VideoDatabase.h
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoDatabase.h	2008-07-23 00:44:34 UTC (rev 14373)
+++ branches/linuxport/XBMC/xbmc/VideoDatabase.h	2008-07-23 01:04:02 UTC (rev 14374)
@@ -72,7 +72,7 @@
   VIDEODB_CONTENT_MOVIES = 1,
   VIDEODB_CONTENT_TVSHOWS = 2,
   VIDEODB_CONTENT_MUSICVIDEOS = 3,
-  VIDEODB_CONTENT_EPISODES    = 4
+  VIDEODB_CONTENT_EPISODES = 4
 } VIDEODB_CONTENT_TYPE;
 
 typedef enum // this enum MUST match the offset struct further down!! and make sure to keep min and max at -1 and sizeof(offsets)
@@ -324,10 +324,10 @@
   long SetDetailsForEpisode(const CStdString& strFilenameAndPath, const CVideoInfoTag& details, long idShow, long lEpisodeId=-1);
   void SetDetailsForMusicVideo(const CStdString& strFilenameAndPath, const CVideoInfoTag& details);
 
-  void DeleteMovie(const CStdString& strFilenameAndPath);
-  void DeleteTvShow(const CStdString& strPath);
-  void DeleteEpisode(const CStdString& strFilenameAndPath, long lEpisodeId=-1);
-  void DeleteMusicVideo(const CStdString& strFilenameAndPath);
+  void DeleteMovie(const CStdString& strFilenameAndPath, bool bKeepId = false, bool bKeepThumb = false);
+  void DeleteTvShow(const CStdString& strPath, bool bKeepId = false, bool bKeepThumb = false);
+  void DeleteEpisode(const CStdString& strFilenameAndPath, long lEpisodeId = -1, bool bKeepId = false, bool bKeepThumb = false);
+  void DeleteMusicVideo(const CStdString& strFilenameAndPath, bool bKeepId = false, bool bKeepThumb = false);
   void DeleteDetailsForTvShow(const CStdString& strPath);
   void RemoveContentForPath(const CStdString& strPath,CGUIDialogProgress *progress = NULL);
 
@@ -496,5 +496,5 @@
   void DeleteThumbForItem(const CStdString& strPath, bool bFolder);
 
   bool GetStackedTvShowList(long idShow, CStdString& strIn);
-  void Stack(CFileItemList& items, VIDEODB_CONTENT_TYPE type = VIDEODB_CONTENT_TVSHOWS);
+  void Stack(CFileItemList& items, VIDEODB_CONTENT_TYPE type);
 };

Modified: branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp	2008-07-23 00:44:34 UTC (rev 14373)
+++ branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp	2008-07-23 01:04:02 UTC (rev 14374)
@@ -391,7 +391,7 @@
     for (int i = 0; i < (int)items.Size(); ++i)
     {
       IMDB_EPISODELIST episodes;
-      IMDB_EPISODELIST files;
+      EPISODES files;
       CFileItemPtr pItem = items[i];
 
       // we do this since we may have a override per dir
@@ -439,7 +439,7 @@
           // fetch episode guide
           m_database.GetTvShowInfo(pItem->m_strPath,showDetails,lTvShowId);
           files.clear();
-          EnumerateSeriesFolder(pItem.get(),files);
+          EnumerateSeriesFolder(pItem.get(), files);
           if (files.size() == 0) // no update or no files
             continue;
 
@@ -672,7 +672,7 @@
     return count;
   }
 
-  void CVideoInfoScanner::EnumerateSeriesFolder(const CFileItem* item, IMDB_EPISODELIST& episodeList)
+  void CVideoInfoScanner::EnumerateSeriesFolder(const CFileItem* item, EPISODES& episodeList)
   {
     CFileItemList items;
     CRegExp regExSample;
@@ -748,6 +748,9 @@
         CLog::Log(LOGDEBUG,"running expression %s on label %s",expression[j].c_str(),strLabel.c_str());
         int regexppos, regexp2pos;
 
+        SEpisode myEpisode;
+        myEpisode.strPath = items[i]->m_strPath;
+
         if ((regexppos = reg.RegFind(strLabel.c_str())) > -1)
         {
           char* season = reg.GetReplaceString("\\1");
@@ -756,13 +759,10 @@
           if (season && episode)
           {
             CLog::Log(LOGDEBUG,"found match %s %s %s",strLabel.c_str(),season,episode);
-            int iSeason = atoi(season);
-            int iEpisode = atoi(episode);
-            std::pair<int,int> key(iSeason,iEpisode);
-            CScraperUrl url(items[i]->m_strPath);
-            episodeList.insert(std::make_pair<std::pair<int,int>,CScraperUrl>(key,url));
+            myEpisode.iSeason = atoi(season);
+            myEpisode.iEpisode = atoi(episode);
+            episodeList.push_back(myEpisode);
             bMatched = true;
-
             // check the remainder of the string for any further episodes.
             CRegExp reg2;
             if (!reg2.RegComp(g_advancedSettings.m_tvshowMultiPartStackRegExp))
@@ -779,12 +779,12 @@
               {
                 season = reg.GetReplaceString("\\1");
                 episode = reg.GetReplaceString("\\2");
-                key.first = atoi(season);
-                key.second = atoi(episode);
+                myEpisode.iSeason = atoi(season);
+                myEpisode.iEpisode = atoi(episode);
                 free(season);
                 free(episode);
-                CLog::Log(LOGDEBUG, "adding new season %u, multipart episode %u", key.first, key.second);
-                episodeList.insert(std::make_pair<std::pair<int,int>,CScraperUrl>(key,url));
+                CLog::Log(LOGDEBUG, "adding new season %u, multipart episode %u", myEpisode.iSeason, myEpisode.iEpisode);
+                episodeList.push_back(myEpisode);
                 remainder = reg.GetReplaceString("\\3");
                 offset = 0;
               } 
@@ -792,10 +792,10 @@
                        (regexp2pos >= 0 && regexppos == -1))
               {
                 episode = reg2.GetReplaceString("\\1");
-                key.second = atoi(episode);
+                myEpisode.iEpisode = atoi(episode);
                 free(episode);
-                CLog::Log(LOGDEBUG, "adding multipart episode %u", key.second);
-                episodeList.insert(std::make_pair<std::pair<int,int>,CScraperUrl>(key,url));
+                CLog::Log(LOGDEBUG, "adding multipart episode %u", myEpisode.iEpisode);
+                episodeList.push_back(myEpisode);
                 offset += regexp2pos + reg2.GetFindLen();
               }
             }
@@ -901,7 +901,7 @@
     return lResult;
   }
 
-  void CVideoInfoScanner::OnProcessSeriesFolder(IMDB_EPISODELIST& episodes, IMDB_EPISODELIST& files, long lShowId, CIMDB& IMDB, const CStdString& strShowTitle, CGUIDialogProgress* pDlgProgress /* = NULL */)
+  void CVideoInfoScanner::OnProcessSeriesFolder(IMDB_EPISODELIST& episodes, EPISODES& files, long lShowId, CIMDB& IMDB, const CStdString& strShowTitle, CGUIDialogProgress* pDlgProgress /* = NULL */)
   {
     if (pDlgProgress)
     {
@@ -914,7 +914,7 @@
     int iMax = files.size();
     int iCurr = 1;
     m_database.Open();
-    for (IMDB_EPISODELIST::iterator iter = files.begin();iter != files.end();++iter)
+    for (EPISODES::iterator file = files.begin(); file != files.end(); ++file)
     {
       if (pDlgProgress)
       {
@@ -938,7 +938,7 @@
       }
 
       CVideoInfoTag episodeDetails;
-      if (m_database.GetEpisodeId(iter->second.m_url[0].m_url,iter->first.second,iter->first.first) > -1)
+      if (m_database.GetEpisodeId(file->strPath,file->iEpisode,file->iSeason) > -1)
       {
         if (m_pObserver)
           m_pObserver->OnSetTitle(g_localizeStrings.Get(20415));
@@ -946,7 +946,7 @@
       }
 
       CFileItem item;
-      item.m_strPath = iter->second.m_url[0].m_url;
+      item.m_strPath = file->strPath;
 
       // handle .nfo files
       CStdString strNfoFile = GetnfoFile(&item,false);
@@ -966,13 +966,16 @@
         }
       }
 
-      IMDB_EPISODELIST::iterator iter2 = episodes.find(iter->first);
-      if (iter2 != episodes.end())
+      std::pair<int,int> key;
+      key.first = file->iSeason;
+      key.second = file->iEpisode;
+      IMDB_EPISODELIST::iterator guide = episodes.find(key);
+      if (guide != episodes.end())
       {
-        if (!IMDB.GetEpisodeDetails(iter2->second,episodeDetails,pDlgProgress))
+        if (!IMDB.GetEpisodeDetails(guide->second,episodeDetails,pDlgProgress))
           break;
-        episodeDetails.m_iSeason = iter2->first.first;
-        episodeDetails.m_iEpisode = iter2->first.second;
+        episodeDetails.m_iSeason = guide->first.first;
+        episodeDetails.m_iEpisode = guide->first.second;
         if (m_pObserver)
         {
           CStdString strTitle;
@@ -980,7 +983,7 @@
           m_pObserver->OnSetTitle(strTitle);
         }
         CFileItem item;
-        item.m_strPath = iter->second.m_url[0].m_url;
+        item.m_strPath = file->strPath;
         AddMovieAndGetThumb(&item,"tvshows",episodeDetails,lShowId);
       }
     }

Modified: branches/linuxport/XBMC/xbmc/VideoInfoScanner.h
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoInfoScanner.h	2008-07-23 00:44:34 UTC (rev 14373)
+++ branches/linuxport/XBMC/xbmc/VideoInfoScanner.h	2008-07-23 01:04:02 UTC (rev 14374)
@@ -23,6 +23,7 @@
 #include "VideoDatabase.h"
 #include "ScraperSettings.h"
 #include "NfoFile.h"
+#include "IMDB.h"
 
 class CIMDB;
 
@@ -35,6 +36,15 @@
     int  recurse;           /* recurse into sub folders (indicate levels) */
   } SScanSettings;
 
+  typedef struct SEpisode
+  {
+    CStdString strPath;
+    int iSeason;
+    int iEpisode;
+  } SEpisode;
+
+  typedef std::vector<SEpisode> EPISODES;
+
   enum SCAN_STATE { PREPARING = 0, REMOVING_OLD, CLEANING_UP_DATABASE, FETCHING_MOVIE_INFO, FETCHING_MUSICVIDEO_INFO, FETCHING_TVSHOW_INFO, COMPRESSING_DATABASE, WRITING_CHANGES };
 
   class IVideoInfoScannerObserver
@@ -60,9 +70,9 @@
     void Stop();
     void SetObserver(IVideoInfoScannerObserver* pObserver);
 
-    void EnumerateSeriesFolder(const CFileItem* item, std::map<std::pair<int,int>,CScraperUrl>& episodeList);
+    void EnumerateSeriesFolder(const CFileItem* item, EPISODES& episodeList);
     long AddMovieAndGetThumb(CFileItem *pItem, const CStdString &content, const CVideoInfoTag &movieDetails, long idShow, bool bApplyToDir=false, CGUIDialogProgress* pDialog = NULL);
-    void OnProcessSeriesFolder(std::map<std::pair<int,int>,CScraperUrl>& episodes, std::map<std::pair<int,int>,CScraperUrl>& files, long lShowId, CIMDB& IMDB, const CStdString& strShowTitle, CGUIDialogProgress* pDlgProgress = NULL);
+    void OnProcessSeriesFolder(IMDB_EPISODELIST& episodes, EPISODES& files, long lShowId, CIMDB& IMDB, const CStdString& strShowTitle, CGUIDialogProgress* pDlgProgress = NULL);
     static CStdString GetnfoFile(CFileItem *item, bool bGrabAny=false);
     long GetIMDBDetails(CFileItem *pItem, CScraperUrl &url, const SScraperInfo& info, bool bUseDirNames=false, CGUIDialogProgress* pDialog=NULL);
     bool RetrieveVideoInfo(CFileItemList& items, bool bDirNames, const SScraperInfo& info, bool bRefresh=false, CScraperUrl *pURL=NULL, CGUIDialogProgress* pDlgProgress  = NULL);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14379
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14379&view=rev
Author:   jmarshallnz
Date:     2008-07-23 03:52:57 +0000 (Wed, 23 Jul 2008)

Log Message:
-----------
added: Groundwork to allow edit controls to be used in the GUI settings.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUISettings.cpp
    branches/linuxport/XBMC/xbmc/GUISettings.h
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.h
    branches/linuxport/XBMC/xbmc/SettingsControls.cpp
    branches/linuxport/XBMC/xbmc/SettingsControls.h

Modified: branches/linuxport/XBMC/xbmc/GUISettings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-07-23 02:35:41 UTC (rev 14378)
+++ branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-07-23 03:52:57 UTC (rev 14379)
@@ -289,7 +289,7 @@
 
   AddCategory(3, "cddaripper", 620);
   AddString(1, "cddaripper.path", 20000, "select writable folder", BUTTON_CONTROL_PATH_INPUT, false, 657);
-  AddString(2, "cddaripper.trackformat", 13307, "[%N. ]%T - %A", BUTTON_CONTROL_INPUT, false, 16016);
+  AddString(2, "cddaripper.trackformat", 13307, "[%N. ]%T - %A", EDIT_CONTROL_INPUT, false, 16016);
   AddInt(3, "cddaripper.encoder", 621, CDDARIP_ENCODER_LAME, CDDARIP_ENCODER_LAME, 1, CDDARIP_ENCODER_WAV, SPIN_CONTROL_TEXT);
   AddInt(4, "cddaripper.quality", 622, CDDARIP_QUALITY_CBR, CDDARIP_QUALITY_CBR, 1, CDDARIP_QUALITY_EXTREME, SPIN_CONTROL_TEXT);
   AddInt(5, "cddaripper.bitrate", 623, 192, 128, 32, 320, SPIN_CONTROL_INT_PLUS, MASK_KBPS);
@@ -480,7 +480,7 @@
   AddSeparator(12, "network.sep1");
 #endif
   AddBool(13, "network.usehttpproxy", 708, false);
-  AddString(14, "network.httpproxyserver", 706, "", BUTTON_CONTROL_IP_INPUT);
+  AddString(14, "network.httpproxyserver", 706, "", EDIT_CONTROL_IP_INPUT);
   AddString(15, "network.httpproxyport", 707, "8080", BUTTON_CONTROL_INPUT, false, 707);
   AddSeparator(16, "network.sep2");
   AddBool(17, "network.enableinternet", 14054, true);
@@ -508,8 +508,8 @@
 #endif
 
   AddCategory(6, "smb", 1200);
-  AddString(1, "smb.username",    1203,   "", BUTTON_CONTROL_INPUT, true, 1203);
-  AddString(2, "smb.password",    1204,   "", BUTTON_CONTROL_HIDDEN_INPUT, true, 1204);
+  AddString(1, "smb.username",    1203,   "", EDIT_CONTROL_INPUT, true, 1203);
+  AddString(2, "smb.password",    1204,   "", EDIT_CONTROL_HIDDEN_INPUT, true, 1204);
   AddString(3, "smb.winsserver",  1207,   "",  BUTTON_CONTROL_IP_INPUT);
   AddString(4, "smb.workgroup",   1202,   "WORKGROUP", BUTTON_CONTROL_INPUT, false, 1202);
 #ifdef _LINUX

Modified: branches/linuxport/XBMC/xbmc/GUISettings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUISettings.h	2008-07-23 02:35:41 UTC (rev 14378)
+++ branches/linuxport/XBMC/xbmc/GUISettings.h	2008-07-23 03:52:57 UTC (rev 14379)
@@ -120,18 +120,21 @@
 #define SETTINGS_TYPE_HEX    5
 #define SETTINGS_TYPE_SEPARATOR 6
 
-#define CHECKMARK_CONTROL    1
-#define SPIN_CONTROL_FLOAT   2
-#define SPIN_CONTROL_INT    3
-#define SPIN_CONTROL_INT_PLUS  4
-#define SPIN_CONTROL_TEXT    5
-#define BUTTON_CONTROL_INPUT    6
+#define CHECKMARK_CONTROL           1
+#define SPIN_CONTROL_FLOAT          2
+#define SPIN_CONTROL_INT            3
+#define SPIN_CONTROL_INT_PLUS       4
+#define SPIN_CONTROL_TEXT           5
+#define BUTTON_CONTROL_INPUT        6
 #define BUTTON_CONTROL_HIDDEN_INPUT 7
-#define BUTTON_CONTROL_STANDARD   8
-#define BUTTON_CONTROL_IP_INPUT   9
-#define BUTTON_CONTROL_MISC_INPUT 10
-#define BUTTON_CONTROL_PATH_INPUT 11
-#define SEPARATOR_CONTROL 12
+#define BUTTON_CONTROL_STANDARD     8
+#define BUTTON_CONTROL_IP_INPUT     9
+#define BUTTON_CONTROL_MISC_INPUT  10
+#define BUTTON_CONTROL_PATH_INPUT  11
+#define SEPARATOR_CONTROL          12
+#define EDIT_CONTROL_INPUT         13
+#define EDIT_CONTROL_HIDDEN_INPUT  14
+#define EDIT_CONTROL_IP_INPUT      15
 
 #define REPLAY_GAIN_NONE 0
 #define REPLAY_GAIN_ALBUM 1

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-07-23 02:35:41 UTC (rev 14378)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-07-23 03:52:57 UTC (rev 14379)
@@ -104,6 +104,7 @@
 #define CONTROL_DEFAULT_SPIN            9
 #define CONTROL_DEFAULT_CATEGORY_BUTTON 10
 #define CONTROL_DEFAULT_SEPARATOR       11
+#define CONTROL_DEFAULT_EDIT            12
 #define CONTROL_START_BUTTONS           30
 #define CONTROL_START_CONTROL           50
 
@@ -336,10 +337,14 @@
   m_pOriginalImage = (CGUIImage *)GetControl(CONTROL_DEFAULT_SEPARATOR);
   if (!m_pOriginalCategoryButton || !m_pOriginalSpin || !m_pOriginalRadioButton || !m_pOriginalButton)
     return ;
+  m_pOriginalEdit = (CGUIEditControl *)GetControl(CONTROL_DEFAULT_EDIT);
+  if (!m_pOriginalEdit)
+    m_pOriginalEdit = new CGUIEditControl(*m_pOriginalButton);
   m_pOriginalSpin->SetVisible(false);
   m_pOriginalRadioButton->SetVisible(false);
   m_pOriginalButton->SetVisible(false);
   m_pOriginalCategoryButton->SetVisible(false);
+  m_pOriginalEdit->SetVisible(false);
   if (m_pOriginalImage) m_pOriginalImage->SetVisible(false);
   // setup our control groups...
 #ifdef PRE_SKIN_VERSION_2_1_COMPATIBILITY
@@ -1073,7 +1078,7 @@
     }
     else if (strSetting.Equals("servers.webserverpassword"))
     { // Fill in a blank pass if we don't have it
-      CGUIButtonControl *pControl = (CGUIButtonControl *)GetControl(pSettingControl->GetID());
+      CGUIEditControl *pControl = (CGUIEditControl *)GetControl(pSettingControl->GetID());
       if (((CSettingString *)pSettingControl->GetSetting())->GetData().size() == 0 && pControl)
       {
         pControl->SetLabel2(g_localizeStrings.Get(734));
@@ -2259,10 +2264,8 @@
 {
   CBaseSettingControl *pSettingControl = NULL;
   CGUIControl *pControl = NULL;
-  CGUIControl *baseControl = NULL;
   if (pSetting->GetControlType() == CHECKMARK_CONTROL)
   {
-    baseControl = m_pOriginalRadioButton;
     pControl = new CGUIRadioButtonControl(*m_pOriginalRadioButton);
     if (!pControl) return ;
     ((CGUIRadioButtonControl *)pControl)->SetLabel(g_localizeStrings.Get(pSetting->GetLabel()));
@@ -2271,7 +2274,6 @@
   }
   else if (pSetting->GetControlType() == SPIN_CONTROL_FLOAT || pSetting->GetControlType() == SPIN_CONTROL_INT_PLUS || pSetting->GetControlType() == SPIN_CONTROL_TEXT || pSetting->GetControlType() == SPIN_CONTROL_INT)
   {
-    baseControl = m_pOriginalSpin;
     pControl = new CGUISpinControlEx(*m_pOriginalSpin);
     if (!pControl) return ;
     pControl->SetWidth(width);
@@ -2280,15 +2282,24 @@
   }
   else if (pSetting->GetControlType() == SEPARATOR_CONTROL && m_pOriginalImage)
   {
-    baseControl = m_pOriginalImage;
     pControl = new CGUIImage(*m_pOriginalImage);
     if (!pControl) return;
     pControl->SetWidth(width);
     pSettingControl = new CSeparatorSettingControl((CGUIImage *)pControl, iControlID, pSetting);
   }
+  else if (pSetting->GetControlType() == EDIT_CONTROL_INPUT ||
+           pSetting->GetControlType() == EDIT_CONTROL_HIDDEN_INPUT ||
+           pSetting->GetControlType() == EDIT_CONTROL_IP_INPUT)
+  {
+    pControl = new CGUIEditControl(*m_pOriginalEdit);
+    if (!pControl) return ;
+    ((CGUIEditControl *)pControl)->SettingsCategorySetTextAlign(XBFONT_CENTER_Y);
+    ((CGUIEditControl *)pControl)->SetLabel(g_localizeStrings.Get(pSetting->GetLabel()));
+    pControl->SetWidth(width);
+    pSettingControl = new CEditSettingControl((CGUIEditControl *)pControl, iControlID, pSetting);
+  }
   else if (pSetting->GetControlType() != SEPARATOR_CONTROL) // button control
   {
-    baseControl = m_pOriginalButton;
     pControl = new CGUIButtonControl(*m_pOriginalButton);
     if (!pControl) return ;
     ((CGUIButtonControl *)pControl)->SettingsCategorySetTextAlign(XBFONT_CENTER_Y);

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.h	2008-07-23 02:35:41 UTC (rev 14378)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.h	2008-07-23 03:52:57 UTC (rev 14379)
@@ -94,6 +94,7 @@
   CGUIRadioButtonControl *m_pOriginalRadioButton;
   CGUIButtonControl *m_pOriginalCategoryButton;
   CGUIButtonControl *m_pOriginalButton;
+  CGUIEditControl *m_pOriginalEdit;
   CGUIImage *m_pOriginalImage;
   // Network settings
   int m_iNetworkAssignment;

Modified: branches/linuxport/XBMC/xbmc/SettingsControls.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/SettingsControls.cpp	2008-07-23 02:35:41 UTC (rev 14378)
+++ branches/linuxport/XBMC/xbmc/SettingsControls.cpp	2008-07-23 03:52:57 UTC (rev 14379)
@@ -193,9 +193,40 @@
   m_pButton->SetLabel2(strText);
 }
 
+CEditSettingControl::CEditSettingControl(CGUIEditControl *pEdit, DWORD dwID, CSetting *pSetting)
+    : CBaseSettingControl(dwID, pSetting)
+{
+  m_pEdit = pEdit;
+  m_pEdit->SetID(dwID);
+  int heading = ((CSettingString *)m_pSetting)->m_iHeadingString;
+  if (heading < 0) heading = 0;
+  if (pSetting->GetControlType() == EDIT_CONTROL_HIDDEN_INPUT)
+    m_pEdit->SetInputType(CGUIEditControl::INPUT_TYPE_PASSWORD, heading);
+  else if (pSetting->GetControlType() == EDIT_CONTROL_IP_INPUT)
+    m_pEdit->SetInputType(CGUIEditControl::INPUT_TYPE_IPADDRESS, heading);
+  else
+    m_pEdit->SetInputType(CGUIEditControl::INPUT_TYPE_TEXT, heading);
+  Update();
+}
 
-bool CButtonSettingControl::IsValidIPAddress(const CStdString &strIP)
+CEditSettingControl::~CEditSettingControl()
 {
+}
+
+bool CEditSettingControl::OnClick()
+{
+  // update our string
+  ((CSettingString *)m_pSetting)->SetData(m_pEdit->GetLabel2());
+  return true;
+}
+
+void CEditSettingControl::Update()
+{
+  m_pEdit->SetLabel2(((CSettingString *)m_pSetting)->GetData());
+}
+
+bool CEditSettingControl::IsValidIPAddress(const CStdString &strIP)
+{
   const char* s = strIP.c_str();
   bool legalFormat = true;
   bool numSet = false;

Modified: branches/linuxport/XBMC/xbmc/SettingsControls.h
===================================================================
--- branches/linuxport/XBMC/xbmc/SettingsControls.h	2008-07-23 02:35:41 UTC (rev 14378)
+++ branches/linuxport/XBMC/xbmc/SettingsControls.h	2008-07-23 03:52:57 UTC (rev 14379)
@@ -21,7 +21,7 @@
  */
 
 #include "GUISpinControlEx.h"
-#include "GUIButtonControl.h"
+#include "GUIEditControl.h"
 #include "GUIRadioButtonControl.h"
 
 class CSetting;
@@ -72,10 +72,21 @@
   virtual bool OnClick();
   virtual void Update();
 private:
-  bool IsValidIPAddress(const CStdString &strIP);
   CGUIButtonControl *m_pButton;
 };
 
+class CEditSettingControl : public CBaseSettingControl
+{
+public:
+  CEditSettingControl(CGUIEditControl* pButton, DWORD dwID, CSetting *pSetting);
+  virtual ~CEditSettingControl();
+  virtual bool OnClick();
+  virtual void Update();
+private:
+  bool IsValidIPAddress(const CStdString &strIP);
+  CGUIEditControl *m_pEdit;
+};
+
 class CSeparatorSettingControl : public CBaseSettingControl
 {
 public:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14381
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14381&view=rev
Author:   jmarshallnz
Date:     2008-07-23 06:37:42 +0000 (Wed, 23 Jul 2008)

Log Message:
-----------
fixed: Ticket #3859 - "Remember views for different folders" cannot be disabled.  Note that this isn't really a particularly attractive option when coupled with the default views that we have (essentially nothing is remembered, so changes to views made are immediately forgotten again)

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIViewState.cpp
    branches/linuxport/XBMC/xbmc/GUIViewState.h
    branches/linuxport/XBMC/xbmc/GUIViewStateMusic.cpp
    branches/linuxport/XBMC/xbmc/GUIViewStateMusic.h
    branches/linuxport/XBMC/xbmc/GUIViewStatePictures.cpp
    branches/linuxport/XBMC/xbmc/GUIViewStatePrograms.cpp
    branches/linuxport/XBMC/xbmc/GUIViewStateVideo.cpp
    branches/linuxport/XBMC/xbmc/GUIViewStateVideo.h
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIViewState.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIViewState.cpp	2008-07-23 05:43:33 UTC (rev 14380)
+++ branches/linuxport/XBMC/xbmc/GUIViewState.cpp	2008-07-23 06:37:42 UTC (rev 14381)
@@ -372,23 +372,17 @@
   }
 }
 
-void CGUIViewState::SaveViewToDb(const CStdString &path, int windowID)
+void CGUIViewState::SaveViewToDb(const CStdString &path, int windowID, CViewState *viewState)
 {
-  CViewState state(m_currentViewAsControl, GetSortMethod(), m_sortOrder);
-  SaveViewToDb(path, windowID, state, false);
-}
-
-void CGUIViewState::SaveViewToDb(const CStdString &path, int windowID, CViewState &viewState, bool saveSettings)
-{
   CViewDatabase db;
   if (db.Open())
   {
-    viewState.m_viewMode = m_currentViewAsControl;
-    viewState.m_sortMethod = GetSortMethod();
-    viewState.m_sortOrder = m_sortOrder;
-    db.SetViewState(path, windowID, viewState);
+    CViewState state(m_currentViewAsControl, GetSortMethod(), m_sortOrder);
+    if (viewState)
+      *viewState = state;
+    db.SetViewState(path, windowID, state);
     db.Close();
-    if (saveSettings)
+    if (viewState)
       g_settings.Save();
   }
 }

Modified: branches/linuxport/XBMC/xbmc/GUIViewState.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIViewState.h	2008-07-23 05:43:33 UTC (rev 14380)
+++ branches/linuxport/XBMC/xbmc/GUIViewState.h	2008-07-23 06:37:42 UTC (rev 14381)
@@ -66,8 +66,7 @@
 protected:
   CGUIViewState(const CFileItemList& items);  // no direct object creation, use GetViewState()
   virtual void SaveViewState()=0;
-  void SaveViewToDb(const CStdString &path, int windowID);
-  void SaveViewToDb(const CStdString &path, int windowID, CViewState &viewState, bool saveSettings = true);
+  virtual void SaveViewToDb(const CStdString &path, int windowID, CViewState *viewState = NULL);
   void LoadViewState(const CStdString &path, int windowID);
 
   void AddSortMethod(SORT_METHOD sortMethod, int buttonLabel, LABEL_MASKS labelmasks);

Modified: branches/linuxport/XBMC/xbmc/GUIViewStateMusic.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIViewStateMusic.cpp	2008-07-23 05:43:33 UTC (rev 14380)
+++ branches/linuxport/XBMC/xbmc/GUIViewStateMusic.cpp	2008-07-23 06:37:42 UTC (rev 14381)
@@ -60,6 +60,15 @@
   return g_stSettings.m_musicExtensions;
 }
 
+void CGUIViewStateWindowMusic::SaveViewToDb(const CStdString &path, int windowID, CViewState *viewState)
+{
+  // Note that musicfiles.savefolderviews only seems to apply to files view
+  // (see CGUIWindowSettingsCategory::ClearFolderViews), so that's all we
+  // check for here.
+  if (windowID != WINDOW_MUSIC_FILES || g_guiSettings.GetBool("musicfiles.savefolderviews"))
+    CGUIViewState::SaveViewToDb(path, windowID, viewState);
+}
+
 CGUIViewStateMusicSearch::CGUIViewStateMusicSearch(const CFileItemList& items) : CGUIViewStateWindowMusic(items)
 {
   CStdString strTrackLeft=g_guiSettings.GetString("musicfiles.librarytrackformat");
@@ -96,7 +105,7 @@
 
 void CGUIViewStateMusicSearch::SaveViewState()
 {
-  SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_NAV, g_stSettings.m_viewStateMusicNavSongs);
+  SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_NAV, &g_stSettings.m_viewStateMusicNavSongs);
 }
 
 CGUIViewStateMusicDatabase::CGUIViewStateMusicDatabase(const CFileItemList& items) : CGUIViewStateWindowMusic(items)
@@ -314,12 +323,12 @@
   switch (NodeType)
   {
     case NODE_TYPE_ARTIST:
-      SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_NAV, g_stSettings.m_viewStateMusicNavArtists);
+      SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_NAV, &g_stSettings.m_viewStateMusicNavArtists);
       break;
     case NODE_TYPE_ALBUM_COMPILATIONS:
     case NODE_TYPE_ALBUM:
     case NODE_TYPE_YEAR_ALBUM:
-      SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_NAV, g_stSettings.m_viewStateMusicNavAlbums);
+      SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_NAV, &g_stSettings.m_viewStateMusicNavAlbums);
       break;
     case NODE_TYPE_ALBUM_RECENTLY_ADDED:
     case NODE_TYPE_ALBUM_TOP100:
@@ -329,7 +338,7 @@
     case NODE_TYPE_ALBUM_COMPILATIONS_SONGS:
     case NODE_TYPE_SONG:
     case NODE_TYPE_YEAR_SONG:
-      SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_NAV, g_stSettings.m_viewStateMusicNavSongs);
+      SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_NAV, &g_stSettings.m_viewStateMusicNavSongs);
       break;
     case NODE_TYPE_ALBUM_RECENTLY_PLAYED_SONGS:
     case NODE_TYPE_ALBUM_RECENTLY_ADDED_SONGS:
@@ -376,7 +385,7 @@
 
 void CGUIViewStateMusicSmartPlaylist::SaveViewState()
 {
-  SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_NAV, g_stSettings.m_viewStateMusicNavSongs);
+  SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_NAV, &g_stSettings.m_viewStateMusicNavSongs);
 }
 
 CGUIViewStateMusicPlaylist::CGUIViewStateMusicPlaylist(const CFileItemList& items) : CGUIViewStateWindowMusic(items)
@@ -672,7 +681,7 @@
 
 void CGUIViewStateMusicShoutcast::SaveViewState()
 {
-  SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_FILES, g_stSettings.m_viewStateMusicShoutcast);
+  SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_FILES, &g_stSettings.m_viewStateMusicShoutcast);
 }
 
 CGUIViewStateMusicLastFM::CGUIViewStateMusicLastFM(const CFileItemList& items) : CGUIViewStateWindowMusic(items)
@@ -698,6 +707,6 @@
 
 void CGUIViewStateMusicLastFM::SaveViewState()
 {
-  SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_FILES, g_stSettings.m_viewStateMusicLastFM);
+  SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_FILES, &g_stSettings.m_viewStateMusicLastFM);
 }
 

Modified: branches/linuxport/XBMC/xbmc/GUIViewStateMusic.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIViewStateMusic.h	2008-07-23 05:43:33 UTC (rev 14380)
+++ branches/linuxport/XBMC/xbmc/GUIViewStateMusic.h	2008-07-23 06:37:42 UTC (rev 14381)
@@ -29,6 +29,8 @@
 public:
   CGUIViewStateWindowMusic(const CFileItemList& items) : CGUIViewState(items) {}
 protected:
+  virtual void SaveViewToDb(const CStdString &path, int windowID, CViewState *viewState = NULL);
+
   virtual int GetPlaylist();
   virtual bool UnrollArchives();
   virtual bool AutoPlayNextItem();

Modified: branches/linuxport/XBMC/xbmc/GUIViewStatePictures.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIViewStatePictures.cpp	2008-07-23 05:43:33 UTC (rev 14380)
+++ branches/linuxport/XBMC/xbmc/GUIViewStatePictures.cpp	2008-07-23 06:37:42 UTC (rev 14381)
@@ -57,7 +57,8 @@
 
 void CGUIViewStateWindowPictures::SaveViewState()
 {
-  SaveViewToDb(m_items.m_strPath, WINDOW_PICTURES);
+  if (g_guiSettings.GetBool("pictures.savefolderviews"))
+    SaveViewToDb(m_items.m_strPath, WINDOW_PICTURES);
 }
 
 CStdString CGUIViewStateWindowPictures::GetLockType()

Modified: branches/linuxport/XBMC/xbmc/GUIViewStatePrograms.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIViewStatePrograms.cpp	2008-07-23 05:43:33 UTC (rev 14380)
+++ branches/linuxport/XBMC/xbmc/GUIViewStatePrograms.cpp	2008-07-23 06:37:42 UTC (rev 14381)
@@ -49,7 +49,8 @@
 
 void CGUIViewStateWindowPrograms::SaveViewState()
 {
-  SaveViewToDb(m_items.m_strPath, WINDOW_PROGRAMS);
+  if (g_guiSettings.GetBool("programfiles.savefolderviews"))
+    SaveViewToDb(m_items.m_strPath, WINDOW_PROGRAMS);
 }
 
 CStdString CGUIViewStateWindowPrograms::GetLockType()

Modified: branches/linuxport/XBMC/xbmc/GUIViewStateVideo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIViewStateVideo.cpp	2008-07-23 05:43:33 UTC (rev 14380)
+++ branches/linuxport/XBMC/xbmc/GUIViewStateVideo.cpp	2008-07-23 06:37:42 UTC (rev 14381)
@@ -52,6 +52,15 @@
   return PLAYLIST_VIDEO;
 }
 
+void CGUIViewStateWindowVideo::SaveViewToDb(const CStdString &path, int windowID, CViewState *viewState)
+{
+  // Note that myvideos.savefolderviews only seems to apply to files view
+  // (see CGUIWindowSettingsCategory::ClearFolderViews), so that's all we
+  // check for here.
+  if (windowID != WINDOW_VIDEO_FILES || g_guiSettings.GetBool("myvideos.savefolderviews"))
+    CGUIViewState::SaveViewToDb(path, windowID, viewState);
+}
+
 CGUIViewStateWindowVideoFiles::CGUIViewStateWindowVideoFiles(const CFileItemList& items) : CGUIViewStateWindowVideo(items)
 {
   if (items.IsVirtualDirectoryRoot())
@@ -302,28 +311,28 @@
   switch (NodeType)
   {
   case NODE_TYPE_ACTOR:
-    SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, g_stSettings.m_viewStateVideoNavActors);
+    SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, &g_stSettings.m_viewStateVideoNavActors);
     break;
   case NODE_TYPE_YEAR:
-    SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, g_stSettings.m_viewStateVideoNavYears);
+    SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, &g_stSettings.m_viewStateVideoNavYears);
     break;
   case NODE_TYPE_GENRE:
-    SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, g_stSettings.m_viewStateVideoNavGenres);
+    SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, &g_stSettings.m_viewStateVideoNavGenres);
     break;
   case NODE_TYPE_TITLE_MOVIES:
-    SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, g_stSettings.m_viewStateVideoNavTitles);
+    SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, &g_stSettings.m_viewStateVideoNavTitles);
     break;
   case NODE_TYPE_EPISODES:
-    SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, g_stSettings.m_viewStateVideoNavEpisodes);
+    SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, &g_stSettings.m_viewStateVideoNavEpisodes);
     break;
   case NODE_TYPE_TITLE_TVSHOWS:
-    SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, g_stSettings.m_viewStateVideoNavTvShows);
+    SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, &g_stSettings.m_viewStateVideoNavTvShows);
     break;
   case NODE_TYPE_SEASONS:
-    SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, g_stSettings.m_viewStateVideoNavSeasons);
+    SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, &g_stSettings.m_viewStateVideoNavSeasons);
     break;
   case NODE_TYPE_TITLE_MUSICVIDEOS:
-    SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, g_stSettings.m_viewStateVideoNavMusicVideos);
+    SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, &g_stSettings.m_viewStateVideoNavMusicVideos);
   default:
     SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV);
     break;
@@ -440,7 +449,7 @@
 
 void CGUIViewStateVideoMovies::SaveViewState()
 {
-  SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, g_stSettings.m_viewStateVideoNavTitles);
+  SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, &g_stSettings.m_viewStateVideoNavTitles);
 }
 
 
@@ -474,7 +483,7 @@
 
 void CGUIViewStateVideoMusicVideos::SaveViewState()
 {
-  SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, g_stSettings.m_viewStateVideoNavMusicVideos);
+  SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, &g_stSettings.m_viewStateVideoNavMusicVideos);
 }
 
 
@@ -499,7 +508,7 @@
 
 void CGUIViewStateVideoTVShows::SaveViewState()
 {
-  SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, g_stSettings.m_viewStateVideoNavTvShows);
+  SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, &g_stSettings.m_viewStateVideoNavTvShows);
 }
 
 
@@ -536,6 +545,6 @@
 
 void CGUIViewStateVideoEpisodes::SaveViewState()
 {
-  SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, g_stSettings.m_viewStateVideoNavEpisodes);
+  SaveViewToDb(m_items.m_strPath, WINDOW_VIDEO_NAV, &g_stSettings.m_viewStateVideoNavEpisodes);
 }
 

Modified: branches/linuxport/XBMC/xbmc/GUIViewStateVideo.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIViewStateVideo.h	2008-07-23 05:43:33 UTC (rev 14380)
+++ branches/linuxport/XBMC/xbmc/GUIViewStateVideo.h	2008-07-23 06:37:42 UTC (rev 14381)
@@ -30,6 +30,8 @@
   CGUIViewStateWindowVideo(const CFileItemList& items) : CGUIViewState(items) {}
 
 protected:
+  virtual void SaveViewToDb(const CStdString &path, int windowID, CViewState *viewState = NULL);
+
   virtual CStdString GetLockType();
   virtual bool UnrollArchives();
   virtual int GetPlaylist();

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-07-23 05:43:33 UTC (rev 14380)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-07-23 06:37:42 UTC (rev 14381)
@@ -3491,7 +3491,7 @@
     CViewDatabase db;
     if (db.Open())
     {
-      db.ClearViewStates(WINDOW_MUSIC_FILES);
+      db.ClearViewStates(windowID);
       db.Close();
     }
   }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14397
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14397&view=rev
Author:   charlydoes
Date:     2008-07-23 21:45:19 +0000 (Wed, 23 Jul 2008)

Log Message:
-----------
[WIN32] changed: cleaned up ftello/telli/seeko/seeki a bit.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
    branches/linuxport/XBMC/xbmc/win32/PlatformDefs.h

Modified: branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2008-07-23 21:41:48 UTC (rev 14396)
+++ branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2008-07-23 21:45:19 UTC (rev 14397)
@@ -58,7 +58,10 @@
 using namespace DIRECTORY;
 
 #if defined(_MSC_VER) && _MSC_VER < 1500
-extern "C" __int64 __cdecl _ftelli64(FILE *);
+extern "C" {
+  __int64 __cdecl _ftelli64(FILE *);
+  int __cdecl _fseeki64(FILE *, __int64, int);
+}
 #endif
 
 struct SDirData
@@ -970,10 +973,10 @@
     {
       // it might be something else than a file, or the file is not emulated
       // let the operating system handle it
-#ifndef __APPLE__
+#if __APPLE__
+      return fseek(stream, offset, origin);
+#else
       return fseeko64(stream, offset, origin);
-#else
-      return fseek(stream, offset, origin);
 #endif
     }
     CLog::Log(LOGERROR, "%s emulated function failed",  __FUNCTION__);
@@ -1035,9 +1038,7 @@
     {
       // it might be something else than a file, or the file is not emulated
       // let the operating system handle it
-#ifdef _WIN32
-      return (off64_t)_ftelli64(stream);
-#elif defined(__APPLE__)
+#if defined(__APPLE__)
       return ftello(stream);
 #else
       return ftello64(stream);

Modified: branches/linuxport/XBMC/xbmc/win32/PlatformDefs.h
===================================================================
--- branches/linuxport/XBMC/xbmc/win32/PlatformDefs.h	2008-07-23 21:41:48 UTC (rev 14396)
+++ branches/linuxport/XBMC/xbmc/win32/PlatformDefs.h	2008-07-23 21:45:19 UTC (rev 14397)
@@ -34,12 +34,13 @@
 #endif
 #endif
 #ifndef off64_t
-#define off64_t off_t
+#define off64_t long long
 #endif
-#ifndef fseeko64
-#define fseeko64 fseek
-#endif
-#endif
 
+#define ftello64 _ftelli64
+#define fseeko64 _fseeki64
+
+#endif // _WIN32
+
 #endif //__PLATFORM_DEFS_H__
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14398
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14398&view=rev
Author:   spiff_
Date:     2008-07-23 21:53:01 +0000 (Wed, 23 Jul 2008)

Log Message:
-----------
fixed: dll path mess introduced in rev 14389

Revision Links:
--------------
    http://xbmc.svn.sourceforge.net/xbmc/?rev=14389&view=rev

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/DllPaths_generated.h.in
    branches/linuxport/XBMC/xbmc/DllPaths_win32.h
    branches/linuxport/XBMC/xbmc/DynamicDll.h
    branches/linuxport/XBMC/xbmc/FileSystem/HDHomeRun.h
    branches/linuxport/XBMC/xbmc/cdrip/DllOgg.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h
    branches/linuxport/XBMC/xbmc/cores/ffmpeg/DllAvCodec.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DllLibshnplay.h

Modified: branches/linuxport/XBMC/xbmc/DllPaths_generated.h.in
===================================================================
--- branches/linuxport/XBMC/xbmc/DllPaths_generated.h.in	2008-07-23 21:45:19 UTC (rev 14397)
+++ branches/linuxport/XBMC/xbmc/DllPaths_generated.h.in	2008-07-23 21:53:01 UTC (rev 14398)
@@ -5,6 +5,7 @@
 #define DLL_PATH_IMAGELIB      "Q:\\system\\ImageLib-@..."
 #define DLL_PATH_LIBEXIF       "Q:\\system\\libexif-@..."
 #define DLL_PATH_LIBID3TAG     "Q:\\system\\libid3tag-@..."
+#define DLL_PATH_LIBHDHOMERUN  "Q:\\system\\hdhomerun-@..."
 #define DLL_PATH_LIBCMYTH      "xbmc.so"
 #ifdef __APPLE__
 #define DLL_PATH_LIBCURL       "Q:\\system\\libcurl-@..."
@@ -42,10 +43,12 @@
 #define DLL_PATH_LIBFAAD       "Q:\\system\\players\\dvdplayer\\libfaad-@..."
 #define DLL_PATH_LIBMAD        "Q:\\system\\players\\dvdplayer\\libmad-@..."
 #define DLL_PATH_LIBMPEG2      "Q:\\system\\players\\dvdplayer\\libmpeg2-@..."
+#define DLL_PATH_LIBDVDNAV     "Q:\\system\\players\\dvdplayer\\libdvdnav-@..."
 
 /* ffmpeg */
 #define DLL_PATH_LIBAVCODEC    "Q:\\system\\players\\dvdplayer\\avcodec-51-@..."
 #define DLL_PATH_LIBAVFORMAT   "Q:\\system\\players\\dvdplayer\\avformat-51-@..."
+#define DLL_PATH_LIBAVUTIL     "Q:\\system\\players\\dvdplayer\\avutil-51-@..."
 #define DLL_PATH_LIBPOSTPROC   "Q:\\system\\players\\dvdplayer\\postproc-51-@..."
 #define DLL_PATH_LIBSWSCALE    "Q:\\system\\players\\dvdplayer\\swscale-51-@..."
 

Modified: branches/linuxport/XBMC/xbmc/DllPaths_win32.h
===================================================================
--- branches/linuxport/XBMC/xbmc/DllPaths_win32.h	2008-07-23 21:45:19 UTC (rev 14397)
+++ branches/linuxport/XBMC/xbmc/DllPaths_win32.h	2008-07-23 21:53:01 UTC (rev 14398)
@@ -6,6 +6,7 @@
 #define DLL_PATH_LIBEXIF       "Q:\\system\\libexif.dll"
 #define DLL_PATH_LIBID3TAG     "Q:\\system\\libid3tag.dll"
 #define DLL_PATH_LIBCMYTH      "Q:\\system\\libcmyth.dll"
+#define DLL_PATH_LIBHDHOMERUN  "Q:\\system\\hdhomerun.dll"
 #define DLL_PATH_LIBCURL       "Q:\\system\\libcurl.dll"
 
 /* paplayer */
@@ -38,10 +39,12 @@
 #define DLL_PATH_LIBFAAD       "Q:\\system\\players\\dvdplayer\\libfaad.dll"
 #define DLL_PATH_LIBMAD        "Q:\\system\\players\\dvdplayer\\libmad.dll"
 #define DLL_PATH_LIBMPEG2      "Q:\\system\\players\\dvdplayer\\libmpeg2.dll"
+#define DLL_PATH_LIBDVDNAV     "Q:\\system\\players\\dvdplayer\\libdvdnav.dll"
 
 /* ffmpeg */
 #define DLL_PATH_LIBAVCODEC    "Q:\\system\\players\\dvdplayer\\avcodec-51.dll"
 #define DLL_PATH_LIBAVFORMAT   "Q:\\system\\players\\dvdplayer\\avformat-52.dll"
+#define DLL_PATH_LIBAVUTIL     "Q:\\system\\players\\dvdplayer\\avutil-49.so"
 #define DLL_PATH_LIBPOSTPROC   "Q:\\system\\players\\dvdplayer\\postproc-51.dll"
 #define DLL_PATH_LIBSWSCALE    "Q:\\system\\players\\dvdplayer\\swscale-0.5.0.dll"
 

Modified: branches/linuxport/XBMC/xbmc/DynamicDll.h
===================================================================
--- branches/linuxport/XBMC/xbmc/DynamicDll.h	2008-07-23 21:45:19 UTC (rev 14397)
+++ branches/linuxport/XBMC/xbmc/DynamicDll.h	2008-07-23 21:53:01 UTC (rev 14398)
@@ -36,10 +36,13 @@
 //
 //  classname: name of the wrapper class to construct
 //  dllname: file including path of the dll to wrap
-//
+
 #define DECLARE_DLL_WRAPPER(classname, dllname) \
+XDECLARE_DLL_WRAPPER(classname,dllname)
+
+#define XDECLARE_DLL_WRAPPER(classname, dllname) \
 public: \
-  classname () : DllDynamic( #dllname ) {}
+  classname () : DllDynamic( dllname ) {}
 
 ///////////////////////////////////////////////////////////
 //

Modified: branches/linuxport/XBMC/xbmc/FileSystem/HDHomeRun.h
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/HDHomeRun.h	2008-07-23 21:45:19 UTC (rev 14397)
+++ branches/linuxport/XBMC/xbmc/FileSystem/HDHomeRun.h	2008-07-23 21:53:01 UTC (rev 14398)
@@ -44,13 +44,7 @@
 
 class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface
 {
-#ifndef _LINUX
-  DECLARE_DLL_WRAPPER(DllHdHomeRun, Q:\\system\\hdhomerun.dll)
-#elif defined(__x86_64__)
-  DECLARE_DLL_WRAPPER(DllHdHomeRun, Q:\\system\\hdhomerun-x86_64-linux.so)
-#else
-  DECLARE_DLL_WRAPPER(DllHdHomeRun, Q:\\system\\hdhomerun-i486-linux.so)
-#endif
+  DECLARE_DLL_WRAPPER(DllHdHomeRun, DLL_PATH_LIBHDHOMERUN)
   DEFINE_METHOD3(int, discover_find_devices, (uint32_t p1, struct hdhomerun_discover_device_t p2[], int p3))
   DEFINE_METHOD1(struct hdhomerun_device_t*, device_create_from_str, (const char* p1))
   DEFINE_METHOD1(void, device_destroy, (struct hdhomerun_device_t* p1))

Modified: branches/linuxport/XBMC/xbmc/cdrip/DllOgg.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cdrip/DllOgg.h	2008-07-23 21:45:19 UTC (rev 14397)
+++ branches/linuxport/XBMC/xbmc/cdrip/DllOgg.h	2008-07-23 21:53:01 UTC (rev 14398)
@@ -38,7 +38,7 @@
 
 class DllOgg : public DllDynamic, DllOggInterface
 {
-  DECLARE_DLL_WRAPPER(DllOgg, DLL_PATH_OGG_ENC)
+  DECLARE_DLL_WRAPPER(DllOgg, DLL_PATH_OGG)
   DEFINE_METHOD1(int, ogg_page_eos, (ogg_page *p1))
   DEFINE_METHOD2(int, ogg_stream_init, (ogg_stream_state *p1, int p2))
   DEFINE_METHOD1(int, ogg_stream_clear, (ogg_stream_state *p1))

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h	2008-07-23 21:45:19 UTC (rev 14397)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h	2008-07-23 21:53:01 UTC (rev 14398)
@@ -101,15 +101,7 @@
 
 class DllDvdNav : public DllDynamic, DllDvdNavInterface
 {
-#ifdef __APPLE__
-  DECLARE_DLL_WRAPPER(DllDvdNav, Q:\\system\\players\\dvdplayer\\libdvdnav-osx.so)
-#elif !defined(_LINUX)
-  DECLARE_DLL_WRAPPER(DllDvdNav, Q:\\system\\players\\dvdplayer\\libdvdnav.dll)
-#elif defined(__x86_64__)
-  DECLARE_DLL_WRAPPER(DllDvdNav, Q:\\system\\players\\dvdplayer\\libdvdnav-x86_64-linux.so)
-#else
-  DECLARE_DLL_WRAPPER(DllDvdNav, Q:\\system\\players\\dvdplayer\\libdvdnav-i486-linux.so)
-#endif
+  DECLARE_DLL_WRAPPER(DllDvdNav, DLL_PATH_LIBDVDNAV)
 
   DEFINE_METHOD2(dvdnav_status_t, dvdnav_open, (dvdnav_t **p1, const char *p2))
   DEFINE_METHOD1(dvdnav_status_t, dvdnav_close, (dvdnav_t *p1))

Modified: branches/linuxport/XBMC/xbmc/cores/ffmpeg/DllAvCodec.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/ffmpeg/DllAvCodec.h	2008-07-23 21:45:19 UTC (rev 14397)
+++ branches/linuxport/XBMC/xbmc/cores/ffmpeg/DllAvCodec.h	2008-07-23 21:53:01 UTC (rev 14398)
@@ -238,15 +238,7 @@
 
 class DllAvUtilBase : public DllDynamic, DllAvUtilInterface
 {
-#ifdef __APPLE__
-  DECLARE_DLL_WRAPPER(DllAvUtilBase, Q:\\system\\players\\dvdplayer\\avutil-51-osx.so)
-#elif !defined(_LINUX)
-  DECLARE_DLL_WRAPPER(DllAvUtilBase, Q:\\system\\players\\dvdplayer\\avutil-49.dll)
-#elif defined(__x86_64__)
-  DECLARE_DLL_WRAPPER(DllAvUtilBase, Q:\\system\\players\\dvdplayer\\avutil-51-x86_64-linux.so)
-#else
-  DECLARE_DLL_WRAPPER(DllAvUtilBase, Q:\\system\\players\\dvdplayer\\avutil-51-i486-linux.so)
-#endif
+  DECLARE_DLL_WRAPPER(DllAvUtilBase, DLL_PATH_LIBAVUTIL)
 
   LOAD_SYMBOLS()
 

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/DllLibshnplay.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/DllLibshnplay.h	2008-07-23 21:45:19 UTC (rev 14397)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/DllLibshnplay.h	2008-07-23 21:53:01 UTC (rev 14398)
@@ -46,7 +46,7 @@
 
 class DllLibShnPlay : public DllDynamic, DllLibShnPlayInterface
 {
-  DECLARE_DLL_WRAPPER(DllLibShnPlay, Q:\\system\\players\\PAPlayer\\libshnplay.dll)
+  DECLARE_DLL_WRAPPER(DllLibShnPlay, "Q:\\system\\players\\PAPlayer\\libshnplay.dll")
   DEFINE_METHOD3(int, OpenStream, (ShnPlay ** p1, ShnPlayStream * p2, unsigned int p3))
   DEFINE_METHOD1(int, Close, (ShnPlay * p1))
   DEFINE_METHOD2(int, GetInfo, (ShnPlay * p1, ShnPlayInfo * p2))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14407
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14407&view=rev
Author:   jmarshallnz
Date:     2008-07-24 01:24:23 +0000 (Thu, 24 Jul 2008)

Log Message:
-----------
changed: Only update editcontrol based settings on exit of the category.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.h
    branches/linuxport/XBMC/xbmc/SettingsControls.cpp
    branches/linuxport/XBMC/xbmc/SettingsControls.h

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-07-24 00:57:25 UTC (rev 14406)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-07-24 01:24:23 UTC (rev 14407)
@@ -179,6 +179,9 @@
       if (focusedControl >= CONTROL_START_BUTTONS && focusedControl < (DWORD) (CONTROL_START_BUTTONS + m_vecSections.size()) &&
           focusedControl - CONTROL_START_BUTTONS != (DWORD) m_iSection)
       {
+        // changing section, check for updates
+        CheckForUpdates();
+
         if (m_vecSections[focusedControl-CONTROL_START_BUTTONS]->m_strCategory == "masterlock")
         {
           if (!g_passwordManager.IsMasterLockUnlocked(true))
@@ -316,6 +319,7 @@
       if (g_videoConfig.NeedsSave())
         g_videoConfig.Save();
 
+      CheckForUpdates();
       CheckNetworkSettings();
       CGUIWindow::OnMessage(message);
       FreeControls();
@@ -1389,10 +1393,34 @@
     }
   }
 
-  // if OnClick() returns false, the setting hasn't changed
-  if (!pSettingControl->OnClick()) // call the control to do it's thing
+  // if OnClick() returns false, the setting hasn't changed or doesn't
+  // require immediate update
+  if (!pSettingControl->OnClick())
+  {
+    UpdateSettings();
     return;
+  }
 
+  OnSettingChanged(pSettingControl);
+}
+
+void CGUIWindowSettingsCategory::CheckForUpdates()
+{
+  for (unsigned int i = 0; i < m_vecSettings.size(); i++)
+  {
+    CBaseSettingControl *pSettingControl = m_vecSettings[i];
+    if (pSettingControl->NeedsUpdate())
+    {
+      OnSettingChanged(pSettingControl);
+      pSettingControl->Reset();
+    }
+  }
+}
+
+void CGUIWindowSettingsCategory::OnSettingChanged(CBaseSettingControl *pSettingControl)
+{
+  CStdString strSetting = pSettingControl->GetSetting()->GetSetting();
+
   if (strSetting.Equals("videoscreen.testresolution"))
   {
     RESOLUTION lastRes = g_graphicsContext.GetVideoResolution();

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.h	2008-07-24 00:57:25 UTC (rev 14406)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.h	2008-07-24 01:24:23 UTC (rev 14407)
@@ -76,9 +76,11 @@
   void CreateSettings();
   void UpdateSettings();
   void UpdateRealTimeSettings();
+  void CheckForUpdates();
   void FreeSettingsControls();
   virtual void FreeControls();
   virtual void OnClick(CBaseSettingControl *pSettingControl);
+  virtual void OnSettingChanged(CBaseSettingControl *pSettingControl);
   void AddSetting(CSetting *pSetting, float width, int &iControlID);
   CBaseSettingControl* GetSetting(const CStdString &strSetting);
 

Modified: branches/linuxport/XBMC/xbmc/SettingsControls.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/SettingsControls.cpp	2008-07-24 00:57:25 UTC (rev 14406)
+++ branches/linuxport/XBMC/xbmc/SettingsControls.cpp	2008-07-24 01:24:23 UTC (rev 14407)
@@ -196,6 +196,7 @@
 CEditSettingControl::CEditSettingControl(CGUIEditControl *pEdit, DWORD dwID, CSetting *pSetting)
     : CBaseSettingControl(dwID, pSetting)
 {
+  m_needsUpdate = false;
   m_pEdit = pEdit;
   m_pEdit->SetID(dwID);
   int heading = ((CSettingString *)m_pSetting)->m_iHeadingString;
@@ -217,7 +218,9 @@
 {
   // update our string
   ((CSettingString *)m_pSetting)->SetData(m_pEdit->GetLabel2());
-  return true;
+  // we update on exit only
+  m_needsUpdate = true;
+  return false;
 }
 
 void CEditSettingControl::Update()

Modified: branches/linuxport/XBMC/xbmc/SettingsControls.h
===================================================================
--- branches/linuxport/XBMC/xbmc/SettingsControls.h	2008-07-24 00:57:25 UTC (rev 14406)
+++ branches/linuxport/XBMC/xbmc/SettingsControls.h	2008-07-24 01:24:23 UTC (rev 14407)
@@ -35,7 +35,8 @@
   virtual void Update() {};
   DWORD GetID() { return m_dwID; };
   CSetting* GetSetting() { return m_pSetting; };
-
+  virtual bool NeedsUpdate() { return false; };   ///< Returns true if the control needs an update
+  virtual void Reset() {}; ///< Resets the NeedsUpdate() state
 protected:
   DWORD m_dwID;
   CSetting* m_pSetting;
@@ -82,9 +83,12 @@
   virtual ~CEditSettingControl();
   virtual bool OnClick();
   virtual void Update();
+  virtual bool NeedsUpdate() { return m_needsUpdate; };
+  virtual void Reset() { m_needsUpdate = false; };
 private:
   bool IsValidIPAddress(const CStdString &strIP);
   CGUIEditControl *m_pEdit;
+  bool m_needsUpdate;
 };
 
 class CSeparatorSettingControl : public CBaseSettingControl


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14411
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14411&view=rev
Author:   jmarshallnz
Date:     2008-07-24 06:17:00 +0000 (Thu, 24 Jul 2008)

Log Message:
-----------
fixed: crashes due to CUtil::GetMatchingSource() shenanigans.  Note that this function is just about always used incorrectly, and ideally should be removed.  Fixes Ticket #4365.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileSystem/VirtualPathDirectory.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogContextMenu.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogFileBrowser.cpp
    branches/linuxport/XBMC/xbmc/GUIPassword.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowFileManager.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowMusicSongs.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowPictures.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowPrograms.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp
    branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp

Modified: branches/linuxport/XBMC/xbmc/FileSystem/VirtualPathDirectory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/VirtualPathDirectory.cpp	2008-07-24 06:04:34 UTC (rev 14410)
+++ branches/linuxport/XBMC/xbmc/FileSystem/VirtualPathDirectory.cpp	2008-07-24 06:17:00 UTC (rev 14411)
@@ -177,7 +177,7 @@
   int iIndex = CUtil::GetMatchingSource(strSource, *VECSOURCES, bIsSourceName);
   if (!bIsSourceName)
     return false;
-  if (iIndex < 0)
+  if (iIndex < 0 || iIndex >= (int)VECSOURCES->size())
     return false;
 
   share = (*VECSOURCES)[iIndex];

Modified: branches/linuxport/XBMC/xbmc/GUIDialogContextMenu.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogContextMenu.cpp	2008-07-24 06:04:34 UTC (rev 14410)
+++ branches/linuxport/XBMC/xbmc/GUIDialogContextMenu.cpp	2008-07-24 06:17:00 UTC (rev 14411)
@@ -553,7 +553,7 @@
 
   bool bIsSourceName(false);
   int iIndex = CUtil::GetMatchingSource(strDefault, *pShares, bIsSourceName);
-  if (iIndex < 0)
+  if (iIndex < 0 || iIndex >= (int)pShares->size())
     return "";
 
   return pShares->at(iIndex).strName;

Modified: branches/linuxport/XBMC/xbmc/GUIDialogFileBrowser.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogFileBrowser.cpp	2008-07-24 06:04:34 UTC (rev 14410)
+++ branches/linuxport/XBMC/xbmc/GUIDialogFileBrowser.cpp	2008-07-24 06:17:00 UTC (rev 14411)
@@ -116,7 +116,7 @@
         bool bFool;
         int iSource = CUtil::GetMatchingSource(m_selectedPath,m_shares,bFool);
         bFool = true;
-        if (iSource > -1)
+        if (iSource > -1 && iSource < (int)m_shares.size())
         {
           if (m_shares[iSource].strPath.Equals(m_selectedPath))
             bFool = false;

Modified: branches/linuxport/XBMC/xbmc/GUIPassword.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIPassword.cpp	2008-07-24 06:04:34 UTC (rev 14410)
+++ branches/linuxport/XBMC/xbmc/GUIPassword.cpp	2008-07-24 06:17:00 UTC (rev 14411)
@@ -527,7 +527,7 @@
   bool bName = false;
   int iIndex = CUtil::GetMatchingSource(strPath, vecSources, bName);
 
-  if (iIndex > -1)
+  if (iIndex > -1 && iIndex < (int)vecSources.size())
     if (vecSources[iIndex].m_iHasLock < 2)
       return true;
 

Modified: branches/linuxport/XBMC/xbmc/GUIWindowFileManager.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowFileManager.cpp	2008-07-24 06:04:34 UTC (rev 14410)
+++ branches/linuxport/XBMC/xbmc/GUIWindowFileManager.cpp	2008-07-24 06:17:00 UTC (rev 14411)
@@ -1588,7 +1588,7 @@
       if (iIndex > -1)
       {
         // set current directory to matching share
-        if (bIsSourceName)
+        if (bIsSourceName && iIndex < (int)shares.size())
           m_Directory[0]->m_strPath = shares[iIndex].strPath;
         else
           m_Directory[0]->m_strPath = strDestination;

Modified: branches/linuxport/XBMC/xbmc/GUIWindowMusicSongs.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowMusicSongs.cpp	2008-07-24 06:04:34 UTC (rev 14410)
+++ branches/linuxport/XBMC/xbmc/GUIWindowMusicSongs.cpp	2008-07-24 06:17:00 UTC (rev 14411)
@@ -120,7 +120,7 @@
           if (iIndex > -1)
           {
             bool unlocked = true;
-            if (shares[iIndex].m_iHasLock == 2)
+            if (iIndex < (int)shares.size() && shares[iIndex].m_iHasLock == 2)
             {
               CFileItem item(shares[iIndex]);
               if (!g_passwordManager.IsItemUnlocked(&item,"music"))

Modified: branches/linuxport/XBMC/xbmc/GUIWindowPictures.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowPictures.cpp	2008-07-24 06:04:34 UTC (rev 14410)
+++ branches/linuxport/XBMC/xbmc/GUIWindowPictures.cpp	2008-07-24 06:17:00 UTC (rev 14411)
@@ -120,7 +120,7 @@
           if (iIndex > -1)
           {
             bool bDoStuff = true;
-            if (shares[iIndex].m_iHasLock == 2)
+            if (iIndex < (int)shares.size() && shares[iIndex].m_iHasLock == 2)
             {
               CFileItem item(shares[iIndex]);
               if (!g_passwordManager.IsItemUnlocked(&item,"pictures"))

Modified: branches/linuxport/XBMC/xbmc/GUIWindowPrograms.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowPrograms.cpp	2008-07-24 06:04:34 UTC (rev 14410)
+++ branches/linuxport/XBMC/xbmc/GUIWindowPrograms.cpp	2008-07-24 06:17:00 UTC (rev 14411)
@@ -118,7 +118,7 @@
           if (iIndex > -1)
           {
             bool bDoStuff = true;
-            if (shares[iIndex].m_iHasLock == 2)
+            if (iIndex < (int)shares.size() && shares[iIndex].m_iHasLock == 2)
             {
               CFileItem item(shares[iIndex]);
               if (!g_passwordManager.IsItemUnlocked(&item,"programs"))

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp	2008-07-24 06:04:34 UTC (rev 14410)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp	2008-07-24 06:17:00 UTC (rev 14411)
@@ -120,7 +120,7 @@
           if (iIndex > -1)
           {
             bool bDoStuff = true;
-            if (shares[iIndex].m_iHasLock == 2)
+            if (iIndex < shares.size() && shares[iIndex].m_iHasLock == 2)
             {
               CFileItem item(shares[iIndex]);
               if (!g_passwordManager.IsItemUnlocked(&item,"video"))

Modified: branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp	2008-07-24 06:04:34 UTC (rev 14410)
+++ branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp	2008-07-24 06:17:00 UTC (rev 14411)
@@ -713,7 +713,7 @@
     VECSOURCES VECSOURCES = *pShares;
     bool bIsShareName = false;
     int iIndex = CUtil::GetMatchingSource(strLocation, VECSOURCES, bIsShareName);
-    if (iIndex < 0)
+    if (iIndex < 0 || iIndex >= (int)VECSOURCES.size())
     {
       CStdString strError = "Error: invalid location, " + strLocation;
       return SetResponse(openTag+strError);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14412
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14412&view=rev
Author:   jmarshallnz
Date:     2008-07-24 08:43:17 +0000 (Thu, 24 Jul 2008)

Log Message:
-----------
changed: All remaining virtual keyboard based button settings to edit controls.  Testing would be appreciated.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUISettings.cpp
    branches/linuxport/XBMC/xbmc/GUISettings.h
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp
    branches/linuxport/XBMC/xbmc/SettingsControls.cpp

Modified: branches/linuxport/XBMC/xbmc/GUISettings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-07-24 06:17:00 UTC (rev 14411)
+++ branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-07-24 08:43:17 UTC (rev 14412)
@@ -265,13 +265,13 @@
 
   AddCategory(3, "musicfiles", 744);
   AddBool(1, "musicfiles.usetags", 258, true);
-  AddString(2, "musicfiles.trackformat", 13307, "[%N. ]%A - %T", BUTTON_CONTROL_INPUT, false, 16016);
-  AddString(3, "musicfiles.trackformatright", 13387, "%D", BUTTON_CONTROL_INPUT, false, 16016);
+  AddString(2, "musicfiles.trackformat", 13307, "[%N. ]%A - %T", EDIT_CONTROL_INPUT, false, 16016);
+  AddString(3, "musicfiles.trackformatright", 13387, "%D", EDIT_CONTROL_INPUT, false, 16016);
   // advanced per-view trackformats.
-  AddString(0, "musicfiles.nowplayingtrackformat", 13307, "", BUTTON_CONTROL_INPUT, false, 16016);
-  AddString(0, "musicfiles.nowplayingtrackformatright", 13387, "", BUTTON_CONTROL_INPUT, false, 16016);
-  AddString(0, "musicfiles.librarytrackformat", 13307, "", BUTTON_CONTROL_INPUT, false, 16016);
-  AddString(0, "musicfiles.librarytrackformatright", 13387, "", BUTTON_CONTROL_INPUT, false, 16016);
+  AddString(0, "musicfiles.nowplayingtrackformat", 13307, "", EDIT_CONTROL_INPUT, false, 16016);
+  AddString(0, "musicfiles.nowplayingtrackformatright", 13387, "", EDIT_CONTROL_INPUT, false, 16016);
+  AddString(0, "musicfiles.librarytrackformat", 13307, "", EDIT_CONTROL_INPUT, false, 16016);
+  AddString(0, "musicfiles.librarytrackformatright", 13387, "", EDIT_CONTROL_INPUT, false, 16016);
   AddSeparator(4, "musicfiles.sep1");
   AddInt(5, "musicfiles.viewmode", 582, DEFAULT_VIEW_AUTO, DEFAULT_VIEW_LIST, DEFAULT_VIEW_LIST, DEFAULT_VIEW_MAX, SPIN_CONTROL_TEXT);
   AddInt(6, "musicfiles.sortmethod", 581, SORT_METHOD_LABEL, SORT_METHOD_LABEL, 1, SORT_METHOD_MAX, SPIN_CONTROL_TEXT);
@@ -284,8 +284,8 @@
   AddCategory(3, "lastfm", 15200);
   AddBool(1, "lastfm.enable", 15201, false);
   AddBool(2, "lastfm.recordtoprofile", 15250, false);
-  AddString(3,"lastfm.username", 15202, "", BUTTON_CONTROL_INPUT, false, 15202);
-  AddString(4,"lastfm.password", 15203, "", BUTTON_CONTROL_HIDDEN_INPUT, false, 15203);
+  AddString(3,"lastfm.username", 15202, "", EDIT_CONTROL_INPUT, false, 15202);
+  AddString(4,"lastfm.password", 15203, "", EDIT_CONTROL_HIDDEN_INPUT, false, 15203);
 
   AddCategory(3, "cddaripper", 620);
   AddString(1, "cddaripper.path", 20000, "select writable folder", BUTTON_CONTROL_PATH_INPUT, false, 657);
@@ -466,14 +466,14 @@
 #ifndef __APPLE__
   AddString(1, "network.interface",775,"", SPIN_CONTROL_TEXT);
   AddInt(2, "network.assignment", 715, NETWORK_DHCP, NETWORK_DHCP, 1, NETWORK_DISABLED, SPIN_CONTROL_TEXT);
-  AddString(3, "network.ipaddress", 719, "0.0.0.0", BUTTON_CONTROL_IP_INPUT);
-  AddString(4, "network.subnet", 720, "255.255.255.0", BUTTON_CONTROL_IP_INPUT);
-  AddString(5, "network.gateway", 721, "0.0.0.0", BUTTON_CONTROL_IP_INPUT);
-  AddString(6, "network.dns", 722, "0.0.0.0", BUTTON_CONTROL_IP_INPUT);
-  AddString(7, "network.dnssuffix", 22002, "", BUTTON_CONTROL_INPUT, true);
+  AddString(3, "network.ipaddress", 719, "0.0.0.0", EDIT_CONTROL_IP_INPUT);
+  AddString(4, "network.subnet", 720, "255.255.255.0", EDIT_CONTROL_IP_INPUT);
+  AddString(5, "network.gateway", 721, "0.0.0.0", EDIT_CONTROL_IP_INPUT);
+  AddString(6, "network.dns", 722, "0.0.0.0", EDIT_CONTROL_IP_INPUT);
+  AddString(7, "network.dnssuffix", 22002, "", EDIT_CONTROL_INPUT, true);
   AddString(8, "network.essid", 776, "0.0.0.0", BUTTON_CONTROL_STANDARD);
   AddInt(9, "network.enc", 778, ENC_NONE, ENC_NONE, 1, ENC_WPA2, SPIN_CONTROL_TEXT);
-  AddString(10, "network.key", 777, "0.0.0.0", BUTTON_CONTROL_INPUT);
+  AddString(10, "network.key", 777, "0.0.0.0", EDIT_CONTROL_INPUT);
 #ifndef _WIN32PC
   AddString(11, "network.save", 779, "", BUTTON_CONTROL_STANDARD);
 #endif
@@ -481,19 +481,19 @@
 #endif
   AddBool(13, "network.usehttpproxy", 708, false);
   AddString(14, "network.httpproxyserver", 706, "", EDIT_CONTROL_IP_INPUT);
-  AddString(15, "network.httpproxyport", 707, "8080", BUTTON_CONTROL_INPUT, false, 707);
+  AddString(15, "network.httpproxyport", 707, "8080", EDIT_CONTROL_NUMBER_INPUT, false, 707);
   AddSeparator(16, "network.sep2");
   AddBool(17, "network.enableinternet", 14054, true);
 
   // hidden proxy authentication details
-  AddString(0, "network.httpproxyusername", 706, "", BUTTON_CONTROL_INPUT);
-  AddString(0, "network.httpproxypassword", 706, "", BUTTON_CONTROL_INPUT);
+  AddString(0, "network.httpproxyusername", 706, "", EDIT_CONTROL_INPUT);
+  AddString(0, "network.httpproxypassword", 706, "", EDIT_CONTROL_INPUT);
 
   AddCategory(6, "servers", 14036);
 #if defined(HAS_FTP_SERVER) || defined (HAS_WEB_SERVER)
 #ifdef HAS_FTP_SERVER
   AddBool(1,  "servers.ftpserver",        167, true);
-  AddString(3,"servers.ftpserverpassword",1246, "xbox", BUTTON_CONTROL_HIDDEN_INPUT, true, 1246);
+  AddString(3,"servers.ftpserverpassword",1246, "xbox", EDIT_CONTROL_HIDDEN_INPUT, true, 1246);
   AddBool(4,  "servers.ftpautofatx",      771, true);
   AddString(2,"servers.ftpserveruser",    1245, "xbox", SPIN_CONTROL_TEXT);
 #endif
@@ -502,16 +502,16 @@
 #endif
 #ifdef HAS_WEB_SERVER
   AddBool(6,  "servers.webserver",        263, false);
-  AddString(7,"servers.webserverport",    730, "80", BUTTON_CONTROL_INPUT, false, 730);
-  AddString(8,"servers.webserverpassword",733, "", BUTTON_CONTROL_HIDDEN_INPUT, true, 733);
+  AddString(7,"servers.webserverport",    730, "80", EDIT_CONTROL_NUMBER_INPUT, false, 730);
+  AddString(8,"servers.webserverpassword",733, "", EDIT_CONTROL_HIDDEN_INPUT, true, 733);
 #endif
 #endif
 
   AddCategory(6, "smb", 1200);
   AddString(1, "smb.username",    1203,   "", EDIT_CONTROL_INPUT, true, 1203);
   AddString(2, "smb.password",    1204,   "", EDIT_CONTROL_HIDDEN_INPUT, true, 1204);
-  AddString(3, "smb.winsserver",  1207,   "",  BUTTON_CONTROL_IP_INPUT);
-  AddString(4, "smb.workgroup",   1202,   "WORKGROUP", BUTTON_CONTROL_INPUT, false, 1202);
+  AddString(3, "smb.winsserver",  1207,   "",  EDIT_CONTROL_IP_INPUT);
+  AddString(4, "smb.workgroup",   1202,   "WORKGROUP", EDIT_CONTROL_INPUT, false, 1202);
 #ifdef _LINUX
   AddBool  (5, "smb.mountshares", 1208,   false);
 #endif
@@ -529,7 +529,7 @@
 #ifdef HAS_EVENT_SERVER
   AddCategory(6, "remoteevents", 790);
   AddBool(1,  "remoteevents.enabled",         791, true);
-  AddString(2,"remoteevents.port",            792, "9777", BUTTON_CONTROL_INPUT, false, 792);
+  AddString(2,"remoteevents.port",            792, "9777", EDIT_CONTROL_NUMBER_INPUT, false, 792);
   AddInt(3,   "remoteevents.portrange",       793, 10, 1, 1, 100, SPIN_CONTROL_INT);
   AddInt(4,   "remoteevents.maxclients",      797, 20, 1, 1, 100, SPIN_CONTROL_INT);
   AddSeparator(5,"remoteevents.sep1");
@@ -571,7 +571,7 @@
 #ifndef __APPLE__
   AddSeparator(9, "locale.sep2");
   AddBool(10,   "locale.timeserver"       , 168  , false);
-  AddString(11, "locale.timeserveraddress"      , 731  , "pool.ntp.org", BUTTON_CONTROL_INPUT);
+  AddString(11, "locale.timeserveraddress"      , 731  , "pool.ntp.org", EDIT_CONTROL_INPUT);
 #endif
 
   AddCategory(7, "videoscreen", 131);

Modified: branches/linuxport/XBMC/xbmc/GUISettings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUISettings.h	2008-07-24 06:17:00 UTC (rev 14411)
+++ branches/linuxport/XBMC/xbmc/GUISettings.h	2008-07-24 08:43:17 UTC (rev 14412)
@@ -125,16 +125,14 @@
 #define SPIN_CONTROL_INT            3
 #define SPIN_CONTROL_INT_PLUS       4
 #define SPIN_CONTROL_TEXT           5
-#define BUTTON_CONTROL_INPUT        6
-#define BUTTON_CONTROL_HIDDEN_INPUT 7
-#define BUTTON_CONTROL_STANDARD     8
-#define BUTTON_CONTROL_IP_INPUT     9
-#define BUTTON_CONTROL_MISC_INPUT  10
-#define BUTTON_CONTROL_PATH_INPUT  11
-#define SEPARATOR_CONTROL          12
-#define EDIT_CONTROL_INPUT         13
-#define EDIT_CONTROL_HIDDEN_INPUT  14
-#define EDIT_CONTROL_IP_INPUT      15
+#define EDIT_CONTROL_INPUT          6
+#define EDIT_CONTROL_HIDDEN_INPUT   7
+#define EDIT_CONTROL_NUMBER_INPUT   8
+#define EDIT_CONTROL_IP_INPUT       9
+#define BUTTON_CONTROL_STANDARD    10
+#define BUTTON_CONTROL_MISC_INPUT  11
+#define BUTTON_CONTROL_PATH_INPUT  12
+#define SEPARATOR_CONTROL          13
 
 #define REPLAY_GAIN_NONE 0
 #define REPLAY_GAIN_ALBUM 1
@@ -349,7 +347,7 @@
 
   void AddHex(int iOrder, const char *strSetting, int iLabel, int fSetting, int iMin, int iStep, int iMax, int iControlType, const char *strFormat = NULL);
 
-  void AddString(int iOrder, const char *strSetting, int iLabel, const char *strData, int iControlType = BUTTON_CONTROL_INPUT, bool bAllowEmpty = false, int iHeadingString = -1);
+  void AddString(int iOrder, const char *strSetting, int iLabel, const char *strData, int iControlType = EDIT_CONTROL_INPUT, bool bAllowEmpty = false, int iHeadingString = -1);
   const CStdString &GetString(const char *strSetting, bool bPrompt=true) const;
   void SetString(const char *strSetting, const char *strData);
 

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-07-24 06:17:00 UTC (rev 14411)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-07-24 08:43:17 UTC (rev 14412)
@@ -2317,6 +2317,7 @@
   }
   else if (pSetting->GetControlType() == EDIT_CONTROL_INPUT ||
            pSetting->GetControlType() == EDIT_CONTROL_HIDDEN_INPUT ||
+           pSetting->GetControlType() == EDIT_CONTROL_NUMBER_INPUT ||
            pSetting->GetControlType() == EDIT_CONTROL_IP_INPUT)
   {
     pControl = new CGUIEditControl(*m_pOriginalEdit);

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp	2008-07-24 06:17:00 UTC (rev 14411)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp	2008-07-24 08:43:17 UTC (rev 14412)
@@ -120,7 +120,7 @@
           if (iIndex > -1)
           {
             bool bDoStuff = true;
-            if (iIndex < shares.size() && shares[iIndex].m_iHasLock == 2)
+            if (iIndex < (int)shares.size() && shares[iIndex].m_iHasLock == 2)
             {
               CFileItem item(shares[iIndex]);
               if (!g_passwordManager.IsItemUnlocked(&item,"video"))

Modified: branches/linuxport/XBMC/xbmc/SettingsControls.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/SettingsControls.cpp	2008-07-24 06:17:00 UTC (rev 14411)
+++ branches/linuxport/XBMC/xbmc/SettingsControls.cpp	2008-07-24 08:43:17 UTC (rev 14412)
@@ -147,27 +147,7 @@
 
 bool CButtonSettingControl::OnClick()
 {
-  // grab the onscreen keyboard
-  CStdString keyboardInput(((CSettingString *)m_pSetting)->GetData());
-  CStdString heading;
-  if (((CSettingString *)m_pSetting)->m_iHeadingString > 0)
-    heading = g_localizeStrings.Get(((CSettingString *)m_pSetting)->m_iHeadingString);
-  if (m_pSetting->GetControlType() == BUTTON_CONTROL_INPUT)
-  {
-    if (!CGUIDialogKeyboard::ShowAndGetInput(keyboardInput, heading, ((CSettingString *)m_pSetting)->m_bAllowEmpty))
-      return false;
-  }
-  if (m_pSetting->GetControlType() == BUTTON_CONTROL_HIDDEN_INPUT)
-  {
-    if (!CGUIDialogKeyboard::ShowAndGetNewPassword(keyboardInput, heading, ((CSettingString *)m_pSetting)->m_bAllowEmpty))
-      return false;
-  }
-  if (m_pSetting->GetControlType() == BUTTON_CONTROL_IP_INPUT)
-  {
-    if (!CGUIDialogNumeric::ShowAndGetIPAddress(keyboardInput, g_localizeStrings.Get(14068)))
-      return false;
-  }
-  ((CSettingString *)m_pSetting)->SetData(keyboardInput);
+  // this is pretty much a no-op as all click action is done in the calling class
   Update();
   return true;
 }
@@ -177,13 +157,6 @@
   if (m_pSetting->GetControlType() == BUTTON_CONTROL_STANDARD)
     return ;
   CStdString strText = ((CSettingString *)m_pSetting)->GetData();
-  if (m_pSetting->GetControlType() == BUTTON_CONTROL_HIDDEN_INPUT)
-  {
-    int iNumChars = strText.size();
-    strText.Empty();
-    for (int i = 0; i < iNumChars; i++)
-      strText += '*';
-  }
   if (m_pSetting->GetControlType() == BUTTON_CONTROL_PATH_INPUT)
   {
     CStdString shortPath;
@@ -205,6 +178,8 @@
     m_pEdit->SetInputType(CGUIEditControl::INPUT_TYPE_PASSWORD, heading);
   else if (pSetting->GetControlType() == EDIT_CONTROL_IP_INPUT)
     m_pEdit->SetInputType(CGUIEditControl::INPUT_TYPE_IPADDRESS, heading);
+  else if (pSetting->GetControlType() == EDIT_CONTROL_NUMBER_INPUT)
+    m_pEdit->SetInputType(CGUIEditControl::INPUT_TYPE_NUMBER, heading);
   else
     m_pEdit->SetInputType(CGUIEditControl::INPUT_TYPE_TEXT, heading);
   Update();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14422
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14422&view=rev
Author:   jmarshallnz
Date:     2008-07-24 23:14:04 +0000 (Thu, 24 Jul 2008)

Log Message:
-----------
fixed: Potential crashes in the playlistplayer + added warnings for going out of range.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/PlayList.cpp
    branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp

Modified: branches/linuxport/XBMC/xbmc/PlayList.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/PlayList.cpp	2008-07-24 21:29:12 UTC (rev 14421)
+++ branches/linuxport/XBMC/xbmc/PlayList.cpp	2008-07-24 23:14:04 UTC (rev 14422)
@@ -184,11 +184,23 @@
 
 const CFileItemPtr CPlayList::operator[] (int iItem) const
 {
+  if (iItem < 0 || iItem >= size())
+  {
+    assert(false);
+    CLog::Log(LOGERROR, "Error trying to retrieve an item that's out of range");
+    return CFileItemPtr();
+  }
   return m_vecItems[iItem];
 }
 
 CFileItemPtr CPlayList::operator[] (int iItem)
 {
+  if (iItem < 0 || iItem >= size())
+  {
+    assert(false);
+    CLog::Log(LOGERROR, "Error trying to retrieve an item that's out of range");
+    return CFileItemPtr();
+  }
   return m_vecItems[iItem];
 }
 

Modified: branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp	2008-07-24 21:29:12 UTC (rev 14421)
+++ branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp	2008-07-24 23:14:04 UTC (rev 14422)
@@ -102,7 +102,7 @@
   if (RepeatedOne(m_iCurrentPlayList))
   {
     // otherwise immediately abort playback
-    if (playlist[m_iCurrentSong]->GetPropertyBOOL("unplayable"))
+    if (m_iCurrentSong >= 0 && m_iCurrentSong < playlist.size() && playlist[m_iCurrentSong]->GetPropertyBOOL("unplayable"))
     {
       CLog::Log(LOGERROR,"Playlist Player: RepeatOne stuck on unplayable item: %i, path [%s]", m_iCurrentSong, playlist[m_iCurrentSong]->m_strPath.c_str());
       CGUIMessage msg(GUI_MSG_PLAYLISTPLAYER_STOPPED, 0, 0, m_iCurrentPlayList, m_iCurrentSong);
@@ -424,19 +424,20 @@
   {
     // save the order value of the current song so we can use it find its new location later
     int iOrder = -1;
-    if (m_iCurrentSong >= 0)
-      iOrder = GetPlaylist(iPlaylist)[m_iCurrentSong]->m_iprogramCount;
+    CPlayList &playlist = GetPlaylist(iPlaylist);
+    if (m_iCurrentSong >= 0 && m_iCurrentSong < playlist.size())
+      iOrder = playlist[m_iCurrentSong]->m_iprogramCount;
 
     // shuffle or unshuffle as necessary
     if (bYesNo)
-      GetPlaylist(iPlaylist).Shuffle();
+      playlist.Shuffle();
     else
-      GetPlaylist(iPlaylist).UnShuffle();
+      playlist.UnShuffle();
 
     // find the previous order value and fix the current song marker
     if (iOrder >= 0)
     {
-      int iIndex = GetPlaylist(iPlaylist).FindOrder(iOrder);
+      int iIndex = playlist.FindOrder(iOrder);
       if (iIndex >= 0)
         m_iCurrentSong = iIndex;
       // if iIndex < 0, something unexpected happened


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14437
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14437&view=rev
Author:   elupus
Date:     2008-07-25 14:03:05 +0000 (Fri, 25 Jul 2008)

Log Message:
-----------
fixed: win32 build didn't compile after fgetpos64 addition.
changed: off64_t shouldn't be defined to long long on windows, as that isn't always 64bit.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.h
    branches/linuxport/XBMC/xbmc/win32/PlatformDefs.h

Modified: branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2008-07-25 13:06:31 UTC (rev 14436)
+++ branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2008-07-25 14:03:05 UTC (rev 14437)
@@ -72,10 +72,6 @@
   int dll_read(int fd, void* buffer, unsigned int uiSize);
   int dll_write(int fd, const void* buffer, unsigned int uiSize);
   int dll_close(int fd);
-#ifndef _LINUX // hack for missing types
-#define __off64_t __int64
-#define __off_t long
-#endif
   __off64_t dll_lseeki64(int fd, __off64_t lPos, int iWhence);
   __off_t dll_lseek(int fd, __off_t lPos, int iWhence);
   char* dll_getenv(const char* szKey);

Modified: branches/linuxport/XBMC/xbmc/win32/PlatformDefs.h
===================================================================
--- branches/linuxport/XBMC/xbmc/win32/PlatformDefs.h	2008-07-25 13:06:31 UTC (rev 14436)
+++ branches/linuxport/XBMC/xbmc/win32/PlatformDefs.h	2008-07-25 14:03:05 UTC (rev 14437)
@@ -33,10 +33,12 @@
 #define PRId64 "lld"
 #endif
 #endif
-#ifndef off64_t
-#define off64_t long long
-#endif
 
+typedef __int64 off64_t;
+typedef __int64 fpos64_t;
+typedef __int64 __off64_t;
+typedef long    __off_t;
+
 #define ftello64 _ftelli64
 #define fseeko64 _fseeki64
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14440
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14440&view=rev
Author:   nuka1195
Date:     2008-07-25 16:30:54 +0000 (Fri, 25 Jul 2008)

Log Message:
-----------
added: Plugin method xbmcplugin.disableCache(). Allows you to disable caching so backing into the directory will refresh the listing. (sets a property "donotcachetodisc") Thanks cptspiff

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIMediaWindow.cpp
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIMediaWindow.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIMediaWindow.cpp	2008-07-25 16:01:29 UTC (rev 14439)
+++ branches/linuxport/XBMC/xbmc/GUIMediaWindow.cpp	2008-07-25 16:30:54 UTC (rev 14440)
@@ -479,7 +479,8 @@
       return false;
 
     // took over a second, and not normally cached, so cache it
-    if (time + 1000 < timeGetTime() && !items.GetCacheToDisc())
+    if ((time + 1000 < timeGetTime() && !items.GetCacheToDisc()) &&
+        !items.GetPropertyBOOL("donotcachetodisc"))
       items.Save();
 
     // if these items should replace the current listing, then pop it off the top

Modified: branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp	2008-07-25 16:01:29 UTC (rev 14439)
+++ branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp	2008-07-25 16:30:54 UTC (rev 14440)
@@ -331,6 +331,40 @@
     return Py_None;
   }
 
+  PyDoc_STRVAR(disableCache__doc__,
+    "disableCache(handle) -- Disables the cache to disc in current directory for this plugin.\n"
+    "\n"
+    "handle      : integer - handle the plugin was started with.\n"
+    "\n"
+    "*Note, You can use the above as keywords for arguments.\n"
+    "\n"
+    "       By default caching is time based.\n"
+    "\n"
+    "example:\n"
+    "  - xbmcplugin.disableCache(int(sys.argv[1]))\n");
+
+  PyObject* XBMCPLUGIN_DisableCache(PyTypeObject *type, PyObject *args, PyObject *kwds)
+  {
+    static char *keywords[] = { "handle", NULL };
+    int handle = -1;
+    // parse arguments to constructor
+    if (!PyArg_ParseTupleAndKeywords(
+      args,
+      kwds,
+      (char*)"i",
+      (char**)keywords,
+      &handle
+      ))
+    {
+      return NULL;
+    };
+
+    DIRECTORY::CPluginDirectory::SetProperty(handle, "donotcachetodisc", "1");
+
+    Py_INCREF(Py_None);
+    return Py_None;
+  }
+
   // define c functions to be used in python here
   PyMethodDef pluginMethods[] = {
     {(char*)"addDirectoryItem", (PyCFunction)XBMCPLUGIN_AddDirectoryItem, METH_VARARGS|METH_KEYWORDS, addDirectoryItem__doc__},
@@ -340,6 +374,7 @@
     {(char*)"setContent", (PyCFunction)XBMCPLUGIN_SetContent, METH_VARARGS|METH_KEYWORDS, setContent__doc__},
     {(char*)"setPluginCategory", (PyCFunction)XBMCPLUGIN_SetPluginCategory, METH_VARARGS|METH_KEYWORDS, setPluginCategory__doc__},
     {(char*)"setPluginFanart", (PyCFunction)XBMCPLUGIN_SetPluginFanart, METH_VARARGS|METH_KEYWORDS, setPluginFanart__doc__},
+    {(char*)"disableCache", (PyCFunction)XBMCPLUGIN_DisableCache, METH_VARARGS|METH_KEYWORDS, disableCache__doc__},
     {NULL, NULL, 0, NULL}
   };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14441
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14441&view=rev
Author:   elupus
Date:     2008-07-25 16:45:32 +0000 (Fri, 25 Jul 2008)

Log Message:
-----------
changed: the ati hack for ghosted image can now only be enabled from an advanced setting. <glrectanglehack>1</glrectanglehack>

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Settings.cpp
    branches/linuxport/XBMC/xbmc/Settings.h
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.cpp

Modified: branches/linuxport/XBMC/xbmc/Settings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.cpp	2008-07-25 16:30:54 UTC (rev 14440)
+++ branches/linuxport/XBMC/xbmc/Settings.cpp	2008-07-25 16:45:32 UTC (rev 14441)
@@ -245,6 +245,7 @@
 #endif
 
   g_advancedSettings.m_playlistRetries = 100;
+  g_advancedSettings.m_GLRectangleHack = false;
 }
 
 CSettings::~CSettings(void)
@@ -1191,6 +1192,7 @@
   GetInteger(pRootElement, "playlistretries", g_advancedSettings.m_playlistRetries, 100, -1, 5000);
 
   XMLUtils::GetBoolean(pRootElement,"rootovershoot",g_advancedSettings.m_bUseEvilB);
+  XMLUtils::GetBoolean(pRootElement,"glrectanglehack", g_advancedSettings.m_GLRectangleHack);
 
   //Tuxbox
   pElement = pRootElement->FirstChildElement("tuxbox");

Modified: branches/linuxport/XBMC/xbmc/Settings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.h	2008-07-25 16:30:54 UTC (rev 14440)
+++ branches/linuxport/XBMC/xbmc/Settings.h	2008-07-25 16:45:32 UTC (rev 14441)
@@ -225,6 +225,7 @@
     bool m_fullScreen;
 #endif
     int m_playlistRetries;
+    bool m_GLRectangleHack;
   };
 
   struct stSettings

Modified: branches/linuxport/XBMC/xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.cpp	2008-07-25 16:30:54 UTC (rev 14440)
+++ branches/linuxport/XBMC/xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.cpp	2008-07-25 16:45:32 UTC (rev 14441)
@@ -23,6 +23,7 @@
 #include "include.h"
 #include "../RenderFlags.h"
 #include "YUV2RGBShader.h"
+#include "Settings.h"
 #include <string>
 #include <sstream>
 
@@ -197,7 +198,7 @@
   }
 
   // ati breaks down with sampler2DRect, but it seem to work without it
-  if(rect && strstr((const char*)glGetString(GL_VENDOR), "ATI") != NULL)
+  if(rect && g_advancedSettings.m_GLRectangleHack)
   {
     shaderf += "#define idY 2\n";
     shaderf += "#define idU 0\n";
@@ -279,7 +280,7 @@
   }
 
   // ati breaks down with sampler2DRect, but it seem to work without it
-  if(rect && strstr((const char*)glGetString(GL_VENDOR), "ATI") != NULL)
+  if(rect && g_advancedSettings.m_GLRectangleHack)
   {
     shaderf += "#define idY 2\n";
     shaderf += "#define idU 0\n";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14446
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14446&view=rev
Author:   d4rkm4ster
Date:     2008-07-25 21:43:59 +0000 (Fri, 25 Jul 2008)

Log Message:
-----------
fixed: [OSX] compilation issues

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/wrapper.c
    branches/linuxport/XBMC/xbmc/linux/PlatformDefs.h

Modified: branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/wrapper.c
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/wrapper.c	2008-07-25 19:50:44 UTC (rev 14445)
+++ branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/wrapper.c	2008-07-25 21:43:59 UTC (rev 14446)
@@ -36,6 +36,7 @@
 typedef int64_t   off64_t;
 typedef off_t     __off_t;
 typedef off64_t   __off64_t;
+typedef fpos_t fpos64_t;
 #endif
 
 #ifdef _LINUX

Modified: branches/linuxport/XBMC/xbmc/linux/PlatformDefs.h
===================================================================
--- branches/linuxport/XBMC/xbmc/linux/PlatformDefs.h	2008-07-25 19:50:44 UTC (rev 14445)
+++ branches/linuxport/XBMC/xbmc/linux/PlatformDefs.h	2008-07-25 21:43:59 UTC (rev 14446)
@@ -38,6 +38,7 @@
 #include <pthread.h>
 #include <string.h>
 #ifdef __APPLE__
+#include <stdio.h>
 #include <sys/sysctl.h>
 #include <mach/mach.h>
 #else
@@ -131,6 +132,7 @@
 typedef int64_t   off64_t;
 typedef off_t     __off_t;
 typedef off64_t   __off64_t;
+typedef fpos_t fpos64_t;
 #include <sched.h>
 #if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040)
 #define MAC_TIGER


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14447
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14447&view=rev
Author:   yuvalt
Date:     2008-07-25 22:20:59 +0000 (Fri, 25 Jul 2008)

Log Message:
-----------
fix: md5 was giving link errors due to conflict with libgoahead. Wrapped 
MD5 with class and fixed all callers.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIDialogGamepad.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogKeyboard.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogNumeric.cpp
    branches/linuxport/XBMC/xbmc/LastFmManager.cpp
    branches/linuxport/XBMC/xbmc/MusicInfoScanner.cpp
    branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp
    branches/linuxport/XBMC/xbmc/lib/libscrobbler/scrobbler.cpp
    branches/linuxport/XBMC/xbmc/utils/Makefile
    branches/linuxport/XBMC/xbmc/utils/md5.h

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/utils/md5.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIDialogGamepad.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogGamepad.cpp	2008-07-25 21:43:59 UTC (rev 14446)
+++ branches/linuxport/XBMC/xbmc/GUIDialogGamepad.cpp	2008-07-25 22:20:59 UTC (rev 14447)
@@ -86,12 +86,12 @@
     m_bConfirmed = false;
     m_bCanceled = false;
 
-    MD5_CTX md5state;
     unsigned char md5pword[16];
     char md5pword2[33];
-    MD5Init(&md5state);
-    MD5Update(&md5state, (unsigned char *)m_strUserInput.c_str(), (int)m_strUserInput.size());
-    MD5Final(md5pword, &md5state);
+    XBMC::MD5 md5state;
+    md5state.append(m_strUserInput);
+    md5state.getDigest(md5pword);
+
     XKGeneral::BytesToHexStr(md5pword,16,md5pword2);
 
     if (!m_strPassword.Equals(md5pword2))
@@ -284,12 +284,11 @@
 
   if (bGetUserInput && !pDialog->IsCanceled())
   {
-    MD5_CTX md5state;
     unsigned char md5pword[16];
     char md5pword2[33];
-    MD5Init(&md5state);
-    MD5Update(&md5state, (unsigned char *)pDialog->m_strUserInput.c_str(), (int)pDialog->m_strUserInput.size());
-    MD5Final(md5pword, &md5state);
+    XBMC::MD5 md5state;
+    md5state.append(pDialog->m_strUserInput);
+    md5state.getDigest(md5pword);
     XKGeneral::BytesToHexStr(md5pword,16,md5pword2);
     strToVerify = md5pword2;
     strToVerify.ToLower();

Modified: branches/linuxport/XBMC/xbmc/GUIDialogKeyboard.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogKeyboard.cpp	2008-07-25 21:43:59 UTC (rev 14446)
+++ branches/linuxport/XBMC/xbmc/GUIDialogKeyboard.cpp	2008-07-25 22:20:59 UTC (rev 14447)
@@ -588,12 +588,11 @@
   // check the password
   if (checkInput == userInput)
   {
-    MD5_CTX md5state;
     unsigned char md5pword[16];
     char md5pword2[33];
-    MD5Init(&md5state);
-    MD5Update(&md5state, (unsigned char *)userInput.c_str(), (int)userInput.size());
-    MD5Final(md5pword, &md5state);
+    XBMC::MD5 md5state;
+    md5state.append(userInput.c_str());
+    md5state.getDigest(md5pword);
     XKGeneral::BytesToHexStr(md5pword,16,md5pword2);
     newPassword = md5pword2;
     newPassword.ToLower();
@@ -634,12 +633,11 @@
     if (strPassword == strUserInput)
       return 0;
 
-    MD5_CTX md5state;
     unsigned char md5pword[16];
     char md5pword2[33];
-    MD5Init(&md5state);
-    MD5Update(&md5state, (unsigned char *)strUserInput.c_str(), (int)strUserInput.size());
-    MD5Final(md5pword, &md5state);
+    XBMC::MD5 md5state;
+    md5state.append(strUserInput.c_str());
+    md5state.getDigest(md5pword);
     XKGeneral::BytesToHexStr(md5pword, 16, md5pword2);
     if (strPassword.Equals(md5pword2))
       return 0;     // user entered correct password
@@ -649,12 +647,11 @@
   {
     if (!strUserInput.IsEmpty())
     {
-      MD5_CTX md5state;
       unsigned char md5pword[16];
       char md5pword2[33];
-      MD5Init(&md5state);
-      MD5Update(&md5state, (unsigned char *)strUserInput.c_str(), (int)strUserInput.size());
-      MD5Final(md5pword, &md5state);
+      XBMC::MD5 md5state;
+      md5state.append(strUserInput.c_str());
+      md5state.getDigest(md5pword);
       XKGeneral::BytesToHexStr(md5pword, 16, md5pword2);
 
       strPassword = md5pword2;

Modified: branches/linuxport/XBMC/xbmc/GUIDialogNumeric.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogNumeric.cpp	2008-07-25 21:43:59 UTC (rev 14446)
+++ branches/linuxport/XBMC/xbmc/GUIDialogNumeric.cpp	2008-07-25 22:20:59 UTC (rev 14447)
@@ -680,12 +680,11 @@
     return false;
   }
 
-  MD5_CTX md5state;
   unsigned char md5pword[16];
   char md5pword2[33];
-  MD5Init(&md5state);
-  MD5Update(&md5state, (unsigned char *)strInput.c_str(), (int)strInput.size());
-  MD5Final(md5pword, &md5state);
+  XBMC::MD5 md5state;
+  md5state.append(strInput.c_str());
+  md5state.getDigest(md5pword);
   XKGeneral::BytesToHexStr(md5pword, 16, md5pword2);
 
   if (!bVerifyInput)

Modified: branches/linuxport/XBMC/xbmc/LastFmManager.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/LastFmManager.cpp	2008-07-25 21:43:59 UTC (rev 14446)
+++ branches/linuxport/XBMC/xbmc/LastFmManager.cpp	2008-07-25 22:20:59 UTC (rev 14447)
@@ -229,7 +229,7 @@
   CStdString url;
   CStdString html;
   url.Format("http://" + m_RadioBaseUrl + m_RadioBasePath + "/adjust.php?session=%s&url=%s&debug=%i", m_RadioSession, strUrl, 0);
-  if (!http.Get(url, html)) 
+  if (!http.Get(url, html))
   {
     CLog::Log(LOGERROR, "Connect to Last.fm to change station failed.");
     CloseProgressDialog();
@@ -280,7 +280,7 @@
   url.Format("http://" + m_RadioBaseUrl + m_RadioBasePath + "/xspf.php?sk=%s&discovery=0&desktop=", m_RadioSession);
   {
     CHTTP http;
-    if (!http.Get(url, html)) 
+    if (!http.Get(url, html))
     {
       m_RadioSession.empty();
       CLog::Log(LOGERROR, "LastFmManager: Connect to Last.fm to request tracks failed.");
@@ -367,7 +367,7 @@
         newItem->GetMusicInfoTag()->SetAlbum(child->Value());
       }
     }
-   
+
     pElement = pTrackElement->FirstChildElement("duration");
     if (pElement)
     {
@@ -472,7 +472,7 @@
         CSingleLock lock2(m_lockPlaylist);
         playlist.Add(item);
       }
-      else 
+      else
       {
         break;
       }
@@ -496,7 +496,7 @@
       MovePlaying();
       Update();
       SendUpdateMessage();
-      
+
       CLog::Log(LOGDEBUG, "%s: Done (time: %i ms)", __FUNCTION__, (int)(timeGetTime() - start));
     }
   }
@@ -609,7 +609,7 @@
 
 void CLastFmManager::StopRadio(bool bKillSession /*= true*/)
 {
-  if (bKillSession) 
+  if (bKillSession)
   {
 	m_RadioSession = "";
 	g_playlistPlayer.SetRepeat(PLAYLIST_MUSIC, m_LastRepeatState);
@@ -635,20 +635,19 @@
       }
     }
   }
-  
+
   SendUpdateMessage();
 }
 
 void CLastFmManager::CreateMD5Hash(const CStdString& bufferToHash, CStdString& hash)
 {
-  MD5_CTX md5state;
   unsigned char md5pword[16];
-  MD5Init(&md5state);
-  MD5Update(&md5state, (unsigned char *)bufferToHash.c_str(), (int)bufferToHash.size());
-  MD5Final(md5pword, &md5state);
+  XBMC::MD5 md5state;
+  md5state.append(bufferToHash);
+  md5state.getDigest(md5pword);
   char tmp[33];
   strncpy(tmp, "\0", sizeof(tmp));
-  for (int j = 0;j < 16;j++) 
+  for (int j = 0;j < 16;j++)
   {
     char a[3];
     sprintf(a, "%02x", md5pword[j]);
@@ -690,7 +689,7 @@
     CLog::Log(LOGERROR, "Last.fm CallXmlRpc no tracktitle provided.");
     return false;
   }
-  
+
   char ti[20];
   time_t rawtime;
   time ( &rawtime );
@@ -806,7 +805,7 @@
           g_application.m_guiDialogKaiToast.QueueNotification("", g_localizeStrings.Get(15200), strMessage, 7000);
           return true;
         }
-        else 
+        else
         {
           strMessage.Format(g_localizeStrings.Get(15290), strTitle);
           g_application.m_guiDialogKaiToast.QueueNotification("", g_localizeStrings.Get(15200), strMessage, 7000);
@@ -839,7 +838,7 @@
           g_application.m_guiDialogKaiToast.QueueNotification("", g_localizeStrings.Get(15200), strMessage, 7000);
           return true;
         }
-        else 
+        else
         {
           strMessage.Format(g_localizeStrings.Get(15292), strTitle);
           g_application.m_guiDialogKaiToast.QueueNotification("", g_localizeStrings.Get(15200), strMessage, 7000);
@@ -858,10 +857,10 @@
     CLog::Log(LOGERROR, "LastFmManager Love, lastfm is not enabled.");
     return false;
   }
-  
+
   CStdString strTitle = musicinfotag.GetTitle();
   CStdString strArtist = musicinfotag.GetArtist();
-  
+
   CStdString strFilePath;
   if (m_CurrentSong.CurrentSong && !m_CurrentSong.CurrentSong->IsLastFM())
   {
@@ -899,7 +898,7 @@
     CLog::Log(LOGERROR, "LastFmManager Ban, radio is not active");
     return false;
   }
-  
+
   if (CallXmlRpc("banTrack", musicinfotag.GetArtist(), musicinfotag.GetTitle()))
   {
     //we banned this track so skip to the next track
@@ -972,7 +971,7 @@
     CLog::Log(LOGERROR, "LastFmManager Unban, lasfm is not enabled");
     return false;
   }
-  
+
   CStdString strTitle = musicinfotag.GetTitle();
   CStdString strArtist = musicinfotag.GetArtist();
 
@@ -999,7 +998,7 @@
 bool CLastFmManager::IsLastFmEnabled()
 {
   return (
-    !g_guiSettings.GetString("lastfm.username").IsEmpty() && 
+    !g_guiSettings.GetString("lastfm.username").IsEmpty() &&
     !g_guiSettings.GetString("lastfm.password").IsEmpty()
   );
 }
@@ -1010,11 +1009,11 @@
     m_CurrentSong.CurrentSong &&
     !m_CurrentSong.IsLoved &&
     IsLastFmEnabled() &&
-    (m_CurrentSong.CurrentSong->IsLastFM() || 
+    (m_CurrentSong.CurrentSong->IsLastFM() ||
     (
-      m_CurrentSong.CurrentSong->HasMusicInfoTag() && 
+      m_CurrentSong.CurrentSong->HasMusicInfoTag() &&
       m_CurrentSong.CurrentSong->GetMusicInfoTag()->Loaded() &&
-      !m_CurrentSong.CurrentSong->GetMusicInfoTag()->GetArtist().IsEmpty() && 
+      !m_CurrentSong.CurrentSong->GetMusicInfoTag()->GetArtist().IsEmpty() &&
       !m_CurrentSong.CurrentSong->GetMusicInfoTag()->GetTitle().IsEmpty()
     ))
   );
@@ -1028,7 +1027,7 @@
 bool CLastFmManager::CanScrobble(const CFileItem &fileitem)
 {
   return (
-    (!fileitem.IsInternetStream() && g_guiSettings.GetBool("lastfm.enable")) || 
+    (!fileitem.IsInternetStream() && g_guiSettings.GetBool("lastfm.enable")) ||
     (fileitem.IsLastFM() && g_guiSettings.GetBool("lastfm.recordtoprofile"))
   );
 }

Modified: branches/linuxport/XBMC/xbmc/MusicInfoScanner.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/MusicInfoScanner.cpp	2008-07-25 21:43:59 UTC (rev 14446)
+++ branches/linuxport/XBMC/xbmc/MusicInfoScanner.cpp	2008-07-25 22:20:59 UTC (rev 14447)
@@ -161,10 +161,10 @@
           m_pObserver->OnDirectoryChanged(it->strArtist+" - "+it->strAlbum);
           m_pObserver->OnSetProgress(iCurrentItem++, m_albumsToScan.size());
         }
-        
+
         CMusicAlbumInfo albumInfo;
         bool bCanceled;
-        DownloadAlbumInfo(it->strGenre,it->strArtist,it->strAlbum, bCanceled, albumInfo); // genre field holds path - see fetchalbuminfo() 
+        DownloadAlbumInfo(it->strGenre,it->strArtist,it->strAlbum, bCanceled, albumInfo); // genre field holds path - see fetchalbuminfo()
 
         if (m_bStop)
           break;
@@ -230,7 +230,7 @@
 
   CFileItemList items;
   if (strDirectory.IsEmpty())
-  { 
+  {
     m_musicDatabase.Open();
     m_musicDatabase.GetAlbumsNav("musicdb://3/",items,-1,-1);
     m_musicDatabase.Close();
@@ -245,7 +245,7 @@
       items.Add(item);
     }
   }
-  
+
   for (int i=0;i<items.Size();++i)
   {
     if (CMusicDatabaseDirectory::IsAllItem(items[i]->m_strPath) || items[i]->IsParentFolder())
@@ -271,7 +271,7 @@
   CFileItemList items;
 
   if (strDirectory.IsEmpty())
-  { 
+  {
     m_musicDatabase.Open();
     m_musicDatabase.GetArtistsNav("musicdb://2/",items,-1,false);
     m_musicDatabase.Close();
@@ -493,7 +493,7 @@
       long iAlbum = m_musicDatabase.GetAlbumByName(song.strAlbum,song.strArtist);
       CStdString strPath;
       strPath.Format("musicdb://3/%u/",iAlbum);
-      
+
       CMusicAlbumInfo albumInfo;
       bool bCanceled;
       if (find(m_albumsScanned.begin(),m_albumsScanned.end(),iAlbum) == m_albumsScanned.end())
@@ -706,22 +706,21 @@
 {
   // Create a hash based on the filenames, filesize and filedate.  Also count the number of files
   if (0 == items.Size()) return 0;
-  MD5_CTX md5state;
   unsigned char md5hash[16];
   char md5HexString[33];
-  MD5Init(&md5state);
+  XBMC::MD5 md5state;
   int count = 0;
   for (int i = 0; i < items.Size(); ++i)
   {
     const CFileItemPtr pItem = items[i];
-    MD5Update(&md5state, (unsigned char *)pItem->m_strPath.c_str(), (int)pItem->m_strPath.size());
-    MD5Update(&md5state, (unsigned char *)&pItem->m_dwSize, sizeof(pItem->m_dwSize));
+    md5state.append(pItem->m_strPath);
+    md5state.append((unsigned char *)&pItem->m_dwSize, sizeof(pItem->m_dwSize));
     FILETIME time = pItem->m_dateTime;
-    MD5Update(&md5state, (unsigned char *)&time, sizeof(FILETIME));
+    md5state.append((unsigned char *)&time, sizeof(FILETIME));
     if (pItem->IsAudio() && !pItem->IsPlayList() && !pItem->IsNFO())
       count++;
   }
-  MD5Final(md5hash, &md5state);
+  md5state.getDigest(md5hash);
   XKGeneral::BytesToHexStr(md5hash, 16, md5HexString);
   hash = md5HexString;
   return count;
@@ -778,7 +777,7 @@
       }
       else
       {
-        CScraperUrl scrUrl(nfoReader.m_strImDbUrl); 
+        CScraperUrl scrUrl(nfoReader.m_strImDbUrl);
         CMusicAlbumInfo album("nfo",scrUrl);
         scraper.GetAlbums().push_back(album);
       }
@@ -851,7 +850,7 @@
       if (relevance < THRESHOLD)
       {
         m_musicDatabase.Close();
-        return false; 
+        return false;
       }
    }
 
@@ -862,9 +861,9 @@
       pDlg->DoModal();
 
       // and wait till user selects one
-      if (pDlg->GetSelectedLabel() < 0) 
+      if (pDlg->GetSelectedLabel() < 0)
       { // none chosen
-        if (!pDlg->IsButtonPressed()) 
+        if (!pDlg->IsButtonPressed())
         {
           bCanceled = true;
           return false;
@@ -952,7 +951,7 @@
   if (m_pObserver)
   {
     m_pObserver->OnStateChanged(DOWNLOADING_ARTIST_INFO);
-    m_pObserver->OnDirectoryChanged(strArtist);  
+    m_pObserver->OnDirectoryChanged(strArtist);
   }
 
   CMusicInfoScraper scraper(info);
@@ -977,7 +976,7 @@
       }
       else
       {
-        CScraperUrl scrUrl(nfoReader.m_strImDbUrl); 
+        CScraperUrl scrUrl(nfoReader.m_strImDbUrl);
         CMusicArtistInfo artist("nfo",scrUrl);
         scraper.GetArtists().push_back(artist);
       }
@@ -1030,7 +1029,7 @@
         pDlg->DoModal();
 
         // and wait till user selects one
-        if (pDlg->GetSelectedLabel() < 0) 
+        if (pDlg->GetSelectedLabel() < 0)
         { // none chosen
           if (!pDlg->IsButtonPressed()) return false;
           // manual button pressed
@@ -1048,7 +1047,7 @@
         iSelectedArtist = pDlg->GetSelectedItem().m_idepth;
       }
     }
-    
+
     scraper.LoadArtistinfo(iSelectedArtist);
 
     while (!scraper.Completed())
@@ -1081,7 +1080,7 @@
     if (!XFILE::CFile::Exists(thumb))
       CScraperUrl::DownloadThumbnail(thumb,artist.thumbURL.m_url[0]);
   }
-   
+
   m_musicDatabase.Close();
   return true;
 }

Modified: branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp	2008-07-25 21:43:59 UTC (rev 14446)
+++ branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp	2008-07-25 22:20:59 UTC (rev 14447)
@@ -42,7 +42,7 @@
 using namespace DIRECTORY;
 using namespace XFILE;
 
-namespace VIDEO 
+namespace VIDEO
 {
 
   CVideoInfoScanner::CVideoInfoScanner()
@@ -80,7 +80,7 @@
 
       // Create the thread to count all files to be scanned
       SetPriority(THREAD_PRIORITY_IDLE);
-      CThread fileCountReader(this);    
+      CThread fileCountReader(this);
       if (m_pObserver)
         fileCountReader.Create();
 
@@ -297,7 +297,7 @@
         bSkip = true;
       }
     }
-    
+
     if (!m_info.settings.GetPluginRoot() && m_info.settings.GetSettings().IsEmpty()) // check for settings, if they are around load defaults - to workaround the nastyness
     {
       CScraperParser parser;
@@ -354,7 +354,7 @@
     CIMDB IMDB;
     IMDB.SetScraperInfo(info);
     CRegExp regExSample;
-    
+
     if (!regExSample.RegComp(REGEXSAMPLEFILE))
     {
       CLog::Log(LOGERROR, "Unable to compile RegExp for Sample file");
@@ -413,7 +413,7 @@
       // Discard all possible sample files defined by regExSample
       if (regExSample.RegFind(CUtil::GetFileName(pItem->m_strPath)) > -1)
         continue;
- 
+
       if (info2.strContent.Equals("movies") || info2.strContent.Equals("musicvideos"))
       {
         if (m_pObserver)
@@ -524,7 +524,7 @@
             pDlgProgress->SetLine(0, pItem->GetLabel());
             pDlgProgress->SetLine(2,"");
             pDlgProgress->Progress();
-            if (pDlgProgress->IsCanceled()) 
+            if (pDlgProgress->IsCanceled())
             {
               pDlgProgress->Close();
               m_database.RollbackTransaction();
@@ -676,7 +676,7 @@
   {
     CFileItemList items;
     CRegExp regExSample;
-    
+
     if (!regExSample.RegComp(REGEXSAMPLEFILE))
     {
       CLog::Log(LOGERROR, "Unable to compile RegExp for Sample file");
@@ -770,9 +770,9 @@
 
             char *remainder = reg.GetReplaceString("\\3");
             int offset = 0;
-            
+
             // we want "long circuit" OR below so that both offsets are evaluated
-            while (((regexp2pos = reg2.RegFind(remainder + offset)) > -1) | ((regexppos = reg.RegFind(remainder + offset)) > -1)) 
+            while (((regexp2pos = reg2.RegFind(remainder + offset)) > -1) | ((regexppos = reg.RegFind(remainder + offset)) > -1))
             {
               if (((regexppos <= regexp2pos) && regexppos != -1) ||
                  (regexppos >= 0 && regexp2pos == -1))
@@ -787,7 +787,7 @@
                 episodeList.push_back(myEpisode);
                 remainder = reg.GetReplaceString("\\3");
                 offset = 0;
-              } 
+              }
               else if (((regexp2pos < regexppos) && regexp2pos != -1) ||
                        (regexp2pos >= 0 && regexppos == -1))
               {
@@ -1083,7 +1083,7 @@
           return items[numNFO]->m_strPath;
       }
     }
-    
+
     return nfoFile;
   }
 
@@ -1148,22 +1148,21 @@
   {
     // Create a hash based on the filenames, filesize and filedate.  Also count the number of files
     if (0 == items.Size()) return 0;
-    MD5_CTX md5state;
     unsigned char md5hash[16];
     char md5HexString[33];
-    MD5Init(&md5state);
+    XBMC::MD5 md5state;
     int count = 0;
     for (int i = 0; i < items.Size(); ++i)
     {
       const CFileItemPtr pItem = items[i];
-      MD5Update(&md5state, (unsigned char *)pItem->m_strPath.c_str(), (int)pItem->m_strPath.size());
-      MD5Update(&md5state, (unsigned char *)&pItem->m_dwSize, sizeof(pItem->m_dwSize));
+      md5state.append(pItem->m_strPath);
+      md5state.append((unsigned char *)&pItem->m_dwSize, sizeof(pItem->m_dwSize));
       FILETIME time = pItem->m_dateTime;
-      MD5Update(&md5state, (unsigned char *)&time, sizeof(FILETIME));
+      md5state.append((unsigned char *)&time, sizeof(FILETIME));
       if (pItem->IsVideo() && !pItem->IsPlayList() && !pItem->IsNFO())
         count++;
     }
-    MD5Final(md5hash, &md5state);
+    md5state.getDigest(md5hash);
     XKGeneral::BytesToHexStr(md5hash, 16, md5HexString);
     hash = md5HexString;
     return count;
@@ -1243,7 +1242,7 @@
           nfoReader.GetDetails(movieDetails);
           if (m_pObserver)
             m_pObserver->OnSetTitle(movieDetails.m_strTitle);
-          
+
           AddMovieAndGetThumb(pItem, info.strContent, movieDetails, -1, bGrabAny, pDlgProgress);
           if (info.strContent.Equals("tvshows"))
           {

Modified: branches/linuxport/XBMC/xbmc/lib/libscrobbler/scrobbler.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libscrobbler/scrobbler.cpp	2008-07-25 21:43:59 UTC (rev 14446)
+++ branches/linuxport/XBMC/xbmc/lib/libscrobbler/scrobbler.cpp	2008-07-25 22:20:59 UTC (rev 14447)
@@ -15,7 +15,7 @@
     along with libscrobbler; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-  Copyright \xA9 2003 Russell Garrett (russ-scrobbler@...)
+  Copyright � 2003 Russell Garrett (russ-scrobbler@...)
 */
 #include "stdafx.h"
 #include "scrobbler.h"
@@ -53,7 +53,7 @@
   m_bAuthWarningDone=false;
   m_bBadPassWarningDone=false;
   m_bReHandShaking=false;
-  m_strClientId = CLIENT_ID; 
+  m_strClientId = CLIENT_ID;
   m_strClientVer = CLIENT_VERSION;
   m_bCloseThread = false;
   m_Interval = m_LastConnect = m_SongStartTime = 0;
@@ -139,14 +139,13 @@
 {
   if (strPass.IsEmpty())
     return;
-  MD5_CTX md5state;
+  XBMC::MD5 md5state;
   unsigned char md5pword[16];
-  MD5Init(&md5state);
-  MD5Update(&md5state, (unsigned char *)strPass.c_str(), (int)strPass.size());
-  MD5Final(md5pword, &md5state);
+  md5state.append(strPass);
+  md5state.getDigest(md5pword);
   char tmp[33];
   strncpy(tmp, "\0", sizeof(tmp));
-  for (int j = 0;j < 16;j++) 
+  for (int j = 0;j < 16;j++)
   {
     char a[3];
     sprintf(a, "%02x", md5pword[j]);
@@ -238,12 +237,12 @@
 
   time_t now;
   time (&now);
-  if ((m_Interval + m_LastConnect) < now) 
+  if ((m_Interval + m_LastConnect) < now)
   {
     DoSubmit();
     return 1;
-  } 
-  else 
+  }
+  else
   {
     CStdString strMsg;
     strMsg.Format("Not submitting, caching for %i more seconds. Cache is %i entries.", (int)(m_Interval + m_LastConnect - now), m_iSongNum);
@@ -255,7 +254,7 @@
 void CScrobbler::DoHandshake()
 {
   m_bReadyToSubmit = false;
-  time_t now; 
+  time_t now;
   time (&now);
   m_LastConnect = now;
   m_strHsString = "http://post.audioscrobbler.com/?hs=true&p=1.1&c=" + m_strClientId + "&v=" + m_strClientVer + "&u=" + m_strUserName;
@@ -289,22 +288,22 @@
   // Doesn't take into account multiple-packet returns (not that I've seen one yet)...
 
   // Ian says: strtok() is not re-entrant, but since it's only being called
-  //  in only one function at a time, it's ok so far. 
+  //  in only one function at a time, it's ok so far.
 
   char seps[] = " \n\r";
   char *response = strtok(handshake, seps);
-  if (!response) 
+  if (!response)
   {
     StatusUpdate(S_HANDSHAKE_INVALID_RESPONSE,"Handshake failed: Response invalid");
     return;
   }
-  do 
+  do
   {
-    if (stricmp("UPTODATE", response) == 0) 
+    if (stricmp("UPTODATE", response) == 0)
     {
       StatusUpdate(S_HANDSHAKE_UP_TO_DATE,"Handshaking: Client up to date.");
-    } 
-    else if (stricmp("UPDATE", response) == 0) 
+    }
+    else if (stricmp("UPDATE", response) == 0)
     {
       char *updateurl = strtok(NULL, seps);
       if (!updateurl)
@@ -312,13 +311,13 @@
       string msg = "Handshaking: Please update your client at: ";
       msg += updateurl;
       StatusUpdate(S_HANDSHAKE_OLD_CLIENT,msg.c_str());
-    } 
-    else if (stricmp("BADUSER", response) == 0) 
+    }
+    else if (stricmp("BADUSER", response) == 0)
     {
       StatusUpdate(S_HANDSHAKE_BAD_USERNAME,"Handshake failed: Bad username");
       return;
-    } 
-    else 
+    }
+    else
     {
       break;
     }
@@ -340,7 +339,7 @@
 
 void CScrobbler::HandleSubmit(char *data)
 {
-  //  submit returned 
+  //  submit returned
   m_bSubmitInProgress = false; //- this should already have been cancelled by the header callback
 
   StatusUpdate(S_DEBUG,data);
@@ -348,12 +347,12 @@
   // Doesn't take into account multiple-packet returns (not that I've seen one yet)...
   char seps[] = " \n\r";
   char * response = strtok(data, seps);
-  if (!response) 
+  if (!response)
   {
     StatusUpdate(S_SUBMIT_INVALID_RESPONSE,"Submission failed: Response invalid");
     return;
   }
-  if (stricmp("OK", response) == 0) 
+  if (stricmp("OK", response) == 0)
   {
     StatusUpdate(S_SUBMIT_SUCCESS,"Submission succeeded.");
 
@@ -361,36 +360,36 @@
 
     ClearCache();
     char *inttext = strtok(NULL, seps);
-    if (inttext && (stricmp("INTERVAL", inttext) == 0)) 
+    if (inttext && (stricmp("INTERVAL", inttext) == 0))
     {
       m_Interval = atoi(strtok(NULL, seps));
       CStdString strBuf;
       strBuf.Format("Submit interval set to %i seconds.", m_Interval);
       StatusUpdate(S_SUBMIT_INTERVAL, strBuf);
     }
-  } 
-  else if (stricmp("BADPASS", response) == 0) 
+  }
+  else if (stricmp("BADPASS", response) == 0)
   {
     StatusUpdate(S_SUBMIT_BAD_PASSWORD,"Submission failed: bad password.");
-  } 
-  else if (stricmp("FAILED", response) == 0) 
+  }
+  else if (stricmp("FAILED", response) == 0)
   {
     CStdString strBuf;
     strBuf.Format("Submission failed: %s", strtok(NULL, "\n"));
     StatusUpdate(S_SUBMIT_FAILED, strBuf);
     char *inttext = strtok(NULL, seps);
-    if (inttext && (stricmp("INTERVAL", inttext) == 0)) 
+    if (inttext && (stricmp("INTERVAL", inttext) == 0))
     {
       m_Interval = atoi(strtok(NULL, seps));
       strBuf.Format("Submit interval set to %i seconds.", m_Interval);
       StatusUpdate(S_SUBMIT_INTERVAL, strBuf);
     }
-  } 
-  else if (stricmp("BADAUTH",response) == 0) 
+  }
+  else if (stricmp("BADAUTH",response) == 0)
   {
     StatusUpdate(S_SUBMIT_BADAUTH,"Submission failed: bad authorization.");
     char *inttext = strtok(NULL, seps);
-    if (inttext && (stricmp("INTERVAL", inttext) == 0)) 
+    if (inttext && (stricmp("INTERVAL", inttext) == 0))
     {
       m_Interval = atoi(strtok(NULL, seps));
       CStdString strBuf;
@@ -400,8 +399,8 @@
     //re-handshake
     m_bReHandShaking = true;
     DoHandshake();
-  } 
-  else 
+  }
+  else
   {
     CStdString strBuf;
     strBuf.Format("Submission failed: %s", strtok(NULL, "\n"));
@@ -409,7 +408,7 @@
   }
 }
 
-void CScrobbler::SetInterval(int in) 
+void CScrobbler::SetInterval(int in)
 {
   m_Interval = in;
   CStdString ret;
@@ -417,17 +416,17 @@
   StatusUpdate(S_SUBMIT_INTERVAL, ret);
 }
 
-void CScrobbler::GenSessionKey() 
+void CScrobbler::GenSessionKey()
 {
   CStdString clear = m_strPassword + m_strChallenge;
-  MD5_CTX md5state;
   unsigned char md5pword[16];
-  MD5Init(&md5state);
-  MD5Update(&md5state, (unsigned char *)clear.c_str(), (int)clear.length());
-  MD5Final(md5pword, &md5state);
+  XBMC::MD5 md5state;
+  md5state.append(clear);
+  md5state.getDigest(md5pword);
+
   char key[33];
   strncpy(key, "\0", sizeof(key));
-  for (int j = 0;j < 16;j++) 
+  for (int j = 0;j < 16;j++)
   {
     char a[3];
     sprintf(a, "%02x", md5pword[j]);
@@ -437,8 +436,8 @@
   m_strSessionKey = key;
 }
 
-int CScrobbler::LoadCache() 
-{ 
+int CScrobbler::LoadCache()
+{
   StatusUpdate(S_SUBMITTING,"load cache");
 
   int iNumEntries=0;
@@ -455,11 +454,11 @@
     SetCache(strCache, iNumEntries);
     return 1;
   }
-  return 0; 
+  return 0;
 }
 
 int CScrobbler::SaveCache(const CStdString& strCache, int iNumEntries)
-{ 
+{
   if (iNumEntries<=0)
     return 0;
 
@@ -473,7 +472,7 @@
     file.Close();
     return 1;
   }
-  return 0; 
+  return 0;
 }
 
 void CScrobbler::StatusUpdate(ScrobbleStatus status, const CStdString& strText)
@@ -555,7 +554,7 @@
     CHTTP http;
     CStdString strHtml;
     bool bSuccess;
-    if (!m_bReadyToSubmit) 
+    if (!m_bReadyToSubmit)
     {
       bSuccess=http.Get(m_strHsString, strHtml);
       if (bSuccess)
@@ -566,8 +565,8 @@
         if (m_bReHandShaking)
           m_bReHandShaking = false;
       }
-    } 
-    else 
+    }
+    else
     {
       bSuccess=http.Post(m_strSubmitUrl, m_strSubmit, strHtml);
       if (bSuccess)
@@ -591,7 +590,7 @@
 
     ReleaseMutex(m_hHttpMutex);
     // OK, if this was a handshake, it failed since m_bReadyToSubmit isn't true. Submissions get cached.
-    while (!m_bReadyToSubmit && !m_bCloseThread) 
+    while (!m_bReadyToSubmit && !m_bCloseThread)
     {
       StatusUpdate(S_HANDHAKE_NOTREADY,"Unable to handshake: sleeping...");
       Sleep(HS_FAIL_WAIT);

Modified: branches/linuxport/XBMC/xbmc/utils/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/Makefile	2008-07-25 21:43:59 UTC (rev 14446)
+++ branches/linuxport/XBMC/xbmc/utils/Makefile	2008-07-25 22:20:59 UTC (rev 14447)
@@ -1,10 +1,7 @@
 INCLUDES=-I. -I.. -I../linux -I../../guilib
 
-SRCS=AlarmClock.cpp Archive.cpp CharsetConverter.cpp CriticalSection.cpp DelayController.cpp Event.cpp fstrcmp.cpp GUIInfoManager.cpp HTMLTable.cpp HTMLUtil.cpp HttpHeader.cpp IMDB.cpp InfoLoader.cpp log.cpp MusicAlbumInfo.cpp MusicInfoScraper.cpp RegExp.cpp RssReader.cpp ScraperParser.cpp SingleLock.cpp Splash.cpp Stopwatch.cpp SystemInfo.cpp TuxBoxUtil.cpp UdpClient.cpp Weather.cpp Thread.cpp HTTP.cpp SharedSection.cpp Win32Exception.cpp CPUInfo.cpp PCMAmplifier.cpp LabelFormatter.cpp Network.cpp BitstreamStats.cpp PerformanceStats.cpp PerformanceSample.cpp LCDFactory.cpp LCD.cpp EventServer.cpp EventPacket.cpp EventClient.cpp Socket.cpp Fanart.cpp ScraperUrl.cpp MusicArtistInfo.cpp RssFeed.cpp Mutex.cpp
+SRCS=AlarmClock.cpp Archive.cpp CharsetConverter.cpp CriticalSection.cpp DelayController.cpp Event.cpp fstrcmp.cpp GUIInfoManager.cpp HTMLTable.cpp HTMLUtil.cpp HttpHeader.cpp IMDB.cpp InfoLoader.cpp log.cpp MusicAlbumInfo.cpp MusicInfoScraper.cpp RegExp.cpp RssReader.cpp ScraperParser.cpp SingleLock.cpp Splash.cpp Stopwatch.cpp SystemInfo.cpp TuxBoxUtil.cpp UdpClient.cpp Weather.cpp Thread.cpp HTTP.cpp SharedSection.cpp Win32Exception.cpp CPUInfo.cpp PCMAmplifier.cpp LabelFormatter.cpp Network.cpp BitstreamStats.cpp PerformanceStats.cpp PerformanceSample.cpp LCDFactory.cpp LCD.cpp EventServer.cpp EventPacket.cpp EventClient.cpp Socket.cpp Fanart.cpp ScraperUrl.cpp MusicArtistInfo.cpp RssFeed.cpp Mutex.cpp md5.cpp
 
-# This includes only the objects of the C files
-OBJS=md5.o
-
 LIB=utils.a
 
 include ../../Makefile.include

Copied: branches/linuxport/XBMC/xbmc/utils/md5.cpp (from rev 14445, branches/linuxport/XBMC/xbmc/utils/md5.c)
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/md5.cpp	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/utils/md5.cpp	2008-07-25 22:20:59 UTC (rev 14447)
@@ -0,0 +1,308 @@
+/*
+ *      Copyright (C) 2005-2008 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include "md5.h"
+
+static void MD5Init (MD5_CTX *mdContext);
+static void MD5Update (MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen);
+static void MD5Final (unsigned char digest[16], MD5_CTX *mdContext);
+
+XBMC::MD5::MD5(void)
+{
+	MD5Init(&m_ctx);
+}
+
+void XBMC::MD5::append(unsigned char *inBuf, unsigned int inLen)
+{
+	MD5Update(&m_ctx, inBuf, inLen);
+}
+
+void XBMC::MD5::append(const CStdString& str)
+{
+	append((unsigned char*) str.c_str(), (unsigned int) str.length());
+}
+
+void XBMC::MD5::getDigest(unsigned char digest[16])
+{
+	MD5Final(digest, &m_ctx);
+}
+
+/*
+ **********************************************************************
+ ** md5.c                                                            **
+ ** RSA Data Security, Inc. MD5 Message Digest Algorithm             **
+ ** Created: 2/17/90 RLR                                             **
+ ** Revised: 1/91 SRD,AJ,BSK,JT Reference C Version                  **
+ **********************************************************************
+ */
+
+/*
+ **********************************************************************
+ ** Copyright (C) 1990, RSA Data Security, Inc. All rights reserved. **
+ **                                                                  **
+ ** License to copy and use this software is granted provided that   **
+ ** it is identified as the "RSA Data Security, Inc. MD5 Message     **
+ ** Digest Algorithm" in all material mentioning or referencing this **
+ ** software or this function.                                       **
+ **                                                                  **
+ ** License is also granted to make and use derivative works         **
+ ** provided that such works are identified as "derived from the RSA **
+ ** Data Security, Inc. MD5 Message Digest Algorithm" in all         **
+ ** material mentioning or referencing the derived work.             **
+ **                                                                  **
+ ** RSA Data Security, Inc. makes no representations concerning      **
+ ** either the merchantability of this software or the suitability   **
+ ** of this software for any particular purpose.  It is provided "as **
+ ** is" without express or implied warranty of any kind.             **
+ **                                                                  **
+ ** These notices must be retained in any copies of any part of this **
+ ** documentation and/or software.                                   **
+ **********************************************************************
+ */
+
+/* forward declaration */
+static void Transform (UINT4* buf, UINT4* in);
+
+static unsigned char PADDING[64] = {
+  0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+/* F, G and H are basic MD5 functions: selection, majority, parity */
+#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
+#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define I(x, y, z) ((y) ^ ((x) | (~z)))
+
+/* ROTATE_LEFT rotates x left n bits */
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
+
+/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4 */
+/* Rotation is separate from addition to prevent recomputation */
+#define FF(a, b, c, d, x, s, ac) \
+  {(a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+#define GG(a, b, c, d, x, s, ac) \
+  {(a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+#define HH(a, b, c, d, x, s, ac) \
+  {(a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+#define II(a, b, c, d, x, s, ac) \
+  {(a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \
+   (a) = ROTATE_LEFT ((a), (s)); \
+   (a) += (b); \
+  }
+
+static void MD5Init (MD5_CTX *mdContext)
+{
+  mdContext->i[0] = mdContext->i[1] = (UINT4)0;
+
+  /* Load magic initialization constants.
+   */
+  mdContext->buf[0] = (UINT4)0x67452301;
+  mdContext->buf[1] = (UINT4)0xefcdab89;
+  mdContext->buf[2] = (UINT4)0x98badcfe;
+  mdContext->buf[3] = (UINT4)0x10325476;
+}
+
+static void MD5Update (MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen)
+{
+  UINT4 in[16];
+  int mdi;
+  unsigned int i, ii;
+
+  /* compute number of bytes mod 64 */
+  mdi = (int)((mdContext->i[0] >> 3) & 0x3F);
+
+  /* update number of bits */
+  if ((mdContext->i[0] + ((UINT4)inLen << 3)) < mdContext->i[0])
+    mdContext->i[1]++;
+  mdContext->i[0] += ((UINT4)inLen << 3);
+  mdContext->i[1] += ((UINT4)inLen >> 29);
+
+  while (inLen--) {
+    /* add new character to buffer, increment mdi */
+    mdContext->in[mdi++] = *inBuf++;
+
+    /* transform if necessary */
+    if (mdi == 0x40) {
+      for (i = 0, ii = 0; i < 16; i++, ii += 4)
+        in[i] = (((UINT4)mdContext->in[ii+3]) << 24) |
+                (((UINT4)mdContext->in[ii+2]) << 16) |
+                (((UINT4)mdContext->in[ii+1]) << 8) |
+                ((UINT4)mdContext->in[ii]);
+      Transform (mdContext->buf, in);
+      mdi = 0;
+    }
+  }
+}
+
+static void MD5Final (unsigned char digest[16], MD5_CTX *mdContext)
+{
+  UINT4 in[16];
+  int mdi;
+  unsigned int i, ii;
+  unsigned int padLen;
+
+  /* save number of bits */
+  in[14] = mdContext->i[0];
+  in[15] = mdContext->i[1];
+
+  /* compute number of bytes mod 64 */
+  mdi = (int)((mdContext->i[0] >> 3) & 0x3F);
+
+  /* pad out to 56 mod 64 */
+  padLen = (mdi < 56) ? (56 - mdi) : (120 - mdi);
+  MD5Update (mdContext, PADDING, padLen);
+
+  /* append length in bits and transform */
+  for (i = 0, ii = 0; i < 14; i++, ii += 4)
+    in[i] = (((UINT4)mdContext->in[ii+3]) << 24) |
+            (((UINT4)mdContext->in[ii+2]) << 16) |
+            (((UINT4)mdContext->in[ii+1]) << 8) |
+            ((UINT4)mdContext->in[ii]);
+  Transform (mdContext->buf, in);
+
+  /* store buffer in digest */
+  for (i = 0, ii = 0; i < 4; i++, ii += 4) {
+    digest[ii] = (unsigned char)(mdContext->buf[i] & 0xFF);
+    digest[ii+1] =
+      (unsigned char)((mdContext->buf[i] >> 8) & 0xFF);
+    digest[ii+2] =
+      (unsigned char)((mdContext->buf[i] >> 16) & 0xFF);
+    digest[ii+3] =
+      (unsigned char)((mdContext->buf[i] >> 24) & 0xFF);
+  }
+}
+
+/* Basic MD5 step. Transform buf based on in.
+ */
+static void Transform (UINT4* buf, UINT4* in)
+{
+  UINT4 a = buf[0], b = buf[1], c = buf[2], d = buf[3];
+
+  /* Round 1 */
+#define S11 7
+#define S12 12
+#define S13 17
+#define S14 22
+  FF (a, b, c, d, in[ 0], S11, 0xd76aa478); /* 1 */
+  FF (d, a, b, c, in[ 1], S12, 0xe8c7b756); /* 2 */
+  FF (c, d, a, b, in[ 2], S13, 0x242070db); /* 3 */
+  FF (b, c, d, a, in[ 3], S14, 0xc1bdceee); /* 4 */
+  FF (a, b, c, d, in[ 4], S11, 0xf57c0faf); /* 5 */
+  FF (d, a, b, c, in[ 5], S12, 0x4787c62a); /* 6 */
+  FF (c, d, a, b, in[ 6], S13, 0xa8304613); /* 7 */
+  FF (b, c, d, a, in[ 7], S14, 0xfd469501); /* 8 */
+  FF (a, b, c, d, in[ 8], S11, 0x698098d8); /* 9 */
+  FF (d, a, b, c, in[ 9], S12, 0x8b44f7af); /* 10 */
+  FF (c, d, a, b, in[10], S13, 0xffff5bb1); /* 11 */
+  FF (b, c, d, a, in[11], S14, 0x895cd7be); /* 12 */
+  FF (a, b, c, d, in[12], S11, 0x6b901122); /* 13 */
+  FF (d, a, b, c, in[13], S12, 0xfd987193); /* 14 */
+  FF (c, d, a, b, in[14], S13, 0xa679438e); /* 15 */
+  FF (b, c, d, a, in[15], S14, 0x49b40821); /* 16 */
+
+  /* Round 2 */
+#define S21 5
+#define S22 9
+#define S23 14
+#define S24 20
+  GG (a, b, c, d, in[ 1], S21, 0xf61e2562); /* 17 */
+  GG (d, a, b, c, in[ 6], S22, 0xc040b340); /* 18 */
+  GG (c, d, a, b, in[11], S23, 0x265e5a51); /* 19 */
+  GG (b, c, d, a, in[ 0], S24, 0xe9b6c7aa); /* 20 */
+  GG (a, b, c, d, in[ 5], S21, 0xd62f105d); /* 21 */
+  GG (d, a, b, c, in[10], S22,  0x2441453); /* 22 */
+  GG (c, d, a, b, in[15], S23, 0xd8a1e681); /* 23 */
+  GG (b, c, d, a, in[ 4], S24, 0xe7d3fbc8); /* 24 */
+  GG (a, b, c, d, in[ 9], S21, 0x21e1cde6); /* 25 */
+  GG (d, a, b, c, in[14], S22, 0xc33707d6); /* 26 */
+  GG (c, d, a, b, in[ 3], S23, 0xf4d50d87); /* 27 */
+  GG (b, c, d, a, in[ 8], S24, 0x455a14ed); /* 28 */
+  GG (a, b, c, d, in[13], S21, 0xa9e3e905); /* 29 */
+  GG (d, a, b, c, in[ 2], S22, 0xfcefa3f8); /* 30 */
+  GG (c, d, a, b, in[ 7], S23, 0x676f02d9); /* 31 */
+  GG (b, c, d, a, in[12], S24, 0x8d2a4c8a); /* 32 */
+
+  /* Round 3 */
+#define S31 4
+#define S32 11
+#define S33 16
+#define S34 23
+  HH (a, b, c, d, in[ 5], S31, 0xfffa3942); /* 33 */
+  HH (d, a, b, c, in[ 8], S32, 0x8771f681); /* 34 */
+  HH (c, d, a, b, in[11], S33, 0x6d9d6122); /* 35 */
+  HH (b, c, d, a, in[14], S34, 0xfde5380c); /* 36 */
+  HH (a, b, c, d, in[ 1], S31, 0xa4beea44); /* 37 */
+  HH (d, a, b, c, in[ 4], S32, 0x4bdecfa9); /* 38 */
+  HH (c, d, a, b, in[ 7], S33, 0xf6bb4b60); /* 39 */
+  HH (b, c, d, a, in[10], S34, 0xbebfbc70); /* 40 */
+  HH (a, b, c, d, in[13], S31, 0x289b7ec6); /* 41 */
+  HH (d, a, b, c, in[ 0], S32, 0xeaa127fa); /* 42 */
+  HH (c, d, a, b, in[ 3], S33, 0xd4ef3085); /* 43 */
+  HH (b, c, d, a, in[ 6], S34,  0x4881d05); /* 44 */
+  HH (a, b, c, d, in[ 9], S31, 0xd9d4d039); /* 45 */
+  HH (d, a, b, c, in[12], S32, 0xe6db99e5); /* 46 */
+  HH (c, d, a, b, in[15], S33, 0x1fa27cf8); /* 47 */
+  HH (b, c, d, a, in[ 2], S34, 0xc4ac5665); /* 48 */
+
+  /* Round 4 */
+#define S41 6
+#define S42 10
+#define S43 15
+#define S44 21
+  II ( a, b, c, d, in[ 0], S41, 0xf4292244); /* 49 */
+  II ( d, a, b, c, in[ 7], S42, 0x432aff97); /* 50 */
+  II ( c, d, a, b, in[14], S43, 0xab9423a7); /* 51 */
+  II ( b, c, d, a, in[ 5], S44, 0xfc93a039); /* 52 */
+  II ( a, b, c, d, in[12], S41, 0x655b59c3); /* 53 */
+  II ( d, a, b, c, in[ 3], S42, 0x8f0ccc92); /* 54 */
+  II ( c, d, a, b, in[10], S43, 0xffeff47d); /* 55 */
+  II ( b, c, d, a, in[ 1], S44, 0x85845dd1); /* 56 */
+  II ( a, b, c, d, in[ 8], S41, 0x6fa87e4f); /* 57 */
+  II ( d, a, b, c, in[15], S42, 0xfe2ce6e0); /* 58 */
+  II ( c, d, a, b, in[ 6], S43, 0xa3014314); /* 59 */
+  II ( b, c, d, a, in[13], S44, 0x4e0811a1); /* 60 */
+  II ( a, b, c, d, in[ 4], S41, 0xf7537e82); /* 61 */
+  II ( d, a, b, c, in[11], S42, 0xbd3af235); /* 62 */
+  II ( c, d, a, b, in[ 2], S43, 0x2ad7d2bb); /* 63 */
+  II ( b, c, d, a, in[ 9], S44, 0xeb86d391); /* 64 */
+
+  buf[0] += a;
+  buf[1] += b;
+  buf[2] += c;
+  buf[3] += d;
+}
+

Modified: branches/linuxport/XBMC/xbmc/utils/md5.h
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/md5.h	2008-07-25 21:43:59 UTC (rev 14446)
+++ branches/linuxport/XBMC/xbmc/utils/md5.h	2008-07-25 22:20:59 UTC (rev 14447)
@@ -40,9 +40,7 @@
 #ifndef _MD5_H_
 #define _MD5_H_ 1
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "system.h"
 
 /* typedef a 32 bit type */
 typedef unsigned long int UINT4;
@@ -54,13 +52,20 @@
   unsigned char in[64];                              /* input buffer */
 } MD5_CTX;
 
-void MD5Init (MD5_CTX *mdContext);
-void MD5Update (MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen);
-void MD5Final (unsigned char digest[16], MD5_CTX *mdContext);
+namespace XBMC
+{
+	class MD5
+	{
+	public:
+		MD5(void);
+		void append(unsigned char *inBuf, unsigned int inLen);
+		void append(const CStdString& str);
+		void getDigest(unsigned char digest[16]);
 
-#ifdef __cplusplus
+	private:
+		MD5_CTX m_ctx;
+	};
 }
-#endif
 
 #endif
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14455
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14455&view=rev
Author:   jmarshallnz
Date:     2008-07-26 02:34:57 +0000 (Sat, 26 Jul 2008)

Log Message:
-----------
changed: Unified the fileitemlist caching a bit.  Ideally the "always cache" option would all be handled by the time-based stuff (or internally by the directory classes)

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileItem.cpp
    branches/linuxport/XBMC/xbmc/FileItem.h
    branches/linuxport/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNode.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.h
    branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNode.cpp
    branches/linuxport/XBMC/xbmc/GUIMediaWindow.cpp
    branches/linuxport/XBMC/xbmc/UPnP.cpp
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp

Modified: branches/linuxport/XBMC/xbmc/FileItem.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-07-26 02:18:10 UTC (rev 14454)
+++ branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-07-26 02:34:57 UTC (rev 14455)
@@ -1083,7 +1083,7 @@
 {
   m_fastLookup = false;
   m_bIsFolder=true;
-  m_bCacheToDisc=false;
+  m_cacheToDisc=CACHE_IF_SLOW;
   m_sortMethod=SORT_METHOD_NONE;
   m_sortOrder=SORT_ORDER_NONE;
   m_replaceListing = false;
@@ -1094,7 +1094,7 @@
   m_strPath=strPath;
   m_fastLookup = false;
   m_bIsFolder=true;
-  m_bCacheToDisc=false;
+  m_cacheToDisc=CACHE_IF_SLOW;
   m_sortMethod=SORT_METHOD_NONE;
   m_sortOrder=SORT_ORDER_NONE;
   m_replaceListing = false;
@@ -1169,7 +1169,7 @@
   ClearItems();
   m_sortMethod=SORT_METHOD_NONE;
   m_sortOrder=SORT_ORDER_NONE;
-  m_bCacheToDisc=false;
+  m_cacheToDisc=CACHE_IF_SLOW;
   m_sortDetails.clear();
   m_replaceListing = false;
   m_content.Empty();
@@ -1484,7 +1484,7 @@
 
     ar << (int)m_sortMethod;
     ar << (int)m_sortOrder;
-    ar << m_bCacheToDisc;
+    ar << (int)m_cacheToDisc;
 
     ar << (int)m_sortDetails.size();
     for (unsigned int j = 0; j < m_sortDetails.size(); ++j)
@@ -1540,7 +1540,7 @@
 
     ar >> (int&)m_sortMethod;
     ar >> (int&)m_sortOrder;
-    ar >> m_bCacheToDisc;
+    ar >> (int&)m_cacheToDisc;
 
     unsigned int detailSize = 0;
     ar >> detailSize;

Modified: branches/linuxport/XBMC/xbmc/FileItem.h
===================================================================
--- branches/linuxport/XBMC/xbmc/FileItem.h	2008-07-26 02:18:10 UTC (rev 14454)
+++ branches/linuxport/XBMC/xbmc/FileItem.h	2008-07-26 02:34:57 UTC (rev 14455)
@@ -299,6 +299,8 @@
 class CFileItemList : public CFileItem
 {
 public:
+  enum CACHE_TYPE { CACHE_NEVER = 0, CACHE_IF_SLOW, CACHE_ALWAYS };
+
   CFileItemList();
   CFileItemList(const CStdString& strPath);
   virtual ~CFileItemList();
@@ -341,8 +343,9 @@
   SORT_METHOD GetSortMethod() const { return m_sortMethod; }
   bool Load();
   bool Save();
-  void SetCacheToDisc(bool bYesNo) { m_bCacheToDisc=bYesNo; }
-  bool GetCacheToDisc() const { return m_bCacheToDisc; }
+  void SetCacheToDisc(CACHE_TYPE cacheToDisc) { m_cacheToDisc = cacheToDisc; }
+  bool CacheToDiscAlways() const { return m_cacheToDisc == CACHE_ALWAYS; }
+  bool CacheToDiscIfSlow() const { return m_cacheToDisc == CACHE_IF_SLOW; }
   void RemoveDiscCache() const;
   bool AlwaysCache() const;
 
@@ -375,7 +378,7 @@
   bool m_fastLookup;
   SORT_METHOD m_sortMethod;
   SORT_ORDER m_sortOrder;
-  bool m_bCacheToDisc;
+  CACHE_TYPE m_cacheToDisc;
   bool m_replaceListing;
   CStdString m_content;
 

Modified: branches/linuxport/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNode.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNode.cpp	2008-07-26 02:18:10 UTC (rev 14454)
+++ branches/linuxport/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNode.cpp	2008-07-26 02:34:57 UTC (rev 14455)
@@ -247,7 +247,7 @@
     {
       AddQueuingFolder(items);
       if (CanCache())
-        items.SetCacheToDisc(true);
+        items.SetCacheToDisc(CFileItemList::CACHE_ALWAYS);
     }
     else
       items.Clear();

Modified: branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.cpp	2008-07-26 02:18:10 UTC (rev 14454)
+++ branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.cpp	2008-07-26 02:34:57 UTC (rev 14455)
@@ -543,6 +543,7 @@
 
 void CPluginDirectory::SetProperty(int handle, const CStdString &strProperty, const CStdString &strValue)
 {
+  CSingleLock lock(m_handleLock);
   if (handle < 0 || handle >= (int)globalHandles.size())
   {
     CLog::Log(LOGERROR, "%s called with an invalid handle.", __FUNCTION__);
@@ -553,6 +554,19 @@
   dir->m_listItems->SetProperty(strProperty, strValue);
 }
 
+void CPluginDirectory::SetCacheToDisc(int handle, bool cacheToDisc)
+{
+  CSingleLock lock(m_handleLock);
+  if (handle < 0 || handle >= (int)globalHandles.size())
+  {
+    CLog::Log(LOGERROR, "%s called with an invalid handle.", __FUNCTION__);
+    return;
+  }
+
+  CPluginDirectory *dir = globalHandles[handle];
+  dir->m_listItems->SetCacheToDisc(cacheToDisc ? CFileItemList::CACHE_IF_SLOW : CFileItemList::CACHE_NEVER);
+}
+
 void CPluginDirectory::LoadPluginStrings(const CURL &url)
 {
   // Path where the plugin resides

Modified: branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.h
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.h	2008-07-26 02:18:10 UTC (rev 14454)
+++ branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.h	2008-07-26 02:34:57 UTC (rev 14455)
@@ -53,6 +53,7 @@
   static void AddSortMethod(int handle, SORT_METHOD sortMethod);
   static void SetContent(int handle, const CStdString &strContent);
   static void SetProperty(int handle, const CStdString &strProperty, const CStdString &strValue);
+  static void SetCacheToDisc(int handle, bool cacheToDisc);
 
 private:
   bool WaitOnScriptResult(const CStdString &scriptPath, const CStdString &scriptName);

Modified: branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNode.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNode.cpp	2008-07-26 02:18:10 UTC (rev 14454)
+++ branches/linuxport/XBMC/xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNode.cpp	2008-07-26 02:34:57 UTC (rev 14455)
@@ -244,7 +244,7 @@
     {
       AddQueuingFolder(items);
       if (CanCache())
-        items.SetCacheToDisc(true);
+        items.SetCacheToDisc(CFileItemList::CACHE_ALWAYS);
     }
     else
       items.Clear();

Modified: branches/linuxport/XBMC/xbmc/GUIMediaWindow.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIMediaWindow.cpp	2008-07-26 02:18:10 UTC (rev 14454)
+++ branches/linuxport/XBMC/xbmc/GUIMediaWindow.cpp	2008-07-26 02:34:57 UTC (rev 14455)
@@ -407,7 +407,7 @@
     items.Sort(guiState->GetSortMethod(), guiState->GetDisplaySortOrder());
 
     // Should these items be saved to the hdd
-    if (items.GetCacheToDisc())
+    if (items.CacheToDiscAlways())
       items.Save();
   }
 }
@@ -479,8 +479,7 @@
       return false;
 
     // took over a second, and not normally cached, so cache it
-    if ((time + 1000 < timeGetTime() && !items.GetCacheToDisc()) &&
-        !items.GetPropertyBOOL("donotcachetodisc"))
+    if (time + 1000 < timeGetTime() && items.CacheToDiscIfSlow())
       items.Save();
 
     // if these items should replace the current listing, then pop it off the top

Modified: branches/linuxport/XBMC/xbmc/UPnP.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/UPnP.cpp	2008-07-26 02:18:10 UTC (rev 14454)
+++ branches/linuxport/XBMC/xbmc/UPnP.cpp	2008-07-26 02:34:57 UTC (rev 14455)
@@ -917,7 +917,7 @@
         } else {
             CDirectory::GetDirectory((const char*)id, items);
         }
-        if(items.GetCacheToDisc() || time < GetTickCount())
+        if(items.CacheToDiscAlways() || (items.CacheToDiscIfSlow() && time < GetTickCount()))
           items.Save();
     }
 

Modified: branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp	2008-07-26 02:18:10 UTC (rev 14454)
+++ branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/GUIPythonWindowXML.cpp	2008-07-26 02:34:57 UTC (rev 14455)
@@ -450,7 +450,7 @@
     items.Sort(guiState->GetSortMethod(), guiState->GetDisplaySortOrder());
 
     // Should these items be saved to the hdd
-    if (items.GetCacheToDisc())
+    if (items.CacheToDiscAlways())
       items.Save();
   }
 }

Modified: branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp	2008-07-26 02:18:10 UTC (rev 14454)
+++ branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp	2008-07-26 02:34:57 UTC (rev 14455)
@@ -359,7 +359,7 @@
       return NULL;
     };
 
-    DIRECTORY::CPluginDirectory::SetProperty(handle, "donotcachetodisc", "1");
+    DIRECTORY::CPluginDirectory::SetCacheToDisc(handle, false);
 
     Py_INCREF(Py_None);
     return Py_None;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14467
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14467&view=rev
Author:   yuvalt
Date:     2008-07-26 14:17:01 +0000 (Sat, 26 Jul 2008)

Log Message:
-----------
add support for arabic character shaping

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUISettings.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
    branches/linuxport/XBMC/xbmc/utils/CharsetConverter.cpp
    branches/linuxport/XBMC/xbmc/utils/Makefile

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/utils/ArabicShaping.cpp
    branches/linuxport/XBMC/xbmc/utils/ArabicShaping.h

Modified: branches/linuxport/XBMC/xbmc/GUISettings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-07-26 11:53:22 UTC (rev 14466)
+++ branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-07-26 14:17:01 UTC (rev 14467)
@@ -444,6 +444,7 @@
   AddInt(4, "subtitles.color", 737, SUBTITLE_COLOR_START + 1, SUBTITLE_COLOR_START, 1, SUBTITLE_COLOR_END, SPIN_CONTROL_TEXT);
   AddString(5, "subtitles.charset", 735, "DEFAULT", SPIN_CONTROL_TEXT);
   AddBool(6, "subtitles.flipbidicharset", 13304, false);
+  AddBool(7, "subtitles.arabicshaping", 13362, false);
   AddSeparator(7, "subtitles.sep1");
   AddBool(9, "subtitles.searchrars", 13249, false);
   AddSeparator(10,"subtitles.sep2");

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-07-26 11:53:22 UTC (rev 14466)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-07-26 14:17:01 UTC (rev 14467)
@@ -1112,8 +1112,8 @@
     else if (strSetting.Equals("network.assignment"))
     {
       CGUISpinControlEx* pControl1 = (CGUISpinControlEx *)GetControl(GetSetting("network.assignment")->GetID());
-#ifdef HAS_LINUX_NETWORK    
-      if (pControl1)  
+#ifdef HAS_LINUX_NETWORK
+      if (pControl1)
          pControl1->SetEnabled(geteuid() == 0);
 #endif
     }
@@ -3531,7 +3531,7 @@
   CGUISpinControlEx *pControl = (CGUISpinControlEx *)GetControl(GetSetting(pSetting->GetSetting())->GetID());
   pControl->Clear();
 
-#if defined(HAS_LINUX_NETWORK) || defined(HAS_WIN32_NETWORK) 
+#if defined(HAS_LINUX_NETWORK) || defined(HAS_WIN32_NETWORK)
   // query list of interfaces
   vector<CStdString> vecInterfaces;
   std::vector<CNetworkInterface*>& ifaces = g_application.getNetwork().GetInterfaceList();

Added: branches/linuxport/XBMC/xbmc/utils/ArabicShaping.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/ArabicShaping.cpp	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/utils/ArabicShaping.cpp	2008-07-26 14:17:01 UTC (rev 14467)
@@ -0,0 +1,284 @@
+/*
+ *      Copyright (C) 2005-2008 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  A port of Mohammed Yousif's C Arabic shaping code
+ *  Ported by Nibras Al-shaiba
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#include <malloc.h>
+#include "ArabicShaping.h"
+
+#define NIL 0x0000
+
+#define MAP_LENGTH 37
+#define COMB_MAP_LENGTH 4
+#define TRANS_CHARS_LENGTH 39
+
+typedef struct
+{
+  FriBidiChar code;
+  FriBidiChar mIsolated;
+  FriBidiChar mInitial;
+  FriBidiChar mMedial;
+  FriBidiChar mFinal;
+} CharRep;
+
+typedef struct
+{
+  FriBidiChar code[2];
+  FriBidiChar mIsolated;
+  FriBidiChar mInitial;
+  FriBidiChar mMedial;
+  FriBidiChar mFinal;
+} CombCharRep;
+
+CharRep charsMap[MAP_LENGTH] =
+{
+  { 0x0621, 0xFE80, NIL, NIL, NIL }, /* HAMZA */
+  { 0x0622, 0xFE81, NIL, NIL, 0xFE82 }, /* ALEF_MADDA */
+  { 0x0623, 0xFE83, NIL, NIL, 0xFE84 }, /* ALEF_HAMZA_ABOVE */
+  { 0x0624, 0xFE85, NIL, NIL, 0xFE86 }, /* WAW_HAMZA */
+  { 0x0625, 0xFE87, NIL, NIL, 0xFE88 }, /* ALEF_HAMZA_BELOW */
+  { 0x0626, 0xFE89, 0xFE8B, 0xFE8C, 0xFE8A }, /* YEH_HAMZA */
+  { 0x0627, 0xFE8D, NIL, NIL, 0xFE8E }, /* ALEF */
+  { 0x0628, 0xFE8F, 0xFE91, 0xFE92, 0xFE90 }, /* BEH */
+  { 0x0629, 0xFE93, NIL, NIL, 0xFE94 }, /* TEH_MARBUTA */
+  { 0x062A, 0xFE95, 0xFE97, 0xFE98, 0xFE96 }, /* TEH */
+  { 0x062B, 0xFE99, 0xFE9B, 0xFE9C, 0xFE9A }, /* THEH */
+  { 0x062C, 0xFE9D, 0xFE9F, 0xFEA0, 0xFE9E }, /* JEEM */
+  { 0x062D, 0xFEA1, 0xFEA3, 0xFEA4, 0xFEA2 }, /* HAH */
+  { 0x062E, 0xFEA5, 0xFEA7, 0xFEA8, 0xFEA6 }, /* KHAH */
+  { 0x062F, 0xFEA9, NIL, NIL, 0xFEAA }, /* DAL */
+  { 0x0630, 0xFEAB, NIL, NIL, 0xFEAC }, /* THAL */
+  { 0x0631, 0xFEAD, NIL, NIL, 0xFEAE }, /* REH */
+  { 0x0632, 0xFEAF, NIL, NIL, 0xFEB0 }, /* ZAIN */
+  { 0x0633, 0xFEB1, 0xFEB3, 0xFEB4, 0xFEB2 }, /* SEEN */
+  { 0x0634, 0xFEB5, 0xFEB7, 0xFEB8, 0xFEB6 }, /* SHEEN */
+  { 0x0635, 0xFEB9, 0xFEBB, 0xFEBC, 0xFEBA }, /* SAD */
+  { 0x0636, 0xFEBD, 0xFEBF, 0xFEC0, 0xFEBE }, /* DAD */
+  { 0x0637, 0xFEC1, 0xFEC3, 0xFEC4, 0xFEC2 }, /* TAH */
+  { 0x0638, 0xFEC5, 0xFEC7, 0xFEC8, 0xFEC6 }, /* ZAH */
+  { 0x0639, 0xFEC9, 0xFECB, 0xFECC, 0xFECA }, /* AIN */
+  { 0x063A, 0xFECD, 0xFECF, 0xFED0, 0xFECE }, /* GHAIN */
+  { 0x0640, 0x0640, NIL, NIL, NIL }, /* TATWEEL */
+  { 0x0641, 0xFED1, 0xFED3, 0xFED4, 0xFED2 }, /* FEH */
+  { 0x0642, 0xFED5, 0xFED7, 0xFED8, 0xFED6 }, /* QAF */
+  { 0x0643, 0xFED9, 0xFEDB, 0xFEDC, 0xFEDA }, /* KAF */
+  { 0x0644, 0xFEDD, 0xFEDF, 0xFEE0, 0xFEDE }, /* LAM */
+  { 0x0645, 0xFEE1, 0xFEE3, 0xFEE4, 0xFEE2 }, /* MEEM */
+  { 0x0646, 0xFEE5, 0xFEE7, 0xFEE8, 0xFEE6 }, /* NOON */
+  { 0x0647, 0xFEE9, 0xFEEB, 0xFEEC, 0xFEEA }, /* HEH */
+  { 0x0648, 0xFEED, NIL, NIL, 0xFEEE }, /* WAW */
+  //{ 0x0649, 0xFEEF, 0xFBE8, 0xFBE9, 0xFEF0 },    /* ALEF_MAKSURA */
+  { 0x0649, 0xFEEF, NIL, NIL, 0xFEF0 }, /* ALEF_MAKSURA */
+  { 0x064A, 0xFEF1, 0xFEF3, 0xFEF4, 0xFEF2 } /* YEH */
+};
+
+CombCharRep combCharsMap[COMB_MAP_LENGTH] =
+{
+  { { 0x0644, 0x0622 }, 0xFEF5, NIL, NIL, 0xFEF6 }, /* LAM_ALEF_MADDA */
+  { { 0x0644, 0x0623 }, 0xFEF7, NIL, NIL, 0xFEF8 }, /* LAM_ALEF_HAMZA_ABOVE */
+  { { 0x0644, 0x0625 }, 0xFEF9, NIL, NIL, 0xFEFA }, /* LAM_ALEF_HAMZA_BELOW */
+  { { 0x0644, 0x0627 }, 0xFEFB, NIL, NIL, 0xFEFC } /* LAM_ALEF */
+};
+
+FriBidiChar transChars[TRANS_CHARS_LENGTH] =
+{
+  0x0610, /* ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM */
+  0x0612, /* ARABIC SIGN ALAYHE ASSALLAM */
+  0x0613, /* ARABIC SIGN RADI ALLAHOU ANHU */
+  0x0614, /* ARABIC SIGN TAKHALLUS */
+  0x0615, /* ARABIC SMALL HIGH TAH */
+  0x064B, /* ARABIC FATHATAN */
+  0x064C, /* ARABIC DAMMATAN */
+  0x064D, /* ARABIC KASRATAN */
+  0x064E, /* ARABIC FATHA */
+  0x064F, /* ARABIC DAMMA */
+  0x0650, /* ARABIC KASRA */
+  0x0651, /* ARABIC SHADDA */
+  0x0652, /* ARABIC SUKUN */
+  0x0653, /* ARABIC MADDAH ABOVE */
+  0x0654, /* ARABIC HAMZA ABOVE */
+  0x0655, /* ARABIC HAMZA BELOW */
+  0x0656, /* ARABIC SUBSCRIPT ALEF */
+  0x0657, /* ARABIC INVERTED DAMMA */
+  0x0658, /* ARABIC MARK NOON GHUNNA */
+  0x0670, /* ARABIC LETTER SUPERSCRIPT ALEF */
+  0x06D6, /* ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA */
+  0x06D7, /* ARABIC SMALL HIGH LIGATURE QAF WITH LAM WITH ALEF MAKSURA */
+  0x06D8, /* ARABIC SMALL HIGH MEEM INITIAL FORM */
+  0x06D9, /* ARABIC SMALL HIGH LAM ALEF */
+  0x06DA, /* ARABIC SMALL HIGH JEEM */
+  0x06DB, /* ARABIC SMALL HIGH THREE DOTS */
+  0x06DC, /* ARABIC SMALL HIGH SEEN */
+  0x06DF, /* ARABIC SMALL HIGH ROUNDED ZERO */
+  0x06E0, /* ARABIC SMALL HIGH UPRIGHT RECTANGULAR ZERO */
+  0x06E1, /* ARABIC SMALL HIGH DOTLESS HEAD OF KHAH */
+  0x06E2, /* ARABIC SMALL HIGH MEEM ISOLATED FORM */
+  0x06E3, /* ARABIC SMALL LOW SEEN */
+  0x06E4, /* ARABIC SMALL HIGH MADDA */
+  0x06E7, /* ARABIC SMALL HIGH YEH */
+  0x06E8, /* ARABIC SMALL HIGH NOON */
+  0x06EA, /* ARABIC EMPTY CENTRE LOW STOP */
+  0x06EB, /* ARABIC EMPTY CENTRE HIGH STOP */
+  0x06EC, /* ARABIC ROUNDED HIGH STOP WITH FILLED CENTRE */
+  0x06ED /* ARABIC SMALL LOW MEEM */
+};
+
+static fribidi_boolean CharacterMapContains(FriBidiChar c)
+{
+  for (int i = 0; i < MAP_LENGTH; i++)
+  {
+    if (charsMap[i].code == c)
+      return FRIBIDI_TRUE;
+  }
+
+  return FRIBIDI_FALSE;
+}
+
+static CharRep GetCharRep(FriBidiChar c)
+{
+  for (int i = 0; i < MAP_LENGTH; i++)
+  {
+    if (charsMap[i].code == c)
+      return charsMap[i];
+  }
+
+  CharRep nilRep =  { NIL, NIL, NIL, NIL };
+  return nilRep;
+}
+
+static CombCharRep GetCombCharRep(FriBidiChar c1, FriBidiChar c2)
+{
+  int i = 0;
+  for (i = 0; i < COMB_MAP_LENGTH; i++)
+  {
+    if (combCharsMap[i].code[0] == c1 && combCharsMap[i].code[1] == c2)
+      return combCharsMap[i];
+  }
+  CombCharRep combNilRep =
+  {
+  { NIL, NIL }, NIL, NIL, NIL };
+  return combNilRep;
+}
+
+static fribidi_boolean IsTransparent(FriBidiChar c)
+{
+  int i = 0;
+  for (i = 0; i < TRANS_CHARS_LENGTH; i++)
+  {
+    if (transChars[i] == c)
+      return FRIBIDI_TRUE;
+  }
+  return FRIBIDI_FALSE;
+}
+
+FriBidiChar* shape_arabic(FriBidiChar * str, int len)
+{
+  CharRep crep;
+  CombCharRep combcrep;
+  FriBidiChar * shaped =
+      (FriBidiChar *) malloc(sizeof(FriBidiChar) * (len + 1));
+  int writeCount = 0;
+  for (int i = 0; i < len; i++)
+  {
+    FriBidiChar current = str[i];
+    if (CharacterMapContains(current))
+    {
+      FriBidiChar prev = NIL;
+      FriBidiChar next = NIL;
+      int prevID = i - 1;
+      int nextID = i + 1;
+
+      /*
+       Transparent characters have no effect in the shaping process.
+       So, ignore all the transparent characters that are BEFORE the
+       current character.
+       */
+      for (; prevID >= 0; prevID--)
+        if (!IsTransparent(str[prevID]))
+          break;
+
+      if ((prevID < 0) || !CharacterMapContains(prev = str[prevID]) || (!((crep
+          = GetCharRep(prev)).mInitial != NIL) && !(crep.mMedial != NIL)))
+        prev = NIL;
+
+      /*
+       Transparent characters have no effect in the shaping process.
+       So, ignore all the transparent characters that are AFTER the
+       current character.
+       */
+      for (; nextID < len; nextID++)
+        if (!IsTransparent(str[nextID]))
+          break;
+
+      if ((nextID >= len) || !CharacterMapContains(next = str[nextID])
+          || (!((crep = GetCharRep(next)).mMedial != NIL) && !((crep
+              = GetCharRep(next)).mFinal != NIL) && (next != 0x0640)))
+        next = NIL;
+
+      /* Combinations */
+      if (current == 0x0644 && next != NIL && (next == 0x0622 || next == 0x0623
+          || next == 0x0625 || next == 0x0627))
+      {
+        combcrep = GetCombCharRep(current, next);
+        if (prev != NIL)
+        {
+          shaped[writeCount++] = combcrep.mFinal;
+        }
+        else
+        {
+          shaped[writeCount++] = combcrep.mIsolated;
+        }
+        i++;
+        continue;
+      }
+
+      crep = GetCharRep(current);
+
+      /* Medial */
+      if (prev != NIL && next != NIL && crep.mMedial != NIL)
+      {
+        shaped[writeCount++] = crep.mMedial;
+        continue;
+        /* Final */
+      }
+      else if (prev != NIL && crep.mFinal != NIL)
+      {
+        shaped[writeCount++] = crep.mFinal;
+        continue;
+        /* Initial */
+      }
+      else if (next != NIL && crep.mInitial != NIL)
+      {
+        shaped[writeCount++] = crep.mInitial;
+        continue;
+      }
+      /* Isolated */
+      shaped[writeCount++] = crep.mIsolated;
+    }
+    else
+    {
+      shaped[writeCount++] = current;
+    }
+  }
+  shaped[writeCount] = NIL;
+  return shaped;
+}

Added: branches/linuxport/XBMC/xbmc/utils/ArabicShaping.h
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/ArabicShaping.h	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/utils/ArabicShaping.h	2008-07-26 14:17:01 UTC (rev 14467)
@@ -0,0 +1,44 @@
+#ifndef ARABICSHAPING_H
+#define ARABICSHAPING_H
+
+/*
+ *      Copyright (C) 2005-2008 Team XBMC
+ *      http://www.xbmc.org
+ *
+ *  A port of Mohammed Yousif's C Arabic shaping code
+ *  Ported by Nibras Al-shaiba
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+#ifndef _LINUX
+#include "lib/libiconv/iconv.h"
+#include "lib/libfribidi/fribidi.h"
+#else
+#include <fribidi/fribidi.h>
+#include <fribidi/fribidi_char_sets.h>
+#endif
+
+/**
+ * Shapes an Arabic text chunk
+ *
+ * @param FriBidiChar * (The Arabic text chunk to be shaped in Unicode)
+ * @return FriBidiChar * (The shaped Arabic text chunk in Unicode, the user is resposible for freeing it)
+ */
+FriBidiChar * shape_arabic(FriBidiChar *, int);
+
+#endif /*ARABICSHAPING */

Modified: branches/linuxport/XBMC/xbmc/utils/CharsetConverter.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/CharsetConverter.cpp	2008-07-26 11:53:22 UTC (rev 14466)
+++ branches/linuxport/XBMC/xbmc/utils/CharsetConverter.cpp	2008-07-26 14:17:01 UTC (rev 14467)
@@ -21,6 +21,8 @@
 
 #include "stdafx.h"
 #include "Util.h"
+#include "ArabicShaping.h"
+#include "GUISettings.h"
 
 using namespace std;
 
@@ -252,6 +254,15 @@
     // Convert from the selected charset to Unicode
     int len = fribidi_charset_to_unicode(fribidiCharset, (char*) lines[i].c_str(), sourceLen, logical);
 
+    if (g_guiSettings.GetBool("subtitles.arabicshaping"))
+    {
+      // Shape Arabic Text
+      FriBidiChar *shaped_text = shape_arabic(logical, len);
+      for (int i=0; i<len; i++)
+         logical[i] = shaped_text[i];
+      free(shaped_text);
+    }
+
     if (fribidi_log2vis(logical, len, &base, visual, NULL, NULL, NULL))
     {
       // Removes bidirectional marks

Modified: branches/linuxport/XBMC/xbmc/utils/Makefile
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/Makefile	2008-07-26 11:53:22 UTC (rev 14466)
+++ branches/linuxport/XBMC/xbmc/utils/Makefile	2008-07-26 14:17:01 UTC (rev 14467)
@@ -1,6 +1,6 @@
 INCLUDES=-I. -I.. -I../linux -I../../guilib
 
-SRCS=AlarmClock.cpp Archive.cpp CharsetConverter.cpp CriticalSection.cpp DelayController.cpp Event.cpp fstrcmp.cpp GUIInfoManager.cpp HTMLTable.cpp HTMLUtil.cpp HttpHeader.cpp IMDB.cpp InfoLoader.cpp log.cpp MusicAlbumInfo.cpp MusicInfoScraper.cpp RegExp.cpp RssReader.cpp ScraperParser.cpp SingleLock.cpp Splash.cpp Stopwatch.cpp SystemInfo.cpp TuxBoxUtil.cpp UdpClient.cpp Weather.cpp Thread.cpp HTTP.cpp SharedSection.cpp Win32Exception.cpp CPUInfo.cpp PCMAmplifier.cpp LabelFormatter.cpp Network.cpp BitstreamStats.cpp PerformanceStats.cpp PerformanceSample.cpp LCDFactory.cpp LCD.cpp EventServer.cpp EventPacket.cpp EventClient.cpp Socket.cpp Fanart.cpp ScraperUrl.cpp MusicArtistInfo.cpp RssFeed.cpp Mutex.cpp md5.cpp
+SRCS=AlarmClock.cpp Archive.cpp CharsetConverter.cpp CriticalSection.cpp DelayController.cpp Event.cpp fstrcmp.cpp GUIInfoManager.cpp HTMLTable.cpp HTMLUtil.cpp HttpHeader.cpp IMDB.cpp InfoLoader.cpp log.cpp MusicAlbumInfo.cpp MusicInfoScraper.cpp RegExp.cpp RssReader.cpp ScraperParser.cpp SingleLock.cpp Splash.cpp Stopwatch.cpp SystemInfo.cpp TuxBoxUtil.cpp UdpClient.cpp Weather.cpp Thread.cpp HTTP.cpp SharedSection.cpp Win32Exception.cpp CPUInfo.cpp PCMAmplifier.cpp LabelFormatter.cpp Network.cpp BitstreamStats.cpp PerformanceStats.cpp PerformanceSample.cpp LCDFactory.cpp LCD.cpp EventServer.cpp EventPacket.cpp EventClient.cpp Socket.cpp Fanart.cpp ScraperUrl.cpp MusicArtistInfo.cpp RssFeed.cpp Mutex.cpp md5.cpp ArabicShaping.cpp
 
 LIB=utils.a
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14469
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14469&view=rev
Author:   yuvalt
Date:     2008-07-26 16:11:44 +0000 (Sat, 26 Jul 2008)

Log Message:
-----------
changed: remove settings for flipping bidi as it is always done
changed: remove settings for arabic shaping and do it anyway
fixed: character sets comming from RSS may not match the case that we 
have. When checking, ignore case.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUISettings.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
    branches/linuxport/XBMC/xbmc/utils/CharsetConverter.cpp

Modified: branches/linuxport/XBMC/xbmc/GUISettings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-07-26 16:10:10 UTC (rev 14468)
+++ branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-07-26 16:11:44 UTC (rev 14469)
@@ -443,8 +443,6 @@
   AddInt(3, "subtitles.style", 736, FONT_STYLE_BOLD, FONT_STYLE_NORMAL, 1, FONT_STYLE_BOLD_ITALICS, SPIN_CONTROL_TEXT);
   AddInt(4, "subtitles.color", 737, SUBTITLE_COLOR_START + 1, SUBTITLE_COLOR_START, 1, SUBTITLE_COLOR_END, SPIN_CONTROL_TEXT);
   AddString(5, "subtitles.charset", 735, "DEFAULT", SPIN_CONTROL_TEXT);
-  AddBool(6, "subtitles.flipbidicharset", 13304, false);
-  AddBool(7, "subtitles.arabicshaping", 13362, false);
   AddSeparator(7, "subtitles.sep1");
   AddBool(9, "subtitles.searchrars", 13249, false);
   AddSeparator(10,"subtitles.sep2");

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-07-26 16:10:10 UTC (rev 14468)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-07-26 16:11:44 UTC (rev 14469)
@@ -1198,12 +1198,6 @@
       CGUIControl *pControl = (CGUIControl *)GetControl(GetSetting(strSetting)->GetID());
       pControl->SetEnabled(CUtil::IsUsingTTFSubtitles());
     }
-    else if (strSetting.Equals("subtitles.flipbidicharset"))
-    {
-      CGUIControl *pControl = (CGUIControl *)GetControl(GetSetting(strSetting)->GetID());
-      CStdString strCharset=g_langInfo.GetSubtitleCharSet();
-      pControl->SetEnabled( /*CUtil::IsUsingTTFSubtitles() &&*/ g_charsetConverter.isBidiCharset(strCharset));
-    }
     else if (strSetting.Equals("locale.charset"))
     { // TODO: Determine whether we are using a TTF font or not.
       //   CGUIControl *pControl = (CGUIControl *)GetControl(pSettingControl->GetID());

Modified: branches/linuxport/XBMC/xbmc/utils/CharsetConverter.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/CharsetConverter.cpp	2008-07-26 16:10:10 UTC (rev 14468)
+++ branches/linuxport/XBMC/xbmc/utils/CharsetConverter.cpp	2008-07-26 16:11:44 UTC (rev 14469)
@@ -140,7 +140,7 @@
 {
   for (unsigned int i = 0; i < m_vecCharsetNames.size(); i++)
   {
-    if (m_vecCharsetNames[i] == charsetName)
+    if (m_vecCharsetNames[i].Equals(charsetName, true))
     {
       return m_vecCharsetLabels[i];
     }
@@ -153,7 +153,7 @@
 {
   for (unsigned int i = 0; i < m_vecCharsetLabels.size(); i++)
   {
-    if (m_vecCharsetLabels[i] == charsetLabel)
+    if (m_vecCharsetLabels[i].Equals(charsetLabel, true))
     {
       return m_vecCharsetNames[i];
     }
@@ -166,7 +166,7 @@
 {
   for (unsigned int i = 0; i < m_vecBidiCharsetNames.size(); i++)
   {
-    if (m_vecBidiCharsetNames[i].Equals(charset))
+    if (m_vecBidiCharsetNames[i].Equals(charset, true))
     {
       return true;
     }
@@ -254,14 +254,11 @@
     // Convert from the selected charset to Unicode
     int len = fribidi_charset_to_unicode(fribidiCharset, (char*) lines[i].c_str(), sourceLen, logical);
 
-    if (g_guiSettings.GetBool("subtitles.arabicshaping"))
-    {
-      // Shape Arabic Text
-      FriBidiChar *shaped_text = shape_arabic(logical, len);
-      for (int i=0; i<len; i++)
-         logical[i] = shaped_text[i];
-      free(shaped_text);
-    }
+    // Shape Arabic Text
+    FriBidiChar *shaped_text = shape_arabic(logical, len);
+    for (int i=0; i<len; i++)
+       logical[i] = shaped_text[i];
+    free(shaped_text);
 
     if (fribidi_log2vis(logical, len, &base, visual, NULL, NULL, NULL))
     {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14496
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14496&view=rev
Author:   nuka1195
Date:     2008-07-27 00:57:30 +0000 (Sun, 27 Jul 2008)

Log Message:
-----------
fixed: m_cacheToDisc was not being copied over (thanks jmarshall)
changed: you now pass cacheToDisc in the endOfDirectory() call to prevent caching. default = True, cache

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileItem.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.h
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp

Modified: branches/linuxport/XBMC/xbmc/FileItem.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-07-27 00:17:00 UTC (rev 14495)
+++ branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-07-27 00:57:30 UTC (rev 14496)
@@ -1268,6 +1268,7 @@
   m_replaceListing = itemlist.m_replaceListing;
   m_content = itemlist.m_content;
   m_mapProperties = itemlist.m_mapProperties;
+  m_cacheToDisc = itemlist.m_cacheToDisc;
 }
 
 CFileItemPtr CFileItemList::Get(int iItem)

Modified: branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.cpp	2008-07-27 00:17:00 UTC (rev 14495)
+++ branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.cpp	2008-07-27 00:57:30 UTC (rev 14496)
@@ -82,7 +82,7 @@
   return !dir->m_cancelled;
 }
 
-void CPluginDirectory::EndOfDirectory(int handle, bool success, bool replaceListing)
+void CPluginDirectory::EndOfDirectory(int handle, bool success, bool replaceListing, bool cacheToDisc)
 {
   CSingleLock lock(m_handleLock);
   if (handle < 0 || handle >= (int)globalHandles.size())
@@ -91,6 +91,10 @@
     return;
   }
   CPluginDirectory *dir = globalHandles[handle];
+
+  // set cache to disc
+  dir->m_listItems->SetCacheToDisc(cacheToDisc ? CFileItemList::CACHE_IF_SLOW : CFileItemList::CACHE_NEVER);
+
   dir->m_success = success;
   dir->m_listItems->SetReplaceListing(replaceListing);
 
@@ -554,19 +558,6 @@
   dir->m_listItems->SetProperty(strProperty, strValue);
 }
 
-void CPluginDirectory::SetCacheToDisc(int handle, bool cacheToDisc)
-{
-  CSingleLock lock(m_handleLock);
-  if (handle < 0 || handle >= (int)globalHandles.size())
-  {
-    CLog::Log(LOGERROR, "%s called with an invalid handle.", __FUNCTION__);
-    return;
-  }
-
-  CPluginDirectory *dir = globalHandles[handle];
-  dir->m_listItems->SetCacheToDisc(cacheToDisc ? CFileItemList::CACHE_IF_SLOW : CFileItemList::CACHE_NEVER);
-}
-
 void CPluginDirectory::LoadPluginStrings(const CURL &url)
 {
   // Path where the plugin resides

Modified: branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.h
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.h	2008-07-27 00:17:00 UTC (rev 14495)
+++ branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.h	2008-07-27 00:57:30 UTC (rev 14496)
@@ -49,11 +49,10 @@
 
   // callbacks from python
   static bool AddItem(int handle, const CFileItem *item, int totalItems);
-  static void EndOfDirectory(int handle, bool success, bool replaceListing);
+  static void EndOfDirectory(int handle, bool success, bool replaceListing, bool cacheToDisc);
   static void AddSortMethod(int handle, SORT_METHOD sortMethod);
   static void SetContent(int handle, const CStdString &strContent);
   static void SetProperty(int handle, const CStdString &strProperty, const CStdString &strValue);
-  static void SetCacheToDisc(int handle, bool cacheToDisc);
 
 private:
   bool WaitOnScriptResult(const CStdString &scriptPath, const CStdString &scriptName);

Modified: branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp	2008-07-27 00:17:00 UTC (rev 14495)
+++ branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp	2008-07-27 00:57:30 UTC (rev 14496)
@@ -100,40 +100,43 @@
   }
 
   PyDoc_STRVAR(endOfDirectory__doc__,
-    "endOfDirectory(handle[, succeeded, updateListing]) -- Callback function to tell XBMC that the end of the directory listing in a virtualPythonFolder module is reached.\n"
+    "endOfDirectory(handle[, succeeded, updateListing, cacheToDisc]) -- Callback function to tell XBMC that the end of the directory listing in a virtualPythonFolder module is reached.\n"
     "\n"
     "handle           : integer - handle the plugin was started with.\n"
     "succeeded        : [opt] bool - True=script completed successfully(Default)/False=Script did not.\n"
     "updateListing    : [opt] bool - True=this folder should update the current listing/False=Folder is a subfolder(Default).\n"
+    "cacheToDisc      : [opt] bool - True=Folder will cache if extended time(default)/False=this folder will never cache to disc.\n"
     "\n"
     "*Note, You can use the above as keywords for arguments and skip certain optional arguments.\n"
     "       Once you use a keyword, all following arguments require the keyword.\n"
     "\n"
     "example:\n"
-    "  - xbmcplugin.endOfDirectory(int(sys.argv[1]))\n");
+    "  - xbmcplugin.endOfDirectory(int(sys.argv[1]), cacheToDisc=False)\n");
 
   PyObject* XBMCPLUGIN_EndOfDirectory(PyTypeObject *type, PyObject *args, PyObject *kwds)
   {
-    static const char *keywords[] = { "handle", "succeeded", "updateListing", NULL };
+    static const char *keywords[] = { "handle", "succeeded", "updateListing", "cacheToDisc", NULL };
     int handle = -1;
     bool bSucceeded = true;
     bool bUpdateListing = false;
+    bool bCacheToDisc = true;
     // parse arguments to constructor
     if (!PyArg_ParseTupleAndKeywords(
       args,
       kwds,
-      (char*)"i|bb",
+      (char*)"i|bbb",
       (char**)keywords,
       &handle,
       &bSucceeded,
-      &bUpdateListing
+      &bUpdateListing,
+      &bCacheToDisc
       ))
     {
       return NULL;
     };
 
     // tell the directory class that we're done
-    DIRECTORY::CPluginDirectory::EndOfDirectory(handle, bSucceeded, bUpdateListing);
+    DIRECTORY::CPluginDirectory::EndOfDirectory(handle, bSucceeded, bUpdateListing, bCacheToDisc);
 
     Py_INCREF(Py_None);
     return Py_None;
@@ -331,40 +334,6 @@
     return Py_None;
   }
 
-  PyDoc_STRVAR(disableCache__doc__,
-    "disableCache(handle) -- Disables the cache to disc in current directory for this plugin.\n"
-    "\n"
-    "handle      : integer - handle the plugin was started with.\n"
-    "\n"
-    "*Note, You can use the above as keywords for arguments.\n"
-    "\n"
-    "       By default caching is time based.\n"
-    "\n"
-    "example:\n"
-    "  - xbmcplugin.disableCache(int(sys.argv[1]))\n");
-
-  PyObject* XBMCPLUGIN_DisableCache(PyTypeObject *type, PyObject *args, PyObject *kwds)
-  {
-    static char *keywords[] = { "handle", NULL };
-    int handle = -1;
-    // parse arguments to constructor
-    if (!PyArg_ParseTupleAndKeywords(
-      args,
-      kwds,
-      (char*)"i",
-      (char**)keywords,
-      &handle
-      ))
-    {
-      return NULL;
-    };
-
-    DIRECTORY::CPluginDirectory::SetCacheToDisc(handle, false);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-  }
-
   // define c functions to be used in python here
   PyMethodDef pluginMethods[] = {
     {(char*)"addDirectoryItem", (PyCFunction)XBMCPLUGIN_AddDirectoryItem, METH_VARARGS|METH_KEYWORDS, addDirectoryItem__doc__},
@@ -374,7 +343,6 @@
     {(char*)"setContent", (PyCFunction)XBMCPLUGIN_SetContent, METH_VARARGS|METH_KEYWORDS, setContent__doc__},
     {(char*)"setPluginCategory", (PyCFunction)XBMCPLUGIN_SetPluginCategory, METH_VARARGS|METH_KEYWORDS, setPluginCategory__doc__},
     {(char*)"setPluginFanart", (PyCFunction)XBMCPLUGIN_SetPluginFanart, METH_VARARGS|METH_KEYWORDS, setPluginFanart__doc__},
-    {(char*)"disableCache", (PyCFunction)XBMCPLUGIN_DisableCache, METH_VARARGS|METH_KEYWORDS, disableCache__doc__},
     {NULL, NULL, 0, NULL}
   };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14565
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14565&view=rev
Author:   spiff_
Date:     2008-07-29 12:20:49 +0000 (Tue, 29 Jul 2008)

Log Message:
-----------
cosmetics. thanks to tokyovigilante 
(http://github.com/elan/xbmc-fork/commit/5fc25b1aa01a70c330fffa07bb1e09d32bf943a7)

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileSystem/cdioSupport.h
    branches/linuxport/XBMC/xbmc/GUIDialogKeyboard.cpp
    branches/linuxport/XBMC/xbmc/Id3Tag.cpp
    branches/linuxport/XBMC/xbmc/Id3Tag.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxSPU.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/DVDPlayerCodec.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/WAVPackcodec.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/WAVPackcodec.h
    branches/linuxport/XBMC/xbmc/lib/UnrarXLib/pathfn.cpp
    branches/linuxport/XBMC/xbmc/lib/libGoAhead/SpyceModule.cpp
    branches/linuxport/XBMC/xbmc/utils/RegExp.h

Modified: branches/linuxport/XBMC/xbmc/FileSystem/cdioSupport.h
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/cdioSupport.h	2008-07-29 12:10:30 UTC (rev 14564)
+++ branches/linuxport/XBMC/xbmc/FileSystem/cdioSupport.h	2008-07-29 12:20:49 UTC (rev 14565)
@@ -124,7 +124,7 @@
     for (int i = 0; i < 100; i++)
       cdtext_init(&m_ti[i].cdtext);
 
-    m_nLenght = m_nFirstTrack = m_nNumTrack = m_nNumAudio = m_nFirstAudio = m_nNumData = m_nFirstData = 0;
+    m_nLength = m_nFirstTrack = m_nNumTrack = m_nNumAudio = m_nFirstAudio = m_nNumData = m_nFirstData = 0;
   }
   virtual ~CCdInfo()
   {
@@ -145,7 +145,7 @@
   int GetDataTrackCount() { return m_nNumData; }
   int GetAudioTrackCount() { return m_nNumAudio; }
   ULONG GetCddbDiscId() { return m_ulCddbDiscId; }
-  int GetDiscLength() { return m_nLenght; }
+  int GetDiscLength() { return m_nLength; }
   CStdString GetDiscLabel(){ return m_strDiscLabel; }
 
   // CD-ROM with ISO 9660 filesystem
@@ -240,7 +240,7 @@
 void SetDiscCDTextInformation( cdtext_t cdtext ) { m_cdtext = cdtext; }
 
   void SetCddbDiscId( ULONG ulCddbDiscId ) { m_ulCddbDiscId = ulCddbDiscId; }
-  void SetDiscLength( int nLenght ) { m_nLenght = nLenght; }
+  void SetDiscLength( int nLength ) { m_nLength = nLength; }
   bool HasCDDBInfo() { return m_bHasCDDBInfo; }
   void SetNoCDDBInfo() { m_bHasCDDBInfo = false; }
 
@@ -255,7 +255,7 @@
   int m_nFirstTrack;
   trackinfo m_ti[100];
   ULONG m_ulCddbDiscId;
-  int m_nLenght;   // Disclenght can be used for cddb query, also see trackinfo.nFrames
+  int m_nLength;   // Disclength can be used for cddb query, also see trackinfo.nFrames
   bool m_bHasCDDBInfo;
   CStdString m_strDiscLabel;
   cdtext_t m_cdtext;  //  CD-Text for this disc

Modified: branches/linuxport/XBMC/xbmc/GUIDialogKeyboard.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogKeyboard.cpp	2008-07-29 12:10:30 UTC (rev 14564)
+++ branches/linuxport/XBMC/xbmc/GUIDialogKeyboard.cpp	2008-07-29 12:20:49 UTC (rev 14565)
@@ -717,7 +717,7 @@
   int length = 0;
   if (start > -1)
   {
-    length = reg.GetSubLenght(0);
+    length = reg.GetSubLength(0);
     ip = utf8String.Mid(start, length);
   }
   else

Modified: branches/linuxport/XBMC/xbmc/Id3Tag.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Id3Tag.cpp	2008-07-29 12:10:30 UTC (rev 14564)
+++ branches/linuxport/XBMC/xbmc/Id3Tag.cpp	2008-07-29 12:20:49 UTC (rev 14565)
@@ -124,11 +124,11 @@
   dateTime.wYear = atoi(GetYear());
   tag.SetReleaseDate(dateTime);
 
-  id3_length_t lenght;
-  const LPCSTR pb=(LPCSTR)GetUniqueFileIdentifier("http://musicbrainz.org", &lenght);
+  id3_length_t length;
+  const LPCSTR pb=(LPCSTR)GetUniqueFileIdentifier("http://musicbrainz.org", &length);
   if (pb)
   {
-    CStdString strTrackId(pb, lenght);
+    CStdString strTrackId(pb, length);
     tag.SetMusicBrainzTrackID(strTrackId);
   }
 
@@ -355,9 +355,9 @@
   return m_dll.id3_metadata_getpicturedata(m_tag, pictype, length);
 }
 
-const BYTE* CID3Tag::GetUniqueFileIdentifier(const CStdString& strOwnerIdentifier, id3_length_t* lenght) const
+const BYTE* CID3Tag::GetUniqueFileIdentifier(const CStdString& strOwnerIdentifier, id3_length_t* length) const
 {
-  return m_dll.id3_metadata_getuniquefileidentifier(m_tag, strOwnerIdentifier.c_str(), lenght);
+  return m_dll.id3_metadata_getuniquefileidentifier(m_tag, strOwnerIdentifier.c_str(), length);
 }
 
 CStdString CID3Tag::GetUserText(const CStdString& strDescription) const

Modified: branches/linuxport/XBMC/xbmc/Id3Tag.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Id3Tag.h	2008-07-29 12:10:30 UTC (rev 14564)
+++ branches/linuxport/XBMC/xbmc/Id3Tag.h	2008-07-29 12:20:49 UTC (rev 14565)
@@ -55,7 +55,7 @@
   bool HasPicture(id3_picture_type pictype) const;
   CStdString GetPictureMimeType(id3_picture_type pictype) const;
   const BYTE* GetPictureData(id3_picture_type pictype, id3_length_t* length) const;
-  const BYTE* GetUniqueFileIdentifier(const CStdString& strOwnerIdentifier, id3_length_t* lenght) const;
+  const BYTE* GetUniqueFileIdentifier(const CStdString& strOwnerIdentifier, id3_length_t* length) const;
   CStdString GetUserText(const CStdString& strDescription) const;
   bool GetFirstNonStandardPictype(id3_picture_type* pictype) const;
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp	2008-07-29 12:10:30 UTC (rev 14564)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp	2008-07-29 12:20:49 UTC (rev 14565)
@@ -87,13 +87,13 @@
 bool CDVDAudioCodecPassthrough::SyncDTSHeader(BYTE* pData, int iDataSize, int* iOffset, int* iFrameSize)
 {
   int i = 0, iLen = 0;
-  int iFlags, iSampleRate, iBitRate, iFrameLenght;
+  int iFlags, iSampleRate, iBitRate, iFrameLength;
 
   if( !m_pStateDTS ) return false;
 
   while (i <= (iDataSize - 10))
   {
-    iLen = m_dllDTS.dts_syncinfo(m_pStateDTS, pData, &iFlags, &iSampleRate, &iBitRate, &iFrameLenght);
+    iLen = m_dllDTS.dts_syncinfo(m_pStateDTS, pData, &iFlags, &iSampleRate, &iBitRate, &iFrameLength);
     if (iLen > 0)
     {
 
@@ -103,7 +103,7 @@
         return false;
       }
 
-      m_iSamplesPerFrame = iFrameLenght;
+      m_iSamplesPerFrame = iFrameLength;
       m_iSampleRate = iSampleRate;
 
       (*iFrameSize) = iLen;

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxSPU.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxSPU.cpp	2008-07-29 12:10:30 UTC (rev 14564)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxSPU.cpp	2008-07-29 12:20:49 UTC (rev 14565)
@@ -89,16 +89,15 @@
     pSPUData->iSize = 0;
 
     // check spu data lenght, only needed / possible in the first spu pakcet
-    unsigned __int16 lenght = data[0] << 8 | data[1];
-
-    if (lenght == 0)
+    unsigned __int16 length = data[0] << 8 | data[1];
+    if (length == 0)
     {
       DebugLog("corrupt spu data: zero packet");
       m_spuData.iNeededSize = 0;
       m_spuData.iSize = 0;
       return NULL;
     }
-    if (lenght > iSize) pSPUData->iNeededSize = lenght;
+    if (length > iSize) pSPUData->iNeededSize = length;
     else pSPUData->iNeededSize = iSize;
 
     // set presentation time stamp
@@ -127,7 +126,7 @@
   
   if (pSPUData->iSize == pSPUData->iNeededSize)
   {
-    DebugLog("got complete spu packet\n  lenght: %i bytes\n  stream: %i\n", pSPUData->iSize);
+    DebugLog("got complete spu packet\n  length: %i bytes\n  stream: %i\n", pSPUData->iSize);
 
     return ParsePacket(pSPUData);
   }
@@ -164,7 +163,7 @@
   BYTE* p = pSPUData->data; // pointer to walk through all data
 
   // get data length
-  unsigned __int16 datalenght = p[2] << 8 | p[3]; // datalength + 4 control bytes
+  unsigned __int16 datalength = p[2] << 8 | p[3]; // datalength + 4 control bytes
 
   pUnparsedData = pSPUData->data + 4;
 
@@ -173,7 +172,7 @@
   pSPUInfo->iPTSStartTime = -1;
 
   //skip data packet and goto control sequence
-  p += datalenght;
+  p += datalength;
 
   bool bHasNewDCSQ = true;
   while (bHasNewDCSQ)
@@ -296,9 +295,9 @@
       case CHG_COLCON:
         {
           p++;
-          unsigned __int16 paramlenght = p[0] << 8 | p[1];
-          DebugLog("GetPacket, CHG_COLCON, skippin %i bytes", paramlenght);
-          p += paramlenght;
+          unsigned __int16 paramlength = p[0] << 8 | p[1];
+          DebugLog("GetPacket, CHG_COLCON, skippin %i bytes", paramlength);
+          p += paramlength;
         }
         break;
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h	2008-07-29 12:10:30 UTC (rev 14564)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h	2008-07-29 12:20:49 UTC (rev 14565)
@@ -233,7 +233,7 @@
   /*
    * returns the total time in msec
    */
-  virtual int GetStreamLenght() = 0;
+  virtual int GetStreamLength() = 0;
   
   /*
    * returns the stream or NULL on error, starting from 0

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2008-07-29 12:10:30 UTC (rev 14564)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2008-07-29 12:20:49 UTC (rev 14565)
@@ -818,7 +818,7 @@
   }
 }
 
-int CDVDDemuxFFmpeg::GetStreamLenght()
+int CDVDDemuxFFmpeg::GetStreamLength()
 {
   if (!m_pFormatContext)
     return 0;

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h	2008-07-29 12:10:30 UTC (rev 14564)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h	2008-07-29 12:20:49 UTC (rev 14565)
@@ -88,7 +88,7 @@
 
   bool SeekTime(int time, bool backwords = false, double* startpts = NULL);
   bool SeekByte(__int64 pos);
-  int GetStreamLenght();
+  int GetStreamLength();
   CDemuxStream* GetStream(int iStreamId);
   int GetNrOfStreams();
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.cpp	2008-07-29 12:10:30 UTC (rev 14564)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.cpp	2008-07-29 12:20:49 UTC (rev 14565)
@@ -177,7 +177,7 @@
   return false;
 }
 
-int CDVDDemuxShoutcast::GetStreamLenght()
+int CDVDDemuxShoutcast::GetStreamLength()
 {
   return 0;
 }

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.h	2008-07-29 12:10:30 UTC (rev 14564)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.h	2008-07-29 12:20:49 UTC (rev 14565)
@@ -48,7 +48,7 @@
   DemuxPacket* Read();
 
   bool SeekTime(int time, bool backwords = false, double* startpts = NULL);
-  int GetStreamLenght();
+  int GetStreamLength();
   CDemuxStream* GetStream(int iStreamId);
   int GetNrOfStreams();
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.h	2008-07-29 12:10:30 UTC (rev 14564)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.h	2008-07-29 12:20:49 UTC (rev 14565)
@@ -42,7 +42,7 @@
   virtual void          SetSpeed(int speed) {}
   virtual CDemuxStream* GetStream(int index) { return m_Streams[index]; }
   virtual int           GetNrOfStreams()     { return m_Streams.size(); }
-  virtual int           GetStreamLenght()    { return 0; }
+  virtual int           GetStreamLength()    { return 0; }
   virtual std::string   GetFileName()        { return m_Filename; }
 
 private:

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-07-29 12:10:30 UTC (rev 14564)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-07-29 12:20:49 UTC (rev 14565)
@@ -2729,7 +2729,7 @@
     m_State.chapter_count = m_pDemuxer->GetChapterCount();
 
     m_State.time       = DVD_TIME_TO_MSEC(m_clock.GetClock());
-    m_State.time_total = m_pDemuxer->GetStreamLenght();
+    m_State.time_total = m_pDemuxer->GetStreamLength();
   }
 
   if(m_pInputStream)
@@ -2861,7 +2861,7 @@
   AVFormatContext *pContext = pDemuxer->m_pFormatContext; 
   if (pContext)
   {
-    int nLenMsec = pDemuxer->GetStreamLenght();
+    int nLenMsec = pDemuxer->GetStreamLength();
     CStdString strDuration;
     int nHours = nLenMsec / 1000 / 60 / 60;
     int nMinutes = ((nLenMsec / 1000) - nHours * 3600) / 60;
@@ -2954,7 +2954,7 @@
     CDVDVideoCodec *pVideoCodec = CDVDFactoryCodec::CreateVideoCodec( hint );
     if (pVideoCodec)
     {
-      int nTotalLen = pDemuxer->GetStreamLenght();
+      int nTotalLen = pDemuxer->GetStreamLength();
       int nSeekTo = nTotalLen / 3;
 
       CLog::Log(LOGDEBUG,"%s - seeking to pos %dms (total: %dms) in %s", __FUNCTION__, nSeekTo, nTotalLen, strPath.c_str());

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/DVDPlayerCodec.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/DVDPlayerCodec.cpp	2008-07-29 12:10:30 UTC (rev 14564)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/DVDPlayerCodec.cpp	2008-07-29 12:20:49 UTC (rev 14565)
@@ -163,7 +163,7 @@
   if (m_SampleRate == 0)
     m_SampleRate = 44100;
 
-  m_TotalTime = m_pDemuxer->GetStreamLenght();
+  m_TotalTime = m_pDemuxer->GetStreamLength();
 
   return true;
 }

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/WAVPackcodec.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/WAVPackcodec.cpp	2008-07-29 12:10:30 UTC (rev 14564)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/WAVPackcodec.cpp	2008-07-29 12:20:49 UTC (rev 14565)
@@ -61,7 +61,7 @@
   m_Callbacks.set_pos_abs=SetPosAbsCallback;
   m_Callbacks.set_pos_rel=SetPosRelCallback;
   m_Callbacks.push_back_byte=PushBackByteCallback;
-  m_Callbacks.get_length=GetLenghtCallback;
+  m_Callbacks.get_length=GetLengthCallback;
   m_Callbacks.can_seek=CanSeekCallback;
 
   //  open file with decoder
@@ -302,7 +302,7 @@
   return 1;
 }
 
-unsigned int WAVPackCodec::GetLenghtCallback(void *id)
+unsigned int WAVPackCodec::GetLengthCallback(void *id)
 {
   WAVPackCodec* pCodec=(WAVPackCodec*)id;
   if (!pCodec)

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/WAVPackcodec.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/WAVPackcodec.h	2008-07-29 12:10:30 UTC (rev 14564)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/WAVPackcodec.h	2008-07-29 12:20:49 UTC (rev 14565)
@@ -41,7 +41,7 @@
   static unsigned int GetPosCallback(void *id);
   static int SetPosAbsCallback(void *id, unsigned int pos);
   static int SetPosRelCallback(void *id, int delta, int mode);
-  static unsigned int GetLenghtCallback(void *id);
+  static unsigned int GetLengthCallback(void *id);
   static int CanSeekCallback(void *id);
   static int PushBackByteCallback(void *id, int c);
 

Modified: branches/linuxport/XBMC/xbmc/lib/UnrarXLib/pathfn.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/UnrarXLib/pathfn.cpp	2008-07-29 12:10:30 UTC (rev 14564)
+++ branches/linuxport/XBMC/xbmc/lib/UnrarXLib/pathfn.cpp	2008-07-29 12:20:49 UTC (rev 14565)
@@ -515,10 +515,10 @@
 	  else if (iFileNameSize > 42 && bKeepExtension == true)
 	  {
 		  char strExtension[42];
-		  unsigned int iExtensionLenght = iFileNameSize - (strrchr(FileName, '.') - FileName);
-		  strcpy(strExtension, (FileName + iFileNameSize - iExtensionLenght));
+		  unsigned int iExtensionLength = iFileNameSize - (strrchr(FileName, '.') - FileName);
+		  strcpy(strExtension, (FileName + iFileNameSize - iExtensionLength));
 
-		  strcpy(FileName + (42 - iExtensionLenght), strExtension);
+		  strcpy(FileName + (42 - iExtensionLength), strExtension);
 	  }
 	}
 

Modified: branches/linuxport/XBMC/xbmc/lib/libGoAhead/SpyceModule.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libGoAhead/SpyceModule.cpp	2008-07-29 12:10:30 UTC (rev 14564)
+++ branches/linuxport/XBMC/xbmc/lib/libGoAhead/SpyceModule.cpp	2008-07-29 12:20:49 UTC (rev 14565)
@@ -77,7 +77,7 @@
 		std::string strRequestMethod;
 		std::string strQuery = wp->query;
 		std::string strCookie;
-		int iContentLenght = 0;
+		int iContentLength = 0;
 		
 		if (strlen(wp->query) > 0)
 		{
@@ -87,12 +87,12 @@
 		}
 
 		if (wp->flags & WEBS_COOKIE) strCookie = wp->cookie;
-		iContentLenght = strQuery.length();
+		iContentLength = strQuery.length();
 
 		// create enviroment and parse file
 		PyObject* pEnv = PyDict_New();
 		PyObject* pREQUEST_METHOD = PyString_FromString(strRequestMethod.c_str());
-		PyObject* pCONTENT_LENGTH = PyInt_FromLong(iContentLenght);
+		PyObject* pCONTENT_LENGTH = PyInt_FromLong(iContentLength);
 		PyObject* pQUERY_STRING = PyString_FromString(strQuery.c_str());
 		PyObject* pHTTP_COOKIE = PyString_FromString(strCookie.c_str());
 		PyObject* pCONTENT_TYPE = PyString_FromString(wp->type);

Modified: branches/linuxport/XBMC/xbmc/utils/RegExp.h
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/RegExp.h	2008-07-29 12:10:30 UTC (rev 14564)
+++ branches/linuxport/XBMC/xbmc/utils/RegExp.h	2008-07-29 12:20:49 UTC (rev 14565)
@@ -64,7 +64,6 @@
   int GetSubCount() { return m_iMatchCount - 1; } // PCRE returns the number of sub-patterns + 1
   int GetSubStart(int iSub) { return m_iOvector[iSub*2] - m_iOvector[0]; } // normalized to match old engine
   int GetSubLength(int iSub) { return (m_iOvector[(iSub*2)+1] - m_iOvector[(iSub*2)]); } // correct spelling
-  int GetSubLenght(int iSub) { return GetSubLength(iSub); }
   CStdString GetMatch(int iSub = 0);
   void DumpOvector(int iLog = LOGDEBUG);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14585
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14585&view=rev
Author:   althekiller
Date:     2008-07-29 23:49:02 +0000 (Tue, 29 Jul 2008)

Log Message:
-----------
Fixed: Toggle debug mode in GUI.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
    branches/linuxport/XBMC/xbmc/XboxMediaCenter.cpp

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-07-29 21:58:49 UTC (rev 14584)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-07-29 23:49:02 UTC (rev 14585)
@@ -896,6 +896,9 @@
 
   g_Mouse.SetEnabled(g_guiSettings.GetBool("lookandfeel.enablemouse"));
 
+  if (!m_bQuiet)
+    m_bQuiet = !g_guiSettings.GetBool("system.debuglogging");
+
   return CXBApplicationEx::Create(hWnd);
 }
 

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-07-29 21:58:49 UTC (rev 14584)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-07-29 23:49:02 UTC (rev 14585)
@@ -1453,11 +1453,13 @@
     if (g_guiSettings.GetBool("system.debuglogging") && g_advancedSettings.m_logLevel < LOG_LEVEL_DEBUG_FREEMEM)
     {
       g_advancedSettings.m_logLevel = LOG_LEVEL_DEBUG_FREEMEM;
+      g_application.SetQuiet(false);
       CLog::Log(LOGNOTICE, "Enabled debug logging due to GUI setting");
     }
     else if (!g_guiSettings.GetBool("system.debuglogging") && g_advancedSettings.m_logLevel == LOG_LEVEL_DEBUG_FREEMEM)
     {
       CLog::Log(LOGNOTICE, "Disabled debug logging due to GUI setting");
+      g_application.SetQuiet(true);
       g_advancedSettings.m_logLevel = LOG_LEVEL_NORMAL;
     }
   }

Modified: branches/linuxport/XBMC/xbmc/XboxMediaCenter.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/XboxMediaCenter.cpp	2008-07-29 21:58:49 UTC (rev 14584)
+++ branches/linuxport/XBMC/xbmc/XboxMediaCenter.cpp	2008-07-29 23:49:02 UTC (rev 14585)
@@ -51,7 +51,10 @@
     for (int i=1; i<argc;i++)
     {
       if (strnicmp(argv[i], "-q", 2) == 0)
+      {
         g_application.SetQuiet(true);
+        g_guiSettings.SetBool("system.debuglogging",true);
+      }
 
       else if (strnicmp(argv[i], "-fs", 3) == 0)
       {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14588
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14588&view=rev
Author:   kraqh3d
Date:     2008-07-30 01:18:34 +0000 (Wed, 30 Jul 2008)

Log Message:
-----------
added: advanced setting option to disable automatic removal of items from the database during "update library" or "update on startup"

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Settings.cpp
    branches/linuxport/XBMC/xbmc/Settings.h
    branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp

Modified: branches/linuxport/XBMC/xbmc/Settings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.cpp	2008-07-30 01:11:24 UTC (rev 14587)
+++ branches/linuxport/XBMC/xbmc/Settings.cpp	2008-07-30 01:18:34 UTC (rev 14588)
@@ -226,6 +226,7 @@
   g_advancedSettings.m_bVideoLibraryAllItemsOnBottom = false;
   g_advancedSettings.m_bVideoLibraryHideRecentlyAddedItems = false;
   g_advancedSettings.m_bVideoLibraryHideEmptySeries = false;
+  g_advancedSettings.m_bVideoLibraryCleanOnUpdate = true;
 
   g_advancedSettings.m_bUseEvilB = true;
 
@@ -1132,6 +1133,7 @@
     XMLUtils::GetBoolean(pElement, "allitemsonbottom", g_advancedSettings.m_bVideoLibraryAllItemsOnBottom);
     XMLUtils::GetBoolean(pElement, "hiderecentlyaddeditems", g_advancedSettings.m_bVideoLibraryHideRecentlyAddedItems);
     XMLUtils::GetBoolean(pElement, "hideemptyseries", g_advancedSettings.m_bVideoLibraryHideEmptySeries);
+    XMLUtils::GetBoolean(pElement, "cleanonupdate", g_advancedSettings.m_bVideoLibraryCleanOnUpdate);
     GetString(pElement, "itemseparator", g_advancedSettings.m_videoItemSeparator, " / ");
   }
 

Modified: branches/linuxport/XBMC/xbmc/Settings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.h	2008-07-30 01:11:24 UTC (rev 14587)
+++ branches/linuxport/XBMC/xbmc/Settings.h	2008-07-30 01:18:34 UTC (rev 14588)
@@ -206,6 +206,7 @@
     bool m_bVideoLibraryAllItemsOnBottom;
     bool m_bVideoLibraryHideRecentlyAddedItems;
     bool m_bVideoLibraryHideEmptySeries;
+    bool m_bVideoLibraryCleanOnUpdate;
 
     bool m_bUseEvilB;
     std::vector<CStdString> m_vecTokens; // cleaning strings tied to language

Modified: branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp	2008-07-30 01:11:24 UTC (rev 14587)
+++ branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp	2008-07-30 01:18:34 UTC (rev 14588)
@@ -146,7 +146,7 @@
       // we go.
       m_database.Open();
       m_database.GetPaths(m_pathsToScan);
-      m_bClean = true;
+      m_bClean = g_advancedSettings.m_bVideoLibraryCleanOnUpdate;
       m_database.Close();
     }
     else
@@ -298,6 +298,9 @@
       }
     }
 
+    CLog::Log(LOGDEBUG,"Hash[%s,%s]:DB=[%s],Computed=[%s]",
+      m_info.strContent.c_str(),strDirectory.c_str(),dbHash.c_str(),hash.c_str());
+
     if (!m_info.settings.GetPluginRoot() && m_info.settings.GetSettings().IsEmpty()) // check for settings, if they are around load defaults - to workaround the nastyness
     {
       CScraperParser parser;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14633
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14633&view=rev
Author:   spiff_
Date:     2008-08-02 10:10:33 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
added: Ticket #4414 - Chapter name support for supported containers. thanks to capnbry

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/IPlayer.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h
    branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.cpp
    branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.h

Modified: branches/linuxport/XBMC/xbmc/cores/IPlayer.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/IPlayer.h	2008-08-02 02:40:38 UTC (rev 14632)
+++ branches/linuxport/XBMC/xbmc/cores/IPlayer.h	2008-08-02 10:10:33 UTC (rev 14633)
@@ -105,6 +105,7 @@
 
   virtual int  GetChapterCount()                               { return 0; }
   virtual int  GetChapter()                                    { return -1; }
+  virtual void GetChapterName(CStdString& strChapterName)      { return; }
   virtual int  SeekChapter(int iChapter)                       { return -1; }
 //  virtual bool GetChapterInfo(int chapter, SChapterInfo &info) { return false; }
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h	2008-08-02 02:40:38 UTC (rev 14632)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h	2008-08-02 10:10:33 UTC (rev 14633)
@@ -220,6 +220,11 @@
   virtual int GetChapter() { return -1; }
 
   /*
+   * Get the name of the current chapter
+   */
+  virtual void GetChapterName(std::string& strChapterName) {}
+
+  /*
    * Set the playspeed, if demuxer can handle different
    * speeds of playback
    */

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2008-08-02 02:40:38 UTC (rev 14632)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp	2008-08-02 10:10:33 UTC (rev 14633)
@@ -1037,6 +1037,18 @@
   return 0;
 }
 
+void CDVDDemuxFFmpeg::GetChapterName(std::string& strChapterName)
+{
+  if(m_pInput && m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD))
+    return;
+  else 
+  {
+    int chapterIdx = GetChapter();
+    if(chapterIdx)
+      strChapterName = m_pFormatContext->chapters[chapterIdx-1]->title;
+  }
+}
+
 bool CDVDDemuxFFmpeg::SeekChapter(int chapter, double* startpts)
 {
   if(chapter < 1)

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h	2008-08-02 02:40:38 UTC (rev 14632)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h	2008-08-02 10:10:33 UTC (rev 14633)
@@ -95,6 +95,7 @@
   bool SeekChapter(int chapter, double* startpts = NULL);
   int GetChapterCount();
   int GetChapter();
+  void GetChapterName(std::string& strChapterName);
 
 
   bool Aborted();

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-08-02 02:40:38 UTC (rev 14632)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-08-02 10:10:33 UTC (rev 14633)
@@ -2632,6 +2632,12 @@
   return m_State.chapter;
 }
 
+void CDVDPlayer::GetChapterName(CStdString& strChapterName)
+{
+  if(m_pDemuxer)
+    m_pDemuxer->GetChapterName(strChapterName);
+}
+
 int CDVDPlayer::SeekChapter(int iChapter)
 {
   if (GetChapterCount() > 0)

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h	2008-08-02 02:40:38 UTC (rev 14632)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h	2008-08-02 10:10:33 UTC (rev 14633)
@@ -188,6 +188,7 @@
 
   virtual int  GetChapterCount();
   virtual int  GetChapter();
+  virtual void GetChapterName(CStdString& strChapterName);
   virtual int  SeekChapter(int iChapter);
 
   virtual void SeekTime(__int64 iTime);

Modified: branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-08-02 02:40:38 UTC (rev 14632)
+++ branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-08-02 10:10:33 UTC (rev 14633)
@@ -201,6 +201,7 @@
     else if (strTest.Equals("player.hasduration")) ret = PLAYER_HASDURATION;
     else if (strTest.Equals("player.chapter")) ret = PLAYER_CHAPTER;
     else if (strTest.Equals("player.chaptercount")) ret = PLAYER_CHAPTERCOUNT;
+    else if (strTest.Equals("player.chaptername")) ret = PLAYER_CHAPTERNAME;
     else if (strTest.Equals("player.starrating")) ret = PLAYER_STAR_RATING;
   }
   else if (strCategory.Equals("weather"))
@@ -900,6 +901,10 @@
     if(g_application.IsPlaying() && g_application.m_pPlayer)
       strLabel.Format("%02d", g_application.m_pPlayer->GetChapterCount());
     break;
+  case PLAYER_CHAPTERNAME:
+    if(g_application.IsPlaying() && g_application.m_pPlayer)
+      g_application.m_pPlayer->GetChapterName(strLabel);
+    break;
   case PLAYER_CACHELEVEL:
     {
       int iLevel = 0;

Modified: branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.h
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.h	2008-08-02 02:40:38 UTC (rev 14632)
+++ branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.h	2008-08-02 10:10:33 UTC (rev 14633)
@@ -96,6 +96,7 @@
 #define PLAYER_FINISH_TIME           38
 #define PLAYER_CACHELEVEL            39
 #define PLAYER_STAR_RATING           40
+#define PLAYER_CHAPTERNAME           41
 
 #define WEATHER_CONDITIONS          100
 #define WEATHER_TEMPERATURE         101


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14649
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14649&view=rev
Author:   elupus
Date:     2008-08-02 19:15:36 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
changed: OnPlayBackStopped is now called by players
changed: moved code from OnPlayBackStopped and OnPlayBackEnded into the gui message instead to avoid thread issues
fixed: crash on stacks by making sure dvdplayer doesn't call OnPlayBack* functions when in identify mode.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/paplayer_linux.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/paplayer_osx.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/paplayer_win32.cpp

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-02 19:12:29 UTC (rev 14648)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-02 19:15:36 UTC (rev 14649)
@@ -4137,9 +4137,6 @@
 
 void CApplication::OnPlayBackEnded()
 {
-  //playback ended
-  SetPlaySpeed(1);
-
   // informs python script currently running playback has ended
   // (does nothing if python is not loaded)
 #ifdef HAS_PYTHON
@@ -4156,12 +4153,6 @@
 
   CGUIMessage msg(GUI_MSG_PLAYBACK_ENDED, 0, 0);
   m_gWindowManager.SendThreadMessage(msg);
-  DimLCDOnPlayback(false);
-
-  g_audioManager.Enable(true);
-
-  //  Reset audioscrobbler submit status
-  CScrobbler::GetInstance()->SetSubmitSong(false);
 }
 
 void CApplication::OnPlayBackStarted()
@@ -4182,8 +4173,6 @@
 
   CGUIMessage msg(GUI_MSG_PLAYBACK_STARTED, 0, 0);
   m_gWindowManager.SendThreadMessage(msg);
-
-  DimLCDOnPlayback(true);
 }
 
 void CApplication::OnQueueNextItem()
@@ -4219,15 +4208,9 @@
     getApplicationMessenger().HttpApi("broadcastlevel; OnPlayBackStopped;1");
 #endif
 
-  OutputDebugString("Playback was stopped\n");
+  CLog::Log(LOGDEBUG, "Playback was stopped\n");
   CGUIMessage msg( GUI_MSG_PLAYBACK_STOPPED, 0, 0 );
-  m_gWindowManager.SendMessage(msg);
-  DimLCDOnPlayback(false);
-
-  g_audioManager.Enable(true);
-
-  //  Reset audioscrobbler submit status
-  CScrobbler::GetInstance()->SetSubmitSong(false);
+  m_gWindowManager.SendThreadMessage(msg);
 }
 
 bool CApplication::IsPlaying() const
@@ -4321,7 +4304,6 @@
     m_pPlayer->CloseFile();
     g_partyModeManager.Disable();
   }
-  OnPlayBackStopped();
 }
 
 bool CApplication::NeedRenderFullScreen()
@@ -4811,6 +4793,8 @@
       CLastFmManager::GetInstance()->OnSongChange(*m_itemCurrentFile);
       g_partyModeManager.OnSongChange(true);
 
+      DimLCDOnPlayback(true);
+
       if (IsPlayingAudio())
       {
         // Start our cdg parser as appropriate
@@ -4902,6 +4886,9 @@
       g_infoManager.ResetCurrentItem();
       m_currentStack->Clear();
 
+      // Reset audioscrobbler submit status
+      CScrobbler::GetInstance()->SetSubmitSong(false);
+
       if (message.GetMessage() == GUI_MSG_PLAYBACK_ENDED)
       {
         // sending true to PlayNext() effectively passes bRestart to PlayFile()
@@ -4918,11 +4905,16 @@
         }
       }
 
+      if (!IsPlaying())
+      {
+        g_audioManager.Enable(true);
+        DimLCDOnPlayback(false);
+
 #ifdef HAS_KARAOKE
-      // no new player, free any cdg parser
-      if (!m_pPlayer && m_pCdgParser)
-        m_pCdgParser->Free();
+        if(m_pCdgParser)
+          m_pCdgParser->Free();
 #endif
+      }
 
       if (!IsPlayingVideo() && m_gWindowManager.GetActiveWindow() == WINDOW_FULLSCREEN_VIDEO)
       {

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-08-02 19:12:29 UTC (rev 14648)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-08-02 19:15:36 UTC (rev 14649)
@@ -261,7 +261,6 @@
   m_UpdateApplication = 0;
 
   m_bAbortRequest = false;
-  m_bPlayingNewFile = false;
   m_errorCount = 0;
   m_playSpeed = DVD_PLAYSPEED_NORMAL;
   m_caching = false;
@@ -307,11 +306,7 @@
     // if playing a file close it first
     // this has to be changed so we won't have to close it.
     if(ThreadHandle())
-    {
-      m_bPlayingNewFile = true;
       CloseFile();
-      m_bPlayingNewFile = false;
-    }
 
     m_bAbortRequest = false;
     SetPlaySpeed(DVD_PLAYSPEED_NORMAL);
@@ -682,6 +677,7 @@
 
   // make sure application know our info
   UpdateApplication(0);
+  HandlePlayState(0);
 
   int count;
 
@@ -717,7 +713,8 @@
   // we are done initializing now, set the readyevent
   SetEvent(m_hReadyEvent);
 
-  m_callback.OnPlayBackStarted();
+  if(m_PlayerOptions.identify == false)
+    m_callback.OnPlayBackStarted();
 
   if (m_pDlgCache && m_pDlgCache->IsCanceled())
     return;
@@ -1396,13 +1393,6 @@
     // clean up all selection streams
     m_SelectionStreams.Clear(STREAM_NONE, STREAM_SOURCE_NONE);
 
-    // if we didn't stop playing, advance to the next item in xbmc's playlist
-    // N.B. We need to call this if we aborted too, otherwise the application
-    // doesn't know that we're done with the full screen view and video playing!
-    //
-    if (m_bPlayingNewFile == false)
-      m_callback.OnPlayBackEnded();
-
     m_messenger.End();
 
   }
@@ -1419,6 +1409,15 @@
     m_pDlgCache->Close();
     m_pDlgCache = NULL;
   }
+
+  // if we didn't stop playing, advance to the next item in xbmc's playlist
+  if(m_PlayerOptions.identify == false)
+  {
+    if (m_bAbortRequest)
+      m_callback.OnPlayBackStopped();
+    else
+      m_callback.OnPlayBackEnded();
+  }
 }
 
 void CDVDPlayer::HandleMessages()

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h	2008-08-02 19:12:29 UTC (rev 14648)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.h	2008-08-02 19:15:36 UTC (rev 14649)
@@ -269,7 +269,6 @@
   double m_UpdateApplication;
 
   bool m_bAbortRequest;
-  bool m_bPlayingNewFile;
 
   std::string m_filename; // holds the actual filename
   std::string m_content;  // hold a hint to what content file contains (mime type)

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/paplayer_linux.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/paplayer_linux.cpp	2008-08-02 19:12:29 UTC (rev 14648)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/paplayer_linux.cpp	2008-08-02 19:15:36 UTC (rev 14649)
@@ -492,9 +492,9 @@
     CLog::Log(LOGINFO, "PAPlayer: End of playback reached");
     m_bIsPlaying = false;
     if (!m_bStopPlaying && !m_bStop)
-    {
       m_callback.OnPlayBackEnded();
-    }
+    else
+      m_callback.OnPlayBackStopped();
   }
   CLog::Log(LOGDEBUG, "PAPlayer: Thread end");
 }

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/paplayer_osx.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/paplayer_osx.cpp	2008-08-02 19:12:29 UTC (rev 14648)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/paplayer_osx.cpp	2008-08-02 19:15:36 UTC (rev 14649)
@@ -450,9 +450,9 @@
     CLog::Log(LOGINFO, "PAPlayer: End of playback reached");
     m_bIsPlaying = false;
     if (!m_bStopPlaying && !m_bStop)
-    {
       m_callback.OnPlayBackEnded();
-    }
+    else
+      m_callback.OnPlayBackStopped();
   }
   CLog::Log(LOGDEBUG, "PAPlayer: Thread end");
 }

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/paplayer_win32.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/paplayer_win32.cpp	2008-08-02 19:12:29 UTC (rev 14648)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/paplayer_win32.cpp	2008-08-02 19:15:36 UTC (rev 14649)
@@ -444,9 +444,9 @@
     CLog::Log(LOGINFO, "PAPlayer: End of playback reached");
     m_bIsPlaying = false;
     if (!m_bStopPlaying && !m_bStop)
-    {
       m_callback.OnPlayBackEnded();
-    }
+    else
+      m_callback.OnPlayBackStopped();
   }
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14659
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14659&view=rev
Author:   elupus
Date:     2008-08-03 01:48:29 +0000 (Sun, 03 Aug 2008)

Log Message:
-----------
changed: made application delay stopped/ended messages while starting a new file and ignore them if it succeed.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/Application.h

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-03 01:39:13 UTC (rev 14658)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-03 01:48:29 UTC (rev 14659)
@@ -4086,6 +4086,7 @@
 #endif
 
   // tell system we are starting a file
+  while(m_vPlaybackStarting.size()) m_vPlaybackStarting.pop();
   m_bPlaybackStarting = true;
 
   // We should restart the player, unless the previous and next tracks are using
@@ -4105,15 +4106,15 @@
     m_pPlayer = CPlayerCoreFactory::CreatePlayer(eNewCore, *this);
   }
 
-  if (!m_pPlayer)
+  bool bResult;
+  if (m_pPlayer)
+    bResult = m_pPlayer->OpenFile(item, options);
+  else
   {
     CLog::Log(LOGERROR, "Error creating player for item %s (File doesn't exist?)", item.m_strPath.c_str());
-    m_bPlaybackStarting = false;
-    return false;
+    bResult = false;
   }
 
-  bool bResult = m_pPlayer->OpenFile(item, options);
-
   if(bResult)
   {
     if (m_iPlaySpeed != 1)
@@ -4137,7 +4138,18 @@
       g_audioManager.Enable(false);
   }
 
+  if(!IsPlaying())
+  {
+    // since we didn't manage to get playback started, send any queued up messages
+    while(m_vPlaybackStarting.size())
+    {
+      m_gWindowManager.SendMessage(m_vPlaybackStarting.front());
+      m_vPlaybackStarting.pop();
+    }
+  }
+  while(m_vPlaybackStarting.size()) m_vPlaybackStarting.pop();
   m_bPlaybackStarting = false;
+
   return bResult;
 }
 
@@ -4158,7 +4170,11 @@
   CLog::Log(LOGDEBUG, "Playback has finished");
 
   CGUIMessage msg(GUI_MSG_PLAYBACK_ENDED, 0, 0);
-  m_gWindowManager.SendThreadMessage(msg);
+
+  if(m_bPlaybackStarting)
+    m_vPlaybackStarting.push(msg);
+  else
+    m_gWindowManager.SendThreadMessage(msg);
 }
 
 void CApplication::OnPlayBackStarted()
@@ -4215,8 +4231,12 @@
 #endif
 
   CLog::Log(LOGDEBUG, "Playback was stopped\n");
+
   CGUIMessage msg( GUI_MSG_PLAYBACK_STOPPED, 0, 0 );
-  m_gWindowManager.SendThreadMessage(msg);
+  if(m_bPlaybackStarting)
+    m_vPlaybackStarting.push(msg);
+  else
+    m_gWindowManager.SendThreadMessage(msg);
 }
 
 bool CApplication::IsPlaying() const
@@ -4860,20 +4880,8 @@
 
   case GUI_MSG_PLAYBACK_STOPPED:
   case GUI_MSG_PLAYBACK_ENDED:
+  case GUI_MSG_PLAYLISTPLAYER_STOPPED:
     {
-
-      if(IsPlaying())
-      {
-        CLog::Log(LOGDEBUG, "CApplication::OnMessage - playback was ended, but application has already started next file, skipping event");
-        return true;
-      }
-
-      if(m_bPlaybackStarting)
-      {
-        m_gWindowManager.SendThreadMessage(message);
-        return true;
-      }
-
       // first check if we still have items in the stack to play
       if (message.GetMessage() == GUI_MSG_PLAYBACK_ENDED)
       {
@@ -4976,11 +4984,6 @@
       return true;
     }
     break;
-  case GUI_MSG_PLAYLISTPLAYER_STOPPED:
-    {
-      return true;
-    }
-    break;
   case GUI_MSG_FULLSCREEN:
     { // Switch to fullscreen, if we can
       SwitchToFullScreen();

Modified: branches/linuxport/XBMC/xbmc/Application.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.h	2008-08-03 01:39:13 UTC (rev 14658)
+++ branches/linuxport/XBMC/xbmc/Application.h	2008-08-03 01:48:29 UTC (rev 14659)
@@ -135,6 +135,7 @@
   bool IsPlayingAudio() const ;
   bool IsPlayingVideo() const ;
   bool IsPlayingFullScreenVideo() const ;
+  bool IsStartingPlayback() const { return m_bPlaybackStarting; }
   bool OnKey(CKey& key);
   bool OnAction(const CAction &action);
   void RenderMemoryStatus();
@@ -203,6 +204,7 @@
   DWORD m_dwSkinTime;
   bool m_bIsPaused;
   bool m_bPlaybackStarting;
+  std::queue<CGUIMessage> m_vPlaybackStarting;
 
   CCdgParser* m_pCdgParser;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14665
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14665&view=rev
Author:   elupus
Date:     2008-08-03 17:32:10 +0000 (Sun, 03 Aug 2008)

Log Message:
-----------
changed: if dvdplayer runs into an error from libdvdnav, abort playback. libdvdnav can almost never recover + it's very 
likely to crash or leak memory if you retry.
fixed: dvdplayer would still return IsPlaying() after it had exit normally
fixed: OnPlayBack* events weren't triggered if player returned failure on OpenFile, but then still reported that it was 
playing in IsPlaying()

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-03 17:14:44 UTC (rev 14664)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-03 17:32:10 UTC (rev 14665)
@@ -4137,8 +4137,7 @@
     if (!g_guiSettings.GetBool("lookandfeel.soundsduringplayback"))
       g_audioManager.Enable(false);
   }
-
-  if(!IsPlaying())
+  else
   {
     // since we didn't manage to get playback started, send any queued up messages
     while(m_vPlaybackStarting.size())
@@ -4147,6 +4146,7 @@
       m_vPlaybackStarting.pop();
     }
   }
+
   while(m_vPlaybackStarting.size()) m_vPlaybackStarting.pop();
   m_bPlaybackStarting = false;
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp	2008-08-03 17:14:44 UTC (rev 14664)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp	2008-08-03 17:32:10 UTC (rev 14665)
@@ -290,6 +290,7 @@
   if (result == DVDNAV_STATUS_ERR)
   {
     CLog::Log(LOGERROR,"Error getting next block: %s\n", m_dll.dvdnav_err_to_string(m_dvdnav));
+    m_bEOF = true;
     return NAVRESULT_ERROR;
   }
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-08-03 17:14:44 UTC (rev 14664)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-08-03 17:32:10 UTC (rev 14665)
@@ -1410,6 +1410,7 @@
     m_pDlgCache = NULL;
   }
 
+  m_bStop = true;
   // if we didn't stop playing, advance to the next item in xbmc's playlist
   if(m_PlayerOptions.identify == false)
   {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14668
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14668&view=rev
Author:   kraqh3d
Date:     2008-08-03 18:57:21 +0000 (Sun, 03 Aug 2008)

Log Message:
-----------
added: iMaxStrings option to SplitString to limit the number of split actions (like perl and python's split() functions)

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/StringUtils.cpp
    branches/linuxport/XBMC/xbmc/StringUtils.h

Modified: branches/linuxport/XBMC/xbmc/StringUtils.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/StringUtils.cpp	2008-08-03 18:44:27 UTC (rev 14667)
+++ branches/linuxport/XBMC/xbmc/StringUtils.cpp	2008-08-03 18:57:21 UTC (rev 14668)
@@ -51,7 +51,8 @@
 
 // Splits the string input into pieces delimited by delimiter.
 // if 2 delimiters are in a row, it will include the empty string between them.
-int StringUtils::SplitString(const CStdString& input, const CStdString& delimiter, CStdStringArray &results)
+// added MaxStrings parameter to restrict the number of returned substrings (like perl and python)
+int StringUtils::SplitString(const CStdString& input, const CStdString& delimiter, CStdStringArray &results, unsigned int iMaxStrings /* = 0 */)
 {
   int iPos = -1;
   int newPos = -1;
@@ -60,7 +61,6 @@
 
   results.clear();
 
-  //CArray positions;
   vector<unsigned int> positions;
 
   newPos = input.Find (delimiter, 0);
@@ -71,22 +71,25 @@
     return 1;
   }
 
-  int numFound = 1;
-
   while ( newPos > iPos )
   {
-    numFound++;
     positions.push_back(newPos);
     iPos = newPos;
     newPos = input.Find (delimiter, iPos + sizeS2);
   }
 
-  for ( unsigned int i = 0; i <= positions.size(); i++ )
+  // numFound is the number of delimeters which is one less
+  // than the number of substrings
+  unsigned int numFound = positions.size();
+  if (iMaxStrings > 0 && numFound >= iMaxStrings)
+    numFound = iMaxStrings - 1;
+
+  for ( unsigned int i = 0; i <= numFound; i++ )
   {
     CStdString s;
     if ( i == 0 )
     {
-      if (i == positions.size())
+      if ( i == numFound )
         s = input;
       else
         s = input.Mid( i, positions[i] );
@@ -96,7 +99,7 @@
       int offset = positions[i - 1] + sizeS2;
       if ( offset < isize )
       {
-        if ( i == positions.size() )
+        if ( i == numFound )
           s = input.Mid(offset);
         else if ( i > 0 )
           s = input.Mid( positions[i - 1] + sizeS2,
@@ -105,7 +108,8 @@
     }
     results.push_back(s);
   }
-  return numFound;
+  // return the number of substrings
+  return results.size();
 }
 
 // returns the number of occurences of strFind in strInput.

Modified: branches/linuxport/XBMC/xbmc/StringUtils.h
===================================================================
--- branches/linuxport/XBMC/xbmc/StringUtils.h	2008-08-03 18:44:27 UTC (rev 14667)
+++ branches/linuxport/XBMC/xbmc/StringUtils.h	2008-08-03 18:57:21 UTC (rev 14668)
@@ -50,7 +50,7 @@
 {
 public:
   static void JoinString(const CStdStringArray &strings, const CStdString& delimiter, CStdString& result);
-  static int SplitString(const CStdString& input, const CStdString& delimiter, CStdStringArray &results);
+  static int SplitString(const CStdString& input, const CStdString& delimiter, CStdStringArray &results, unsigned int iMaxStrings = 0);
   static int FindNumber(const CStdString& strInput, const CStdString &strFind);
   static int AlphaNumericCompare(const char *left, const char *right);
   static long TimeStringToSeconds(const CStdString &timeString);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14683
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14683&view=rev
Author:   kraqh3d
Date:     2008-08-05 02:34:57 +0000 (Tue, 05 Aug 2008)

Log Message:
-----------
changed: SlideShow() built-in command to support "recursive", "random", and "notrandom" parameters.  see wiki for documentation.  RecursiveSlideShow() remains unchanged.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowSlideShow.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowSlideShow.h
    branches/linuxport/XBMC/xbmc/Util.cpp
    branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSlideShow.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSlideShow.cpp	2008-08-05 01:54:27 UTC (rev 14682)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSlideShow.cpp	2008-08-05 02:34:57 UTC (rev 14683)
@@ -591,8 +591,21 @@
   case GUI_MSG_START_SLIDESHOW:
     {
       CStdString strFolder = message.GetStringParam();
-      bool bRecursive = message.GetParam1() != 0;
-        RunSlideShow(strFolder, bRecursive);
+      unsigned int iParams = message.GetParam1();
+      //decode params
+      bool bRecursive = false;
+      bool bRandom = false;
+      bool bNotRandom = false;
+      if (iParams > 0)
+      {
+        if ((iParams & 1) == 1)
+          bRecursive = true;
+        if ((iParams & 2) == 2)
+          bRandom = true;
+        if ((iParams & 4) == 4)
+          bNotRandom = true;
+      }
+      RunSlideShow(strFolder, bRecursive, bRandom, bNotRandom);
     }
     break;
   }
@@ -730,7 +743,7 @@
   return m_iCurrentSlide + 1;
 }
 
-void CGUIWindowSlideShow::RunSlideShow(const CStdString &strPath, bool bRecursive)
+void CGUIWindowSlideShow::RunSlideShow(const CStdString &strPath, bool bRecursive /* = false */, bool bRandom /* = false */, bool bNotRandom /* = false */)
 {
   // stop any video
   if (g_application.IsPlayingVideo())
@@ -742,7 +755,14 @@
     AddItems(strPath, bRecursive);
     // ok, now run the slideshow
   }
-  if (g_guiSettings.GetBool("slideshow.shuffle"))
+
+  // mutually exclusive options
+  // if both are set, clear both and use the gui setting
+  if (bRandom && bNotRandom)
+    bRandom = bNotRandom = false;
+
+  // NotRandom overrides the window setting
+  if ((!bNotRandom && g_guiSettings.GetBool("slideshow.shuffle")) || bRandom)
     Shuffle();
 
   StartSlideShow();

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSlideShow.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSlideShow.h	2008-08-05 01:54:27 UTC (rev 14682)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSlideShow.h	2008-08-05 02:34:57 UTC (rev 14683)
@@ -68,7 +68,7 @@
   void Select(const CStdString& strPicture);
   const CFileItemList &GetSlideShowContents();
   const CFileItemPtr GetCurrentSlide();
-  void RunSlideShow(const CStdString& strPath, bool bRecursive = false);
+  void RunSlideShow(const CStdString &strPath, bool bRecursive = false, bool bRandom = false, bool bNotRandom = false);
   void StartSlideShow();
   bool InSlideShow() const;
   virtual bool OnMessage(CGUIMessage& message);

Modified: branches/linuxport/XBMC/xbmc/Util.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Util.cpp	2008-08-05 01:54:27 UTC (rev 14682)
+++ branches/linuxport/XBMC/xbmc/Util.cpp	2008-08-05 02:34:57 UTC (rev 14683)
@@ -2663,8 +2663,63 @@
       CLog::Log(LOGERROR, "XBMC.SlideShow called with empty parameter");
       return -2;
     }
-    CGUIMessage msg( GUI_MSG_START_SLIDESHOW, 0, 0, execute.Equals("SlideShow") ? 0 : 1);
-    msg.SetStringParam(strParameterCaseIntact);
+    bool bRecursive = false;
+    bool bRandom = false;
+    bool bNotRandom = false;
+    CStdString strDir = strParameterCaseIntact;
+
+    // leave RecursiveSlideShow command as-is
+    if (execute.Equals("RecursiveSlideShow"))
+      bRecursive = true;
+
+    // SlideShow([recursive],[[not]random],dir)
+    // additional parameters must at the beginning as the dir may contain commas
+    else
+    {
+      vector<CStdString> results;
+      StringUtils::SplitString(strParameterCaseIntact, ",", results, 2); // max of two split pieces
+      while (results.size() > 0)
+      {
+        // pop off the first item in the vector
+        CStdString strTest = results.front();
+        results.erase(results.begin());
+
+        if (strTest.Equals("recursive"))
+          bRecursive = true;
+        else if (strTest.Equals("random"))
+          bRandom = true;
+        else if (strTest.Equals("notrandom"))
+          bNotRandom = true;
+        else
+        {
+          // not a known parameter, so it must be the directory 
+          // add the test string back to the remainder of the result array
+          // (this means the directory contained a comma)
+          strDir = strTest;
+          if (results.size() > 0)
+            strDir += "," + results.front();
+          break;
+        }
+        // it was a parameter, so we need to split again
+        if (results.size() > 0)
+        {
+          strTest = results.front();
+          StringUtils::SplitString(strTest, ",", results, 2);
+        }
+      }
+    }
+
+    // encode parameters
+    unsigned int iParams = 0;
+    if (bRecursive)
+      iParams += 1;
+    if (bRandom)
+      iParams += 2;
+    if (bNotRandom)
+      iParams += 4;
+
+    CGUIMessage msg(GUI_MSG_START_SLIDESHOW, 0, 0, iParams);
+    msg.SetStringParam(strDir);
     CGUIWindow *pWindow = m_gWindowManager.GetWindow(WINDOW_SLIDESHOW);
     if (pWindow) pWindow->OnMessage(msg);
   }

Modified: branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp	2008-08-05 01:54:27 UTC (rev 14682)
+++ branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp	2008-08-05 02:34:57 UTC (rev 14683)
@@ -1522,21 +1522,20 @@
   }
 }
 
-int CXbmcHttp::xbmcPlaySlideshow(int numParas, CStdString paras[] )
+int CXbmcHttp::xbmcPlaySlideshow(int numParas, CStdString paras[])
 { // (filename(;1)) -> 1 indicates recursive
-    int recursive;
-    if (numParas>1)
-      recursive=atoi(paras[1].c_str());
-    else
-      recursive=0;
-    CGUIMessage msg( GUI_MSG_START_SLIDESHOW, 0, 0, recursive);
-    if (numParas==0)
-      msg.SetStringParam("");
-    else
-      msg.SetStringParam(paras[0]);
-    CGUIWindow *pWindow = m_gWindowManager.GetWindow(WINDOW_SLIDESHOW);
-    if (pWindow) pWindow->OnMessage(msg);
-    return SetResponse(openTag+"OK");
+  // TODO: add suoport for new random and notrandom options
+  unsigned int recursive = 0;
+  if (numParas>1 && paras[1].Equals("1"))
+    recursive=1;
+  CGUIMessage msg(GUI_MSG_START_SLIDESHOW, 0, 0, recursive);
+  if (numParas==0)
+    msg.SetStringParam("");
+  else
+    msg.SetStringParam(paras[0]);
+  CGUIWindow *pWindow = m_gWindowManager.GetWindow(WINDOW_SLIDESHOW);
+  if (pWindow) pWindow->OnMessage(msg);
+  return SetResponse(openTag+"OK");
 }
 
 int CXbmcHttp::xbmcSlideshowSelect(int numParas, CStdString paras[])


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14692
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14692&view=rev
Author:   jmarshallnz
Date:     2008-08-05 06:52:57 +0000 (Tue, 05 Aug 2008)

Log Message:
-----------
fixed: MusicPlayer.offset(blah) didn't reflect the repeat state.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp
    branches/linuxport/XBMC/xbmc/PlayListPlayer.h
    branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.cpp

Modified: branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp	2008-08-05 06:18:53 UTC (rev 14691)
+++ branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp	2008-08-05 06:52:57 UTC (rev 14692)
@@ -85,6 +85,32 @@
   return false;
 }
 
+int CPlayListPlayer::GetNextSong(int offset) const
+{
+  if (m_iCurrentPlayList == PLAYLIST_NONE)
+    return -1;
+
+  const CPlayList& playlist = GetPlaylist(m_iCurrentPlayList);
+  if (playlist.size() <= 0)
+    return -1;
+
+  int song = m_iCurrentSong;
+
+  // party mode
+  if (g_partyModeManager.IsEnabled() && GetCurrentPlaylist() == PLAYLIST_MUSIC)
+    return song + offset;
+
+  // wrap around in the case of repeating
+  if (RepeatedOne(m_iCurrentPlayList))
+    return song;
+
+  song++;
+  if (song >= playlist.size() && Repeated(m_iCurrentPlayList))
+    song = 0;
+
+  return song;
+}
+
 int CPlayListPlayer::GetNextSong()
 {
   if (m_iCurrentPlayList == PLAYLIST_NONE)
@@ -302,7 +328,7 @@
 /// - PLAYLIST_NONE \n No playlist active
 /// - PLAYLIST_MUSIC \n Playlist from music playlist window
 /// - PLAYLIST_VIDEO \n Playlist from music playlist window
-int CPlayListPlayer::GetCurrentPlaylist()
+int CPlayListPlayer::GetCurrentPlaylist() const
 {
   return m_iCurrentPlayList;
 }
@@ -363,6 +389,23 @@
   }
 }
 
+const CPlayList& CPlayListPlayer::GetPlaylist(int iPlaylist) const
+{
+  switch ( iPlaylist )
+  {
+  case PLAYLIST_MUSIC:
+    return *m_PlaylistMusic;
+    break;
+  case PLAYLIST_VIDEO:
+    return *m_PlaylistVideo;
+    break;
+  default:
+    // NOTE: This playlist may not be empty if the caller of the non-const version alters it!
+    return *m_PlaylistEmpty;
+    break;
+  }
+}
+
 /// \brief Removes any item from all playlists located on a removable share
 /// \return Number of items removed from PLAYLIST_MUSIC and PLAYLIST_VIDEO
 int CPlayListPlayer::RemoveDVDItems()
@@ -392,7 +435,7 @@
 
 /// \brief Returns \e true if iPlaylist is repeated
 /// \param iPlaylist Playlist to be asked
-bool CPlayListPlayer::Repeated(int iPlaylist)
+bool CPlayListPlayer::Repeated(int iPlaylist) const
 {
   if (iPlaylist >= PLAYLIST_MUSIC && iPlaylist <= PLAYLIST_VIDEO)
     return (m_repeatState[iPlaylist] == REPEAT_ALL);
@@ -401,7 +444,7 @@
 
 /// \brief Returns \e true if iPlaylist repeats one song
 /// \param iPlaylist Playlist to be asked
-bool CPlayListPlayer::RepeatedOne(int iPlaylist)
+bool CPlayListPlayer::RepeatedOne(int iPlaylist) const
 {
   if (iPlaylist >= PLAYLIST_MUSIC && iPlaylist <= PLAYLIST_VIDEO)
     return (m_repeatState[iPlaylist] == REPEAT_ONE);

Modified: branches/linuxport/XBMC/xbmc/PlayListPlayer.h
===================================================================
--- branches/linuxport/XBMC/xbmc/PlayListPlayer.h	2008-08-05 06:18:53 UTC (rev 14691)
+++ branches/linuxport/XBMC/xbmc/PlayListPlayer.h	2008-08-05 06:52:57 UTC (rev 14692)
@@ -52,12 +52,14 @@
   void Play();
   void Play(int iSong, bool bAutoPlay = false, bool bPlayPrevious = false);
   int GetCurrentSong() const;
+  int GetNextSong(int offset) const; ///< Returns the song index that is offset away from the current song
   int GetNextSong();
   void SetCurrentSong(int iSong);
   bool HasChanged();
   void SetCurrentPlaylist(int iPlaylist);
-  int GetCurrentPlaylist();
+  int GetCurrentPlaylist() const;
   CPlayList& GetPlaylist(int iPlaylist);
+  const CPlayList& GetPlaylist(int iPlaylist) const;
   int RemoveDVDItems();
   void Reset();
   void ClearPlaylist(int iPlaylist);
@@ -75,8 +77,8 @@
   void Add(int iPlaylist, CFileItemList& items);
 
 protected:
-  bool Repeated(int iPlaylist);
-  bool RepeatedOne(int iPlaylist);
+  bool Repeated(int iPlaylist) const;
+  bool RepeatedOne(int iPlaylist) const;
   void ReShuffle(int iPlaylist, int iPosition);
   bool m_bChanged;
   bool m_bPlayedFirstFile;

Modified: branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-08-05 06:18:53 UTC (rev 14691)
+++ branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-08-05 06:52:57 UTC (rev 14692)
@@ -2493,7 +2493,7 @@
   { // relative index (requires current playlist is PLAYLIST_MUSIC)
     if (g_playlistPlayer.GetCurrentPlaylist() != PLAYLIST_MUSIC)
       return "";
-    index += g_playlistPlayer.GetCurrentSong();
+    index = g_playlistPlayer.GetNextSong(index);
   }
   if (index < 0 || index >= playlist.size())
     return "";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14693
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14693&view=rev
Author:   jmarshallnz
Date:     2008-08-05 07:03:01 +0000 (Tue, 05 Aug 2008)

Log Message:
-----------
cleanup: const-ness and useless functions from CPlayList/CPlayListPlayer.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/PlayList.cpp
    branches/linuxport/XBMC/xbmc/PlayList.h
    branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp
    branches/linuxport/XBMC/xbmc/PlayListPlayer.h
    branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp
    branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMCweb.cpp

Modified: branches/linuxport/XBMC/xbmc/PlayList.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/PlayList.cpp	2008-08-05 06:52:57 UTC (rev 14692)
+++ branches/linuxport/XBMC/xbmc/PlayList.cpp	2008-08-05 07:03:01 UTC (rev 14693)
@@ -267,7 +267,7 @@
   DecrementOrder(iOrder);
 }
 
-int CPlayList::FindOrder(int iOrder)
+int CPlayList::FindOrder(int iOrder) const
 {
   for (int i = 0; i < size(); i++)
   {

Modified: branches/linuxport/XBMC/xbmc/PlayList.h
===================================================================
--- branches/linuxport/XBMC/xbmc/PlayList.h	2008-08-05 06:52:57 UTC (rev 14692)
+++ branches/linuxport/XBMC/xbmc/PlayList.h	2008-08-05 07:03:01 UTC (rev 14693)
@@ -42,7 +42,7 @@
   void Insert(CPlayList& playlist, int iPosition = -1);
   void Insert(CFileItemList& items, int iPosition = -1);
 
-  int FindOrder(int iOrder);
+  int FindOrder(int iOrder) const;
   const CStdString& GetName() const;
   void Remove(const CStdString& strFileName);
   void Remove(int position);
@@ -55,16 +55,15 @@
   const CFileItemPtr operator[] (int iItem) const;
   CFileItemPtr operator[] (int iItem);
 
-  // why are these virtual functions? there is no derived child class
   void Shuffle(int iPosition = 0);
   void UnShuffle();
-  bool IsShuffled() { return m_bShuffled; }
+  bool IsShuffled() const { return m_bShuffled; }
 
   void SetPlayed(bool bPlayed) { m_bWasPlayed = true; };
-  bool WasPlayed() { return m_bWasPlayed; };
+  bool WasPlayed() const { return m_bWasPlayed; };
 
   void SetUnPlayable(int iItem);
-  int GetPlayable() { return m_iPlayableItems; };
+  int GetPlayable() const { return m_iPlayableItems; };
 
   void UpdateItem(const CFileItem *item);
 

Modified: branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp	2008-08-05 06:52:57 UTC (rev 14692)
+++ branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp	2008-08-05 07:03:01 UTC (rev 14693)
@@ -39,7 +39,6 @@
   m_PlaylistVideo = new CPlayList;
   m_PlaylistEmpty = new CPlayList;
   m_iCurrentSong = -1;
-  m_bChanged = false;
   m_bPlayedFirstFile = false;
   m_iCurrentPlayList = PLAYLIST_NONE;
   for (int i = 0; i < 2; i++)
@@ -230,7 +229,6 @@
         break;
   }
 
-  m_bChanged = true;
   int iPreviousSong = m_iCurrentSong;
   m_iCurrentSong = iSong;
   CFileItemPtr item = playlist[m_iCurrentSong];
@@ -315,13 +313,6 @@
   return m_iCurrentSong;
 }
 
-bool CPlayListPlayer::HasChanged()
-{
-  bool bResult = m_bChanged;
-  m_bChanged = false;
-  return bResult;
-}
-
 /// \brief Returns the active playlist.
 /// \return Active playlist \n
 /// Return values can be: \n
@@ -351,7 +342,6 @@
 
   m_iCurrentPlayList = iPlaylist;
   m_bPlayedFirstFile = false;
-  m_bChanged = true;
 }
 
 void CPlayListPlayer::ClearPlaylist(int iPlaylist)
@@ -428,7 +418,7 @@
 }
 
 /// \brief Whether or not something has been played yet or not from the current playlist.
-bool CPlayListPlayer::HasPlayedFirstFile()
+bool CPlayListPlayer::HasPlayedFirstFile() const
 {
   return m_bPlayedFirstFile;
 }
@@ -489,7 +479,7 @@
   }
 }
 
-bool CPlayListPlayer::IsShuffled(int iPlaylist)
+bool CPlayListPlayer::IsShuffled(int iPlaylist) const
 {
   // even if shuffled, party mode says its not
   if (g_partyModeManager.IsEnabled() && iPlaylist == PLAYLIST_MUSIC)
@@ -514,7 +504,7 @@
   m_repeatState[iPlaylist] = state;
 }
 
-REPEAT_STATE CPlayListPlayer::GetRepeat(int iPlaylist)
+REPEAT_STATE CPlayListPlayer::GetRepeat(int iPlaylist) const
 {
   if (iPlaylist >= PLAYLIST_MUSIC && iPlaylist <= PLAYLIST_VIDEO)
     return m_repeatState[iPlaylist];

Modified: branches/linuxport/XBMC/xbmc/PlayListPlayer.h
===================================================================
--- branches/linuxport/XBMC/xbmc/PlayListPlayer.h	2008-08-05 06:52:57 UTC (rev 14692)
+++ branches/linuxport/XBMC/xbmc/PlayListPlayer.h	2008-08-05 07:03:01 UTC (rev 14693)
@@ -55,7 +55,6 @@
   int GetNextSong(int offset) const; ///< Returns the song index that is offset away from the current song
   int GetNextSong();
   void SetCurrentSong(int iSong);
-  bool HasChanged();
   void SetCurrentPlaylist(int iPlaylist);
   int GetCurrentPlaylist() const;
   CPlayList& GetPlaylist(int iPlaylist);
@@ -65,11 +64,11 @@
   void ClearPlaylist(int iPlaylist);
   void Clear();
   void SetShuffle(int iPlaylist, bool bYesNo);
-  bool IsShuffled(int iPlaylist);
-  bool HasPlayedFirstFile();
+  bool IsShuffled(int iPlaylist) const;
+  bool HasPlayedFirstFile() const;
 
   void SetRepeat(int iPlaylist, REPEAT_STATE state);
-  REPEAT_STATE GetRepeat(int iPlaylist);
+  REPEAT_STATE GetRepeat(int iPlaylist) const;
 
   // add items via the playlist player
   void Add(int iPlaylist, CPlayList& playlist);
@@ -80,7 +79,7 @@
   bool Repeated(int iPlaylist) const;
   bool RepeatedOne(int iPlaylist) const;
   void ReShuffle(int iPlaylist, int iPosition);
-  bool m_bChanged;
+
   bool m_bPlayedFirstFile;
   int m_iFailedSongs;
   int m_iCurrentSong;

Modified: branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp	2008-08-05 06:52:57 UTC (rev 14692)
+++ branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp	2008-08-05 07:03:01 UTC (rev 14693)
@@ -1023,7 +1023,6 @@
     }
     if (changed)
     {
-      g_playlistPlayer.HasChanged();
       return SetResponse(openTag+"OK");
     }
     else

Modified: branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMCweb.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMCweb.cpp	2008-08-05 06:52:57 UTC (rev 14692)
+++ branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMCweb.cpp	2008-08-05 07:03:01 UTC (rev 14693)
@@ -658,7 +658,6 @@
           // attempt to enque the selected directory or file
           CFileItemPtr itm = webDirItems->Get(selectionNumber);
           AddItemToPlayList(itm);
-          g_playlistPlayer.HasChanged();
         }
         else if (strAction == XBMC_CAT_UNQUE)
         {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14695
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14695&view=rev
Author:   yuvalt
Date:     2008-08-05 07:23:02 +0000 (Tue, 05 Aug 2008)

Log Message:
-----------
give credit to the test patterns designer

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowTestPattern.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowTestPattern.h

Modified: branches/linuxport/XBMC/xbmc/GUIWindowTestPattern.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowTestPattern.cpp	2008-08-05 07:19:31 UTC (rev 14694)
+++ branches/linuxport/XBMC/xbmc/GUIWindowTestPattern.cpp	2008-08-05 07:23:02 UTC (rev 14695)
@@ -2,6 +2,8 @@
  *      Copyright (C) 2005-2008 Team XBMC
  *      http://www.xbmc.org
  *
+ *      Test patterns designed by Ofer LaOr - hometheater.co.il
+ *
  *  This Program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)

Modified: branches/linuxport/XBMC/xbmc/GUIWindowTestPattern.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowTestPattern.h	2008-08-05 07:19:31 UTC (rev 14694)
+++ branches/linuxport/XBMC/xbmc/GUIWindowTestPattern.h	2008-08-05 07:23:02 UTC (rev 14695)
@@ -4,6 +4,8 @@
  *      Copyright (C) 2005-2008 Team XBMC
  *      http://www.xbmc.org
  *
+ *      Test patterns designed by Ofer LaOr - hometheater.co.il
+ *
  *  This Program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14701
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14701&view=rev
Author:   jmarshallnz
Date:     2008-08-05 09:36:46 +0000 (Tue, 05 Aug 2008)

Log Message:
-----------
fixed: Get Fanart button didn't work for http://www.moviebackdrops.com

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp
    branches/linuxport/XBMC/xbmc/utils/Fanart.cpp
    branches/linuxport/XBMC/xbmc/utils/Fanart.h

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp	2008-08-05 08:51:59 UTC (rev 14700)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp	2008-08-05 09:36:46 UTC (rev 14701)
@@ -781,6 +781,9 @@
 {
   CFileItemList items;
 
+  // ensure the fanart is unpacked
+  m_movieItem->GetVideoInfoTag()->m_fanart.Unpack();
+
   // Grab the thumbnails from the web
   CStdString strPath;
   CUtil::AddFileToFolder(g_advancedSettings.m_cachePath,"fanartthumbs",strPath);

Modified: branches/linuxport/XBMC/xbmc/utils/Fanart.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/Fanart.cpp	2008-08-05 08:51:59 UTC (rev 14700)
+++ branches/linuxport/XBMC/xbmc/utils/Fanart.cpp	2008-08-05 09:36:46 UTC (rev 14701)
@@ -23,6 +23,7 @@
 #include "Fanart.h"
 #include "HTTP.h"
 #include "tinyXML/tinyxml.h"
+#include "Util.h"
 
 #ifdef RESAMPLE_CACHED_IMAGES
 #include "Picture.h"
@@ -74,7 +75,6 @@
 	  {
       SFanartData data;
       data.strImage = fanartThumb->GetText();
-      data.strThumb.Format("_cache/%s", data.strImage.c_str());
       data.strResolution = fanartThumb->Attribute("dim");
       ParseColors(fanartThumb->Attribute("colors"), data.strColors);
       m_fanart.push_back(data);
@@ -94,16 +94,6 @@
   return result;
 }
 
-const CStdString CFanart::GetThumbURL() const
-{
-  if (m_fanart.size() == 0)
-    return "";
-
-  CStdString result;
-  result.Format("%s%s", m_url.c_str(), m_fanart[0].strThumb.c_str());
-  return result;
-}
-
 const CStdString CFanart::GetColor(unsigned int index) const
 {
   if (index >= max_fanart_colors || m_fanart.size() == 0)
@@ -131,35 +121,48 @@
   if (index >= m_fanart.size())
     return false;
 
+  // thetvdb.com uses the url format:
+  // <url>/_cache/<thumbname> for the thumb <url>/<thumbname>
+
+  CStdString thumbURL = CUtil::AddFileToFolder(m_url, "_cache");
+  thumbURL = CUtil::AddFileToFolder(thumbURL, m_fanart[index].strImage.c_str());
+
   CHTTP http;
-  CStdString thumbURL;
-  thumbURL.Format("%s%s", m_url.c_str(), m_fanart[index].strThumb.c_str());
-  return (http.Download(thumbURL, strDestination));
+  if (http.Download(thumbURL, strDestination))
+    return true;
+
+  // try downloading the image instead
+  thumbURL = CUtil::AddFileToFolder(m_url, m_fanart[index].strImage.c_str());
+  return DownloadImage(thumbURL, strDestination);
 }
 
-bool CFanart::DownloadImage(const CStdString &strDestination) const
+bool CFanart::DownloadImage(const CStdString &url, const CStdString &destination) const
 {
-  if (m_fanart.size() == 0)
-    return false;
-
   // Ideally we'd just call CPicture::CacheImage() directly, but for some
   // reason curl doesn't seem to like downloading these for us
   CHTTP http;
 #ifdef RESAMPLE_CACHED_IMAGES
   CStdString tempFile = _P("Z:\\fanart_download.jpg");
-  if (http.Download(GetImageURL(), tempFile))
+  if (http.Download(url, tempFile))
   { 
     CPicture pic;
-    pic.CacheImage(tempFile, strDestination);
+    pic.CacheImage(tempFile, destination);
     XFILE::CFile::Delete(tempFile);
     return true;
   }
   return false;
 #else
-  return http.Download(GetImageURL(), strDestination);
+  return http.Download(url, destination);
 #endif
 }
 
+bool CFanart::DownloadImage(const CStdString &strDestination) const
+{
+  if (m_fanart.size() == 0)
+    return false;
+  return DownloadImage(GetImageURL(), strDestination);
+}
+
 unsigned int CFanart::GetNumFanarts()
 {
   return m_fanart.size();

Modified: branches/linuxport/XBMC/xbmc/utils/Fanart.h
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/Fanart.h	2008-08-05 08:51:59 UTC (rev 14700)
+++ branches/linuxport/XBMC/xbmc/utils/Fanart.h	2008-08-05 09:36:46 UTC (rev 14701)
@@ -63,10 +63,6 @@
   /// \return A CStdString containing the full URL to the full resolution fanart image
   const CStdString GetImageURL() const;
   ///
-  /// Retrieves the fanart thumbnail image URL
-  /// \return a CStdString containing the full URL to the thumbnail sized fanart image
-  const CStdString GetThumbURL() const;
-  ///
   /// Used to return a specified fanart theme color value
   /// \param index: 0 based index of the color to retrieve.  A fanart theme contains 3 colors, indices 0-2, arranged from darkest to lightest.
   const CStdString GetColor(unsigned int index) const;
@@ -102,6 +98,13 @@
   /// also the interface used to pass the fanart data from the scraper to CFanart.
   CStdString m_xml;
 private:
+  ///
+  /// Downloads the specified image to the specified destination
+  ///
+  /// \param url: CStdString full url indicating where to download the image from
+  /// \param destination: CStdString full path and filename indicating where to store the image
+  /// \return A boolean indicating success of failure of the download
+  bool DownloadImage(const CStdString &url, const CStdString &destination) const;
   static const unsigned int max_fanart_colors;
   ///
   /// Parse various color formats as returned by the sites scraped into a format we recognize
@@ -119,7 +122,6 @@
   struct SFanartData
   {
     CStdString strImage;
-    CStdString strThumb;
     CStdString strResolution;
     CStdString strColors;
   };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14728
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14728&view=rev
Author:   kraqh3d
Date:     2008-08-07 04:30:20 +0000 (Thu, 07 Aug 2008)

Log Message:
-----------
added: workaround to prevent user initiated database updates while a video scan is in progress (mark as watched/unwatched, edit title, delete movie)

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp	2008-08-07 04:26:11 UTC (rev 14727)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp	2008-08-07 04:30:20 UTC (rev 14728)
@@ -1298,6 +1298,14 @@
 
 void CGUIWindowVideoBase::MarkUnWatched(const CFileItemPtr &item)
 {
+  // dont allow update while scanning
+  CGUIDialogVideoScan* pDialogScan = (CGUIDialogVideoScan*)m_gWindowManager.GetWindow(WINDOW_DIALOG_VIDEO_SCAN);
+  if (pDialogScan && pDialogScan->IsScanning())
+  {
+    CGUIDialogOK::ShowAndGetInput(257, 0, 14057, 0);
+    return;
+  }
+
   CVideoDatabase database;
   database.Open();
   CFileItemList items;
@@ -1325,6 +1333,14 @@
 //Add Mark a Title as watched
 void CGUIWindowVideoBase::MarkWatched(const CFileItemPtr &item)
 {
+  // dont allow update while scanning
+  CGUIDialogVideoScan* pDialogScan = (CGUIDialogVideoScan*)m_gWindowManager.GetWindow(WINDOW_DIALOG_VIDEO_SCAN);
+  if (pDialogScan && pDialogScan->IsScanning())
+  {
+    CGUIDialogOK::ShowAndGetInput(257, 0, 14057, 0);
+    return;
+  }
+
   CVideoDatabase database;
   database.Open();
   CFileItemList items;
@@ -1352,6 +1368,14 @@
 //Add change a title's name
 void CGUIWindowVideoBase::UpdateVideoTitle(const CFileItem* pItem)
 {
+  // dont allow update while scanning
+  CGUIDialogVideoScan* pDialogScan = (CGUIDialogVideoScan*)m_gWindowManager.GetWindow(WINDOW_DIALOG_VIDEO_SCAN);
+  if (pDialogScan && pDialogScan->IsScanning())
+  {
+    CGUIDialogOK::ShowAndGetInput(257, 0, 14057, 0);
+    return;
+  }
+
   CVideoInfoTag detail;
   CVideoDatabase database;
   database.Open();

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.cpp	2008-08-07 04:26:11 UTC (rev 14727)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.cpp	2008-08-07 04:30:20 UTC (rev 14728)
@@ -35,6 +35,7 @@
 #include "PlayListFactory.h"
 #include "GUIFontManager.h"
 #include "GUIDialogVideoScan.h"
+#include "GUIDialogOK.h"
 #include "PartyModeManager.h"
 #include "MusicDatabase.h"
 #include "GUIWindowManager.h"
@@ -809,6 +810,14 @@
 
 bool CGUIWindowVideoNav::DeleteItem(CFileItem* pItem)
 {
+  // dont allow update while scanning
+  CGUIDialogVideoScan* pDialogScan = (CGUIDialogVideoScan*)m_gWindowManager.GetWindow(WINDOW_DIALOG_VIDEO_SCAN);
+  if (pDialogScan && pDialogScan->IsScanning())
+  {
+    CGUIDialogOK::ShowAndGetInput(257, 0, 14057, 0);
+    return false;
+  }
+
   VIDEODB_CONTENT_TYPE iType=VIDEODB_CONTENT_MOVIES;
   if (pItem->HasVideoInfoTag() && !pItem->GetVideoInfoTag()->m_strShowTitle.IsEmpty())
     iType = VIDEODB_CONTENT_TVSHOWS;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14731
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14731&view=rev
Author:   monkeyman_67156
Date:     2008-08-08 00:07:29 +0000 (Fri, 08 Aug 2008)

Log Message:
-----------
fixed: a few memory leaks reported by Valgrind

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/Database.cpp

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-07 23:37:12 UTC (rev 14730)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-08 00:07:29 UTC (rev 14731)
@@ -3573,6 +3573,7 @@
     m_gWindowManager.Delete(WINDOW_SETTINGS_MENU);
     m_gWindowManager.Delete(WINDOW_SETTINGS_PROFILES);
     m_gWindowManager.Delete(WINDOW_SETTINGS_MYPICTURES);  // all the settings categories
+    m_gWindowManager.Delete(WINDOW_TEST_PATTERN);
     m_gWindowManager.Delete(WINDOW_SCREEN_CALIBRATION);
     m_gWindowManager.Delete(WINDOW_SYSTEM_INFORMATION);
     m_gWindowManager.Delete(WINDOW_SCREENSAVER);

Modified: branches/linuxport/XBMC/xbmc/Database.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Database.cpp	2008-08-07 23:37:12 UTC (rev 14730)
+++ branches/linuxport/XBMC/xbmc/Database.cpp	2008-08-08 00:07:29 UTC (rev 14731)
@@ -38,7 +38,7 @@
 
 CDatabase::~CDatabase(void)
 {
-
+  Close();
 }
 
 void CDatabase::Split(const CStdString& strFileNameAndPath, CStdString& strPath, CStdString& strFileName)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14764
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14764&view=rev
Author:   jmarshallnz
Date:     2008-08-09 11:08:50 +0000 (Sat, 09 Aug 2008)

Log Message:
-----------
fixed: Largeimage textures weren't cleared from the allocated list after deletion.
fixed: Deadlock when loading and unloading many largeimage textures.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUILargeTextureManager.cpp
    branches/linuxport/XBMC/xbmc/GUILargeTextureManager.h

Modified: branches/linuxport/XBMC/xbmc/GUILargeTextureManager.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUILargeTextureManager.cpp	2008-08-09 10:31:42 UTC (rev 14763)
+++ branches/linuxport/XBMC/xbmc/GUILargeTextureManager.cpp	2008-08-09 11:08:50 UTC (rev 14764)
@@ -45,9 +45,9 @@
 // Once there's nothing queued or allocated, end the thread.
 void CGUILargeTextureManager::Process()
 {
+  m_running = true;
   // lock item list
   CSingleLock lock(m_listSection);
-  m_running = true;
   while (m_queued.size() && !m_bStop)
   { // load the top item in the queue
     // take a copy of the details required for the load, as
@@ -135,21 +135,11 @@
 #endif
     }
   }
+  lock.Leave();
+
   if (firstRequest)
-  {
-    for (listIterator it = m_queued.begin(); it != m_queued.end(); ++it)
-    {
-      CLargeTexture *image = *it;
-      if (image->GetPath() == path)
-      {
-        image->AddRef();
-        return NULL; // already queued - it'll be returned above.
-      }
-    }
-    // queue the item
-    CLargeTexture *image = new CLargeTexture(path);
-    QueueImage(image);
-  }
+    QueueImage(path);
+
   return NULL;
 }
 
@@ -161,7 +151,8 @@
     CLargeTexture *image = *it;
     if (image->GetPath() == path)
     {
-      image->DecrRef(immediately);
+      if (image->DecrRef(immediately) && immediately)
+        m_allocated.erase(it);
       return;
     }
   }
@@ -177,11 +168,25 @@
 }
 
 // queue the image, and start the background loader if necessary
-void CGUILargeTextureManager::QueueImage(CLargeTexture *image)
+void CGUILargeTextureManager::QueueImage(const CStdString &path)
 {
   CSingleLock lock(m_listSection);
+  for (listIterator it = m_queued.begin(); it != m_queued.end(); ++it)
+  {
+    CLargeTexture *image = *it;
+    if (image->GetPath() == path)
+    {
+      image->AddRef();
+      return; // already queued
+    }
+  }
+
+  // queue the item
+  CLargeTexture *image = new CLargeTexture(path);
   m_queued.push_back(image);
 
+  lock.Leave(); // done with our lock
+
   if (!m_running)
   {
     StopThread();

Modified: branches/linuxport/XBMC/xbmc/GUILargeTextureManager.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUILargeTextureManager.h	2008-08-09 10:31:42 UTC (rev 14763)
+++ branches/linuxport/XBMC/xbmc/GUILargeTextureManager.h	2008-08-09 11:08:50 UTC (rev 14764)
@@ -123,7 +123,7 @@
     unsigned int m_timeToDelete;
   };
 
-  void QueueImage(CLargeTexture *image);
+  void QueueImage(const CStdString &path);
 
 private:
   std::vector<CLargeTexture *> m_queued;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14785
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14785&view=rev
Author:   elupus
Date:     2008-08-09 19:47:07 +0000 (Sat, 09 Aug 2008)

Log Message:
-----------
changed: if file only has one chapter, we should be using standard large skips not chapter seeks

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowFullScreen.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIWindowFullScreen.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowFullScreen.cpp	2008-08-09 19:45:57 UTC (rev 14784)
+++ branches/linuxport/XBMC/xbmc/GUIWindowFullScreen.cpp	2008-08-09 19:47:07 UTC (rev 14785)
@@ -203,12 +203,12 @@
     break;
 
   case ACTION_BIG_STEP_BACK:
-    SeekChapter(g_application.m_pPlayer->GetChapter() - 1);
+    Seek(false, true);
     return true;
     break;
 
   case ACTION_BIG_STEP_FORWARD:
-    SeekChapter(g_application.m_pPlayer->GetChapter() + 1);
+    Seek(true, true);
     return true;
     break;
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-08-09 19:45:57 UTC (rev 14784)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2008-08-09 19:47:07 UTC (rev 14785)
@@ -1709,7 +1709,7 @@
     return;
   }
 #endif
-  if (bLargeStep && GetChapterCount() > 0)
+  if (bLargeStep && GetChapterCount() > 1)
   {
     if(bPlus)
       SeekChapter(GetChapter() + 1);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14796
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14796&view=rev
Author:   jmarshallnz
Date:     2008-08-10 03:45:20 +0000 (Sun, 10 Aug 2008)

Log Message:
-----------
fixed: Ticket #4430, Smart Playlists, unable to affect episode ordering.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/VideoDatabase.cpp
    branches/linuxport/XBMC/xbmc/VideoDatabase.h

Modified: branches/linuxport/XBMC/xbmc/VideoDatabase.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoDatabase.cpp	2008-08-10 03:02:24 UTC (rev 14795)
+++ branches/linuxport/XBMC/xbmc/VideoDatabase.cpp	2008-08-10 03:45:20 UTC (rev 14796)
@@ -4206,7 +4206,11 @@
     CLog::Log(LOGDEBUG,"Time to retrieve movies from dataset = %d",
               timeGetTime() - time);
     if (g_guiSettings.GetBool("videolibrary.removeduplicates"))
-      Stack(items, VIDEODB_CONTENT_TVSHOWS);
+    {
+      CStdString order(where);
+      bool maintainOrder = order.ToLower().Find("order by")  != CStdString::npos;
+      Stack(items, VIDEODB_CONTENT_TVSHOWS, maintainOrder);
+    }
 
     // cleanup
     m_pDS->close();
@@ -4219,8 +4223,15 @@
   return false;
 }
 
-void CVideoDatabase::Stack(CFileItemList& items, VIDEODB_CONTENT_TYPE type)
+void CVideoDatabase::Stack(CFileItemList& items, VIDEODB_CONTENT_TYPE type, bool maintainSortOrder /* = false */)
 {
+  if (maintainSortOrder)
+  {
+    // save current sort order
+    for (int i = 0; i < items.Size(); i++)
+      items[i]->m_iprogramCount = i;
+  }
+
   switch (type)
   {
     case VIDEODB_CONTENT_TVSHOWS:
@@ -4352,6 +4363,11 @@
     default:
       break;
   }
+  if (maintainSortOrder)
+  {
+    // restore original sort order - essential for smartplaylists
+    items.Sort(SORT_METHOD_PROGRAM_COUNT, SORT_ORDER_ASC);
+  }
 }
 
 bool CVideoDatabase::GetEpisodesNav(const CStdString& strBaseDir, CFileItemList& items, long idGenre, long idYear, long idActor, long idDirector, long idShow, long idSeason)
@@ -4443,7 +4459,11 @@
     CLog::Log(LOGDEBUG,"Time to retrieve movies from dataset = %d",
               timeGetTime() - time);
     if (g_guiSettings.GetBool("videolibrary.removeduplicates"))
-      Stack(items, VIDEODB_CONTENT_EPISODES);
+    {
+      CStdString order(where);
+      bool maintainOrder = order.ToLower().Find("order by")  != CStdString::npos;
+      Stack(items, VIDEODB_CONTENT_EPISODES, maintainOrder);
+    }
 
     // cleanup
     m_pDS->close();

Modified: branches/linuxport/XBMC/xbmc/VideoDatabase.h
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoDatabase.h	2008-08-10 03:02:24 UTC (rev 14795)
+++ branches/linuxport/XBMC/xbmc/VideoDatabase.h	2008-08-10 03:45:20 UTC (rev 14796)
@@ -498,5 +498,5 @@
   void DeleteThumbForItem(const CStdString& strPath, bool bFolder);
 
   bool GetStackedTvShowList(long idShow, CStdString& strIn);
-  void Stack(CFileItemList& items, VIDEODB_CONTENT_TYPE type);
+  void Stack(CFileItemList& items, VIDEODB_CONTENT_TYPE type, bool maintainSortOrder = false);
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14800
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14800&view=rev
Author:   jmarshallnz
Date:     2008-08-10 05:19:42 +0000 (Sun, 10 Aug 2008)

Log Message:
-----------
fixed: Ticket #4454, Get fanart crashing in Aeon skin.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.h

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp	2008-08-10 04:56:36 UTC (rev 14799)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp	2008-08-10 05:19:42 UTC (rev 14800)
@@ -97,13 +97,11 @@
   case GUI_MSG_WINDOW_DEINIT:
     {
       ClearCastList();
-      m_database.Close();
     }
     break;
 
   case GUI_MSG_WINDOW_INIT:
     {
-      m_database.Open();
       m_dlgProgress = (CGUIDialogProgress*)m_gWindowManager.GetWindow(WINDOW_DIALOG_PROGRESS);
 
       m_bRefresh = false;
@@ -190,7 +188,12 @@
           if (CGUIDialogYesNo::ShowAndGetInput(20377,20378,-1,-1,bCanceled))
           {
             m_bRefreshAll = true;
-            m_database.SetPathHash(m_movieItem->GetVideoInfoTag()->m_strPath,"");
+            CVideoDatabase db;
+            if (db.Open())
+            {
+              db.SetPathHash(m_movieItem->GetVideoInfoTag()->m_strPath,"");
+              db.Close();
+            }
           }
           else
             m_bRefreshAll = false;
@@ -564,7 +567,11 @@
 void CGUIWindowVideoInfo::DoSearch(CStdString& strSearch, CFileItemList& items)
 {
   VECMOVIES movies;
-  m_database.GetMoviesByActor(strSearch, movies);
+  CVideoDatabase db;
+  if (!db.Open())
+    return;
+
+  db.GetMoviesByActor(strSearch, movies);
   for (int i = 0; i < (int)movies.size(); ++i)
   {
     CStdString strItem;
@@ -575,7 +582,7 @@
     items.Add(pItem);
   }
   movies.clear();
-  m_database.GetTvShowsByActor(strSearch, movies);
+  db.GetTvShowsByActor(strSearch, movies);
   for (int i = 0; i < (int)movies.size(); ++i)
   {
     CStdString strItem;
@@ -586,7 +593,7 @@
     items.Add(pItem);
   }
   movies.clear();
-  m_database.GetEpisodesByActor(strSearch, movies);
+  db.GetEpisodesByActor(strSearch, movies);
   for (int i = 0; i < (int)movies.size(); ++i)
   {
     CStdString strItem;
@@ -598,7 +605,7 @@
   }
 
   CFileItemList mvids;
-  m_database.GetMusicVideosByArtist(strSearch, mvids);
+  db.GetMusicVideosByArtist(strSearch, mvids);
   for (int i = 0; i < (int)mvids.Size(); ++i)
   {
     CStdString strItem;
@@ -608,6 +615,7 @@
     pItem->m_strPath = mvids[i]->GetVideoInfoTag()->m_strFileNameAndPath;
     items.Add(pItem);
   }
+  db.Close();
 }
 
 /// \brief React on the selected search item
@@ -622,15 +630,20 @@
   if (pItem->HasVideoInfoTag() && !pItem->GetVideoInfoTag()->m_strArtist.IsEmpty())
     iType = 3;
 
+  CVideoDatabase db;
+  if (!db.Open())
+    return;
+
   CVideoInfoTag movieDetails;
   if (iType == 0)
-    m_database.GetMovieInfo(pItem->m_strPath, movieDetails, pItem->GetVideoInfoTag()->m_iDbId);
+    db.GetMovieInfo(pItem->m_strPath, movieDetails, pItem->GetVideoInfoTag()->m_iDbId);
   if (iType == 1)
-    m_database.GetEpisodeInfo(pItem->m_strPath, movieDetails, pItem->GetVideoInfoTag()->m_iDbId);
+    db.GetEpisodeInfo(pItem->m_strPath, movieDetails, pItem->GetVideoInfoTag()->m_iDbId);
   if (iType == 2)
-    m_database.GetTvShowInfo(pItem->m_strPath, movieDetails, pItem->GetVideoInfoTag()->m_iDbId);
+    db.GetTvShowInfo(pItem->m_strPath, movieDetails, pItem->GetVideoInfoTag()->m_iDbId);
   if (iType == 3)
-    m_database.GetMusicVideoInfo(pItem->m_strPath, movieDetails, pItem->GetVideoInfoTag()->m_iDbId);
+    db.GetMusicVideoInfo(pItem->m_strPath, movieDetails, pItem->GetVideoInfoTag()->m_iDbId);
+  db.Close();
 
   CFileItem item(*pItem);
   *item.GetVideoInfoTag() = movieDetails;
@@ -834,7 +847,12 @@
     {
       // set new primary fanart, and update our database accordingly
       m_movieItem->GetVideoInfoTag()->m_fanart.SetPrimaryFanart(iFanart);
-      m_database.SetDetailsForTvShow(m_movieItem->m_strPath, *m_movieItem->GetVideoInfoTag());
+      CVideoDatabase db;
+      if (db.Open())
+      {
+        db.SetDetailsForTvShow(m_movieItem->m_strPath, *m_movieItem->GetVideoInfoTag());
+        db.Close();
+      }
 
       // download the fullres fanart image.  TODO: FANART - this could take some time, so should probably be backgrounded
       m_movieItem->GetVideoInfoTag()->m_fanart.DownloadImage(cachedThumb);

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.h	2008-08-10 04:56:36 UTC (rev 14799)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.h	2008-08-10 05:19:42 UTC (rev 14800)
@@ -23,7 +23,6 @@
 
 #include "GUIDialog.h"
 #include "GUIListItem.h"
-#include "VideoDatabase.h"
 #include "GUIWindowVideoBase.h"
 #include "GUIWindowVideoFiles.h"
 
@@ -65,5 +64,4 @@
   bool m_bRefresh;
   bool m_bRefreshAll;
   CGUIDialogProgress* m_dlgProgress;
-  CVideoDatabase m_database;
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14814
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14814&view=rev
Author:   nuka1195
Date:     2008-08-10 20:19:40 +0000 (Sun, 10 Aug 2008)

Log Message:
-----------
added: Script settings support(incomplete)

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIDialogContextMenu.h
    branches/linuxport/XBMC/xbmc/GUIWindowScripts.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIDialogContextMenu.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogContextMenu.h	2008-08-10 20:12:41 UTC (rev 14813)
+++ branches/linuxport/XBMC/xbmc/GUIDialogContextMenu.h	2008-08-10 20:19:40 UTC (rev 14814)
@@ -109,7 +109,8 @@
                       CONTEXT_BUTTON_USER7,
                       CONTEXT_BUTTON_USER8,
                       CONTEXT_BUTTON_USER9,
-                      CONTEXT_BUTTON_USER10
+                      CONTEXT_BUTTON_USER10,
+                      CONTEXT_BUTTON_SCRIPT_SETTINGS
                     };
 
 class CContextButtons : public std::vector< std::pair<CONTEXT_BUTTON, CStdString> >

Modified: branches/linuxport/XBMC/xbmc/GUIWindowScripts.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowScripts.cpp	2008-08-10 20:12:41 UTC (rev 14813)
+++ branches/linuxport/XBMC/xbmc/GUIWindowScripts.cpp	2008-08-10 20:19:40 UTC (rev 14814)
@@ -213,6 +213,7 @@
 {
   CGUIMediaWindow::GetContextButtons(itemNumber, buttons);
   buttons.Add(CONTEXT_BUTTON_INFO, 654);
+  buttons.Add(CONTEXT_BUTTON_SCRIPT_SETTINGS, 1045);
 }
 
 bool CGUIWindowScripts::OnContextButton(int itemNumber, CONTEXT_BUTTON button)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14837
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14837&view=rev
Author:   elupus
Date:     2008-08-11 19:53:20 +0000 (Mon, 11 Aug 2008)

Log Message:
-----------
fixed: mms:// streams that failed segfaulted xbmc

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp
    branches/linuxport/XBMC/xbmc/PlayListPlayer.h

Modified: branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp	2008-08-11 05:29:08 UTC (rev 14836)
+++ branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp	2008-08-11 19:53:20 UTC (rev 14837)
@@ -40,6 +40,7 @@
   m_PlaylistEmpty = new CPlayList;
   m_iCurrentSong = -1;
   m_bPlayedFirstFile = false;
+  m_bPlaybackStarted = false;
   m_iCurrentPlayList = PLAYLIST_NONE;
   for (int i = 0; i < 2; i++)
     m_repeatState[i] = REPEAT_NONE;
@@ -69,7 +70,7 @@
     break;
   case GUI_MSG_PLAYBACK_STOPPED:
     {
-      if (m_iCurrentPlayList != PLAYLIST_NONE)
+      if (m_iCurrentPlayList != PLAYLIST_NONE && m_bPlaybackStarted)
       {
         CGUIMessage msg(GUI_MSG_PLAYLISTPLAYER_STOPPED, 0, 0, m_iCurrentPlayList, m_iCurrentSong);
         m_gWindowManager.SendThreadMessage(msg);
@@ -234,6 +235,8 @@
   CFileItemPtr item = playlist[m_iCurrentSong];
   playlist.SetPlayed(true);
 
+  m_bPlaybackStarted = false;
+
   if (!g_application.PlayFile(*item, bAutoPlay))
   {
     CLog::Log(LOGERROR,"Playlist Player: skipping unplayable item: %i, path [%s]", m_iCurrentSong, item->m_strPath.c_str());
@@ -278,10 +281,14 @@
     }
   }
 
-  m_bPlayedFirstFile = true;
+  // TODO - move the above failure logic and the below success logic
+  //        to callbacks instead so we don't rely on the return value
+  //        of PlayFile()
 
   // consecutive error counter so reset if the current item is playing
   m_iFailedSongs = 0;
+  m_bPlaybackStarted = true;
+  m_bPlayedFirstFile = true;
 
   if (!item->IsShoutCast())
   {
@@ -411,6 +418,7 @@
 {
   m_iCurrentSong = -1;
   m_bPlayedFirstFile = false;
+  m_bPlaybackStarted = false;
 
   // its likely that the playlist changed
   CGUIMessage msg(GUI_MSG_PLAYLIST_CHANGED, 0, 0);

Modified: branches/linuxport/XBMC/xbmc/PlayListPlayer.h
===================================================================
--- branches/linuxport/XBMC/xbmc/PlayListPlayer.h	2008-08-11 05:29:08 UTC (rev 14836)
+++ branches/linuxport/XBMC/xbmc/PlayListPlayer.h	2008-08-11 19:53:20 UTC (rev 14837)
@@ -81,6 +81,7 @@
   void ReShuffle(int iPlaylist, int iPosition);
 
   bool m_bPlayedFirstFile;
+  bool m_bPlaybackStarted;
   int m_iFailedSongs;
   int m_iCurrentSong;
   int m_iCurrentPlayList;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14841
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14841&view=rev
Author:   jmarshallnz
Date:     2008-08-11 23:09:24 +0000 (Mon, 11 Aug 2008)

Log Message:
-----------
changed: Aligned network interface with trunk (which can busy wait on CNetwork::IsAvailable()) - we still don't actually wait at all.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Settings.cpp
    branches/linuxport/XBMC/xbmc/utils/Network.cpp
    branches/linuxport/XBMC/xbmc/utils/Network.h
    branches/linuxport/XBMC/xbmc/utils/RssReader.cpp

Modified: branches/linuxport/XBMC/xbmc/Settings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.cpp	2008-08-11 22:59:38 UTC (rev 14840)
+++ branches/linuxport/XBMC/xbmc/Settings.cpp	2008-08-11 23:09:24 UTC (rev 14841)
@@ -331,7 +331,7 @@
         CLog::Log(LOGDEBUG, "Found <remote> tag");
         CLog::Log(LOGDEBUG, "Attempting to retrieve remote file: %s", strRemoteFile.c_str());
         // sometimes we have to wait for the network
-        if (g_application.getNetwork().IsAvailable())
+        if (g_application.getNetwork().IsAvailable(true))
         {
           // cache the external source file
           if (CFile::Cache(strRemoteFile, strCached))

Modified: branches/linuxport/XBMC/xbmc/utils/Network.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/Network.cpp	2008-08-11 22:59:38 UTC (rev 14840)
+++ branches/linuxport/XBMC/xbmc/utils/Network.cpp	2008-08-11 23:09:24 UTC (rev 14841)
@@ -68,10 +68,17 @@
    return NULL;
 }
 
-bool CNetwork::IsAvailable()
+bool CNetwork::IsAvailable(bool wait /*= false*/)
 {
-   std::vector<CNetworkInterface*>& ifaces = GetInterfaceList();
-   return (ifaces.size() != 0);
+  if (wait)
+  {
+    // NOTE: Not implemented in linuxport branch as 99.9% of the time
+    //       we have the network setup already.  Trunk code has a busy
+    //       wait for 5 seconds here.
+  }
+
+  std::vector<CNetworkInterface*>& ifaces = GetInterfaceList();
+  return (ifaces.size() != 0);
 }
 
 bool CNetwork::IsConnected()

Modified: branches/linuxport/XBMC/xbmc/utils/Network.h
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/Network.h	2008-08-11 22:59:38 UTC (rev 14840)
+++ branches/linuxport/XBMC/xbmc/utils/Network.h	2008-08-11 23:09:24 UTC (rev 14841)
@@ -96,7 +96,7 @@
    CNetworkInterface* GetFirstConnectedInterface(void);
 
    // Return true if there's at least one defined network interface
-   bool IsAvailable(void);
+   bool IsAvailable(bool wait = false);
 
    // Return true if there's at least one interface which is connected
    bool IsConnected(void);

Modified: branches/linuxport/XBMC/xbmc/utils/RssReader.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/RssReader.cpp	2008-08-11 22:59:38 UTC (rev 14840)
+++ branches/linuxport/XBMC/xbmc/utils/RssReader.cpp	2008-08-11 23:09:24 UTC (rev 14841)
@@ -117,7 +117,8 @@
     int nRetries = 3;
     CURL url(strUrl);
 
-    if ((url.GetProtocol() == "http" || url.GetProtocol() == "https") && (!g_guiSettings.GetBool("network.enableinternet") || !g_application.getNetwork().IsAvailable()))
+    // we wait for the network to come up
+    if ((url.GetProtocol() == "http" || url.GetProtocol() == "https") && (!g_guiSettings.GetBool("network.enableinternet") || !g_application.getNetwork().IsAvailable(true)))
       strXML = "<rss><item><title>"+g_localizeStrings.Get(15301)+"</title></item></rss>";
     else
     {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14843
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14843&view=rev
Author:   jmarshallnz
Date:     2008-08-11 23:15:13 +0000 (Mon, 11 Aug 2008)

Log Message:
-----------
changed: Wait for network to come up when entering a window with a network location as the starting url.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIMediaWindow.cpp
    branches/linuxport/XBMC/xbmc/GUIMediaWindow.h
    branches/linuxport/XBMC/xbmc/GUIWindowMusicSongs.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowPictures.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIMediaWindow.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIMediaWindow.cpp	2008-08-11 23:14:06 UTC (rev 14842)
+++ branches/linuxport/XBMC/xbmc/GUIMediaWindow.cpp	2008-08-11 23:15:13 UTC (rev 14843)
@@ -34,6 +34,7 @@
 #include "GUIWindowFileManager.h"
 #include "Favourites.h"
 #include "utils/LabelFormatter.h"
+#include "GUIDialogProgress.h"
 
 #include "guiImage.h"
 #include "GUIMultiImage.h"
@@ -1244,4 +1245,30 @@
   return *m_vecItems;
 }
 
+bool CGUIMediaWindow::WaitForNetwork() const
+{
+  if (g_application.getNetwork().IsAvailable())
+    return true;
 
+  CGUIDialogProgress *progress = (CGUIDialogProgress *)m_gWindowManager.GetWindow(WINDOW_DIALOG_PROGRESS);
+  if (!progress)
+    return true;
+
+  CURL url(m_vecItems->m_strPath);
+  progress->SetHeading(1040); // Loading Directory
+  progress->SetLine(1, url.GetURLWithoutUserDetails());
+  progress->ShowProgressBar(false);
+  progress->StartModal();
+  while (!g_application.getNetwork().IsAvailable())
+  {
+    progress->Progress();
+    if (progress->IsCanceled())
+    {
+      progress->Close();
+      return false;
+    }
+  }
+  progress->Close();
+  return true;
+}
+

Modified: branches/linuxport/XBMC/xbmc/GUIMediaWindow.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIMediaWindow.h	2008-08-11 23:14:06 UTC (rev 14842)
+++ branches/linuxport/XBMC/xbmc/GUIMediaWindow.h	2008-08-11 23:15:13 UTC (rev 14843)
@@ -79,6 +79,7 @@
   void OnRenameItem(int iItem);
 
 protected:
+  bool WaitForNetwork() const;
   DIRECTORY::CVirtualDirectory m_rootDir;
   CGUIViewControl m_viewControl;
 

Modified: branches/linuxport/XBMC/xbmc/GUIWindowMusicSongs.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowMusicSongs.cpp	2008-08-11 23:14:06 UTC (rev 14842)
+++ branches/linuxport/XBMC/xbmc/GUIWindowMusicSongs.cpp	2008-08-11 23:15:13 UTC (rev 14843)
@@ -146,6 +146,10 @@
           }
         }
 
+        // check for network up
+        if (CUtil::IsRemote(m_vecItems->m_strPath) && !WaitForNetwork())
+          m_vecItems->m_strPath.Empty();
+
         // need file filters or GetDirectory in SetHistoryPath fails
         SetHistoryForPath(m_vecItems->m_strPath);
       }

Modified: branches/linuxport/XBMC/xbmc/GUIWindowPictures.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowPictures.cpp	2008-08-11 23:14:06 UTC (rev 14842)
+++ branches/linuxport/XBMC/xbmc/GUIWindowPictures.cpp	2008-08-11 23:15:13 UTC (rev 14843)
@@ -147,6 +147,10 @@
           }
         }
 
+        // check for network up
+        if (CUtil::IsRemote(m_vecItems->m_strPath) && !WaitForNetwork())
+          m_vecItems->m_strPath.Empty();
+
         SetHistoryForPath(m_vecItems->m_strPath);
       }
 

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp	2008-08-11 23:14:06 UTC (rev 14842)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp	2008-08-11 23:15:13 UTC (rev 14843)
@@ -146,6 +146,10 @@
           }
         }
 
+        // check for network up
+        if (CUtil::IsRemote(m_vecItems->m_strPath) && !WaitForNetwork())
+          m_vecItems->m_strPath.Empty();
+
         SetHistoryForPath(m_vecItems->m_strPath);
       }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14861
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14861&view=rev
Author:   spiff_
Date:     2008-08-12 17:52:40 +0000 (Tue, 12 Aug 2008)

Log Message:
-----------
changed: cache zip entries > 4mb instead of showing progress bar - part of a temporary workaround for ticket #4401

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileSystem/FileZip.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/FileZip.h
    branches/linuxport/XBMC/xbmc/URL.cpp

Modified: branches/linuxport/XBMC/xbmc/FileSystem/FileZip.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/FileZip.cpp	2008-08-12 16:26:04 UTC (rev 14860)
+++ branches/linuxport/XBMC/xbmc/FileSystem/FileZip.cpp	2008-08-12 17:52:40 UTC (rev 14861)
@@ -22,6 +22,7 @@
 #include "stdafx.h"
 #include "FileZip.h"
 #include "URL.h"
+#include "Util.h"
 
 #include <sys/stat.h>
 
@@ -31,13 +32,16 @@
 #endif
 #endif
 
+#define ZIP_CACHE_LIMIT 4*1024*1024
+
 using namespace XFILE;
 
-CFileZip::CFileZip() : m_bUseProgressBar(false), m_dlgProgress(NULL)
+CFileZip::CFileZip()
 {
   m_szStringBuffer = NULL;
   m_szStartOfStringBuffer = NULL;
   m_iDataInStringBuffer = 0;
+  m_bCached = false;
 }
 
 CFileZip::~CFileZip()
@@ -50,7 +54,10 @@
 bool CFileZip::Open(const CURL&url, bool bBinary)
 {
   CStdString strPath;
-  url.GetURL(strPath);
+  CStdString strOpts  = url.GetOptions();
+  CURL url2(url);
+  url2.SetOptions("");
+  url2.GetURL(strPath);
   if (!g_ZipManager.GetZipEntry(strPath,mZipItem))
     return false;
   
@@ -66,6 +73,14 @@
     return false;
   }
 
+  if (mZipItem.usize > ZIP_CACHE_LIMIT && strOpts != "?cache=no")
+  {
+    if (!CFile::Exists(_P("Z:\\"+CUtil::GetFileName(strPath))))
+      CFile::Cache(strPath+"?cache=no",_P("Z:\\"+CUtil::GetFileName(strPath)));
+    m_bCached = true;
+    return mFile.Open(_P("Z:\\"+CUtil::GetFileName(strPath)),bBinary);
+  }
+
   if (!mFile.Open(url.GetHostName(),true)) // this is the zip-file, always open binary
   {
     CLog::Log(LOGERROR,"FileZip: unable to open zip file %s!",url.GetHostName().c_str());
@@ -106,11 +121,16 @@
 
 __int64 CFileZip::GetPosition()
 {
+  if (m_bCached)
+    return mFile.GetPosition();
+
   return m_iFilePos;
 }
 
 __int64 CFileZip::Seek(__int64 iFilePosition, int iWhence)
 {
+  if (m_bCached)
+    return mFile.Seek(iFilePosition,iWhence);
   if (mZipItem.method == 0) // this is easy
   {
     __int64 iResult;
@@ -151,7 +171,6 @@
   if (mZipItem.method == 8)
   {
     char temp[131072];
-    __int64 iStartPos = m_iFilePos;
     switch (iWhence)
     {
     case SEEK_SET:
@@ -172,27 +191,12 @@
         m_ZStream.next_in = (Bytef*)m_szBuffer;
         m_ZStream.avail_in = 0;
         m_ZStream.total_out = 0;
-        if (iFilePosition > 1024*1024) // 1 MB seek
-        {
-          StartProgressBar();
-          m_bUseProgressBar = true;
-        }
         while (m_iFilePos < iFilePosition)
         {
           unsigned int iToRead = (iFilePosition-m_iFilePos)>131072?131072:(int)(iFilePosition-m_iFilePos);
           if (Read(temp,iToRead) != iToRead)
             return -1;
-          if (m_bUseProgressBar)
-          {
-            m_dlgProgress->SetPercentage(static_cast<int>(static_cast<float>(m_iFilePos)/static_cast<float>(iFilePosition)*100));
-            m_dlgProgress->Progress();
-          }
         }
-        if( m_bUseProgressBar) 
-        {
-          StopProgressBar();
-          m_bUseProgressBar = false;
-        }
         return m_iFilePos;
       }
       else // seek forward
@@ -206,27 +210,12 @@
       if (m_iFilePos+iFilePosition > mZipItem.usize)
         return -1;
       iFilePosition += m_iFilePos;
-      if (iFilePosition-m_iFilePos > 1024*1024) // 1 MB seek
-      {
-        StartProgressBar();
-        m_bUseProgressBar = true;
-      }
       while (m_iFilePos < iFilePosition)
       {
         unsigned int iToRead = (iFilePosition-m_iFilePos)>131072?131072:(int)(iFilePosition-m_iFilePos);
         if (Read(temp,iToRead) != iToRead)
           return -1;
-        if (m_bUseProgressBar)
-        {
-          m_dlgProgress->SetPercentage(static_cast<int>(static_cast<float>(m_iFilePos)/static_cast<float>(iFilePosition)*100));
-          m_dlgProgress->Progress();
-        }
       }
-      if( m_bUseProgressBar) 
-        {
-          StopProgressBar();
-          m_bUseProgressBar = false;
-        }
       return m_iFilePos;
       break;
 
@@ -234,28 +223,12 @@
       // now this is a nasty bastard, possibly takes lotsoftime
       // uncompress, minding m_ZStream.total_out
             
-      if ((GetLength()+iFilePosition)-m_iFilePos > 1024*1024) // 1 MB seek
-      {
-        StartProgressBar();
-        m_bUseProgressBar = true;
-      }
-
       while( m_ZStream.total_out < mZipItem.usize+iFilePosition)
       {
         unsigned int iToRead = (mZipItem.usize+iFilePosition-m_ZStream.total_out > 131072)?131072:(int)(mZipItem.usize+iFilePosition-m_ZStream.total_out);
         if (Read(temp,iToRead) != iToRead)
           return -1;
-        if (m_bUseProgressBar)
-        {
-          m_dlgProgress->SetPercentage(static_cast<int>(static_cast<float>(m_iFilePos-iStartPos)/static_cast<float>(mZipItem.usize+iFilePosition)*100));
-          m_dlgProgress->Progress();
-        }
       }
-      if( m_bUseProgressBar) 
-      {
-          StopProgressBar();
-          m_bUseProgressBar = false;
-      }
       return m_iFilePos;
       break;
     default:
@@ -296,7 +269,7 @@
 }
 
 int CFileZip::Stat(const CURL& url, struct __stat64* buffer)
-{ 
+{
   CStdString strPath;
   url.GetURL(strPath);
   if (!g_ZipManager.GetZipEntry(strPath,mZipItem))
@@ -310,6 +283,9 @@
 
 unsigned int CFileZip::Read(void* lpBuf, __int64 uiBufSize)
 {
+  if (m_bCached)
+    return mFile.Read(lpBuf,uiBufSize);
+
   // flush what might be left in the string buffer
   if (m_iDataInStringBuffer > 0)
   {
@@ -379,7 +355,7 @@
 
 void CFileZip::Close()
 {
-  if (mZipItem.method == 8)
+  if (mZipItem.method == 8 && !m_bCached)
     inflateEnd(&m_ZStream);
   
   mFile.Close();
@@ -486,24 +462,6 @@
   m_bFlush = false;
 }
 
-void CFileZip::StartProgressBar()
-{
-  if (!m_dlgProgress)
-    m_dlgProgress = (CGUIDialogProgress*)m_gWindowManager.GetWindow(WINDOW_DIALOG_PROGRESS);
-  m_dlgProgress->StartModal();
-  m_dlgProgress->SetPercentage(0);
-  m_dlgProgress->SetHeading(773);
-  m_dlgProgress->SetLine(0,"");
-  m_dlgProgress->SetLine(1,"");
-  m_dlgProgress->SetLine(2,"");
-  m_dlgProgress->ShowProgressBar(true);
-}
-
-void CFileZip::StopProgressBar()
-{
-  m_dlgProgress->Close();
-}
-
 int CFileZip::UnpackFromMemory(std::string& strDest, const std::string& strInput)
 {
   unsigned int iPos=0;

Modified: branches/linuxport/XBMC/xbmc/FileSystem/FileZip.h
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/FileZip.h	2008-08-12 16:26:04 UTC (rev 14860)
+++ branches/linuxport/XBMC/xbmc/FileSystem/FileZip.h	2008-08-12 17:52:40 UTC (rev 14861)
@@ -26,7 +26,6 @@
 #include "lib/zlib/zlib.h"
 #include "utils/log.h"
 #include "GUIWindowManager.h"
-#include "GUIDialogProgress.h"
 #include "FileSystem/File.h"
 #include "FileSystem/ZipManager.h"
 
@@ -54,8 +53,6 @@
     bool InitDecompress();
     bool FillBuffer();
     void DestroyBuffer(void* lpBuffer, int iBufSize);
-    void StartProgressBar();
-    void StopProgressBar();
     CFile mFile;
     SZipEntry mZipItem;
     __int64 m_iFilePos; // position in _uncompressed_ data read
@@ -68,8 +65,7 @@
     int m_iDataInStringBuffer;
     int m_iRead;
     bool m_bFlush;
-    bool m_bUseProgressBar;
-    CGUIDialogProgress* m_dlgProgress; // used if seeking is required..
+    bool m_bCached;
   };
 }
 

Modified: branches/linuxport/XBMC/xbmc/URL.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/URL.cpp	2008-08-12 16:26:04 UTC (rev 14860)
+++ branches/linuxport/XBMC/xbmc/URL.cpp	2008-08-12 17:52:40 UTC (rev 14861)
@@ -161,7 +161,8 @@
     || m_strProtocol.Equals("daap")
     || m_strProtocol.Equals("plugin")
     || m_strProtocol.Equals("hdhomerun")
-    || m_strProtocol.Equals("rtsp"))
+    || m_strProtocol.Equals("rtsp")
+    || m_strProtocol.Equals("zip"))
   {
     int iOptions = strURL.find_first_of("?;#", iPos);
     if (iOptions >= 0 )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14862
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14862&view=rev
Author:   spiff_
Date:     2008-08-12 17:55:49 +0000 (Tue, 12 Aug 2008)

Log Message:
-----------
forgotten files from 14589

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIDialogSettings.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogSettings.h

Modified: branches/linuxport/XBMC/xbmc/GUIDialogSettings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogSettings.cpp	2008-08-12 17:52:40 UTC (rev 14861)
+++ branches/linuxport/XBMC/xbmc/GUIDialogSettings.cpp	2008-08-12 17:55:49 UTC (rev 14862)
@@ -185,10 +185,12 @@
     CGUIRadioButtonControl *pControl = (CGUIRadioButtonControl *)GetControl(controlID);
     if (pControl && setting.data) pControl->SetSelected(*(unsigned char*)setting.data ? true : false);
   }
-  else if (setting.type == SettingInfo::SLIDER)
+  else if (setting.type == SettingInfo::SLIDER || setting.type == SettingInfo::SLIDER_ABS)
   {
     CGUISettingsSliderControl *pControl = (CGUISettingsSliderControl *)GetControl(controlID);
-    if (pControl && setting.data) pControl->SetFloatValue(*(float *)setting.data);
+    pControl->SetFormatString(setting.format);
+    float value = *(float *)setting.data;
+    if (pControl && setting.data) pControl->SetFloatValue(value);
   }
   else if (setting.type == SettingInfo::SLIDER_INT)
   {
@@ -251,7 +253,7 @@
     CGUIRadioButtonControl *pControl = (CGUIRadioButtonControl *)GetControl(iID);
     if (setting.data) *(unsigned char*)setting.data = pControl->IsSelected() ? 1 : 0;
   }
-  else if (setting.type == SettingInfo::SLIDER)
+  else if (setting.type == SettingInfo::SLIDER || setting.type == SettingInfo::SLIDER_ABS)
   {
     CGUISettingsSliderControl *pControl = (CGUISettingsSliderControl *)GetControl(iID);
     if (setting.data) *(float *)setting.data = pControl->GetFloatValue();
@@ -315,17 +317,17 @@
       ((CGUISpinControlEx *)pControl)->AddLabel(setting.entry[i], i);
     if (setting.data) ((CGUISpinControlEx *)pControl)->SetValue(*(int *)setting.data);
   }
-  else if (setting.type == SettingInfo::SLIDER || setting.type == SettingInfo::SLIDER_INT)
+  else if (setting.type == SettingInfo::SLIDER || setting.type == SettingInfo::SLIDER_INT|| setting.type == SettingInfo::SLIDER_ABS)
   {
     if (!m_pOriginalSlider) return;
     pControl = new CGUISettingsSliderControl(*m_pOriginalSlider);
     if (!pControl) return ;
     pControl->SetWidth(width);
     ((CGUISettingsSliderControl *)pControl)->SetText(setting.name);
-    if (setting.type == SettingInfo::SLIDER)
+    if (setting.type == SettingInfo::SLIDER || setting.type == SettingInfo::SLIDER_ABS)
     {
       ((CGUISettingsSliderControl *)pControl)->SetFormatString(setting.format);
-      ((CGUISettingsSliderControl *)pControl)->SetType(SPIN_CONTROL_TYPE_FLOAT);
+      ((CGUISettingsSliderControl *)pControl)->SetType(setting.type==SettingInfo::SLIDER?SPIN_CONTROL_TYPE_FLOAT:SPIN_CONTROL_TYPE_FLOAT_ABS);
       ((CGUISettingsSliderControl *)pControl)->SetFloatRange(setting.min, setting.max);
       ((CGUISettingsSliderControl *)pControl)->SetFloatInterval(setting.interval);
       if (setting.data) ((CGUISettingsSliderControl *)pControl)->SetFloatValue(*(float *)setting.data);
@@ -405,12 +407,15 @@
   m_settings.push_back(setting);
 }
 
-void CGUIDialogSettings::AddSlider(unsigned int id, int label, float *current, float min, float interval, float max, const char *format /*= NULL*/)
+void CGUIDialogSettings::AddSlider(unsigned int id, int label, float *current, float min, float interval, float max, const char *format /*= NULL*/, bool absvalue /* = false */)
 {
   SettingInfo setting;
   setting.id = id;
   setting.name = g_localizeStrings.Get(label);
-  setting.type = SettingInfo::SLIDER;
+  if (absvalue)
+    setting.type = SettingInfo::SLIDER_ABS;
+  else
+    setting.type = SettingInfo::SLIDER;
   setting.min = min;
   setting.interval = interval;
   setting.max = max;

Modified: branches/linuxport/XBMC/xbmc/GUIDialogSettings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogSettings.h	2008-08-12 17:52:40 UTC (rev 14861)
+++ branches/linuxport/XBMC/xbmc/GUIDialogSettings.h	2008-08-12 17:55:49 UTC (rev 14862)
@@ -30,7 +30,7 @@
 class SettingInfo
 {
 public:
-  enum SETTING_TYPE { NONE=0, BUTTON, CHECK, CHECK_UCHAR, SPIN, SLIDER, SLIDER_INT, SEPARATOR };
+  enum SETTING_TYPE { NONE=0, BUTTON, CHECK, CHECK_UCHAR, SPIN, SLIDER, SLIDER_INT, SLIDER_ABS, SEPARATOR };
   SettingInfo()
   {
     id = 0;
@@ -76,7 +76,7 @@
   void AddBool(unsigned int id, int label, bool *on, bool enabled = true);
   void AddSpin(unsigned int id, int label, int *current, unsigned int max, const int *entries);
   void AddSpin(unsigned int id, int label, int *current, unsigned int min, unsigned int max, const char* minLabel = NULL);
-  void AddSlider(unsigned int id, int label, float *current, float min, float interval, float max, const char *format = NULL);
+  void AddSlider(unsigned int id, int label, float *current, float min, float interval, float max, const char *format = NULL, bool absvalue=false);
   void AddSlider(unsigned int id, int label, int *current, int min, int max);
   void AddSeparator(unsigned int id);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14876
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14876&view=rev
Author:   nuka1195
Date:     2008-08-13 03:01:38 +0000 (Wed, 13 Aug 2008)

Log Message:
-----------
removed: script settings from context menu

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIDialogContextMenu.h
    branches/linuxport/XBMC/xbmc/GUIWindowScripts.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIDialogContextMenu.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogContextMenu.h	2008-08-13 00:46:52 UTC (rev 14875)
+++ branches/linuxport/XBMC/xbmc/GUIDialogContextMenu.h	2008-08-13 03:01:38 UTC (rev 14876)
@@ -109,8 +109,7 @@
                       CONTEXT_BUTTON_USER7,
                       CONTEXT_BUTTON_USER8,
                       CONTEXT_BUTTON_USER9,
-                      CONTEXT_BUTTON_USER10,
-                      CONTEXT_BUTTON_SCRIPT_SETTINGS
+                      CONTEXT_BUTTON_USER10
                     };
 
 class CContextButtons : public std::vector< std::pair<CONTEXT_BUTTON, CStdString> >

Modified: branches/linuxport/XBMC/xbmc/GUIWindowScripts.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowScripts.cpp	2008-08-13 00:46:52 UTC (rev 14875)
+++ branches/linuxport/XBMC/xbmc/GUIWindowScripts.cpp	2008-08-13 03:01:38 UTC (rev 14876)
@@ -213,7 +213,6 @@
 {
   CGUIMediaWindow::GetContextButtons(itemNumber, buttons);
   buttons.Add(CONTEXT_BUTTON_INFO, 654);
-  buttons.Add(CONTEXT_BUTTON_SCRIPT_SETTINGS, 1045);
 }
 
 bool CGUIWindowScripts::OnContextButton(int itemNumber, CONTEXT_BUTTON button)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14882
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14882&view=rev
Author:   jmarshallnz
Date:     2008-08-13 06:08:04 +0000 (Wed, 13 Aug 2008)

Log Message:
-----------
fixed: Ticket #4497 - Crash creating a new profile.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIDialogProfileSettings.cpp
    branches/linuxport/XBMC/xbmc/Settings.cpp
    branches/linuxport/XBMC/xbmc/Settings.h

Modified: branches/linuxport/XBMC/xbmc/GUIDialogProfileSettings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogProfileSettings.cpp	2008-08-13 04:58:29 UTC (rev 14881)
+++ branches/linuxport/XBMC/xbmc/GUIDialogProfileSettings.cpp	2008-08-13 06:08:04 UTC (rev 14882)
@@ -338,11 +338,11 @@
           CFile::Cache(g_settings.GetUserDataFolder()+"\\guisettings.xml",g_settings.GetUserDataFolder()+"\\"+dialog->m_strDirectory+"\\guisettings.xml");
         else
         {
-          CGUISettings settings = g_guiSettings;
-          CGUISettings settings2;
-          g_guiSettings = settings2;
-          g_settings.SaveSettings(g_settings.GetUserDataFolder()+"\\"+dialog->m_strDirectory+"\\guisettings.xml");
-          g_guiSettings = settings;
+          // create some new settings
+          CGUISettings localSettings;
+          CStdString path = CUtil::AddFileToFolder(g_settings.GetUserDataFolder(), dialog->m_strDirectory);
+          path = CUtil::AddFileToFolder(path, "guisettings.xml");
+          g_settings.SaveSettings(path, &localSettings);
         }
       }
 

Modified: branches/linuxport/XBMC/xbmc/Settings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.cpp	2008-08-13 04:58:29 UTC (rev 14881)
+++ branches/linuxport/XBMC/xbmc/Settings.cpp	2008-08-13 06:08:04 UTC (rev 14882)
@@ -1514,7 +1514,7 @@
   g_guiSettings.LoadXML(pRootElement, true);  // true to hide the settings we read in
 }
 
-bool CSettings::SaveSettings(const CStdString& strSettingsFile) const
+bool CSettings::SaveSettings(const CStdString& strSettingsFile, CGUISettings *localSettings /* = NULL */) const
 {
   TiXmlDocument xmlDoc;
   TiXmlElement xmlRootElement("settings");
@@ -1637,7 +1637,10 @@
 
   SaveCalibration(pRoot);
 
-  g_guiSettings.SaveXML(pRoot);
+  if (localSettings) // local settings to save
+    localSettings->SaveXML(pRoot);
+  else // save the global settings
+    g_guiSettings.SaveXML(pRoot);
 
   SaveSkinSettings(pRoot);
 

Modified: branches/linuxport/XBMC/xbmc/Settings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.h	2008-08-13 04:58:29 UTC (rev 14881)
+++ branches/linuxport/XBMC/xbmc/Settings.h	2008-08-13 06:08:04 UTC (rev 14882)
@@ -366,7 +366,7 @@
   bool LoadProfiles(const CStdString& strSettingsFile);
   bool SaveProfiles(const CStdString& strSettingsFile) const;
 
-  bool SaveSettings(const CStdString& strSettingsFile) const;
+  bool SaveSettings(const CStdString& strSettingsFile, CGUISettings *localSettings = NULL) const;
 
   bool SaveSources();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14890
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14890&view=rev
Author:   jmarshallnz
Date:     2008-08-13 08:57:16 +0000 (Wed, 13 Aug 2008)

Log Message:
-----------
fixed: Fanart didn't work for newly created profiles (due to fanart folder not being created)

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/Settings.cpp
    branches/linuxport/XBMC/xbmc/Settings.h

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-13 08:23:21 UTC (rev 14889)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-13 08:57:16 UTC (rev 14890)
@@ -1208,34 +1208,9 @@
 
   CreateDirectory(g_settings.GetUserDataFolder().c_str(), NULL);
   CreateDirectory(g_settings.GetProfileUserDataFolder().c_str(), NULL);
-  CreateDirectory(g_settings.GetDatabaseFolder().c_str(), NULL);
-  CreateDirectory(g_settings.GetCDDBFolder().c_str(), NULL);
+  g_settings.CreateProfileFolders();
 
-  // Thumbnails/
-  CreateDirectory(g_settings.GetThumbnailsFolder().c_str(), NULL);
-  CreateDirectory(g_settings.GetMusicThumbFolder().c_str(), NULL);
-  CreateDirectory(g_settings.GetMusicArtistThumbFolder().c_str(), NULL);
-  CreateDirectory(g_settings.GetLastFMThumbFolder().c_str(), NULL);
-  CreateDirectory(g_settings.GetVideoThumbFolder().c_str(), NULL);
-  CreateDirectory(g_settings.GetBookmarksThumbFolder().c_str(), NULL);
-  CreateDirectory(g_settings.GetProgramsThumbFolder().c_str(), NULL);
-  CreateDirectory(g_settings.GetGameSaveThumbFolder().c_str(), NULL);
-  CreateDirectory(g_settings.GetPicturesThumbFolder().c_str(), NULL);
   CreateDirectory(g_settings.GetProfilesThumbFolder().c_str(),NULL);
-  CreateDirectory(g_settings.GetVideoFanartFolder().c_str(),NULL);
-  CLog::Log(LOGINFO, "  thumbnails folder:%s", g_settings.GetThumbnailsFolder().c_str());
-  for (unsigned int hex=0; hex < 16; hex++)
-  {
-    CStdString strHex;
-    strHex.Format("%x",hex);
-    CStdString strThumbLoc;
-    CUtil::AddFileToFolder(g_settings.GetPicturesThumbFolder(), strHex, strThumbLoc);
-    CreateDirectory(strThumbLoc.c_str(),NULL);
-    CUtil::AddFileToFolder(g_settings.GetMusicThumbFolder(), strHex, strThumbLoc);
-    CreateDirectory(strThumbLoc.c_str(),NULL);
-    CUtil::AddFileToFolder(g_settings.GetVideoThumbFolder(), strHex, strThumbLoc);
-    CreateDirectory(strThumbLoc.c_str(),NULL);
-  }
 
   CreateDirectory(_P("Z:\\temp"), NULL); // temp directory for python and dllGetTempPathA
   CreateDirectory(_P("Q:\\scripts"), NULL);

Modified: branches/linuxport/XBMC/xbmc/Settings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.cpp	2008-08-13 08:23:21 UTC (rev 14889)
+++ branches/linuxport/XBMC/xbmc/Settings.cpp	2008-08-13 08:57:16 UTC (rev 14890)
@@ -1663,32 +1663,8 @@
   //int iOldRes = g_guiSettings.GetInt("videoscreen.resolution");
   if (Load(bSourcesXML,bSourcesXML))
   {
-    CreateDirectory(g_settings.GetDatabaseFolder(), NULL);
-    CreateDirectory(g_settings.GetCDDBFolder().c_str(), NULL);
-
-    // Thumbnails/
-    CreateDirectory(g_settings.GetThumbnailsFolder().c_str(), NULL);
-    CreateDirectory(g_settings.GetMusicThumbFolder().c_str(), NULL);
-    CreateDirectory(g_settings.GetMusicArtistThumbFolder().c_str(), NULL);
-    CreateDirectory(g_settings.GetLastFMThumbFolder().c_str(), NULL);
-    CreateDirectory(g_settings.GetVideoThumbFolder().c_str(), NULL);
-    CreateDirectory(g_settings.GetBookmarksThumbFolder().c_str(), NULL);
-    CreateDirectory(g_settings.GetProgramsThumbFolder().c_str(), NULL);
-    CreateDirectory(g_settings.GetPicturesThumbFolder().c_str(), NULL);
+    g_settings.CreateProfileFolders();
     CreateDirectory(_P("P:\\visualisations"),NULL);
-    CLog::Log(LOGINFO, "  thumbnails folder:%s", g_settings.GetThumbnailsFolder().c_str());
-    for (unsigned int hex=0; hex < 16; hex++)
-    {
-      CStdString strHex;
-      strHex.Format("%x",hex);
-      CStdString strThumbLoc;
-      CUtil::AddFileToFolder(g_settings.GetPicturesThumbFolder(), strHex, strThumbLoc);
-      CreateDirectory(strThumbLoc.c_str(),NULL);
-      CUtil::AddFileToFolder(g_settings.GetMusicThumbFolder(), strHex, strThumbLoc);
-      CreateDirectory(strThumbLoc.c_str(),NULL);
-      CUtil::AddFileToFolder(g_settings.GetVideoThumbFolder(), strHex, strThumbLoc);
-      CreateDirectory(strThumbLoc.c_str(),NULL);
-    }
 
     // initialize our charset converter
     g_charsetConverter.reset();
@@ -2709,3 +2685,31 @@
   return _P(settings);
 }
 
+void CSettings::CreateProfileFolders()
+{
+  CreateDirectory(GetDatabaseFolder(), NULL);
+  CreateDirectory(GetCDDBFolder().c_str(), NULL);
+
+  // Thumbnails/
+  CreateDirectory(GetThumbnailsFolder().c_str(), NULL);
+  CreateDirectory(GetMusicThumbFolder().c_str(), NULL);
+  CreateDirectory(GetMusicArtistThumbFolder().c_str(), NULL);
+  CreateDirectory(GetLastFMThumbFolder().c_str(), NULL);
+  CreateDirectory(GetVideoThumbFolder().c_str(), NULL);
+  CreateDirectory(GetBookmarksThumbFolder().c_str(), NULL);
+  CreateDirectory(GetProgramsThumbFolder().c_str(), NULL);
+  CreateDirectory(GetPicturesThumbFolder().c_str(), NULL);
+  CLog::Log(LOGINFO, "  thumbnails folder:%s", GetThumbnailsFolder().c_str());
+  for (unsigned int hex=0; hex < 16; hex++)
+  {
+    CStdString strHex;
+    strHex.Format("%x",hex);
+    CStdString strThumbLoc;
+    CUtil::AddFileToFolder(GetPicturesThumbFolder(), strHex, strThumbLoc);
+    CreateDirectory(strThumbLoc.c_str(),NULL);
+    CUtil::AddFileToFolder(GetMusicThumbFolder(), strHex, strThumbLoc);
+    CreateDirectory(strThumbLoc.c_str(),NULL);
+    CUtil::AddFileToFolder(GetVideoThumbFolder(), strHex, strThumbLoc);
+    CreateDirectory(strThumbLoc.c_str(),NULL);
+  }
+}

Modified: branches/linuxport/XBMC/xbmc/Settings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.h	2008-08-13 08:23:21 UTC (rev 14889)
+++ branches/linuxport/XBMC/xbmc/Settings.h	2008-08-13 08:57:16 UTC (rev 14890)
@@ -102,6 +102,7 @@
   bool LoadProfile(int index);
   bool SaveSettingsToProfile(int index);
   bool DeleteProfile(int index);
+  void CreateProfileFolders();
 
   VECSOURCES *GetSourcesFromType(const CStdString &type);
   CStdString GetDefaultSourceFromType(const CStdString &type);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14927
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14927&view=rev
Author:   jmarshallnz
Date:     2008-08-15 01:21:09 +0000 (Fri, 15 Aug 2008)

Log Message:
-----------
fixed: CUtil::Tokenize() was assuming that the string passed in for tokenization was a path that needed to be corrected. (fixes Ticket #4525)

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Settings.cpp
    branches/linuxport/XBMC/xbmc/Util.cpp

Modified: branches/linuxport/XBMC/xbmc/Settings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.cpp	2008-08-14 23:56:03 UTC (rev 14926)
+++ branches/linuxport/XBMC/xbmc/Settings.cpp	2008-08-15 01:21:09 UTC (rev 14927)
@@ -409,7 +409,7 @@
   strText = szText;
   // unroll any relative paths used
   std::vector<CStdString> token;
-  CUtil::Tokenize(strText,token,"\\");
+  CUtil::Tokenize(_P(strText),token,"\\");
   if (token.size() > 1)
   {
     strText = "";

Modified: branches/linuxport/XBMC/xbmc/Util.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Util.cpp	2008-08-14 23:56:03 UTC (rev 14926)
+++ branches/linuxport/XBMC/xbmc/Util.cpp	2008-08-15 01:21:09 UTC (rev 14927)
@@ -1898,20 +1898,19 @@
 void CUtil::Tokenize(const CStdString& path, vector<CStdString>& tokens, const string& delimiters)
 {
   // Tokenize ripped from http://www.linuxselfhelp.com/HOWTO/C++Programming-HOWTO-7.html
-  string str = _P(path);
   // Skip delimiters at beginning.
-  string::size_type lastPos = str.find_first_not_of(delimiters, 0);
+  string::size_type lastPos = path.find_first_not_of(delimiters, 0);
   // Find first "non-delimiter".
-  string::size_type pos = str.find_first_of(delimiters, lastPos);
+  string::size_type pos = path.find_first_of(delimiters, lastPos);
 
   while (string::npos != pos || string::npos != lastPos)
   {
     // Found a token, add it to the vector.
-    tokens.push_back(str.substr(lastPos, pos - lastPos));
+    tokens.push_back(path.substr(lastPos, pos - lastPos));
     // Skip delimiters.  Note the "not_of"
-    lastPos = str.find_first_not_of(delimiters, pos);
+    lastPos = path.find_first_not_of(delimiters, pos);
     // Find next "non-delimiter"
-    pos = str.find_first_of(delimiters, lastPos);
+    pos = path.find_first_of(delimiters, lastPos);
   }
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14945
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14945&view=rev
Author:   spiff_
Date:     2008-08-16 00:12:41 +0000 (Sat, 16 Aug 2008)

Log Message:
-----------
fixed: save profiles.xml using internal paths instead of absolute paths.
fixed: show the correct directory separator for linux, osx in profile dialog
fixed: cosmetics

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIDialogProfileSettings.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowLoginScreen.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsProfile.cpp
    branches/linuxport/XBMC/xbmc/Settings.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIDialogProfileSettings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogProfileSettings.cpp	2008-08-15 23:57:11 UTC (rev 14944)
+++ branches/linuxport/XBMC/xbmc/GUIDialogProfileSettings.cpp	2008-08-16 00:12:41 UTC (rev 14945)
@@ -151,7 +151,7 @@
     }
     if (!m_strName.IsEmpty())
     {
-      m_strDirectory.Format("profiles\\%s",CUtil::MakeLegalFileName(m_strName).c_str());
+      m_strDirectory = CUtil::AddFileToFolder("profiles",CUtil::MakeLegalFileName(m_strName));
       CStdString strPath;
       CUtil::AddFileToFolder(g_settings.m_vecProfiles[0].getDirectory(),m_strDirectory,strPath);
       CDirectory::Create(_P(strPath));
@@ -208,18 +208,18 @@
     VECSOURCES shares;
     CMediaSource share;
     share.strName = "Profiles";
-    share.strPath = g_settings.m_vecProfiles[0].getDirectory()+"\\profiles";
+    share.strPath = CUtil::AddFileToFolder(g_settings.m_vecProfiles[0].getDirectory(),"profiles");
     shares.push_back(share);
     CStdString strDirectory;
     if (m_strDirectory == "")
       strDirectory = share.strPath;
     else
-      strDirectory.Format("%s\\%s",g_settings.m_vecProfiles[0].getDirectory().c_str(),m_strDirectory.c_str());
+      strDirectory = CUtil::AddFileToFolder(g_settings.m_vecProfiles[0].getDirectory(),m_strDirectory);
     if (CGUIDialogFileBrowser::ShowAndGetDirectory(shares,g_localizeStrings.Get(657),strDirectory,true))
     {
       m_strDirectory = strDirectory;
       if (!m_bIsDefault)
-        m_strDirectory.erase(0,g_settings.m_vecProfiles[0].getDirectory().size()+1);
+        m_strDirectory.erase(0,g_settings.m_vecProfiles[0].getDirectory().size());
       m_bNeedSave = true;
       SET_CONTROL_LABEL(1001,m_strDirectory);
     }
@@ -325,7 +325,8 @@
       // check for old profile settings
       CProfile profile;
       g_settings.m_vecProfiles.push_back(profile);
-      bool bExists = CFile::Exists(g_settings.GetUserDataFolder()+"\\"+dialog->m_strDirectory+"\\guisettings.xml");
+      bool bExists = CFile::Exists(CUtil::AddFileToFolder(g_settings.GetUserDataFolder(),
+                                                          dialog->m_strDirectory+"\\guisettings.xml"));
 
       if (bExists)
         if (!CGUIDialogYesNo::ShowAndGetInput(20058,20104,20105,20022))
@@ -335,7 +336,11 @@
       {
         // save new profile guisettings
         if (CGUIDialogYesNo::ShowAndGetInput(20058,20048,20102,20022,20044,20064))
-          CFile::Cache(g_settings.GetUserDataFolder()+"\\guisettings.xml",g_settings.GetUserDataFolder()+"\\"+dialog->m_strDirectory+"\\guisettings.xml");
+        {
+          CFile::Cache(CUtil::AddFileToFolder(g_settings.GetUserDataFolder(),"guisettings.xml"),
+                       CUtil::AddFileToFolder(g_settings.GetUserDataFolder(),
+                                              dialog->m_strDirectory+"\\guisettings.xml"));
+        }
         else
         {
           // create some new settings
@@ -346,7 +351,8 @@
         }
       }
 
-      bExists = CFile::Exists(g_settings.GetUserDataFolder()+"\\"+dialog->m_strDirectory+"\\sources.xml");
+      bExists = CFile::Exists(CUtil::AddFileToFolder(g_settings.GetUserDataFolder(),
+                                                     dialog->m_strDirectory+"\\sources.xml"));
       if (bExists)
         if (!CGUIDialogYesNo::ShowAndGetInput(20058,20106,20105,20022))
           bExists = false;
@@ -355,7 +361,11 @@
       {
         if ((dialog->m_iSourcesMode & 2) == 2)
           if (CGUIDialogYesNo::ShowAndGetInput(20058,20071,20102,20022,20044,20064))
-            CFile::Cache(g_settings.GetUserDataFolder()+"\\sources.xml",g_settings.GetUserDataFolder()+"\\"+dialog->m_strDirectory+"\\sources.xml");
+          {
+            CFile::Cache(CUtil::AddFileToFolder(g_settings.GetUserDataFolder(),"sources.xml"),
+                         CUtil::AddFileToFolder(g_settings.GetUserDataFolder(),
+                         dialog->m_strDirectory+"\\sources.xml"));
+          }
       }
     }
 

Modified: branches/linuxport/XBMC/xbmc/GUIWindowLoginScreen.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowLoginScreen.cpp	2008-08-15 23:57:11 UTC (rev 14944)
+++ branches/linuxport/XBMC/xbmc/GUIWindowLoginScreen.cpp	2008-08-16 00:12:41 UTC (rev 14945)
@@ -39,6 +39,7 @@
 #include "Settings.h"
 #include "FileSystem/File.h"
 #include "FileItem.h"
+#include "Util.h"
 
 using namespace XFILE;
 
@@ -101,7 +102,7 @@
 
           if (bOkay)
           {
-            if (CFile::Exists("q:\\scripts\\autoexec.py") && watch.GetElapsedMilliseconds() < 5000.f)
+            if (CFile::Exists(_P("q:\\scripts\\autoexec.py")) && watch.GetElapsedMilliseconds() < 5000.f)
               while (watch.GetElapsedMilliseconds() < 5000) ;
             if (iItem != 0 || g_settings.m_iLastLoadedProfileIndex != 0)
             {

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsProfile.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsProfile.cpp	2008-08-15 23:57:11 UTC (rev 14944)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsProfile.cpp	2008-08-16 00:12:41 UTC (rev 14945)
@@ -32,6 +32,7 @@
 #include "GUIWindowManager.h"
 #include "FileSystem/Directory.h"
 #include "FileItem.h"
+#include "Util.h"
 
 using namespace DIRECTORY;
 
@@ -180,7 +181,7 @@
           }
           else if (iItem > (int)g_settings.m_vecProfiles.size() - 1)
           {
-            CDirectory::Create(g_settings.GetUserDataFolder()+"\\profiles");
+            CDirectory::Create(CUtil::AddFileToFolder(g_settings.GetUserDataFolder(),"profiles"));
             if (CGUIDialogProfileSettings::ShowForProfile(g_settings.m_vecProfiles.size()))
             {
               LoadList();

Modified: branches/linuxport/XBMC/xbmc/Settings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.cpp	2008-08-15 23:57:11 UTC (rev 14944)
+++ branches/linuxport/XBMC/xbmc/Settings.cpp	2008-08-16 00:12:41 UTC (rev 14945)
@@ -1813,6 +1813,10 @@
 
     CStdString strDirectory;
     XMLUtils::GetString(pProfile,"directory",strDirectory);
+  strDirectory.Replace("U:\\userdata",_P("U:\\userdata"));
+#ifdef _LINUX
+    strDirectory.Replace("\\","/");
+#endif
     profile.setDirectory(strDirectory);
 
     CStdString strThumb;
@@ -1896,7 +1900,10 @@
     TiXmlElement profileNode("profile");
     TiXmlNode *pNode = pRoot->InsertEndChild(profileNode);
     SetString(pNode,"name",g_settings.m_vecProfiles[iProfile].getName());
-    SetString(pNode,"directory",g_settings.m_vecProfiles[iProfile].getDirectory());
+    CStdString strDir(g_settings.m_vecProfiles[iProfile].getDirectory());
+    strDir.Replace(_P("U:\\userdata"),"U:\\userdata");
+    strDir.Replace("/","\\");
+    SetString(pNode,"directory",strDir);
     SetString(pNode,"thumbnail",g_settings.m_vecProfiles[iProfile].getThumb());
     SetString(pNode,"lastdate",g_settings.m_vecProfiles[iProfile].getDate());
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14948
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14948&view=rev
Author:   jmarshallnz
Date:     2008-08-16 06:11:59 +0000 (Sat, 16 Aug 2008)

Log Message:
-----------
fixed: Sort by Year in Album listings wasn't working

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileItem.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.cpp
    branches/linuxport/XBMC/xbmc/GUIViewStateMusic.cpp
    branches/linuxport/XBMC/xbmc/GUIViewStateVideo.cpp
    branches/linuxport/XBMC/xbmc/SortFileItem.cpp
    branches/linuxport/XBMC/xbmc/SortFileItem.h
    branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp

Modified: branches/linuxport/XBMC/xbmc/FileItem.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-08-16 03:05:09 UTC (rev 14947)
+++ branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-08-16 06:11:59 UTC (rev 14948)
@@ -1435,8 +1435,8 @@
   case SORT_METHOD_VIDEO_TITLE:
     FillSortFields(SSortFileItem::ByMovieTitle);
     break;
-  case SORT_METHOD_VIDEO_YEAR:
-    FillSortFields(SSortFileItem::ByMovieYear);
+  case SORT_METHOD_YEAR:
+    FillSortFields(SSortFileItem::ByYear);
     break;
   case SORT_METHOD_PRODUCTIONCODE:
     FillSortFields(SSortFileItem::ByProductionCode);

Modified: branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.cpp	2008-08-16 03:05:09 UTC (rev 14947)
+++ branches/linuxport/XBMC/xbmc/FileSystem/PluginDirectory.cpp	2008-08-16 06:11:59 UTC (rev 14948)
@@ -185,9 +185,9 @@
         dir->m_listItems->AddSortMethod(SORT_METHOD_VIDEO_RATING, 563, LABEL_MASKS("%T", "%R"));
         break;
       }
-    case SORT_METHOD_VIDEO_YEAR:
+    case SORT_METHOD_YEAR:
       {
-        dir->m_listItems->AddSortMethod(SORT_METHOD_VIDEO_YEAR, 562, LABEL_MASKS("%T", "%Y"));
+        dir->m_listItems->AddSortMethod(SORT_METHOD_YEAR, 562, LABEL_MASKS("%T", "%Y"));
         break;
       }
     case SORT_METHOD_SONG_RATING:

Modified: branches/linuxport/XBMC/xbmc/GUIViewStateMusic.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIViewStateMusic.cpp	2008-08-16 03:05:09 UTC (rev 14947)
+++ branches/linuxport/XBMC/xbmc/GUIViewStateMusic.cpp	2008-08-16 06:11:59 UTC (rev 14948)
@@ -206,6 +206,9 @@
       else
         AddSortMethod(SORT_METHOD_ARTIST, 557, LABEL_MASKS("%F", "", strAlbumLeft, strAlbumRight));  // Filename, empty | Userdefined, Userdefined
 
+      // year
+      AddSortMethod(SORT_METHOD_YEAR, 562, LABEL_MASKS("%F", "", strAlbumLeft, strAlbumRight));
+
       SetSortMethod(g_stSettings.m_viewStateMusicNavAlbums.m_sortMethod);
 
       SetViewAsControl(g_stSettings.m_viewStateMusicNavAlbums.m_viewMode);
@@ -448,7 +451,7 @@
           AddSortMethod(SORT_METHOD_LABEL_IGNORE_THE, 556, LABEL_MASKS("%T", "%Y"));  // Filename, Duration | Foldername, empty
         else
           AddSortMethod(SORT_METHOD_LABEL, 551, LABEL_MASKS("%T", "%Y"));  // Filename, Duration | Foldername, empty
-        AddSortMethod(SORT_METHOD_VIDEO_YEAR,562, LABEL_MASKS("%T", "%Y"));
+        AddSortMethod(SORT_METHOD_YEAR,562, LABEL_MASKS("%T", "%Y"));
         if (g_guiSettings.GetBool("filelists.ignorethewhensorting"))
         {
           AddSortMethod(SORT_METHOD_ARTIST_IGNORE_THE,557, LABEL_MASKS("%A - %T", "%Y"));

Modified: branches/linuxport/XBMC/xbmc/GUIViewStateVideo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIViewStateVideo.cpp	2008-08-16 03:05:09 UTC (rev 14947)
+++ branches/linuxport/XBMC/xbmc/GUIViewStateVideo.cpp	2008-08-16 06:11:59 UTC (rev 14948)
@@ -170,7 +170,7 @@
           AddSortMethod(SORT_METHOD_LABEL, 551, LABEL_MASKS("%L", "%M", "%L", "%M"));  // Filename, Duration | Foldername, empty
 
         AddSortMethod(SORT_METHOD_TRACKNUM, 20360, LABEL_MASKS("%L", "%M", "%L", "%M"));  // Filename, Duration | Foldername, empty
-        AddSortMethod(SORT_METHOD_VIDEO_YEAR,562,LABEL_MASKS("%L","%Y","%L","%Y"));
+        AddSortMethod(SORT_METHOD_YEAR,562,LABEL_MASKS("%L","%Y","%L","%Y"));
         SetSortMethod(SORT_METHOD_LABEL);
 
         SetViewAsControl(g_stSettings.m_viewStateVideoNavTvShows.m_viewMode);
@@ -234,7 +234,7 @@
         else
           AddSortMethod(SORT_METHOD_LABEL, 551, LABEL_MASKS("%T", "%R"));  // Filename, Duration | Foldername, empty
         AddSortMethod(SORT_METHOD_VIDEO_RATING, 563, LABEL_MASKS("%T", "%R"));  // Filename, Duration | Foldername, empty
-        AddSortMethod(SORT_METHOD_VIDEO_YEAR,562, LABEL_MASKS("%T", "%Y"));
+        AddSortMethod(SORT_METHOD_YEAR,562, LABEL_MASKS("%T", "%Y"));
         SetSortMethod(g_stSettings.m_viewStateVideoNavTitles.m_sortMethod);
 
         SetViewAsControl(g_stSettings.m_viewStateVideoNavTitles.m_viewMode);
@@ -248,7 +248,7 @@
           AddSortMethod(SORT_METHOD_LABEL_IGNORE_THE, 556, LABEL_MASKS("%T", "%Y"));  // Filename, Duration | Foldername, empty
         else
           AddSortMethod(SORT_METHOD_LABEL, 551, LABEL_MASKS("%T", "%Y"));  // Filename, Duration | Foldername, empty
-        AddSortMethod(SORT_METHOD_VIDEO_YEAR,562, LABEL_MASKS("%T", "%Y"));
+        AddSortMethod(SORT_METHOD_YEAR,562, LABEL_MASKS("%T", "%Y"));
         if (g_guiSettings.GetBool("filelists.ignorethewhensorting"))
         {
           AddSortMethod(SORT_METHOD_ARTIST_IGNORE_THE,557, LABEL_MASKS("%A - %T", "%Y"));
@@ -432,7 +432,7 @@
   else
     AddSortMethod(SORT_METHOD_LABEL, 551, LABEL_MASKS("%T", "%R"));  // Filename, Duration | Foldername, empty
   AddSortMethod(SORT_METHOD_VIDEO_RATING, 563, LABEL_MASKS("%T", "%R"));  // Filename, Duration | Foldername, empty
-  AddSortMethod(SORT_METHOD_VIDEO_YEAR,562, LABEL_MASKS("%T", "%Y"));
+  AddSortMethod(SORT_METHOD_YEAR,562, LABEL_MASKS("%T", "%Y"));
 
   if (items.IsSmartPlayList())
     AddSortMethod(SORT_METHOD_PLAYLIST_ORDER, 559, LABEL_MASKS("%T", "%R"));
@@ -456,7 +456,7 @@
     AddSortMethod(SORT_METHOD_LABEL_IGNORE_THE, 556, LABEL_MASKS("%T", "%Y"));  // Filename, Duration | Foldername, empty
   else
     AddSortMethod(SORT_METHOD_LABEL, 551, LABEL_MASKS("%T", "%Y"));  // Filename, Duration | Foldername, empty
-  AddSortMethod(SORT_METHOD_VIDEO_YEAR,562, LABEL_MASKS("%T", "%Y"));
+  AddSortMethod(SORT_METHOD_YEAR,562, LABEL_MASKS("%T", "%Y"));
   if (g_guiSettings.GetBool("filelists.ignorethewhensorting"))
   {
     AddSortMethod(SORT_METHOD_ARTIST_IGNORE_THE,557, LABEL_MASKS("%A - %T", "%Y"));
@@ -491,7 +491,7 @@
   else
     AddSortMethod(SORT_METHOD_LABEL, 551, LABEL_MASKS("%L", "%M", "%L", "%M"));  // Filename, Duration | Foldername, empty
 
-  AddSortMethod(SORT_METHOD_VIDEO_YEAR,562,LABEL_MASKS("%L","%Y","%L","%Y"));
+  AddSortMethod(SORT_METHOD_YEAR,562,LABEL_MASKS("%L","%Y","%L","%Y"));
 
   if (items.IsSmartPlayList())
     AddSortMethod(SORT_METHOD_PLAYLIST_ORDER, 559, LABEL_MASKS("%L", "%M", "%L", "%M"));

Modified: branches/linuxport/XBMC/xbmc/SortFileItem.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/SortFileItem.cpp	2008-08-16 03:05:09 UTC (rev 14947)
+++ branches/linuxport/XBMC/xbmc/SortFileItem.cpp	2008-08-16 06:11:59 UTC (rev 14948)
@@ -286,19 +286,22 @@
     item->SetSortLabel(item->GetVideoInfoTag()->m_strGenre);
 }
 
-void SSortFileItem::ByMovieTitle(CFileItemPtr &item)
+void SSortFileItem::ByYear(CFileItemPtr &item)
 {
   if (!item) return;
-  item->SetSortLabel(item->GetVideoInfoTag()->m_strTitle);
+
+  CStdString label;
+  if (item->HasMusicInfoTag())
+    label.Format("%i %s", item->GetMusicInfoTag()->GetYear(), item->GetLabel().c_str());
+  else
+    label.Format("%s %s %i %s", item->GetVideoInfoTag()->m_strPremiered.c_str(), item->GetVideoInfoTag()->m_strFirstAired, item->GetVideoInfoTag()->m_iYear, item->GetLabel().c_str());
+  item->SetSortLabel(label);
 }
 
-void SSortFileItem::ByMovieYear(CFileItemPtr &item)
+void SSortFileItem::ByMovieTitle(CFileItemPtr &item)
 {
   if (!item) return;
-
-  CStdString label = item->GetVideoInfoTag()->m_strPremiered + " " + item->GetVideoInfoTag()->m_strFirstAired;
-  label.AppendFormat(" %i %s", item->GetVideoInfoTag()->m_iYear, item->GetLabel().c_str());
-  item->SetSortLabel(label);
+  item->SetSortLabel(item->GetVideoInfoTag()->m_strTitle);
 }
 
 void SSortFileItem::ByMovieRating(CFileItemPtr &item)

Modified: branches/linuxport/XBMC/xbmc/SortFileItem.h
===================================================================
--- branches/linuxport/XBMC/xbmc/SortFileItem.h	2008-08-16 03:05:09 UTC (rev 14947)
+++ branches/linuxport/XBMC/xbmc/SortFileItem.h	2008-08-16 06:11:59 UTC (rev 14948)
@@ -51,8 +51,9 @@
   static void ByProgramCount(CFileItemPtr &item);
 
   static void ByGenre(CFileItemPtr &item);
+  static void ByYear(CFileItemPtr &item);
+
   static void ByMovieTitle(CFileItemPtr &item);
-  static void ByMovieYear(CFileItemPtr &item);
   static void ByMovieRating(CFileItemPtr &item);
   static void ByMovieRuntime(CFileItemPtr &item);
   static void ByMPAARating(CFileItemPtr &item);
@@ -80,7 +81,7 @@
   SORT_METHOD_ALBUM,
   SORT_METHOD_ALBUM_IGNORE_THE,
   SORT_METHOD_GENRE,
-  SORT_METHOD_VIDEO_YEAR,
+  SORT_METHOD_YEAR,
   SORT_METHOD_VIDEO_RATING,
   SORT_METHOD_PROGRAM_COUNT,
   SORT_METHOD_PLAYLIST_ORDER,

Modified: branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp	2008-08-16 03:05:09 UTC (rev 14947)
+++ branches/linuxport/XBMC/xbmc/lib/libPython/xbmcmodule/xbmcplugin.cpp	2008-08-16 06:11:59 UTC (rev 14948)
@@ -442,7 +442,7 @@
     PyModule_AddIntConstant(pXbmcPluginModule, (char*)"SORT_METHOD_ALBUM", SORT_METHOD_ALBUM);
     PyModule_AddIntConstant(pXbmcPluginModule, (char*)"SORT_METHOD_ALBUM_IGNORE_THE", SORT_METHOD_ALBUM_IGNORE_THE);
     PyModule_AddIntConstant(pXbmcPluginModule, (char*)"SORT_METHOD_GENRE", SORT_METHOD_GENRE);
-    PyModule_AddIntConstant(pXbmcPluginModule, (char*)"SORT_METHOD_VIDEO_YEAR", SORT_METHOD_VIDEO_YEAR);
+    PyModule_AddIntConstant(pXbmcPluginModule, (char*)"SORT_METHOD_VIDEO_YEAR", SORT_METHOD_YEAR);
     PyModule_AddIntConstant(pXbmcPluginModule, (char*)"SORT_METHOD_VIDEO_RATING", SORT_METHOD_VIDEO_RATING);
     PyModule_AddIntConstant(pXbmcPluginModule, (char*)"SORT_METHOD_PROGRAM_COUNT", SORT_METHOD_PROGRAM_COUNT);
     PyModule_AddIntConstant(pXbmcPluginModule, (char*)"SORT_METHOD_PLAYLIST_ORDER", SORT_METHOD_PLAYLIST_ORDER);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14965
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14965&view=rev
Author:   jmarshallnz
Date:     2008-08-17 06:38:10 +0000 (Sun, 17 Aug 2008)

Log Message:
-----------
changed: Apply musicfilenamefilters whenever we load music tags for the infomanager.  Should fix Ticket #4453.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileItem.cpp
    branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.cpp

Modified: branches/linuxport/XBMC/xbmc/FileItem.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-08-17 04:45:55 UTC (rev 14964)
+++ branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-08-17 06:38:10 UTC (rev 14965)
@@ -2596,24 +2596,54 @@
     return true;
   // check db
   CMusicDatabase musicDatabase;
-  CSong song;
-  musicDatabase.Open();
-  if (musicDatabase.GetSongByFileName(m_strPath, song))
+  if (musicDatabase.Open())
   {
-    GetMusicInfoTag()->SetSong(song);
-    return true;
+    CSong song;
+    if (musicDatabase.GetSongByFileName(m_strPath, song))
+    {
+      GetMusicInfoTag()->SetSong(song);
+      return true;
+    }
+    musicDatabase.Close();
   }
   // load tag from file
+  CLog::Log(LOGDEBUG, "%s: loading tag information for file: %s", __FUNCTION__, m_strPath.c_str());
+  CMusicInfoTagLoaderFactory factory;
+  auto_ptr<IMusicInfoTagLoader> pLoader (factory.CreateLoader(m_strPath));
+  if (NULL != pLoader.get())
+  {
+    if (pLoader->Load(m_strPath, *GetMusicInfoTag()))
+      return true;
+  }
+  // no tag - try some other things
+  if (IsCDDA())
+  {
+    // we have the tracknumber...
+    int iTrack = GetMusicInfoTag()->GetTrackNumber();
+    if (iTrack >= 1)
+    {
+      CStdString strText = g_localizeStrings.Get(554); // "Track"
+      if (strText.GetAt(strText.size() - 1) != ' ')
+        strText += " ";
+      CStdString strTrack;
+      strTrack.Format(strText + "%i", iTrack);
+      GetMusicInfoTag()->SetTitle(strTrack);
+      GetMusicInfoTag()->SetLoaded(true);
+      return true;
+    }
+  }
   else
   {
-    CLog::Log(LOGDEBUG, "%s: loading tag information for file: %s", __FUNCTION__, m_strPath.c_str());
-    CMusicInfoTagLoaderFactory factory;
-    CMusicInfoTag tag;
-    auto_ptr<IMusicInfoTagLoader> pLoader (factory.CreateLoader(m_strPath));
-    if (NULL != pLoader.get())
+    CStdString fileName = CUtil::GetFileName(m_strPath);
+    CUtil::RemoveExtension(fileName);
+    for (unsigned int i = 0; i < g_advancedSettings.m_musicTagsFromFileFilters.size(); i++)
     {
-      if (pLoader->Load(m_strPath, *GetMusicInfoTag()))
+      CLabelFormatter formatter(g_advancedSettings.m_musicTagsFromFileFilters[i], "");
+      if (formatter.FillMusicTag(fileName, GetMusicInfoTag()))
+      {
+        GetMusicInfoTag()->SetLoaded(true);
         return true;
+      }
     }
   }
   return false;

Modified: branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-08-17 04:45:55 UTC (rev 14964)
+++ branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-08-17 06:38:10 UTC (rev 14965)
@@ -2901,81 +2901,14 @@
   CLog::Log(LOGDEBUG,"CGUIInfoManager::SetCurrentSong(%s)",item.m_strPath.c_str());
   *m_currentFile = item;
 
-  // Get a reference to the item's tag
-  CMusicInfoTag& tag = *m_currentFile->GetMusicInfoTag();
-  // check if we don't have the tag already loaded
-  if (!tag.Loaded())
+  m_currentFile->LoadMusicTag();
+  if (m_currentFile->GetMusicInfoTag()->GetTitle().IsEmpty())
   {
-    // we have a audio file.
-    // Look if we have this file in database...
-    bool bFound = false;
-    CMusicDatabase musicdatabase;
-    if (musicdatabase.Open())
-    {
-      CSong song;
-      bFound = musicdatabase.GetSongByFileName(m_currentFile->m_strPath, song);
-      m_currentFile->GetMusicInfoTag()->SetSong(song);
-      musicdatabase.Close();
-    }
-
-    if (!bFound)
-    {
-      // always get id3 info for the overlay
-      CMusicInfoTagLoaderFactory factory;
-      auto_ptr<IMusicInfoTagLoader> pLoader (factory.CreateLoader(m_currentFile->m_strPath));
-      // Do we have a tag loader for this file type?
-      if (NULL != pLoader.get())
-        pLoader->Load(m_currentFile->m_strPath, tag);
-    }
+    // No title in tag, show filename only
+    m_currentFile->GetMusicInfoTag()->SetTitle(CUtil::GetTitleFromPath(m_currentFile->m_strPath));
   }
+  m_currentFile->GetMusicInfoTag()->SetLoaded(true);
 
-  // If we have tag information, ...
-  if (tag.Loaded())
-  {
-    if (!tag.GetTitle().size())
-    {
-      // No title in tag, show filename only
-        tag.SetTitle( CUtil::GetTitleFromPath(m_currentFile->m_strPath) );
-    }
-  } // if (tag.Loaded())
-  else
-  {
-    // If we have a cdda track without cddb information,...
-    if (m_currentFile->IsCDDA())
-    {
-      // we have the tracknumber...
-      int iTrack = tag.GetTrackNumber();
-      if (iTrack >= 1)
-      {
-        CStdString strText = g_localizeStrings.Get(554); // "Track"
-        if (strText.GetAt(strText.size() - 1) != ' ')
-          strText += " ";
-        CStdString strTrack;
-        strTrack.Format(strText + "%i", iTrack);
-        tag.SetTitle(strTrack);
-        tag.SetLoaded(true);
-      }
-    } // if (!tag.Loaded() && url.GetProtocol()=="cdda" )
-    else
-    {
-      CStdString fileName = CUtil::GetFileName(m_currentFile->m_strPath);
-      CUtil::RemoveExtension(fileName);
-      for (unsigned int i = 0; i < g_advancedSettings.m_musicTagsFromFileFilters.size(); i++)
-      {
-        CLabelFormatter formatter(g_advancedSettings.m_musicTagsFromFileFilters[i], "");
-        if (formatter.FillMusicTag(fileName, &tag))
-        {
-          tag.SetLoaded(true);
-          break;
-        }
-      }
-      if (!tag.Loaded()) // at worse, set our title as the filename
-        tag.SetTitle( CUtil::GetTitleFromPath(m_currentFile->m_strPath) );
-    }
-    // we now have at least the title
-    tag.SetLoaded(true);
-  }
-
   // find a thumb for this file.
   if (m_currentFile->IsInternetStream())
   {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14987
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14987&view=rev
Author:   jmarshallnz
Date:     2008-08-17 22:22:00 +0000 (Sun, 17 Aug 2008)

Log Message:
-----------
added: Playlist timeout in addition to the consecutive failure count. Defaults to 20 seconds.  Note that you can change both of these via advancedsettings.xml (0 to disable).

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp
    branches/linuxport/XBMC/xbmc/PlayListPlayer.h
    branches/linuxport/XBMC/xbmc/Settings.cpp
    branches/linuxport/XBMC/xbmc/Settings.h

Modified: branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp	2008-08-17 21:56:02 UTC (rev 14986)
+++ branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp	2008-08-17 22:22:00 UTC (rev 14987)
@@ -45,6 +45,7 @@
   for (int i = 0; i < 2; i++)
     m_repeatState[i] = REPEAT_NONE;
   m_iFailedSongs = 0;
+  m_failedSongsStart = 0;
 }
 
 CPlayListPlayer::~CPlayListPlayer(void)
@@ -174,7 +175,7 @@
     }
   }
   Play(iSong, bAutoPlay);
-  if (playlist[iSong]->IsAudio() && m_gWindowManager.GetActiveWindow() == WINDOW_FULLSCREEN_VIDEO)
+  if (iSong < playlist.size() && playlist[iSong]->IsAudio() && m_gWindowManager.GetActiveWindow() == WINDOW_FULLSCREEN_VIDEO)
     m_gWindowManager.ActivateWindow(WINDOW_VISUALISATION);
   //g_partyModeManager.OnSongChange();
 }
@@ -237,14 +238,18 @@
 
   m_bPlaybackStarted = false;
 
+  DWORD playAttempt = timeGetTime();
   if (!g_application.PlayFile(*item, bAutoPlay))
   {
     CLog::Log(LOGERROR,"Playlist Player: skipping unplayable item: %i, path [%s]", m_iCurrentSong, item->m_strPath.c_str());
     playlist.SetUnPlayable(m_iCurrentSong);
 
     // abort on 100 failed CONSECTUTIVE songs
+    if (!m_iFailedSongs)
+      m_failedSongsStart = playAttempt;
     m_iFailedSongs++;
-    if (m_iFailedSongs >= g_advancedSettings.m_playlistRetries && g_advancedSettings.m_playlistRetries >= 0)
+    if ((m_iFailedSongs >= g_advancedSettings.m_playlistRetries && g_advancedSettings.m_playlistRetries >= 0)
+        || (timeGetTime() - m_failedSongsStart  >= (unsigned int)g_advancedSettings.m_playlistTimeout * 1000) && g_advancedSettings.m_playlistTimeout)
     {
       CLog::Log(LOGDEBUG,"Playlist Player: too many consecutive failures... aborting playback");
 
@@ -257,6 +262,7 @@
       GetPlaylist(m_iCurrentPlayList).Clear();
       m_iCurrentPlayList = PLAYLIST_NONE;
       m_iFailedSongs = 0;
+      m_failedSongsStart = 0;
       return;
     }
 
@@ -287,6 +293,7 @@
 
   // consecutive error counter so reset if the current item is playing
   m_iFailedSongs = 0;
+  m_failedSongsStart = 0;
   m_bPlaybackStarted = true;
   m_bPlayedFirstFile = true;
 

Modified: branches/linuxport/XBMC/xbmc/PlayListPlayer.h
===================================================================
--- branches/linuxport/XBMC/xbmc/PlayListPlayer.h	2008-08-17 21:56:02 UTC (rev 14986)
+++ branches/linuxport/XBMC/xbmc/PlayListPlayer.h	2008-08-17 22:22:00 UTC (rev 14987)
@@ -83,6 +83,7 @@
   bool m_bPlayedFirstFile;
   bool m_bPlaybackStarted;
   int m_iFailedSongs;
+  DWORD m_failedSongsStart;
   int m_iCurrentSong;
   int m_iCurrentPlayList;
   CPlayList* m_PlaylistMusic;

Modified: branches/linuxport/XBMC/xbmc/Settings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.cpp	2008-08-17 21:56:02 UTC (rev 14986)
+++ branches/linuxport/XBMC/xbmc/Settings.cpp	2008-08-17 22:22:00 UTC (rev 14987)
@@ -252,6 +252,7 @@
 #endif
 
   g_advancedSettings.m_playlistRetries = 100;
+  g_advancedSettings.m_playlistTimeout = 20; // 20 seconds timeout
   g_advancedSettings.m_GLRectangleHack = false;
 }
 
@@ -1201,6 +1202,7 @@
   GetInteger(pRootElement, "songinfoduration", g_advancedSettings.m_songInfoDuration, 10, 1, 15);
   GetInteger(pRootElement, "busydialogdelay", g_advancedSettings.m_busyDialogDelay, 2000, 0, 5000);
   GetInteger(pRootElement, "playlistretries", g_advancedSettings.m_playlistRetries, 100, -1, 5000);
+  GetInteger(pRootElement, "playlisttimeout", g_advancedSettings.m_playlistTimeout, 20, 0, 5000);
 
   XMLUtils::GetBoolean(pRootElement,"rootovershoot",g_advancedSettings.m_bUseEvilB);
   XMLUtils::GetBoolean(pRootElement,"glrectanglehack", g_advancedSettings.m_GLRectangleHack);

Modified: branches/linuxport/XBMC/xbmc/Settings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.h	2008-08-17 21:56:02 UTC (rev 14986)
+++ branches/linuxport/XBMC/xbmc/Settings.h	2008-08-17 22:22:00 UTC (rev 14987)
@@ -227,6 +227,7 @@
     bool m_fullScreen;
 #endif
     int m_playlistRetries;
+    int m_playlistTimeout;
     bool m_GLRectangleHack;
   };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14988
          http://xbmc.svn.sourceforge.net/xbmc/?rev=14988&view=rev
Author:   elupus
Date:     2008-08-17 22:28:33 +0000 (Sun, 17 Aug 2008)

Log Message:
-----------
changed: stack duration calculation now uses special function based on dvdplayer demuxers to get each file's length instead of starting playing each file.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDFileInfo.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDFileInfo.h

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-17 22:22:00 UTC (rev 14987)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-17 22:28:33 UTC (rev 14988)
@@ -25,6 +25,7 @@
 #include "Util.h"
 #include "TextureManager.h"
 #include "cores/PlayerCoreFactory.h"
+#include "cores/dvdplayer/DVDFileInfo.h"
 #include "PlayListPlayer.h"
 #include "MusicDatabase.h"
 #include "VideoDatabase.h"
@@ -214,7 +215,6 @@
 #include "utils/EventServer.h"
 #endif
 
-#include "cores/dlgcache.h"
 #include "lib/libcdio/logging.h"
 
 using namespace std;
@@ -3790,31 +3790,13 @@
       (*m_currentStack)[i]->m_lEndOffset = times[i];
     else
     {
-      EPLAYERCORES eNewCore = m_eForcedNextPlayer;
-      if (eNewCore == EPC_NONE)
-        eNewCore = CPlayerCoreFactory::GetDefaultPlayer(item);
-
-      m_pPlayer = CPlayerCoreFactory::CreatePlayer(eNewCore, *this);
-      if(!m_pPlayer)
+      int duration;
+      if (!CDVDFileInfo::GetFileDuration((*m_currentStack)[i]->m_strPath, duration))
       {
         m_currentStack->Clear();
         return false;
       }
-
-      CPlayerOptions options;
-      options.identify = true;
-
-      if (!m_pPlayer->OpenFile(*(*m_currentStack)[i], options))
-      {
-        m_currentStack->Clear();
-        return false;
-      }
-
-      totalTime += (long)m_pPlayer->GetTotalTime();
-
-      m_pPlayer->CloseFile();
-      SAFE_DELETE(m_pPlayer);
-
+      totalTime += duration / 1000;
       (*m_currentStack)[i]->m_lEndOffset = totalTime;
       times.push_back(totalTime);
     }
@@ -3822,7 +3804,6 @@
 
   *m_itemCurrentFile = item;
   m_currentStackPosition = 0;
-  m_eCurrentPlayer = EPC_NONE; // must be reset on initial play otherwise last player will be used
 
   double seconds = item.m_lStartOffset / 75.0;
 

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDFileInfo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDFileInfo.cpp	2008-08-17 22:22:00 UTC (rev 14987)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDFileInfo.cpp	2008-08-17 22:28:33 UTC (rev 14988)
@@ -24,6 +24,7 @@
 #include "Settings.h"
 #include "Picture.h"
 
+
 #include "DVDFileInfo.h"
 #include "DVDStreamInfo.h"
 #include "DVDInputStreams/DVDInputStream.h"
@@ -41,6 +42,29 @@
 #include "../ffmpeg/DllSwScale.h"
 
 
+bool CDVDFileInfo::GetFileDuration(const CStdString &path, int& duration)
+{
+  std::auto_ptr<CDVDInputStream> input;
+  std::auto_ptr<CDVDDemux> demux;
+
+  input.reset(CDVDFactoryInputStream::CreateInputStream(NULL, path, ""));
+  if (!input.get())
+    return false;
+
+  if (!input->Open(path, ""))
+    return false;
+
+  demux.reset(CDVDFactoryDemuxer::CreateDemuxer(input.get()));
+  if (!demux.get())
+    return false;
+
+  duration = demux->GetStreamLength();
+  if (duration > 0)
+    return true;
+  else
+    return false;
+}
+
 bool CDVDFileInfo::ExtractThumb(const CStdString &strPath, const CStdString &strTarget)
 {
   int nTime = timeGetTime();

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDFileInfo.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDFileInfo.h	2008-08-17 22:22:00 UTC (rev 14987)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDFileInfo.h	2008-08-17 22:28:33 UTC (rev 14988)
@@ -31,4 +31,5 @@
   // GetFileMetaData will fill pItem's properties according to what can be extracted from the file.
   static void GetFileMetaData(const CStdString &strPath, CFileItem *pItem); 
 
+  static bool GetFileDuration(const CStdString &path, int &duration);
 };
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15029
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15029&view=rev
Author:   monkeyman_67156
Date:     2008-08-19 01:17:58 +0000 (Tue, 19 Aug 2008)

Log Message:
-----------
changed: some warning fixes

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowSlideShow.cpp
    branches/linuxport/XBMC/xbmc/VideoDatabase.cpp
    branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSlideShow.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSlideShow.cpp	2008-08-19 01:16:46 UTC (rev 15028)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSlideShow.cpp	2008-08-19 01:17:58 UTC (rev 15029)
@@ -99,9 +99,9 @@
           int iSize = pic.GetWidth() * pic.GetHeight() - MAX_PICTURE_SIZE;
           if ((iSize + (int)pic.GetWidth() > 0) || (iSize + (int)pic.GetHeight() > 0))
             bFullSize = true;
-          if (!bFullSize && pic.GetWidth() == g_graphicsContext.GetMaxTextureSize())
+          if (!bFullSize && (int)pic.GetWidth() == g_graphicsContext.GetMaxTextureSize())
             bFullSize = true;
-          if (!bFullSize && pic.GetHeight() == g_graphicsContext.GetMaxTextureSize())
+          if (!bFullSize && (int)pic.GetHeight() == g_graphicsContext.GetMaxTextureSize())
             bFullSize = true;
         }
         m_pCallback->OnLoadPic(m_iPic, m_iSlideNumber, pTexture, pic.GetWidth(), pic.GetHeight(), pic.GetOriginalWidth(), pic.GetOriginalHeight(), pic.GetExifInfo()->Orientation, bFullSize);

Modified: branches/linuxport/XBMC/xbmc/VideoDatabase.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoDatabase.cpp	2008-08-19 01:16:46 UTC (rev 15028)
+++ branches/linuxport/XBMC/xbmc/VideoDatabase.cpp	2008-08-19 01:17:58 UTC (rev 15029)
@@ -4210,7 +4210,7 @@
     if (g_guiSettings.GetBool("videolibrary.removeduplicates"))
     {
       CStdString order(where);
-      bool maintainOrder = order.ToLower().Find("order by")  != CStdString::npos;
+      bool maintainOrder = (size_t)order.ToLower().Find("order by") != CStdString::npos;
       Stack(items, VIDEODB_CONTENT_TVSHOWS, maintainOrder);
     }
 
@@ -4463,7 +4463,7 @@
     if (g_guiSettings.GetBool("videolibrary.removeduplicates"))
     {
       CStdString order(where);
-      bool maintainOrder = order.ToLower().Find("order by")  != CStdString::npos;
+      bool maintainOrder = (size_t)order.ToLower().Find("order by") != CStdString::npos;
       Stack(items, VIDEODB_CONTENT_EPISODES, maintainOrder);
     }
 

Modified: branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2008-08-19 01:16:46 UTC (rev 15028)
+++ branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2008-08-19 01:17:58 UTC (rev 15029)
@@ -137,7 +137,6 @@
 extern "C" void __stdcall update_emu_environ()
 {
   // Use a proxy, if the GUI was configured as such
-  bool bProxyEnabled = g_guiSettings.GetBool("network.usehttpproxy");
   if (g_guiSettings.GetBool("network.usehttpproxy") &&
       g_guiSettings.GetString("network.httpproxyserver") &&
       g_guiSettings.GetString("network.httpproxyport"))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15040
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15040&view=rev
Author:   jmarshallnz
Date:     2008-08-19 09:35:56 +0000 (Tue, 19 Aug 2008)

Log Message:
-----------
fixed: Don't set any defaults in LoadAdvancedSettings() - they'll override any changes to the constructor's default values otherwise.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Settings.cpp
    branches/linuxport/XBMC/xbmc/Settings.h

Modified: branches/linuxport/XBMC/xbmc/Settings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.cpp	2008-08-19 08:57:30 UTC (rev 15039)
+++ branches/linuxport/XBMC/xbmc/Settings.cpp	2008-08-19 09:35:56 UTC (rev 15040)
@@ -681,6 +681,12 @@
   return false;
 }
 
+bool CSettings::GetString(const TiXmlElement* pRootElement, const char *tagName, CStdString &strValue)
+{
+  CStdString defaultValue = strValue;
+  return GetString(pRootElement, tagName, strValue, defaultValue);
+}
+
 bool CSettings::GetString(const TiXmlElement* pRootElement, const char *tagName, CStdString &strValue, const CStdString& strDefaultValue)
 {
   if (XMLUtils::GetString(pRootElement, tagName, strValue))
@@ -705,27 +711,41 @@
 
 bool CSettings::GetInteger(const TiXmlElement* pRootElement, const char *tagName, int& iValue, const int iDefault, const int iMin, const int iMax)
 {
+  if (GetInteger(pRootElement, tagName, iValue, iMin, iMax))
+    return true;
+  // default
+  iValue = iDefault;
+  return false;
+}
+
+bool CSettings::GetInteger(const TiXmlElement* pRootElement, const char *tagName, int& iValue, const int iMin, const int iMax)
+{
   if (XMLUtils::GetInt(pRootElement, tagName, iValue))
   { // check range
     if (iValue < iMin) iValue = iMin;
     if (iValue > iMax) iValue = iMax;
     return true;
   }
-  // default
-  iValue = iDefault;
   return false;
 }
 
 bool CSettings::GetFloat(const TiXmlElement* pRootElement, const char *tagName, float& fValue, const float fDefault, const float fMin, const float fMax)
 {
+  if (GetFloat(pRootElement, tagName, fValue, fMin, fMax))
+    return true;
+  // default
+  fValue = fDefault;
+  return false;
+}
+
+bool CSettings::GetFloat(const TiXmlElement* pRootElement, const char *tagName, float& fValue, const float fMin, const float fMax)
+{
   if (XMLUtils::GetFloat(pRootElement, tagName, fValue))
   { // check range
     if (fValue < fMin) fValue = fMin;
     if (fValue > fMax) fValue = fMax;
     return true;
   }
-  // default
-  fValue = fDefault;
   return false;
 }
 
@@ -1071,6 +1091,9 @@
 
 void CSettings::LoadAdvancedSettings()
 {
+  // NOTE: This routine should NOT set the default of any of these parameters
+  //       it should instead use the versions of GetString/Integer/Float that
+  //       don't take defaults in.  Defaults are set in the constructor above
   CStdString advancedSettingsXML;
   advancedSettingsXML  = g_settings.GetUserDataItem("advancedsettings.xml");
   TiXmlDocument advancedXML;
@@ -1093,30 +1116,30 @@
   TiXmlElement *pElement = pRootElement->FirstChildElement("audio");
   if (pElement)
   {
-    GetInteger(pElement, "headroom", g_advancedSettings.m_audioHeadRoom, 0, 0, 12);
-    GetFloat(pElement, "karaokesyncdelay", g_advancedSettings.m_karaokeSyncDelay, 0.0f, -3.0f, 3.0f);
+    GetInteger(pElement, "headroom", g_advancedSettings.m_audioHeadRoom, 0, 12);
+    GetFloat(pElement, "karaokesyncdelay", g_advancedSettings.m_karaokeSyncDelay, -3.0f, 3.0f);
   }
 
   pElement = pRootElement->FirstChildElement("video");
   if (pElement)
   {
-    GetFloat(pElement, "subsdelayrange", g_advancedSettings.m_videoSubsDelayRange, 10, 10, 600);
-    GetFloat(pElement, "audiodelayrange", g_advancedSettings.m_videoAudioDelayRange, 10, 10, 600);
-    GetInteger(pElement, "smallstepbackseconds", g_advancedSettings.m_videoSmallStepBackSeconds, 7, 1, INT_MAX);
-    GetInteger(pElement, "smallstepbacktries", g_advancedSettings.m_videoSmallStepBackTries, 3, 1, 10);
-    GetInteger(pElement, "smallstepbackdelay", g_advancedSettings.m_videoSmallStepBackDelay, 300, 100, 5000); //MS
+    GetFloat(pElement, "subsdelayrange", g_advancedSettings.m_videoSubsDelayRange, 10, 600);
+    GetFloat(pElement, "audiodelayrange", g_advancedSettings.m_videoAudioDelayRange, 10, 600);
+    GetInteger(pElement, "smallstepbackseconds", g_advancedSettings.m_videoSmallStepBackSeconds, 1, INT_MAX);
+    GetInteger(pElement, "smallstepbacktries", g_advancedSettings.m_videoSmallStepBackTries, 1, 10);
+    GetInteger(pElement, "smallstepbackdelay", g_advancedSettings.m_videoSmallStepBackDelay, 100, 5000); //MS
 
     XMLUtils::GetBoolean(pElement, "usetimeseeking", g_advancedSettings.m_videoUseTimeSeeking);
-    GetInteger(pElement, "timeseekforward", g_advancedSettings.m_videoTimeSeekForward, 30, 0, 6000);
-    GetInteger(pElement, "timeseekbackward", g_advancedSettings.m_videoTimeSeekBackward, -30, -6000, 0);
-    GetInteger(pElement, "timeseekforwardbig", g_advancedSettings.m_videoTimeSeekForwardBig, 600, 0, 6000);
-    GetInteger(pElement, "timeseekbackwardbig", g_advancedSettings.m_videoTimeSeekBackwardBig, -600, -6000, 0);
+    GetInteger(pElement, "timeseekforward", g_advancedSettings.m_videoTimeSeekForward, 0, 6000);
+    GetInteger(pElement, "timeseekbackward", g_advancedSettings.m_videoTimeSeekBackward, -6000, 0);
+    GetInteger(pElement, "timeseekforwardbig", g_advancedSettings.m_videoTimeSeekForwardBig, 0, 6000);
+    GetInteger(pElement, "timeseekbackwardbig", g_advancedSettings.m_videoTimeSeekBackwardBig, -6000, 0);
 
-    GetInteger(pElement, "percentseekforward", g_advancedSettings.m_videoPercentSeekForward, 2, 0, 100);
-    GetInteger(pElement, "percentseekbackward", g_advancedSettings.m_videoPercentSeekBackward, -2, -100, 0);
-    GetInteger(pElement, "percentseekforwardbig", g_advancedSettings.m_videoPercentSeekForwardBig, 10, 0, 100);
-    GetInteger(pElement, "percentseekbackwardbig", g_advancedSettings.m_videoPercentSeekBackwardBig, -10, -100, 0);
-    GetInteger(pElement, "blackbarcolour", g_advancedSettings.m_videoBlackBarColour, 1, 0, 255);
+    GetInteger(pElement, "percentseekforward", g_advancedSettings.m_videoPercentSeekForward, 0, 100);
+    GetInteger(pElement, "percentseekbackward", g_advancedSettings.m_videoPercentSeekBackward, -100, 0);
+    GetInteger(pElement, "percentseekforwardbig", g_advancedSettings.m_videoPercentSeekForwardBig, 0, 100);
+    GetInteger(pElement, "percentseekbackwardbig", g_advancedSettings.m_videoPercentSeekBackwardBig, -100, 0);
+    GetInteger(pElement, "blackbarcolour", g_advancedSettings.m_videoBlackBarColour, 0, 255);
     XMLUtils::GetBoolean(pElement, "fullscreenonmoviestart", g_advancedSettings.m_fullScreenOnMovieStart);
   }
 
@@ -1128,9 +1151,9 @@
     XMLUtils::GetBoolean(pElement, "allitemsonbottom", g_advancedSettings.m_bMusicLibraryAllItemsOnBottom);
     XMLUtils::GetBoolean(pElement, "hidecompilationartists", g_advancedSettings.m_bMusicLibraryHideCompilationArtists);
     XMLUtils::GetBoolean(pElement, "albumssortbyartistthenyear", g_advancedSettings.m_bMusicLibraryAlbumsSortByArtistThenYear);
-    GetString(pElement, "albumformat", g_advancedSettings.m_strMusicLibraryAlbumFormat, "");
-    GetString(pElement, "albumformatright", g_advancedSettings.m_strMusicLibraryAlbumFormatRight, "");
-    GetString(pElement, "itemseparator", g_advancedSettings.m_musicItemSeparator, " / ");
+    GetString(pElement, "albumformat", g_advancedSettings.m_strMusicLibraryAlbumFormat);
+    GetString(pElement, "albumformatright", g_advancedSettings.m_strMusicLibraryAlbumFormatRight);
+    GetString(pElement, "itemseparator", g_advancedSettings.m_musicItemSeparator);
   }
 
   pElement = pRootElement->FirstChildElement("videolibrary");
@@ -1141,44 +1164,44 @@
     XMLUtils::GetBoolean(pElement, "hiderecentlyaddeditems", g_advancedSettings.m_bVideoLibraryHideRecentlyAddedItems);
     XMLUtils::GetBoolean(pElement, "hideemptyseries", g_advancedSettings.m_bVideoLibraryHideEmptySeries);
     XMLUtils::GetBoolean(pElement, "cleanonupdate", g_advancedSettings.m_bVideoLibraryCleanOnUpdate);
-    GetString(pElement, "itemseparator", g_advancedSettings.m_videoItemSeparator, " / ");
+    GetString(pElement, "itemseparator", g_advancedSettings.m_videoItemSeparator);
   }
 
   pElement = pRootElement->FirstChildElement("slideshow");
   if (pElement)
   {
-    GetFloat(pElement, "panamount", g_advancedSettings.m_slideshowPanAmount, 2.5f, 0.0f, 20.0f);
-    GetFloat(pElement, "zoomamount", g_advancedSettings.m_slideshowZoomAmount, 5.0f, 0.0f, 20.0f);
-    GetFloat(pElement, "blackbarcompensation", g_advancedSettings.m_slideshowBlackBarCompensation, 20.0f, 0.0f, 50.0f);
+    GetFloat(pElement, "panamount", g_advancedSettings.m_slideshowPanAmount, 0.0f, 20.0f);
+    GetFloat(pElement, "zoomamount", g_advancedSettings.m_slideshowZoomAmount, 0.0f, 20.0f);
+    GetFloat(pElement, "blackbarcompensation", g_advancedSettings.m_slideshowBlackBarCompensation, 0.0f, 50.0f);
   }
 
   pElement = pRootElement->FirstChildElement("lcd");
   if (pElement)
   {
-    GetInteger(pElement, "rows", g_advancedSettings.m_lcdRows, 4, 1, 4);
-    GetInteger(pElement, "columns", g_advancedSettings.m_lcdColumns, 20, 1, 40);
-    GetInteger(pElement, "address1", g_advancedSettings.m_lcdAddress1, 0, 0, 0x100);
-    GetInteger(pElement, "address2", g_advancedSettings.m_lcdAddress2, 0x40, 0, 0x100);
-    GetInteger(pElement, "address3", g_advancedSettings.m_lcdAddress3, 0x14, 0, 0x100);
-    GetInteger(pElement, "address4", g_advancedSettings.m_lcdAddress4, 0x54, 0, 0x100);
+    GetInteger(pElement, "rows", g_advancedSettings.m_lcdRows, 1, 4);
+    GetInteger(pElement, "columns", g_advancedSettings.m_lcdColumns, 1, 40);
+    GetInteger(pElement, "address1", g_advancedSettings.m_lcdAddress1, 0, 0x100);
+    GetInteger(pElement, "address2", g_advancedSettings.m_lcdAddress2, 0, 0x100);
+    GetInteger(pElement, "address3", g_advancedSettings.m_lcdAddress3, 0, 0x100);
+    GetInteger(pElement, "address4", g_advancedSettings.m_lcdAddress4, 0, 0x100);
   }
   pElement = pRootElement->FirstChildElement("network");
   if (pElement)
   {
-    GetInteger(pElement, "autodetectpingtime", g_advancedSettings.m_autoDetectPingTime, 30, 1, 240);
-    GetInteger(pElement, "curlclienttimeout", g_advancedSettings.m_curlclienttimeout, 10, 1, 1000);
+    GetInteger(pElement, "autodetectpingtime", g_advancedSettings.m_autoDetectPingTime, 1, 240);
+    GetInteger(pElement, "curlclienttimeout", g_advancedSettings.m_curlclienttimeout, 1, 1000);
   }
 
-  GetFloat(pRootElement, "playcountminimumpercent", g_advancedSettings.m_playCountMinimumPercent, 90.0f, 1.0f, 100.0f);
+  GetFloat(pRootElement, "playcountminimumpercent", g_advancedSettings.m_playCountMinimumPercent, 1.0f, 100.0f);
 
   pElement = pRootElement->FirstChildElement("samba");
   if (pElement)
   {
-    GetString(pElement,  "doscodepage",   g_advancedSettings.m_sambadoscodepage,   "");
-    GetInteger(pElement, "clienttimeout", g_advancedSettings.m_sambaclienttimeout, 10, 5, 100);
+    GetString(pElement,  "doscodepage",   g_advancedSettings.m_sambadoscodepage);
+    GetInteger(pElement, "clienttimeout", g_advancedSettings.m_sambaclienttimeout, 5, 100);
   }
 
-  if (GetInteger(pRootElement, "loglevel", g_advancedSettings.m_logLevel, g_advancedSettings.m_logLevel, LOG_LEVEL_NONE, LOG_LEVEL_MAX))
+  if (GetInteger(pRootElement, "loglevel", g_advancedSettings.m_logLevel, LOG_LEVEL_NONE, LOG_LEVEL_MAX))
   { // read the loglevel setting, so set the setting advanced to hide it in GUI
     // as altering it will do nothing - we don't write to advancedsettings.xml
     CSettingBool *setting = (CSettingBool *)g_guiSettings.GetSetting("system.debuglogging");
@@ -1188,7 +1211,7 @@
       setting->SetAdvanced();
     }
   }
-  GetString(pRootElement, "cddbaddress", g_advancedSettings.m_cddbAddress, "freedb.freedb.org");
+  GetString(pRootElement, "cddbaddress", g_advancedSettings.m_cddbAddress);
 #ifdef HAS_HAL
   XMLUtils::GetBoolean(pRootElement, "usehalmount", g_advancedSettings.m_useHalMount);
 #endif
@@ -1199,10 +1222,10 @@
   XMLUtils::GetBoolean(pRootElement, "fullscreen", g_advancedSettings.m_fullScreen);
 #endif
 
-  GetInteger(pRootElement, "songinfoduration", g_advancedSettings.m_songInfoDuration, 10, 1, 15);
-  GetInteger(pRootElement, "busydialogdelay", g_advancedSettings.m_busyDialogDelay, 2000, 0, 5000);
-  GetInteger(pRootElement, "playlistretries", g_advancedSettings.m_playlistRetries, 100, -1, 5000);
-  GetInteger(pRootElement, "playlisttimeout", g_advancedSettings.m_playlistTimeout, 20, 0, 5000);
+  GetInteger(pRootElement, "songinfoduration", g_advancedSettings.m_songInfoDuration, 1, 15);
+  GetInteger(pRootElement, "busydialogdelay", g_advancedSettings.m_busyDialogDelay, 0, 5000);
+  GetInteger(pRootElement, "playlistretries", g_advancedSettings.m_playlistRetries, -1, 5000);
+  GetInteger(pRootElement, "playlisttimeout", g_advancedSettings.m_playlistTimeout, 0, 5000);
 
   XMLUtils::GetBoolean(pRootElement,"rootovershoot",g_advancedSettings.m_bUseEvilB);
   XMLUtils::GetBoolean(pRootElement,"glrectanglehack", g_advancedSettings.m_GLRectangleHack);
@@ -1215,10 +1238,10 @@
     XMLUtils::GetBoolean(pElement, "submenuselection", g_advancedSettings.m_bTuxBoxSubMenuSelection);
     XMLUtils::GetBoolean(pElement, "pictureicon", g_advancedSettings.m_bTuxBoxPictureIcon);
     XMLUtils::GetBoolean(pElement, "sendallaudiopids", g_advancedSettings.m_bTuxBoxSendAllAPids);
-    GetInteger(pElement, "epgrequesttime", g_advancedSettings.m_iTuxBoxEpgRequestTime, 10, 0, 3600);
-    GetInteger(pElement, "defaultsubmenu", g_advancedSettings.m_iTuxBoxDefaultSubMenu, 4, 1, 4);
-    GetInteger(pElement, "defaultrootmenu", g_advancedSettings.m_iTuxBoxDefaultRootMenu, 0, 0, 4);
-    GetInteger(pElement, "zapwaittime", g_advancedSettings.m_iTuxBoxZapWaitTime, 0, 0, 120);
+    GetInteger(pElement, "epgrequesttime", g_advancedSettings.m_iTuxBoxEpgRequestTime, 0, 3600);
+    GetInteger(pElement, "defaultsubmenu", g_advancedSettings.m_iTuxBoxDefaultSubMenu, 1, 4);
+    GetInteger(pElement, "defaultrootmenu", g_advancedSettings.m_iTuxBoxDefaultRootMenu, 0, 4);
+    GetInteger(pElement, "zapwaittime", g_advancedSettings.m_iTuxBoxZapWaitTime, 0, 120);
 
   }
 
@@ -1301,7 +1324,7 @@
 
   // TODO: Should cache path be given in terms of our predefined paths??
   //       Are we even going to have predefined paths??
-  GetString(pRootElement, "cachepath", g_advancedSettings.m_cachePath,"Z:\\");
+  GetString(pRootElement, "cachepath", g_advancedSettings.m_cachePath);
   g_advancedSettings.m_cachePath = CUtil::TranslateSpecialSource(g_advancedSettings.m_cachePath);
   CUtil::AddSlashAtEnd(g_advancedSettings.m_cachePath);
 
@@ -1424,9 +1447,9 @@
     }
   }
 
-  GetInteger(pRootElement, "remoterepeat", g_advancedSettings.m_remoteRepeat, 480, 1, INT_MAX);
-  GetFloat(pRootElement, "controllerdeadzone", g_advancedSettings.m_controllerDeadzone, 0.2f, 0.0f, 1.0f);
-  GetInteger(pRootElement, "thumbsize", g_advancedSettings.m_thumbSize, 192, 64, 1024);
+  GetInteger(pRootElement, "remoterepeat", g_advancedSettings.m_remoteRepeat, 1, INT_MAX);
+  GetFloat(pRootElement, "controllerdeadzone", g_advancedSettings.m_controllerDeadzone, 0.0f, 1.0f);
+  GetInteger(pRootElement, "thumbsize", g_advancedSettings.m_thumbSize, g_advancedSettings.m_thumbSize, 64, 1024);
 
   XMLUtils::GetBoolean(pRootElement, "playlistasfolders", g_advancedSettings.m_playlistAsFolders);
   XMLUtils::GetBoolean(pRootElement, "detectasudf", g_advancedSettings.m_detectAsUdf);

Modified: branches/linuxport/XBMC/xbmc/Settings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.h	2008-08-19 08:57:30 UTC (rev 15039)
+++ branches/linuxport/XBMC/xbmc/Settings.h	2008-08-19 09:35:56 UTC (rev 15040)
@@ -373,6 +373,11 @@
   bool SaveSources();
 
 protected:
+  // these 3 don't have a default - used for advancedsettings.xml
+  bool GetInteger(const TiXmlElement* pRootElement, const char *strTagName, int& iValue, const int iMin, const int iMax);
+  bool GetFloat(const TiXmlElement* pRootElement, const char *strTagName, float& fValue, const float fMin, const float fMax);
+  bool GetString(const TiXmlElement* pRootElement, const char *strTagName, CStdString& strValue);
+
   bool GetInteger(const TiXmlElement* pRootElement, const char *strTagName, int& iValue, const int iDefault, const int iMin, const int iMax);
   bool GetFloat(const TiXmlElement* pRootElement, const char *strTagName, float& fValue, const float fDefault, const float fMin, const float fMax);
   bool GetString(const TiXmlElement* pRootElement, const char *strTagName, CStdString& strValue, const CStdString& strDefaultValue);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15055
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15055&view=rev
Author:   vdrfan
Date:     2008-08-20 17:03:48 +0000 (Wed, 20 Aug 2008)

Log Message:
-----------
changed: Ticket #4457 - Copy of LCD.xml in .xbmc/userdata folder

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/utils/LCD.cpp

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-20 16:26:35 UTC (rev 15054)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-20 17:03:48 UTC (rev 15055)
@@ -1008,6 +1008,7 @@
     //CopyUserDataIfNeeded(_P("t:\\"), "Keymap.xml");  // Eventual FIXME.
     CopyUserDataIfNeeded(_P("t:\\"), "RssFeeds.xml");
     CopyUserDataIfNeeded(_P("t:\\"), "Lircmap.xml");
+    CopyUserDataIfNeeded(_P("t:\\"), "LCD.xml");
   }
   else
   {

Modified: branches/linuxport/XBMC/xbmc/utils/LCD.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/LCD.cpp	2008-08-20 16:26:35 UTC (rev 15054)
+++ branches/linuxport/XBMC/xbmc/utils/LCD.cpp	2008-08-20 17:03:48 UTC (rev 15055)
@@ -385,7 +385,7 @@
 void ILCD::Initialize()
 {
   CStdString lcdPath;
-  lcdPath = g_settings.GetUserDataItem("lcd.xml");
+  lcdPath = g_settings.GetUserDataItem("LCD.xml");
   LoadSkin(lcdPath);
   m_eCurrentCharset = CUSTOM_CHARSET_DEFAULT;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15058
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15058&view=rev
Author:   elupus
Date:     2008-08-20 17:28:41 +0000 (Wed, 20 Aug 2008)

Log Message:
-----------
fixed: initial fix to #4508 broke http api.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/ApplicationMessenger.cpp
    branches/linuxport/XBMC/xbmc/ApplicationMessenger.h
    branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp

Modified: branches/linuxport/XBMC/xbmc/ApplicationMessenger.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/ApplicationMessenger.cpp	2008-08-20 17:26:28 UTC (rev 15057)
+++ branches/linuxport/XBMC/xbmc/ApplicationMessenger.cpp	2008-08-20 17:28:41 UTC (rev 15058)
@@ -532,12 +532,12 @@
   return tmp;
 }
 
-void CApplicationMessenger::HttpApi(string cmd)
+void CApplicationMessenger::HttpApi(string cmd, bool wait)
 {
   SetResponse("");
   ThreadMessage tMsg = {TMSG_HTTPAPI};
   tMsg.strParam = cmd;
-  SendMessage(tMsg);
+  SendMessage(tMsg, wait);
 }
 
 void CApplicationMessenger::ExecBuiltIn(const CStdString &command)

Modified: branches/linuxport/XBMC/xbmc/ApplicationMessenger.h
===================================================================
--- branches/linuxport/XBMC/xbmc/ApplicationMessenger.h	2008-08-20 17:26:28 UTC (rev 15057)
+++ branches/linuxport/XBMC/xbmc/ApplicationMessenger.h	2008-08-20 17:28:41 UTC (rev 15058)
@@ -103,7 +103,7 @@
 
   CStdString GetResponse();
   int SetResponse(CStdString response);
-  void HttpApi(std::string cmd);
+  void HttpApi(std::string cmd, bool wait = false);
   void ExecBuiltIn(const CStdString &command);
 
   void NetworkMessage(DWORD dwMessage, DWORD dwParam = 0);

Modified: branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp	2008-08-20 17:26:28 UTC (rev 15057)
+++ branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp	2008-08-20 17:28:41 UTC (rev 15058)
@@ -3156,9 +3156,9 @@
   if (legalCmd)
   {
 	  if (paras!="")
-		g_application.getApplicationMessenger().HttpApi(cmd+"; "+paras);
+		g_application.getApplicationMessenger().HttpApi(cmd+"; "+paras, true);
 	  else
-		g_application.getApplicationMessenger().HttpApi(cmd);
+		g_application.getApplicationMessenger().HttpApi(cmd, true);
 	//wait for response - max 20s
 	Sleep(0);
 	response=g_application.getApplicationMessenger().GetResponse();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15064
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15064&view=rev
Author:   yuvalt
Date:     2008-08-20 20:50:45 +0000 (Wed, 20 Aug 2008)

Log Message:
-----------
add --standalone as a command-line option. default is no network 
interface settings.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/Application.h
    branches/linuxport/XBMC/xbmc/GUISettings.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
    branches/linuxport/XBMC/xbmc/XboxMediaCenter.cpp

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-20 18:48:25 UTC (rev 15063)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-20 20:50:45 UTC (rev 15064)
@@ -326,6 +326,9 @@
 
   m_bPresentFrame = false;
   m_bPlatformDirectories = false;
+
+  m_bStandalone = false;
+  m_bEnableLegacyRes = false;
 }
 
 CApplication::~CApplication(void)
@@ -995,7 +998,7 @@
     CreateDirectory(xbmcDir.c_str(), NULL);
     xbmcDir = _P("u:\\plugins\\pictures");
     CreateDirectory(xbmcDir.c_str(), NULL);
-    
+
     xbmcDir = _P("u:\\scripts");
     CreateDirectory(xbmcDir.c_str(), NULL);
     xbmcDir = _P("u:\\scripts\\My Scripts"); // FIXME: both scripts should be in 1 directory
@@ -2243,7 +2246,7 @@
 {
   if (!m_AppActive && !m_bStop && (!IsPlayingVideo() || IsPaused()))
   {
-    Sleep(1); 
+    Sleep(1);
     ResetScreenSaver();
     return;
   }

Modified: branches/linuxport/XBMC/xbmc/Application.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.h	2008-08-20 18:48:25 UTC (rev 15063)
+++ branches/linuxport/XBMC/xbmc/Application.h	2008-08-20 20:50:45 UTC (rev 15064)
@@ -218,6 +218,26 @@
     m_bPlatformDirectories = enable;
   }
 
+  void SetStandAlone(bool value)
+  {
+    m_bStandalone = value;
+  }
+
+  bool IsStandAlone()
+  {
+    return m_bStandalone;
+  }
+
+  void SetEnableLegacyRes(bool value)
+  {
+    m_bEnableLegacyRes = value;
+  }
+
+  bool IsEnableLegacyRes()
+  {
+    return m_bEnableLegacyRes;
+  }
+
 protected:
   friend class CApplicationMessenger;
   // screensaver
@@ -263,6 +283,9 @@
 
   bool m_bPresentFrame;
 
+  bool m_bStandalone;
+  bool m_bEnableLegacyRes;
+
 #ifdef HAS_SDL
   int        m_frameCount;
   SDL_mutex* m_frameMutex;

Modified: branches/linuxport/XBMC/xbmc/GUISettings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-08-20 18:48:25 UTC (rev 15063)
+++ branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-08-20 20:50:45 UTC (rev 15064)
@@ -32,6 +32,7 @@
 #include "LinuxTimezone.h"
 #endif
 #include "utils/Network.h"
+#include "Application.h"
 
 using namespace std;
 
@@ -460,22 +461,26 @@
   // network settings
   AddGroup(6, 705);
   AddCategory(6, "network", 705);
+
+  if (g_application.IsStandAlone())
+  {
 #ifndef __APPLE__
-  AddString(1, "network.interface",775,"", SPIN_CONTROL_TEXT);
-  AddInt(2, "network.assignment", 715, NETWORK_DHCP, NETWORK_DHCP, 1, NETWORK_DISABLED, SPIN_CONTROL_TEXT);
-  AddString(3, "network.ipaddress", 719, "0.0.0.0", EDIT_CONTROL_IP_INPUT);
-  AddString(4, "network.subnet", 720, "255.255.255.0", EDIT_CONTROL_IP_INPUT);
-  AddString(5, "network.gateway", 721, "0.0.0.0", EDIT_CONTROL_IP_INPUT);
-  AddString(6, "network.dns", 722, "0.0.0.0", EDIT_CONTROL_IP_INPUT);
-  AddString(7, "network.dnssuffix", 22002, "", EDIT_CONTROL_INPUT, true);
-  AddString(8, "network.essid", 776, "0.0.0.0", BUTTON_CONTROL_STANDARD);
-  AddInt(9, "network.enc", 778, ENC_NONE, ENC_NONE, 1, ENC_WPA2, SPIN_CONTROL_TEXT);
-  AddString(10, "network.key", 777, "0.0.0.0", EDIT_CONTROL_INPUT);
+    AddString(1, "network.interface",775,"", SPIN_CONTROL_TEXT);
+    AddInt(2, "network.assignment", 715, NETWORK_DHCP, NETWORK_DHCP, 1, NETWORK_DISABLED, SPIN_CONTROL_TEXT);
+    AddString(3, "network.ipaddress", 719, "0.0.0.0", EDIT_CONTROL_IP_INPUT);
+    AddString(4, "network.subnet", 720, "255.255.255.0", EDIT_CONTROL_IP_INPUT);
+    AddString(5, "network.gateway", 721, "0.0.0.0", EDIT_CONTROL_IP_INPUT);
+    AddString(6, "network.dns", 722, "0.0.0.0", EDIT_CONTROL_IP_INPUT);
+    AddString(7, "network.dnssuffix", 22002, "", EDIT_CONTROL_INPUT, true);
+    AddString(8, "network.essid", 776, "0.0.0.0", BUTTON_CONTROL_STANDARD);
+    AddInt(9, "network.enc", 778, ENC_NONE, ENC_NONE, 1, ENC_WPA2, SPIN_CONTROL_TEXT);
+    AddString(10, "network.key", 777, "0.0.0.0", EDIT_CONTROL_INPUT);
 #ifndef _WIN32PC
-  AddString(11, "network.save", 779, "", BUTTON_CONTROL_STANDARD);
+    AddString(11, "network.save", 779, "", BUTTON_CONTROL_STANDARD);
 #endif
-  AddSeparator(12, "network.sep1");
+    AddSeparator(12, "network.sep1");
 #endif
+  }
   AddBool(13, "network.usehttpproxy", 708, false);
   AddString(14, "network.httpproxyserver", 706, "", EDIT_CONTROL_IP_INPUT);
   AddString(15, "network.httpproxyport", 707, "8080", EDIT_CONTROL_NUMBER_INPUT, false, 707);

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-08-20 18:48:25 UTC (rev 15063)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-08-20 20:50:45 UTC (rev 15064)
@@ -2393,6 +2393,9 @@
 
 void CGUIWindowSettingsCategory::CheckNetworkSettings()
 {
+  if (!g_application.IsStandAlone())
+    return;
+
   // check if our network needs restarting (requires a reset, so check well!)
   if (m_iNetworkAssignment == -1)
   {
@@ -3419,13 +3422,16 @@
 
 void CGUIWindowSettingsCategory::OnInitWindow()
 {
+  if (g_application.IsStandAlone())
+  {
 #ifndef __APPLE__
-  m_iNetworkAssignment = g_guiSettings.GetInt("network.assignment");
-  m_strNetworkIPAddress = g_guiSettings.GetString("network.ipaddress");
-  m_strNetworkSubnet = g_guiSettings.GetString("network.subnet");
-  m_strNetworkGateway = g_guiSettings.GetString("network.gateway");
-  m_strNetworkDNS = g_guiSettings.GetString("network.dns");
+    m_iNetworkAssignment = g_guiSettings.GetInt("network.assignment");
+    m_strNetworkIPAddress = g_guiSettings.GetString("network.ipaddress");
+    m_strNetworkSubnet = g_guiSettings.GetString("network.subnet");
+    m_strNetworkGateway = g_guiSettings.GetString("network.gateway");
+    m_strNetworkDNS = g_guiSettings.GetString("network.dns");
 #endif
+  }
   m_strOldTrackFormat = g_guiSettings.GetString("musicfiles.trackformat");
   m_strOldTrackFormatRight = g_guiSettings.GetString("musicfiles.trackformatright");
   m_NewResolution = INVALID;
@@ -3579,6 +3585,9 @@
 
 void CGUIWindowSettingsCategory::NetworkInterfaceChanged(void)
 {
+  if (!g_application.IsStandAlone())
+    return;
+
 #ifdef __APPLE__
   return;
 #endif

Modified: branches/linuxport/XBMC/xbmc/XboxMediaCenter.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/XboxMediaCenter.cpp	2008-08-20 18:48:25 UTC (rev 15063)
+++ branches/linuxport/XBMC/xbmc/XboxMediaCenter.cpp	2008-08-20 20:50:45 UTC (rev 15064)
@@ -48,13 +48,31 @@
 #endif
   if (argc > 1)
   {
-    for (int i=1; i<argc;i++)
+    for (int i = 1; i < argc; i++)
     {
       if (strnicmp(argv[i], "-fs", 3) == 0)
       {
-        printf("Running in fullscreen mode...\n");
         g_advancedSettings.m_fullScreen = true;
       }
+      else if (strnicmp(argv[i], "-h", 2) == 0 || strnicmp(argv[i], "--help", 6) == 0)
+      {
+        printf("Usage: %s [OPTION]... [FILE]...\n\n", argv[0]);
+        printf("Arguments:\n");
+        printf("  -fs\t\t\tRuns XBMC in full screen\n");
+        printf("  --standalone\t\tXBMC runs in a stand alone environment without a window \n");
+        printf("\t\t\tmanager and supporting applications. For example, that\n");
+        printf("\t\t\tenables network settings.\n");
+        printf("  --legacy-res\t\tEnables screen resolutions such as PAL, NTSC, etc.\n");
+        exit(0);
+      }
+      else if (strnicmp(argv[i], "--standalone", 12) == 0)
+      {
+        g_application.SetStandAlone(true);
+      }
+      else if (strnicmp(argv[i], "--legacy-res", 12) == 0)
+      {
+        g_application.SetEnableLegacyRes(true);
+      }
       else if (argv[i][0] != '-')
       {
         CFileItemPtr pItem(new CFileItem(argv[i]));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15066
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15066&view=rev
Author:   d4rkm4ster
Date:     2008-08-21 00:09:26 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
fixed: [#4123] don't log or send GUI notifications about media changes if system
doesn't have an optical drive.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/DetectDVDType.cpp
    branches/linuxport/XBMC/xbmc/xbox/IoSupport.h

Modified: branches/linuxport/XBMC/xbmc/DetectDVDType.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/DetectDVDType.cpp	2008-08-20 22:43:35 UTC (rev 15065)
+++ branches/linuxport/XBMC/xbmc/DetectDVDType.cpp	2008-08-21 00:09:26 UTC (rev 15066)
@@ -117,6 +117,10 @@
     CSingleLock waitLock(m_muReadingMedia);
     switch (GetTrayState())
     {
+      case DRIVE_NONE:
+        // TODO: reduce / stop polling for drive updates
+        break;
+
       case DRIVE_OPEN:
         {
           // Send Message to GUI that disc been ejected
@@ -353,7 +357,7 @@
 
   char* dvdDevice = CCdIoSupport::GetDeviceFileName();
   if (strlen(dvdDevice) == 0)
-    return DRIVE_NOT_READY;
+    return DRIVE_NONE;
 
 #ifndef USING_CDIO78
 

Modified: branches/linuxport/XBMC/xbmc/xbox/IoSupport.h
===================================================================
--- branches/linuxport/XBMC/xbmc/xbox/IoSupport.h	2008-08-20 22:43:35 UTC (rev 15065)
+++ branches/linuxport/XBMC/xbmc/xbox/IoSupport.h	2008-08-21 00:09:26 UTC (rev 15066)
@@ -38,6 +38,7 @@
 #define DRIVE_READY      2
 #define DRIVE_CLOSED_NO_MEDIA   3 // CLOSED...but no media in drive
 #define DRIVE_CLOSED_MEDIA_PRESENT  4 // Will be send once when the drive just have closed
+#define DRIVE_NONE  5 // system doesn't have an optical drive
 
 #define MODE2_DATA_START   24   // Mode2 raw sector has 24 bytes before the data payload
 #define MODE2_DATA_SIZE    2324 // And has 2324 usable bytes


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15068
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15068&view=rev
Author:   davilla
Date:     2008-08-21 07:07:03 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
[OSX] fixed Ticket #4555 -- profiles now work in OSX

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/Util.cpp

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-21 06:41:10 UTC (rev 15067)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-21 07:07:03 UTC (rev 15068)
@@ -1044,88 +1044,144 @@
 CProfile* CApplication::InitDirectoriesOSX()
 {
 #ifdef __APPLE__
+  // these two lines should move elsewhere
   Cocoa_Initialize(this);
-
   // We're going to manually manage the screensaver.
   setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", true);
 
-  CStdString strExecutablePath;
-  CUtil::GetHomePath(strExecutablePath);
-  setenv("XBMC_HOME", strExecutablePath.c_str(), 0);
+  CProfile* profile = NULL;
 
   // Z: common for both
   CIoSupport::RemapDriveLetter('Z',"/tmp/xbmc");
   CreateDirectory(_P("Z:\\"), NULL);
 
-  CStdString home = getenv("HOME");
-  CIoSupport::RemapDriveLetter('Q', (char*) strExecutablePath.c_str());
+  CStdString userHome;
+  if (getenv("HOME"))
+  {
+    userHome = getenv("HOME");
+  }
+  else
+  {
+    userHome = "/root";
+  }
 
-  g_settings.m_vecProfiles.clear();
-  g_settings.LoadProfiles(_P(PROFILES_FILE));
-
-  CProfile* profile = NULL;
-
+  // OSX always runs with m_bPlatformDirectories == true
   if (m_bPlatformDirectories)
   {
-    // Make sure the required directories exist.
-    CStdString str2, str = home;
 
-    str.append("/Library/Application Support");
-    CreateDirectory(str.c_str(), NULL);
-    str.append("/XBMC");
-    CreateDirectory(str.c_str(), NULL);
-    //
-    str2 = str;
-    str2.append("/mounts");
-    CreateDirectory(str2.c_str(), NULL);
-    str2 = str;
-    str2.append("/userdata");
-    CreateDirectory(str2.c_str(), NULL);
-    str2 = str;
-    str2.append("/plugins");
-    CreateDirectory(str2.c_str(), NULL);
-    str2 = str;
-    str2.append("/plugins/music");
-    CreateDirectory(str2.c_str(), NULL);
-    str2 = str;
-    str2.append("/plugins/pictures");
-    CreateDirectory(str2.c_str(), NULL);
-    str2 = str;
-    str2.append("/plugins/video");
-    CreateDirectory(str2.c_str(), NULL);
-    str2 = str;
-    str2.append("/plugins/programs");
-    CreateDirectory(str2.c_str(), NULL);
+    #ifdef __APPLE__
+        CStdString logDir = userHome + "/Library/Logs/";
+        g_stSettings.m_logFolder = logDir;
 
-    // See if the keymap file exists, and if not, copy it from our "virgin" one.
-    //CopyUserDataIfNeeded(str, "Keymap.xml");
-    CopyUserDataIfNeeded(str, "RssFeeds.xml");
+        // //Library/Application\ Support/XBMC/
+        CStdString install_path;
+        CUtil::GetHomePath(install_path);
+        setenv("XBMC_HOME", install_path.c_str(), 0);
+        CIoSupport::RemapDriveLetter('Q', (char*) install_path.c_str());
 
-    // Put the user data folder somewhere standard for the platform.
-    str = getenv("HOME");
-    str.append("/Library/Application Support/XBMC");
-    CIoSupport::RemapDriveLetter('U', str.c_str());
+        // /Users/<username>/Library/Application Support/XBMC
+        CStdString xbmcHome = userHome + "/Library/Application Support/XBMC";
+        CreateDirectory(xbmcHome, NULL);
+        CIoSupport::RemapDriveLetter('U', xbmcHome.c_str());
 
-    str.append("/userdata");
-    CIoSupport::RemapDriveLetter('T', str.c_str());
+        // /Users/<username>/Library/Application Support/XBMC/userdata
+        CStdString xbmcUserdata = xbmcHome + "/userdata";
+        CreateDirectory(xbmcUserdata, NULL);
+        CIoSupport::RemapDriveLetter('T', xbmcUserdata.c_str());
+    #else
+        CStdString logDir = "/var/tmp/";
+        if (getenv("USER"))
+        {
+          logDir += getenv("USER");
+          logDir += "-";
+        }
+        g_stSettings.m_logFolder = logDir;
 
-    if (g_settings.m_vecProfiles.size()==0)
-    {
-      profile = new CProfile;
-      CStdString s = getenv("HOME");
-      s.append("/Library/Application Support/XBMC/userdata");
-      profile->setDirectory(s.c_str());
-    }
+        setenv("XBMC_HOME", INSTALL_PATH, 0);
+        CStdString str = INSTALL_PATH;
+        CIoSupport::RemapDriveLetter('Q', (char*) str.c_str());
+
+        // make the $HOME/.xbmc directory
+        CStdString xbmcHome = userHome + "/.xbmc";
+        CreateDirectory(xbmcHome, NULL);
+        CIoSupport::RemapDriveLetter('U', xbmcHome.c_str());
+
+        // make the $HOME/.xbmc/userdata directory
+        CStdString xbmcUserdata = xbmcHome + "/userdata";
+        CreateDirectory(xbmcUserdata.c_str(), NULL);
+        CIoSupport::RemapDriveLetter('T', xbmcUserdata.c_str());
+    #endif
+
+
+    CStdString xbmcDir;
+    xbmcDir = _P("u:\\skin");
+    CreateDirectory(xbmcDir.c_str(), NULL);
+
+    xbmcDir = _P("u:\\visualisations");
+    CreateDirectory(xbmcDir.c_str(), NULL);
+
+    xbmcDir = _P("u:\\screensavers");
+    CreateDirectory(xbmcDir.c_str(), NULL);
+
+    xbmcDir = _P("u:\\sounds");
+    CreateDirectory(xbmcDir.c_str(), NULL);
+
+    xbmcDir = _P("u:\\system");
+    CreateDirectory(xbmcDir.c_str(), NULL);
+
+    xbmcDir = _P("u:\\plugins");
+    CreateDirectory(xbmcDir.c_str(), NULL);
+    xbmcDir = _P("u:\\plugins\\video");
+    CreateDirectory(xbmcDir.c_str(), NULL);
+    xbmcDir = _P("u:\\plugins\\music");
+    CreateDirectory(xbmcDir.c_str(), NULL);
+    xbmcDir = _P("u:\\plugins\\pictures");
+    CreateDirectory(xbmcDir.c_str(), NULL);
+    xbmcDir = _P("u:\\plugins\\programs");
+    CreateDirectory(xbmcDir.c_str(), NULL);
+    
+    xbmcDir = _P("u:\\scripts");
+    CreateDirectory(xbmcDir.c_str(), NULL);
+    xbmcDir = _P("u:\\scripts\\My Scripts"); // FIXME: both scripts should be in 1 directory
+    CreateDirectory(xbmcDir.c_str(), NULL);
+
+    xbmcDir = _P("u:\\scripts\\Common Scripts"); // FIXME:
+    #ifdef __APPLE__
+        CStdString str = install_path + "/scripts";
+        symlink( str.c_str(),  xbmcDir.c_str() );
+    #else
+        symlink( INSTALL_PATH "/scripts",  xbmcDir.c_str() );
+    #endif
+
+    // copy required files
+    //CopyUserDataIfNeeded(_P("t:\\"), "Keymap.xml");
+    CopyUserDataIfNeeded(_P("t:\\"), "RssFeeds.xml");
+    // this is wrong, CopyUserDataIfNeeded pulls from q:\\userdata, Lircmap.xml is in q:\\system
+    CopyUserDataIfNeeded(_P("t:\\"), "Lircmap.xml");    
+    CopyUserDataIfNeeded(_P("t:\\"), "LCD.xml");
   }
   else
   {
-    CIoSupport::RemapDriveLetter('T', _P("Q:\\userdata").c_str());
-    if (g_settings.m_vecProfiles.size()==0)
-    {
-      profile = new CProfile;
-      profile->setDirectory(_P("q:\\userdata"));
-    }
+    CStdString strHomePath;
+    CUtil::GetHomePath(strHomePath);
+    setenv("XBMC_HOME", strHomePath.c_str(), 0);
+
+    CUtil::AddDirectorySeperator(strHomePath);
+    g_stSettings.m_logFolder = strHomePath;
+
+    CIoSupport::RemapDriveLetter('Q', (char*)strHomePath.c_str());
+    CIoSupport::RemapDriveLetter('T', _P("Q:\\userdata"));
+    CIoSupport::RemapDriveLetter('U', _P("Q:"));
   }
+
+  g_settings.m_vecProfiles.clear();
+  g_settings.LoadProfiles(_P( PROFILES_FILE ));
+
+  if (g_settings.m_vecProfiles.size()==0)
+  {
+    profile = new CProfile;
+    profile->setDirectory(_P("t:\\"));
+  }
   return profile;
 #else
   return NULL;

Modified: branches/linuxport/XBMC/xbmc/Util.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Util.cpp	2008-08-21 06:41:10 UTC (rev 15067)
+++ branches/linuxport/XBMC/xbmc/Util.cpp	2008-08-21 07:07:03 UTC (rev 15068)
@@ -4385,36 +4385,6 @@
 
   if (path.length() > 0 && path[1] == ':')
   {
-#ifdef __APPLE__
-    CStdString lowerPath = path;
-    lowerPath.ToLower();
-
-    // Special mappings for OS X.
-    if (path[0] == 'Q' || path[0] == 'q')
-    {
-      if (path.Equals("q:\\system\\profiles.xml", false))
-      {
-        CStdString str = getenv("HOME");
-        str.append("/Library/Application Support/XBMC/profiles.xml");
-        return str;
-      }
-      else if (path.Equals("q:\\system\\mediasources.xml", false))
-      {
-        CStdString str = getenv("HOME");
-        str.append("/Library/Application Support/XBMC/mediasources.xml");
-        return str;
-      }
-      else if (lowerPath.Find("u:\\plugins") == 0)
-      {
-        CStdString str = getenv("HOME");
-        str.append("/Library/Application Support/XBMC/Plugins");
-        str.append(path.substr(10));
-        str.Replace('\\', '/');
-        return str;
-      }
-    }
-#endif
-
     const char *p = CIoSupport::GetPartition(path[0]);
     if (p != NULL)
     {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15071
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15071&view=rev
Author:   vdrfan
Date:     2008-08-21 09:44:48 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
changed: disabled lcdprocs heartbeat by default. it can be enabled from an advanced setting <heartbeat>true</heartbeat>

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
    branches/linuxport/XBMC/xbmc/Settings.cpp
    branches/linuxport/XBMC/xbmc/Settings.h
    branches/linuxport/XBMC/xbmc/linux/XLCDproc.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-08-21 09:23:03 UTC (rev 15070)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-08-21 09:44:48 UTC (rev 15071)
@@ -1313,15 +1313,7 @@
     else if (strSetting.Equals("lcd.contrast"))
     {
       CGUIControl *pControl = (CGUIControl *)GetControl(pSettingControl->GetID());
-      // X3 can't controll the Contrast via software graying out!
-      if(g_guiSettings.GetInt("lcd.type") != LCD_TYPE_NONE)
-      {
-        if (pControl) pControl->SetEnabled(true);
-      }
-      else
-      {
-        if (pControl) pControl->SetEnabled(false);
-      }
+      if (pControl) pControl->SetEnabled(g_guiSettings.GetInt("lcd.type") != LCD_TYPE_NONE);
     }
     else if (strSetting.Equals("lookandfeel.soundsduringplayback"))
     {

Modified: branches/linuxport/XBMC/xbmc/Settings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.cpp	2008-08-21 09:23:03 UTC (rev 15070)
+++ branches/linuxport/XBMC/xbmc/Settings.cpp	2008-08-21 09:44:48 UTC (rev 15071)
@@ -167,6 +167,7 @@
   g_advancedSettings.m_lcdAddress2 = 0x40;
   g_advancedSettings.m_lcdAddress3 = 0x14;
   g_advancedSettings.m_lcdAddress4 = 0x54;
+  g_advancedSettings.m_lcdHeartbeat = false;
 
   g_advancedSettings.m_autoDetectPingTime = 30;
   g_advancedSettings.m_playCountMinimumPercent = 90.0f;
@@ -1184,6 +1185,7 @@
     GetInteger(pElement, "address2", g_advancedSettings.m_lcdAddress2, 0, 0x100);
     GetInteger(pElement, "address3", g_advancedSettings.m_lcdAddress3, 0, 0x100);
     GetInteger(pElement, "address4", g_advancedSettings.m_lcdAddress4, 0, 0x100);
+    XMLUtils::GetBoolean(pElement, "heartbeat", g_advancedSettings.m_lcdHeartbeat);
   }
   pElement = pRootElement->FirstChildElement("network");
   if (pElement)

Modified: branches/linuxport/XBMC/xbmc/Settings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.h	2008-08-21 09:23:03 UTC (rev 15070)
+++ branches/linuxport/XBMC/xbmc/Settings.h	2008-08-21 09:44:48 UTC (rev 15071)
@@ -159,6 +159,7 @@
     int m_lcdAddress2;
     int m_lcdAddress3;
     int m_lcdAddress4;
+    bool m_lcdHeartbeat;
 
     int m_autoDetectPingTime;
     float m_playCountMinimumPercent;

Modified: branches/linuxport/XBMC/xbmc/linux/XLCDproc.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/linux/XLCDproc.cpp	2008-08-21 09:23:03 UTC (rev 15070)
+++ branches/linuxport/XBMC/xbmc/linux/XLCDproc.cpp	2008-08-21 09:44:48 UTC (rev 15071)
@@ -79,6 +79,8 @@
   //Build command to setup screen
   CStdString cmd;
   cmd = "hello\nscreen_add xbmc\n";
+  if (!g_advancedSettings.m_lcdHeartbeat)
+    cmd.append("screen_set xbmc -heartbeat off\n");
   cmd.append("widget_add xbmc line1 scroller\n");
   cmd.append("widget_add xbmc line2 scroller\n");
   cmd.append("widget_add xbmc line3 scroller\n");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15073
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15073&view=rev
Author:   jmarshallnz
Date:     2008-08-21 10:28:59 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
changed: Mouse movement now pops up the video OSD during fullscreen video.  Left click pauses, and Right click toggles back to the menu.
fixed: Occasional crash on stop of video.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowFullScreen.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowOSD.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowOSD.h

Modified: branches/linuxport/XBMC/xbmc/GUIWindowFullScreen.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowFullScreen.cpp	2008-08-21 10:23:56 UTC (rev 15072)
+++ branches/linuxport/XBMC/xbmc/GUIWindowFullScreen.cpp	2008-08-21 10:28:59 UTC (rev 15073)
@@ -517,11 +517,21 @@
     return true;
   }
   if (g_Mouse.bClick[MOUSE_LEFT_BUTTON])
-  { // no control found to absorb this click - toggle the OSD
+  { // no control found to absorb this click - pause video
     CAction action;
-    action.wID = ACTION_SHOW_OSD;
-    OnAction(action);
+    action.wID = ACTION_PAUSE;
+    return g_application.OnAction(action);
   }
+  if (g_Mouse.HasMoved())
+  { // movement - toggle the OSD
+    CLog::Log(LOGDEBUG, "%s: mouse message sent", __FUNCTION__);
+    CGUIWindowOSD *pOSD = (CGUIWindowOSD *)m_gWindowManager.GetWindow(WINDOW_OSD);
+    if (pOSD)
+    {
+      pOSD->SetAutoClose(3000);
+      pOSD->DoModal();
+    }
+  }
   return true;
 }
 
@@ -557,7 +567,7 @@
   if (m_bShowCurrentTime) return true;
   if (g_infoManager.GetDisplayAfterSeek()) return true;
   if (g_infoManager.GetBool(PLAYER_SEEKBAR, GetID())) return true;
-  if (CUtil::IsUsingTTFSubtitles() && g_application.m_pPlayer->GetSubtitleVisible() && m_subsLayout)
+  if (CUtil::IsUsingTTFSubtitles() && g_application.m_pPlayer && g_application.m_pPlayer->GetSubtitleVisible() && m_subsLayout)
     return true;
   if (m_bLastRender)
   {

Modified: branches/linuxport/XBMC/xbmc/GUIWindowOSD.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowOSD.cpp	2008-08-21 10:23:56 UTC (rev 15072)
+++ branches/linuxport/XBMC/xbmc/GUIWindowOSD.cpp	2008-08-21 10:28:59 UTC (rev 15073)
@@ -41,6 +41,13 @@
 
 bool CGUIWindowOSD::OnAction(const CAction &action)
 {
+  if (action.wID == ACTION_MOUSE)
+  {
+    if (g_Mouse.HasMoved() && m_autoClosing)
+    { // movement - update the auto closing
+      SetAutoClose(3000);
+    }
+  }
   // ACTION_SHOW_OSD should take the OSD away too!
   if (action.wID == ACTION_SHOW_OSD)
   {
@@ -57,6 +64,17 @@
   return CGUIDialog::OnAction(action);
 }
 
+bool CGUIWindowOSD::OnMouse(const CPoint &point)
+{
+  if (g_Mouse.bClick[MOUSE_LEFT_BUTTON])
+  { // pause
+    CAction action;
+    action.wID = ACTION_PAUSE;
+    return g_application.OnAction(action);
+  }
+  return CGUIDialog::OnMouse(point);
+}
+
 bool CGUIWindowOSD::OnMessage(CGUIMessage& message)
 {
   switch ( message.GetMessage() )

Modified: branches/linuxport/XBMC/xbmc/GUIWindowOSD.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowOSD.h	2008-08-21 10:23:56 UTC (rev 15072)
+++ branches/linuxport/XBMC/xbmc/GUIWindowOSD.h	2008-08-21 10:28:59 UTC (rev 15073)
@@ -32,5 +32,6 @@
 
   virtual bool OnMessage(CGUIMessage& message);
   virtual bool OnAction(const CAction &action);
+  virtual bool OnMouse(const CPoint &point);
   virtual void OnWindowLoaded();
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15075
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15075&view=rev
Author:   jmarshallnz
Date:     2008-08-21 10:49:44 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
changed: Mouse movement now pops up the music OSD during visualisation.  Left click pauses, and Right click toggles back to the menu.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIDialogMusicOSD.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogMusicOSD.h
    branches/linuxport/XBMC/xbmc/GUIWindowVisualisation.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIDialogMusicOSD.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogMusicOSD.cpp	2008-08-21 10:41:07 UTC (rev 15074)
+++ branches/linuxport/XBMC/xbmc/GUIDialogMusicOSD.cpp	2008-08-21 10:49:44 UTC (rev 15075)
@@ -22,6 +22,7 @@
 #include "stdafx.h"
 #include "GUIDialogMusicOSD.h"
 #include "GUIWindowSettingsCategory.h"
+#include "Application.h"
 
 
 #define CONTROL_VIS_BUTTON       500
@@ -106,3 +107,26 @@
   CGUIDialog::OnInitWindow();
 }
 
+bool CGUIDialogMusicOSD::OnAction(const CAction &action)
+{
+  if (action.wID == ACTION_MOUSE)
+  {
+    if (g_Mouse.HasMoved() && m_autoClosing)
+    { // movement - update the auto closing
+      SetAutoClose(3000);
+    }
+  }
+  return CGUIDialog::OnAction(action);
+}
+
+bool CGUIDialogMusicOSD::OnMouse(const CPoint &point)
+{
+  if (g_Mouse.bClick[MOUSE_LEFT_BUTTON])
+  { // pause
+    CAction action;
+    action.wID = ACTION_PAUSE;
+    return g_application.OnAction(action);
+  }
+  return CGUIDialog::OnMouse(point);
+}
+

Modified: branches/linuxport/XBMC/xbmc/GUIDialogMusicOSD.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogMusicOSD.h	2008-08-21 10:41:07 UTC (rev 15074)
+++ branches/linuxport/XBMC/xbmc/GUIDialogMusicOSD.h	2008-08-21 10:49:44 UTC (rev 15075)
@@ -31,6 +31,8 @@
   CGUIDialogMusicOSD(void);
   virtual ~CGUIDialogMusicOSD(void);
   virtual bool OnMessage(CGUIMessage &message);
+  virtual bool OnAction(const CAction &action);
+  virtual bool OnMouse(const CPoint &point);
   virtual void Render();
 protected:
   virtual void OnInitWindow();

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVisualisation.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVisualisation.cpp	2008-08-21 10:41:07 UTC (rev 15074)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVisualisation.cpp	2008-08-21 10:49:44 UTC (rev 15075)
@@ -226,9 +226,18 @@
   if (g_Mouse.bClick[MOUSE_LEFT_BUTTON])
   { // no control found to absorb this click - toggle the track INFO
     CAction action;
-    action.wID = ACTION_SHOW_INFO;
-    OnAction(action);
+    action.wID = ACTION_PAUSE;
+    return g_application.OnAction(action);
   }
+  if (g_Mouse.HasMoved())
+  { // movement - toggle the OSD
+    CGUIDialog *pOSD = (CGUIDialog *)m_gWindowManager.GetWindow(WINDOW_DIALOG_MUSIC_OSD);
+    if (pOSD)
+    {
+      pOSD->SetAutoClose(3000);
+      pOSD->DoModal();
+    }
+  }
   return true;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15081
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15081&view=rev
Author:   elupus
Date:     2008-08-21 20:22:03 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
fixed: xbmc would swap between last frame and current frame if dvdplayer didn't send a new one in time. this resulted in playback looking like it was going backwords or codec info flickering between having audio/video streams and not having after seek.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/RenderFlags.h

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-21 19:47:50 UTC (rev 15080)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-21 20:22:03 UTC (rev 15081)
@@ -2151,9 +2151,10 @@
     // release the context so the async renderer can draw to it
 #ifdef HAS_SDL_OPENGL
     // Video rendering occuring from main thread for OpenGL
-    //g_renderManager.RenderUpdate(true, 0, 0);
     if (m_bPresentFrame)
       g_renderManager.Present();
+    else
+      g_renderManager.RenderUpdate(true, 0, 255);
 
     ResetScreenSaver();
     g_infoManager.ResetCache();

Modified: branches/linuxport/XBMC/xbmc/cores/VideoRenderers/RenderFlags.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/VideoRenderers/RenderFlags.h	2008-08-21 19:47:50 UTC (rev 15080)
+++ branches/linuxport/XBMC/xbmc/cores/VideoRenderers/RenderFlags.h	2008-08-21 20:22:03 UTC (rev 15081)
@@ -26,7 +26,7 @@
 #define RENDER_FLAG_ODD         0x02
 #define RENDER_FLAG_BOTH (RENDER_FLAG_EVEN | RENDER_FLAG_ODD)
 #define RENDER_FLAG_FIELDMASK   0x03
-#define RENDER_FLAG_LAST        0x04
+#define RENDER_FLAG_LAST        0x40
 
 #define RENDER_FLAG_NOOSD       0x04 /* don't draw any osd */
 #define RENDER_FLAG_NOOSDALPHA  0x08 /* don't allow alpha when osd is drawn */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15095
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15095&view=rev
Author:   jmarshallnz
Date:     2008-08-22 02:58:58 +0000 (Fri, 22 Aug 2008)

Log Message:
-----------
changed: Any action, or the present of a submenu on screen will stop music + video OSDs from auto-closing.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIDialogMusicOSD.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowOSD.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowOSD.h

Modified: branches/linuxport/XBMC/xbmc/GUIDialogMusicOSD.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogMusicOSD.cpp	2008-08-22 02:54:05 UTC (rev 15094)
+++ branches/linuxport/XBMC/xbmc/GUIDialogMusicOSD.cpp	2008-08-22 02:58:58 UTC (rev 15095)
@@ -23,6 +23,7 @@
 #include "GUIDialogMusicOSD.h"
 #include "GUIWindowSettingsCategory.h"
 #include "Application.h"
+#include "GUIWindowManager.h"
 
 
 #define CONTROL_VIS_BUTTON       500
@@ -95,6 +96,13 @@
 
 void CGUIDialogMusicOSD::Render()
 {
+  if (m_autoClosing)
+  {
+    // check for movement of mouse or a submenu open
+    if (g_Mouse.HasMoved() || m_gWindowManager.IsWindowActive(WINDOW_DIALOG_VIS_SETTINGS)
+                           || m_gWindowManager.IsWindowActive(WINDOW_DIALOG_VIS_PRESET_LIST))
+      SetAutoClose(3000);
+  }
   CGUIDialog::Render();
 }
 
@@ -109,13 +117,9 @@
 
 bool CGUIDialogMusicOSD::OnAction(const CAction &action)
 {
-  if (action.wID == ACTION_MOUSE)
-  {
-    if (g_Mouse.HasMoved() && m_autoClosing)
-    { // movement - update the auto closing
-      SetAutoClose(3000);
-    }
-  }
+  // keyboard or controller movement should prevent autoclosing
+  if (action.wID != ACTION_MOUSE && m_autoClosing)
+    SetAutoClose(3000);
   return CGUIDialog::OnAction(action);
 }
 

Modified: branches/linuxport/XBMC/xbmc/GUIWindowOSD.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowOSD.cpp	2008-08-22 02:54:05 UTC (rev 15094)
+++ branches/linuxport/XBMC/xbmc/GUIWindowOSD.cpp	2008-08-22 02:58:58 UTC (rev 15095)
@@ -39,15 +39,24 @@
   m_bRelativeCoords = true;
 }
 
-bool CGUIWindowOSD::OnAction(const CAction &action)
+void CGUIWindowOSD::Render()
 {
-  if (action.wID == ACTION_MOUSE)
+  if (m_autoClosing)
   {
-    if (g_Mouse.HasMoved() && m_autoClosing)
-    { // movement - update the auto closing
+    // check for movement of mouse or a submenu open
+    if (g_Mouse.HasMoved() || m_gWindowManager.IsWindowActive(WINDOW_DIALOG_AUDIO_OSD_SETTINGS)
+                           || m_gWindowManager.IsWindowActive(WINDOW_DIALOG_VIDEO_OSD_SETTINGS))
       SetAutoClose(3000);
-    }
   }
+  CGUIDialog::Render();
+}
+
+bool CGUIWindowOSD::OnAction(const CAction &action)
+{
+  // keyboard or controller movement should prevent autoclosing
+  if (action.wID != ACTION_MOUSE && m_autoClosing)
+    SetAutoClose(3000);
+
   // ACTION_SHOW_OSD should take the OSD away too!
   if (action.wID == ACTION_SHOW_OSD)
   {

Modified: branches/linuxport/XBMC/xbmc/GUIWindowOSD.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowOSD.h	2008-08-22 02:54:05 UTC (rev 15094)
+++ branches/linuxport/XBMC/xbmc/GUIWindowOSD.h	2008-08-22 02:58:58 UTC (rev 15095)
@@ -30,6 +30,7 @@
   CGUIWindowOSD(void);
   virtual ~CGUIWindowOSD(void);
 
+  virtual void Render();
   virtual bool OnMessage(CGUIMessage& message);
   virtual bool OnAction(const CAction &action);
   virtual bool OnMouse(const CPoint &point);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15135
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15135&view=rev
Author:   vdrfan
Date:     2008-08-23 22:51:37 +0000 (Sat, 23 Aug 2008)

Log Message:
-----------
changed: completely removed soundtrack:// related stuff as it is xbox-only.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIDialogMediaSource.cpp
    branches/linuxport/XBMC/xbmc/MediaSource.cpp
    branches/linuxport/XBMC/xbmc/Util.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIDialogMediaSource.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogMediaSource.cpp	2008-08-23 22:41:11 UTC (rev 15134)
+++ branches/linuxport/XBMC/xbmc/GUIDialogMediaSource.cpp	2008-08-23 22:51:37 UTC (rev 15135)
@@ -270,11 +270,6 @@
       share2.strName = g_localizeStrings.Get(21883);
       extraShares.push_back(share2);
     }
-#ifdef _XBOX
-    share1.strPath = "soundtrack://";
-    share1.strName = "MS Soundtracks";
-    extraShares.push_back(share1);
-#endif
     if (g_guiSettings.GetBool("network.enableinternet"))
     {
       CMediaSource share3;

Modified: branches/linuxport/XBMC/xbmc/MediaSource.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/MediaSource.cpp	2008-08-23 22:41:11 UTC (rev 15134)
+++ branches/linuxport/XBMC/xbmc/MediaSource.cpp	2008-08-23 22:51:37 UTC (rev 15135)
@@ -74,8 +74,6 @@
     m_iDriveType = SOURCE_TYPE_VIRTUAL_DVD;
     strPath = "D:\\";
   }
-  else if (strPath.Left(11).Equals("soundtrack:"))
-    m_iDriveType = SOURCE_TYPE_LOCAL;
   else if (CUtil::IsISO9660(strPath))
     m_iDriveType = SOURCE_TYPE_VIRTUAL_DVD;
   else if (CUtil::IsDVD(strPath))

Modified: branches/linuxport/XBMC/xbmc/Util.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Util.cpp	2008-08-23 22:41:11 UTC (rev 15134)
+++ branches/linuxport/XBMC/xbmc/Util.cpp	2008-08-23 22:51:37 UTC (rev 15135)
@@ -203,12 +203,6 @@
   {
     strFilename = g_localizeStrings.Get(20171); // Windows SMB Network (SMB)
   }
-
-  /*else if (strFileNameAndPath.Compare("soundtrack://") == 0)
-  {
-    strFilename = "MS Soundtracks";  // Would need localizing
-  }*/
-
   else if (strFileNameAndPath.Compare("shout://") == 0)
   {
     strFilename = g_localizeStrings.Get(260); // Shoutcast


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15169
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15169&view=rev
Author:   jmarshallnz
Date:     2008-08-25 00:54:11 +0000 (Mon, 25 Aug 2008)

Log Message:
-----------
fixed: Make sure weather + directory fetching wait on network as applicable.  Fixes #4637, and weather not shown on startup (xbox)

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileSystem/FactoryDirectory.cpp
    branches/linuxport/XBMC/xbmc/utils/Weather.cpp

Modified: branches/linuxport/XBMC/xbmc/FileSystem/FactoryDirectory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/FactoryDirectory.cpp	2008-08-25 00:52:38 UTC (rev 15168)
+++ branches/linuxport/XBMC/xbmc/FileSystem/FactoryDirectory.cpp	2008-08-25 00:54:11 UTC (rev 15169)
@@ -111,7 +111,7 @@
   if (strProtocol == "filereader") 
     return CFactoryDirectory::Create(url.GetFileName());
 
-  if( g_application.getNetwork().IsAvailable() )
+  if( g_application.getNetwork().IsAvailable(true) )  // true to wait for the network (if possible)
   {
     if (strProtocol == "shout") return new CShoutcastDirectory();
     if (strProtocol == "lastfm") return new CLastFMDirectory();

Modified: branches/linuxport/XBMC/xbmc/utils/Weather.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/Weather.cpp	2008-08-25 00:52:38 UTC (rev 15168)
+++ branches/linuxport/XBMC/xbmc/utils/Weather.cpp	2008-08-25 00:54:11 UTC (rev 15169)
@@ -100,7 +100,8 @@
   if (!g_guiSettings.GetBool("network.enableinternet"))
     return;
 
-  if (!g_application.getNetwork().IsAvailable())
+  // wait for the network
+  if (!g_application.getNetwork().IsAvailable(true))
     return;
 
   CWeather *callback = (CWeather *)m_callback;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15173
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15173&view=rev
Author:   jmarshallnz
Date:     2008-08-25 03:06:26 +0000 (Mon, 25 Aug 2008)

Log Message:
-----------
changed: Show root Plugins automatically as a source if the user has a plugin.  Fixes #4658.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIViewStateMusic.cpp
    branches/linuxport/XBMC/xbmc/GUIViewStatePictures.cpp
    branches/linuxport/XBMC/xbmc/GUIViewStatePrograms.cpp
    branches/linuxport/XBMC/xbmc/GUIViewStateVideo.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIViewStateMusic.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIViewStateMusic.cpp	2008-08-25 01:04:12 UTC (rev 15172)
+++ branches/linuxport/XBMC/xbmc/GUIViewStateMusic.cpp	2008-08-25 03:06:26 UTC (rev 15173)
@@ -598,7 +598,16 @@
 
 VECSOURCES& CGUIViewStateWindowMusicSongs::GetSources()
 {
-  return g_settings.m_musicSources;
+  m_sources = g_settings.m_musicSources;
+  // plugins share
+  if (CPluginDirectory::HasPlugins("music"))
+  {
+    CMediaSource share;
+    share.strName = g_localizeStrings.Get(1038);
+    share.strPath = "plugin://music/";
+    m_sources.push_back(share);
+  }
+  return CGUIViewStateWindowMusic::GetSources();
 }
 
 CGUIViewStateWindowMusicPlaylist::CGUIViewStateWindowMusicPlaylist(const CFileItemList& items) : CGUIViewStateWindowMusic(items)

Modified: branches/linuxport/XBMC/xbmc/GUIViewStatePictures.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIViewStatePictures.cpp	2008-08-25 01:04:12 UTC (rev 15172)
+++ branches/linuxport/XBMC/xbmc/GUIViewStatePictures.cpp	2008-08-25 03:06:26 UTC (rev 15173)
@@ -26,6 +26,7 @@
 #include "ViewState.h"
 #include "Settings.h"
 #include "FileSystem/Directory.h"
+#include "FileSystem/PluginDirectory.h"
 
 using namespace DIRECTORY;
 
@@ -78,6 +79,15 @@
 
 VECSOURCES& CGUIViewStateWindowPictures::GetSources()
 {
-  return g_settings.m_pictureSources;
+  m_sources = g_settings.m_pictureSources;
+  // plugins share
+  if (CPluginDirectory::HasPlugins("pictures"))
+  {
+    CMediaSource share;
+    share.strName = g_localizeStrings.Get(1039); // Picture Plugins
+    share.strPath = "plugin://pictures/";
+    m_sources.push_back(share);
+  }
+  return CGUIViewState::GetSources();
 }
 

Modified: branches/linuxport/XBMC/xbmc/GUIViewStatePrograms.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIViewStatePrograms.cpp	2008-08-25 01:04:12 UTC (rev 15172)
+++ branches/linuxport/XBMC/xbmc/GUIViewStatePrograms.cpp	2008-08-25 03:06:26 UTC (rev 15173)
@@ -26,6 +26,7 @@
 #include "ViewState.h"
 #include "Settings.h"
 #include "FileSystem/Directory.h"
+#include "FileSystem/PluginDirectory.h"
 
 using namespace DIRECTORY;
 
@@ -65,6 +66,15 @@
 
 VECSOURCES& CGUIViewStateWindowPrograms::GetSources()
 {
-  return g_settings.m_programSources;
+  m_sources = g_settings.m_programSources;
+  // plugins share
+  if (CPluginDirectory::HasPlugins("programs"))
+  {
+    CMediaSource share;
+    share.strName = g_localizeStrings.Get(1043); // Program Plugins
+    share.strPath = "plugin://programs/";
+    m_sources.push_back(share);
+  }
+  return CGUIViewState::GetSources();
 }
 

Modified: branches/linuxport/XBMC/xbmc/GUIViewStateVideo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIViewStateVideo.cpp	2008-08-25 01:04:12 UTC (rev 15172)
+++ branches/linuxport/XBMC/xbmc/GUIViewStateVideo.cpp	2008-08-25 03:06:26 UTC (rev 15173)
@@ -95,7 +95,16 @@
 
 VECSOURCES& CGUIViewStateWindowVideoFiles::GetSources()
 {
-  return g_settings.m_videoSources;
+  m_sources = g_settings.m_videoSources;
+  // plugins share
+  if (CPluginDirectory::HasPlugins("video"))
+  {
+    CMediaSource share;
+    share.strName = g_localizeStrings.Get(1037);
+    share.strPath = "plugin://video/";
+    m_sources.push_back(share);
+  }
+  return CGUIViewStateWindowVideo::GetSources();
 }
 
 CGUIViewStateWindowVideoNav::CGUIViewStateWindowVideoNav(const CFileItemList& items) : CGUIViewStateWindowVideo(items)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15190
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15190&view=rev
Author:   vdrfan
Date:     2008-08-25 19:01:03 +0000 (Mon, 25 Aug 2008)

Log Message:
-----------
fixed: media sources won't add/remove properly.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIViewStateMusic.cpp
    branches/linuxport/XBMC/xbmc/GUIViewStatePictures.cpp
    branches/linuxport/XBMC/xbmc/GUIViewStatePrograms.cpp
    branches/linuxport/XBMC/xbmc/GUIViewStateVideo.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIViewStateMusic.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIViewStateMusic.cpp	2008-08-25 16:16:28 UTC (rev 15189)
+++ branches/linuxport/XBMC/xbmc/GUIViewStateMusic.cpp	2008-08-25 19:01:03 UTC (rev 15190)
@@ -26,6 +26,7 @@
 #include "VideoDatabase.h"
 #include "Settings.h"
 #include "FileItem.h"
+#include "Util.h"
 
 #include "FileSystem/MusicDatabaseDirectory.h"
 #include "FileSystem/VideoDatabaseDirectory.h"
@@ -598,16 +599,17 @@
 
 VECSOURCES& CGUIViewStateWindowMusicSongs::GetSources()
 {
-  m_sources = g_settings.m_musicSources;
+  bool bIsSourceName = true;
   // plugins share
   if (CPluginDirectory::HasPlugins("music"))
   {
     CMediaSource share;
     share.strName = g_localizeStrings.Get(1038);
     share.strPath = "plugin://music/";
-    m_sources.push_back(share);
+    if (CUtil::GetMatchingSource(share.strName, g_settings.m_musicSources, bIsSourceName) < 0)
+      g_settings.m_musicSources.push_back(share);
   }
-  return CGUIViewStateWindowMusic::GetSources();
+  return g_settings.m_musicSources; 
 }
 
 CGUIViewStateWindowMusicPlaylist::CGUIViewStateWindowMusicPlaylist(const CFileItemList& items) : CGUIViewStateWindowMusic(items)

Modified: branches/linuxport/XBMC/xbmc/GUIViewStatePictures.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIViewStatePictures.cpp	2008-08-25 16:16:28 UTC (rev 15189)
+++ branches/linuxport/XBMC/xbmc/GUIViewStatePictures.cpp	2008-08-25 19:01:03 UTC (rev 15190)
@@ -27,6 +27,7 @@
 #include "Settings.h"
 #include "FileSystem/Directory.h"
 #include "FileSystem/PluginDirectory.h"
+#include "Util.h"
 
 using namespace DIRECTORY;
 
@@ -79,15 +80,16 @@
 
 VECSOURCES& CGUIViewStateWindowPictures::GetSources()
 {
-  m_sources = g_settings.m_pictureSources;
+  bool bIsSourceName = true;
   // plugins share
   if (CPluginDirectory::HasPlugins("pictures"))
   {
     CMediaSource share;
     share.strName = g_localizeStrings.Get(1039); // Picture Plugins
     share.strPath = "plugin://pictures/";
-    m_sources.push_back(share);
+    if (CUtil::GetMatchingSource(share.strName, g_settings.m_pictureSources, bIsSourceName) < 0)
+      g_settings.m_pictureSources.push_back(share);
   }
-  return CGUIViewState::GetSources();
+  return g_settings.m_pictureSources; 
 }
 

Modified: branches/linuxport/XBMC/xbmc/GUIViewStatePrograms.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIViewStatePrograms.cpp	2008-08-25 16:16:28 UTC (rev 15189)
+++ branches/linuxport/XBMC/xbmc/GUIViewStatePrograms.cpp	2008-08-25 19:01:03 UTC (rev 15190)
@@ -27,6 +27,7 @@
 #include "Settings.h"
 #include "FileSystem/Directory.h"
 #include "FileSystem/PluginDirectory.h"
+#include "Util.h"
 
 using namespace DIRECTORY;
 
@@ -66,15 +67,16 @@
 
 VECSOURCES& CGUIViewStateWindowPrograms::GetSources()
 {
-  m_sources = g_settings.m_programSources;
+  bool bIsSourceName = true;
   // plugins share
   if (CPluginDirectory::HasPlugins("programs"))
   {
     CMediaSource share;
     share.strName = g_localizeStrings.Get(1043); // Program Plugins
     share.strPath = "plugin://programs/";
-    m_sources.push_back(share);
+    if (CUtil::GetMatchingSource(share.strName, g_settings.m_programSources, bIsSourceName) < 0)
+      g_settings.m_programSources.push_back(share);
   }
-  return CGUIViewState::GetSources();
+  return g_settings.m_programSources; 
 }
 

Modified: branches/linuxport/XBMC/xbmc/GUIViewStateVideo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIViewStateVideo.cpp	2008-08-25 16:16:28 UTC (rev 15189)
+++ branches/linuxport/XBMC/xbmc/GUIViewStateVideo.cpp	2008-08-25 19:01:03 UTC (rev 15190)
@@ -28,6 +28,7 @@
 #include "VideoDatabase.h"
 #include "Settings.h"
 #include "FileItem.h"
+#include "Util.h"
 
 using namespace DIRECTORY;
 using namespace VIDEODATABASEDIRECTORY;
@@ -95,16 +96,17 @@
 
 VECSOURCES& CGUIViewStateWindowVideoFiles::GetSources()
 {
-  m_sources = g_settings.m_videoSources;
+  bool bIsSourceName = true;
   // plugins share
   if (CPluginDirectory::HasPlugins("video"))
   {
     CMediaSource share;
     share.strName = g_localizeStrings.Get(1037);
     share.strPath = "plugin://video/";
-    m_sources.push_back(share);
+    if (CUtil::GetMatchingSource(share.strName, g_settings.m_videoSources, bIsSourceName) < 0)
+      g_settings.m_videoSources.push_back(share);
   }
-  return CGUIViewStateWindowVideo::GetSources();
+  return g_settings.m_videoSources; 
 }
 
 CGUIViewStateWindowVideoNav::CGUIViewStateWindowVideoNav(const CFileItemList& items) : CGUIViewStateWindowVideo(items)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15200
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15200&view=rev
Author:   jmarshallnz
Date:     2008-08-25 23:51:34 +0000 (Mon, 25 Aug 2008)

Log Message:
-----------
fixed: Don't focus the XBMC window on mouse over.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/XBApplicationEx.cpp
    branches/linuxport/XBMC/xbmc/XBApplicationEx.h

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-25 23:10:12 UTC (rev 15199)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-25 23:51:34 UTC (rev 15200)
@@ -3255,7 +3255,7 @@
 {
   MEASURE_FUNCTION;
 
-  if (!g_Mouse.IsActive())
+  if (!g_Mouse.IsActive() || !m_AppFocused)
     return false;
 
   // Reset the screensaver and idle timers

Modified: branches/linuxport/XBMC/xbmc/XBApplicationEx.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/XBApplicationEx.cpp	2008-08-25 23:10:12 UTC (rev 15199)
+++ branches/linuxport/XBMC/xbmc/XBApplicationEx.cpp	2008-08-25 23:51:34 UTC (rev 15200)
@@ -69,6 +69,7 @@
   m_strFrameRate[0] = L'\0';
   m_bStop = false;
   m_AppActive = true;
+  m_AppFocused = true;
 
 #ifndef HAS_SDL
   // Set up the presentation parameters for a double-buffered, 640x480,
@@ -412,6 +413,10 @@
       {
         m_AppActive = event.active.gain != 0;
       }
+      if (event.active.state & SDL_APPINPUTFOCUS)
+      {
+        m_AppFocused = event.active.gain != 0;
+      }
       break;
     case SDL_MOUSEBUTTONDOWN:
       // mouse scroll wheel.

Modified: branches/linuxport/XBMC/xbmc/XBApplicationEx.h
===================================================================
--- branches/linuxport/XBMC/xbmc/XBApplicationEx.h	2008-08-25 23:10:12 UTC (rev 15199)
+++ branches/linuxport/XBMC/xbmc/XBApplicationEx.h	2008-08-25 23:51:34 UTC (rev 15200)
@@ -75,6 +75,7 @@
   HANDLE m_hFrameCounter;     // Handle to frame rate perf counter
   bool m_bStop;
   bool m_AppActive;
+  bool m_AppFocused;
 #ifdef HAS_GAMEPAD
   // Members to init the XINPUT devices.
   XDEVICE_PREALLOC_TYPE* m_InputDeviceTypes;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15207
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15207&view=rev
Author:   wiso
Date:     2008-08-26 16:55:58 +0000 (Tue, 26 Aug 2008)

Log Message:
-----------
[WIN32]: fixed sysinfo shows wrong drives. m_diskUsage now cleaned in destructor and on GUI_MSG_WINDOW_INIT. Since the renderer is called after GUI_MSG_WINDOW_DEINIT it makes no sense there. 

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowSystemInfo.cpp
    branches/linuxport/XBMC/xbmc/win32/WIN32Util.cpp
    branches/linuxport/XBMC/xbmc/win32/WIN32Util.h

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSystemInfo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSystemInfo.cpp	2008-08-26 15:35:08 UTC (rev 15206)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSystemInfo.cpp	2008-08-26 16:55:58 UTC (rev 15207)
@@ -29,6 +29,9 @@
 #ifdef _LINUX
 #include "LinuxFileSystem.h"
 #endif
+#ifdef _WIN32PC
+#include "WIN32Util.h"
+#endif
 
 CGUIWindowSystemInfo::CGUIWindowSystemInfo(void)
 :CGUIWindow(WINDOW_SYSTEM_INFORMATION, "SettingsSystemInfo.xml")
@@ -37,6 +40,7 @@
 }
 CGUIWindowSystemInfo::~CGUIWindowSystemInfo(void)
 {
+  m_diskUsage.clear();
 }
 bool CGUIWindowSystemInfo::OnAction(const CAction &action)
 {
@@ -53,13 +57,13 @@
   {
   case GUI_MSG_WINDOW_INIT:
     {
+      m_diskUsage.clear();
       CGUIWindow::OnMessage(message);
       SetLabelDummy();
       return true;
     }
     break;
   case GUI_MSG_WINDOW_DEINIT:
-    m_diskUsage.empty();
     break;
   case GUI_MSG_CLICKED:
     {
@@ -93,29 +97,19 @@
     SetLabelDummy();
     SET_CONTROL_LABEL(40,g_localizeStrings.Get(20155));
     int i = 2;
-#ifdef _WIN32PC
-    // for backward compatibility just show Free space info else would be to long...
-    SET_CONTROL_LABEL(i++, g_infoManager.GetLabel(SYSTEM_FREE_SPACE_C));
-    SET_CONTROL_LABEL(i++, g_infoManager.GetLabel(SYSTEM_FREE_SPACE_E));
-    SET_CONTROL_LABEL(i++, g_infoManager.GetLabel(SYSTEM_FREE_SPACE_F));
-    SET_CONTROL_LABEL(i++, g_infoManager.GetLabel(SYSTEM_FREE_SPACE_G));
-    SET_CONTROL_LABEL(i++, g_infoManager.GetLabel(SYSTEM_FREE_SPACE_X));
-    SET_CONTROL_LABEL(i++, g_infoManager.GetLabel(SYSTEM_FREE_SPACE_Y));
-    SET_CONTROL_LABEL(i++, g_infoManager.GetLabel(SYSTEM_FREE_SPACE_Z));
-    SET_CONTROL_LABEL(i++, g_infoManager.GetLabel(SYSTEM_TOTAL_SPACE));
-    SET_CONTROL_LABEL(i++, g_infoManager.GetLabel(SYSTEM_USED_SPACE_PERCENT));
-    SET_CONTROL_LABEL(i++, g_infoManager.GetLabel(SYSTEM_FREE_SPACE_PERCENT));
-#else
     if (m_diskUsage.size() == 0)
     {
+#ifdef _WIN32PC
+      m_diskUsage = CWIN32Util::GetDiskUsage();
+#else
       m_diskUsage = CLinuxFileSystem::GetDiskUsage();
+#endif
     }
 
     for (size_t d = 0; d < m_diskUsage.size(); d++)
     {
       SET_CONTROL_LABEL(i++, m_diskUsage[d]);
     }
-#endif
   }
   else if(iControl == CONTROL_BT_NETWORK)
   {

Modified: branches/linuxport/XBMC/xbmc/win32/WIN32Util.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/win32/WIN32Util.cpp	2008-08-26 15:35:08 UTC (rev 15206)
+++ branches/linuxport/XBMC/xbmc/win32/WIN32Util.cpp	2008-08-26 16:55:58 UTC (rev 15207)
@@ -340,3 +340,34 @@
 
   return ret;
 }
+
+std::vector<CStdString> CWIN32Util::GetDiskUsage()
+{
+  CStdString strRet;
+  vector<CStdString> result;
+  ULARGE_INTEGER ULTotal= { { 0 } };
+  ULARGE_INTEGER ULTotalFree= { { 0 } };
+
+  char* pcBuffer= NULL;
+  DWORD dwStrLength= GetLogicalDriveStrings( 0, pcBuffer );
+  if( dwStrLength != 0 )
+  {
+    dwStrLength+= 1;
+    pcBuffer= new char [dwStrLength];
+    GetLogicalDriveStrings( dwStrLength, pcBuffer );
+    int iPos= 0;
+    do 
+    {
+      CStdString strDrive = pcBuffer + iPos;
+      if( DRIVE_FIXED == GetDriveType( strDrive.c_str()  ) &&
+        GetDiskFreeSpaceEx( ( strDrive.c_str() ), NULL, &ULTotal, &ULTotalFree ) )
+      {
+        strRet.Format("%s %d MB %s",strDrive.c_str(), int(ULTotalFree.QuadPart/(1024*1024)),g_localizeStrings.Get(160));
+        result.push_back(strRet);
+      }
+      iPos += (strlen( pcBuffer + iPos) + 1 );
+    }while( strlen( pcBuffer + iPos ) > 0 );
+  }
+  free( pcBuffer );
+  return result;
+}
\ No newline at end of file

Modified: branches/linuxport/XBMC/xbmc/win32/WIN32Util.h
===================================================================
--- branches/linuxport/XBMC/xbmc/win32/WIN32Util.h	2008-08-26 15:35:08 UTC (rev 15206)
+++ branches/linuxport/XBMC/xbmc/win32/WIN32Util.h	2008-08-26 16:55:58 UTC (rev 15207)
@@ -49,6 +49,7 @@
   static CStdString GetChangedDrive();
   static bool PowerManagement(PowerState State);
   static bool XBMCShellExecute(const CStdString &strPath, bool bWaitForScriptExit=false);
+  static std::vector<CStdString> GetDiskUsage();
 
 private:
   static DWORD dwDriveMask;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15254
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15254&view=rev
Author:   AlTheKiller
Date:     2008-08-29 18:58:54 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
fixed: Only only refresh list if we've actually modified something upon return from IMDB info view. Saves potentially lengthy (5s in my case) blocking of user input.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.h
    branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp	2008-08-29 08:57:52 UTC (rev 15253)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp	2008-08-29 18:58:54 UTC (rev 15254)
@@ -311,8 +311,8 @@
     else
       item.m_strPath = item.GetVideoInfoTag()->m_strFileNameAndPath;
   }
-  ShowIMDB(&item, info);
-  if (!info.strContent.Equals("plugin") &&
+  bool modified = ShowIMDB(&item, info);
+  if (modified && !info.strContent.Equals("plugin") &&
      (m_gWindowManager.GetActiveWindow() == WINDOW_VIDEO_FILES ||
       m_gWindowManager.GetActiveWindow() == WINDOW_VIDEO_NAV)) // since we can be called from the music library we need this check
   {
@@ -341,7 +341,7 @@
 //     and show the information.
 // 6.  Check for a refresh, and if so, go to 3.
 
-void CGUIWindowVideoBase::ShowIMDB(CFileItem *item, const SScraperInfo& info2)
+bool CGUIWindowVideoBase::ShowIMDB(CFileItem *item, const SScraperInfo& info2)
 {
   /*
   CLog::Log(LOGDEBUG,"CGUIWindowVideoBase::ShowIMDB");
@@ -359,9 +359,9 @@
   IMDB.SetScraperInfo(info2);
   SScraperInfo info(info2); // use this as nfo might change it..
 
-  if (!pDlgProgress) return ;
-  if (!pDlgSelect) return ;
-  if (!pDlgInfo) return ;
+  if (!pDlgProgress) return false;
+  if (!pDlgSelect) return false;
+  if (!pDlgInfo) return false;
   CUtil::ClearCache();
 
   // 1.  Check for already downloaded information, and if we have it, display our dialog
@@ -414,7 +414,7 @@
   if (info.strContent.Equals("plugin"))
   {
     if (!item->HasVideoInfoTag())
-      return;
+      return false;
     movieDetails = *item->GetVideoInfoTag();
 
     bHasInfo = true;
@@ -429,21 +429,26 @@
     *item->GetVideoInfoTag() = movieDetails;
     pDlgInfo->SetMovie(item);
     pDlgInfo->DoModal();
-    if (!info.strContent.Equals("plugin"))
-      item->SetThumbnailImage(pDlgInfo->GetThumbnail());
-    if ( !pDlgInfo->NeedRefresh() ) return ;
+    if (!info.strContent.Equals("plugin")){
+      CStdString thumb(pDlgInfo->GetThumbnail());
+      if (thumb != item->GetThumbnailImage()) {
+        item->SetThumbnailImage(pDlgInfo->GetThumbnail());
+        return true;
+      }
+    }
+    if ( !pDlgInfo->NeedRefresh() ) return false;
   }
 
   // quietly return if Internet lookups are disabled
-  if (!g_guiSettings.GetBool("network.enableinternet")) return ;
+  if (!g_guiSettings.GetBool("network.enableinternet")) return false;
   if (!g_settings.m_vecProfiles[g_settings.m_iLastLoadedProfileIndex].canWriteDatabases() && !g_passwordManager.bMasterUser)
-    return;
+    return false;
 
   CGUIDialogVideoScan* pDialog = (CGUIDialogVideoScan*)m_gWindowManager.GetWindow(WINDOW_DIALOG_VIDEO_SCAN);
   if (pDialog && pDialog->IsScanning())
   {
     CGUIDialogOK::ShowAndGetInput(13346,14057,-1,-1);
-    return;
+    return false;
   }
 
   CScraperUrl scrUrl;
@@ -520,7 +525,7 @@
           else if (!pDlgSelect->IsButtonPressed())
           {
             m_database.Close();
-            return; // user backed out
+            return false; // user backed out
           }
         }
       }
@@ -534,7 +539,7 @@
       if (pDlgProgress->IsCanceled())
       {
         m_database.Close();
-        return;
+        return false;
       }
 
       // Prompt the user to input the movieName
@@ -544,7 +549,7 @@
       if (!CGUIDialogKeyboard::ShowAndGetInput(movieName, g_localizeStrings.Get(iString), false))
       {
         m_database.Close();
-        return; // user backed out
+        return false; // user backed out
       }
 
       needsRefresh = true;
@@ -648,7 +653,7 @@
         if (pDlgProgress->IsCanceled())
         {
           m_database.Close();
-          return; // user cancelled
+          return false; // user cancelled
         }
         OutputDebugString("failed to get details\n");
         // show dialog...
@@ -663,12 +668,13 @@
           pDlgOK->DoModal();
         }
         m_database.Close();
-        return;
+        return false;
       }
     }
   // 6. Check for a refresh
   } while (needsRefresh);
   m_database.Close();
+  return true;
 }
 
 void CGUIWindowVideoBase::OnManualIMDB()

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.h	2008-08-29 08:57:52 UTC (rev 15253)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.h	2008-08-29 18:58:54 UTC (rev 15254)
@@ -70,7 +70,7 @@
   virtual bool OnPlayMedia(int iItem);
   void LoadPlayList(const CStdString& strPlayList, int iPlayList = PLAYLIST_VIDEO);
 
-  void ShowIMDB(CFileItem *item, const SScraperInfo& info);
+  bool ShowIMDB(CFileItem *item, const SScraperInfo& info);
 
   void OnManualIMDB();
   bool CheckMovie(const CStdString& strFileName);

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp	2008-08-29 08:57:52 UTC (rev 15253)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp	2008-08-29 18:58:54 UTC (rev 15254)
@@ -431,11 +431,11 @@
     if (pItem->HasVideoInfoTag())
       *item.GetVideoInfoTag() = *pItem->GetVideoInfoTag();
   }
-  ShowIMDB(&item,info);
+  bool modified = ShowIMDB(&item,info);
   // apply any IMDb icon to our item
-  if (pItem->m_bIsFolder)
+  if (modified && pItem->m_bIsFolder)
     CVideoInfoScanner::ApplyIMDBThumbToFolder(pItem->m_strPath, item.GetThumbnailImage());
-  if (!info.strContent.Equals("plugin"))
+  if (modified && !info.strContent.Equals("plugin"))
     Update(m_vecItems->m_strPath);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15259
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15259&view=rev
Author:   vdrfan
Date:     2008-08-29 23:35:22 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
changed: non-functional lcdproc options should not be shown.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/GUISettings.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-29 20:54:16 UTC (rev 15258)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-29 23:35:22 UTC (rev 15259)
@@ -1763,6 +1763,7 @@
 void CApplication::DimLCDOnPlayback(bool dim)
 {
 #ifdef HAS_LCD
+#ifndef _LINUX
   if(g_lcd && dim && (g_guiSettings.GetInt("lcd.disableonplayback") != LED_PLAYBACK_OFF) && (g_guiSettings.GetInt("lcd.type") != LCD_TYPE_NONE))
   {
     if ( (IsPlayingVideo()) && g_guiSettings.GetInt("lcd.disableonplayback") == LED_PLAYBACK_VIDEO)
@@ -1775,6 +1776,7 @@
   else if(!dim)
     g_lcd->SetBackLight(g_guiSettings.GetInt("lcd.backlight"));
 #endif
+#endif
 }
 
 void CApplication::StartServices()

Modified: branches/linuxport/XBMC/xbmc/GUISettings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-08-29 20:54:16 UTC (rev 15258)
+++ branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-08-29 23:35:22 UTC (rev 15259)
@@ -322,12 +322,14 @@
 #ifdef _LINUX
   AddInt(2, "lcd.type", 4501, LCD_TYPE_NONE, LCD_TYPE_NONE, 1, LCD_TYPE_LCDPROC, SPIN_CONTROL_TEXT);
 #endif
+#ifndef _LINUX // xbmc's lcdproc can't control backlight/contrast yet ..
   AddInt(4, "lcd.backlight", 463, 80, 0, 5, 100, SPIN_CONTROL_INT_PLUS, MASK_PERCENT);
   AddInt(5, "lcd.contrast", 465, 100, 0, 5, 100, SPIN_CONTROL_INT_PLUS, MASK_PERCENT);
   AddSeparator(6, "lcd.sep1");
   AddInt(7, "lcd.disableonplayback", 20310, LED_PLAYBACK_OFF, LED_PLAYBACK_OFF, 1, LED_PLAYBACK_VIDEO_MUSIC, SPIN_CONTROL_TEXT);
   AddBool(8, "lcd.enableonpaused", 20312, true);
 #endif
+#endif
 
 #ifdef __APPLE__
   AddCategory(4, "appleremote", 13600);

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-08-29 20:54:16 UTC (rev 15258)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-08-29 23:35:22 UTC (rev 15259)
@@ -769,6 +769,7 @@
       pControl->AddLabel(g_localizeStrings.Get(351), LED_COLOUR_OFF);
       pControl->SetValue(pSettingInt->GetData());
     }
+#ifndef _LINUX
     else if (strSetting.Equals("system.leddisableonplayback") || strSetting.Equals("lcd.disableonplayback"))
     {
       CSettingInt *pSettingInt = (CSettingInt*)pSetting;
@@ -779,6 +780,7 @@
       pControl->AddLabel(g_localizeStrings.Get(476), LED_PLAYBACK_VIDEO_MUSIC); // Video & Music
       pControl->SetValue(pSettingInt->GetData());
     }
+#endif
 #ifndef __APPLE__
     else if (strSetting.Equals("videoplayer.rendermethod"))
     {
@@ -1295,6 +1297,7 @@
       if (pControl && g_guiSettings.GetString(strSetting, false).IsEmpty())
         pControl->SetLabel2("");
     }
+#ifndef _LINUX
     else if (strSetting.Equals("lcd.enableonpaused"))
     {
       CGUIControl *pControl = (CGUIControl *)GetControl(pSettingControl->GetID());
@@ -1317,6 +1320,7 @@
       CGUIControl *pControl = (CGUIControl *)GetControl(pSettingControl->GetID());
       if (pControl) pControl->SetEnabled(g_guiSettings.GetInt("lcd.type") != LCD_TYPE_NONE);
     }
+#endif
     else if (strSetting.Equals("lookandfeel.soundsduringplayback"))
     {
       CGUIControl *pControl = (CGUIControl *)GetControl(pSettingControl->GetID());
@@ -1619,6 +1623,7 @@
 #endif
     g_lcd->Initialize();
   }
+#ifndef _LINUX
   else if (strSetting.Equals("lcd.backlight"))
   {
     g_lcd->SetBackLight(((CSettingInt *)pSettingControl->GetSetting())->GetData());
@@ -1628,6 +1633,7 @@
     g_lcd->SetContrast(((CSettingInt *)pSettingControl->GetSetting())->GetData());
   }
 #endif
+#endif
   else if (strSetting.Equals("servers.ftpserver"))
   {
     g_application.StopFtpServer();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15270
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15270&view=rev
Author:   topfs2
Date:     2008-08-30 09:49:41 +0000 (Sat, 30 Aug 2008)

Log Message:
-----------
[LINUX] Moved from Gnome-PowerManagement to SystemPowerManagement, should now work in KDE and with no desktop. Old code left as default and new code accesable via advancedsettings.xml <systempowermanagement>true</systempowermanagement>

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Settings.cpp
    branches/linuxport/XBMC/xbmc/Settings.h
    branches/linuxport/XBMC/xbmc/linux/HalManager.cpp

Modified: branches/linuxport/XBMC/xbmc/Settings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.cpp	2008-08-30 03:38:25 UTC (rev 15269)
+++ branches/linuxport/XBMC/xbmc/Settings.cpp	2008-08-30 09:49:41 UTC (rev 15270)
@@ -176,11 +176,14 @@
   g_advancedSettings.m_busyDialogDelay = 2000;
   g_advancedSettings.m_logLevel = LOG_LEVEL_DEBUG; // = LOG_LEVEL_NORMAL
   g_advancedSettings.m_cddbAddress = "freedb.freedb.org";
-#if defined(HAS_HAL) && defined(HAL_MOUNT)
+#ifdef HAS_HAL)
+  g_advancedSettings.m_useSystemPowerManagement = false;
+#ifdef HAL_MOUNT
   g_advancedSettings.m_useHalMount = true;
-#elif defined(HAS_HAL)
+#else
   g_advancedSettings.m_useHalMount = false;
 #endif
+#endif
   g_advancedSettings.m_fullScreenOnMovieStart = true;
   g_advancedSettings.m_noDVDROM = false;
   g_advancedSettings.m_cachePath = "Z:\\";
@@ -1209,6 +1212,7 @@
   GetString(pRootElement, "cddbaddress", g_advancedSettings.m_cddbAddress);
 #ifdef HAS_HAL
   XMLUtils::GetBoolean(pRootElement, "usehalmount", g_advancedSettings.m_useHalMount);
+  XMLUtils::GetBoolean(pRootElement, "systempowermanagement", g_advancedSettings.m_useSystemPowerManagement);
 #endif
   XMLUtils::GetBoolean(pRootElement, "nodvdrom", g_advancedSettings.m_noDVDROM);
   XMLUtils::GetBoolean(pRootElement, "usemultipaths", g_advancedSettings.m_useMultipaths);

Modified: branches/linuxport/XBMC/xbmc/Settings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.h	2008-08-30 03:38:25 UTC (rev 15269)
+++ branches/linuxport/XBMC/xbmc/Settings.h	2008-08-30 09:49:41 UTC (rev 15270)
@@ -170,6 +170,7 @@
     CStdString m_cddbAddress;
 #ifdef HAS_HAL
     bool m_useHalMount;
+    bool m_useSystemPowerManagement;
 #endif
     bool m_fullScreenOnMovieStart;
     bool m_noDVDROM;

Modified: branches/linuxport/XBMC/xbmc/linux/HalManager.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/linux/HalManager.cpp	2008-08-30 03:38:25 UTC (rev 15269)
+++ branches/linuxport/XBMC/xbmc/linux/HalManager.cpp	2008-08-30 09:49:41 UTC (rev 15270)
@@ -383,59 +383,122 @@
 // Makes a temporary DBus connection and sends a PowerManagement call
 bool CHalManager::PowerManagement(PowerState State)
 {
-  DBusMessage* msg;
-  DBusConnection *connection = dbus_bus_get (DBUS_BUS_SESSION, &m_Error);
-  if (connection)
+  if (g_advancedSettings.m_useSystemPowerManagement)
   {
-    CStdString StateString;
-    switch (State)
+    DBusMessage* msg;
+    DBusMessageIter args;
+    DBusError error;
+    dbus_error_init (&error);
+    DBusConnection *connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
+    dbus_int32_t int32 = 0;
+    if (connection)
     {
-    case POWERSTATE_HIBERNATE:
-      StateString = "Hibernate";
-      break;
-    case POWERSTATE_SUSPEND:
-      StateString = "Suspend";
-      break;
-    case POWERSTATE_SHUTDOWN:
-      StateString = "Shutdown";
-      break;
-    case POWERSTATE_REBOOT:
-      StateString = "Reboot";
-      break;
-    default:
-      CLog::Log(LOGERROR, "DBus: Unrecognised State");
-      return false;
-      break;
+      switch (State)
+      {
+      case POWERSTATE_HIBERNATE:
+        msg = dbus_message_new_method_call("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device.SystemPowerManagement", "Hibernate");
+        dbus_message_iter_init_append(msg, &args);
+        if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_INT32, &int32))
+          CLog::Log(LOGERROR, "DBus: Failed to append arguments");
+        break;
+      case POWERSTATE_SUSPEND:
+        msg = dbus_message_new_method_call("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device.SystemPowerManagement", "Suspend");
+        dbus_message_iter_init_append(msg, &args);
+        if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_INT32, &int32))
+          CLog::Log(LOGERROR, "DBus: Failed to append arguments");
+        break;
+      case POWERSTATE_SHUTDOWN:
+        msg = dbus_message_new_method_call("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device.SystemPowerManagement", "Shutdown");
+        break;
+      case POWERSTATE_REBOOT:
+        msg = dbus_message_new_method_call("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device.SystemPowerManagement", "Reboot");
+        break;
+      default:
+        CLog::Log(LOGERROR, "DBus: Unrecognised State");
+        return false;
+        break;
+      }
+
+      if (msg == NULL)
+        CLog::Log(LOGERROR, "DBus: Create PowerManagement Message failed");
+      else
+      {
+        DBusMessage *reply;
+        reply = dbus_connection_send_with_reply_and_block(connection, msg, -1, &error); //The reply timout might be bad to have as -1
+        if (dbus_error_is_set(&error))
+        {
+          CLog::Log(LOGERROR, "DBus: %s - %s", error.name, error.message);
+          return false;
+        }
+        // Need to create a reader for the Message
+        dbus_message_unref (reply);
+        dbus_message_unref(msg);
+        msg = NULL;
+      }
+
+      dbus_connection_unref(connection);
+      connection = NULL;
+      return true;
     }
-    msg = dbus_message_new_method_call("org.freedesktop.PowerManagement", "/org/freedesktop/PowerManagement", "org.freedesktop.PowerManagement", StateString.c_str());
 
-    if (msg == NULL)
-      CLog::Log(LOGERROR, "DBus: Create PowerManagement Message failed");
-    else
+    return false;
+  }
+  else
+  {
+    DBusMessage* msg;
+    DBusConnection *connection = dbus_bus_get (DBUS_BUS_SESSION, &m_Error);
+    if (connection)
     {
-      dbus_message_set_no_reply(msg, TRUE);
-
-      if (!dbus_connection_send(connection, msg, NULL))
+      CStdString StateString;
+      switch (State)
       {
-        CLog::Log(LOGERROR, "DBus: Ran out of memory while queueing message");
+      case POWERSTATE_HIBERNATE:
+        StateString = "Hibernate";
+        break;
+      case POWERSTATE_SUSPEND:
+        StateString = "Suspend";
+        break;
+      case POWERSTATE_SHUTDOWN:
+        StateString = "Shutdown";
+        break;
+      case POWERSTATE_REBOOT:
+        StateString = "Reboot";
+        break;
+      default:
+        CLog::Log(LOGERROR, "DBus: Unrecognised State");
         return false;
+        break;
       }
+      msg = dbus_message_new_method_call("org.freedesktop.Hal.Device.SystemPowerManagement", "/org/freedesktop/Hal/Device/SystemPowerManagement", "org.freedesktop.Hal.Device.SystemPowerManagement", StateString.c_str());
 
-      printf("Waiting for send-queue to be sent out\n");
-      dbus_connection_flush(connection);
+      if (msg == NULL)
+        CLog::Log(LOGERROR, "DBus: Create PowerManagement Message failed");
+      else
+      {
+        dbus_message_set_no_reply(msg, TRUE);
 
-      printf("Queue is now empty\n");
+        if (!dbus_connection_send(connection, msg, NULL))
+        {
+          CLog::Log(LOGERROR, "DBus: Ran out of memory while queueing message");
+          return false;
+        }
 
-      dbus_message_unref(msg);
-      msg = NULL;
+        printf("Waiting for send-queue to be sent out\n");
+        dbus_connection_flush(connection);
+
+        printf("Queue is now empty\n");
+
+        dbus_message_unref(msg);
+        msg = NULL;
+      }
+
+      dbus_connection_unref(connection);
+      connection = NULL;
+      return true;
     }
 
-    dbus_connection_unref(connection);
-    connection = NULL;
-    return true;
+    return false;
   }
-
-  return false;
 }
 
 /* libhal-storage type to readable form */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15271
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15271&view=rev
Author:   jmarshallnz
Date:     2008-08-30 09:51:16 +0000 (Sat, 30 Aug 2008)

Log Message:
-----------
fixed: Parent directory didn't function if one entered a library subnode without a library present.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowMusicNav.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIWindowMusicNav.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowMusicNav.cpp	2008-08-30 09:49:41 UTC (rev 15270)
+++ branches/linuxport/XBMC/xbmc/GUIWindowMusicNav.cpp	2008-08-30 09:51:16 UTC (rev 15271)
@@ -206,8 +206,11 @@
 
       if (m_bDisplayEmptyDatabaseMessage)
       {
+        // no library - make sure we focus on a known control, and default to the root.
         SET_CONTROL_FOCUS(CONTROL_BTNTYPE, 0);
-        Update(m_vecItems->m_strPath);  // Will remove content from the list/thumb control
+        m_vecItems->m_strPath = "";
+        SetHistoryForPath("");
+        Update("");
       }
 
       return true;

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.cpp	2008-08-30 09:49:41 UTC (rev 15270)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.cpp	2008-08-30 09:51:16 UTC (rev 15271)
@@ -197,8 +197,11 @@
 
       if (m_bDisplayEmptyDatabaseMessage)
       {
+        // no library - make sure we focus on a known control, and default to the root.
         SET_CONTROL_FOCUS(CONTROL_BTNTYPE, 0);
-        Update(m_vecItems->m_strPath);  // Will remove content from the list/thumb control
+        m_vecItems->m_strPath = "";
+        SetHistoryForPath("");
+        Update("");
       }
 
       m_database.Close();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15285
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15285&view=rev
Author:   jmarshallnz
Date:     2008-08-31 03:11:57 +0000 (Sun, 31 Aug 2008)

Log Message:
-----------
fixed: TV show refresh from nfo files failure.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/VideoDatabase.cpp
    branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp

Modified: branches/linuxport/XBMC/xbmc/VideoDatabase.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoDatabase.cpp	2008-08-31 03:10:38 UTC (rev 15284)
+++ branches/linuxport/XBMC/xbmc/VideoDatabase.cpp	2008-08-31 03:11:57 UTC (rev 15285)
@@ -1689,9 +1689,11 @@
 {
   try
   {
-    if (!m_pDB.get() || !m_pDS.get()) 
+    if (!m_pDB.get() || !m_pDS.get())
+    {
+      CLog::Log(LOGERROR, "%s: called without database open", __FUNCTION__);
       return -1;
-
+    }
     long lTvShowId = GetTvShowId(strPath);
     if (lTvShowId < 0)
       lTvShowId = AddTvShow(strPath);

Modified: branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp	2008-08-31 03:10:38 UTC (rev 15284)
+++ branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp	2008-08-31 03:11:57 UTC (rev 15285)
@@ -812,6 +812,12 @@
 
   long CVideoInfoScanner::AddMovieAndGetThumb(CFileItem *pItem, const CStdString &content, const CVideoInfoTag &movieDetails, long idShow, bool bApplyToDir, CGUIDialogProgress* pDialog /* == NULL */)
   {
+    // ensure our database is open (this can get called via other classes)
+    if (!m_database.Open())
+    {
+      CLog::Log(LOGERROR, "%s - failed to open database", __FUNCTION__);
+      return -1;
+    }
     CLog::Log(LOGDEBUG,"Adding new item to %s:%s", content.c_str(), pItem->m_strPath.c_str());
     long lResult=-1;
     // add to all movies in the stacked set
@@ -901,6 +907,7 @@
 
     if (g_guiSettings.GetBool("videolibrary.actorthumbs"))
       FetchActorThumbs(movieDetails.m_cast);
+    m_database.Close();
     return lResult;
   }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15291
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15291&view=rev
Author:   jmarshallnz
Date:     2008-08-31 07:48:47 +0000 (Sun, 31 Aug 2008)

Log Message:
-----------
cleanup: Removed some duplicate code, ifdef'd out some xbox-only stuff, and implemented tighter memory control around album + song queries. Fixes #4703.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/MusicDatabase.cpp
    branches/linuxport/XBMC/xbmc/lib/sqLite/qry_dat.h
    branches/linuxport/XBMC/xbmc/lib/sqLite/sqlitedataset.cpp
    branches/linuxport/XBMC/xbmc/lib/sqLite/sqlitedataset.h

Modified: branches/linuxport/XBMC/xbmc/MusicDatabase.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/MusicDatabase.cpp	2008-08-31 04:08:58 UTC (rev 15290)
+++ branches/linuxport/XBMC/xbmc/MusicDatabase.cpp	2008-08-31 07:48:47 UTC (rev 15291)
@@ -2527,6 +2527,8 @@
 
 bool CMusicDatabase::GetArtistsNav(const CStdString& strBaseDir, CFileItemList& items, long idGenre, bool albumArtistsOnly)
 {
+  if (NULL == m_pDB.get()) return false;
+  if (NULL == m_pDS.get()) return false;
   try
   {
     if (NULL == m_pDB.get()) return false;
@@ -2679,6 +2681,7 @@
   }
   catch (...)
   {
+    m_pDS->close();
     CLog::Log(LOGERROR, "%s failed", __FUNCTION__);
   }
   return false;
@@ -2805,11 +2808,11 @@
 
 bool CMusicDatabase::GetAlbumsByWhere(const CStdString &baseDir, const CStdString &where, CFileItemList &items)
 {
+  if (NULL == m_pDB.get()) return false;
+  if (NULL == m_pDS.get()) return false;
+
   try
   {
-    if (NULL == m_pDB.get()) return false;
-    if (NULL == m_pDS.get()) return false;
-
     CStdString sql = "select * from albumview ";
 
     // block null album names
@@ -2834,13 +2837,20 @@
     // get data from returned rows
     while (!m_pDS->eof())
     {
-      CStdString strDir;
-      long idAlbum = m_pDS->fv("idAlbum").get_asLong();
-      strDir.Format("%s%ld/", baseDir.c_str(), idAlbum);
-      CFileItemPtr pItem(new CFileItem(strDir, GetAlbumFromDataset(m_pDS.get())));
-      items.Add(pItem);
-
-      m_pDS->next();
+      try
+      {
+        CStdString strDir;
+        long idAlbum = m_pDS->fv("idAlbum").get_asLong();
+        strDir.Format("%s%ld/", baseDir.c_str(), idAlbum);
+        CFileItemPtr pItem(new CFileItem(strDir, GetAlbumFromDataset(m_pDS.get())));
+        items.Add(pItem);
+        m_pDS->next();
+      }
+      catch (...)
+      {
+        m_pDS->close();
+        CLog::Log(LOGERROR, "%s - out of memory getting listing (got %i)", __FUNCTION__, items.Size());
+      }
     }
 
     // cleanup
@@ -2849,6 +2859,7 @@
   }
   catch (...)
   {
+    m_pDS->close();
     CLog::Log(LOGERROR, "%s (%s) failed", __FUNCTION__, where.c_str());
   }
   return false;
@@ -2876,7 +2887,7 @@
     }
 
     // get data from returned rows
-    items.Reserve(iRowsFound);
+    items.Reserve(items.Size() + iRowsFound);
     // get songs from returned subtable
     int count = 0;
     while (!m_pDS->eof())
@@ -2919,158 +2930,73 @@
 
 bool CMusicDatabase::GetSongsNav(const CStdString& strBaseDir, CFileItemList& items, long idGenre, long idArtist,long idAlbum)
 {
-  try
-  {
-    DWORD time = timeGetTime();
+  CStdString strWhere;
 
-    if (NULL == m_pDB.get()) return false;
-    if (NULL == m_pDS.get()) return false;
+  if (idAlbum!=-1)
+    strWhere=FormatSQL("where (idAlbum=%ld) ", idAlbum);
 
-    CStdString strWhere;
-    CStdString strSQL = "select * from songview ";
+  if (idGenre!=-1)
+  {
+    if (strWhere.IsEmpty())
+      strWhere += "where ";
+    else
+      strWhere += "and ";
 
-    if (idAlbum!=-1)
-      strWhere=FormatSQL("where (idAlbum=%ld) ", idAlbum);
+    strWhere += FormatSQL("(idGenre=%ld " // All songs where primary genre fits
+                          "or idSong IN "
+                            "("
+                            "select exgenresong.idSong from exgenresong " // All songs by where extra genres fit
+                            "where exgenresong.idGenre=%ld"
+                            ")"
+                          ") "
+                          , idGenre, idGenre);
+  }
 
-    if (idGenre!=-1)
-    {
-      if (strWhere.IsEmpty())
-        strWhere += "where ";
-      else
-        strWhere += "and ";
+  if (idArtist!=-1)
+  {
+    if (strWhere.IsEmpty())
+      strWhere += "where ";
+    else
+      strWhere += "and ";
 
-      strWhere += FormatSQL("(idGenre=%ld " // All songs where primary genre fits
-                            "or idSong IN "
-                              "("
-                              "select exgenresong.idSong from exgenresong " // All songs by where extra genres fit
-                              "where exgenresong.idGenre=%ld"
-                              ")"
-                            ") "
-                            , idGenre, idGenre);
-    }
+    strWhere += FormatSQL("(idArtist=%ld " // All songs where primary artist fits
+                          "or idSong IN "
+                            "("
+                            "select exartistsong.idSong from exartistsong " // All songs where extra artists fit
+                            "where exartistsong.idArtist=%ld"
+                            ")"
+                          "or idSong IN "
+                            "("
+                            "select song.idSong from song " // All songs where the primary album artist fits
+                            "join album on song.idAlbum=album.idAlbum "
+                            "where album.idArtist=%ld"
+                            ")"
+                          "or idSong IN "
+                            "("
+                            "select song.idSong from song " // All songs where the extra album artist fit, excluding
+                            "join exartistalbum on song.idAlbum=exartistalbum.idAlbum " // various artist albums
+                            "join album on song.idAlbum=album.idAlbum "
+                            "where exartistalbum.idArtist=%ld and album.strExtraArtists != ''"
+                            ")"
+                          ") "
+                          , idArtist, idArtist, idArtist, idArtist);
+  }
 
-    if (idArtist!=-1)
+#ifdef _XBOX
+  if (idAlbum == -1 && idArtist == -1 && idGenre == -1)
+  {
+    int iLIMIT = 5000;    // chunk size
+    for (int i=0;;i+=iLIMIT)
     {
-      if (strWhere.IsEmpty())
-        strWhere += "where ";
-      else
-        strWhere += "and ";
-
-      strWhere += FormatSQL("(idArtist=%ld " // All songs where primary artist fits
-                            "or idSong IN "
-                              "("
-                              "select exartistsong.idSong from exartistsong " // All songs where extra artists fit
-                              "where exartistsong.idArtist=%ld"
-                              ")"
-                            "or idSong IN "
-                              "("
-                              "select song.idSong from song " // All songs where the primary album artist fits
-                              "join album on song.idAlbum=album.idAlbum "
-                              "where album.idArtist=%ld"
-                              ")"
-                            "or idSong IN "
-                              "("
-                              "select song.idSong from song " // All songs where the extra album artist fit, excluding
-                              "join exartistalbum on song.idAlbum=exartistalbum.idAlbum " // various artist albums
-                              "join album on song.idAlbum=album.idAlbum "
-                              "where exartistalbum.idArtist=%ld and album.strExtraArtists != ''"
-                              ")"
-                            ") "
-                            , idArtist, idArtist, idArtist, idArtist);
+      CStdString limitedWhere = FormatSQL("%s limit %i offset %i", strWhere.c_str(), iLIMIT, i);
+      if (!GetSongsByWhere(strBaseDir, limitedWhere, items))
+        return items.Size() > 0;
     }
-
-    strSQL += strWhere;
-
-    // get all songs out of the database in fixed size chunks
-    // dont reserve the items ahead of time just in case it fails part way though
-    if (idAlbum == -1 && idArtist == -1 && idGenre == -1)
-    {
-      int iLIMIT = 5000;    // chunk size
-      int iSONGS = 0;       // number of songs added to items
-      int iITERATIONS = 0;  // number of iterations
-      for (int i=0;;i+=iLIMIT)
-      {
-        CStdString strSQL2=FormatSQL("%s limit %i offset %i", strSQL.c_str(), iLIMIT, i);
-        CLog::Log(LOGDEBUG, "%s query: %s", __FUNCTION__, strSQL2.c_str());
-        try
-        {
-          if (!m_pDS->query(strSQL2.c_str()))
-            return false;
-
-          // keep going until no rows are left!
-          int iRowsFound = m_pDS->num_rows();
-          if (iRowsFound == 0)
-          {
-            m_pDS->close();
-            if (iITERATIONS == 0)
-              return false; // failed on first iteration, so there's probably no songs in the db
-            else
-              return true; // there no more songs left to process (aborts the unbounded for loop)
-          }
-
-          // get songs from returned subtable
-          while (!m_pDS->eof())
-          {
-            CFileItemPtr item(new CFileItem);
-            GetFileItemFromDataset(item.get(), strBaseDir);
-            items.Add(item);
-            iSONGS++;
-            m_pDS->next();
-          }
-        }
-        catch (...)
-        {
-          CLog::Log(LOGERROR, "%s failed at iteration %i, num songs %i", __FUNCTION__, iITERATIONS, iSONGS);
-
-          if (iSONGS > 0)
-            return true; // keep whatever songs we may have gotten before the failure
-          else
-            return false; // no songs, return false
-        }
-        // next iteration
-        iITERATIONS++;
-        m_pDS->close();
-      }
-      return true;
-    }
-
-    // run query
-    CLog::Log(LOGDEBUG, "%s query: %s", __FUNCTION__, strSQL.c_str());
-    if (!m_pDS->query(strSQL.c_str())) return false;
-    int iRowsFound = m_pDS->num_rows();
-    if (iRowsFound == 0)
-    {
-      m_pDS->close();
-      return false;
-    }
-
-    CLog::Log(LOGDEBUG,"Time for actual SQL query = %u",
-              timeGetTime() - time); time = timeGetTime();
-
-    // get data from returned rows
-    items.Reserve(iRowsFound);
-
-    while (!m_pDS->eof())
-    {
-      CFileItemPtr item(new CFileItem);
-      GetFileItemFromDataset(item.get(), strBaseDir);
-      items.Add(item);
-
-      m_pDS->next();
-    }
-
-    CLog::Log(LOGDEBUG,"Time to retrieve songs from dataset = %u",
-              timeGetTime() - time);
-
-    // cleanup
-    m_pDS->close();
     return true;
   }
-  catch (...)
-  {
-    CLog::Log(LOGERROR, "%s failed", __FUNCTION__);
-  }
-  return false;
+#endif
+  // run query
+  return GetSongsByWhere(strBaseDir, strWhere, items);
 }
 
 bool CMusicDatabase::UpdateOldVersion(int version)

Modified: branches/linuxport/XBMC/xbmc/lib/sqLite/qry_dat.h
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/sqLite/qry_dat.h	2008-08-31 04:08:58 UTC (rev 15290)
+++ branches/linuxport/XBMC/xbmc/lib/sqLite/qry_dat.h	2008-08-31 07:48:47 UTC (rev 15291)
@@ -227,7 +227,8 @@
   void clear()
   {
     for (unsigned int i = 0; i < records.size(); i++)
-      delete records[i];
+      if (records[i])
+        delete records[i];
     records.clear();
     record_header.clear();
   };

Modified: branches/linuxport/XBMC/xbmc/lib/sqLite/sqlitedataset.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/sqLite/sqlitedataset.cpp	2008-08-31 04:08:58 UTC (rev 15290)
+++ branches/linuxport/XBMC/xbmc/lib/sqLite/sqlitedataset.cpp	2008-08-31 07:48:47 UTC (rev 15291)
@@ -375,26 +375,27 @@
   if (result.records.size() != 0)
   {
     const sql_record *row = result.records[frecno];
-    const unsigned int ncols = row->size();
-    fields_object->resize(ncols);
-    edit_object->resize(ncols);
-    for (unsigned int i = 0; i < ncols; i++)
+    if (row)
     {
-      (*fields_object)[i].val = row->at(i);
-      (*edit_object)[i].val = row->at(i);
+      const unsigned int ncols = row->size();
+      fields_object->resize(ncols);
+      edit_object->resize(ncols);
+      for (unsigned int i = 0; i < ncols; i++)
+      {
+        (*fields_object)[i].val = row->at(i);
+        (*edit_object)[i].val = row->at(i);
+      }
+      return;
     }
   }
-  else
+  const unsigned int ncols = result.record_header.size();
+  fields_object->resize(ncols);
+  edit_object->resize(ncols);
+  for (unsigned int i = 0; i < ncols; i++)
   {
-    const unsigned int ncols = result.record_header.size();
-    fields_object->resize(ncols);
-    edit_object->resize(ncols);
-    for (unsigned int i = 0; i < ncols; i++)
-    {
-      (*fields_object)[i].val = "";
-      (*edit_object)[i].val = "";
-    }    
-  }
+    (*fields_object)[i].val = "";
+    (*edit_object)[i].val = "";
+  }    
 }
 
 
@@ -559,12 +560,27 @@
 }
 
 void SqliteDataset::next(void) {
+#ifdef _XBOX
+  free_row();
+#endif
   Dataset::next();
   if (!eof()) 
       fill_fields();
 }
 
+void SqliteDataset::free_row(void)
+{
+  if (frecno < 0 || (unsigned int)frecno >= result.records.size())
+    return;
 
+  sql_record *row = result.records[frecno];
+  if (row)
+  {
+    delete row;
+    result.records[frecno] = NULL;
+  }
+}
+
 bool SqliteDataset::seek(int pos) {
   if (ds_state == dsSelect) {
     Dataset::seek(pos);

Modified: branches/linuxport/XBMC/xbmc/lib/sqLite/sqlitedataset.h
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/sqLite/sqlitedataset.h	2008-08-31 04:08:58 UTC (rev 15290)
+++ branches/linuxport/XBMC/xbmc/lib/sqLite/sqlitedataset.h	2008-08-31 07:48:47 UTC (rev 15291)
@@ -120,6 +120,7 @@
   Filling the fields information from select statement */
   virtual void fill_fields();
 /* Changing field values during dataset navigation */
+  virtual void free_row();  // free the memory allocated for the current row
 
 public:
 /* constructor */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15292
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15292&view=rev
Author:   jmarshallnz
Date:     2008-08-31 08:29:48 +0000 (Sun, 31 Aug 2008)

Log Message:
-----------
changed: Make default sort order in episode lists sort by episode. Fixes ticket #4711.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Settings.cpp
    branches/linuxport/XBMC/xbmc/Settings.h

Modified: branches/linuxport/XBMC/xbmc/Settings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.cpp	2008-08-31 07:48:47 UTC (rev 15291)
+++ branches/linuxport/XBMC/xbmc/Settings.cpp	2008-08-31 08:29:48 UTC (rev 15292)
@@ -176,7 +176,7 @@
   g_advancedSettings.m_busyDialogDelay = 2000;
   g_advancedSettings.m_logLevel = LOG_LEVEL_DEBUG; // = LOG_LEVEL_NORMAL
   g_advancedSettings.m_cddbAddress = "freedb.freedb.org";
-#ifdef HAS_HAL)
+#ifdef HAS_HAL
   g_advancedSettings.m_useSystemPowerManagement = false;
 #ifdef HAL_MOUNT
   g_advancedSettings.m_useHalMount = true;
@@ -746,12 +746,16 @@
   return false;
 }
 
-void CSettings::GetViewState(const TiXmlElement *pRootElement, const CStdString &strTagName, CViewState &viewState)
+void CSettings::GetViewState(const TiXmlElement *pRootElement, const CStdString &strTagName, CViewState &viewState, SORT_METHOD defaultSort)
 {
   const TiXmlElement* pNode = pRootElement->FirstChildElement(strTagName);
-  if (!pNode) return;
+  if (!pNode)
+  {
+    viewState.m_sortMethod = defaultSort;
+    return;
+  }
   GetInteger(pNode, "viewmode", viewState.m_viewMode, DEFAULT_VIEW_LIST, DEFAULT_VIEW_LIST, DEFAULT_VIEW_MAX);
-  GetInteger(pNode, "sortmethod", (int&)viewState.m_sortMethod, SORT_METHOD_LABEL, SORT_METHOD_NONE, SORT_METHOD_MAX);
+  GetInteger(pNode, "sortmethod", (int&)viewState.m_sortMethod, defaultSort, SORT_METHOD_NONE, SORT_METHOD_MAX);
   GetInteger(pNode, "sortorder", (int&)viewState.m_sortOrder, SORT_ORDER_ASC, SORT_ORDER_NONE, SORT_ORDER_DESC);
 }
 
@@ -1024,7 +1028,7 @@
     GetViewState(pElement, "videonavyears", g_stSettings.m_viewStateVideoNavYears);
     GetViewState(pElement, "videonavgenres", g_stSettings.m_viewStateVideoNavGenres);
     GetViewState(pElement, "videonavtitles", g_stSettings.m_viewStateVideoNavTitles);
-    GetViewState(pElement, "videonavepisodes", g_stSettings.m_viewStateVideoNavEpisodes);
+    GetViewState(pElement, "videonavepisodes", g_stSettings.m_viewStateVideoNavEpisodes, SORT_METHOD_EPISODE);
     GetViewState(pElement, "videonavtvshows", g_stSettings.m_viewStateVideoNavTvShows);
     GetViewState(pElement, "videonavseasons", g_stSettings.m_viewStateVideoNavSeasons);
     GetViewState(pElement, "videonavmusicvideos", g_stSettings.m_viewStateVideoNavMusicVideos);

Modified: branches/linuxport/XBMC/xbmc/Settings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.h	2008-08-31 07:48:47 UTC (rev 15291)
+++ branches/linuxport/XBMC/xbmc/Settings.h	2008-08-31 08:29:48 UTC (rev 15292)
@@ -387,7 +387,7 @@
   bool GetSource(const CStdString &category, const TiXmlNode *source, CMediaSource &share);
   void GetSources(const TiXmlElement* pRootElement, const CStdString& strTagName, VECSOURCES& items, CStdString& strDefault);
   bool SetSources(TiXmlNode *root, const char *section, const VECSOURCES &shares, const char *defaultPath);
-  void GetViewState(const TiXmlElement* pRootElement, const CStdString& strTagName, CViewState &viewState);
+  void GetViewState(const TiXmlElement* pRootElement, const CStdString& strTagName, CViewState &viewState, SORT_METHOD defaultSort = SORT_METHOD_LABEL);
 
   void ConvertHomeVar(CStdString& strText);
   // functions for writing xml files


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15295
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15295&view=rev
Author:   vdrfan
Date:     2008-08-31 14:06:43 +0000 (Sun, 31 Aug 2008)

Log Message:
-----------
fixed: Ticket #4746 - Make LCDProc actually dim when playing movie / music

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/GUISettings.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
    branches/linuxport/XBMC/xbmc/linux/XLCDproc.cpp
    branches/linuxport/XBMC/xbmc/linux/XLCDproc.h
    branches/linuxport/XBMC/xbmc/utils/LCD.h

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-31 13:28:22 UTC (rev 15294)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-31 14:06:43 UTC (rev 15295)
@@ -1763,7 +1763,7 @@
 void CApplication::DimLCDOnPlayback(bool dim)
 {
 #ifdef HAS_LCD
-#ifndef _LINUX
+//#ifndef _LINUX
   if(g_lcd && dim && (g_guiSettings.GetInt("lcd.disableonplayback") != LED_PLAYBACK_OFF) && (g_guiSettings.GetInt("lcd.type") != LCD_TYPE_NONE))
   {
     if ( (IsPlayingVideo()) && g_guiSettings.GetInt("lcd.disableonplayback") == LED_PLAYBACK_VIDEO)
@@ -1774,6 +1774,9 @@
       g_lcd->SetBackLight(0);
   }
   else if(!dim)
+#ifdef _LINUX
+    g_lcd->SetBackLight(1);
+#else
     g_lcd->SetBackLight(g_guiSettings.GetInt("lcd.backlight"));
 #endif
 #endif

Modified: branches/linuxport/XBMC/xbmc/GUISettings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-08-31 13:28:22 UTC (rev 15294)
+++ branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-08-31 14:06:43 UTC (rev 15295)
@@ -326,10 +326,10 @@
   AddInt(4, "lcd.backlight", 463, 80, 0, 5, 100, SPIN_CONTROL_INT_PLUS, MASK_PERCENT);
   AddInt(5, "lcd.contrast", 465, 100, 0, 5, 100, SPIN_CONTROL_INT_PLUS, MASK_PERCENT);
   AddSeparator(6, "lcd.sep1");
+#endif
   AddInt(7, "lcd.disableonplayback", 20310, LED_PLAYBACK_OFF, LED_PLAYBACK_OFF, 1, LED_PLAYBACK_VIDEO_MUSIC, SPIN_CONTROL_TEXT);
   AddBool(8, "lcd.enableonpaused", 20312, true);
 #endif
-#endif
 
 #ifdef __APPLE__
   AddCategory(4, "appleremote", 13600);

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-08-31 13:28:22 UTC (rev 15294)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-08-31 14:06:43 UTC (rev 15295)
@@ -769,7 +769,7 @@
       pControl->AddLabel(g_localizeStrings.Get(351), LED_COLOUR_OFF);
       pControl->SetValue(pSettingInt->GetData());
     }
-#ifndef _LINUX
+//#ifndef _LINUX
     else if (strSetting.Equals("system.leddisableonplayback") || strSetting.Equals("lcd.disableonplayback"))
     {
       CSettingInt *pSettingInt = (CSettingInt*)pSetting;
@@ -780,7 +780,7 @@
       pControl->AddLabel(g_localizeStrings.Get(476), LED_PLAYBACK_VIDEO_MUSIC); // Video & Music
       pControl->SetValue(pSettingInt->GetData());
     }
-#endif
+//#endif
 #ifndef __APPLE__
     else if (strSetting.Equals("videoplayer.rendermethod"))
     {
@@ -1297,7 +1297,7 @@
       if (pControl && g_guiSettings.GetString(strSetting, false).IsEmpty())
         pControl->SetLabel2("");
     }
-#ifndef _LINUX
+//#ifndef _LINUX
     else if (strSetting.Equals("lcd.enableonpaused"))
     {
       CGUIControl *pControl = (CGUIControl *)GetControl(pSettingControl->GetID());
@@ -1310,6 +1310,7 @@
       CGUIControl *pControl = (CGUIControl *)GetControl(pSettingControl->GetID());
       if (pControl) pControl->SetEnabled(g_guiSettings.GetInt("system.leddisableonplayback") != LED_PLAYBACK_OFF && g_guiSettings.GetInt("system.ledcolour") != LED_COLOUR_OFF && g_guiSettings.GetInt("system.ledcolour") != LED_COLOUR_NO_CHANGE);
     }
+#ifndef _LINUX
     else if (strSetting.Equals("lcd.backlight") || strSetting.Equals("lcd.disableonplayback"))
     {
       CGUIControl *pControl = (CGUIControl *)GetControl(pSettingControl->GetID());

Modified: branches/linuxport/XBMC/xbmc/linux/XLCDproc.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/linux/XLCDproc.cpp	2008-08-31 13:28:22 UTC (rev 15294)
+++ branches/linuxport/XBMC/xbmc/linux/XLCDproc.cpp	2008-08-31 14:06:43 UTC (rev 15295)
@@ -93,7 +93,32 @@
 }
 void XLCDproc::SetBackLight(int iLight)
 {
-  //TODO:
+  if (sockfd > 0) 
+  { 
+    //Build command 
+    CStdString cmd; 
+
+    if (iLight == 0) {
+      m_bStop = true;
+      cmd = "screen_set xbmc -backlight off\n"; 
+      cmd.append("widget_del xbmc line1\n");
+      cmd.append("widget_del xbmc line2\n");
+      cmd.append("widget_del xbmc line3\n");
+      cmd.append("widget_del xbmc line4\n");
+    }
+    if (iLight > 0) {
+      m_bStop = false;
+      cmd = "screen_set xbmc -backlight on\n"; 
+      cmd.append("widget_add xbmc line1 scroller\n");
+      cmd.append("widget_add xbmc line2 scroller\n");
+      cmd.append("widget_add xbmc line3 scroller\n");
+      cmd.append("widget_add xbmc line4 scroller\n");
+    }
+ 
+    //Send to server 
+    if (write(sockfd,cmd.c_str(),cmd.size()) < 0) 
+      CLog::Log(LOGERROR, "LCDproc:Initialize: Unable to write to socket"); 
+  } 
 }
 void XLCDproc::SetContrast(int iContrast)
 {
@@ -111,6 +136,40 @@
   }
 }
 
+void XLCDproc::Suspend() 
+{ 
+  if (!m_bStop) 
+  { 
+    if (sockfd > 0) 
+    { 
+      //Build command to suspend screen 
+      CStdString cmd; 
+      cmd = "screen_set xbmc -priority hidden\n"; 
+ 
+      //Send to server 
+      if (write(sockfd,cmd.c_str(),cmd.size()) < 0) 
+        CLog::Log(LOGERROR, "LCDproc:Initialize: Unable to write to socket"); 
+    } 
+  } 
+} 
+ 
+void XLCDproc::Resume() 
+{ 
+  if (!m_bStop) 
+  { 
+    if (sockfd > 0) 
+    { 
+      //Build command to resume screen 
+      CStdString cmd; 
+      cmd = "screen_set xbmc -priority info\n"; 
+ 
+      //Send to server 
+      if (write(sockfd,cmd.c_str(),cmd.size()) < 0) 
+        CLog::Log(LOGERROR, "LCDproc:Initialize: Unable to write to socket"); 
+    } 
+  } 
+} 
+
 void XLCDproc::SetLine(int iLine, const CStdString& strLine)
 {
   if (m_bStop)

Modified: branches/linuxport/XBMC/xbmc/linux/XLCDproc.h
===================================================================
--- branches/linuxport/XBMC/xbmc/linux/XLCDproc.h	2008-08-31 13:28:22 UTC (rev 15294)
+++ branches/linuxport/XBMC/xbmc/linux/XLCDproc.h	2008-08-31 14:06:43 UTC (rev 15295)
@@ -34,6 +34,8 @@
   virtual ~XLCDproc(void);
   virtual void Initialize();
   virtual void Stop();
+  virtual void Suspend(); 
+  virtual void Resume(); 
   virtual void SetBackLight(int iLight);
   virtual void SetContrast(int iContrast);
 

Modified: branches/linuxport/XBMC/xbmc/utils/LCD.h
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/LCD.h	2008-08-31 13:28:22 UTC (rev 15294)
+++ branches/linuxport/XBMC/xbmc/utils/LCD.h	2008-08-31 14:06:43 UTC (rev 15295)
@@ -50,6 +50,8 @@
                 };
   virtual void Initialize();
   virtual void Stop() = 0;
+  virtual void Suspend() = 0; 
+  virtual void Resume() = 0; 
   virtual void SetBackLight(int iLight) = 0;
   virtual void SetContrast(int iContrast) = 0;
   virtual void SetLine(int iLine, const CStdString& strLine) = 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15296
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15296&view=rev
Author:   vdrfan
Date:     2008-08-31 14:13:51 +0000 (Sun, 31 Aug 2008)

Log Message:
-----------
fixed: removed some commented lines from previous commit

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-31 14:06:43 UTC (rev 15295)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-08-31 14:13:51 UTC (rev 15296)
@@ -1763,7 +1763,6 @@
 void CApplication::DimLCDOnPlayback(bool dim)
 {
 #ifdef HAS_LCD
-//#ifndef _LINUX
   if(g_lcd && dim && (g_guiSettings.GetInt("lcd.disableonplayback") != LED_PLAYBACK_OFF) && (g_guiSettings.GetInt("lcd.type") != LCD_TYPE_NONE))
   {
     if ( (IsPlayingVideo()) && g_guiSettings.GetInt("lcd.disableonplayback") == LED_PLAYBACK_VIDEO)

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-08-31 14:06:43 UTC (rev 15295)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-08-31 14:13:51 UTC (rev 15296)
@@ -769,7 +769,6 @@
       pControl->AddLabel(g_localizeStrings.Get(351), LED_COLOUR_OFF);
       pControl->SetValue(pSettingInt->GetData());
     }
-//#ifndef _LINUX
     else if (strSetting.Equals("system.leddisableonplayback") || strSetting.Equals("lcd.disableonplayback"))
     {
       CSettingInt *pSettingInt = (CSettingInt*)pSetting;
@@ -780,7 +779,6 @@
       pControl->AddLabel(g_localizeStrings.Get(476), LED_PLAYBACK_VIDEO_MUSIC); // Video & Music
       pControl->SetValue(pSettingInt->GetData());
     }
-//#endif
 #ifndef __APPLE__
     else if (strSetting.Equals("videoplayer.rendermethod"))
     {
@@ -1297,7 +1295,6 @@
       if (pControl && g_guiSettings.GetString(strSetting, false).IsEmpty())
         pControl->SetLabel2("");
     }
-//#ifndef _LINUX
     else if (strSetting.Equals("lcd.enableonpaused"))
     {
       CGUIControl *pControl = (CGUIControl *)GetControl(pSettingControl->GetID());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15332
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15332&view=rev
Author:   jmarshallnz
Date:     2008-09-02 02:07:32 +0000 (Tue, 02 Sep 2008)

Log Message:
-----------
fixed: Ticket #4768 - Choosing fanart for a movie adds it to the tvshows list.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.h
    branches/linuxport/XBMC/xbmc/VideoDatabase.cpp
    branches/linuxport/XBMC/xbmc/VideoDatabase.h

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp	2008-09-02 01:33:14 UTC (rev 15331)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp	2008-09-02 02:07:32 UTC (rev 15332)
@@ -291,7 +291,8 @@
   // old fixed id labels that we have floating around (they may be using
   // content type to determine visibility, so we'll set the wrong label)
   ClearCastList();
-  if (!m_movieItem->GetVideoInfoTag()->m_strArtist.IsEmpty())
+  VIDEODB_CONTENT_TYPE type = GetContentType(m_movieItem.get());
+  if (type == VIDEODB_CONTENT_MUSICVIDEOS)
   { // music video
     CStdStringArray artists;
     StringUtils::SplitString(m_movieItem->GetVideoInfoTag()->m_strArtist, g_advancedSettings.m_videoItemSeparator, artists);
@@ -302,7 +303,7 @@
         item->SetThumbnailImage(item->GetCachedArtistThumb());
       item->SetIconImage("DefaultArtist.png");
       m_castList->Add(item);
-}
+    }
     m_castList->SetContent("musicvideos");
   }
   else
@@ -322,7 +323,7 @@
       m_castList->Add(item);
     }
     // determine type:
-    if (m_movieItem->m_bIsFolder)
+    if (type == VIDEODB_CONTENT_TVSHOWS)
     {
       m_castList->SetContent("tvshows");
       // special case stuff for shows (not currently retrieved from the library in filemode (ref: GetTvShowInfo vs GetTVShowsByWhere)
@@ -335,7 +336,7 @@
       if (CFile::Exists(m_movieItem->GetCachedFanart()))
         m_movieItem->SetProperty("fanart_image",m_movieItem->GetCachedFanart());
     }
-    else if (m_movieItem->GetVideoInfoTag()->m_iSeason > -1)
+    else if (type == VIDEODB_CONTENT_EPISODES)
     {
       m_castList->SetContent("episodes");
       // special case stuff for episodes (not currently retrieved from the library in filemode (ref: GetEpisodeInfo vs GetEpisodesByWhere)
@@ -610,30 +611,36 @@
   db.Close();
 }
 
-/// \brief React on the selected search item
-/// \param pItem Search result item
-void CGUIWindowVideoInfo::OnSearchItemFound(const CFileItem* pItem)
+VIDEODB_CONTENT_TYPE CGUIWindowVideoInfo::GetContentType(const CFileItem *pItem) const
 {
-  int iType=0;
+  VIDEODB_CONTENT_TYPE type = VIDEODB_CONTENT_MOVIES;
   if (pItem->HasVideoInfoTag() && !pItem->GetVideoInfoTag()->m_strShowTitle.IsEmpty()) // tvshow
-    iType = 2;
+    type = VIDEODB_CONTENT_TVSHOWS;
   if (pItem->HasVideoInfoTag() && pItem->GetVideoInfoTag()->m_iSeason > -1 && !pItem->m_bIsFolder) // episode
-    iType = 1;
+    type = VIDEODB_CONTENT_EPISODES;
   if (pItem->HasVideoInfoTag() && !pItem->GetVideoInfoTag()->m_strArtist.IsEmpty())
-    iType = 3;
+    type = VIDEODB_CONTENT_MUSICVIDEOS;
+  return type;
+}
 
+/// \brief React on the selected search item
+/// \param pItem Search result item
+void CGUIWindowVideoInfo::OnSearchItemFound(const CFileItem* pItem)
+{
+  VIDEODB_CONTENT_TYPE type = GetContentType(pItem);
+
   CVideoDatabase db;
   if (!db.Open())
     return;
 
   CVideoInfoTag movieDetails;
-  if (iType == 0)
+  if (type == VIDEODB_CONTENT_MOVIES)
     db.GetMovieInfo(pItem->m_strPath, movieDetails, pItem->GetVideoInfoTag()->m_iDbId);
-  if (iType == 1)
+  if (type == VIDEODB_CONTENT_EPISODES)
     db.GetEpisodeInfo(pItem->m_strPath, movieDetails, pItem->GetVideoInfoTag()->m_iDbId);
-  if (iType == 2)
+  if (type == VIDEODB_CONTENT_TVSHOWS)
     db.GetTvShowInfo(pItem->m_strPath, movieDetails, pItem->GetVideoInfoTag()->m_iDbId);
-  if (iType == 3)
+  if (type == VIDEODB_CONTENT_MUSICVIDEOS)
     db.GetMusicVideoInfo(pItem->m_strPath, movieDetails, pItem->GetVideoInfoTag()->m_iDbId);
   db.Close();
 
@@ -842,7 +849,7 @@
       CVideoDatabase db;
       if (db.Open())
       {
-        db.SetDetailsForTvShow(m_movieItem->m_strPath, *m_movieItem->GetVideoInfoTag());
+        db.UpdateFanart(*m_movieItem, GetContentType(m_movieItem.get()));
         db.Close();
       }
 

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.h	2008-09-02 01:33:14 UTC (rev 15331)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.h	2008-09-02 02:07:32 UTC (rev 15332)
@@ -47,6 +47,7 @@
   void Refresh();
   void Update();
   void SetLabel(int iControl, const CStdString& strLabel);
+  VIDEODB_CONTENT_TYPE GetContentType(const CFileItem *pItem) const;
 
   // link cast to movies
   void ClearCastList();

Modified: branches/linuxport/XBMC/xbmc/VideoDatabase.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoDatabase.cpp	2008-09-02 01:33:14 UTC (rev 15331)
+++ branches/linuxport/XBMC/xbmc/VideoDatabase.cpp	2008-09-02 02:07:32 UTC (rev 15332)
@@ -3238,6 +3238,29 @@
   return -1;
 }
 
+void CVideoDatabase::UpdateFanart(const CFileItem &item, VIDEODB_CONTENT_TYPE type)
+{
+  if (NULL == m_pDB.get()) return;
+  if (NULL == m_pDS.get()) return;
+  if (!item.HasVideoInfoTag() || item.GetVideoInfoTag()->m_iDbId < 0) return;
+
+  const CVideoInfoTag *tag = item.GetVideoInfoTag();
+  CStdString exec;
+  if (type == VIDEODB_CONTENT_TVSHOWS)
+    exec = FormatSQL("UPDATE tvshow set c%02d=%i WHERE idshow=%i", VIDEODB_ID_TV_FANART, item.GetVideoInfoTag()->m_fanart.m_xml, item.GetVideoInfoTag()->m_iDbId);
+  else if (type == VIDEODB_CONTENT_MOVIES)
+    exec = FormatSQL("UPDATE movie set c%02d=%i WHERE idmovie=%i", VIDEODB_ID_FANART, item.GetVideoInfoTag()->m_fanart.m_xml, item.GetVideoInfoTag()->m_iDbId);
+
+  try
+  {
+    m_pDS->exec(exec.c_str());
+  }
+  catch (...)
+  {
+    CLog::Log(LOGERROR, "%s - error updating fanart for %s", __FUNCTION__, item.m_strPath.c_str());
+  }
+}
+
 void CVideoDatabase::MarkAsWatched(const CFileItem &item)
 {
   // first grab the type of video and it's id

Modified: branches/linuxport/XBMC/xbmc/VideoDatabase.h
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoDatabase.h	2008-09-02 01:33:14 UTC (rev 15331)
+++ branches/linuxport/XBMC/xbmc/VideoDatabase.h	2008-09-02 02:07:32 UTC (rev 15332)
@@ -332,6 +332,7 @@
   void DeleteMusicVideo(const CStdString& strFilenameAndPath, bool bKeepId = false, bool bKeepThumb = false);
   void DeleteDetailsForTvShow(const CStdString& strPath);
   void RemoveContentForPath(const CStdString& strPath,CGUIDialogProgress *progress = NULL);
+  void UpdateFanart(const CFileItem &item, VIDEODB_CONTENT_TYPE type);
 
   // per-file video settings
   bool GetVideoSettings(const CStdString &strFilenameAndPath, CVideoSettings &settings);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15339
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15339&view=rev
Author:   vdrfan
Date:     2008-09-02 07:11:01 +0000 (Tue, 02 Sep 2008)

Log Message:
-----------
fixed: Ticket #4770 - Add Source default name doesn't update

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIDialogMediaSource.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogMediaSource.h

Modified: branches/linuxport/XBMC/xbmc/GUIDialogMediaSource.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogMediaSource.cpp	2008-09-02 06:56:17 UTC (rev 15338)
+++ branches/linuxport/XBMC/xbmc/GUIDialogMediaSource.cpp	2008-09-02 07:11:01 UTC (rev 15339)
@@ -53,13 +53,17 @@
 
 CGUIDialogMediaSource::~CGUIDialogMediaSource()
 {
+  m_bNameChanged=false;
   delete m_paths;
 }
 
 bool CGUIDialogMediaSource::OnAction(const CAction &action)
 {
   if (action.wID == ACTION_PREVIOUS_MENU)
+  {
     m_confirmed = false;
+    m_bNameChanged=false;
+  }
   return CGUIDialog::OnAction(action);
 }
 
@@ -82,6 +86,7 @@
       else if (iControl == CONTROL_NAME)
       {
         OnEditChanged(iControl, m_name);
+	m_bNameChanged=true;
         UpdateButtons();
       }
       else if (iControl == CONTROL_OK)
@@ -248,7 +253,7 @@
     extraShares.push_back(share1);
 
     share1.strPath = "smb://";
-    share1.strName = "Windows Network (SMB)";
+    share1.strName = g_localizeStrings.Get(20171);
     extraShares.push_back(share1);
 
     share1.strPath = "upnp://";
@@ -310,7 +315,7 @@
     extraShares.push_back(share2);
 
     share2.strPath = "smb://";
-    share2.strName = "Windows Network (SMB)";
+    share2.strName = g_localizeStrings.Get(20171);
     extraShares.push_back(share2);
 
     share2.strPath = "hdhomerun://";
@@ -347,7 +352,7 @@
     CMediaSource share2;
 
     share2.strPath = "smb://";
-    share2.strName = "Windows Network (SMB)";
+    share2.strName = g_localizeStrings.Get(20171);
     extraShares.push_back(share2);
 
     share2.strPath = "upnp://";
@@ -376,7 +381,7 @@
   if (CGUIDialogFileBrowser::ShowAndGetSource(path, allowNetworkShares, extraShares.size()==0?NULL:&extraShares))
   {
     m_paths->Get(item)->m_strPath = path;
-    if (m_name.IsEmpty())
+    if (!m_bNameChanged || m_name.IsEmpty())
     {
       CURL url(path);
       url.GetURLWithoutUserDetails(m_name);

Modified: branches/linuxport/XBMC/xbmc/GUIDialogMediaSource.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogMediaSource.h	2008-09-02 06:56:17 UTC (rev 15338)
+++ branches/linuxport/XBMC/xbmc/GUIDialogMediaSource.h	2008-09-02 07:11:01 UTC (rev 15339)
@@ -63,6 +63,7 @@
   bool m_confirmed;
   SScraperInfo m_info;
   bool m_bRunScan;
+  bool m_bNameChanged;
 
   VIDEO::SScanSettings m_settings;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15347
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15347&view=rev
Author:   topfs2
Date:     2008-09-02 13:28:10 +0000 (Tue, 02 Sep 2008)

Log Message:
-----------
Backported the --standalone fix from PowerManagementBranch

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/GUISettings.cpp
    branches/linuxport/XBMC/xbmc/GUISettings.h

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-09-02 13:25:28 UTC (rev 15346)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-09-02 13:28:10 UTC (rev 15347)
@@ -511,6 +511,8 @@
 
 HRESULT CApplication::Create(HWND hWnd)
 {
+  g_guiSettings.Initialize();  // Initialize default Settings
+
 #ifdef _LINUX
   tzset();   // Initialize timezone information variables
 #endif

Modified: branches/linuxport/XBMC/xbmc/GUISettings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-09-02 13:25:28 UTC (rev 15346)
+++ branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-09-02 13:28:10 UTC (rev 15347)
@@ -181,6 +181,10 @@
 // Settings are case sensitive
 CGUISettings::CGUISettings(void)
 {
+}
+
+void CGUISettings::Initialize()
+{
   ZeroMemory(&m_replayGain, sizeof(ReplayGainSettings));
 
   // Pictures settings

Modified: branches/linuxport/XBMC/xbmc/GUISettings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUISettings.h	2008-09-02 13:25:28 UTC (rev 15346)
+++ branches/linuxport/XBMC/xbmc/GUISettings.h	2008-09-02 13:28:10 UTC (rev 15347)
@@ -327,6 +327,8 @@
   CGUISettings();
   ~CGUISettings();
 
+  void Initialize();
+
   void AddGroup(DWORD dwGroupID, DWORD dwLabelID);
   void AddCategory(DWORD dwGroupID, const char *strCategory, DWORD dwLabelID);
   CSettingsGroup *GetGroup(DWORD dwWindowID);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15352
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15352&view=rev
Author:   topfs2
Date:     2008-09-02 14:30:42 +0000 (Tue, 02 Sep 2008)

Log Message:
-----------
Moved advancedSettings default value initialization from constructor so we can change the default with runtime variables, ie --foo

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/Settings.cpp
    branches/linuxport/XBMC/xbmc/Settings.h

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-09-02 14:23:06 UTC (rev 15351)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-09-02 14:30:42 UTC (rev 15352)
@@ -512,6 +512,7 @@
 HRESULT CApplication::Create(HWND hWnd)
 {
   g_guiSettings.Initialize();  // Initialize default Settings
+  g_settings.Initialize(); //Initialize default AdvancedSettings
 
 #ifdef _LINUX
   tzset();   // Initialize timezone information variables

Modified: branches/linuxport/XBMC/xbmc/Settings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.cpp	2008-09-02 14:23:06 UTC (rev 15351)
+++ branches/linuxport/XBMC/xbmc/Settings.cpp	2008-09-02 14:30:42 UTC (rev 15352)
@@ -64,6 +64,10 @@
 
 CSettings::CSettings(void)
 {
+}
+
+void CSettings::Initialize()
+{
   for (int i = HDTV_1080i; i <= PAL60_16x9; i++)
   {
     ZeroMemory(&m_ResInfo[i], sizeof(RESOLUTION));

Modified: branches/linuxport/XBMC/xbmc/Settings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.h	2008-09-02 14:23:06 UTC (rev 15351)
+++ branches/linuxport/XBMC/xbmc/Settings.h	2008-09-02 14:30:42 UTC (rev 15352)
@@ -93,6 +93,8 @@
   CSettings(void);
   virtual ~CSettings(void);
 
+  void Initialize();
+
   bool Load(bool& bXboxMediacenter, bool& bSettings);
   void Save() const;
   bool Reset();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15381
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15381&view=rev
Author:   vdrfan
Date:     2008-09-03 22:23:07 +0000 (Wed, 03 Sep 2008)

Log Message:
-----------
changed: don`t load german keyboardmap.xml. it will render the keymap useless on all sdl builds.
fixed: library should not be availabe after removing all musicvideo items 

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
    branches/linuxport/XBMC/xbmc/Settings.cpp
    branches/linuxport/XBMC/xbmc/VideoDatabase.cpp

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-09-03 21:43:25 UTC (rev 15380)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-09-03 22:23:07 UTC (rev 15381)
@@ -851,11 +851,13 @@
   CLog::Log(LOGINFO, "load language info file: %s", strLangInfoPath.c_str());
   g_langInfo.Load(strLangInfoPath);
 
+#ifdef _XBOX
   CStdString strKeyboardLayoutConfigurationPath;
   strKeyboardLayoutConfigurationPath.Format("Q:\\language\\%s\\keyboardmap.xml", strLanguage.c_str());
   strKeyboardLayoutConfigurationPath = _P(strKeyboardLayoutConfigurationPath);
   CLog::Log(LOGINFO, "load keyboard layout configuration info file: %s", strKeyboardLayoutConfigurationPath.c_str());
   g_keyboardLayoutConfiguration.Load(strKeyboardLayoutConfigurationPath);
+#endif
 
   m_splash = new CSplash(_P("Q:\\media\\splash.png"));
 #ifndef HAS_SDL_OPENGL

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-09-03 21:43:25 UTC (rev 15380)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-09-03 22:23:07 UTC (rev 15381)
@@ -223,11 +223,13 @@
 
         g_charsetConverter.reset();
 
+#ifdef _XBOX
         CStdString strKeyboardLayoutConfigurationPath;
         strKeyboardLayoutConfigurationPath.Format("Q:\\language\\%s\\keyboardmap.xml", m_strNewLanguage.c_str());
         strKeyboardLayoutConfigurationPath = _P(strKeyboardLayoutConfigurationPath);
         CLog::Log(LOGINFO, "load keyboard layout configuration info file: %s", strKeyboardLayoutConfigurationPath.c_str());
         g_keyboardLayoutConfiguration.Load(strKeyboardLayoutConfigurationPath);
+#endif
 
         CStdString strLanguagePath;
         strLanguagePath.Format("Q:\\language\\%s\\strings.xml", m_strNewLanguage.c_str());

Modified: branches/linuxport/XBMC/xbmc/Settings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.cpp	2008-09-03 21:43:25 UTC (rev 15380)
+++ branches/linuxport/XBMC/xbmc/Settings.cpp	2008-09-03 22:23:07 UTC (rev 15381)
@@ -1720,11 +1720,13 @@
     CLog::Log(LOGINFO, "load language info file:%s", strLangInfoPath.c_str());
     g_langInfo.Load(strLangInfoPath);
 
+#ifdef _XBOX
     CStdString strKeyboardLayoutConfigurationPath;
     strKeyboardLayoutConfigurationPath.Format("Q:\\language\\%s\\keyboardmap.xml", strLanguage.c_str());
     strKeyboardLayoutConfigurationPath = _P(strKeyboardLayoutConfigurationPath);
     CLog::Log(LOGINFO, "load keyboard layout configuration info file: %s", strKeyboardLayoutConfigurationPath.c_str());
     g_keyboardLayoutConfiguration.Load(strKeyboardLayoutConfigurationPath);
+#endif
 
     CStdString strLanguagePath;
     strLanguagePath.Format("Q:\\language\\%s\\strings.xml", strLanguage.c_str());

Modified: branches/linuxport/XBMC/xbmc/VideoDatabase.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoDatabase.cpp	2008-09-03 21:43:25 UTC (rev 15380)
+++ branches/linuxport/XBMC/xbmc/VideoDatabase.cpp	2008-09-03 22:23:07 UTC (rev 15381)
@@ -2350,6 +2350,8 @@
     {
       return ;
     }
+   
+    BeginTransaction();
 
     CStdString strSQL;
     strSQL=FormatSQL("delete from genrelinkmusicvideo where idmvideo=%i", lMVideoId);
@@ -2389,6 +2391,7 @@
     CStdString strPath, strFileName;
     SplitPath(strFilenameAndPath,strPath,strFileName);
     InvalidatePathHash(strPath);
+    CommitTransaction();
   }
   catch (...)
   {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15385
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15385&view=rev
Author:   kraqh3d
Date:     2008-09-04 02:51:25 +0000 (Thu, 04 Sep 2008)

Log Message:
-----------
fixed: local trailers are now always searched for, even when using nfo files which are missing the trailer field.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileItem.cpp
    branches/linuxport/XBMC/xbmc/FileItem.h
    branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp
    branches/linuxport/XBMC/xbmc/VideoInfoScanner.h

Modified: branches/linuxport/XBMC/xbmc/FileItem.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-09-04 02:48:54 UTC (rev 15384)
+++ branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-09-04 02:51:25 UTC (rev 15385)
@@ -2745,3 +2745,37 @@
   return m_musicInfoTag;
 }
 
+CStdString CFileItem::FindTrailer() const
+{
+  CStdString strTrailer;
+  CStdString strFile = m_strPath;
+  if (IsStack())
+  {
+    CStdString strPath;
+    CUtil::GetParentPath(m_strPath,strPath);
+    CStackDirectory dir;
+    CStdString strPath2;
+    strPath2 = dir.GetStackedTitlePath(strFile);
+    CUtil::AddFileToFolder(strPath,CUtil::GetFileName(strPath2),strFile);
+  }
+  if (CUtil::IsInRAR(strFile) || CUtil::IsInZIP(strFile))
+  {
+    CStdString strPath, strParent;
+    CUtil::GetDirectory(strFile,strPath);
+    CUtil::GetParentPath(strPath,strParent);
+    CUtil::AddFileToFolder(strParent,CUtil::GetFileName(m_strPath),strFile);
+  }
+  CUtil::RemoveExtension(strFile);
+  strFile += "-trailer";
+  std::vector<CStdString> exts;
+  StringUtils::SplitString(g_stSettings.m_videoExtensions,"|",exts);
+  for (unsigned int i=0;i<exts.size();++i)
+  {
+    if (CFile::Exists(strFile+exts[i]))
+    {
+      strTrailer = strFile+exts[i];
+      break;
+    }
+  }
+  return strTrailer;
+}
\ No newline at end of file

Modified: branches/linuxport/XBMC/xbmc/FileItem.h
===================================================================
--- branches/linuxport/XBMC/xbmc/FileItem.h	2008-09-04 02:48:54 UTC (rev 15384)
+++ branches/linuxport/XBMC/xbmc/FileItem.h	2008-09-04 02:51:25 UTC (rev 15385)
@@ -207,6 +207,9 @@
   void SetUserProgramThumb();
   void SetUserMusicThumb(bool alwaysCheckRemote = false);
 
+  // finds a matching local trailer file
+  CStdString FindTrailer() const;
+
   virtual bool LoadMusicTag();
 
   /* returns the content type of this item if known. will lookup for http streams */  

Modified: branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp	2008-09-04 02:48:54 UTC (rev 15384)
+++ branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp	2008-09-04 02:51:25 UTC (rev 15385)
@@ -810,7 +810,7 @@
     }
   }
 
-  long CVideoInfoScanner::AddMovieAndGetThumb(CFileItem *pItem, const CStdString &content, const CVideoInfoTag &movieDetails, long idShow, bool bApplyToDir, CGUIDialogProgress* pDialog /* == NULL */)
+  long CVideoInfoScanner::AddMovieAndGetThumb(CFileItem *pItem, const CStdString &content, CVideoInfoTag &movieDetails, long idShow, bool bApplyToDir, CGUIDialogProgress* pDialog /* == NULL */)
   {
     // ensure our database is open (this can get called via other classes)
     if (!m_database.Open())
@@ -823,6 +823,10 @@
     // add to all movies in the stacked set
     if (content.Equals("movies"))
     {
+      // find local trailer first
+      CStdString strTrailer = pItem->FindTrailer();
+      if (!strTrailer.IsEmpty())
+        movieDetails.m_strTrailer = strTrailer;
       m_database.SetDetailsForMovie(pItem->m_strPath, movieDetails);
     }
     else if (content.Equals("tvshows"))
@@ -1106,38 +1110,6 @@
 
     if ( IMDB.GetDetails(url, movieDetails, pDialog) )
     {
-      if (info.strContent.Equals("movies"))
-      {
-        CStdString strFile = pItem->m_strPath;
-        if (pItem->IsStack())
-        {
-          CStdString strPath;
-          CUtil::GetParentPath(pItem->m_strPath,strPath);
-          CStackDirectory dir;
-          CStdString strPath2;
-          strPath2 = dir.GetStackedTitlePath(strFile);
-          CUtil::AddFileToFolder(strPath,CUtil::GetFileName(strPath2),strFile);
-        }
-        if (CUtil::IsInRAR(strFile) || CUtil::IsInZIP(strFile))
-        {
-          CStdString strPath, strParent;
-          CUtil::GetDirectory(strFile,strPath);
-          CUtil::GetParentPath(strPath,strParent);
-          CUtil::AddFileToFolder(strParent,CUtil::GetFileName(pItem->m_strPath),strFile);
-        }
-        CUtil::RemoveExtension(strFile);
-        strFile += "-trailer";
-        std::vector<CStdString> exts;
-        StringUtils::SplitString(g_stSettings.m_videoExtensions,"|",exts);
-        for (unsigned int i=0;i<exts.size();++i)
-        {
-          if (CFile::Exists(strFile+exts[i]))
-          {
-            movieDetails.m_strTrailer = strFile+exts[i];
-            break;
-          }
-        }
-      }
       return AddMovieAndGetThumb(pItem, info.strContent, movieDetails, -1, bUseDirNames);
     }
     return -1;

Modified: branches/linuxport/XBMC/xbmc/VideoInfoScanner.h
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoInfoScanner.h	2008-09-04 02:48:54 UTC (rev 15384)
+++ branches/linuxport/XBMC/xbmc/VideoInfoScanner.h	2008-09-04 02:51:25 UTC (rev 15385)
@@ -71,7 +71,7 @@
     void SetObserver(IVideoInfoScannerObserver* pObserver);
 
     void EnumerateSeriesFolder(const CFileItem* item, EPISODES& episodeList);
-    long AddMovieAndGetThumb(CFileItem *pItem, const CStdString &content, const CVideoInfoTag &movieDetails, long idShow, bool bApplyToDir=false, CGUIDialogProgress* pDialog = NULL);
+    long AddMovieAndGetThumb(CFileItem *pItem, const CStdString &content, CVideoInfoTag &movieDetails, long idShow, bool bApplyToDir=false, CGUIDialogProgress* pDialog = NULL);
     void OnProcessSeriesFolder(IMDB_EPISODELIST& episodes, EPISODES& files, long lShowId, CIMDB& IMDB, const CStdString& strShowTitle, CGUIDialogProgress* pDlgProgress = NULL);
     static CStdString GetnfoFile(CFileItem *item, bool bGrabAny=false);
     long GetIMDBDetails(CFileItem *pItem, CScraperUrl &url, const SScraperInfo& info, bool bUseDirNames=false, CGUIDialogProgress* pDialog=NULL);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15391
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15391&view=rev
Author:   davilla
Date:     2008-09-05 02:32:52 +0000 (Fri, 05 Sep 2008)

Log Message:
-----------
[OSX] add build scripts for libass and libFLAC

Added Paths:
-----------
    branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/make-xbmc-lib-osx.sh
    branches/linuxport/XBMC/xbmc/lib/libass/make-xbmc-lib-osx.sh

Added: branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/make-xbmc-lib-osx.sh
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/make-xbmc-lib-osx.sh	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/make-xbmc-lib-osx.sh	2008-09-05 02:32:52 UTC (rev 15391)
@@ -0,0 +1,27 @@
+#!/bin/bash  
+
+if [ "$XBMC_ROOT" == "" ]; then
+   echo you must define XBMC_ROOT to the root source folder
+   exit 1
+fi
+
+export MACOSX_DEPLOYMENT_TARGET=10.4
+
+make distclean >/dev/null 2>&1
+
+./configure -C \
+    --with-pic \
+    --disable-asm-optimizations \
+    --disable-xmms-plugin \
+    --disable-cpplibs \
+    CFLAGS="-D_LINUX -D_DLL -fPIC -O2 -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
+
+sed -ie s/__DECLARE__XBMC__ARCH__/osx/ Makefile
+
+
+# make handles the wrapping
+make
+
+# distclean after making
+#make distclean >/dev/null 2>&1
+


Property changes on: branches/linuxport/XBMC/xbmc/cores/paplayer/flac-1.2.1/make-xbmc-lib-osx.sh
___________________________________________________________________
Added: svn:executable
   + *

Added: branches/linuxport/XBMC/xbmc/lib/libass/make-xbmc-lib-osx.sh
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libass/make-xbmc-lib-osx.sh	                        (rev 0)
+++ branches/linuxport/XBMC/xbmc/lib/libass/make-xbmc-lib-osx.sh	2008-09-05 02:32:52 UTC (rev 15391)
@@ -0,0 +1,28 @@
+#!/bin/bash  
+
+if [ "$XBMC_ROOT" == "" ]; then
+   echo you must define XBMC_ROOT to the root source folder
+   exit 1
+fi
+
+export MACOSX_DEPLOYMENT_TARGET=10.4
+
+make distclean >/dev/null 2>&1
+
+./configure CFLAGS="-D_LINUX -D_DLL -fPIC -O2 -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"
+
+make
+
+echo wrapping libass
+
+gcc -bundle -flat_namespace -undefined suppress -shared -fPIC \
+	-mmacosx-version-min=10.4 -o libass-osx.so libass/.libs/*.o
+
+cd $XBMC_ROOT/tools/Mach5;./mach5.rb $XBMC_ROOT/xbmc/lib/libass/libass-osx.so;mv output.so $XBMC_ROOT/system/players/dvdplayer/libass-osx.so
+
+rm $XBMC_ROOT/xbmc/lib/libass/libass-osx.so
+
+# distclean after making
+cd $XBMC_ROOT/xbmc/lib/libass/
+make distclean >/dev/null 2>&1
+


Property changes on: branches/linuxport/XBMC/xbmc/lib/libass/make-xbmc-lib-osx.sh
___________________________________________________________________
Added: svn:executable
   + *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15396
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15396&view=rev
Author:   davilla
Date:     2008-09-05 02:50:04 +0000 (Fri, 05 Sep 2008)

Log Message:
-----------
[ALL] XBMC for Linux/OSX will crash if they see a shn audio file, hardcoded path would try and load libshnplay.dll on both platforms.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/DllPaths_generated.h.in
    branches/linuxport/XBMC/xbmc/DllPaths_win32.h
    branches/linuxport/XBMC/xbmc/cores/paplayer/DllLibshnplay.h

Modified: branches/linuxport/XBMC/xbmc/DllPaths_generated.h.in
===================================================================
--- branches/linuxport/XBMC/xbmc/DllPaths_generated.h.in	2008-09-05 02:48:00 UTC (rev 15395)
+++ branches/linuxport/XBMC/xbmc/DllPaths_generated.h.in	2008-09-05 02:50:04 UTC (rev 15396)
@@ -38,6 +38,7 @@
 #define DLL_PATH_WAVPACK_CODEC "Q:\\system\\players\\paplayer\\wavpack-@..."
 #define DLL_PATH_WMA_CODEC     "Q:\\system\\players\\paplayer\\wma-@..."
 #define DLL_PATH_YM_CODEC      "Q:\\system\\players\\paplayer\\stsoundlibrary-@..."
+#define DLL_PATH_SHN_CODEC     "Q:\\system\\players\\paplayer\\libshnplay-@..."
 
 /* dvdplayer */
 #define DLL_PATH_LIBASS        "Q:\\system\\players\\dvdplayer\\libass-@..."

Modified: branches/linuxport/XBMC/xbmc/DllPaths_win32.h
===================================================================
--- branches/linuxport/XBMC/xbmc/DllPaths_win32.h	2008-09-05 02:48:00 UTC (rev 15395)
+++ branches/linuxport/XBMC/xbmc/DllPaths_win32.h	2008-09-05 02:50:04 UTC (rev 15396)
@@ -31,6 +31,7 @@
 #define DLL_PATH_WAVPACK_CODEC "Q:\\system\\players\\paplayer\\wavpack.dll"
 #define DLL_PATH_WMA_CODEC     "Q:\\system\\players\\paplayer\\wma.dll"
 #define DLL_PATH_YM_CODEC      "Q:\\system\\players\\paplayer\\stsoundlibrary.dll"
+#define DLL_PATH_SHN_CODEC     "Q:\\system\\players\\paplayer\\libshnplay.dll"
 
 /* dvdplayer */
 #define DLL_PATH_LIBASS        "Q:\\system\\players\\dvdplayer\\libass.dll"

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/DllLibshnplay.h
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/DllLibshnplay.h	2008-09-05 02:48:00 UTC (rev 15395)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/DllLibshnplay.h	2008-09-05 02:50:04 UTC (rev 15396)
@@ -46,7 +46,7 @@
 
 class DllLibShnPlay : public DllDynamic, DllLibShnPlayInterface
 {
-  DECLARE_DLL_WRAPPER(DllLibShnPlay, "Q:\\system\\players\\PAPlayer\\libshnplay.dll")
+  DECLARE_DLL_WRAPPER(DllLibShnPlay, DLL_PATH_SHN_CODEC)
   DEFINE_METHOD3(int, OpenStream, (ShnPlay ** p1, ShnPlayStream * p2, unsigned int p3))
   DEFINE_METHOD1(int, Close, (ShnPlay * p1))
   DEFINE_METHOD2(int, GetInfo, (ShnPlay * p1, ShnPlayInfo * p2))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15412
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15412&view=rev
Author:   jmarshallnz
Date:     2008-09-06 00:54:41 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------
changed: Make the current thumb the first item in the get thumb dialog.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowMusicInfo.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIWindowMusicInfo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowMusicInfo.cpp	2008-09-06 00:42:48 UTC (rev 15411)
+++ branches/linuxport/XBMC/xbmc/GUIWindowMusicInfo.cpp	2008-09-06 00:54:41 UTC (rev 15412)
@@ -434,9 +434,16 @@
 {
   CFileItemList items;
 
-  // Grab the thumbnail from the web
-  CStdString thumbFromWeb;
-  CUtil::AddFileToFolder(g_advancedSettings.m_cachePath, "allmusicThumb", thumbFromWeb);
+  // Current thumb
+  if (CFile::Exists(m_albumItem->GetThumbnailImage()))
+  {
+    CFileItemPtr item(new CFileItem("thumb://Current", false));
+    item->SetThumbnailImage(m_albumItem->GetThumbnailImage());
+    item->SetLabel(g_localizeStrings.Get(20016));
+    items.Add(item);
+  }
+
+  // Grab the thumbnail(s) from the web
   CScraperUrl url;
   if (m_bArtistInfo)
     url = m_artist.thumbURL;
@@ -459,15 +466,6 @@
     items.Add(item);
   }
 
-  // Current thumb
-  if (CFile::Exists(m_albumItem->GetThumbnailImage()))
-  {
-    CFileItemPtr item(new CFileItem("thumb://Current", false));
-    item->SetThumbnailImage(m_albumItem->GetThumbnailImage());
-    item->SetLabel(g_localizeStrings.Get(20016));
-    items.Add(item);
-  }
-
   // local thumb
   CStdString cachedLocalThumb;
   CStdString localThumb;

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp	2008-09-06 00:42:48 UTC (rev 15411)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp	2008-09-06 00:54:41 UTC (rev 15412)
@@ -684,11 +684,16 @@
 {
   CFileItemList items;
 
+  // Current thumb
+  if (CFile::Exists(m_movieItem->GetThumbnailImage()))
+  {
+    CFileItemPtr item(new CFileItem("thumb://Current", false));
+    item->SetThumbnailImage(m_movieItem->GetThumbnailImage());
+    item->SetLabel(g_localizeStrings.Get(20016));
+    items.Add(item);
+  }
+
   // Grab the thumbnails from the web
-  CStdString strPath;
-  CUtil::AddFileToFolder(g_advancedSettings.m_cachePath,"imdbthumbs",strPath);
-  CUtil::WipeDir(_P(strPath));
-  DIRECTORY::CDirectory::Create(strPath);
   int i=1;
   for (std::vector<CScraperUrl::SUrlEntry>::iterator iter=m_movieItem->GetVideoInfoTag()->m_strPictureURL.m_url.begin();iter != m_movieItem->GetVideoInfoTag()->m_strPictureURL.m_url.end();++iter)
   {
@@ -708,13 +713,6 @@
       CFile::Delete(item->GetCachedPictureThumb());
     items.Add(item);
   }
-  if (CFile::Exists(m_movieItem->GetThumbnailImage()))
-  {
-    CFileItemPtr item(new CFileItem("thumb://Current", false));
-    item->SetThumbnailImage(m_movieItem->GetThumbnailImage());
-    item->SetLabel(g_localizeStrings.Get(20016));
-    items.Add(item);
-  }
 
   CStdString cachedLocalThumb;
   CStdString localThumb(m_movieItem->GetUserVideoThumb());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15421
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15421&view=rev
Author:   monkeyman_67156
Date:     2008-09-06 04:27:11 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------
changed: silence some warnings

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileItem.cpp
    branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMCweb.cpp

Modified: branches/linuxport/XBMC/xbmc/FileItem.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-09-06 04:05:08 UTC (rev 15420)
+++ branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-09-06 04:27:11 UTC (rev 15421)
@@ -2778,4 +2778,5 @@
     }
   }
   return strTrailer;
-}
\ No newline at end of file
+}
+

Modified: branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMCweb.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMCweb.cpp	2008-09-06 04:05:08 UTC (rev 15420)
+++ branches/linuxport/XBMC/xbmc/lib/libGoAhead/XBMCweb.cpp	2008-09-06 04:27:11 UTC (rev 15421)
@@ -468,9 +468,9 @@
           output = buffer;
         }
       }
-      websWrite(wp, T("<html>\n"));
+      websWrite(wp, T((char*)"<html>\n"));
       cnt = websWrite(wp, (char*)output);
-      websWrite(wp, T("</html>\n"));
+      websWrite(wp, T((char*)"</html>\n"));
       return cnt;
     }
 
@@ -933,11 +933,11 @@
   parameter = websGetVar(wp, (char*)WEB_PARAMETER, (char*)XBMC_NONE);
 
   // do the command
-  websWrite(wp, T("HTTP/1.0 200 OK\r\n"));
-  websWrite(wp, T("Pragma: no-cache\r\n"));
-  websWrite(wp, T("Cache-control: no-cache\r\n"));
-  websWrite(wp, T("Content-Type: text/html\r\n"));
-  websWrite(wp, T("\r\n"));
+  websWrite(wp, T((char*)"HTTP/1.0 200 OK\r\n"));
+  websWrite(wp, T((char*)"Pragma: no-cache\r\n"));
+  websWrite(wp, T((char*)"Cache-control: no-cache\r\n"));
+  websWrite(wp, T((char*)"Content-Type: text/html\r\n"));
+  websWrite(wp, T((char*)"\r\n"));
 
   xbmcProcessCommand( NO_EID, wp, command, parameter);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15436
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15436&view=rev
Author:   vdrfan
Date:     2008-09-07 02:11:20 +0000 (Sun, 07 Sep 2008)

Log Message:
-----------
fixed: Ticket #4800 - LCD isn't updated after resume from suspend

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/Application.h
    branches/linuxport/XBMC/xbmc/linux/HalManager.cpp

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-09-07 00:35:43 UTC (rev 15435)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-09-07 02:11:20 UTC (rev 15436)
@@ -330,6 +330,7 @@
   m_bStandalone = false;
   m_bEnableLegacyRes = false;
   m_restartLirc = false;
+  m_restartLCD = false;
 }
 
 CApplication::~CApplication(void)
@@ -3266,6 +3267,14 @@
     return OnKey(key);
   }
 #endif
+#ifdef _LINUX
+  if (m_restartLCD) {
+    CLog::Log(LOGDEBUG, "g_application.m_restartLCD is true - restarting LCDd");
+    g_lcd->Stop(); 
+    g_lcd->Initialize();
+    m_restartLCD = false;
+  }
+#endif
   return false;
 }
 

Modified: branches/linuxport/XBMC/xbmc/Application.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.h	2008-09-07 00:35:43 UTC (rev 15435)
+++ branches/linuxport/XBMC/xbmc/Application.h	2008-09-07 02:11:20 UTC (rev 15436)
@@ -239,6 +239,7 @@
   }
 
   bool m_restartLirc;
+  bool m_restartLCD;
 
 protected:
   friend class CApplicationMessenger;

Modified: branches/linuxport/XBMC/xbmc/linux/HalManager.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/linux/HalManager.cpp	2008-09-07 00:35:43 UTC (rev 15435)
+++ branches/linuxport/XBMC/xbmc/linux/HalManager.cpp	2008-09-07 02:11:20 UTC (rev 15436)
@@ -401,6 +401,7 @@
         if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_INT32, &int32))
           CLog::Log(LOGERROR, "DBus: Failed to append arguments");
         g_application.m_restartLirc = true;
+        g_application.m_restartLCD = true;
         break;
       case POWERSTATE_SUSPEND:
         msg = dbus_message_new_method_call("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device.SystemPowerManagement", "Suspend");
@@ -408,6 +409,7 @@
         if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_INT32, &int32))
           CLog::Log(LOGERROR, "DBus: Failed to append arguments");
         g_application.m_restartLirc = true;
+        g_application.m_restartLCD= true;
         break;
       case POWERSTATE_SHUTDOWN:
         msg = dbus_message_new_method_call("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device.SystemPowerManagement", "Shutdown");
@@ -460,10 +462,12 @@
       case POWERSTATE_HIBERNATE:
         StateString = "Hibernate";
         g_application.m_restartLirc = true;
+        g_application.m_restartLCD = true;
         break;
       case POWERSTATE_SUSPEND:
         StateString = "Suspend";
         g_application.m_restartLirc = true;
+        g_application.m_restartLCD = true;
         break;
       case POWERSTATE_SHUTDOWN:
         StateString = "Shutdown";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15438
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15438&view=rev
Author:   davilla
Date:     2008-09-07 03:47:37 +0000 (Sun, 07 Sep 2008)

Log Message:
-----------
[OSX] fixed libdvdnav crash with VOB > 4GB and IFO present. st_size (off_t) in stat/fstat on osx is 64 bit not 32 bit. 

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Util.cpp
    branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp

Modified: branches/linuxport/XBMC/xbmc/Util.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Util.cpp	2008-09-07 03:36:57 UTC (rev 15437)
+++ branches/linuxport/XBMC/xbmc/Util.cpp	2008-09-07 03:47:37 UTC (rev 15438)
@@ -2194,7 +2194,7 @@
   result->st_uid = stat->st_uid;
   result->st_gid = stat->st_gid;
   result->st_rdev = stat->st_rdev;
-  if (stat->st_size <= LONG_MAX)
+  if (sizeof(stat->st_size) <= sizeof(result->st_size) )
 #ifndef _LINUX
     result->st_size = (_off_t)stat->st_size;
 #else

Modified: branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2008-09-07 03:36:57 UTC (rev 15437)
+++ branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2008-09-07 03:47:37 UTC (rev 15438)
@@ -1528,7 +1528,7 @@
       CLog::Log(LOGINFO, "Stating open file");
     
       __int64 size = pFile->GetLength();
-      if (size <= LONG_MAX)
+      if (sizeof(size) <= sizeof(buffer->st_size) )
         buffer->st_size = (_off_t)size;
       else
       {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15455
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15455&view=rev
Author:   jmarshallnz
Date:     2008-09-08 04:15:20 +0000 (Mon, 08 Sep 2008)

Log Message:
-----------
fixed: Dialog to check if the resolution was valid (Test Resolution button in settings) failed to autoclose.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIDialogYesNo.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogYesNo.h
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIDialogYesNo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogYesNo.cpp	2008-09-08 04:10:53 UTC (rev 15454)
+++ branches/linuxport/XBMC/xbmc/GUIDialogYesNo.cpp	2008-09-08 04:15:20 UTC (rev 15455)
@@ -88,7 +88,7 @@
   return ShowAndGetInput(heading,line0,line1,line2,iNoLabel,iYesLabel,bDummy);
 }
 
-bool CGUIDialogYesNo::ShowAndGetInput(int heading, int line0, int line1, int line2, int iNoLabel, int iYesLabel, bool& bCanceled)
+bool CGUIDialogYesNo::ShowAndGetInput(int heading, int line0, int line1, int line2, int iNoLabel, int iYesLabel, bool& bCanceled, unsigned int autoCloseTime)
 {
   CGUIDialogYesNo *dialog = (CGUIDialogYesNo *)m_gWindowManager.GetWindow(WINDOW_DIALOG_YES_NO);
   if (!dialog) return false;
@@ -96,6 +96,8 @@
   dialog->SetLine(0, line0);
   dialog->SetLine(1, line1);
   dialog->SetLine(2, line2);
+  if (autoCloseTime)
+    dialog->SetAutoClose(autoCloseTime);
   if (iNoLabel != -1)
     dialog->SetChoice(0,iNoLabel);
   if (iYesLabel != -1)

Modified: branches/linuxport/XBMC/xbmc/GUIDialogYesNo.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogYesNo.h	2008-09-08 04:10:53 UTC (rev 15454)
+++ branches/linuxport/XBMC/xbmc/GUIDialogYesNo.h	2008-09-08 04:15:20 UTC (rev 15455)
@@ -34,7 +34,7 @@
 
   static bool ShowAndGetInput(int heading, int line0, int line1, int line2, int iNoLabel=-1, int iYesLabel=-1);
   static bool ShowAndGetInput(int heading, int line0, int line1, int line2, bool& bCanceled);
-  static bool ShowAndGetInput(int heading, int line0, int line1, int line2, int iNoLabel, int iYesLabel, bool& bCanceled);
+  static bool ShowAndGetInput(int heading, int line0, int line1, int line2, int iNoLabel, int iYesLabel, bool& bCanceled, unsigned int autoCloseTime = 0);
   static bool ShowAndGetInput(const CStdString& heading, const CStdString& line0, const CStdString& line1, const CStdString& line2);
   static bool ShowAndGetInput(const CStdString& heading, const CStdString& line0, const CStdString& line1, const CStdString& line2, bool &bCanceled);
 protected:

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-09-08 04:10:53 UTC (rev 15454)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-09-08 04:15:20 UTC (rev 15455)
@@ -1430,9 +1430,8 @@
     g_graphicsContext.SetVideoResolution(m_NewResolution, TRUE);
     g_guiSettings.m_LookAndFeelResolution = m_NewResolution;
     g_application.ReloadSkin();
-    CGUIDialogYesNo dlg;
-    dlg.SetAutoClose(5000);
-    if (!dlg.ShowAndGetInput(13110, 13111, 20022, 20022))
+    bool cancelled = false;
+    if (!CGUIDialogYesNo::ShowAndGetInput(13110, 13111, 20022, 20022, -1, -1, cancelled, 5000))
     {
       g_guiSettings.SetInt("videoscreen.resolution", lastRes);
       g_graphicsContext.SetVideoResolution(lastRes, TRUE);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15456
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15456&view=rev
Author:   jmarshallnz
Date:     2008-09-08 05:39:20 +0000 (Mon, 08 Sep 2008)

Log Message:
-----------
fixed; Ticket #4803 - slow startup of music smartplaylists.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowMusicBase.cpp
    branches/linuxport/XBMC/xbmc/PlayListFactory.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIWindowMusicBase.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowMusicBase.cpp	2008-09-08 04:15:20 UTC (rev 15455)
+++ branches/linuxport/XBMC/xbmc/GUIWindowMusicBase.cpp	2008-09-08 05:39:20 UTC (rev 15456)
@@ -675,6 +675,9 @@
   if (!pItem->CanQueue() || pItem->IsRAR() || pItem->IsZIP() || pItem->IsParentFolder()) // no zip/rar enques thank you!
     return;
 
+  // fast lookup is needed here
+  queuedItems.SetFastLookup(true);
+
   if (pItem->IsMusicDb() && pItem->m_bIsFolder && !pItem->IsParentFolder())
   { // we have a music database folder, just grab the "all" item underneath it
     CMusicDatabaseDirectory dir;
@@ -737,7 +740,6 @@
       CFileItemPtr itemCheck = queuedItems.Get(pItem->m_strPath);
       if (!itemCheck || itemCheck->m_lStartOffset != pItem->m_lStartOffset)
       { // add item
-        CLog::Log(LOGDEBUG, "Adding item (%s) to playlist", pItem->m_strPath.c_str());
         queuedItems.Add(pItem);
       }
     }

Modified: branches/linuxport/XBMC/xbmc/PlayListFactory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/PlayListFactory.cpp	2008-09-08 04:15:20 UTC (rev 15455)
+++ branches/linuxport/XBMC/xbmc/PlayListFactory.cpp	2008-09-08 05:39:20 UTC (rev 15456)
@@ -108,7 +108,6 @@
   if (extension == ".wpl") return true;
   if (extension == ".asx") return true;
   if (extension == ".ram") return true;
-  if (extension == ".xsp") return true;
   return false;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15471
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15471&view=rev
Author:   elupus
Date:     2008-09-08 21:41:16 +0000 (Mon, 08 Sep 2008)

Log Message:
-----------
fixed: deadlock if xbmc was unable to load GUIDialogKaiToast xml file due to mismatched enter/leave critical section

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIDialogKaiToast.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogKaiToast.h

Modified: branches/linuxport/XBMC/xbmc/GUIDialogKaiToast.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogKaiToast.cpp	2008-09-08 21:19:38 UTC (rev 15470)
+++ branches/linuxport/XBMC/xbmc/GUIDialogKaiToast.cpp	2008-09-08 21:41:16 UTC (rev 15471)
@@ -33,12 +33,10 @@
 {
   m_defaultIcon = "";
   m_loadOnDemand = false;
-  InitializeCriticalSection(&m_critical);
 }
 
 CGUIDialogKaiToast::~CGUIDialogKaiToast(void)
 {
-  DeleteCriticalSection(&m_critical);
 }
 
 bool CGUIDialogKaiToast::OnMessage(CGUIMessage& message)
@@ -76,11 +74,8 @@
 
 void CGUIDialogKaiToast::QueueNotification(const CStdString& aImageFile, const CStdString& aCaption, const CStdString& aDescription, unsigned int displayTime /*= TOAST_DISPLAY_TIME*/)
 {
-  EnterCriticalSection(&m_critical);
+  CSingleLock lock(m_critical);
 
-  if (!Initialize())
-    return;
-
   Notification toast;
   toast.imagefile = aImageFile;
   toast.caption = aCaption;
@@ -88,25 +83,26 @@
   toast.displayTime = displayTime > TOAST_MESSAGE_TIME + 500 ? displayTime : TOAST_MESSAGE_TIME + 500;
 
   m_notifications.push(toast);
-
-  LeaveCriticalSection(&m_critical);
 }
 
 
 bool CGUIDialogKaiToast::DoWork()
 {
-  EnterCriticalSection(&m_critical);
+  CSingleLock lock(m_critical);
 
   bool bPending = m_notifications.size() > 0;
   if (bPending && timeGetTime() - m_dwTimer > TOAST_MESSAGE_TIME)
   {
     Notification toast = m_notifications.front();
+    m_notifications.pop();
+    lock.leave();
 
     m_toastDisplayTime = toast.displayTime;
 
-    m_notifications.pop();
+    CSingleLock lock2(g_graphicsContext);
 
-    g_graphicsContext.Lock();
+    if(!Initialize())
+      return false;
 
     SET_CONTROL_LABEL(POPUP_CAPTION_TEXT, toast.caption);
 
@@ -121,17 +117,13 @@
         image->SetFileName(m_defaultIcon);
     }
 
-    g_graphicsContext.Unlock();
-
     //  Play the window specific init sound for each notification queued
     g_audioManager.PlayWindowSound(GetID(), SOUND_INIT);
 
     ResetTimer();
   }
 
-  LeaveCriticalSection(&m_critical);
-
-  return bPending;
+  return false;
 }
 
 

Modified: branches/linuxport/XBMC/xbmc/GUIDialogKaiToast.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogKaiToast.h	2008-09-08 21:19:38 UTC (rev 15470)
+++ branches/linuxport/XBMC/xbmc/GUIDialogKaiToast.h	2008-09-08 21:41:16 UTC (rev 15471)
@@ -63,5 +63,5 @@
 
   typedef std::queue<Notification> TOASTQUEUE;
   TOASTQUEUE m_notifications;
-  CRITICAL_SECTION m_critical;
+  CCriticalSection m_critical;
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15475
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15475&view=rev
Author:   elupus
Date:     2008-09-08 22:43:25 +0000 (Mon, 08 Sep 2008)

Log Message:
-----------
changed: upnp root folder will now update automatically as more servers show up.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIMediaWindow.cpp
    branches/linuxport/XBMC/xbmc/GUIUserMessages.h
    branches/linuxport/XBMC/xbmc/UPnP.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIMediaWindow.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIMediaWindow.cpp	2008-09-08 22:31:52 UTC (rev 15474)
+++ branches/linuxport/XBMC/xbmc/GUIMediaWindow.cpp	2008-09-08 22:43:25 UTC (rev 15475)
@@ -309,6 +309,10 @@
           items.RemoveDiscCache();
         }
       }
+      else if (message.GetParam1()==GUI_MSG_UPDATE_PATH && message.GetStringParam() == m_vecItems->m_strPath && IsActive())
+      {
+        Update(m_vecItems->m_strPath);
+      }
       else
         return CGUIWindow::OnMessage(message);
 

Modified: branches/linuxport/XBMC/xbmc/GUIUserMessages.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIUserMessages.h	2008-09-08 22:31:52 UTC (rev 15474)
+++ branches/linuxport/XBMC/xbmc/GUIUserMessages.h	2008-09-08 22:43:25 UTC (rev 15475)
@@ -124,3 +124,6 @@
 // Message sent to tell the GUI to change sort method/direction
 #define GUI_MSG_CHANGE_SORT_METHOD    GUI_MSG_USER + 31
 #define GUI_MSG_CHANGE_SORT_DIRECTION GUI_MSG_USER + 32
+
+// Sent from filesystem if a path is known to have changed
+#define GUI_MSG_UPDATE_PATH           GUI_MSG_USER + 33

Modified: branches/linuxport/XBMC/xbmc/UPnP.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/UPnP.cpp	2008-09-08 22:31:52 UTC (rev 15474)
+++ branches/linuxport/XBMC/xbmc/UPnP.cpp	2008-09-08 22:43:25 UTC (rev 15475)
@@ -46,6 +46,7 @@
 #include "URL.h"
 #include "Settings.h"
 #include "FileItem.h"
+#include "GUIWindowManager.h"
 
 using namespace std;
 using namespace MUSIC_INFO;
@@ -1222,6 +1223,28 @@
     PLT_DeviceHostReference m_Device;
 };
 
+class CMediaBrowser : public PLT_SyncMediaBrowser
+{
+public:
+    CMediaBrowser(PLT_CtrlPointReference& ctrlPoint)
+      : PLT_SyncMediaBrowser(ctrlPoint, true)
+    {}
+
+    virtual void OnMSAddedRemoved(PLT_DeviceDataReference& device, int added)
+    {
+      PLT_SyncMediaBrowser::OnMSAddedRemoved(device, added);
+      CGUIMessage message(GUI_MSG_NOTIFY_ALL, 0, 0, GUI_MSG_UPDATE_PATH);
+      message.SetStringParam("upnp://");
+      m_gWindowManager.SendThreadMessage(message);
+    }
+    virtual void OnMSStateVariablesChanged(PLT_Service* service, NPT_List<PLT_StateVariable*>* vars)
+    {
+      /* this could be used to find changes in folders */
+      PLT_SyncMediaBrowser::OnMSStateVariablesChanged(service, vars);
+    }
+};
+
+
 /*----------------------------------------------------------------------
 |   CUPnP::CUPnP
 +---------------------------------------------------------------------*/
@@ -1308,7 +1331,7 @@
     m_UPnP->AddCtrlPoint(m_CtrlPointHolder->m_CtrlPoint);
 
     // start browser
-    m_MediaBrowser = new PLT_SyncMediaBrowser(m_CtrlPointHolder->m_CtrlPoint, true);
+    m_MediaBrowser = new CMediaBrowser(m_CtrlPointHolder->m_CtrlPoint);
 
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15482
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15482&view=rev
Author:   jmarshallnz
Date:     2008-09-09 08:52:32 +0000 (Tue, 09 Sep 2008)

Log Message:
-----------
fixed: Ticket #4835 - XBMC automatically starts to play music after video ends

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp
    branches/linuxport/XBMC/xbmc/PartyModeManager.cpp
    branches/linuxport/XBMC/xbmc/PartyModeManager.h

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp	2008-09-09 06:30:19 UTC (rev 15481)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp	2008-09-09 08:52:32 UTC (rev 15482)
@@ -783,7 +783,7 @@
   CFileItemList queuedItems;
   AddItemToPlayList(item, queuedItems);
   // if party mode, add items but DONT start playing
-  if (g_partyModeManager.IsEnabled())
+  if (g_partyModeManager.IsEnabled(PARTYMODECONTEXT_VIDEO))
   {
     g_partyModeManager.AddUserSongs(queuedItems, false);
     return;
@@ -1179,7 +1179,7 @@
   CFileItemPtr pItem = m_vecItems->Get(iItem);
 
   // party mode
-  if (g_partyModeManager.IsEnabled())
+  if (g_partyModeManager.IsEnabled(PARTYMODECONTEXT_VIDEO))
   {
     CPlayList playlistTemp;
     playlistTemp.Add(pItem);

Modified: branches/linuxport/XBMC/xbmc/PartyModeManager.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/PartyModeManager.cpp	2008-09-09 06:30:19 UTC (rev 15481)
+++ branches/linuxport/XBMC/xbmc/PartyModeManager.cpp	2008-09-09 08:52:32 UTC (rev 15482)
@@ -656,3 +656,13 @@
     in.erase(in.begin() + num);
   }
 }
+
+bool CPartyModeManager::IsEnabled(PartyModeContext context /* = PARTYMODECONTEXT_UNKNOWN */) const
+{
+  if (!m_bEnabled) return false;
+  if (context == PARTYMODECONTEXT_VIDEO)
+    return m_bIsVideo;
+  if (context == PARTYMODECONTEXT_MUSIC)
+    return !m_bIsVideo;
+  return true; // unknown, but we're enabled
+}

Modified: branches/linuxport/XBMC/xbmc/PartyModeManager.h
===================================================================
--- branches/linuxport/XBMC/xbmc/PartyModeManager.h	2008-09-09 06:30:19 UTC (rev 15481)
+++ branches/linuxport/XBMC/xbmc/PartyModeManager.h	2008-09-09 08:52:32 UTC (rev 15482)
@@ -48,7 +48,7 @@
   void OnSongChange(bool bUpdatePlayed = false);
   void AddUserSongs(PLAYLIST::CPlayList& tempList, bool bPlay = false);
   void AddUserSongs(CFileItemList& tempList, bool bPlay = false);
-  bool IsEnabled() { return m_bEnabled; };
+  bool IsEnabled(PartyModeContext context=PARTYMODECONTEXT_UNKNOWN) const;
   int GetSongsPlayed();
   int GetMatchingSongs();
   int GetMatchingSongsPicked();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15489
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15489&view=rev
Author:   kraqh3d
Date:     2008-09-09 18:32:52 +0000 (Tue, 09 Sep 2008)

Log Message:
-----------
sort items by full path, to be used by video scanner fix for dvd folders.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/SortFileItem.cpp
    branches/linuxport/XBMC/xbmc/SortFileItem.h

Modified: branches/linuxport/XBMC/xbmc/SortFileItem.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/SortFileItem.cpp	2008-09-09 17:38:32 UTC (rev 15488)
+++ branches/linuxport/XBMC/xbmc/SortFileItem.cpp	2008-09-09 18:32:52 UTC (rev 15489)
@@ -89,6 +89,15 @@
   item->SetSortLabel(label);
 }
 
+void SSortFileItem::ByFullPath(CFileItemPtr &item)
+{
+  if (!item) return;
+
+  CStdString label;
+  label.Format("%s %d", item->m_strPath, item->m_lStartOffset);
+  item->SetSortLabel(label);
+}
+
 void SSortFileItem::ByDate(CFileItemPtr &item)
 {
   if (!item) return;

Modified: branches/linuxport/XBMC/xbmc/SortFileItem.h
===================================================================
--- branches/linuxport/XBMC/xbmc/SortFileItem.h	2008-09-09 17:38:32 UTC (rev 15488)
+++ branches/linuxport/XBMC/xbmc/SortFileItem.h	2008-09-09 18:32:52 UTC (rev 15489)
@@ -35,6 +35,7 @@
   static void ByLabel(CFileItemPtr &item);
   static void ByLabelNoThe(CFileItemPtr &item);
   static void ByFile(CFileItemPtr &item);
+  static void ByFullPath(CFileItemPtr &item);
   static void ByDate(CFileItemPtr &item);
   static void BySize(CFileItemPtr &item);
   static void ByDriveType(CFileItemPtr &item);
@@ -93,6 +94,7 @@
   SORT_METHOD_VIDEO_RUNTIME,
   SORT_METHOD_STUDIO,
   SORT_METHOD_STUDIO_IGNORE_THE,
+  SORT_METHOD_FULLPATH,
   SORT_METHOD_UNSORTED,
   SORT_METHOD_MAX,
 } SORT_METHOD;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15492
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15492&view=rev
Author:   wiso
Date:     2008-09-09 20:38:11 +0000 (Tue, 09 Sep 2008)

Log Message:
-----------
[WIN32]: reverting r15438 for win32 because the file size of_stat64 (stat->st_size -> 64Bit) is bigger than of _stat (result->st_size -> 32Bit). Therefore r15438 will always print the warning about the file size being to large even for files ~3kB.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Util.cpp
    branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp

Modified: branches/linuxport/XBMC/xbmc/Util.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Util.cpp	2008-09-09 20:19:00 UTC (rev 15491)
+++ branches/linuxport/XBMC/xbmc/Util.cpp	2008-09-09 20:38:11 UTC (rev 15492)
@@ -2193,10 +2193,11 @@
   result->st_uid = stat->st_uid;
   result->st_gid = stat->st_gid;
   result->st_rdev = stat->st_rdev;
-  if (sizeof(stat->st_size) <= sizeof(result->st_size) )
 #ifndef _LINUX
+  if (stat->st_size <= LONG_MAX) 
     result->st_size = (_off_t)stat->st_size;
 #else
+  if (sizeof(stat->st_size) <= sizeof(result->st_size) )
     result->st_size = (off_t)stat->st_size;
 #endif
   else

Modified: branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2008-09-09 20:19:00 UTC (rev 15491)
+++ branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp	2008-09-09 20:38:11 UTC (rev 15492)
@@ -1528,7 +1528,11 @@
       CLog::Log(LOGINFO, "Stating open file");
     
       __int64 size = pFile->GetLength();
+#ifdef _WIN32PC
+      if (size <= LONG_MAX) 
+#else
       if (sizeof(size) <= sizeof(buffer->st_size) )
+#endif
         buffer->st_size = (_off_t)size;
       else
       {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15523
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15523&view=rev
Author:   vdrfan
Date:     2008-09-11 15:46:42 +0000 (Thu, 11 Sep 2008)

Log Message:
-----------
fixed: Ticket #4832 - IMDB no longer using folder names for lookups on video_ts vob files. (Note: this will also fix scraping on rarred content)

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp
    branches/linuxport/XBMC/xbmc/Util.cpp
    branches/linuxport/XBMC/xbmc/Util.h

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp	2008-09-11 13:06:17 UTC (rev 15522)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp	2008-09-11 15:46:42 UTC (rev 15523)
@@ -483,17 +483,13 @@
         IMDB.SetScraperInfo(info);
 
   CStdString movieName;
-  if (item->m_bIsFolder || settings.parent_name) // always search based on file paths on refresh
-  {
-    movieName = item->m_strPath;
-    if (!item->m_bIsFolder)
-      CUtil::GetParentPath(item->m_strPath,movieName);
-    CUtil::RemoveSlashAtEnd(movieName);
-    movieName = CUtil::GetFileName(movieName);
-  }
+  if (item->m_bIsFolder || settings.parent_name)
+    movieName = CUtil::GetMovieName(item);
   else
     movieName = CUtil::GetFileName(item->m_strPath);
 
+  CUtil::RemoveExtension(movieName);
+
   // 3. Run a loop so that if we Refresh we re-run this block
   bool needsRefresh(false);
   do

Modified: branches/linuxport/XBMC/xbmc/Util.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Util.cpp	2008-09-11 13:06:17 UTC (rev 15522)
+++ branches/linuxport/XBMC/xbmc/Util.cpp	2008-09-11 15:46:42 UTC (rev 15523)
@@ -648,7 +648,27 @@
   return true;
 }
 
+const CStdString CUtil::GetMovieName(CFileItem* pItem)
+{
+  CStdString movieName;
+  CStdString strArchivePath;
+  movieName = pItem->m_strPath; 
 
+  if (!pItem->m_bIsFolder || pItem->IsDVDFile(false, true) || IsInArchive(pItem->m_strPath))
+  {
+    GetParentPath(pItem->m_strPath,movieName);
+    if (IsRAR(movieName) || IsZIP(movieName) || pItem->IsDVDFile(false, true))
+    {
+      GetParentPath(movieName, strArchivePath);
+      movieName = strArchivePath;
+    }
+  }
+
+  CUtil::RemoveSlashAtEnd(movieName); 
+  movieName = CUtil::GetFileName(movieName); 
+  return movieName;
+}
+
 void CUtil::GetQualifiedFilename(const CStdString &strBasePath, CStdString &strFilename)
 {
   //Make sure you have a full path in the filename, otherwise adds the base path before.
@@ -957,12 +977,18 @@
 
 bool CUtil::IsRAR(const CStdString& strFile)
 {
+  CURL url(strFile);
   CStdString strExtension;
   CUtil::GetExtension(strFile,strExtension);
-  if (strExtension.Equals(".001") && strFile.Mid(strFile.length()-7,7).CompareNoCase(".ts.001")) return true;
-  if (strExtension.CompareNoCase(".cbr") == 0) return true;
+
+  if (strExtension.Equals(".001") && strFile.Mid(strFile.length()-7,7).CompareNoCase(".ts.001"))
+    return true;
+  if (strExtension.CompareNoCase(".cbr") == 0)
+    return true;
   if (strExtension.CompareNoCase(".rar") == 0)
-      return true;
+    return true;
+  if (url.GetProtocol() == "rar")
+    return true;
 
   return false;
 }

Modified: branches/linuxport/XBMC/xbmc/Util.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Util.h	2008-09-11 13:06:17 UTC (rev 15522)
+++ branches/linuxport/XBMC/xbmc/Util.h	2008-09-11 15:46:42 UTC (rev 15523)
@@ -208,6 +208,7 @@
   static void GetBuiltInHelp(CStdString &help);
   static int ExecBuiltIn(const CStdString& execString);
   static bool GetParentPath(const CStdString& strPath, CStdString& strParent);
+  static const CStdString  GetMovieName(CFileItem* pItem);
   static void GetQualifiedFilename(const CStdString &strBasePath, CStdString &strFilename);
   static void RunShortcut(const char* szPath);
   static void GetDirectory(const CStdString& strFilePath, CStdString& strDirectoryPath);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15543
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15543&view=rev
Author:   jmarshallnz
Date:     2008-09-13 10:04:32 +0000 (Sat, 13 Sep 2008)

Log Message:
-----------
fixed: Ticket #4671 - Switching movies in info viewer overwrites list item thumb on close.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp	2008-09-13 07:57:12 UTC (rev 15542)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp	2008-09-13 10:04:32 UTC (rev 15543)
@@ -443,13 +443,6 @@
     *item->GetVideoInfoTag() = movieDetails;
     pDlgInfo->SetMovie(item);
     pDlgInfo->DoModal();
-    if (!info.strContent.Equals("plugin")){
-      CStdString thumb(pDlgInfo->GetThumbnail());
-      if (thumb != item->GetThumbnailImage()) {
-        item->SetThumbnailImage(pDlgInfo->GetThumbnail());
-        return true;
-      }
-    }
     if ( !pDlgInfo->NeedRefresh() ) return false;
   }
 
@@ -478,9 +471,9 @@
 
   CVideoInfoScanner::NFOResult result = scanner.CheckForNFOFile(item,settings.parent_name_root,info,pDlgProgress,scrUrl);
   if (result == CVideoInfoScanner::FULL_NFO)
-        hasDetails = true;
+    hasDetails = true;
   if (result == CVideoInfoScanner::URL_NFO)
-        IMDB.SetScraperInfo(info);
+    IMDB.SetScraperInfo(info);
 
   CStdString movieName;
   if (item->m_bIsFolder || settings.parent_name)

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp	2008-09-13 07:57:12 UTC (rev 15542)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp	2008-09-13 10:04:32 UTC (rev 15543)
@@ -431,11 +431,10 @@
     if (pItem->HasVideoInfoTag())
       *item.GetVideoInfoTag() = *pItem->GetVideoInfoTag();
   }
-  bool modified = ShowIMDB(&item,info);
-  // apply any IMDb icon to our item
-  if (modified && pItem->m_bIsFolder)
-    CVideoInfoScanner::ApplyIMDBThumbToFolder(pItem->m_strPath, item.GetThumbnailImage());
-  if (modified && !info.strContent.Equals("plugin"))
+  // we need to also request any thumbs also be applied to the folder item
+  if (pItem->m_bIsFolder)
+    item.SetProperty("set_folder_thumb", pItem->m_strPath);
+  if (ShowIMDB(&item,info) && !info.strContent.Equals("plugin"))
     Update(m_vecItems->m_strPath);
 }
 

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp	2008-09-13 07:57:12 UTC (rev 15542)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp	2008-09-13 10:04:32 UTC (rev 15543)
@@ -498,10 +498,9 @@
 
     CStdString thumbImage = m_movieItem->GetCachedVideoThumb();
     if (!CFile::Exists(thumbImage) || m_movieItem->GetProperty("HasAutoThumb") == "1")
-      thumbImage = m_movieItem->GetUserVideoThumb();
+      m_movieItem->SetUserVideoThumb();
     if (!CFile::Exists(thumbImage) && strImage.size() > 0)
     {
-      thumbImage = m_movieItem->GetCachedVideoThumb();
       CScraperUrl::DownloadThumbnail(thumbImage,m_movieItem->GetVideoInfoTag()->m_strPictureURL.GetFirstThumb());
       CUtil::DeleteVideoDatabaseDirectoryCache(); // to get them new thumbs to show
     }
@@ -510,6 +509,10 @@
     {
       thumbImage.Empty();
     }
+    else if (m_movieItem->HasProperty("set_folder_thumb"))
+    { // have a folder thumb to set as well
+      VIDEO::CVideoInfoScanner::ApplyIMDBThumbToFolder(m_movieItem->GetProperty("set_folder_thumb"), thumbImage);
+    }
 
     m_movieItem->SetThumbnailImage(thumbImage);
 
@@ -807,6 +810,10 @@
 
   CUtil::DeleteVideoDatabaseDirectoryCache(); // to get them new thumbs to show
   m_movieItem->SetThumbnailImage(cachedThumb);
+  if (m_movieItem->HasProperty("set_folder_thumb"))
+  { // have a folder thumb to set as well
+    VIDEO::CVideoInfoScanner::ApplyIMDBThumbToFolder(m_movieItem->GetProperty("set_folder_thumb"), cachedThumb);
+  }
 
   // tell our GUI to completely reload all controls (as some of them
   // are likely to have had this image in use so will need refreshing)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15544
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15544&view=rev
Author:   jmarshallnz
Date:     2008-09-13 10:06:35 +0000 (Sat, 13 Sep 2008)

Log Message:
-----------
changed: Moved the "Hide artists who appear only on compilations" setting in to the GUI (missed files)

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Settings.cpp
    branches/linuxport/XBMC/xbmc/Settings.h

Modified: branches/linuxport/XBMC/xbmc/Settings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.cpp	2008-09-13 10:04:32 UTC (rev 15543)
+++ branches/linuxport/XBMC/xbmc/Settings.cpp	2008-09-13 10:06:35 UTC (rev 15544)
@@ -224,7 +224,6 @@
 
   g_advancedSettings.m_bMusicLibraryHideAllItems = false;
   g_advancedSettings.m_bMusicLibraryAllItemsOnBottom = false;
-  g_advancedSettings.m_bMusicLibraryHideCompilationArtists = false;
   g_advancedSettings.m_bMusicLibraryAlbumsSortByArtistThenYear = false;
   g_advancedSettings.m_strMusicLibraryAlbumFormat = "";
   g_advancedSettings.m_strMusicLibraryAlbumFormatRight = "";
@@ -1157,7 +1156,6 @@
     XMLUtils::GetBoolean(pElement, "hideallitems", g_advancedSettings.m_bMusicLibraryHideAllItems);
     XMLUtils::GetBoolean(pElement, "prioritiseapetags", g_advancedSettings.m_prioritiseAPEv2tags);
     XMLUtils::GetBoolean(pElement, "allitemsonbottom", g_advancedSettings.m_bMusicLibraryAllItemsOnBottom);
-    XMLUtils::GetBoolean(pElement, "hidecompilationartists", g_advancedSettings.m_bMusicLibraryHideCompilationArtists);
     XMLUtils::GetBoolean(pElement, "albumssortbyartistthenyear", g_advancedSettings.m_bMusicLibraryAlbumsSortByArtistThenYear);
     GetString(pElement, "albumformat", g_advancedSettings.m_strMusicLibraryAlbumFormat);
     GetString(pElement, "albumformatright", g_advancedSettings.m_strMusicLibraryAlbumFormatRight);

Modified: branches/linuxport/XBMC/xbmc/Settings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.h	2008-09-13 10:04:32 UTC (rev 15543)
+++ branches/linuxport/XBMC/xbmc/Settings.h	2008-09-13 10:06:35 UTC (rev 15544)
@@ -198,7 +198,6 @@
 
     bool m_bMusicLibraryHideAllItems;
     bool m_bMusicLibraryAllItemsOnBottom;
-    bool m_bMusicLibraryHideCompilationArtists;
     bool m_bMusicLibraryAlbumsSortByArtistThenYear;
     CStdString m_strMusicLibraryAlbumFormat;
     CStdString m_strMusicLibraryAlbumFormatRight;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15547
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15547&view=rev
Author:   jmarshallnz
Date:     2008-09-13 23:31:18 +0000 (Sat, 13 Sep 2008)

Log Message:
-----------
fixed: Ticket #4873 - Sort By: "File" not working

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileItem.cpp
    branches/linuxport/XBMC/xbmc/SortFileItem.cpp
    branches/linuxport/XBMC/xbmc/SortFileItem.h

Modified: branches/linuxport/XBMC/xbmc/FileItem.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-09-13 23:24:21 UTC (rev 15546)
+++ branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-09-13 23:31:18 UTC (rev 15547)
@@ -1480,7 +1480,9 @@
   default:
     break;
   }
-  if (sortMethod != SORT_METHOD_NONE)
+  if (sortMethod == SORT_METHOD_FILE)
+    Sort(sortOrder==SORT_ORDER_ASC ? SSortFileItem::IgnoreFoldersAscending : SSortFileItem::IgnoreFoldersDescending);
+  else if (sortMethod != SORT_METHOD_NONE)
     Sort(sortOrder==SORT_ORDER_ASC ? SSortFileItem::Ascending : SSortFileItem::Descending);
 
   m_sortMethod=sortMethod;

Modified: branches/linuxport/XBMC/xbmc/SortFileItem.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/SortFileItem.cpp	2008-09-13 23:24:21 UTC (rev 15546)
+++ branches/linuxport/XBMC/xbmc/SortFileItem.cpp	2008-09-13 23:31:18 UTC (rev 15547)
@@ -67,6 +67,28 @@
   return left->m_bIsFolder;
 }
 
+bool SSortFileItem::IgnoreFoldersAscending(const CFileItemPtr &left, const CFileItemPtr &right)
+{
+  // sanity
+  RETURN_IF_NULL(left,false); RETURN_IF_NULL(right,false);
+
+  // ignore the ".." item - that should always be on top
+  if (left->IsParentFolder()) return true;
+  if (right->IsParentFolder()) return false;
+  return StringUtils::AlphaNumericCompare(left->GetSortLabel().c_str(),right->GetSortLabel().c_str()) < 0;
+}
+
+bool SSortFileItem::IgnoreFoldersDescending(const CFileItemPtr &left, const CFileItemPtr &right)
+{
+  // sanity
+  RETURN_IF_NULL(left,false); RETURN_IF_NULL(right,false);
+
+  // ignore the ".." item - that should always be on top
+  if (left->IsParentFolder()) return true;
+  if (right->IsParentFolder()) return false;
+  return StringUtils::AlphaNumericCompare(left->GetSortLabel().c_str(),right->GetSortLabel().c_str()) > 0;
+}
+
 void SSortFileItem::ByLabel(CFileItemPtr &item)
 {
   if (!item) return;

Modified: branches/linuxport/XBMC/xbmc/SortFileItem.h
===================================================================
--- branches/linuxport/XBMC/xbmc/SortFileItem.h	2008-09-13 23:24:21 UTC (rev 15546)
+++ branches/linuxport/XBMC/xbmc/SortFileItem.h	2008-09-13 23:31:18 UTC (rev 15547)
@@ -30,6 +30,8 @@
   // Sort by sort field
   static bool Ascending(const CFileItemPtr &left, const CFileItemPtr &right);
   static bool Descending(const CFileItemPtr &left, const CFileItemPtr &right);
+  static bool IgnoreFoldersAscending(const CFileItemPtr &left, const CFileItemPtr &right);
+  static bool IgnoreFoldersDescending(const CFileItemPtr &left, const CFileItemPtr &right);
 
   // Fill in sort field
   static void ByLabel(CFileItemPtr &item);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15549
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15549&view=rev
Author:   jmarshallnz
Date:     2008-09-14 00:25:33 +0000 (Sun, 14 Sep 2008)

Log Message:
-----------
changed: Default skin to PM3.HD

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/GUISettings.cpp
    branches/linuxport/XBMC/xbmc/Settings.h

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-09-13 23:58:48 UTC (rev 15548)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-09-14 00:25:33 UTC (rev 15549)
@@ -886,9 +886,9 @@
   CLog::Log(LOGINFO, "Checking skin version of: %s", g_guiSettings.GetString("lookandfeel.skin").c_str());
   if (!g_SkinInfo.Check(strSkinPath))
   {
-    // reset to the default skin (Project Mayhem III)
-    CLog::Log(LOGINFO, "The above skin isn't suitable - checking the version of the default: %s", "Project Mayhem III");
-    strSkinPath = strSkinBase + "Project Mayhem III";
+    // reset to the default skin (DEFAULT_SKIN)
+    CLog::Log(LOGINFO, "The above skin isn't suitable - checking the version of the default: %s", DEFAULT_SKIN);
+    strSkinPath = strSkinBase + DEFAULT_SKIN;
     if (!g_SkinInfo.Check(strSkinPath))
     {
       g_LoadErrorStr.Format("No suitable skin version found.\nWe require at least version %5.4f \n", g_SkinInfo.GetMinVersion());
@@ -1934,10 +1934,10 @@
   {
     // failed to load home.xml
     // fallback to default skin
-    if ( strcmpi(strSkin.c_str(), "Project Mayhem III") != 0)
+    if ( strcmpi(strSkin.c_str(), DEFAULT_SKIN) != 0)
     {
-      CLog::Log(LOGERROR, "failed to load home.xml for skin:%s, fallback to \"Project Mayhem III\" skin", strSkin.c_str());
-      g_guiSettings.SetString("lookandfeel.skin", "Project Mayhem III");
+      CLog::Log(LOGERROR, "failed to load home.xml for skin:%s, fallback to \"%s\" skin", strSkin.c_str(), DEFAULT_SKIN);
+      g_guiSettings.SetString("lookandfeel.skin", DEFAULT_SKIN);
       LoadSkin(g_guiSettings.GetString("lookandfeel.skin"));
       return ;
     }

Modified: branches/linuxport/XBMC/xbmc/GUISettings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-09-13 23:58:48 UTC (rev 15548)
+++ branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-09-14 00:25:33 UTC (rev 15549)
@@ -559,7 +559,7 @@
   // appearance settings
   AddGroup(7, 480);
   AddCategory(7,"lookandfeel", 14037);
-  AddString(1, "lookandfeel.skin",166,"Project Mayhem III", SPIN_CONTROL_TEXT);
+  AddString(1, "lookandfeel.skin",166,DEFAULT_SKIN, SPIN_CONTROL_TEXT);
   AddString(2, "lookandfeel.skintheme",15111,"SKINDEFAULT", SPIN_CONTROL_TEXT);
   AddString(3, "lookandfeel.skincolors",14078, "SKINDEFAULT", SPIN_CONTROL_TEXT);
   AddString(4, "lookandfeel.font",13303,"Default", SPIN_CONTROL_TEXT);

Modified: branches/linuxport/XBMC/xbmc/Settings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.h	2008-09-13 23:58:48 UTC (rev 15548)
+++ branches/linuxport/XBMC/xbmc/Settings.h	2008-09-14 00:25:33 UTC (rev 15549)
@@ -24,6 +24,12 @@
 #define PRE_SKIN_VERSION_2_1_COMPATIBILITY 1
 // REMOVE ME WHEN WE SWITCH TO SKIN VERSION 2.1
 
+#ifdef HAS_SDL
+#define DEFAULT_SKIN "PM3.HD"
+#else
+#define DEFAULT_SKIN "Project Mayhem III"
+#endif
+
 #include "settings/VideoSettings.h"
 #include "StringUtils.h"
 #include "GUISettings.h"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15562
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15562&view=rev
Author:   jmarshallnz
Date:     2008-09-14 21:42:51 +0000 (Sun, 14 Sep 2008)

Log Message:
-----------
fixed: Ticket #4498 - merged RTMP fixes from trunk r15561, thanks to frosty

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/PlayerCoreFactory.cpp
    branches/linuxport/XBMC/xbmc/lib/libRTMP/rtmp.cpp
    branches/linuxport/XBMC/xbmc/lib/libRTMP/rtmp.h

Modified: branches/linuxport/XBMC/xbmc/cores/PlayerCoreFactory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/PlayerCoreFactory.cpp	2008-09-14 21:33:24 UTC (rev 15561)
+++ branches/linuxport/XBMC/xbmc/cores/PlayerCoreFactory.cpp	2008-09-14 21:42:51 UTC (rev 15562)
@@ -113,7 +113,8 @@
 
   if (url.GetProtocol().Equals("hdhomerun")
   ||  url.GetProtocol().Equals("myth")
-  ||  url.GetProtocol().Equals("cmyth"))
+  ||  url.GetProtocol().Equals("cmyth")
+  ||  url.GetProtocol().Equals("rtmp"))
     vecCores.push_back(EPC_DVDPLAYER);
 
   if (url.GetProtocol().Equals("lastfm") ||

Modified: branches/linuxport/XBMC/xbmc/lib/libRTMP/rtmp.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libRTMP/rtmp.cpp	2008-09-14 21:33:24 UTC (rev 15561)
+++ branches/linuxport/XBMC/xbmc/lib/libRTMP/rtmp.cpp	2008-09-14 21:42:51 UTC (rev 15562)
@@ -106,7 +106,7 @@
 
   service.sin_port = htons(url.GetPort());
   m_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-  if (m_socket > 0)
+  if (m_socket != INVALID_SOCKET )
   {
     if (connect(m_socket, (sockaddr*) &service, sizeof(struct sockaddr)) < 0)
     {

Modified: branches/linuxport/XBMC/xbmc/lib/libRTMP/rtmp.h
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libRTMP/rtmp.h	2008-09-14 21:33:24 UTC (rev 15561)
+++ branches/linuxport/XBMC/xbmc/lib/libRTMP/rtmp.h	2008-09-14 21:42:51 UTC (rev 15562)
@@ -39,7 +39,7 @@
       void SetPlayPath(const std::string &strPlayPath);
 
       bool Connect(const std::string &strRTMPLink);
-      inline bool IsConnected() { return m_socket > 0; }
+      inline bool IsConnected() { return m_socket != INVALID_SOCKET; }
 
       bool GetNextMediaPacket(RTMPPacket &packet);
 
@@ -117,3 +117,4 @@
 
 #endif
 
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15670
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15670&view=rev
Author:   vdrfan
Date:     2008-09-23 14:33:01 +0000 (Tue, 23 Sep 2008)

Log Message:
-----------
fixed: fanart image will not be displayed after a manual search

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp	2008-09-23 14:06:58 UTC (rev 15669)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoBase.cpp	2008-09-23 14:33:01 UTC (rev 15670)
@@ -639,13 +639,6 @@
         // now show the imdb info
         OutputDebugString("show info\n");
 
-        // Add to the database if applicable
-        if (info.strContent.Equals("movies") && item->m_strPath &&
-           (g_settings.m_vecProfiles[g_settings.m_iLastLoadedProfileIndex].canWriteDatabases() || g_passwordManager.bMasterUser))
-        {
-          m_database.SetDetailsForMovie(item->m_strPath, movieDetails);
-        }
-
         // remove directory caches
         CUtil::DeleteVideoDatabaseDirectoryCache();
 

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp	2008-09-23 14:06:58 UTC (rev 15669)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoInfo.cpp	2008-09-23 14:33:01 UTC (rev 15670)
@@ -323,6 +323,13 @@
       item->SetLabel(character);
       m_castList->Add(item);
     }
+    // set fanart property for tvshows and movies
+    if (type == VIDEODB_CONTENT_TVSHOWS || type == VIDEODB_CONTENT_MOVIES)
+    {
+      m_movieItem->CacheFanart();
+      if (CFile::Exists(m_movieItem->GetCachedFanart()))
+        m_movieItem->SetProperty("fanart_image",m_movieItem->GetCachedFanart());
+    }
     // determine type:
     if (type == VIDEODB_CONTENT_TVSHOWS)
     {
@@ -333,9 +340,6 @@
       m_movieItem->SetProperty("watchedepisodes", m_movieItem->GetVideoInfoTag()->m_playCount);
       m_movieItem->SetProperty("unwatchedepisodes", m_movieItem->GetVideoInfoTag()->m_iEpisode - m_movieItem->GetVideoInfoTag()->m_playCount);
       m_movieItem->GetVideoInfoTag()->m_playCount = (m_movieItem->GetVideoInfoTag()->m_iEpisode == m_movieItem->GetVideoInfoTag()->m_playCount) ? 1 : 0;
-      m_movieItem->CacheFanart();
-      if (CFile::Exists(m_movieItem->GetCachedFanart()))
-        m_movieItem->SetProperty("fanart_image",m_movieItem->GetCachedFanart());
     }
     else if (type == VIDEODB_CONTENT_EPISODES)
     {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15673
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15673&view=rev
Author:   jmarshallnz
Date:     2008-09-23 22:57:14 +0000 (Tue, 23 Sep 2008)

Log Message:
-----------
fixed: ActivateWindow(foo,bar,return) still allowed you to go up the directory structure in video library.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.h

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.cpp	2008-09-23 18:49:15 UTC (rev 15672)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.cpp	2008-09-23 22:57:14 UTC (rev 15673)
@@ -86,6 +86,19 @@
   delete m_unfilteredItems;
 }
 
+bool CGUIWindowVideoNav::OnAction(const CAction &action)
+{
+  if (action.wID == ACTION_PARENT_DIR)
+  {
+    if (g_advancedSettings.m_bUseEvilB && m_vecItems->m_strPath == m_startDirectory)
+    {
+      m_gWindowManager.PreviousWindow();
+      return true;
+    }
+  }
+  return CGUIWindowVideoBase::OnAction(action);
+}
+
 bool CGUIWindowVideoNav::OnMessage(CGUIMessage& message)
 {
   switch (message.GetMessage())
@@ -191,6 +204,9 @@
       if (!CGUIWindowVideoBase::OnMessage(message))
         return false;
 
+      // if we're returning to a window, make sure the root is set as the destPath
+      m_startDirectory = returning ? destPath : "";
+
       //  base class has opened the database, do our check
       m_database.Open();
       DisplayEmptyDatabaseMessage(!m_database.HasContent());

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.h	2008-09-23 18:49:15 UTC (rev 15672)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoNav.h	2008-09-23 22:57:14 UTC (rev 15673)
@@ -33,6 +33,7 @@
   CGUIWindowVideoNav(void);
   virtual ~CGUIWindowVideoNav(void);
 
+  virtual bool OnAction(const CAction &action);
   virtual bool OnMessage(CGUIMessage& message);
   virtual void Render();
 
@@ -67,4 +68,6 @@
   // filtered item views
   CFileItemList* m_unfilteredItems;
   CStdString m_filter;
+
+  CStdString m_startDirectory;
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15675
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15675&view=rev
Author:   jmarshallnz
Date:     2008-09-23 23:42:32 +0000 (Tue, 23 Sep 2008)

Log Message:
-----------
changed: Use reentrant version of localtime() as a safety precaution for valid results (based on plex git http://github.com/elan/plex/commit/401d45dbaa745c698b0b544235895d8af9a6d9ba)

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/lib/UnrarXLib/timefn.cpp
    branches/linuxport/XBMC/xbmc/linux/XTimeUtils.cpp

Modified: branches/linuxport/XBMC/xbmc/lib/UnrarXLib/timefn.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/UnrarXLib/timefn.cpp	2008-09-23 23:04:42 UTC (rev 15674)
+++ branches/linuxport/XBMC/xbmc/lib/UnrarXLib/timefn.cpp	2008-09-23 23:42:32 UTC (rev 15675)
@@ -58,18 +58,18 @@
 #if defined(_UNIX) || defined(_EMX)
 RarTime& RarTime::operator =(time_t ut)
 {
-  struct tm *t;
-  t=localtime(&ut);
+  struct tm t;
+  localtime_r(&ut, &t);
 
-  rlt.Year=t->tm_year+1900;
-  rlt.Month=t->tm_mon+1;
-  rlt.Day=t->tm_mday;
-  rlt.Hour=t->tm_hour;
-  rlt.Minute=t->tm_min;
-  rlt.Second=t->tm_sec;
+  rlt.Year=t.tm_year+1900;
+  rlt.Month=t.tm_mon+1;
+  rlt.Day=t.tm_mday;
+  rlt.Hour=t.tm_hour;
+  rlt.Minute=t.tm_min;
+  rlt.Second=t.tm_sec;
   rlt.Reminder=0;
-  rlt.wDay=t->tm_wday;
-  rlt.yDay=t->tm_yday;
+  rlt.wDay=t.tm_wday;
+  rlt.yDay=t.tm_yday;
   return(*this);
 }
 

Modified: branches/linuxport/XBMC/xbmc/linux/XTimeUtils.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/linux/XTimeUtils.cpp	2008-09-23 23:04:42 UTC (rev 15674)
+++ branches/linuxport/XBMC/xbmc/linux/XTimeUtils.cpp	2008-09-23 23:42:32 UTC (rev 15675)
@@ -64,16 +64,19 @@
 VOID GetLocalTime(LPSYSTEMTIME sysTime)
 {
   const time_t t = time(NULL);
-  struct tm* now = localtime(&t);
-  sysTime->wYear = now->tm_year + 1900;
-  sysTime->wMonth = now->tm_mon + 1;
-  sysTime->wDayOfWeek = now->tm_wday;
-  sysTime->wDay = now->tm_mday;
-  sysTime->wHour = now->tm_hour;
-  sysTime->wMinute = now->tm_min;
-  sysTime->wSecond = now->tm_sec;
+  struct tm now;
+
+  localtime_r(&t, &now);
+  sysTime->wYear = now.tm_year + 1900;
+  sysTime->wMonth = now.tm_mon + 1;
+  sysTime->wDayOfWeek = now.tm_wday;
+  sysTime->wDay = now.tm_mday;
+  sysTime->wHour = now.tm_hour;
+  sysTime->wMinute = now.tm_min;
+  sysTime->wSecond = now.tm_sec;
   sysTime->wMilliseconds = 0;
-  g_timezone.m_IsDST = now->tm_isdst;
+  // NOTE: localtime_r() is not required to set this, but we Assume that it's set here.
+  g_timezone.m_IsDST = now.tm_isdst;
 }
 
 DWORD GetTickCount(void)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15687
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15687&view=rev
Author:   spiff_
Date:     2008-09-25 18:34:05 +0000 (Thu, 25 Sep 2008)

Log Message:
-----------
fixed: auto added network location could get removed if user had added a location with a similar path

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIDialogFileBrowser.cpp
    branches/linuxport/XBMC/xbmc/GUIDialogMediaSource.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIDialogFileBrowser.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogFileBrowser.cpp	2008-09-25 16:10:50 UTC (rev 15686)
+++ branches/linuxport/XBMC/xbmc/GUIDialogFileBrowser.cpp	2008-09-25 18:34:05 UTC (rev 15687)
@@ -81,9 +81,22 @@
   if ((action.wID == ACTION_CONTEXT_MENU || action.wID == ACTION_MOUSE_RIGHT_CLICK) && m_Directory->m_strPath.IsEmpty())
   {
     int iItem = m_viewControl.GetSelectedItem();
-    if ((!m_addSourceType.IsEmpty() && iItem != m_vecItems->Size()-1) || (m_addNetworkShareEnabled && g_mediaManager.HasLocation(m_selectedPath)))
+    if ((!m_addSourceType.IsEmpty() && iItem != m_vecItems->Size()-1))
       return OnPopupMenu(iItem);
+    if (m_addNetworkShareEnabled && g_mediaManager.HasLocation(m_selectedPath))
+    {
+      // need to make sure this source is not an auto added location
+      // as users locations might have the same paths
+      CFileItemPtr pItem = (*m_vecItems)[iItem];
+      for (unsigned int i=0;i<m_shares.size();++i)
+      {
+        if (m_shares[i].strName.Equals(pItem->GetLabel()) && m_shares[i].m_ignore)
+          return false;
+      }
 
+      return OnPopupMenu(iItem);
+    }
+
     return false;
   }
 
@@ -860,7 +873,7 @@
 
       for (unsigned int i=0;i<m_shares.size();++i)
       {
-        if (m_shares[i].strPath.Equals(m_selectedPath)) // getPath().Equals(m_selectedPath))
+        if (m_shares[i].strPath.Equals(m_selectedPath) && !m_shares[i].m_ignore) // getPath().Equals(m_selectedPath))
         {
           m_shares.erase(m_shares.begin()+i);
           break;

Modified: branches/linuxport/XBMC/xbmc/GUIDialogMediaSource.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogMediaSource.cpp	2008-09-25 16:10:50 UTC (rev 15686)
+++ branches/linuxport/XBMC/xbmc/GUIDialogMediaSource.cpp	2008-09-25 18:34:05 UTC (rev 15687)
@@ -251,6 +251,7 @@
     CMediaSource share1;
     share1.strPath = "special://musicplaylists/";
     share1.strName = g_localizeStrings.Get(20011);
+    share1.m_ignore = true;
     extraShares.push_back(share1);
 
     share1.strPath = "smb://";
@@ -267,106 +268,98 @@
 
     if (g_guiSettings.GetString("mymusic.recordingpath",false) != "")
     {
-      CMediaSource share2;
-      share2.strPath = "special://recordings/";
-      share2.strName = g_localizeStrings.Get(20007);
-      extraShares.push_back(share2);
+      share1.strPath = "special://recordings/";
+      share1.strName = g_localizeStrings.Get(20007);
+      extraShares.push_back(share1);
     }
     if (g_guiSettings.GetString("cddaripper.path",false) != "")
     {
-      CMediaSource share2;
-      share2.strPath = "special://cdrips/";
-      share2.strName = g_localizeStrings.Get(21883);
-      extraShares.push_back(share2);
+      share1.strPath = "special://cdrips/";
+      share1.strName = g_localizeStrings.Get(21883);
+      extraShares.push_back(share1);
     }
     if (g_guiSettings.GetBool("network.enableinternet"))
     {
-      CMediaSource share3;
-      share3.strName = "Shoutcast";
-      share3.strPath = "shout://www.shoutcast.com/sbin/newxml.phtml";
-      extraShares.push_back(share3);
+      share1.strName = "Shoutcast";
+      share1.strPath = "shout://www.shoutcast.com/sbin/newxml.phtml";
+      extraShares.push_back(share1);
 
       if (g_guiSettings.GetString("lastfm.username") != "")
       {
-        CMediaSource share4;
-        share4.strName = "Last.FM";
-        share4.strPath = "lastfm://";
-        extraShares.push_back(share4);
+        share1.strName = "Last.FM";
+        share1.strPath = "lastfm://";
+        extraShares.push_back(share1);
       }
     }
     // add the plugins dir as needed
     if (CPluginDirectory::HasPlugins("music"))
     {
-      CMediaSource share2;
-      share2.strPath = "plugin://music/";
-      share2.strName = g_localizeStrings.Get(1038); // Music Plugins
-      extraShares.push_back(share2);
+      share1.strPath = "plugin://music/";
+      share1.strName = g_localizeStrings.Get(1038); // Music Plugins
+      extraShares.push_back(share1);
     }
  }
   else if (m_type == "video" || m_type == "upnpvideo")
   { // add the music playlist location
     CMediaSource share1;
+    share1.m_ignore = true;
     share1.strPath = "special://videoplaylists/";
     share1.strName = g_localizeStrings.Get(20012);
     extraShares.push_back(share1);
 
-    CMediaSource share2;
-    share2.strPath = "rtv://*/";
-    share2.strName = "ReplayTV Devices";
-    extraShares.push_back(share2);
+    share1.strPath = "rtv://*/";
+    share1.strName = "ReplayTV Devices";
+    extraShares.push_back(share1);
 
-    share2.strPath = "smb://";
-    share2.strName = g_localizeStrings.Get(20171);
-    extraShares.push_back(share2);
+    share1.strPath = "smb://";
+    share1.strName = g_localizeStrings.Get(20171);
+    extraShares.push_back(share1);
 
-    share2.strPath = "hdhomerun://";
-    share2.strName = "HDHomerun Devices";
-    extraShares.push_back(share2);
+    share1.strPath = "hdhomerun://";
+    share1.strName = "HDHomerun Devices";
+    extraShares.push_back(share1);
 
-    share2.strPath = "sap://";
-    share2.strName = "SAP Streams";
-    extraShares.push_back(share2);
+    share1.strPath = "sap://";
+    share1.strName = "SAP Streams";
+    extraShares.push_back(share1);
 
-    share2.strPath = "upnp://";
-    share2.strName = "UPnP Devices";
-    extraShares.push_back(share2);
+    share1.strPath = "upnp://";
+    share1.strName = "UPnP Devices";
+    extraShares.push_back(share1);
 
     // add the plugins dir as needed
     if (CPluginDirectory::HasPlugins("video"))
     {
-      CMediaSource share3;
-      share3.strPath = "plugin://video/";
-      share3.strName = g_localizeStrings.Get(1037); // Video Plugins
-      extraShares.push_back(share3);
+      share1.strPath = "plugin://video/";
+      share1.strName = g_localizeStrings.Get(1037); // Video Plugins
+      extraShares.push_back(share1);
     }
   }
   else if (m_type == "pictures" || m_type == "upnpictures")
   {
+    CMediaSource share1;
+    share1.m_ignore = true;
     if (g_guiSettings.GetString("pictures.screenshotpath",false)!= "")
     {
-      CMediaSource share1;
       share1.strPath = "special://screenshots/";
       share1.strName = g_localizeStrings.Get(20008);
       extraShares.push_back(share1);
     }
 
-    CMediaSource share2;
+    share1.strPath = "smb://";
+    share1.strName = g_localizeStrings.Get(20171);
+    extraShares.push_back(share1);
 
-    share2.strPath = "smb://";
-    share2.strName = g_localizeStrings.Get(20171);
-    extraShares.push_back(share2);
+    share1.strPath = "upnp://";
+    share1.strName = "UPnP Devices";
+    extraShares.push_back(share1);
 
-    share2.strPath = "upnp://";
-    share2.strName = "UPnP Devices";
-    extraShares.push_back(share2);
-
     // add the plugins dir as needed
     if (CPluginDirectory::HasPlugins("pictures"))
     {
-      CMediaSource share2;
-      share2.strPath = "plugin://pictures/";
-      share2.strName = g_localizeStrings.Get(1039); // Picture Plugins
-      extraShares.push_back(share2);
+      share1.strPath = "plugin://pictures/";
+      share1.strName = g_localizeStrings.Get(1039); // Picture Plugins
+      extraShares.push_back(share1);
     }
   }
   else if (m_type == "programs")
@@ -376,6 +369,7 @@
       CMediaSource share2;
       share2.strPath = "plugin://programs/";
       share2.strName = g_localizeStrings.Get(1043); // Program Plugins
+      share2.m_ignore = true;
       extraShares.push_back(share2);
     }
   }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15698
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15698&view=rev
Author:   vulkanr
Date:     2008-09-27 19:46:12 +0000 (Sat, 27 Sep 2008)

Log Message:
-----------
applied patch in ticket #4905.
fixed: rtmp stream support for packet 0x16 which broke many streams.
added: better url support (play even when not all parts are provided).

thanks frosty for the patch. and elupus for guidance.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp
    branches/linuxport/XBMC/xbmc/lib/libRTMP/rtmp.cpp

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp	2008-09-27 16:01:24 UTC (rev 15697)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp	2008-09-27 19:46:12 UTC (rev 15698)
@@ -88,7 +88,7 @@
     if (nToConsume > buf_size)
       nToConsume = buf_size;
 
-    memcpy(buf, m_leftOver, nToConsume);
+    memcpy(buf, m_leftOver + m_leftOverConsumed, nToConsume);
     buf_size -= nToConsume;
     m_leftOverConsumed += nToConsume;
     nRead += nToConsume;
@@ -125,40 +125,69 @@
     if (buf_size < 4)
       return nRead;
 
-    RTMP_LIB::CRTMP::EncodeInt32((char*)buf + nRead, m_prevTagSize);
-    nRead += 4;
-    buf_size -= 4;
+    // skip video info/command packets
+    // if we keep these it chokes the dvdplayer
+    if ( packet.m_packetType == 0x09 && 
+         packet.m_nBodySize == 2 &&
+         ( (*packet.m_body & 0xf0) == 0x50) )
+    {
+      continue;
+    }
 
-    if (buf_size < 11)
-      return nRead;
+    // write footer of previous FLV tag
+    if ( m_prevTagSize != -1 )
+    {
+      RTMP_LIB::CRTMP::EncodeInt32((char*)buf + nRead, m_prevTagSize);
+      nRead += 4;
+      buf_size -= 4;
+    }
 
     char *ptr = (char*)buf + nRead;
-    *ptr = packet.m_packetType;
-    ptr++;
-    ptr += RTMP_LIB::CRTMP::EncodeInt24(ptr, packet.m_nBodySize);
-    unsigned int nTimeStamp = m_audioTS;
 
-    if (packet.m_packetType == 0x09) // video
-      nTimeStamp = m_videoTS;
+    // audio (0x08), video (0x09) or metadata (0x12) packets :
+    // construct 11 byte header then add rtmp packet's data
+    if ( packet.m_packetType == 0x08 || packet.m_packetType == 0x09 || packet.m_packetType == 0x12 )
+    {
+      m_prevTagSize = 11 + packet.m_nBodySize;
 
-    ptr += RTMP_LIB::CRTMP::EncodeInt24(ptr, nTimeStamp);
+      if (buf_size < 11)
+        return nRead;
 
-    *ptr = (char)((nTimeStamp & 0xFF000000) >> 24);
-    ptr++;
+      *ptr = packet.m_packetType;
+      ptr++;
+      ptr += RTMP_LIB::CRTMP::EncodeInt24(ptr, packet.m_nBodySize);
+      
+      unsigned int nTimeStamp = 0;
+      if (packet.m_packetType == 0x08){ // audio
+        nTimeStamp = m_audioTS;
+        m_audioTS += packet.m_nInfoField1;
+      }
+      else if (packet.m_packetType == 0x09){ // video
+        nTimeStamp = m_videoTS;
+        m_videoTS += packet.m_nInfoField1;
+      }
+      
+      ptr += RTMP_LIB::CRTMP::EncodeInt24(ptr, nTimeStamp);
 
-    if (packet.m_packetType == 0x09) // video
-      m_videoTS += packet.m_nInfoField1;
-    else
-      m_audioTS += packet.m_nInfoField1;
+      *ptr = (char)((nTimeStamp & 0xFF000000) >> 24);
+      ptr++;
 
-    ptr += RTMP_LIB::CRTMP::EncodeInt24(ptr, 0);
+      ptr += RTMP_LIB::CRTMP::EncodeInt24(ptr, 0);
 
-    nRead += 11;
-    buf_size -= 11;
+      nRead += 11;
+      buf_size -= 11;
 
-    if (buf_size == 0)
-      return nRead;
+      if (buf_size == 0)
+        return nRead;
 
+    }
+    else if (packet.m_packetType == 0x16)
+    {
+      // FLV tag(s) packet 
+      // contains it's own tagsize footer, don't write another
+      m_prevTagSize = -1; 
+    }
+
     int nBodyLen = packet.m_nBodySize;
     if (nBodyLen > buf_size)
     {
@@ -178,9 +207,9 @@
       buf_size -= nBodyLen; 
     }
 
-    m_prevTagSize = 11 + packet.m_nBodySize;
   }
 
+
   if (m_rtmp.IsConnected())
     return nRead;
 

Modified: branches/linuxport/XBMC/xbmc/lib/libRTMP/rtmp.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libRTMP/rtmp.cpp	2008-09-27 16:01:24 UTC (rev 15697)
+++ branches/linuxport/XBMC/xbmc/lib/libRTMP/rtmp.cpp	2008-09-27 19:46:12 UTC (rev 15698)
@@ -52,7 +52,7 @@
 CRTMP::CRTMP() : m_socket(INVALID_SOCKET)
 {
   Close();
-  m_strPlayer = "http://www.boxee.tv/player.swf";
+  m_strPlayer = "file:///xbmc.flv";
   m_pBuffer = new char[RTMP_BUFFER_CACHE_SIZE];
 }
 
@@ -159,6 +159,7 @@
 
       case 0x03:
         // bytes read report
+        CLog::Log(LOGDEBUG,"%s, received: bytes read report", __FUNCTION__);
         break;
 
       case 0x04:
@@ -168,26 +169,31 @@
 
       case 0x05:
         // server bw
+        CLog::Log(LOGDEBUG,"%s, received: server BW", __FUNCTION__);
         break;
 
       case 0x06:
         // client bw
+        CLog::Log(LOGDEBUG,"%s, received: client BW", __FUNCTION__);
         break;
 
       case 0x08:
         // audio data
+        CLog::Log(LOGDEBUG,"%s, received: audio %i bytes", __FUNCTION__, packet.m_nBodySize);
         HandleAudio(packet);
         bHasMediaPacket = true;
         break;
 
       case 0x09:
         // video data
+        CLog::Log(LOGDEBUG,"%s, received: video %i bytes", __FUNCTION__, packet.m_nBodySize);
         HandleVideo(packet);
         bHasMediaPacket = true;
         break;
 
       case 0x12:
-        // metadata
+        // metadata (notify)
+        CLog::Log(LOGDEBUG,"%s, received: notify", __FUNCTION__);
         HandleMetadata(packet);
         bHasMediaPacket = true;
         break;
@@ -197,6 +203,12 @@
         HandleInvoke(packet);
         break;
 
+      case 0x16:
+        // FLV tag(s)
+        CLog::Log(LOGDEBUG,"%s, received: FLV tag(s) %i bytes", __FUNCTION__, packet.m_nBodySize);
+        bHasMediaPacket = true;
+        break;
+
       default:
         CLog::Log(LOGDEBUG,"unknown packet type received: 0x%02x", packet.m_packetType);
     }
@@ -239,7 +251,7 @@
     else
       nBytes = recv(m_socket, ptr, n, 0);
 
-    if (nBytes < 0)
+    if (nBytes == SOCKET_ERROR)
     {
       CLog::Log(LOGERROR, "%s, RTMP recv error %d", __FUNCTION__, GetLastError());
       Close();
@@ -297,7 +309,19 @@
 bool CRTMP::SendConnectPacket()
 {
   CURL url(m_strLink);
+  CStdString app = url.GetFileName();
 
+  CStdString::size_type slistPos = url.GetFileName().Find("slist=");
+  if ( slistPos == CStdString::npos ){
+    // no slist parameter. send the path as the app
+    // if URL path contains a slash, use the part up to that as the app
+    // as we'll send the part after the slash as the thing to play
+    CStdString::size_type pos_slash = app.find_last_of("/");
+    if( pos_slash != CStdString::npos ){
+      app = app.Left(pos_slash);
+    }
+  }
+	
   RTMPPacket packet;
   packet.m_nChannel = 0x03;   // control channel (invoke)
   packet.m_headerType = RTMP_PACKET_SIZE_LARGE;
@@ -309,7 +333,7 @@
   enc += EncodeNumber(enc, 1.0);
   *enc = 0x03; //Object Datatype
   enc++;
-  enc += EncodeString(enc, "app", url.GetFileName());
+  enc += EncodeString(enc, "app", app);
   enc += EncodeString(enc, "flashVer", "LNX 9,0,115,0");
   enc += EncodeString(enc, "swfUrl", m_strPlayer.c_str());
   enc += EncodeString(enc, "tcUrl", m_strLink.c_str());
@@ -474,14 +498,27 @@
   enc += EncodeNumber(enc, 0.0);
   *enc = 0x05; // NULL
   enc++;
+  // use m_strPlayPath
   CStdString strPlay = m_strPlayPath;
   if (strPlay.IsEmpty())
   {
+    // or use slist parameter, if there is one
     int nPos = url.GetFileName().Find("slist=");
     if (nPos > 0)
       strPlay = url.GetFileName().Mid(nPos + 6);
-    if (strPlay.IsEmpty())
-      return false;
+		
+		if (strPlay.IsEmpty())
+		{
+			// or use last piece of URL, if there's more than one level
+			CStdString::size_type pos_slash = url.GetFileName().find_last_of("/");
+			if ( pos_slash != CStdString::npos )
+				strPlay = url.GetFileName().Mid(pos_slash+1);
+		}
+
+		if (strPlay.IsEmpty()){
+			CLog::Log(LOGERROR,"%s, no name to play!", __FUNCTION__);
+			return false;
+		}
   }
 
   enc += EncodeString(enc, strPlay.c_str());
@@ -535,8 +572,8 @@
   }
 
   obj.Dump();
-
   CStdString method = obj.GetProperty(0).GetString();
+  CLog::Log(LOGDEBUG,"%s, server invoking <%s>", __FUNCTION__, method.c_str());
 
   if (method == "_result")
   {
@@ -577,12 +614,14 @@
     CLog::Log(LOGERROR,"rtmp server requested close");
     Close();
   }
-  else if (method == "onstatus")
+  else if (method == "onStatus")
   {
+    CStdString text = obj.GetProperty(3).GetObject().GetProperty("code").GetString();
+    CLog::Log(LOGDEBUG,"%s, onStatus: %s", __FUNCTION__, text.c_str() );
   }
   else
   {
-    CLog::Log(LOGDEBUG,"%s, server invoking <%s>", __FUNCTION__, method.c_str());
+
   }
 }
 
@@ -595,7 +634,7 @@
   if (packet.m_nBodySize >= 4)
   {
     m_chunkSize = ReadInt32(packet.m_body);
-    CLog::Log(LOGDEBUG,"Changed chunk size to %d", m_chunkSize);
+    CLog::Log(LOGDEBUG,"%s, received: chunk size change to %d", __FUNCTION__, m_chunkSize);
   }
 }
 
@@ -634,6 +673,9 @@
   packet.m_nChannel = (type & 0x3f);
 
   int nSize = packetSize[packet.m_headerType];
+  
+//  CLog::Log(LOGDEBUG, "%s, reading RTMP packet chunk on channel %x, headersz %i", __FUNCTION__, packet.m_nChannel, nSize);
+
   if (nSize < RTMP_LARGE_HEADER_SIZE) // using values from the last message of this channel
     packet = m_vecChannelsIn[packet.m_nChannel];
   
@@ -1009,7 +1051,7 @@
   while (m_nBufferSize < RTMP_BUFFER_CACHE_SIZE && time(NULL) - now < 4)
   {
     int nBytes = recv(m_socket, m_pBuffer + m_nBufferSize, RTMP_BUFFER_CACHE_SIZE - m_nBufferSize, 0);
-    if (nBytes > 0)
+    if (nBytes != SOCKET_ERROR)
       m_nBufferSize += nBytes;
     else
     {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15702
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15702&view=rev
Author:   vdrfan
Date:     2008-09-28 23:53:08 +0000 (Sun, 28 Sep 2008)

Log Message:
-----------
fixed: Ticket #5011 - Invalid cuesheet causes no files to be shown

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/CueDocument.cpp
    branches/linuxport/XBMC/xbmc/FileItem.cpp

Modified: branches/linuxport/XBMC/xbmc/CueDocument.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/CueDocument.cpp	2008-09-27 23:35:24 UTC (rev 15701)
+++ branches/linuxport/XBMC/xbmc/CueDocument.cpp	2008-09-28 23:53:08 UTC (rev 15702)
@@ -199,7 +199,7 @@
       song.strTitle.Format("Track %2d", i + 1);
     else
       song.strTitle = m_Track[i].strTitle;
-    song.strFileName =  m_Track[i].strFile;
+    song.strFileName =  CUtil::TranslatePath(m_Track[i].strFile);
     song.iStartOffset = m_Track[i].iStartTime;
     song.iEndOffset = m_Track[i].iEndTime;
     if (song.iEndOffset)
@@ -218,7 +218,7 @@
     uniqueFiles.insert(m_Track[i].strFile);
 
   for (std::set<CStdString>::iterator it = uniqueFiles.begin(); it != uniqueFiles.end(); it++)
-    mediaFiles.push_back(*it);
+    mediaFiles.push_back(CUtil::TranslatePath(*it));
 }
 
 CStdString CCueDocument::GetMediaTitle()

Modified: branches/linuxport/XBMC/xbmc/FileItem.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-09-27 23:35:24 UTC (rev 15701)
+++ branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-09-28 23:53:08 UTC (rev 15702)
@@ -1731,7 +1731,6 @@
                     if (!item.IsCUESheet() && !item.IsPlayList() && Contains(strMediaFile))
                     {
                       bFoundMediaFile = true;
-                      break;
                     }
                   }
                 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15711
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15711&view=rev
Author:   jmarshallnz
Date:     2008-09-29 21:53:24 +0000 (Mon, 29 Sep 2008)

Log Message:
-----------
reverted: r15702.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/CueDocument.cpp
    branches/linuxport/XBMC/xbmc/FileItem.cpp

Modified: branches/linuxport/XBMC/xbmc/CueDocument.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/CueDocument.cpp	2008-09-29 21:19:59 UTC (rev 15710)
+++ branches/linuxport/XBMC/xbmc/CueDocument.cpp	2008-09-29 21:53:24 UTC (rev 15711)
@@ -199,7 +199,7 @@
       song.strTitle.Format("Track %2d", i + 1);
     else
       song.strTitle = m_Track[i].strTitle;
-    song.strFileName =  CUtil::TranslatePath(m_Track[i].strFile);
+    song.strFileName =  m_Track[i].strFile;
     song.iStartOffset = m_Track[i].iStartTime;
     song.iEndOffset = m_Track[i].iEndTime;
     if (song.iEndOffset)
@@ -218,7 +218,7 @@
     uniqueFiles.insert(m_Track[i].strFile);
 
   for (std::set<CStdString>::iterator it = uniqueFiles.begin(); it != uniqueFiles.end(); it++)
-    mediaFiles.push_back(CUtil::TranslatePath(*it));
+    mediaFiles.push_back(*it);
 }
 
 CStdString CCueDocument::GetMediaTitle()

Modified: branches/linuxport/XBMC/xbmc/FileItem.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-09-29 21:19:59 UTC (rev 15710)
+++ branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-09-29 21:53:24 UTC (rev 15711)
@@ -1731,6 +1731,7 @@
                     if (!item.IsCUESheet() && !item.IsPlayList() && Contains(strMediaFile))
                     {
                       bFoundMediaFile = true;
+                      break;
                     }
                   }
                 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15745
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15745&view=rev
Author:   jmarshallnz
Date:     2008-10-03 03:16:15 +0000 (Fri, 03 Oct 2008)

Log Message:
-----------
fixed: Ticket #5046 - Better conversion to UTF8 from unknown scraper sources

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileSystem/cddb.cpp
    branches/linuxport/XBMC/xbmc/NfoFile.h
    branches/linuxport/XBMC/xbmc/utils/CharsetConverter.cpp
    branches/linuxport/XBMC/xbmc/utils/CharsetConverter.h
    branches/linuxport/XBMC/xbmc/utils/IMDB.cpp
    branches/linuxport/XBMC/xbmc/utils/MusicAlbumInfo.cpp
    branches/linuxport/XBMC/xbmc/utils/MusicArtistInfo.cpp
    branches/linuxport/XBMC/xbmc/utils/MusicInfoScraper.cpp
    branches/linuxport/XBMC/xbmc/utils/ScraperUrl.cpp

Modified: branches/linuxport/XBMC/xbmc/FileSystem/cddb.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/cddb.cpp	2008-10-03 00:10:27 UTC (rev 15744)
+++ branches/linuxport/XBMC/xbmc/FileSystem/cddb.cpp	2008-10-03 03:16:15 UTC (rev 15745)
@@ -718,14 +718,12 @@
 
   CStdString strArtist=artist;
   // You never know if you really get UTF-8 strings from cddb
-  if (!g_charsetConverter.isValidUtf8(strArtist)) 
-    g_charsetConverter.stringCharsetToUtf8(CStdString(artist), strArtist);
+  g_charsetConverter.unknownToUTF8(artist, strArtist);
   m_mapArtists[trk_nr] += strArtist;
 
   CStdString strTitle=title;
   // You never know if you really get UTF-8 strings from cddb
-  if (!g_charsetConverter.isValidUtf8(strTitle)) 
-    g_charsetConverter.stringCharsetToUtf8(CStdString(title), strTitle);
+  g_charsetConverter.unknownToUTF8(title, strTitle);
   m_mapTitles[trk_nr] += strTitle;
 }
 
@@ -826,25 +824,16 @@
           CStdString strDisk_title = (char*)(line + i + 3);
 
           // You never know if you really get UTF-8 strings from cddb
-          if (!g_charsetConverter.isValidUtf8(strDisk_artist))
-            g_charsetConverter.stringCharsetToUtf8(strDisk_artist, m_strDisk_artist);
-          else
-            m_strDisk_artist=strDisk_artist;
+          g_charsetConverter.unknownToUTF8(strDisk_artist, m_strDisk_artist);
 
           // You never know if you really get UTF-8 strings from cddb
-          if (!g_charsetConverter.isValidUtf8(strDisk_title))
-            g_charsetConverter.stringCharsetToUtf8(strDisk_title, m_strDisk_title);
-          else
-            m_strDisk_title=strDisk_title;
+          g_charsetConverter.unknownToUTF8(strDisk_title, m_strDisk_title);
         }
         else
         {
           CStdString strDisk_title = (char*)(line + 7);
           // You never know if you really get UTF-8 strings from cddb
-          if (!g_charsetConverter.isValidUtf8(strDisk_title))
-            g_charsetConverter.stringCharsetToUtf8(strDisk_title, m_strDisk_title);
-          else
-            m_strDisk_title=strDisk_title;
+          g_charsetConverter.unknownToUTF8(strDisk_title, m_strDisk_title);
         }
       }
       else if (0 == strncmp(line, "DYEAR", 5))
@@ -852,10 +841,7 @@
         CStdString strYear = (char*)(line + 5);
         strYear.TrimLeft("= ");
         // You never know if you really get UTF-8 strings from cddb
-        if (!g_charsetConverter.isValidUtf8(strYear))
-          g_charsetConverter.stringCharsetToUtf8(strYear, m_strYear);
-        else
-          m_strYear=strYear;
+        g_charsetConverter.unknownToUTF8(strYear, m_strYear);
       }
       else if (0 == strncmp(line, "DGENRE", 6))
       {
@@ -863,10 +849,7 @@
         strGenre.TrimLeft("= ");
 
         // You never know if you really get UTF-8 strings from cddb
-        if (!g_charsetConverter.isValidUtf8(strGenre))
-          g_charsetConverter.stringCharsetToUtf8(strGenre, m_strGenre);
-        else
-          m_strGenre=strGenre;
+        g_charsetConverter.unknownToUTF8(strGenre, m_strGenre);
       }
       else if (0 == strncmp(line, "TTITLE", 6))
       {
@@ -887,10 +870,7 @@
             strYear = strExtd.Mid(iPos + 6, 4);
 
             // You never know if you really get UTF-8 strings from cddb
-            if (!g_charsetConverter.isValidUtf8(strYear))
-              g_charsetConverter.stringCharsetToUtf8(strYear, m_strYear);
-            else
-              m_strYear=strYear;
+            g_charsetConverter.unknownToUTF8(strYear, m_strYear);
           }
         }
 
@@ -951,10 +931,7 @@
   CStdString strValue;
   CStdString strValueUtf8=value;
   // You never know if you really get UTF-8 strings from cddb
-  if (!g_charsetConverter.isValidUtf8(strValueUtf8))
-    g_charsetConverter.stringCharsetToUtf8(strValueUtf8, strValue);
-  else
-    strValue=strValueUtf8;
+  g_charsetConverter.unknownToUTF8(strValueUtf8, strValue);
   m_mapExtended_track[trk_nr] = strValue;
 }
 
@@ -1063,15 +1040,13 @@
 
   CStdString strArtist=artist;
   // You never know if you really get UTF-8 strings from cddb
-  if (!g_charsetConverter.isValidUtf8(strArtist)) 
-    g_charsetConverter.stringCharsetToUtf8(CStdString(artist), strArtist);
+  g_charsetConverter.unknownToUTF8(artist, strArtist);
   m_mapInexact_artist_list[line_cnt] = strArtist;
 
-  CStdString strTitel=title;
+  CStdString strTitle=title;
   // You never know if you really get UTF-8 strings from cddb
-  if (!g_charsetConverter.isValidUtf8(strTitel)) 
-    g_charsetConverter.stringCharsetToUtf8(CStdString(artist), strTitel);
-  m_mapInexact_title_list[line_cnt] = strTitel;
+  g_charsetConverter.unknownToUTF8(title, strTitle);
+  m_mapInexact_title_list[line_cnt] = strTitle;
   // char log_string[1024];
   // sprintf(log_string,"%u: %s - %s",line_cnt,artist,title);
   // //writeLog(log_string);

Modified: branches/linuxport/XBMC/xbmc/NfoFile.h
===================================================================
--- branches/linuxport/XBMC/xbmc/NfoFile.h	2008-10-03 00:10:27 UTC (rev 15744)
+++ branches/linuxport/XBMC/xbmc/NfoFile.h	2008-10-03 03:16:15 UTC (rev 15745)
@@ -51,7 +51,7 @@
       strDoc = m_doc;
     // try to load using string charset
     if (strDoc.Find("encoding=") == -1)
-      g_charsetConverter.stringCharsetToUtf8(strDoc.Mid(0),strDoc);
+      g_charsetConverter.unknownToUTF8(strDoc);
 
     doc.Parse(strDoc.c_str());
     if (details.Load(doc.RootElement()))

Modified: branches/linuxport/XBMC/xbmc/utils/CharsetConverter.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/CharsetConverter.cpp	2008-10-03 00:10:27 UTC (rev 15744)
+++ branches/linuxport/XBMC/xbmc/utils/CharsetConverter.cpp	2008-10-03 03:16:15 UTC (rev 15745)
@@ -368,14 +368,34 @@
   iconv_close(iconvString);
 }
 
-void CCharsetConverter::stringCharsetTo(const CStdStringA& strDestCharset, const CStdStringA& strSource, CStdStringA& strDest)
+void CCharsetConverter::utf8To(const CStdStringA& strDestCharset, const CStdStringA& strSource, CStdStringA& strDest)
 {
+  if (strDestCharset == "UTF-8")
+  { // simple case - no conversion necessary
+    strDest = strSource;
+    return;
+  }
   iconv_t iconvString;
   ICONV_PREPARE(iconvString);
-  convert(iconvString,UTF8_DEST_MULTIPLIER,g_langInfo.GetGuiCharSet(),strDestCharset,strSource,strDest);
+  convert(iconvString,UTF8_DEST_MULTIPLIER,"UTF-8",strDestCharset,strSource,strDest);
   iconv_close(iconvString);
 }
 
+void CCharsetConverter::unknownToUTF8(CStdStringA &sourceAndDest)
+{
+  CStdString source = sourceAndDest;
+  unknownToUTF8(source, sourceAndDest);
+}
+
+void CCharsetConverter::unknownToUTF8(const CStdStringA &source, CStdStringA &dest)
+{
+  // checks whether it's utf8 already, and if not converts using the sourceCharset if given, else the string charset
+  if (isValidUtf8(source))
+    dest = source;
+  else
+    stringCharsetToUtf8(source, dest);
+}
+
 void CCharsetConverter::wToUTF8(const CStdStringW& strSource, CStdStringA &strDest)
 {
   CSingleLock lock(m_critSection);

Modified: branches/linuxport/XBMC/xbmc/utils/CharsetConverter.h
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/CharsetConverter.h	2008-10-03 00:10:27 UTC (rev 15744)
+++ branches/linuxport/XBMC/xbmc/utils/CharsetConverter.h	2008-10-03 03:16:15 UTC (rev 15745)
@@ -101,10 +101,11 @@
 
   void utf8ToStringCharset(CStdStringA& strSourceDest);
 
+  void utf8To(const CStdStringA& strDestCharset, const CStdStringA& strSource, CStdStringA& strDest);
+
   void stringCharsetToUtf8(const CStdStringA& strSource, CStdStringA& strDest);
 
   void stringCharsetToUtf8(const CStdStringA& strSourceCharset, const CStdStringA& strSource, CStdStringA& strDest);
-  void stringCharsetTo(const CStdStringA& strDestCharset, const CStdStringA& strSource, CStdStringA& strDest);
 
   void stringCharsetToUtf8(CStdStringA& strSourceDest);
 
@@ -129,6 +130,9 @@
   void logicalToVisualBiDi(const CStdStringA& strSource, CStdStringA& strDest, FriBidiCharSet fribidiCharset, FriBidiCharType base = FRIBIDI_TYPE_LTR, bool* bWasFlipped=NULL);
   void logicalToVisualBiDi(const CStdStringA& strSource, CStdStringA& strDest, CStdStringA& charset, FriBidiCharType base = FRIBIDI_TYPE_LTR, bool* bWasFlipped=NULL);
 
+  void unknownToUTF8(CStdStringA &sourceDest);
+  void unknownToUTF8(const CStdStringA &source, CStdStringA &dest);
+
 private:
   std::vector<CStdString> m_vecCharsetNames;
   std::vector<CStdString> m_vecCharsetLabels;

Modified: branches/linuxport/XBMC/xbmc/utils/IMDB.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/IMDB.cpp	2008-10-03 00:10:27 UTC (rev 15744)
+++ branches/linuxport/XBMC/xbmc/utils/IMDB.cpp	2008-10-03 03:16:15 UTC (rev 15745)
@@ -110,7 +110,7 @@
   }
 
   if (strXML.Find("encoding=\"utf-8\"") < 0)
-    g_charsetConverter.stringCharsetToUtf8(strXML);
+    g_charsetConverter.unknownToUTF8(strXML);
 
   // ok, now parse the xml file
   TiXmlDocument doc;
@@ -229,6 +229,10 @@
       CLog::Log(LOGERROR, "%s: Unable to parse xml",__FUNCTION__);
       return false;
     }
+
+    if (strXML.Find("encoding=\"utf-8\"") < 0)
+      g_charsetConverter.unknownToUTF8(strXML);
+
     TiXmlHandle docHandle( &doc );
     TiXmlElement *movie = docHandle.FirstChild( "episodeguide" ).FirstChild( "episode" ).Element();
 
@@ -243,7 +247,7 @@
       {
         CScraperUrl url2;
         if (title && title->FirstChild())
-          g_charsetConverter.stringCharsetToUtf8(title->FirstChild()->Value(),url2.strTitle);
+          url2.strTitle = title->FirstChild()->Value();
         else
           url2.strTitle = g_localizeStrings.Get(416);
 
@@ -319,7 +323,7 @@
   // abit ugly, but should work. would have been better if parser
   // set the charset of the xml, and we made use of that
   if (strXML.Find("encoding=\"utf-8\"") < 0)
-    g_charsetConverter.stringCharsetToUtf8(strXML);
+    g_charsetConverter.unknownToUTF8(strXML);
 
     // ok, now parse the xml file
   TiXmlBase::SetCondenseWhiteSpace(false);
@@ -466,7 +470,9 @@
 
     strSearch2.Replace('_', ' ');
 
-    g_charsetConverter.stringCharsetTo(m_parser.GetSearchStringEncoding(),strSearch2,m_parser.m_param[0]);
+    // convert to utf8 first (if necessary), then to the encoding requested by the parser
+    g_charsetConverter.unknownToUTF8(strSearch2);
+    g_charsetConverter.utf8To(m_parser.GetSearchStringEncoding(), strSearch2, m_parser.m_param[0]);
     CUtil::URLEncode(m_parser.m_param[0]);
   }
   scrURL.ParseString(m_parser.Parse("CreateSearchUrl",&m_info.settings));

Modified: branches/linuxport/XBMC/xbmc/utils/MusicAlbumInfo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/MusicAlbumInfo.cpp	2008-10-03 00:10:27 UTC (rev 15744)
+++ branches/linuxport/XBMC/xbmc/utils/MusicAlbumInfo.cpp	2008-10-03 03:16:15 UTC (rev 15745)
@@ -159,7 +159,7 @@
   // abit ugly, but should work. would have been better if parser
   // set the charset of the xml, and we made use of that
   if (strXML.Find("encoding=\"utf-8\"") < 0)
-    g_charsetConverter.stringCharsetToUtf8(strXML);
+    g_charsetConverter.unknownToUTF8(strXML);
 
     // ok, now parse the xml file
   TiXmlBase::SetCondenseWhiteSpace(false);

Modified: branches/linuxport/XBMC/xbmc/utils/MusicArtistInfo.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/MusicArtistInfo.cpp	2008-10-03 00:10:27 UTC (rev 15744)
+++ branches/linuxport/XBMC/xbmc/utils/MusicArtistInfo.cpp	2008-10-03 03:16:15 UTC (rev 15745)
@@ -193,7 +193,7 @@
   // abit ugly, but should work. would have been better if parser
   // set the charset of the xml, and we made use of that
   if (strXML.Find("encoding=\"utf-8\"") < 0)
-    g_charsetConverter.stringCharsetToUtf8(strXML);
+    g_charsetConverter.unknownToUTF8(strXML);
 
     // ok, now parse the xml file
   TiXmlBase::SetCondenseWhiteSpace(false);

Modified: branches/linuxport/XBMC/xbmc/utils/MusicInfoScraper.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/MusicInfoScraper.cpp	2008-10-03 00:10:27 UTC (rev 15744)
+++ branches/linuxport/XBMC/xbmc/utils/MusicInfoScraper.cpp	2008-10-03 03:16:15 UTC (rev 15745)
@@ -116,7 +116,7 @@
   }
 
   if (strXML.Find("encoding=\"utf-8\"") < 0)
-    g_charsetConverter.stringCharsetToUtf8(strXML);
+    g_charsetConverter.unknownToUTF8(strXML);
 
   // ok, now parse the xml file
   TiXmlDocument doc;
@@ -211,7 +211,7 @@
   }
 
   if (strXML.Find("encoding=\"utf-8\"") < 0)
-    g_charsetConverter.stringCharsetToUtf8(strXML);
+    g_charsetConverter.unknownToUTF8(strXML);
 
   // ok, now parse the xml file
   TiXmlDocument doc;

Modified: branches/linuxport/XBMC/xbmc/utils/ScraperUrl.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/ScraperUrl.cpp	2008-10-03 00:10:27 UTC (rev 15744)
+++ branches/linuxport/XBMC/xbmc/utils/ScraperUrl.cpp	2008-10-03 03:16:15 UTC (rev 15745)
@@ -137,7 +137,7 @@
 
   // ok, now parse the xml file
   if (strUrl.Find("encoding=\"utf-8\"") < 0)
-    g_charsetConverter.stringCharsetToUtf8(strUrl);
+    g_charsetConverter.unknownToUTF8(strUrl);
 
   TiXmlDocument doc;
   doc.Parse(strUrl.c_str(),0,TIXML_ENCODING_UTF8);
@@ -288,7 +288,7 @@
 
   // ok, now parse the xml file
   if (strUrls.Find("encoding=\"utf-8\"") < 0)
-    g_charsetConverter.stringCharsetToUtf8(strUrls);
+    g_charsetConverter.unknownToUTF8(strUrls);
 
   TiXmlDocument doc;
   doc.Parse(strUrls.c_str(),0,TIXML_ENCODING_UTF8);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15746
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15746&view=rev
Author:   d4rkm4ster
Date:     2008-10-03 03:29:25 +0000 (Fri, 03 Oct 2008)

Log Message:
-----------
fixed: #5045 execution of certain action would result in a deadlock.
(moved all action execution to the GUI thread.)

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/utils/EventClient.cpp
    branches/linuxport/XBMC/xbmc/utils/EventClient.h
    branches/linuxport/XBMC/xbmc/utils/EventServer.cpp
    branches/linuxport/XBMC/xbmc/utils/EventServer.h

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-10-03 03:16:15 UTC (rev 15745)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-10-03 03:29:25 UTC (rev 15746)
@@ -3440,16 +3440,19 @@
 {
 #ifdef HAS_EVENT_SERVER
   CEventServer* es = CEventServer::GetInstance();
-  if (!es || !es->Running())
+  if (!es || !es->Running() || es->GetNumberOfClients()==0)
     return false;
 
+  // process any queued up actions
+  es->ExecuteNextAction();
+
+  // now handle any buttons or axis
   std::string joystickName;
   bool isAxis = false;
   float fAmount = 0.0;
 
   WORD wKeyID = es->GetButtonCode(joystickName, isAxis, fAmount);
 
-
   if (wKeyID)
   {
     if (joystickName.length() > 0)

Modified: branches/linuxport/XBMC/xbmc/utils/EventClient.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/EventClient.cpp	2008-10-03 03:16:15 UTC (rev 15745)
+++ branches/linuxport/XBMC/xbmc/utils/EventClient.cpp	2008-10-03 03:29:25 UTC (rev 15746)
@@ -172,7 +172,7 @@
   return true;
 }
 
-void CEventClient::ExecuteEvents()
+void CEventClient::ProcessEvents()
 {
   if (m_readyPackets.size() > 0)
   {
@@ -188,6 +188,45 @@
   }
 }
 
+bool CEventClient::ExecuteNextAction()
+{
+  CEventAction actionEvent;
+  CAction action;
+
+  EnterCriticalSection(&m_critSection);
+  if (m_actionQueue.size() > 0)
+  {
+    // grab the next action in line
+    actionEvent = m_actionQueue.front();
+    m_actionQueue.pop();
+    LeaveCriticalSection(&m_critSection);
+  }
+  else
+  {
+    // we got nothing
+    LeaveCriticalSection(&m_critSection);
+    return false;
+  }
+
+  switch(actionEvent.actionType)
+  {
+  case AT_EXEC_BUILTIN:
+    CUtil::ExecBuiltIn(actionEvent.actionName);
+    break;
+
+  case AT_BUTTON:
+    g_buttonTranslator.TranslateActionString(actionEvent.actionName.c_str(), action.wID);
+    action.strAction = actionEvent.actionName;
+    action.fRepeat  = 0.0f;
+    action.fAmount1 = 1.0f;
+    action.fAmount2 = 1.0f;
+    g_application.OnAction(action);
+    break;
+  }
+
+  return true;
+}
+
 bool CEventClient::ProcessPacket(CEventPacket *packet)
 {
   if (!packet)
@@ -414,7 +453,7 @@
     }
     else
     {
-      if(!active && it->m_bActive)  
+      if(!active && it->m_bActive)
       {
         /* since modifying the list invalidates the referse iteratator */
         std::list<CEventButtonState>::iterator it2 = (++it).base();
@@ -615,20 +654,13 @@
   if (!ParseString(payload, psize, actionString))
     return false;
 
-  CAction action;
-
   switch(actionType)
   {
   case AT_EXEC_BUILTIN:
-    CUtil::ExecBuiltIn(actionString);
-    break;
   case AT_BUTTON:
-    g_buttonTranslator.TranslateActionString(actionString.c_str(), action.wID);
-    action.strAction = actionString;
-    action.fRepeat  = 0.0f;
-    action.fAmount1 = 1.0f;
-    action.fAmount2 = 1.0f;
-    g_application.OnAction(action);
+    EnterCriticalSection(&m_critSection);
+    m_actionQueue.push(CEventAction(actionString.c_str(), actionType));
+    LeaveCriticalSection(&m_critSection);
     break;
 
   default:

Modified: branches/linuxport/XBMC/xbmc/utils/EventClient.h
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/EventClient.h	2008-10-03 03:16:15 UTC (rev 15745)
+++ branches/linuxport/XBMC/xbmc/utils/EventClient.h	2008-10-03 03:29:25 UTC (rev 15746)
@@ -34,6 +34,23 @@
 namespace EVENTCLIENT
 {
 
+  class CEventAction
+  {
+  public:
+    CEventAction()
+    {
+      actionType = 0;
+    }
+    CEventAction(const char* action, unsigned char type)
+    {
+      actionName = action;
+      actionType = type;
+    }
+
+    std::string    actionName;
+    unsigned char  actionType;
+  };
+
   class CEventButtonState
   {
   public:
@@ -156,9 +173,12 @@
     // process the packet queue
     bool ProcessQueue();
 
-    // execute the queued up events (packets)
-    void ExecuteEvents();
+    // process the queued up events (packets)
+    void ProcessEvents();
 
+    // execute the next action in the action queue
+    bool ExecuteNextAction();
+
     // deallocate all packets in the queues
     void FreePacketQueues();
 
@@ -231,6 +251,7 @@
 
     // button and mouse state
     std::list<CEventButtonState>  m_buttonQueue;
+    std::queue<CEventAction>      m_actionQueue;
     CEventButtonState m_currentButton;
   };
 

Modified: branches/linuxport/XBMC/xbmc/utils/EventServer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/EventServer.cpp	2008-10-03 03:16:15 UTC (rev 15745)
+++ branches/linuxport/XBMC/xbmc/utils/EventServer.cpp	2008-10-03 03:29:25 UTC (rev 15746)
@@ -214,8 +214,8 @@
       }
     }
 
-    // execute events
-    ExecuteEvents();
+    // process events and queue the necessary actions and button codes
+    ProcessEvents();
 
     // refresh client list
     RefreshClients();
@@ -307,18 +307,32 @@
   m_bRefreshSettings = false;
 }
 
-void CEventServer::ExecuteEvents()
+void CEventServer::ProcessEvents()
 {
   CSingleLock lock(m_critSection);
   map<unsigned long, CEventClient*>::iterator iter = m_clients.begin();
 
   while (iter != m_clients.end())
   {
-    iter->second->ExecuteEvents();
+    iter->second->ProcessEvents();
     iter++;
   }
 }
 
+bool CEventServer::ExecuteNextAction()
+{
+  CSingleLock lock(m_critSection);
+  map<unsigned long, CEventClient*>::iterator iter = m_clients.begin();
+
+  while (iter != m_clients.end())
+  {
+    if (iter->second->ExecuteNextAction())
+      return true;
+    iter++;
+  }
+  return false;
+}
+
 unsigned short CEventServer::GetButtonCode(std::string& strMapName, bool& isAxis, float& fAmount)
 {
   CSingleLock lock(m_critSection);

Modified: branches/linuxport/XBMC/xbmc/utils/EventServer.h
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/EventServer.h	2008-10-03 03:16:15 UTC (rev 15745)
+++ branches/linuxport/XBMC/xbmc/utils/EventServer.h	2008-10-03 03:29:25 UTC (rev 15746)
@@ -63,6 +63,7 @@
 
     // get events
     unsigned short GetButtonCode(std::string& strMapName, bool& isAxis, float& amount);
+    bool ExecuteNextAction();
     bool GetMousePos(float &x, float &y);
     int GetNumberOfClients();
 
@@ -70,7 +71,7 @@
     CEventServer();
     void Cleanup();
     void ProcessPacket(SOCKETS::CAddress& addr, int packetSize);
-    void ExecuteEvents();
+    void ProcessEvents();
     void RefreshClients();
 
     std::map<unsigned long, EVENTCLIENT::CEventClient*>  m_clients;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15756
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15756&view=rev
Author:   topfs2
Date:     2008-10-03 18:19:37 +0000 (Fri, 03 Oct 2008)

Log Message:
-----------
[LINUX][OSX]Moved the HDD sourcing from MediaManager to LinuxFileSystem so its easier to fill more valid information about the device, ie Name and icons

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileSystem/VirtualDirectory.cpp
    branches/linuxport/XBMC/xbmc/MediaManager.cpp
    branches/linuxport/XBMC/xbmc/linux/HalManager.h
    branches/linuxport/XBMC/xbmc/linux/LinuxFileSystem.cpp
    branches/linuxport/XBMC/xbmc/linux/LinuxFileSystem.h

Modified: branches/linuxport/XBMC/xbmc/FileSystem/VirtualDirectory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/VirtualDirectory.cpp	2008-10-03 18:03:10 UTC (rev 15755)
+++ branches/linuxport/XBMC/xbmc/FileSystem/VirtualDirectory.cpp	2008-10-03 18:19:37 UTC (rev 15756)
@@ -258,31 +258,10 @@
   if (m_allowNonLocalSources)
   {
 #ifdef HAS_HAL
-/*  static int DevTypes[] = {0, 5, 6, 7, 8, 9, 10, 13}; //These numbers can be found in libhal-storage.h. 9 is Camera and 10 is Audio player, these are uncertain.
-    std::vector<CStdString> result = CLinuxFileSystem::GetDevices(DevTypes, 8); */
-    std::vector<CStdString> result = CLinuxFileSystem::GetRemovableDrives();
-    for (unsigned int i = 0; i < result.size(); i++)
-    {
-      CMediaSource share;
-      share.strPath = result[i];
-      share.strName = CUtil::GetFileName(result[i]);
-      share.m_ignore = true;
-      shares.push_back(share);
-    }
+    CLinuxFileSystem::GetRemovableDrives(shares);
+
     int type = CMediaSource::SOURCE_TYPE_DVD;
-    result = CLinuxFileSystem::GetDrives(&type, 1);
-    for (unsigned int i = 0; i < result.size(); i++)
-    {
-      CMediaSource share;
-      share.strPath = result[i];
-      share.strName = "DVD: ";
-      share.strName += CStdString(CUtil::GetFileName(result[i]));
-      fprintf(stderr, "DVD: %s\n", result[i].c_str());
-      share.m_ignore = true;
-      share.m_iDriveType = CMediaSource::SOURCE_TYPE_LOCAL;
-      share.m_strThumbnailImage = "defaultDVDRom.png";
-      shares.push_back(share);
-    }
+    CLinuxFileSystem::GetDrives(&type, 1, shares);
 #endif
     CUtil::AutoDetectionGetSource(shares);
   }

Modified: branches/linuxport/XBMC/xbmc/MediaManager.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/MediaManager.cpp	2008-10-03 18:03:10 UTC (rev 15755)
+++ branches/linuxport/XBMC/xbmc/MediaManager.cpp	2008-10-03 18:19:37 UTC (rev 15756)
@@ -238,23 +238,9 @@
 #endif
 
 #ifdef _LINUX
-#ifdef HAS_HAL
-/* HalManager will autosource items so we only want the nonremovable
-   devices here. removable devices will be added in CVirtualDirectory */
-  vector<CStdString> result = CLinuxFileSystem::GetLocalDrives();
-#else
-  vector<CStdString> result = CLinuxFileSystem::GetLocalDrives();
+  CLinuxFileSystem::GetLocalDrives(localDrives);
 #endif
-  for (unsigned int i = 0; i < result.size(); i++)
-  {
-    CMediaSource share;
-    share.strPath = result[i];
-    share.strName = CUtil::GetFileName(result[i]);
-    share.m_ignore = true;
-    localDrives.push_back(share) ;
-  }
 #endif
-#endif // Win32PC
 }
 
 void CMediaManager::GetNetworkLocations(VECSOURCES &locations)

Modified: branches/linuxport/XBMC/xbmc/linux/HalManager.h
===================================================================
--- branches/linuxport/XBMC/xbmc/linux/HalManager.h	2008-10-03 18:03:10 UTC (rev 15755)
+++ branches/linuxport/XBMC/xbmc/linux/HalManager.h	2008-10-03 18:19:37 UTC (rev 15756)
@@ -33,6 +33,8 @@
 #define BYTE char
 #include "../utils/log.h"
 #include "../utils/CriticalSection.h"
+#include "../Util.h"
+#include "../MediaSource.h"
 
 enum PowerState
 {
@@ -86,6 +88,23 @@
 
     return  rtn;
   }
+  void toMediaSource(CMediaSource *share)
+  {
+    share->strPath = MountPoint;
+    if (Label.size() > 0)
+      share->strName = Label;
+    else
+      share->strName = CUtil::GetFileName(MountPoint);
+
+    share->m_ignore = true;
+    if (HotPlugged)
+      share->m_iDriveType = CMediaSource::SOURCE_TYPE_REMOVABLE;
+    else if(Type == CMediaSource::SOURCE_TYPE_DVD)
+      share->m_iDriveType = CMediaSource::SOURCE_TYPE_DVD;
+    else
+      share->m_iDriveType = CMediaSource::SOURCE_TYPE_LOCAL;
+  }
+
 };
 
 

Modified: branches/linuxport/XBMC/xbmc/linux/LinuxFileSystem.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/linux/LinuxFileSystem.cpp	2008-10-03 18:03:10 UTC (rev 15755)
+++ branches/linuxport/XBMC/xbmc/linux/LinuxFileSystem.cpp	2008-10-03 18:19:37 UTC (rev 15756)
@@ -22,6 +22,7 @@
 #include "LinuxFileSystem.h"
 #include "RegExp.h"
 #include "SingleLock.h"
+#include "../Util.h"
 
 using namespace std;
 
@@ -65,51 +66,52 @@
 }
 #endif //HAS_HAL
 
-vector<CStdString> CLinuxFileSystem::GetDrives()
+void CLinuxFileSystem::GetDrives(VECSOURCES &shares)
 {
-  return GetDrives(NULL, -1);
+  return GetDrives(NULL, -1, shares);
 }
 
-vector<CStdString> CLinuxFileSystem::GetLocalDrives()
+void CLinuxFileSystem::GetLocalDrives(VECSOURCES &shares)
 {
   CSingleLock lock(m_lock);
 #ifndef HAS_HAL
-  return GetDrives();
+  GetDrives(shares);
 #else
   UpdateDevices();
-  vector<CStdString> result;
   for (size_t i = 0; i < m_Devices.size(); i++)
   {
     if (m_Devices[i].Mounted && m_Devices[i].Approved && !m_Devices[i].HotPlugged)
     {
-      result.push_back(m_Devices[i].MountPoint);
+      CMediaSource share;
+      m_Devices[i].toMediaSource(&share);
+      shares.push_back(share);
     }
   }
-  return result;
 #endif
 }
 
-vector<CStdString> CLinuxFileSystem::GetRemovableDrives()
+void CLinuxFileSystem::GetRemovableDrives(VECSOURCES &shares)
 {
   CSingleLock lock(m_lock);
 #ifndef HAS_HAL
 #ifndef __APPLE__
-  return GetDevices();
+  GetDrives(shares);
 #else
   vector<CStdString> result;
   return result;
 #endif
 #else
   UpdateDevices();
-  vector<CStdString> result;
+
   for (size_t i = 0; i < m_Devices.size(); i++)
   {
     if (m_Devices[i].Mounted && m_Devices[i].Approved && m_Devices[i].HotPlugged)
     {
-      result.push_back(m_Devices[i].MountPoint);
+      CMediaSource share;
+      m_Devices[i].toMediaSource(&share);
+      shares.push_back(share);
     }
   }
-  return result;
 #endif
 }
 
@@ -117,11 +119,11 @@
    To decide wich types types are approved to be returned send for example int DevTypes[] = {0, 5, 6, 7, 8, 9, 10, 13}.
    this will return all removable types like pendrives, memcards and such but NOT removable hdd's have type 1.
    for more information on these for now is in libhal-storage.h. TODO Make defined types that can be common on all O/S */
-vector<CStdString> CLinuxFileSystem::GetDrives(int *DeviceType, int len)
+void CLinuxFileSystem::GetDrives(int *DeviceType, int len, VECSOURCES &shares)
 {
   CSingleLock lock(m_lock);
-  vector<CStdString> result;
 #ifndef HAS_HAL
+  std::vector<CStdString> result;
   if (DeviceType == NULL) // -1 is considered all devices, this is only needed in the Browse dialog. The other choices are for VirtualDirectory
   {
     CRegExp reMount;
@@ -170,25 +172,40 @@
       pclose(pipe);
     }
   }
+  for (unsigned int i = 0; i < result.size(); i++)
+  {
+    CMediaSource share;
+    share.strPath = result[i];
+    share.strName = CUtil::GetFileName(result[i]);
+    share.m_ignore = true;
+    shares.push_back(share);
+  }
 #else //#ifdef HAS_HAL
   for (unsigned int i = 0; i < m_Devices.size(); i++)
   {
     if (m_Devices[i].Mounted && m_Devices[i].Approved)
     {
       if (DeviceType == NULL)
-        result.push_back(m_Devices[i].MountPoint);
+      {
+        CMediaSource share;
+        m_Devices[i].toMediaSource(&share);
+        shares.push_back(share);
+      }
       else
       {
         for (int j = 0; j < len; j++)
         {
           if (DeviceType[j] == m_Devices[i].Type)
-            result.push_back(m_Devices[i].MountPoint);
+          {
+            CMediaSource share;
+            m_Devices[i].toMediaSource(&share);
+            shares.push_back(share);
+          }
         }
       }
     }
   }
 #endif
-  return result;
 }
 
 std::vector<CStdString> CLinuxFileSystem::GetDiskUsage()

Modified: branches/linuxport/XBMC/xbmc/linux/LinuxFileSystem.h
===================================================================
--- branches/linuxport/XBMC/xbmc/linux/LinuxFileSystem.h	2008-10-03 18:03:10 UTC (rev 15755)
+++ branches/linuxport/XBMC/xbmc/linux/LinuxFileSystem.h	2008-10-03 18:19:37 UTC (rev 15756)
@@ -32,6 +32,7 @@
 #ifdef HAS_HAL
 #include "HalManager.h"
 #endif
+#include "../MediaSource.h"
 
 class CLinuxFileSystem
 {
@@ -52,10 +53,10 @@
 
   static bool ApproveDevice(CStorageDevice *device);
 #endif
-  static std::vector<CStdString> GetDrives();
-  static std::vector<CStdString> GetLocalDrives();
-  static std::vector<CStdString> GetRemovableDrives();
-  static std::vector<CStdString> GetDrives(int *DeviceType, int len);
+  static void GetDrives(VECSOURCES &shares);
+  static void GetLocalDrives(VECSOURCES &shares);
+  static void GetRemovableDrives(VECSOURCES &shares);
+  static void GetDrives(int *DeviceType, int len, VECSOURCES &shares);
   static std::vector<CStdString> GetDiskUsage();
 };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15761
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15761&view=rev
Author:   wiso
Date:     2008-10-03 20:37:28 +0000 (Fri, 03 Oct 2008)

Log Message:
-----------
[WIN32]: reverted sqlitedataset.cpp to r15754 and Database.cpp to r15613 but ifdef it only for win32. (Thanks jmarshall).

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Database.cpp
    branches/linuxport/XBMC/xbmc/lib/sqLite/sqlitedataset.cpp

Modified: branches/linuxport/XBMC/xbmc/Database.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Database.cpp	2008-10-03 19:21:26 UTC (rev 15760)
+++ branches/linuxport/XBMC/xbmc/Database.cpp	2008-10-03 20:37:28 UTC (rev 15761)
@@ -107,7 +107,14 @@
   }
 
   m_pDB.reset(new SqliteDatabase() ) ;
+
+#ifdef _WIN32PC
+  CStdString strDatabaseUTF8;
+  g_charsetConverter.stringCharsetToUtf8(strDatabase, strDatabaseUTF8);
+  m_pDB->setDatabase(strDatabaseUTF8.c_str());
+#else
   m_pDB->setDatabase(strDatabase.c_str());
+#endif
 
   m_pDS.reset(m_pDB->CreateDataset());
   m_pDS2.reset(m_pDB->CreateDataset());

Modified: branches/linuxport/XBMC/xbmc/lib/sqLite/sqlitedataset.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/sqLite/sqlitedataset.cpp	2008-10-03 19:21:26 UTC (rev 15760)
+++ branches/linuxport/XBMC/xbmc/lib/sqLite/sqlitedataset.cpp	2008-10-03 20:37:28 UTC (rev 15761)
@@ -175,11 +175,6 @@
 int SqliteDatabase::connect() {
   try {
     disconnect();
-#ifdef _WIN32PC
-    CStdString strDB = db;
-    g_charsetConverter.unknownToUTF8(strDB);
-    db = strDB;
-#endif
     if (sqlite3_open(db.c_str(),&conn/*,NULL*/)==SQLITE_OK) {
       //cout << "Connected!\n";
       sqlite3_busy_handler(conn, busy_callback,NULL);
@@ -215,11 +210,6 @@
 int SqliteDatabase::drop() {
   if (active == false) throw DbErrors("Can't drop database: no active connection...");
   disconnect();
-#ifdef _WIN32PC
-    CStdString strDB = db;
-    g_charsetConverter.unknownToUTF8(strDB);
-    db = strDB;
-#endif
   if (!unlink(db.c_str())) {
      throw DbErrors("Can't drop database: can't unlink the file %s,\nError: %s",db.c_str(),strerror(errno));
      }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15765
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15765&view=rev
Author:   jmarshallnz
Date:     2008-10-04 01:47:41 +0000 (Sat, 04 Oct 2008)

Log Message:
-----------
fixed: Ticket #5065 - Filesystem issues on win32 when using a windows username with special characters.  Reverts r15752,r15755 and r15761.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/Database.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/HDDirectory.cpp

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-10-04 00:21:32 UTC (rev 15764)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-10-04 01:47:41 UTC (rev 15765)
@@ -1213,10 +1213,10 @@
 
   if (m_bPlatformDirectories)
   {
-    TCHAR szPath[MAX_PATH];
+    WCHAR szPath[MAX_PATH];
 
-    if(SUCCEEDED(SHGetFolderPath(NULL,CSIDL_APPDATA|CSIDL_FLAG_CREATE,NULL,0,szPath)))
-      strWin32UserFolder = szPath;
+    if(SUCCEEDED(SHGetFolderPathW(NULL,CSIDL_APPDATA|CSIDL_FLAG_CREATE,NULL,0,szPath)))
+      g_charsetConverter.wToUTF8(szPath, strWin32UserFolder);
     else
       strWin32UserFolder = strExecutablePath;
 

Modified: branches/linuxport/XBMC/xbmc/Database.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Database.cpp	2008-10-04 00:21:32 UTC (rev 15764)
+++ branches/linuxport/XBMC/xbmc/Database.cpp	2008-10-04 01:47:41 UTC (rev 15765)
@@ -107,14 +107,7 @@
   }
 
   m_pDB.reset(new SqliteDatabase() ) ;
-
-#ifdef _WIN32PC
-  CStdString strDatabaseUTF8;
-  g_charsetConverter.stringCharsetToUtf8(strDatabase, strDatabaseUTF8);
-  m_pDB->setDatabase(strDatabaseUTF8.c_str());
-#else
   m_pDB->setDatabase(strDatabase.c_str());
-#endif
 
   m_pDS.reset(m_pDB->CreateDataset());
   m_pDS2.reset(m_pDB->CreateDataset());

Modified: branches/linuxport/XBMC/xbmc/FileSystem/HDDirectory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/HDDirectory.cpp	2008-10-04 00:21:32 UTC (rev 15764)
+++ branches/linuxport/XBMC/xbmc/FileSystem/HDDirectory.cpp	2008-10-04 01:47:41 UTC (rev 15765)
@@ -183,7 +183,6 @@
 
 #ifndef _LINUX
   CStdStringW strWPath1;
-  g_charsetConverter.unknownToUTF8(strPath1);
   g_charsetConverter.utf8ToW(strPath1, strWPath1);
   if(::CreateDirectoryW(strWPath1, NULL))
 #else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15768
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15768&view=rev
Author:   d4rkm4ster
Date:     2008-10-04 08:16:56 +0000 (Sat, 04 Oct 2008)

Log Message:
-----------
fixed: same as r15767 but 2 more places where the event server might get disabled

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUIWindowLoginScreen.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsProfile.cpp

Modified: branches/linuxport/XBMC/xbmc/GUIWindowLoginScreen.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowLoginScreen.cpp	2008-10-04 08:08:31 UTC (rev 15767)
+++ branches/linuxport/XBMC/xbmc/GUIWindowLoginScreen.cpp	2008-10-04 08:16:56 UTC (rev 15768)
@@ -108,6 +108,7 @@
             {
               g_application.getNetwork().NetworkMessage(CNetwork::SERVICES_DOWN,1);
               g_settings.LoadProfile(m_viewControl.GetSelectedItem());
+              g_application.StartEventServer(); // event server could be needed in some situations
             }
             else
             {

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsProfile.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsProfile.cpp	2008-10-04 08:08:31 UTC (rev 15767)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsProfile.cpp	2008-10-04 08:16:56 UTC (rev 15768)
@@ -106,6 +106,7 @@
     bool bOldMaster = g_passwordManager.bMasterUser;
     g_passwordManager.bMasterUser = true;
     g_settings.LoadProfile(iItem);
+    g_application.StartEventServer(); // event server could be needed in some situations
 
     g_settings.m_vecProfiles[g_settings.m_iLastLoadedProfileIndex].setDate();
     g_settings.SaveProfiles(PROFILES_FILE); // to set last loaded


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15776
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15776&view=rev
Author:   vulkanr
Date:     2008-10-04 18:05:31 +0000 (Sat, 04 Oct 2008)

Log Message:
-----------
changed: shoutcast url. shoutcast changed their site completely which causes our http queries to often fail. they do however maintain backward compatibility via classic.shoutcast.com. for now - use this link.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileSystem/ShoutcastDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/ShoutcastDirectory.h
    branches/linuxport/XBMC/xbmc/GUIDialogMediaSource.cpp
    branches/linuxport/XBMC/xbmc/GUIViewStateMusic.cpp

Modified: branches/linuxport/XBMC/xbmc/FileSystem/ShoutcastDirectory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/ShoutcastDirectory.cpp	2008-10-04 15:59:52 UTC (rev 15775)
+++ branches/linuxport/XBMC/xbmc/FileSystem/ShoutcastDirectory.cpp	2008-10-04 18:05:31 UTC (rev 15776)
@@ -158,14 +158,14 @@
 
 bool CShoutcastDirectory::GetDirectory(const CStdString& strPath, CFileItemList &items)
 {
-
   CStdString strRoot = strPath;
-  if (CUtil::HasSlashAtEnd(strRoot))
+  if (CUtil::HasSlashAtEnd(strRoot) && strRoot != "shout://")
     strRoot.Delete(strRoot.size() - 1);
 
-  /* for old users wich doesn't have the full url */
-  if( strRoot.Equals("shout://www.shoutcast.com") )
-    strRoot = "shout://www.shoutcast.com/sbin/newxml.phtml";
+  /* keep backward competability (for users who already have this source defined) */
+  if( strRoot.Equals("shout://www.shoutcast.com") || strRoot.Equals("shout://") || strRoot.Equals("shout://classic.shoutcast.com") || 
+      strRoot.Equals("shout://www.shoutcast.com/sbin/newxml.phtml") )
+    strRoot = SHOUTCAST_MASTER_LINK;
 
   if (g_directoryCache.GetDirectory(strRoot, items))
     return true;

Modified: branches/linuxport/XBMC/xbmc/FileSystem/ShoutcastDirectory.h
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/ShoutcastDirectory.h	2008-10-04 15:59:52 UTC (rev 15775)
+++ branches/linuxport/XBMC/xbmc/FileSystem/ShoutcastDirectory.h	2008-10-04 18:05:31 UTC (rev 15776)
@@ -25,6 +25,8 @@
 class CURL;
 class TiXmlElement;
 
+#define SHOUTCAST_MASTER_LINK "shout://classic.shoutcast.com/sbin/newxml.phtml"
+
 namespace DIRECTORY
 {
 class CShoutcastDirectory :

Modified: branches/linuxport/XBMC/xbmc/GUIDialogMediaSource.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIDialogMediaSource.cpp	2008-10-04 15:59:52 UTC (rev 15775)
+++ branches/linuxport/XBMC/xbmc/GUIDialogMediaSource.cpp	2008-10-04 18:05:31 UTC (rev 15776)
@@ -30,6 +30,7 @@
 #include "FileSystem/PluginDirectory.h"
 #include "GUIDialogYesNo.h"
 #include "FileSystem/File.h"
+#include "FileSystem/ShoutcastDirectory.h"
 #include "FileItem.h"
 
 using namespace std;
@@ -281,7 +282,7 @@
     if (g_guiSettings.GetBool("network.enableinternet"))
     {
       share1.strName = "Shoutcast";
-      share1.strPath = "shout://www.shoutcast.com/sbin/newxml.phtml";
+      share1.strPath = SHOUTCAST_MASTER_LINK;
       extraShares.push_back(share1);
 
       if (g_guiSettings.GetString("lastfm.username") != "")

Modified: branches/linuxport/XBMC/xbmc/GUIViewStateMusic.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIViewStateMusic.cpp	2008-10-04 15:59:52 UTC (rev 15775)
+++ branches/linuxport/XBMC/xbmc/GUIViewStateMusic.cpp	2008-10-04 18:05:31 UTC (rev 15776)
@@ -31,6 +31,7 @@
 #include "FileSystem/MusicDatabaseDirectory.h"
 #include "FileSystem/VideoDatabaseDirectory.h"
 #include "FileSystem/PluginDirectory.h"
+#include "FileSystem/ShoutcastDirectory.h"
 
 using namespace DIRECTORY;
 using namespace MUSICDATABASEDIRECTORY;
@@ -484,7 +485,7 @@
   for (int i = 0; i < (int)g_settings.m_musicSources.size(); ++i)
   {
     CMediaSource share = g_settings.m_musicSources.at(i);
-    if (share.strPath.Find("shout://www.shoutcast.com/sbin/newxml.phtml") == 0)//shoutcast shares
+    if (share.strPath.Find(SHOUTCAST_MASTER_LINK) == 0)//shoutcast shares
     {
       share.m_strThumbnailImage="defaultFolderBig.png";
       m_sources.push_back(share);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15795
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15795&view=rev
Author:   d4rkm4ster
Date:     2008-10-05 07:53:05 +0000 (Sun, 05 Oct 2008)

Log Message:
-----------
added: skip loop filter advanced setting (Apple TV aid)

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Settings.cpp
    branches/linuxport/XBMC/xbmc/Settings.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp

Modified: branches/linuxport/XBMC/xbmc/Settings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.cpp	2008-10-05 07:24:48 UTC (rev 15794)
+++ branches/linuxport/XBMC/xbmc/Settings.cpp	2008-10-05 07:53:05 UTC (rev 15795)
@@ -259,6 +259,7 @@
   g_advancedSettings.m_playlistRetries = 100;
   g_advancedSettings.m_playlistTimeout = 20; // 20 seconds timeout
   g_advancedSettings.m_GLRectangleHack = false;
+  g_advancedSettings.m_iSkipLoopFilter = 0;
 }
 
 CSettings::~CSettings(void)
@@ -1245,6 +1246,7 @@
 
   XMLUtils::GetBoolean(pRootElement,"rootovershoot",g_advancedSettings.m_bUseEvilB);
   XMLUtils::GetBoolean(pRootElement,"glrectanglehack", g_advancedSettings.m_GLRectangleHack);
+  GetInteger(pRootElement,"skiploopfilter", g_advancedSettings.m_iSkipLoopFilter, 0, -16, 48);
 
   //Tuxbox
   pElement = pRootElement->FirstChildElement("tuxbox");

Modified: branches/linuxport/XBMC/xbmc/Settings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.h	2008-10-05 07:24:48 UTC (rev 15794)
+++ branches/linuxport/XBMC/xbmc/Settings.h	2008-10-05 07:53:05 UTC (rev 15795)
@@ -236,6 +236,7 @@
     int m_playlistRetries;
     int m_playlistTimeout;
     bool m_GLRectangleHack;
+    int m_iSkipLoopFilter;
   };
 
   struct stSettings

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp	2008-10-05 07:24:48 UTC (rev 15794)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp	2008-10-05 07:53:05 UTC (rev 15795)
@@ -29,6 +29,7 @@
 #if defined(_LINUX) || defined(_WIN32PC)
 #include "utils/CPUInfo.h"
 #endif
+#include "../../../../Settings.h"
 
 #ifndef _LINUX
 #define RINT(x) ((x) >= 0 ? ((int)((x) + 0.5)) : ((int)((x) - 0.5)))
@@ -134,6 +135,13 @@
   //
   //m_pCodecContext->skip_loop_filter = AVDISCARD_BIDIR;
 
+  // advanced setting override for skip loop filter (see avcodec.h for valid options)
+  // TODO: allow per video setting?
+  if (g_advancedSettings.m_iSkipLoopFilter != 0)
+  {
+    m_pCodecContext->skip_loop_filter = (AVDiscard)g_advancedSettings.m_iSkipLoopFilter;
+  }
+
   // set any special options
   for(CDVDCodecOptions::iterator it = options.begin(); it != options.end(); it++)
   {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15824
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15824&view=rev
Author:   d4rkm4ster
Date:     2008-10-07 23:22:09 +0000 (Tue, 07 Oct 2008)

Log Message:
-----------
removed: unnecessary #ifdefs

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
    branches/linuxport/XBMC/xbmc/settings/VideoSettings.h

Modified: branches/linuxport/XBMC/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp	2008-10-07 23:10:08 UTC (rev 15823)
+++ branches/linuxport/XBMC/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp	2008-10-07 23:22:09 UTC (rev 15824)
@@ -1207,7 +1207,6 @@
     m_renderQuality = RQ_SINGLEPASS;
     break;
 
-#ifndef __APPLE__
   case VS_SCALINGMETHOD_CUBIC:
     SetTextureFilter(GL_LINEAR);
     m_renderQuality = RQ_MULTIPASS;
@@ -1232,7 +1231,6 @@
     CLog::Log(LOGERROR, "GL: TODO: This scaler has not yet been implemented");
     m_renderQuality = RQ_SINGLEPASS;
     break;
-#endif
     
   case VS_SCALINGMETHOD_BICUBIC_SOFTWARE:
   case VS_SCALINGMETHOD_LANCZOS_SOFTWARE:

Modified: branches/linuxport/XBMC/xbmc/settings/VideoSettings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/settings/VideoSettings.h	2008-10-07 23:10:08 UTC (rev 15823)
+++ branches/linuxport/XBMC/xbmc/settings/VideoSettings.h	2008-10-07 23:22:09 UTC (rev 15824)
@@ -49,13 +49,11 @@
   VS_SCALINGMETHOD_NEAREST=0,
   VS_SCALINGMETHOD_LINEAR,
   
-#ifndef __APPLE__
   VS_SCALINGMETHOD_CUBIC,
   VS_SCALINGMETHOD_LANCZOS2,
   VS_SCALINGMETHOD_LANCZOS3,
   VS_SCALINGMETHOD_SINC8,
   VS_SCALINGMETHOD_NEDI,
-#endif
   
   VS_SCALINGMETHOD_BICUBIC_SOFTWARE,
   VS_SCALINGMETHOD_LANCZOS_SOFTWARE,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15825
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15825&view=rev
Author:   d4rkm4ster
Date:     2008-10-08 03:36:19 +0000 (Wed, 08 Oct 2008)

Log Message:
-----------
added: support for common OS X keyboard shortcuts

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/XBApplicationEx.cpp
    branches/linuxport/XBMC/xbmc/XBApplicationEx.h

Modified: branches/linuxport/XBMC/xbmc/XBApplicationEx.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/XBApplicationEx.cpp	2008-10-07 23:22:09 UTC (rev 15824)
+++ branches/linuxport/XBMC/xbmc/XBApplicationEx.cpp	2008-10-08 03:36:19 UTC (rev 15825)
@@ -399,10 +399,14 @@
       break;
 #endif
     case SDL_KEYDOWN:
-      g_Keyboard.Update(event);
-      // don't handle any more messages in the queue until we've handled keydown,
-      // if a keyup is in the queue it will reset the keypress before it is handled.
-      bProcessNextEvent = false;
+      // process any platform specific shortcuts before handing off to XBMC
+      if (!ProcessOSShortcuts(event))
+      {
+        g_Keyboard.Update(event);
+        // don't handle any more messages in the queue until we've handled keydown,
+        // if a keyup is in the queue it will reset the keypress before it is handled.
+        bProcessNextEvent = false;
+      }
       break;
     case SDL_KEYUP:
       g_Keyboard.Update(event);
@@ -484,3 +488,61 @@
 
 void CXBApplicationEx::Process()
 {}
+
+bool CXBApplicationEx::ProcessOSShortcuts(SDL_Event& event)
+{
+#ifdef __APPLE__
+  return ProcessOSXShortcuts(event);
+#elif defined(_LINUX)
+  return ProcessLinuxShortcuts(event);
+#else
+  return ProcessWin32Shortcuts(event);
+#endif
+}
+
+bool CXBApplicationEx::ProcessWin32Shortcuts(SDL_Event& event)
+{
+  return false;
+}
+
+bool CXBApplicationEx::ProcessLinuxShortcuts(SDL_Event& event)
+{
+  return false;
+}
+
+bool CXBApplicationEx::ProcessOSXShortcuts(SDL_Event& event)
+{
+  static bool shift = false, cmd = false;
+  static CAction action;
+
+  cmd =  SDL_GetModState() & (KMOD_LMETA | KMOD_RMETA);
+  shift =  SDL_GetModState() & (KMOD_LSHIFT | KMOD_RSHIFT);
+
+  if (cmd && event.key.type == SDL_KEYDOWN)
+  {
+    switch(event.key.keysym.sym)
+    {
+    case SDLK_q:  // CMD-q to quit
+    case SDLK_w:  // CMD-w to quit
+      if (!g_application.m_bStop) 
+        g_application.getApplicationMessenger().Quit();
+      return true;
+
+    case SDLK_f: // CMD-f to toggle fullscreen
+      action.wID = ACTION_TOGGLE_FULLSCREEN;
+      g_application.OnAction(action);
+      return true;
+
+    case SDLK_s: // CMD-3 to take a screenshot
+      action.wID = ACTION_TAKE_SCREENSHOT;
+      g_application.OnAction(action);
+      return true;
+
+    case SDLK_h: // CMD-h to hide (but we minimize for now)
+    case SDLK_m: // CMD-m to minimize
+      SDL_WM_IconifyWindow();
+      return true;      
+    }
+  }
+  return false;
+}

Modified: branches/linuxport/XBMC/xbmc/XBApplicationEx.h
===================================================================
--- branches/linuxport/XBMC/xbmc/XBApplicationEx.h	2008-10-07 23:22:09 UTC (rev 15824)
+++ branches/linuxport/XBMC/xbmc/XBApplicationEx.h	2008-10-08 03:36:19 UTC (rev 15825)
@@ -94,6 +94,12 @@
   virtual HRESULT Initialize() { return S_OK; }
   virtual HRESULT Cleanup() { return S_OK; }
   void ReadInput();
+#ifdef HAS_SDL
+  bool ProcessOSShortcuts(SDL_Event &event);
+  bool ProcessWin32Shortcuts(SDL_Event &event);
+  bool ProcessLinuxShortcuts(SDL_Event &event);
+  bool ProcessOSXShortcuts(SDL_Event &event);
+#endif
 
 public:
   // Functions to create, run, and clean up the application


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15836
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15836&view=rev
Author:   vulkanr
Date:     2008-10-09 20:01:02 +0000 (Thu, 09 Oct 2008)

Log Message:
-----------
changed: dvdplayer to take content-type from latest stream (can change on redirect)

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileSystem/FileCache.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/FileCache.h
    branches/linuxport/XBMC/xbmc/FileSystem/IFile.h
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp
    branches/linuxport/XBMC/xbmc/lib/libXBMS/libXBMS-osx.a

Modified: branches/linuxport/XBMC/xbmc/FileSystem/FileCache.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/FileCache.cpp	2008-10-09 18:23:02 UTC (rev 15835)
+++ branches/linuxport/XBMC/xbmc/FileSystem/FileCache.cpp	2008-10-09 20:01:02 UTC (rev 15836)
@@ -364,3 +364,11 @@
   m_seekEvent.Set();
   CThread::StopThread();
 }
+
+CStdString CFileCache::GetContent()
+{
+  if (!m_source.GetImplemenation())
+    return IFile::GetContent();
+  
+  return m_source.GetImplemenation()->GetContent();
+}

Modified: branches/linuxport/XBMC/xbmc/FileSystem/FileCache.h
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/FileCache.h	2008-10-09 18:23:02 UTC (rev 15835)
+++ branches/linuxport/XBMC/xbmc/FileSystem/FileCache.h	2008-10-09 20:01:02 UTC (rev 15836)
@@ -60,8 +60,9 @@
     IFile *GetFileImp();
 
     virtual int  GetChunkSize() {return m_source.GetChunkSize();}
-    
 
+    virtual CStdString GetContent();
+
   private:
     CCacheStrategy *m_pCache;
     bool      m_bDeleteCache;

Modified: branches/linuxport/XBMC/xbmc/FileSystem/IFile.h
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/IFile.h	2008-10-09 18:23:02 UTC (rev 15835)
+++ branches/linuxport/XBMC/xbmc/FileSystem/IFile.h	2008-10-09 20:01:02 UTC (rev 15836)
@@ -118,6 +118,8 @@
 
   virtual ICacheInterface* GetCache() {return NULL;} 
   virtual int IoControl(int request, void* param) { return -1; }
+
+  virtual CStdString GetContent()                            { return "application/octet-stream"; }
 };
 
 class CRedirectException

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp	2008-10-09 18:23:02 UTC (rev 15835)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp	2008-10-09 20:01:02 UTC (rev 15836)
@@ -61,6 +61,10 @@
     m_pFile = NULL;
     return false;
   }
+  
+  if (m_pFile->GetImplemenation())
+    m_content = m_pFile->GetImplemenation()->GetContent();
+  
   m_eof = true;
   return true;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15840
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15840&view=rev
Author:   d4rkm4ster
Date:     2008-10-10 01:12:44 +0000 (Fri, 10 Oct 2008)

Log Message:
-----------
moved: PowerState enums so that they are in one common place
added: [OSX] support for XBMC.Suspend() and XBMC.Hibernate()
(For now, it does a sleep for both events)

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/ApplicationMessenger.cpp
    branches/linuxport/XBMC/xbmc/GUISettings.cpp
    branches/linuxport/XBMC/xbmc/GUISettings.h
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
    branches/linuxport/XBMC/xbmc/linux/HalManager.h
    branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.h
    branches/linuxport/XBMC/xbmc/win32/WIN32Util.h

Modified: branches/linuxport/XBMC/xbmc/ApplicationMessenger.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/ApplicationMessenger.cpp	2008-10-09 20:53:06 UTC (rev 15839)
+++ branches/linuxport/XBMC/xbmc/ApplicationMessenger.cpp	2008-10-10 01:12:44 UTC (rev 15840)
@@ -40,10 +40,11 @@
 #include "FileItem.h"
 #ifdef HAS_HAL
 #include "linux/HalManager.h"
-#endif
-#ifdef _WIN32PC
+#elif defined _WIN32PC
 #include "WIN32Util.h"
 #define CHalManager CWIN32Util
+#elif defined __APPLE__
+#include "CocoaUtils.h"
 #endif
 
 using namespace std;
@@ -213,6 +214,8 @@
         CHalManager::PowerManagement(POWERSTATE_HIBERNATE);
 #elif defined(_WIN32PC)
         CWIN32Util::PowerManagement(POWERSTATE_HIBERNATE);
+#elif defined __APPLE__
+        Cocoa_SleepSystem();
 #endif
       }
       break;
@@ -222,6 +225,8 @@
         CHalManager::PowerManagement(POWERSTATE_SUSPEND);
 #elif defined(_WIN32PC)
         CWIN32Util::PowerManagement(POWERSTATE_SUSPEND);
+#elif defined(__APPLE__)
+        Cocoa_SleepSystem();
 #endif
       }
       break;

Modified: branches/linuxport/XBMC/xbmc/GUISettings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-10-09 20:53:06 UTC (rev 15839)
+++ branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-10-10 01:12:44 UTC (rev 15840)
@@ -309,7 +309,7 @@
 #ifdef __APPLE__
   AddInt(3, "system.displaysleeptime", 17500, 0, 0, 5, 120, SPIN_CONTROL_INT_PLUS, MASK_MINS, TEXT_OFF);
 #endif
-#if defined(HAS_HAL) || defined(_WIN32PC)
+#if defined(HAS_HAL) || defined(_WIN32PC) || defined(__APPLE__)
   // In standalone mode we default to another, and skip one.
   if (g_application.IsStandAlone())
     AddInt(3, "system.shutdownstate", 13008, 0, 1, 1, 4, SPIN_CONTROL_TEXT); 

Modified: branches/linuxport/XBMC/xbmc/GUISettings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUISettings.h	2008-10-09 20:53:06 UTC (rev 15839)
+++ branches/linuxport/XBMC/xbmc/GUISettings.h	2008-10-10 01:12:44 UTC (rev 15840)
@@ -143,6 +143,14 @@
 #define REPLAY_GAIN_ALBUM 1
 #define REPLAY_GAIN_TRACK 2
 
+enum PowerState
+{
+  POWERSTATE_SHUTDOWN  = 1,
+  POWERSTATE_HIBERNATE = 2,
+  POWERSTATE_SUSPEND   = 3,
+  POWERSTATE_REBOOT    = 4
+};
+
 // replay gain settings struct for quick access by the player multiple
 // times per second (saves doing settings lookup)
 struct ReplayGainSettings

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-10-09 20:53:06 UTC (rev 15839)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-10-10 01:12:44 UTC (rev 15840)
@@ -749,7 +749,7 @@
       pControl->SetValue(pSettingInt->GetData());
     }
 #endif
-#if defined(HAS_HAL) || defined(_WIN32PC)
+#if defined(HAS_HAL) || defined(_WIN32PC) || defined(__APPLE__)
     else if (strSetting.Equals("system.shutdownstate"))
     {
       CSettingInt *pSettingInt = (CSettingInt*)pSetting;

Modified: branches/linuxport/XBMC/xbmc/linux/HalManager.h
===================================================================
--- branches/linuxport/XBMC/xbmc/linux/HalManager.h	2008-10-09 20:53:06 UTC (rev 15839)
+++ branches/linuxport/XBMC/xbmc/linux/HalManager.h	2008-10-10 01:12:44 UTC (rev 15840)
@@ -35,15 +35,8 @@
 #include "../utils/CriticalSection.h"
 #include "../Util.h"
 #include "../MediaSource.h"
+#include "GUISettings.h"
 
-enum PowerState
-{
-  POWERSTATE_SHUTDOWN  = 1,
-  POWERSTATE_HIBERNATE = 2,
-  POWERSTATE_SUSPEND   = 3,
-  POWERSTATE_REBOOT    = 4
-};
-
 class CHalDevice
 {
 public:

Modified: branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.h
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.h	2008-10-09 20:53:06 UTC (rev 15839)
+++ branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.h	2008-10-10 01:12:44 UTC (rev 15840)
@@ -393,9 +393,9 @@
 #define BUTTON_SCROLLER_HAS_ICON    30001
 
 #ifdef SVN_REV
-#define VERSION_STRING "SVN:"SVN_REV
+#define VERSION_STRING "pre-8.10 SVN:"SVN_REV
 #else
-#define VERSION_STRING "pre-2.1"
+#define VERSION_STRING "pre-8.10"
 #endif
 
 #define LISTITEM_START              35000

Modified: branches/linuxport/XBMC/xbmc/win32/WIN32Util.h
===================================================================
--- branches/linuxport/XBMC/xbmc/win32/WIN32Util.h	2008-10-09 20:53:06 UTC (rev 15839)
+++ branches/linuxport/XBMC/xbmc/win32/WIN32Util.h	2008-10-10 01:12:44 UTC (rev 15840)
@@ -22,15 +22,8 @@
  */
 
 #include "URL.h"
+#include "GUISettings.h"
 
-enum PowerState
-{
-  POWERSTATE_SHUTDOWN  = 1,
-  POWERSTATE_HIBERNATE = 2,
-  POWERSTATE_SUSPEND   = 3,
-  POWERSTATE_REBOOT    = 4
-};
-
 class CWIN32Util
 {
 public:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15847
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15847&view=rev
Author:   spiff_
Date:     2008-10-10 18:19:06 +0000 (Fri, 10 Oct 2008)

Log Message:
-----------
fixed: ticket #5117 - XBMC hangs when reading a corrupt mp3 file. thanks to apanloco

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/MusicInfoTagLoaderMP3.cpp
    branches/linuxport/XBMC/xbmc/cores/paplayer/MP3codec.cpp

Modified: branches/linuxport/XBMC/xbmc/MusicInfoTagLoaderMP3.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/MusicInfoTagLoaderMP3.cpp	2008-10-10 15:30:33 UTC (rev 15846)
+++ branches/linuxport/XBMC/xbmc/MusicInfoTagLoaderMP3.cpp	2008-10-10 18:19:06 UTC (rev 15847)
@@ -248,8 +248,10 @@
   {
     /* Now check what the ID3v2 size field says */
     id3v2Size += UNSYNC(buffer[6], buffer[7], buffer[8], buffer[9]) + 10;
-    file.Seek(id3v2Size, SEEK_SET);
-    file.Read(buffer, 10);
+    if (file.Seek(id3v2Size, SEEK_SET) == -1)
+      return 0;
+    if (file.Read(buffer, 10) == 0)
+      return 0;
   }
   int firstFrameOffset = id3v2Size;
 

Modified: branches/linuxport/XBMC/xbmc/cores/paplayer/MP3codec.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/paplayer/MP3codec.cpp	2008-10-10 15:30:33 UTC (rev 15846)
+++ branches/linuxport/XBMC/xbmc/cores/paplayer/MP3codec.cpp	2008-10-10 18:19:06 UTC (rev 15847)
@@ -123,16 +123,18 @@
     mp3info.GetSeekInfo(m_seekInfo);
     mp3info.GetReplayGain(m_replayGain);
   }
+  
+  int id3v2Size = 0;
+  int result = 0;
+  __int64 length = 0;
 
   if (!m_file.Open(strFile, true, READ_CACHED))
   {
     CLog::Log(LOGERROR, "MP3Codec: Unable to open file %s", strFile.c_str());
-    delete m_pDecoder;
-    m_pDecoder = NULL;
-    return false;
+    goto error;
   }
   
-  __int64 length = m_file.GetLength();
+  length = m_file.GetLength();
   if (!bIsInternetStream)
   {
     m_TotalTime = (__int64)(m_seekInfo.GetDuration() * 1000.0f);
@@ -146,15 +148,21 @@
   // This needs to be made more intelligent - possibly use a temp output buffer
   // and cycle around continually reading until we have the necessary data
   // as a first workaround skip the id3v2 tag at the beginning of the file
-  int id3v2Size = 0;
   if (!bIsInternetStream)
   {
-    const float* offsets=m_seekInfo.GetOffsets();
-    id3v2Size=(int)offsets[0];
-    m_file.Seek(id3v2Size);
+    if (m_seekInfo.GetNumOffsets() > 0)
+    {
+      const float* offsets=m_seekInfo.GetOffsets();
+      id3v2Size=(int)offsets[0];
+      m_file.Seek(id3v2Size);
+    }
+    else
+    {
+      CLog::Log(LOGERROR, "MP3Codec: Seek info unavailable for file <%s> (corrupt?)", strFile.c_str());
+      goto error;
+    }
   }
   
-  int result = 0;
   m_eof = false;
   while (result >=0 && !m_eof && m_OutputBufferPos < 1152*8) // eof can be set from outside (when stopping playback)
   {
@@ -162,10 +170,7 @@
     if (nRead <= 0)
     { 
       CLog::Log(LOGERROR, "MP3Codec: Unable to read from file <%s>", strFile.c_str());
-      m_file.Close();
-      delete m_pDecoder;
-      m_pDecoder = NULL;
-      return false;
+      goto error;
     }
 
     int nOutSize= m_OutputBufferSize - m_OutputBufferPos;
@@ -186,10 +191,7 @@
     else if (result < 0)
     {
       CLog::Log(LOGERROR, "MP3Codec: Unable to determine file format of %s (corrupt start of mp3?)", strFile.c_str());
-      m_file.Close();
-      delete m_pDecoder;
-      m_pDecoder = NULL;
-      return false;
+      goto error;
     }
   } ;
 
@@ -200,6 +202,15 @@
   }
   //m_file.OnClear = MakeDelegate(this, &MP3Codec::OnFileReaderClearEvent);
   return true;
+
+error:
+  m_file.Close();
+  if (m_pDecoder)
+  {
+    delete m_pDecoder;
+    m_pDecoder = NULL;
+  }
+  return false;
 }
 
 void MP3Codec::DeInit()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15889
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15889&view=rev
Author:   elupus
Date:     2008-10-14 18:58:31 +0000 (Tue, 14 Oct 2008)

Log Message:
-----------
added: support to upnp RenderingControl service to modify xbmc volume

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/UPnP.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltService.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.h

Modified: branches/linuxport/XBMC/xbmc/UPnP.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/UPnP.cpp	2008-10-14 17:51:15 UTC (rev 15888)
+++ branches/linuxport/XBMC/xbmc/UPnP.cpp	2008-10-14 18:58:31 UTC (rev 15889)
@@ -1138,6 +1138,9 @@
     virtual NPT_Result OnPrevious(PLT_ActionReference& action);
     virtual NPT_Result OnStop(PLT_ActionReference& action);
     virtual NPT_Result OnSetAVTransportURI(PLT_ActionReference& action);
+
+    virtual NPT_Result OnSetVolume(PLT_ActionReference& action);
+    virtual NPT_Result OnSetMute(PLT_ActionReference& action);
 };
 
 /*----------------------------------------------------------------------
@@ -1169,12 +1172,28 @@
 void 
 CUPnPRenderer::UpdateState()
 {
-    PLT_Service* avt;
+    PLT_Service *avt, *rct;
     if(NPT_FAILED(FindServiceByType("urn:schemas-upnp-org:service:AVTransport:1", avt)))
         return;
+    if(NPT_FAILED(FindServiceByType("urn:schemas-upnp-org:service:RenderingControl:1", rct)))
+        return;
 
     CStdString buffer;
+    int volume;
+    if (g_stSettings.m_bMute) {
+        rct->SetStateVariable("Mute", "1");
+        volume = g_stSettings.m_iPreMuteVolumeLevel;
+    } else {
+        rct->SetStateVariable("Mute", "0");
+        volume = g_application.GetVolume();
+    }
 
+    buffer.Format("%d", volume);
+    rct->SetStateVariable("Volume", buffer.c_str());
+
+    buffer.Format("%d", 256 * (volume * 60 - 60) / 100);
+    rct->SetStateVariable("VolumeDb", buffer.c_str());
+
     StringUtils::SecondsToTimeString((long)g_application.GetTime(), buffer, TIME_FORMAT_HH_MM_SS);
     avt->SetStateVariable("RelativeTimePosition", buffer.c_str());
 
@@ -1280,6 +1299,23 @@
     return NPT_SUCCESS;
 }
 
+NPT_Result CUPnPRenderer::OnSetVolume(PLT_ActionReference& action)
+{
+    NPT_String volume;
+    NPT_CHECK_SEVERE(action->GetArgumentValue("DesiredVolume",volume));
+    g_application.SetVolume(atoi((const char*)volume));
+    return NPT_SUCCESS;
+}
+
+NPT_Result CUPnPRenderer::OnSetMute(PLT_ActionReference& action)
+{
+    NPT_String mute;
+    NPT_CHECK_SEVERE(action->GetArgumentValue("DesiredMute",mute));
+    if(mute == "1" ^ g_stSettings.m_bMute)
+        g_application.Mute();
+    return NPT_SUCCESS;
+}
+
 /*----------------------------------------------------------------------
 |   CCtrlPointReferenceHolder class
 +---------------------------------------------------------------------*/

Modified: branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltService.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltService.cpp	2008-10-14 17:51:15 UTC (rev 15888)
+++ branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltService.cpp	2008-10-14 18:58:31 UTC (rev 15889)
@@ -713,5 +713,10 @@
     NPT_XmlElementNode* variable = new NPT_XmlElementNode((const char*)var->GetName());
     NPT_CHECK_SEVERE(m_Node->AddChild(variable));
     NPT_CHECK_SEVERE(variable->SetAttribute("val", var->GetValue()));
+    if(var->GetName() == "Volume" || var->GetName() == "VolumeDB" || var->GetName() == "Mute") {
+        if(var->GetService()->GetServiceType() == "urn:schemas-upnp-org:service:RenderingControl:1") {
+            NPT_CHECK_SEVERE(variable->SetAttribute("channel", "Master"));
+        }
+    }
     return NPT_SUCCESS;
 }

Modified: branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.cpp	2008-10-14 17:51:15 UTC (rev 15888)
+++ branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.cpp	2008-10-14 18:58:31 UTC (rev 15889)
@@ -106,6 +106,9 @@
         service->InitURLs("RenderingControl", m_UUID);
         AddService(service);
         service->SetStateVariableRate("LastChange", NPT_TimeInterval(0.2f));
+
+        service->SetStateVariable("Mute", "0");
+        service->SetStateVariable("Volume", "100");
     }
 }
 
@@ -218,6 +221,33 @@
         return OnSetPlayMode(action);
     }
 
+		/* Is it a RendererControl Service Action ? */
+    if (serviceType.Compare("urn:schemas-upnp-org:service:RenderingControl:1", true) == 0) {
+				/* we only support master channel */
+        if (NPT_FAILED(action->VerifyArgumentValue("Channel", "Master"))) {
+            action->SetError(402,"Invalid Args.");
+            return NPT_FAILURE;
+        }
+    }
+
+    if (name.Compare("GetVolume", true) == 0) {
+				NPT_CHECK_SEVERE(action->SetArgumentsOutFromStateVariable());
+        return NPT_SUCCESS;
+    }
+
+    if (name.Compare("GetMute", true) == 0) {
+				NPT_CHECK_SEVERE(action->SetArgumentsOutFromStateVariable());
+        return NPT_SUCCESS;
+    }
+
+		if (name.Compare("SetVolume", true) == 0) {
+			  return OnSetVolume(action);
+		}
+
+		if (name.Compare("SetMute", true) == 0) {
+			  return OnSetMute(action);
+		}
+
     action->SetError(401,"No Such Action.");
     return NPT_FAILURE;
 }
@@ -329,3 +359,21 @@
 {
     return NPT_SUCCESS;
 }
+
+/*----------------------------------------------------------------------
+|   PLT_MediaRenderer::OnSetVolume
++---------------------------------------------------------------------*/
+NPT_Result
+PLT_MediaRenderer::OnSetVolume(PLT_ActionReference& /* action */)
+{
+    return NPT_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   PLT_MediaRenderer::OnSetMute
++---------------------------------------------------------------------*/
+NPT_Result
+PLT_MediaRenderer::OnSetMute(PLT_ActionReference& /* action */)
+{
+    return NPT_SUCCESS;
+}

Modified: branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.h
===================================================================
--- branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.h	2008-10-14 17:51:15 UTC (rev 15888)
+++ branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.h	2008-10-14 18:58:31 UTC (rev 15889)
@@ -64,6 +64,10 @@
     virtual NPT_Result OnStop(PLT_ActionReference& action);
     virtual NPT_Result OnSetAVTransportURI(PLT_ActionReference& action);
     virtual NPT_Result OnSetPlayMode(PLT_ActionReference& action);
+
+    // RenderingControl
+    virtual NPT_Result OnSetVolume(PLT_ActionReference& action);
+    virtual NPT_Result OnSetMute(PLT_ActionReference& action);
 };
 
 #endif /* _PLT_MEDIA_RENDERER_H_ */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15917
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15917&view=rev
Author:   d4rkm4ster
Date:     2008-10-17 01:20:00 +0000 (Fri, 17 Oct 2008)

Log Message:
-----------
disabled: custom resolution settings for video playback and slideshows (until they
are properly respected and make sense for the PC ports)

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUISettings.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowFullScreen.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowSlideShow.cpp

Modified: branches/linuxport/XBMC/xbmc/GUISettings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-10-16 17:37:42 UTC (rev 15916)
+++ branches/linuxport/XBMC/xbmc/GUISettings.cpp	2008-10-17 01:20:00 UTC (rev 15917)
@@ -194,7 +194,9 @@
   AddSeparator(5,"pictures.sep1");
   AddBool(6, "pictures.useexifrotation", 20184, true);
   AddBool(7, "pictures.usetags", 258, true);
-  AddInt(8, "pictures.displayresolution", 169, (int)AUTORES, (int)HDTV_1080i, 1, (int)CUSTOM+MAX_RESOLUTIONS, SPIN_CONTROL_TEXT);
+  // FIXME: hide this setting until it is properly respected. In the meanwhile, default to AUTO.
+  //AddInt(8, "pictures.displayresolution", 169, (int)AUTORES, (int)HDTV_1080i, 1, (int)CUSTOM+MAX_RESOLUTIONS, SPIN_CONTROL_TEXT);
+  AddInt(0, "pictures.displayresolution", 169, (int)AUTORES, (int)AUTORES, 1, (int)AUTORES, SPIN_CONTROL_TEXT);
   AddSeparator(9,"pictures.sep2");
   AddString(10,"pictures.screenshotpath",20004,"select writable folder",BUTTON_CONTROL_PATH_INPUT,false,657);
 
@@ -421,7 +423,9 @@
 #else
   AddInt(4, "videoplayer.rendermethod", 13415, RENDER_METHOD_AUTO, RENDER_METHOD_AUTO, 1, RENDER_METHOD_SOFTWARE, SPIN_CONTROL_TEXT);
 #endif
-  AddInt(5, "videoplayer.displayresolution", 169, (int)AUTORES, (int)HDTV_1080i, 1, (int)CUSTOM+MAX_RESOLUTIONS, SPIN_CONTROL_TEXT);
+  // FIXME: hide this setting until it is properly respected. In the meanwhile, default to AUTO.
+  //AddInt(5, "videoplayer.displayresolution", 169, (int)AUTORES, (int)AUTORES, 1, (int)CUSTOM+MAX_RESOLUTIONS, SPIN_CONTROL_TEXT);
+  AddInt(0, "videoplayer.displayresolution", 169, (int)AUTORES, (int)AUTORES, 1, (int)AUTORES, SPIN_CONTROL_TEXT);
 #ifdef HAS_MPLAYER
   AddInt(6, "videoplayer.framerateconversions", 336, FRAME_RATE_LEAVE_AS_IS, FRAME_RATE_LEAVE_AS_IS, 1, FRAME_RATE_USE_PAL60, SPIN_CONTROL_TEXT);
 #endif

Modified: branches/linuxport/XBMC/xbmc/GUIWindowFullScreen.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowFullScreen.cpp	2008-10-16 17:37:42 UTC (rev 15916)
+++ branches/linuxport/XBMC/xbmc/GUIWindowFullScreen.cpp	2008-10-17 01:20:00 UTC (rev 15917)
@@ -416,7 +416,8 @@
       g_graphicsContext.SetFullScreenVideo(true);
 #ifdef HAS_VIDEO_PLAYBACK
       RESOLUTION res = g_renderManager.GetResolution();
-      g_graphicsContext.SetVideoResolution(res, false, false);
+      //FIXME: Use GUI resolution for now
+      //g_graphicsContext.SetVideoResolution(res, false, false);
 #endif
       lock.Leave();
 
@@ -465,7 +466,8 @@
       CSingleLock lock (g_graphicsContext);
       CUtil::RestoreBrightnessContrastGamma();
       g_graphicsContext.SetFullScreenVideo(false);
-      g_graphicsContext.SetVideoResolution(g_guiSettings.m_LookAndFeelResolution, TRUE);
+      //FIXME: Use GUI resolution for now
+      //g_graphicsContext.SetVideoResolution(g_guiSettings.m_LookAndFeelResolution, TRUE);
       lock.Leave();
 
 #ifdef HAS_VIDEO_PLAYBACK

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-10-16 17:37:42 UTC (rev 15916)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2008-10-17 01:20:00 UTC (rev 15917)
@@ -273,20 +273,6 @@
         g_settings.Save();
       }
 
-      // Reload a resolution
-      // UPDATE: not anymore, resolution is only updated when the 'test resolution'
-      // button is clicked
-      if (m_NewResolution != INVALID)
-      {
-        /*
-        g_guiSettings.SetInt("videoscreen.resolution", m_NewResolution);
-        //set the gui resolution, if newRes is AUTORES newRes will be set to the highest available resolution
-        g_graphicsContext.SetVideoResolution(m_NewResolution, TRUE);
-        //set our lookandfeelres to the resolution set in graphiccontext
-        g_guiSettings.m_LookAndFeelResolution = m_NewResolution;
-        */
-      }
-
       if (IsActive())
         m_returningFromSkinLoad = true;
     }

Modified: branches/linuxport/XBMC/xbmc/GUIWindowSlideShow.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowSlideShow.cpp	2008-10-16 17:37:42 UTC (rev 15916)
+++ branches/linuxport/XBMC/xbmc/GUIWindowSlideShow.cpp	2008-10-17 01:20:00 UTC (rev 15917)
@@ -553,7 +553,8 @@
     {
       if (m_Resolution != g_guiSettings.m_LookAndFeelResolution)
       {
-        g_graphicsContext.SetVideoResolution(g_guiSettings.m_LookAndFeelResolution, TRUE);
+        //FIXME: Use GUI resolution for now
+        //g_graphicsContext.SetVideoResolution(g_guiSettings.m_LookAndFeelResolution, TRUE);
       }
 
       //   Reset();
@@ -569,7 +570,9 @@
   case GUI_MSG_WINDOW_INIT:
     {
       m_Resolution = (RESOLUTION) g_guiSettings.GetInt("pictures.displayresolution");
-      if (m_Resolution != g_guiSettings.m_LookAndFeelResolution && m_Resolution != INVALID && m_Resolution!=AUTORES)
+
+      //FIXME: Use GUI resolution for now
+      if (0 /*m_Resolution != g_guiSettings.m_LookAndFeelResolution && m_Resolution != INVALID && m_Resolution!=AUTORES*/)
       {
         g_graphicsContext.SetVideoResolution(m_Resolution, TRUE);
       }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15920
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15920&view=rev
Author:   vdrfan
Date:     2008-10-17 19:07:45 +0000 (Fri, 17 Oct 2008)

Log Message:
-----------
fixed: library won't be accessible after initial scan

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp
    branches/linuxport/XBMC/xbmc/utils/IMDB.cpp

Modified: branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp	2008-10-17 02:14:38 UTC (rev 15919)
+++ branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp	2008-10-17 19:07:45 UTC (rev 15920)
@@ -653,6 +653,7 @@
       pDlgProgress->ShowProgressBar(false);
 
     //m_database.CommitTransaction();
+    g_infoManager.ResetPersistentCache();
     m_database.Close();
     return true;
   }

Modified: branches/linuxport/XBMC/xbmc/utils/IMDB.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/IMDB.cpp	2008-10-17 02:14:38 UTC (rev 15919)
+++ branches/linuxport/XBMC/xbmc/utils/IMDB.cpp	2008-10-17 19:07:45 UTC (rev 15920)
@@ -452,7 +452,7 @@
     }
 
     CRegExp reTags;
-    reTags.RegComp("["SEP"](ac3|custom|dc|divx|dsr|dsrip|dutch|dvd|dvdrip|dvdscr|dvdscreener|fragment|fs|hdtv|internal|limited|multisubs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|r5|se|svcd|swedish|german|read.nfo|nfofix|unrated|ws|bdrip|720p|1080p|hddvd|bluray|x264|xvid|xxx|cd[1-9]|\\[.*\\])(["SEP"]|$)");
+    reTags.RegComp("["SEP"](ac3|custom|dc|divx|dsr|dsrip|dutch|dvd|dvdrip|dvdscr|dvdscreener|fragment|fs|hdtv|internal|limited|multisubs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|r3|r5|se|svcd|swedish|german|read.nfo|nfofix|unrated|ws|telesync|telecine|bdrip|720p|1080p|hddvd|bluray|x264|xvid|xxx|cd[1-9]|\\[.*\\])(["SEP"]|$)");
 
     int i=0;
     if ((i=reTags.RegFind(strSearch1.c_str())) >= 0) // new logic - select the crap then drop anything to the right of it


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15944
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15944&view=rev
Author:   AlTheKiller
Date:     2008-10-20 17:07:08 +0000 (Mon, 20 Oct 2008)

Log Message:
-----------
fixed: Suppress printing to console in release builds. "Fixes" #5008.
cosmetics: Deleted some commented debug printing.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileSystem/FileMMS.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/ShoutcastDirectory.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/cdioSupport.cpp
    branches/linuxport/XBMC/xbmc/FileSystem/iso9660.cpp
    branches/linuxport/XBMC/xbmc/Util.cpp
    branches/linuxport/XBMC/xbmc/linux/XCriticalSection.cpp
    branches/linuxport/XBMC/xbmc/visualizations/XBMCProjectM/libprojectM/PCM.cpp
    branches/linuxport/XBMC/xbmc/visualizations/XBMCProjectM/libprojectM/projectM.cpp
    branches/linuxport/XBMC/xbmc/win32/XBMC_PC.cpp
    branches/linuxport/XBMC/xbmc/xbox/IoSupport.cpp

Modified: branches/linuxport/XBMC/xbmc/FileSystem/FileMMS.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/FileMMS.cpp	2008-10-20 16:50:37 UTC (rev 15943)
+++ branches/linuxport/XBMC/xbmc/FileSystem/FileMMS.cpp	2008-10-20 17:07:08 UTC (rev 15944)
@@ -417,11 +417,6 @@
 
     command = get_32((unsigned char*) data, 24) & 0xFFFF;
 
-/*
-    printf("MSGT_NETWORK,MSGL_INFO,\ncommand packet detected, len=%d  cmd=0x%X\n",
-        packet_len, command);
-*/
-
     if (command == 0x1b)
       send_command(s, 0x1b, 0, 0, 0, data);
     else if (command == 0x1e)

Modified: branches/linuxport/XBMC/xbmc/FileSystem/ShoutcastDirectory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/ShoutcastDirectory.cpp	2008-10-20 16:50:37 UTC (rev 15943)
+++ branches/linuxport/XBMC/xbmc/FileSystem/ShoutcastDirectory.cpp	2008-10-20 17:07:08 UTC (rev 15944)
@@ -123,7 +123,6 @@
 
     url.SetOptions("?id=" + id);
     url.GetURL(path);
-    //printf("%s: %s\n", name.c_str(), path.c_str());
 
     CFileItemPtr pItem(new CFileItem);
     pItem->m_bIsFolder = false;

Modified: branches/linuxport/XBMC/xbmc/FileSystem/cdioSupport.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/cdioSupport.cpp	2008-10-20 16:50:37 UTC (rev 15943)
+++ branches/linuxport/XBMC/xbmc/FileSystem/cdioSupport.cpp	2008-10-20 17:07:08 UTC (rev 15944)
@@ -294,7 +294,7 @@
   if (fs & VIDEOCDI && num_audio == 0)
   {
     CLog::Log(LOGINFO, "Video CD   ");
-#ifdef HAVE_VCDINFO
+#if defined(HAVE_VCDINFO) && defined(DEBUG)
     if (!opts.no_vcd)
     {
       printf("\n");

Modified: branches/linuxport/XBMC/xbmc/FileSystem/iso9660.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/iso9660.cpp	2008-10-20 16:50:37 UTC (rev 15943)
+++ branches/linuxport/XBMC/xbmc/FileSystem/iso9660.cpp	2008-10-20 17:07:08 UTC (rev 15944)
@@ -916,7 +916,7 @@
     }
     else
     {
-      printf("EOF");
+      CLog::Log(LOGDEBUG, "iso9660::ReadFile() hit EOF");
       break;
     }
   }

Modified: branches/linuxport/XBMC/xbmc/Util.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Util.cpp	2008-10-20 16:50:37 UTC (rev 15943)
+++ branches/linuxport/XBMC/xbmc/Util.cpp	2008-10-20 17:07:08 UTC (rev 15944)
@@ -768,7 +768,9 @@
   }
   else
   {
+#ifdef _DEBUG
     printf("The XBMC_HOME environment variable is not set.\n");
+#endif
 #ifdef __APPLE__
     int      result = -1;
     char     given_path[2*MAXPATHLEN];
@@ -4589,10 +4591,12 @@
 //
 bool CUtil::Command(const CStdStringArray& arrArgs)
 {
+#ifdef _DEBUG
   printf("Executing: ");
   for (size_t i=0; i<arrArgs.size(); i++)
     printf("%s ", arrArgs[i].c_str());
   printf("\n");
+#endif
 
   pid_t child = fork();
   int n = 0;

Modified: branches/linuxport/XBMC/xbmc/linux/XCriticalSection.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/linux/XCriticalSection.cpp	2008-10-20 16:50:37 UTC (rev 15943)
+++ branches/linuxport/XBMC/xbmc/linux/XCriticalSection.cpp	2008-10-20 17:07:08 UTC (rev 15944)
@@ -98,15 +98,19 @@
 {	
 	if (m_isDestroyed)
 	{
+#ifdef _DEBUG
 		// This has to be a printf, otherwise we may recurse.
 		printf("CRITSEC[%p]: Trying to enter destroyed section.\n", (void *)this);
+#endif
 		return;
 	}
 	
 	if (!m_isInitialized)
 	{
+#ifdef _DEBUG
 		// This has to be a printf, otherwise we may recurse.
 		printf("CRITSEC[%p]: Trying to enter uninitialized section.\n", (void *)this);
+#endif
 		return;
 	}
 	
@@ -130,19 +134,25 @@
 {	
 	if (m_isDestroyed)
 	{
+#ifdef _DEBUG
 		printf("CRITSEC[%p]: Trying to leave destroyed section.\n", (void *)this);
+#endif
 		return;
 	}
 	
 	if (!m_isInitialized)
 	{
+#ifdef _DEBUG
 		printf("CRITSEC[%p]: Trying to leave uninitialized section.\n", (void *)this);
+#endif
 		return;
 	}
 
 	if (!Owning())
 	{
+#ifdef _DEBUG
 		printf("CRITSEC[%p]: Some other thread trying to leave our critical section.\n", (void *)this);
+#endif
 		return;
 	}
 	
@@ -158,7 +168,9 @@
 	}
 	else
 	{
-		printf("CRITSEC[%p]: Trying to leave, already left.\n", (void *)this);
+#ifdef _DEBUG
+		printf("RITSEC[%p]: Trying to leave, already left.\n", (void *)this);
+#endif
 	}
 	
 	pthread_mutex_unlock(&m_countMutex);

Modified: branches/linuxport/XBMC/xbmc/visualizations/XBMCProjectM/libprojectM/PCM.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/visualizations/XBMCProjectM/libprojectM/PCM.cpp	2008-10-20 16:50:37 UTC (rev 15943)
+++ branches/linuxport/XBMC/xbmc/visualizations/XBMCProjectM/libprojectM/PCM.cpp	2008-10-20 17:07:08 UTC (rev 15944)
@@ -43,7 +43,6 @@
 #include <iostream>
 PCM::PCM() {
     initPCM( 2048 );
-    std::cerr << "MAX SAMPLES:" << maxsamples << std::endl;
   }
 
 void PCM::initPCM(int samples) {
@@ -172,8 +171,6 @@
           }
 	   }
  
-	 // printf("Added %d samples %d %d %f\n",samples,start,(start+samples)%maxsamples,PCM[0][start+10]); 
-
  start+=samples;
  start=start%maxsamples;
 
@@ -204,10 +201,7 @@
              PCMd[1][j % maxsamples] = 0;
           }
 	   }
-       
  
-	 // printf("Added %d samples %d %d %f\n",samples,start,(start+samples)%maxsamples,PCM[0][start+10]); 
-
  start+=samples;
  start=start%maxsamples;
 
@@ -237,9 +231,6 @@
           }
 	   }
        
- 
-	 // printf("Added %d samples %d %d %f\n",samples,start,(start+samples)%maxsamples,PCM[0][start+10]); 
-
  start+=samples;
  start=start%maxsamples;
 

Modified: branches/linuxport/XBMC/xbmc/visualizations/XBMCProjectM/libprojectM/projectM.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/visualizations/XBMCProjectM/libprojectM/projectM.cpp	2008-10-20 16:50:37 UTC (rev 15943)
+++ branches/linuxport/XBMC/xbmc/visualizations/XBMCProjectM/libprojectM/projectM.cpp	2008-10-20 17:07:08 UTC (rev 15944)
@@ -81,19 +81,12 @@
 {
 
  #ifdef USE_THREADS
-  	printf("c");
 	running = false;
-	printf("l");
 	pthread_cond_signal(&condition);
-	printf("e");
 	pthread_mutex_unlock( &mutex );
-	printf("a");
 	pthread_detach(thread);
-	printf("n");
 	pthread_cond_destroy(&condition);
-	printf("u");
 	pthread_mutex_destroy( &mutex );
-	printf("p");
 #endif
 	destroyPresetTools();
 
@@ -166,8 +159,6 @@
 
 void projectM::readConfig (const std::string & configFile )
 {
-	std::cout << "configFile: " << configFile << std::endl;
-	
 	ConfigFile config ( configFile );
 	_settings.meshX = config.read<int> ( "Mesh X", 32 );
 	_settings.meshY = config.read<int> ( "Mesh Y", 24 );
@@ -238,27 +229,27 @@
 }
 
 #ifdef USE_THREADS
-static void *thread_callback(void *prjm) {
- projectM *p = (projectM *)prjm;
+static void *thread_callback(void *prjm) 
+{
+  projectM *p = (projectM *)prjm;
+  p->thread_func(prjm); 
+  return NULL;
+} 
 
- p->thread_func(prjm); 
-return NULL;} 
 
-
 void *projectM::thread_func(void *vptr_args)
 {
-   pthread_mutex_lock( &mutex );
-  //  printf("in thread: %f\n", timeKeeper->PresetProgressB());
+  pthread_mutex_lock( &mutex );
   while (true)
+  {
+    pthread_cond_wait( &condition, &mutex );
+    if(!running)
     {
-      pthread_cond_wait( &condition, &mutex );
-      if(!running)
-	{
-	  pthread_mutex_unlock( &mutex );
-	  return NULL;
-	}
-     evaluateSecondPreset();
-    } 
+      pthread_mutex_unlock( &mutex );
+      return NULL;
+    }
+    evaluateSecondPreset();
+  } 
 }
 #endif
 
@@ -299,7 +290,6 @@
 
 	timeKeeper->UpdateTimers();
 
-	//printf("A:%f, B:%f, S:%f\n", timeKeeper->PresetProgressA(), timeKeeper->PresetProgressB(), timeKeeper->SmoothRatio());
 	mspf= ( int ) ( 1000.0/ ( float ) presetInputs.fps ); //milliseconds per frame
 
 	setupPresetInputs(&m_activePreset->presetInputs());
@@ -316,8 +306,6 @@
 		{
  			
 			timeKeeper->StartSmoothing();		      
-			//	printf("Start Smooth\n");
-			// if(timeKeeper->IsSmoothing())printf("Confirmed\n");
 			switchPreset(m_activePreset2, 
 				     &m_activePreset->presetInputs() == &presetInputs ? presetInputs2 : presetInputs, 
 				&m_activePreset->presetOutputs() == &presetOutputs ? presetOutputs2 : presetOutputs);
@@ -327,7 +315,6 @@
 		
 		else if ( ( beatDetect->vol-beatDetect->vol_old>beatDetect->beat_sensitivity ) && timeKeeper->CanHardCut() )
 		{
-		  // printf("Hard Cut\n");
 			switchPreset(m_activePreset, presetInputs, presetOutputs);
 
 			timeKeeper->StartPreset();
@@ -339,9 +326,6 @@
 
 	if ( timeKeeper->IsSmoothing() && timeKeeper->SmoothRatio() <= 1.0 && !m_presetChooser->empty() )
 	{
-	  	  
-	  //	 printf("start thread\n");
-		      	
 		assert ( m_activePreset.get() );
 		
 #ifdef USE_THREADS
@@ -366,11 +350,9 @@
 	{
 		if ( timeKeeper->IsSmoothing() && timeKeeper->SmoothRatio() > 1.0 )
 		{
-		  //printf("End Smooth\n");
 			m_activePreset = m_activePreset2;			
 			timeKeeper->EndSmoothing();
 		}
-		//printf("Normal\n");
 	
 		m_activePreset->evaluateFrame();
 
@@ -379,9 +361,6 @@
 
 	}
 
-	//	std::cout<< m_activePreset->absoluteFilePath()<<std::endl;
-	//	renderer->presetName = m_activePreset->absoluteFilePath();
-
 	renderer->RenderFrame ( &m_activePreset->presetOutputs(), &presetInputs );
 
 	count++;
@@ -398,9 +377,7 @@
 
 	if ( timediff < this->mspf )
 	{
-		// printf("%s:",this->mspf-timediff);
 		int sleepTime = ( unsigned int ) ( this->mspf-timediff ) * 1000;
-//		DWRITE ( "usleep: %d\n", sleepTime );
 		if ( sleepTime > 0 && sleepTime < 100000 )
 		{
 			if ( usleep ( sleepTime ) != 0 ) {}}
@@ -479,7 +456,6 @@
 	pthread_cond_init(&condition, NULL);
 	if (pthread_create(&thread, NULL, thread_callback, this) != 0)
 	    { 	      
-		    
 	      std::cerr << "failed to allocate a thread! try building with option USE_THREADS turned off" << std::endl;;
 	      exit(1);
 	    }
@@ -489,7 +465,6 @@
 	renderer->setPresetName ( m_activePreset->presetName() );
 	timeKeeper->StartPreset();
 	assert(pcm());
-//	printf ( "exiting projectM_init()\n" );
 }
 
 

Modified: branches/linuxport/XBMC/xbmc/win32/XBMC_PC.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/win32/XBMC_PC.cpp	2008-10-20 16:50:37 UTC (rev 15943)
+++ branches/linuxport/XBMC/xbmc/win32/XBMC_PC.cpp	2008-10-20 17:07:08 UTC (rev 15944)
@@ -73,7 +73,9 @@
 
   if(strcl.Find("-p") >= 0)
   {
+#ifdef _DEBUG
     printf("Using platform specific directories...\n");
+#endif
     g_application.EnablePlatformDirectories();
   }
   return S_OK;

Modified: branches/linuxport/XBMC/xbmc/xbox/IoSupport.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/xbox/IoSupport.cpp	2008-10-20 16:50:37 UTC (rev 15943)
+++ branches/linuxport/XBMC/xbmc/xbox/IoSupport.cpp	2008-10-20 17:07:08 UTC (rev 15944)
@@ -580,7 +580,6 @@
     else
     {
       int iErr = GetLastError();
-      //   printf("%i\n", iErr);
     }
   }
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15949
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15949&view=rev
Author:   jmarshallnz
Date:     2008-10-20 22:20:25 +0000 (Mon, 20 Oct 2008)

Log Message:
-----------
fixed: Ticket #5095 - stacking is not threadsafe.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Autorun.cpp
    branches/linuxport/XBMC/xbmc/FileItem.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp
    branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.h
    branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp

Modified: branches/linuxport/XBMC/xbmc/Autorun.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Autorun.cpp	2008-10-20 21:32:56 UTC (rev 15948)
+++ branches/linuxport/XBMC/xbmc/Autorun.cpp	2008-10-20 22:20:25 UTC (rev 15949)
@@ -232,7 +232,8 @@
     // stack video files
     CFileItemList tempItems;
     tempItems.Append(vecItems);
-    tempItems.Stack();
+    if (g_stSettings.m_iMyVideoStack != STACK_NONE)
+      tempItems.Stack();
     CFileItemList itemlist;
 
     for (int i = 0; i < tempItems.Size(); i++)

Modified: branches/linuxport/XBMC/xbmc/FileItem.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-10-20 21:32:56 UTC (rev 15948)
+++ branches/linuxport/XBMC/xbmc/FileItem.cpp	2008-10-20 22:20:25 UTC (rev 15949)
@@ -1832,10 +1832,6 @@
 {
   CSingleLock lock(m_lock);
 
-  // stacking is disabled
-  if (g_stSettings.m_iMyVideoStack == STACK_NONE)
-    return;
-
   // not allowed here
   if (IsVirtualDirectoryRoot() || IsTuxBox())
     return;

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp	2008-10-20 21:32:56 UTC (rev 15948)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.cpp	2008-10-20 22:20:25 UTC (rev 15949)
@@ -60,6 +60,7 @@
 CGUIWindowVideoFiles::CGUIWindowVideoFiles()
 : CGUIWindowVideoBase(WINDOW_VIDEO_FILES, "MyVideo.xml")
 {
+  m_stackingAvailable = true;
 }
 
 CGUIWindowVideoFiles::~CGUIWindowVideoFiles()
@@ -228,7 +229,7 @@
   const CGUIControl *stack = GetControl(CONTROL_STACK);
   if (stack)
   {
-    if ((g_stSettings.m_iMyVideoStack & STACK_UNAVAILABLE) != STACK_UNAVAILABLE)
+    if (m_stackingAvailable)
     {
       CONTROL_ENABLE(CONTROL_STACK);
       if (stack->GetControlType() == CGUIControl::GUICONTROL_RADIO)
@@ -260,13 +261,14 @@
 
   SScraperInfo info2;
 
-  g_stSettings.m_iMyVideoStack &= ~STACK_UNAVAILABLE;
+  m_stackingAvailable = true;
+
   if (items.GetContent().IsEmpty())
     items.SetContent("files");
 
   if (m_database.GetScraperForPath(strDirectory,info2) && info2.strContent.Equals("tvshows"))
   { // dont stack in tv dirs
-    g_stSettings.m_iMyVideoStack |= STACK_UNAVAILABLE;
+    m_stackingAvailable = false;
   }
   else if (!items.IsStack() && g_stSettings.m_iMyVideoStack != STACK_NONE)
     items.Stack();
@@ -519,20 +521,7 @@
 {
   items.Clear();
   m_rootDir.GetDirectory(strPath, items);
-
-  // force stacking to be enabled
-  // save stack state
-  int iStack = g_stSettings.m_iMyVideoStack;
-  g_stSettings.m_iMyVideoStack = STACK_SIMPLE;
-
-  /*bool bUnroll = m_guiState->UnrollArchives();
-  g_guiSettings.SetBool("filelists.unrollarchives",true);*/
-
   items.Stack();
-
-  // restore stack
-  g_stSettings.m_iMyVideoStack = iStack;
-  //g_guiSettings.SetBool("VideoFiles.FileLists",bUnroll);
 }
 
 void CGUIWindowVideoFiles::LoadPlayList(const CStdString& strPlayList)

Modified: branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.h	2008-10-20 21:32:56 UTC (rev 15948)
+++ branches/linuxport/XBMC/xbmc/GUIWindowVideoFiles.h	2008-10-20 22:20:25 UTC (rev 15949)
@@ -53,4 +53,7 @@
 
   virtual void LoadPlayList(const CStdString& strFileName);
   void PlayFolder(const CFileItem* pItem);
+
+private:
+  bool m_stackingAvailable;
 };

Modified: branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp	2008-10-20 21:32:56 UTC (rev 15948)
+++ branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp	2008-10-20 22:20:25 UTC (rev 15949)
@@ -208,10 +208,7 @@
 
       CDirectory::GetDirectory(strDirectory,items,g_stSettings.m_videoExtensions);
       items.m_strPath = strDirectory;
-      int iOldStack = g_stSettings.m_iMyVideoStack;
-      g_stSettings.m_iMyVideoStack = STACK_SIMPLE;
       items.Stack();
-      g_stSettings.m_iMyVideoStack = iOldStack;
       int numFilesInFolder = GetPathHash(items, hash);
 
       if (!m_database.GetPathHash(strDirectory, dbHash) || dbHash != hash)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15979
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15979&view=rev
Author:   jmarshallnz
Date:     2008-10-22 02:12:36 +0000 (Wed, 22 Oct 2008)

Log Message:
-----------
fixed: Ticket #5095 - stacking is not threadsafe (missing files from 15949).

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Settings.cpp
    branches/linuxport/XBMC/xbmc/Settings.h

Modified: branches/linuxport/XBMC/xbmc/Settings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.cpp	2008-10-22 01:31:59 UTC (rev 15978)
+++ branches/linuxport/XBMC/xbmc/Settings.cpp	2008-10-22 02:12:36 UTC (rev 15979)
@@ -1592,9 +1592,7 @@
 
   SetInteger(pNode, "startwindow", g_stSettings.m_iVideoStartWindow);
 
-  int iStack = g_stSettings.m_iMyVideoStack;  // make sure we only save this without the temporary flag
-  iStack &= ~STACK_UNAVAILABLE;
-  SetInteger(pNode, "stackvideomode", iStack);
+  SetInteger(pNode, "stackvideomode", g_stSettings.m_iMyVideoStack);
 
   SetString(pNode, "cleantokens", g_stSettings.m_szMyVideoCleanTokens);
   SetString(pNode, "cleanseparators", g_stSettings.m_szMyVideoCleanSeparators);

Modified: branches/linuxport/XBMC/xbmc/Settings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.h	2008-10-22 01:31:59 UTC (rev 15978)
+++ branches/linuxport/XBMC/xbmc/Settings.h	2008-10-22 02:12:36 UTC (rev 15979)
@@ -56,8 +56,6 @@
 
 #define STACK_NONE          0
 #define STACK_SIMPLE        1
-#define STACK_FUZZY         2
-#define STACK_UNAVAILABLE   4
 
 #define VIDEO_SHOW_ALL 0
 #define VIDEO_SHOW_UNWATCHED 1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15994
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15994&view=rev
Author:   wiso
Date:     2008-10-23 20:01:11 +0000 (Thu, 23 Oct 2008)

Log Message:
-----------
[WIN32]: added more logging.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/win32/WIN32Util.cpp
    branches/linuxport/XBMC/xbmc/win32/WIN32Util.h

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-10-23 19:37:21 UTC (rev 15993)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-10-23 20:01:11 UTC (rev 15994)
@@ -201,6 +201,7 @@
 #ifdef _WIN32
 #include <shlobj.h>
 #include <win32/MockXboxSymbols.h>
+#include "win32util.h"
 #endif
 #ifdef HAS_XRANDR
 #include "XRandR.h"
@@ -574,6 +575,8 @@
   CLog::Log(LOGNOTICE, "Starting XBMC, Platform: Mac OS X.  Built on %s", __DATE__);
 #elif defined(_WIN32)
   CLog::Log(LOGNOTICE, "Starting XBMC, Platform: %s.  Built on %s (compiler %i)",g_sysinfo.GetKernelVersion().c_str(), __DATE__, _MSC_VER);
+  CLog::Log(LOGNOTICE, g_cpuInfo.getCPUModel().c_str());
+  CLog::Log(LOGNOTICE, CWIN32Util::GetResInfoString());
 #endif
   CLog::Log(LOGNOTICE, "Q is mapped to: %s", _P("Q:").c_str());
   char szXBEFileName[1024];

Modified: branches/linuxport/XBMC/xbmc/win32/WIN32Util.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/win32/WIN32Util.cpp	2008-10-23 19:37:21 UTC (rev 15993)
+++ branches/linuxport/XBMC/xbmc/win32/WIN32Util.cpp	2008-10-23 20:01:11 UTC (rev 15994)
@@ -371,6 +371,23 @@
   return result;
 }
 
+void CWIN32Util::MaximizeWindow(bool bRemoveBorder)
+{
+  /*int w=0,h=0;
+  g_videoConfig.GetDesktopResolution(&w,&h);*/
+}
+
+CStdString CWIN32Util::GetResInfoString()
+{
+  CStdString strRes;
+  DEVMODE devmode;
+  ZeroMemory(&devmode, sizeof(devmode));
+  devmode.dmSize = sizeof(devmode);
+  EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devmode);
+  strRes.Format("Desktop Resolution: %dx%d %dBit at %dHz",devmode.dmPelsWidth,devmode.dmPelsHeight,devmode.dmBitsPerPel,devmode.dmDisplayFrequency);
+  return strRes;
+}
+
 extern "C" {
   FILE *fopen_utf8(const char *_Filename, const char *_Mode)
   {
@@ -380,3 +397,4 @@
     return _wfopen(wfilename.c_str(), wmode.c_str());
   }
 }
+

Modified: branches/linuxport/XBMC/xbmc/win32/WIN32Util.h
===================================================================
--- branches/linuxport/XBMC/xbmc/win32/WIN32Util.h	2008-10-23 19:37:21 UTC (rev 15993)
+++ branches/linuxport/XBMC/xbmc/win32/WIN32Util.h	2008-10-23 20:01:11 UTC (rev 15994)
@@ -35,14 +35,16 @@
   static CStdString MountShare(const CStdString &strPath, DWORD *dwError=NULL);
   static DWORD UmountShare(const CStdString &strPath);
   static CStdString URLEncode(const CURL &url);
-  static CStdString CWIN32Util::GetLocalPath(const CStdString &strPath);
-  static char CWIN32Util::FirstDriveFromMask (ULONG unitmask);
-  static int CWIN32Util::GetDriveStatus(const CStdString &strPath);
+  static CStdString GetLocalPath(const CStdString &strPath);
+  static char FirstDriveFromMask (ULONG unitmask);
+  static int GetDriveStatus(const CStdString &strPath);
   static void UpdateDriveMask();
   static CStdString GetChangedDrive();
   static bool PowerManagement(PowerState State);
   static bool XBMCShellExecute(const CStdString &strPath, bool bWaitForScriptExit=false);
   static std::vector<CStdString> GetDiskUsage();
+  static void MaximizeWindow(bool bRemoveBorder);
+  static CStdString GetResInfoString();
 
 private:
   static DWORD dwDriveMask;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15998
          http://xbmc.svn.sourceforge.net/xbmc/?rev=15998&view=rev
Author:   elupus
Date:     2008-10-23 23:03:12 +0000 (Thu, 23 Oct 2008)

Log Message:
-----------
fixed: use of uninitialized variable in call to mktime, must set all structure members.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileSystem/FileZip.cpp
    branches/linuxport/XBMC/xbmc/linux/XTimeUtils.cpp

Modified: branches/linuxport/XBMC/xbmc/FileSystem/FileZip.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/FileZip.cpp	2008-10-23 22:39:13 UTC (rev 15997)
+++ branches/linuxport/XBMC/xbmc/FileSystem/FileZip.cpp	2008-10-23 23:03:12 UTC (rev 15998)
@@ -253,7 +253,7 @@
 int CFileZip::Stat(struct __stat64 *buffer)
 {
   int ret;
-  struct tm tm;
+  struct tm tm = {};
 
   ret = mFile.Stat(buffer);
   tm.tm_sec = (mZipItem.mod_time & 0x1F) << 1;

Modified: branches/linuxport/XBMC/xbmc/linux/XTimeUtils.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/linux/XTimeUtils.cpp	2008-10-23 22:39:13 UTC (rev 15997)
+++ branches/linuxport/XBMC/xbmc/linux/XTimeUtils.cpp	2008-10-23 23:03:12 UTC (rev 15998)
@@ -150,7 +150,7 @@
 {
   static const int dayoffset[12] = {0, 31, 59, 90, 120, 151, 182, 212, 243, 273, 304, 334};
 
-  struct tm sysTime;
+  struct tm sysTime = {};
   sysTime.tm_year = lpSystemTime->wYear - 1900;
   sysTime.tm_mon = lpSystemTime->wMonth - 1;
   sysTime.tm_wday = lpSystemTime->wDayOfWeek;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16008
          http://xbmc.svn.sourceforge.net/xbmc/?rev=16008&view=rev
Author:   jmarshallnz
Date:     2008-10-25 09:10:27 +0000 (Sat, 25 Oct 2008)

Log Message:
-----------
fixed: Ticket #5221 - Skin Settings not resetting properly on skin change.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Application.cpp
    branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.cpp

Modified: branches/linuxport/XBMC/xbmc/Application.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Application.cpp	2008-10-25 06:56:17 UTC (rev 16007)
+++ branches/linuxport/XBMC/xbmc/Application.cpp	2008-10-25 09:10:27 UTC (rev 16008)
@@ -2078,6 +2078,8 @@
   g_colorManager.Clear();
 
   g_charsetConverter.reset();
+
+  g_infoManager.Clear();
 }
 
 bool CApplication::LoadUserWindows(const CStdString& strSkinPath)
@@ -3793,7 +3795,6 @@
 #ifdef HAS_EVENT_SERVER
     CEventServer::RemoveInstance();
 #endif
-    g_infoManager.Clear();
     DllLoaderContainer::Clear();
     g_playlistPlayer.Clear();
     g_settings.Clear();

Modified: branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-10-25 06:56:17 UTC (rev 16007)
+++ branches/linuxport/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-10-25 09:10:27 UTC (rev 16008)
@@ -3233,7 +3233,6 @@
 
 void CGUIInfoManager::Clear()
 {
-  m_currentFile->Reset();
   m_CombinedValues.clear();
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16014
          http://xbmc.svn.sourceforge.net/xbmc/?rev=16014&view=rev
Author:   davilla
Date:     2008-10-25 16:17:22 +0000 (Sat, 25 Oct 2008)

Log Message:
-----------
[All] fixes Ticket #5232 - broken sort-by-size when files are bigger than 4GB. tested to 11.5GB files

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/SortFileItem.cpp
    branches/linuxport/XBMC/xbmc/StringUtils.cpp
    branches/linuxport/XBMC/xbmc/StringUtils.h

Modified: branches/linuxport/XBMC/xbmc/SortFileItem.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/SortFileItem.cpp	2008-10-25 15:27:16 UTC (rev 16013)
+++ branches/linuxport/XBMC/xbmc/SortFileItem.cpp	2008-10-25 16:17:22 UTC (rev 16014)
@@ -134,7 +134,7 @@
   if (!item) return;
 
   CStdString label;
-  label.Format("%lu", item->m_dwSize);
+  label.Format("%lld", item->m_dwSize);
   item->SetSortLabel(label);
 }
 

Modified: branches/linuxport/XBMC/xbmc/StringUtils.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/StringUtils.cpp	2008-10-25 15:27:16 UTC (rev 16013)
+++ branches/linuxport/XBMC/xbmc/StringUtils.cpp	2008-10-25 16:17:22 UTC (rev 16014)
@@ -128,13 +128,13 @@
 // Compares separately the numeric and alphabetic parts of a string.
 // returns negative if left < right, positive if left > right
 // and 0 if they are identical (essentially calculates left - right)
-int StringUtils::AlphaNumericCompare(const char *left, const char *right)
+long long StringUtils::AlphaNumericCompare(const char *left, const char *right)
 {
   unsigned char *l = (unsigned char *)left;
   unsigned char *r = (unsigned char *)right;
   unsigned char *ld, *rd;
   unsigned char lc, rc;
-  unsigned int lnum, rnum;
+  long long lnum, rnum;
   while (*l != 0 && *r != 0)
   {
     // check if we have a numerical value
@@ -142,15 +142,15 @@
     {
       ld = l;
       lnum = 0;
-      while (*ld >= '0' && *ld <= '9' && ld < l + 10)
-      { // compare only up to 10 digits
+      while (*ld >= '0' && *ld <= '9' && ld < l + 15)
+      { // compare only up to 15 digits
         lnum *= 10;
         lnum += *ld++ - '0';
       }
       rd = r;
       rnum = 0;
-      while (*rd >= '0' && *rd <= '9' && rd < r + 10)
-      { // compare only up to 10 digits
+      while (*rd >= '0' && *rd <= '9' && rd < r + 15)
+      { // compare only up to 15 digits
         rnum *= 10;
         rnum += *rd++ - '0';
       }

Modified: branches/linuxport/XBMC/xbmc/StringUtils.h
===================================================================
--- branches/linuxport/XBMC/xbmc/StringUtils.h	2008-10-25 15:27:16 UTC (rev 16013)
+++ branches/linuxport/XBMC/xbmc/StringUtils.h	2008-10-25 16:17:22 UTC (rev 16014)
@@ -52,7 +52,7 @@
   static void JoinString(const CStdStringArray &strings, const CStdString& delimiter, CStdString& result);
   static int SplitString(const CStdString& input, const CStdString& delimiter, CStdStringArray &results, unsigned int iMaxStrings = 0);
   static int FindNumber(const CStdString& strInput, const CStdString &strFind);
-  static int AlphaNumericCompare(const char *left, const char *right);
+  static long long AlphaNumericCompare(const char *left, const char *right);
   static long TimeStringToSeconds(const CStdString &timeString);
   static void RemoveCRLF(CStdString& strLine);
   static void SecondsToTimeString( long lSeconds, CStdString& strHMS, TIME_FORMAT format = TIME_FORMAT_GUESS);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16016
          http://xbmc.svn.sourceforge.net/xbmc/?rev=16016&view=rev
Author:   elupus
Date:     2008-10-25 16:36:10 +0000 (Sat, 25 Oct 2008)

Log Message:
-----------
changed: don't use %lld as that isn't valid in msvc

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileSystem/CacheStrategy.cpp
    branches/linuxport/XBMC/xbmc/cdrip/CDDAReader.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp

Modified: branches/linuxport/XBMC/xbmc/FileSystem/CacheStrategy.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/CacheStrategy.cpp	2008-10-25 16:25:09 UTC (rev 16015)
+++ branches/linuxport/XBMC/xbmc/FileSystem/CacheStrategy.cpp	2008-10-25 16:36:10 UTC (rev 16016)
@@ -197,7 +197,7 @@
 
 __int64 CSimpleFileCache::Seek(__int64 iFilePosition, int iWhence) {
 
-	CLog::Log(LOGDEBUG,"CSimpleFileCache::Seek, seeking to %lld", iFilePosition);
+	CLog::Log(LOGDEBUG,"CSimpleFileCache::Seek, seeking to %"PRId64, iFilePosition);
 
 	__int64 iTarget = iFilePosition - m_nStartPosition;
 	if (SEEK_END == iWhence) 
@@ -216,7 +216,7 @@
 
 	__int64 nDiff = iTarget - m_nWritePosition;
 	if ( nDiff > 500000 || (nDiff > 0 && WaitForData((unsigned int)nDiff, 5000) == CACHE_RC_TIMEOUT)  ) {		
-		CLog::Log(LOGWARNING,"%s - attempt to seek pass read data (seek to %"PRId64". max: %lld. reset read pointer. (%"PRId64":%d)", __FUNCTION__, iTarget, m_nWritePosition, iFilePosition, iWhence);
+		CLog::Log(LOGWARNING,"%s - attempt to seek pass read data (seek to %"PRId64". max: %"PRId64". reset read pointer. (%"PRId64":%d)", __FUNCTION__, iTarget, m_nWritePosition, iFilePosition, iWhence);
 		return  CACHE_RC_ERROR;
 	}
 

Modified: branches/linuxport/XBMC/xbmc/cdrip/CDDAReader.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cdrip/CDDAReader.cpp	2008-10-25 16:25:09 UTC (rev 16015)
+++ branches/linuxport/XBMC/xbmc/cdrip/CDDAReader.cpp	2008-10-25 16:36:10 UTC (rev 16016)
@@ -56,7 +56,7 @@
   if (!m_fileCdda.Open(strFileName))
     return false;
 
-  CLog::Log(LOGINFO, "%s, Sectors %lld", strFileName, m_fileCdda.GetLength() / CDIO_CD_FRAMESIZE_RAW);
+  CLog::Log(LOGINFO, "%s, Sectors %"PRId64, strFileName, m_fileCdda.GetLength() / CDIO_CD_FRAMESIZE_RAW);
 
   // allocate 2 buffers
   // read around 128k per chunk. This makes the cd reading less noisy.

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp	2008-10-25 16:25:09 UTC (rev 16015)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp	2008-10-25 16:36:10 UTC (rev 16016)
@@ -237,7 +237,7 @@
   STimestamp timestamp;
 
   while(*line == ' ') line++;
-  if(sscanf(line, "%d:%d:%d:%d, filepos:%lld", &h, &m, &s, &ms, &timestamp.pos) != 5)
+  if(sscanf(line, "%d:%d:%d:%d, filepos:%"PRId64, &h, &m, &s, &ms, &timestamp.pos) != 5)
     return false;
 
   timestamp.id  = state.id;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16018
          http://xbmc.svn.sourceforge.net/xbmc/?rev=16018&view=rev
Author:   elupus
Date:     2008-10-25 23:40:13 +0000 (Sat, 25 Oct 2008)

Log Message:
-----------
changed: attempt to get desktop refresh rate through xrandr

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/XBVideoConfig.cpp
    branches/linuxport/XBMC/xbmc/XBVideoConfig.h
    branches/linuxport/XBMC/xbmc/linux/XRandR.cpp

Modified: branches/linuxport/XBMC/xbmc/XBVideoConfig.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/XBVideoConfig.cpp	2008-10-25 16:38:57 UTC (rev 16017)
+++ branches/linuxport/XBMC/xbmc/XBVideoConfig.cpp	2008-10-25 23:40:13 UTC (rev 16018)
@@ -97,10 +97,11 @@
 }
 
 #ifdef HAS_SDL
-void XBVideoConfig::GetDesktopResolution(int &w, int &h) const
+void XBVideoConfig::GetDesktopResolution(int &w, int &h, float &hz) const
 {
 #ifdef __APPLE__
   Cocoa_GetScreenResolution(&w, &h);
+  hz = 0.0f;
 #elif defined(_WIN32PC)
     DEVMODE devmode;
     ZeroMemory(&devmode, sizeof(devmode));
@@ -108,6 +109,7 @@
     EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devmode);
     w = devmode.dmPelsWidth;
     h = devmode.dmPelsHeight;
+    hz = devmode.dmDisplayFrequency;
 #endif
 
 #ifdef HAS_GLX
@@ -147,6 +149,7 @@
   }
   w = width;
   h = height;
+  hz = g_xrandr.GetCurrentMode("").hz;
 #endif
 }
 #endif
@@ -351,7 +354,8 @@
 #endif
   // Get the desktop resolution to see what we're dealing with here.
   int w, h;
-  GetDesktopResolution(w, h);
+  float hz;
+  GetDesktopResolution(w, h, hz);
 
   // If we've got quite a few pixels, go with 720p.
   if (w > 1280 && h > 720)

Modified: branches/linuxport/XBMC/xbmc/XBVideoConfig.h
===================================================================
--- branches/linuxport/XBMC/xbmc/XBVideoConfig.h	2008-10-25 16:38:57 UTC (rev 16017)
+++ branches/linuxport/XBMC/xbmc/XBVideoConfig.h	2008-10-25 23:40:13 UTC (rev 16018)
@@ -53,7 +53,7 @@
   RESOLUTION GetSafeMode() const;
   RESOLUTION GetBestMode() const;
 #ifdef HAS_SDL
-  void GetDesktopResolution(int &w, int &h) const;
+  void GetDesktopResolution(int &w, int &h, float &hz) const;
   int GetNumberOfResolutions() { return m_iNumResolutions; }
   void GetResolutionInfo(int num, RESOLUTION_INFO &info) { info = m_ResInfo[num]; }
 #endif

Modified: branches/linuxport/XBMC/xbmc/linux/XRandR.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/linux/XRandR.cpp	2008-10-25 16:38:57 UTC (rev 16017)
+++ branches/linuxport/XBMC/xbmc/linux/XRandR.cpp	2008-10-25 23:40:13 UTC (rev 16018)
@@ -253,7 +253,7 @@
 
   for (unsigned int j = 0; j < m_outputs.size(); j++)
   {
-    if (m_outputs[j].name == outputName)
+    if (m_outputs[j].name == outputName || outputName == "")
     {
       for (unsigned int i = 0; i < m_outputs[j].modes.size(); i++)
       {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16053
          http://xbmc.svn.sourceforge.net/xbmc/?rev=16053&view=rev
Author:   jmarshallnz
Date:     2008-10-29 01:09:14 +0000 (Wed, 29 Oct 2008)

Log Message:
-----------
fixed: Ticket #4993 - album smartplaylists wouldn't work if an order clause was given.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileSystem/SmartPlaylistDirectory.cpp
    branches/linuxport/XBMC/xbmc/MusicDatabase.cpp
    branches/linuxport/XBMC/xbmc/MusicDatabase.h

Modified: branches/linuxport/XBMC/xbmc/FileSystem/SmartPlaylistDirectory.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/SmartPlaylistDirectory.cpp	2008-10-29 00:32:58 UTC (rev 16052)
+++ branches/linuxport/XBMC/xbmc/FileSystem/SmartPlaylistDirectory.cpp	2008-10-29 01:09:14 UTC (rev 16053)
@@ -77,8 +77,7 @@
     {
       CMusicDatabase db;
       db.Open();
-      CStdString whereOrder = playlist.GetWhereClause() + " " + playlist.GetOrderClause();
-      success = db.GetAlbumsByWhere("musicdb://3/", whereOrder, items);
+      success = db.GetAlbumsByWhere("musicdb://3/", playlist.GetWhereClause(), playlist.GetOrderClause(), items);
       items.SetContent("albums");
       db.Close();
     }

Modified: branches/linuxport/XBMC/xbmc/MusicDatabase.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/MusicDatabase.cpp	2008-10-29 00:32:58 UTC (rev 16052)
+++ branches/linuxport/XBMC/xbmc/MusicDatabase.cpp	2008-10-29 01:09:14 UTC (rev 16053)
@@ -2522,7 +2522,7 @@
 {
   CStdString where = FormatSQL("where iYear=%ld", year);
 
-  return GetAlbumsByWhere(strBaseDir, where, items);
+  return GetAlbumsByWhere(strBaseDir, where, "", items);
 }
 
 bool CMusicDatabase::GetArtistsNav(const CStdString& strBaseDir, CFileItemList& items, long idGenre, bool albumArtistsOnly)
@@ -2803,10 +2803,10 @@
                           , idArtist, idArtist, idArtist, idArtist);
   }
 
-  return GetAlbumsByWhere(strBaseDir, strWhere, items);
+  return GetAlbumsByWhere(strBaseDir, strWhere, "", items);
 }
 
-bool CMusicDatabase::GetAlbumsByWhere(const CStdString &baseDir, const CStdString &where, CFileItemList &items)
+bool CMusicDatabase::GetAlbumsByWhere(const CStdString &baseDir, const CStdString &where, const CStdString &order, CFileItemList &items)
 {
   if (NULL == m_pDB.get()) return false;
   if (NULL == m_pDS.get()) return false;
@@ -2820,7 +2820,7 @@
       sql += "where ";
     else
       sql += where + " and ";
-    sql += "albumview.strAlbum != \"\"";
+    sql += "albumview.strAlbum != \"\" " + order;
 
     // run query
     CLog::Log(LOGDEBUG, "%s query: %s", __FUNCTION__, sql.c_str());

Modified: branches/linuxport/XBMC/xbmc/MusicDatabase.h
===================================================================
--- branches/linuxport/XBMC/xbmc/MusicDatabase.h	2008-10-29 00:32:58 UTC (rev 16052)
+++ branches/linuxport/XBMC/xbmc/MusicDatabase.h	2008-10-29 01:09:14 UTC (rev 16053)
@@ -166,7 +166,7 @@
   bool GetSongsNav(const CStdString& strBaseDir, CFileItemList& items, long idGenre, long idArtist,long idAlbum);
   bool GetSongsByYear(const CStdString& baseDir, CFileItemList& items, long year);
   bool GetSongsByWhere(const CStdString &baseDir, const CStdString &whereClause, CFileItemList& items);
-  bool GetAlbumsByWhere(const CStdString &baseDir, const CStdString &where, CFileItemList &items);
+  bool GetAlbumsByWhere(const CStdString &baseDir, const CStdString &where, const CStdString &order, CFileItemList &items);
   bool GetRandomSong(CFileItem* item, long& lSongId, const CStdString& strWhere);
   int GetSongsCount();
   int GetSongsCount(const CStdString& strWhere);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16059
          http://xbmc.svn.sourceforge.net/xbmc/?rev=16059&view=rev
Author:   monkeyman_67156
Date:     2008-10-29 03:08:23 +0000 (Wed, 29 Oct 2008)

Log Message:
-----------
fixed: always make sure that malloc'd strings returned from GetReplaceString() are freed properly.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp

Modified: branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp	2008-10-29 03:03:44 UTC (rev 16058)
+++ branches/linuxport/XBMC/xbmc/VideoInfoScanner.cpp	2008-10-29 03:08:23 UTC (rev 16059)
@@ -860,6 +860,7 @@
                 free(episode);
                 CLog::Log(LOGDEBUG, "adding new season %u, multipart episode %u", myEpisode.iSeason, myEpisode.iEpisode);
                 episodeList.push_back(myEpisode);
+                free(remainder);
                 remainder = reg.GetReplaceString("\\3");
                 offset = 0;
               }
@@ -874,6 +875,7 @@
                 offset += regexp2pos + reg2.GetFindLen();
               }
             }
+            free(remainder);
           }
         }
       }

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp	2008-10-29 03:03:44 UTC (rev 16058)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp	2008-10-29 03:08:23 UTC (rev 16059)
@@ -69,6 +69,8 @@
         pOverlay->iPTSStartTime = atoi(startFrame)*DVD_TIME_BASE/1000; 
         pOverlay->iPTSStopTime  = atoi(endFrame)*DVD_TIME_BASE/1000;
 
+        free(endFrame);
+
         CStdStringW strUTF16;
         CStdStringA strUTF8;
         g_charsetConverter.subtitleCharsetToW(text, strUTF16);
@@ -78,7 +80,6 @@
         // add a new text element to our container
         pOverlay->AddElement(new CDVDOverlayText::CElementText(strUTF8.c_str()));
         reuse = true;
-        free(endFrame);
       
         m_collection.Add(pOverlay);
       }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16077
          http://xbmc.svn.sourceforge.net/xbmc/?rev=16077&view=rev
Author:   elupus
Date:     2008-10-30 01:42:54 +0000 (Thu, 30 Oct 2008)

Log Message:
-----------
fixed: forgotten commit of the new advanced setting.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Settings.cpp
    branches/linuxport/XBMC/xbmc/Settings.h

Modified: branches/linuxport/XBMC/xbmc/Settings.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.cpp	2008-10-30 01:29:26 UTC (rev 16076)
+++ branches/linuxport/XBMC/xbmc/Settings.cpp	2008-10-30 01:42:54 UTC (rev 16077)
@@ -82,6 +82,9 @@
     g_graphicsContext.ResetOverscan(m_ResInfo[i]);
   }
 
+  g_graphicsContext.ResetScreenParameters(WINDOW);
+  g_graphicsContext.ResetOverscan(m_ResInfo[WINDOW]);
+
   g_stSettings.m_iMyVideoStack = STACK_NONE;
 
   strcpy(g_stSettings.m_szMyVideoCleanTokens, "divx|xvid|3ivx|ac3|ac351|dts|mp3|wma|m4a|mp4|aac|ogg|scr|ts|sharereactor|dvd|dvdrip|hd-dvd|remux|dtshd|ddplus|blue-ray");
@@ -144,6 +147,7 @@
 
   g_advancedSettings.m_audioHeadRoom = 0;
   g_advancedSettings.m_karaokeSyncDelay = 0.0f;
+  g_advancedSettings.m_analogMultiChannel = false;
 
   g_advancedSettings.m_videoSubsDelayRange = 10;
   g_advancedSettings.m_videoAudioDelayRange = 10;
@@ -1146,6 +1150,7 @@
   {
     GetInteger(pElement, "headroom", g_advancedSettings.m_audioHeadRoom, 0, 12);
     GetFloat(pElement, "karaokesyncdelay", g_advancedSettings.m_karaokeSyncDelay, -3.0f, 3.0f);
+    XMLUtils::GetBoolean(pElement, "analogmultichannel", g_advancedSettings.m_analogMultiChannel);
   }
 
   pElement = pRootElement->FirstChildElement("video");

Modified: branches/linuxport/XBMC/xbmc/Settings.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Settings.h	2008-10-30 01:29:26 UTC (rev 16076)
+++ branches/linuxport/XBMC/xbmc/Settings.h	2008-10-30 01:42:54 UTC (rev 16077)
@@ -134,6 +134,7 @@
 
     int m_audioHeadRoom;
     float m_karaokeSyncDelay;
+    bool m_analogMultiChannel;
 
     float m_videoSubsDelayRange;
     float m_videoAudioDelayRange;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16083
          http://xbmc.svn.sourceforge.net/xbmc/?rev=16083&view=rev
Author:   monkeyman_67156
Date:     2008-10-30 19:40:22 +0000 (Thu, 30 Oct 2008)

Log Message:
-----------
fixed: compilation warnings when using GCC 4.3

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp
    branches/linuxport/XBMC/xbmc/UPnP.cpp
    branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessageQueue.cpp

Modified: branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp	2008-10-30 17:27:30 UTC (rev 16082)
+++ branches/linuxport/XBMC/xbmc/PlayListPlayer.cpp	2008-10-30 19:40:22 UTC (rev 16083)
@@ -249,7 +249,7 @@
       m_failedSongsStart = playAttempt;
     m_iFailedSongs++;
     if ((m_iFailedSongs >= g_advancedSettings.m_playlistRetries && g_advancedSettings.m_playlistRetries >= 0)
-        || (timeGetTime() - m_failedSongsStart  >= (unsigned int)g_advancedSettings.m_playlistTimeout * 1000) && g_advancedSettings.m_playlistTimeout)
+        || ((timeGetTime() - m_failedSongsStart  >= (unsigned int)g_advancedSettings.m_playlistTimeout * 1000) && g_advancedSettings.m_playlistTimeout))
     {
       CLog::Log(LOGDEBUG,"Playlist Player: too many consecutive failures... aborting playback");
 

Modified: branches/linuxport/XBMC/xbmc/UPnP.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/UPnP.cpp	2008-10-30 17:27:30 UTC (rev 16082)
+++ branches/linuxport/XBMC/xbmc/UPnP.cpp	2008-10-30 19:40:22 UTC (rev 16083)
@@ -1321,7 +1321,7 @@
 {
     NPT_String mute;
     NPT_CHECK_SEVERE(action->GetArgumentValue("DesiredMute",mute));
-    if(mute == "1" ^ g_stSettings.m_bMute)
+    if((mute == "1") ^ g_stSettings.m_bMute)
         g_application.Mute();
     return NPT_SUCCESS;
 }

Modified: branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessageQueue.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessageQueue.cpp	2008-10-30 17:27:30 UTC (rev 16082)
+++ branches/linuxport/XBMC/xbmc/cores/dvdplayer/DVDMessageQueue.cpp	2008-10-30 19:40:22 UTC (rev 16083)
@@ -146,7 +146,7 @@
 
   EnterCriticalSection(&m_critSection);
 
-  if(!m_pLastMessage || m_pLastMessage && m_pLastMessage->priority >= priority)
+  if(!m_pLastMessage || (m_pLastMessage && m_pLastMessage->priority >= priority))
   {
     /* quick path to just add at the end */
     if (!m_pFirstMessage) m_pFirstMessage = msgItem;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16092
          http://xbmc.svn.sourceforge.net/xbmc/?rev=16092&view=rev
Author:   jmarshallnz
Date:     2008-11-02 23:16:33 +0000 (Sun, 02 Nov 2008)

Log Message:
-----------
fixed: libcurl wasn't loaded using our dll loader.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/FileSystem/FileCurl.cpp
    branches/linuxport/XBMC/xbmc/cores/DllLoader/DllLoaderContainer.cpp
    branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_socket.cpp

Modified: branches/linuxport/XBMC/xbmc/FileSystem/FileCurl.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/FileSystem/FileCurl.cpp	2008-11-02 23:16:20 UTC (rev 16091)
+++ branches/linuxport/XBMC/xbmc/FileSystem/FileCurl.cpp	2008-11-02 23:16:33 UTC (rev 16092)
@@ -44,6 +44,8 @@
 #if defined(__APPLE__)
 extern "C" int __stdcall dllselect(int ntfs, fd_set *readfds, fd_set *writefds, fd_set *errorfds, const timeval *timeout);
 #define dllselect select
+#elif defined(WIN32)
+extern "C" int __stdcall dllselect(int ntfs, fd_set *readfds, fd_set *writefds, fd_set *errorfds, const timeval *timeout);
 #else
 #define dllselect select
 #endif

Modified: branches/linuxport/XBMC/xbmc/cores/DllLoader/DllLoaderContainer.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/DllLoader/DllLoaderContainer.cpp	2008-11-02 23:16:20 UTC (rev 16091)
+++ branches/linuxport/XBMC/xbmc/cores/DllLoader/DllLoaderContainer.cpp	2008-11-02 23:16:33 UTC (rev 16092)
@@ -277,12 +277,7 @@
     pLoader = new SoLoader(sName, bLoadSymbols);
   else
 #elif defined(_WIN32PC)
-  //NOTE: libcurl does not work with default DllLoader outside of Visual Studio for some mysterious reason, 
-  //load with Win32DllLoader instead.
-  if (
-    (strlen(sName) >= 4 && !strnicmp(sName + (strlen(sName) - 4), ".vis", 4)) ||
-    (strlen(sName) >= 11 && !strnicmp(sName + (strlen(sName) - 11), "libcurl.dll", 11))
-    )
+  if (strlen(sName) >= 4 && !strnicmp(sName + (strlen(sName) - 4), ".vis", 4))
   {
     pLoader = new Win32DllLoader(sName);
   }

Modified: branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_socket.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_socket.cpp	2008-11-02 23:16:20 UTC (rev 16091)
+++ branches/linuxport/XBMC/xbmc/cores/DllLoader/exports/emu_socket.cpp	2008-11-02 23:16:33 UTC (rev 16092)
@@ -212,7 +212,9 @@
     {
       errno = WSAGetLastError();
       sprintf(szBuf, "connect returned:%i %i\n", iResult, WSAGetLastError());
-      OutputDebugString(szBuf);
+      // Don't OutputDebugString here, as no debugger attached
+      // this will (strangely) reset WSAGetLastError()
+      //OutputDebugString(szBuf);
     }
 
     return iResult;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16116
          http://xbmc.svn.sourceforge.net/xbmc/?rev=16116&view=rev
Author:   AlTheKiller
Date:     2008-11-07 23:02:59 +0000 (Fri, 07 Nov 2008)

Log Message:
-----------
fixed: Allow favourites (look you made me use the queen's english :p) to be loaded from Q:\system and U:\userdata.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/Favourites.cpp
    branches/linuxport/XBMC/xbmc/Favourites.h

Modified: branches/linuxport/XBMC/xbmc/Favourites.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/Favourites.cpp	2008-11-07 18:42:33 UTC (rev 16115)
+++ branches/linuxport/XBMC/xbmc/Favourites.cpp	2008-11-07 23:02:59 UTC (rev 16116)
@@ -20,6 +20,7 @@
  */
 
 #include "stdafx.h"
+#include "File.h"
 #include "Favourites.h"
 #include "Util.h"
 #include "Key.h"
@@ -30,11 +31,27 @@
 {
   items.Clear();
   CStdString favourites;
+  
+  favourites = _P("Q:\\system\\favourites.xml");
+  if(XFILE::CFile::Exists(favourites))
+    CFavourites::LoadFavourites(favourites, items);
+  else
+    CLog::Log(LOGDEBUG, "CFavourites::Load - no system favourites found, skipping");
   CUtil::AddFileToFolder(g_settings.GetProfileUserDataFolder(), "favourites.xml", favourites);
+  if(XFILE::CFile::Exists(favourites))
+    CFavourites::LoadFavourites(favourites, items);
+  else
+    CLog::Log(LOGDEBUG, "CFavourites::Load - no userdata favourites found, skipping");
+
+  return true;
+}
+
+bool CFavourites::LoadFavourites(CStdString& strPath, CFileItemList& items)
+{
   TiXmlDocument doc;
-  if (!doc.LoadFile(favourites))
+  if (!doc.LoadFile(strPath))
   {
-    CLog::Log(LOGERROR, "Unable to load %s (row %i column %i)", favourites.c_str(), doc.Row(), doc.Column());
+    CLog::Log(LOGERROR, "Unable to load %s (row %i column %i)", strPath.c_str(), doc.Row(), doc.Column());
     return false;
   }
   TiXmlElement *root = doc.RootElement();

Modified: branches/linuxport/XBMC/xbmc/Favourites.h
===================================================================
--- branches/linuxport/XBMC/xbmc/Favourites.h	2008-11-07 18:42:33 UTC (rev 16115)
+++ branches/linuxport/XBMC/xbmc/Favourites.h	2008-11-07 23:02:59 UTC (rev 16116)
@@ -27,6 +27,7 @@
 {
 public:
   static bool Load(CFileItemList& items);
+  static bool LoadFavourites(CStdString& strPath, CFileItemList& items);
   static bool AddOrRemove(CFileItem *item, DWORD contextWindow);
   static bool Save(const CFileItemList& items);
   static bool IsFavourite(CFileItem *item, DWORD contextWindow);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16117
          http://xbmc.svn.sourceforge.net/xbmc/?rev=16117&view=rev
Author:   elupus
Date:     2008-11-07 23:09:24 +0000 (Fri, 07 Nov 2008)

Log Message:
-----------
fixed: xbmc would leak gpu memory for each largeimage loaded

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUILargeTextureManager.cpp
    branches/linuxport/XBMC/xbmc/GUILargeTextureManager.h

Modified: branches/linuxport/XBMC/xbmc/GUILargeTextureManager.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUILargeTextureManager.cpp	2008-11-07 23:02:59 UTC (rev 16116)
+++ branches/linuxport/XBMC/xbmc/GUILargeTextureManager.cpp	2008-11-07 23:09:24 UTC (rev 16117)
@@ -126,13 +126,7 @@
       width = image->GetWidth();
       height = image->GetHeight();
       orientation = image->GetOrientation();
-#ifdef HAS_SDL_2D
       return image->GetTexture();
-#else
-      if (image->GetTexture())
-        return new CGLTexture(image->GetTexture(), false);
-      return NULL;
-#endif
     }
   }
   lock.Leave();

Modified: branches/linuxport/XBMC/xbmc/GUILargeTextureManager.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUILargeTextureManager.h	2008-11-07 23:02:59 UTC (rev 16116)
+++ branches/linuxport/XBMC/xbmc/GUILargeTextureManager.h	2008-11-07 23:09:24 UTC (rev 16117)
@@ -66,7 +66,11 @@
     {
       assert(m_refCount == 0);
       if (m_texture)
+#ifdef HAS_SDL_OPENGL
+        delete m_texture;
+#else
         SDL_FreeSurface(m_texture);
+#endif
       m_texture = NULL;
     };
 
@@ -99,13 +103,21 @@
     void SetTexture(SDL_Surface * texture, int width, int height, int orientation)
     {
       assert(m_texture == NULL);
+#ifdef HAS_SDL_OPENGL
+      m_texture = new CGLTexture(texture, false, true);
+#else
       m_texture = texture;
+#endif
       m_width = width;
       m_height = height;
       m_orientation = orientation;
     };
 
+#ifdef HAS_SDL_OPENGL
+    CGLTexture * GetTexture() const { return m_texture; };
+#else
     SDL_Surface * GetTexture() const { return m_texture; };
+#endif
     int GetWidth() const { return m_width; };
     int GetHeight() const { return m_height; };
     int GetOrientation() const { return m_orientation; };
@@ -116,7 +128,11 @@
 
     unsigned int m_refCount;
     CStdString m_path;
+#ifdef HAS_SDL_OPENGL
+    CGLTexture * m_texture;
+#else
     SDL_Surface * m_texture;
+#endif
     int m_width;
     int m_height;
     int m_orientation;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16118
          http://xbmc.svn.sourceforge.net/xbmc/?rev=16118&view=rev
Author:   elupus
Date:     2008-11-07 23:41:47 +0000 (Fri, 07 Nov 2008)

Log Message:
-----------
changed: avoid artificial 1ms delay for loading large images (actually delay was scheduler timeslice which on windows was 10ms until quite recently) 

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/GUILargeTextureManager.cpp
    branches/linuxport/XBMC/xbmc/GUILargeTextureManager.h

Modified: branches/linuxport/XBMC/xbmc/GUILargeTextureManager.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/GUILargeTextureManager.cpp	2008-11-07 23:09:24 UTC (rev 16117)
+++ branches/linuxport/XBMC/xbmc/GUILargeTextureManager.cpp	2008-11-07 23:41:47 UTC (rev 16118)
@@ -36,6 +36,8 @@
 
 CGUILargeTextureManager::~CGUILargeTextureManager()
 {
+  m_bStop = true;
+  m_listEvent.Set();
   StopThread();
 }
 
@@ -45,9 +47,10 @@
 // Once there's nothing queued or allocated, end the thread.
 void CGUILargeTextureManager::Process()
 {
-  m_running = true;
   // lock item list
   CSingleLock lock(m_listSection);
+  m_running = true;
+
   while (m_queued.size() && !m_bStop)
   { // load the top item in the queue
     // take a copy of the details required for the load, as
@@ -85,7 +88,7 @@
       texture = NULL;
     }
     lock.Leave();
-    Sleep(1);
+    m_listEvent.WaitMSec(1000);
     lock.Enter();
   }
   m_running = false;
@@ -104,6 +107,7 @@
     else
       ++it;
   }
+  m_listEvent.Set();
 }
 
 // if available, increment reference count, and return the image.
@@ -178,13 +182,14 @@
   // queue the item
   CLargeTexture *image = new CLargeTexture(path);
   m_queued.push_back(image);
+  m_listEvent.Set();
+  
+  if(m_running)
+    return;
 
   lock.Leave(); // done with our lock
 
-  if (!m_running)
-  {
-    StopThread();
-    Create();
-  }
+  StopThread();
+  Create();
 }
 

Modified: branches/linuxport/XBMC/xbmc/GUILargeTextureManager.h
===================================================================
--- branches/linuxport/XBMC/xbmc/GUILargeTextureManager.h	2008-11-07 23:09:24 UTC (rev 16117)
+++ branches/linuxport/XBMC/xbmc/GUILargeTextureManager.h	2008-11-07 23:41:47 UTC (rev 16118)
@@ -147,6 +147,7 @@
   typedef std::vector<CLargeTexture *>::iterator listIterator;
 
   CCriticalSection m_listSection;
+  CEvent m_listEvent;
   bool m_running;
 };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16157
          http://xbmc.svn.sourceforge.net/xbmc/?rev=16157&view=rev
Author:   elupus
Date:     2008-11-12 20:12:18 +0000 (Wed, 12 Nov 2008)

Log Message:
-----------
changed: use queue instead of vector, as removing an item at the front of a vector incurs a memcopy of all later items to the front.

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/ApplicationMessenger.cpp
    branches/linuxport/XBMC/xbmc/ApplicationMessenger.h

Modified: branches/linuxport/XBMC/xbmc/ApplicationMessenger.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/ApplicationMessenger.cpp	2008-11-12 20:10:09 UTC (rev 16156)
+++ branches/linuxport/XBMC/xbmc/ApplicationMessenger.cpp	2008-11-12 20:12:18 UTC (rev 16157)
@@ -53,20 +53,18 @@
 
 void CApplicationMessenger::Cleanup()
 {
-  vector<ThreadMessage*>::iterator it = m_vecMessages.begin();
-  while (it != m_vecMessages.end())
+  while (m_vecMessages.size() > 0)
   {
-    ThreadMessage* pMsg = *it;
+    ThreadMessage* pMsg = m_vecMessages.front();
     delete pMsg;
-    it = m_vecMessages.erase(it);
+    m_vecMessages.pop();
   }
 
-  it = m_vecWindowMessages.begin();
-  while (it != m_vecWindowMessages.end())
+  while (m_vecWindowMessages.size() > 0)
   {
-    ThreadMessage* pMsg = *it;
+    ThreadMessage* pMsg = m_vecWindowMessages.front();
     delete pMsg;
-    it = m_vecWindowMessages.erase(it);
+    m_vecWindowMessages.pop();
   }
 }
 
@@ -98,10 +96,9 @@
   CSingleLock lock (m_critSection);
   if (msg->dwMessage == TMSG_DIALOG_DOMODAL ||
       msg->dwMessage == TMSG_WRITE_SCRIPT_OUTPUT)
-  {
-    m_vecWindowMessages.push_back(msg);
-  }
-  else m_vecMessages.push_back(msg);
+    m_vecWindowMessages.push(msg);
+  else 
+    m_vecMessages.push(msg);
   lock.Leave();
 
   if (message.hWaitEvent)
@@ -118,11 +115,9 @@
   CSingleLock lock (m_critSection);
   while (m_vecMessages.size() > 0)
   {
-    vector<ThreadMessage*>::iterator it = m_vecMessages.begin();
-
-    ThreadMessage* pMsg = *it;
+    ThreadMessage* pMsg = m_vecMessages.front();
     //first remove the message from the queue, else the message could be processed more then once
-    it = m_vecMessages.erase(it);
+    m_vecMessages.pop();
 
     //Leave here as the message might make another
     //thread call processmessages or sendmessage
@@ -539,10 +534,9 @@
   //message type is window, process window messages
   while (m_vecWindowMessages.size() > 0)
   {
-    vector<ThreadMessage*>::iterator it = m_vecWindowMessages.begin();
-    ThreadMessage* pMsg = *it;
+    ThreadMessage* pMsg = m_vecWindowMessages.front();
     //first remove the message from the queue, else the message could be processed more then once
-    it = m_vecWindowMessages.erase(it);
+    m_vecWindowMessages.pop();
 
     // leave here in case we make more thread messages from this one
     lock.Leave();

Modified: branches/linuxport/XBMC/xbmc/ApplicationMessenger.h
===================================================================
--- branches/linuxport/XBMC/xbmc/ApplicationMessenger.h	2008-11-12 20:10:09 UTC (rev 16156)
+++ branches/linuxport/XBMC/xbmc/ApplicationMessenger.h	2008-11-12 20:12:18 UTC (rev 16157)
@@ -126,8 +126,8 @@
   void ProcessMessage(ThreadMessage *pMsg);
 
 
-  std::vector<ThreadMessage*> m_vecMessages;
-  std::vector<ThreadMessage*> m_vecWindowMessages;
+  std::queue<ThreadMessage*> m_vecMessages;
+  std::queue<ThreadMessage*> m_vecWindowMessages;
   CCriticalSection m_critSection;
   CCriticalSection m_critBuffer;
   CStdString bufferResponse;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 16161
          http://xbmc.svn.sourceforge.net/xbmc/?rev=16161&view=rev
Author:   c0diq
Date:     2008-11-13 07:15:06 +0000 (Thu, 13 Nov 2008)

Log Message:
-----------
added: much better improved UPnP Renderer support. Now provides didl for currently playing track...etc..

Modified Paths:
--------------
    branches/linuxport/XBMC/xbmc/UPnP.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltService.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Core/PltService.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaConnect/PltMediaConnect.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.cpp
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.h
    branches/linuxport/XBMC/xbmc/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.h

Modified: branches/linuxport/XBMC/xbmc/UPnP.cpp
===================================================================
--- branches/linuxport/XBMC/xbmc/UPnP.cpp	2008-11-13 07:13:57 UTC (rev 16160)
+++ branches/linuxport/XBMC/xbmc/UPnP.cpp	2008-11-13 07:15:06 UTC (rev 16161)
@@ -24,6 +24,7 @@
 #include "stdafx.h"
 #include "Util.h"
 #include "Application.h"
+#include "XBMChttp.h"
 
 #include "utils/Network.h"
 #include "UPnP.h"
@@ -47,11 +48,14 @@
 #include "Settings.h"
 #include "FileItem.h"
 #include "GUIWindowManager.h"
+#include "GUIInfoManager.h"
 
 using namespace std;
 using namespace MUSIC_INFO;
 using namespace DIRECTORY;
 
+extern CGUIInfoManager g_infoManager;
+
 NPT_SET_LOCAL_LOGGER("xbmc.upnp")
 
 typedef struct {
@@ -197,70 +201,75 @@
                                  NPT_String                    uri_path,
                                  NPT_String                    file_path);
 
+    // class methods
+    static NPT_Result PopulateObjectFromTag(CMusicInfoTag&         tag,
+                                            PLT_MediaObject&       object, 
+                                            NPT_String*            file_path = NULL,
+                                            PLT_MediaItemResource* resource = NULL);
+    static NPT_Result PopulateObjectFromTag(CVideoInfoTag&         tag,
+                                            PLT_MediaObject&       object, 
+                                            NPT_String*            file_path = NULL,
+                                            PLT_MediaItemResource* resource = NULL);     
+                    
+    static PLT_MediaObject* BuildObject(const CFileItem&              item,
+                                        NPT_String&                   file_path,
+                                        bool                          with_count,
+                                        const NPT_HttpRequestContext& context,
+                                        CUPnPServer*                  upnp_server = NULL);
 
 private:
-    NPT_String       BuildHttpUri(const char* host, 
-                              const char* file_path);
-
-    PLT_MediaObject* BuildObject(CFileItem*                    item,
-                                 NPT_String&                   file_path,
-                                 bool                          with_count,
-                                 const NPT_HttpRequestContext& context);
-
     PLT_MediaObject* Build(CFileItemPtr                  item, 
                            bool                          with_count, 
                            const NPT_HttpRequestContext& context,
                            const char*                   parent_id = NULL);
-
     NPT_Result       BuildResponse(PLT_ActionReference&          action,
                                    CFileItemList&                items,
                                    const NPT_HttpRequestContext& context,
                                    const char*                   parent_id);
-
-
+                           
     static NPT_String GetParentFolder(NPT_String file_path) {       
         int index = file_path.ReverseFind("\\");
         if (index == -1) return "";
 
         return file_path.Left(index);
     }
-
-    static NPT_String GetProtocolInfo(const CFileItem* item, const NPT_String& protocol);
+    static NPT_String BuildHttpUri(const NPT_HttpUrl& base_uri, const char* host, const char* file_path);
+    static NPT_String GetProtocolInfo(const CFileItem& item, const NPT_String& protocol);
 };
 
 /*----------------------------------------------------------------------
 |   CUPnPServer::GetProtocolInfo
 +---------------------------------------------------------------------*/
 NPT_String
-CUPnPServer::GetProtocolInfo(const CFileItem* item, const NPT_String& protocol)
+CUPnPServer::GetProtocolInfo(const CFileItem& item, const NPT_String& protocol)
 {
     NPT_String proto = protocol;
     /* fixup the protocol */
     if (proto.IsEmpty()) {
-        proto = item->GetAsUrl().GetProtocol();
+        proto = item.GetAsUrl().GetProtocol();
         if (proto == "http") {
             proto = "http-get";
         }
     }
-    NPT_String ext = CUtil::GetExtension(item->m_strPath).c_str();
-    if( item->HasVideoInfoTag() && !item->GetVideoInfoTag()->m_strFileNameAndPath.IsEmpty() ) {
-        ext = CUtil::GetExtension(item->GetVideoInfoTag()->m_strFileNameAndPath);
-    } else if( item->HasMusicInfoTag() && !item->GetMusicInfoTag()->GetURL().IsEmpty() ) {
-        ext = CUtil::GetExtension(item->GetMusicInfoTag()->GetURL());
+    NPT_String ext = CUtil::GetExtension(item.m_strPath).c_str();
+    if (item.HasVideoInfoTag() && !item.GetVideoInfoTag()->m_strFileNameAndPath.IsEmpty()) {
+        ext = CUtil::GetExtension(item.GetVideoInfoTag()->m_strFileNameAndPath);
+    } else if (item.HasMusicInfoTag() && !item.GetMusicInfoTag()->GetURL().IsEmpty()) {
+        ext = CUtil::GetExtension(item.GetMusicInfoTag()->GetURL());
     }
     ext.TrimLeft('.');
     ext = ext.ToLowercase();
 
     /* we need a valid extension to retrieve the mimetype for the protocol info */
-    NPT_String content = item->GetContentType().c_str();
-    if( content == "application/octet-stream" )
+    NPT_String content = item.GetContentType().c_str();
+    if (content == "application/octet-stream")
         content = "";
 
-    if( content.IsEmpty() ) {
+    if (content.IsEmpty()) {
         content == "application/octet-stream";
         const mimetype_extension_struct* mapping = mimetype_extension_map;
-        while( mapping->extension ) {
-            if( ext == mapping->extension ) {
+        while (mapping->extension) {
+            if (ext == mapping->extension) {
                 content = mapping->mimetype;
                 break;
             }
@@ -269,37 +278,37 @@
     }
 
     /* fallback to generic content type if not found */
-    if( content.IsEmpty() ) {      
-        if( item->IsVideo() || item->IsVideoDb() )
+    if (content.IsEmpty()) {      
+        if (item.IsVideo() || item.IsVideoDb() )
             content = "video/" + ext;
-        else if( item->IsAudio() || item->IsMusicDb() )
+        else if (item.IsAudio() || item.IsMusicDb() )
             content = "audio/" + ext;
-        else if( item->IsPicture() )
+        else if (item.IsPicture() )
             content = "image/" + ext;
     }
     
     /* nothing we can figure out */
-    if( content.IsEmpty() ) {
+    if (content.IsEmpty()) {
         content = "application/octet-stream";
     }
 
     /* setup dlna strings, wish i knew what all of they mean */
     NPT_String extra = "DLNA.ORG_OP=01";
-    if( content == "audio/mpeg" )
+    if (content == "audio/mpeg" )
         extra.Insert("DLNA.ORG_PN=MP3;");
-    else if( content == "image/jpeg" )
+    else if (content == "image/jpeg" )
         extra.Insert("DLNA.ORG_PN=JPEG_LRG;");
-    else if( content == "image/png" )
+    else if (content == "image/png" )
         extra.Insert("DLNA.ORG_PN=PNG_LRG;");
-    else if( content == "image/bmp" )
+    else if (content == "image/bmp" )
         extra.Insert("DLNA.ORG_PN=BMP_LRG;");
-    else if( content == "image/tiff" )
+    else if (content == "image/tiff" )
         extra.Insert("DLNA.ORG_PN=TIFF_LRG;");
-    else if( content == "image/gif" )
+    else if (content == "image/gif" )
         extra.Insert("DLNA.ORG_PN=GIF_LRG;");
-    else if( content == "image/jp2" )
+    else if (content == "image/jp2" )
         extra.Insert("DLNA.ORG_PN=JPEG_LRG;");
-    else if( content == "video/avi" )
+    else if (content == "video/avi" )
         extra.Insert("DLNA.ORG_PN=AVI;");
 
     NPT_String info = proto + ":*:" + content + ":" + extra;
@@ -332,17 +341,94 @@
 }
 
 /*----------------------------------------------------------------------
+|   CUPnPServer::PopulateObjectFromTag
++---------------------------------------------------------------------*/
+NPT_Result
+CUPnPServer::PopulateObjectFromTag(CMusicInfoTag&         tag,
+                                   PLT_MediaObject&       object, 
+                                   NPT_String*            file_path, /* = NULL */
+                                   PLT_MediaItemResource* resource   /* = NULL */)
+{
+    // some usefull buffers
+    CStdStringArray strings;
+    
+    if (!tag.GetURL().IsEmpty() && file_path)
+      *file_path = tag.GetURL();
+
+    StringUtils::SplitString(tag.GetGenre(), " / ", strings);
+    for(CStdStringArray::iterator it = strings.begin(); it != strings.end(); it++) {
+        object.m_Affiliation.genre.Add((*it).c_str());
+    }
+
+    object.m_Affiliation.album = tag.GetAlbum();
+    object.m_People.artists.Add(tag.GetArtist().c_str());
+    object.m_People.artists.Add(tag.GetAlbumArtist().c_str());
+    object.m_Creator = tag.GetArtist();
+    object.m_MiscInfo.original_track_number = tag.GetTrackNumber();
+    if (resource) resource->m_Duration = tag.GetDuration();   
+    
+    return NPT_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   CUPnPServer::PopulateObjectFromTag
++---------------------------------------------------------------------*/
+NPT_Result
+CUPnPServer::PopulateObjectFromTag(CVideoInfoTag&         tag,
+                                   PLT_MediaObject&       object, 
+                                   NPT_String*            file_path, /* = NULL */
+                                   PLT_MediaItemResource* resource   /* = NULL */)
+{
+    // some usefull buffers
+    CStdStringArray strings;
+    
+    if (!tag.m_strFileNameAndPath.IsEmpty() && file_path)
+      *file_path = tag.m_strFileNameAndPath;
+
+    if (tag.m_iDbId != -1 ) {
+        if (tag.m_strShowTitle.IsEmpty()) {
+          object.m_ObjectClass.type = "object.item.videoItem"; // XBox 360 wants object.item.videoItem instead of object.item.videoItem.movie, is WMP happy?
+          object.m_Affiliation.album = "[Unknown Series]"; // required to make WMP to show title
+          object.m_Title = tag.m_strTitle;                                             
+        } else {
+          object.m_ObjectClass.type = "object.item.videoItem.videoBroadcast";
+          object.m_Affiliation.album = tag.m_strShowTitle;
+          object.m_Title = tag.m_strShowTitle + " - ";
+          object.m_Title += "S" + ("0" + NPT_String::FromInteger(tag.m_iSeason)).Right(2);
+          object.m_Title += "E" + ("0" + NPT_String::FromInteger(tag.m_iEpisode)).Right(2);
+          object.m_Title += " : " + tag.m_strTitle;
+        }
+    }
+
+    StringUtils::SplitString(tag.m_strGenre, " / ", strings);                
+    for(CStdStringArray::iterator it = strings.begin(); it != strings.end(); it++) {
+        object.m_Affiliation.genre.Add((*it).c_str());
+    }
+
+    for(CVideoInfoTag::iCast it = tag.m_cast.begin();it != tag.m_cast.end();it++) {
+        object.m_People.actors.Add(it->strName.c_str(), it->strRole.c_str());
+    }
+    object.m_People.director = tag.m_strDirector;
+
+    object.m_Description.description = tag.m_strTagLine;
+    object.m_Description.long_description = tag.m_strPlot;
+    if (resource) resource->m_Duration = StringUtils::TimeStringToSeconds(tag.m_strRuntime.c_str());
+    
+    return NPT_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
 |   CUPnPServer::BuildHttpUri
 +---------------------------------------------------------------------*/
 NPT_String
-CUPnPServer::BuildHttpUri(const char* host, const char* file_path)
+CUPnPServer::BuildHttpUri(const NPT_HttpUrl& base_uri, const char* host, const char* file_path)
 {
-    NPT_HttpUrl uri = m_FileBaseUri;
-    NPT_HttpUrlQuery query;
+    NPT_HttpUrl uri = base_uri;
+    NPT_HttpUrlQuery query(uri.GetQuery());
     NPT_String result;
 
     query.AddField("path", file_path);
-    uri.SetHost(host);
+    if (host) uri.SetHost(host);
     uri.SetQuery(query.ToString());
     // 360 hack: force inclusion of port 80
     result = uri.ToStringWithDefaultPort(0);
@@ -352,23 +438,20 @@
     result = Substitute(result, '+', "%20");
     return result;
 }
-
+                         
 /*----------------------------------------------------------------------
 |   CUPnPServer::BuildObject
 +---------------------------------------------------------------------*/
 PLT_MediaObject*
-CUPnPServer::BuildObject(CFileItem*                    item,
+CUPnPServer::BuildObject(const CFileItem&              item,
                          NPT_String&                   file_path,
                          bool                          with_count,
-                         const NPT_HttpRequestContext& context)
+                         const NPT_HttpRequestContext& context,
+                         CUPnPServer*                  upnp_server /* = NULL */)
 {
     PLT_MediaItemResource resource;
     PLT_MediaObject*      object = NULL;
 
-    // some usefull buffers
-    CStdStringArray strings;
-    CStdString buffer;
-
     // get list of ip addresses
     NPT_List<NPT_String> ips;
     NPT_CHECK_LABEL(PLT_UPnPMessageHelper::GetIPAddresses(ips), failure);
@@ -380,112 +463,66 @@
         ips.Insert(ips.GetFirstItem(), context.GetLocalAddress().GetIpAddress().ToString());
     }
 
-    if (!item->m_bIsFolder) {
+    if (!item.m_bIsFolder) {
         object = new PLT_MediaItem();
-        object->m_ObjectID = item->m_strPath;
+        object->m_ObjectID = item.m_strPath;
 
         /* Setup object type */
-        if( item->IsMusicDb() || item->IsAudio() ) {
+        if (item.IsMusicDb() || item.IsAudio()) {
             object->m_ObjectClass.type = "object.item.audioItem.musicTrack";
           
-            if( item->HasMusicInfoTag() ) {
-                CMusicInfoTag *tag = item->GetMusicInfoTag();
-                if( !tag->GetURL().IsEmpty() )
-                  file_path = tag->GetURL();
-
-                StringUtils::SplitString(tag->GetGenre(), " / ", strings);
-                for(CStdStringArray::iterator it = strings.begin(); it != strings.end(); it++) {
-                    object->m_Affiliation.genre.Add((*it).c_str());
-                }
-
-                object->m_Affiliation.album = tag->GetAlbum();
-                object->m_People.artists.Add(tag->GetArtist().c_str());
-                object->m_People.artists.Add(tag->GetAlbumArtist().c_str());
-                object->m_Creator = tag->GetArtist();
-                object->m_MiscInfo.original_track_number = tag->GetTrackNumber();
-                resource.m_Duration = tag->GetDuration();                
+            if (item.HasMusicInfoTag()) {
+                CMusicInfoTag *tag = (CMusicInfoTag*)item.GetMusicInfoTag();
+                PopulateObjectFromTag(*tag, *object, &file_path, &resource);
             }
-        } else if( item->IsVideoDb() || item->IsVideo() ) {
+        } else if (item.IsVideoDb() || item.IsVideo()) {
             object->m_ObjectClass.type = "object.item.videoItem";
             object->m_Affiliation.album = "[Unknown Series]"; // required to make WMP to show title
 
-            if( item->HasVideoInfoTag() ) {
-                CVideoInfoTag *tag = item->GetVideoInfoTag();
-                if( !tag->m_strFileNameAndPath.IsEmpty() )
-                  file_path = tag->m_strFileNameAndPath;
-
-                if( tag->m_iDbId != -1 ) {
-                    if( tag->m_strShowTitle.IsEmpty() ) {
-                      object->m_ObjectClass.type = "object.item.videoItem"; // XBox 360 wants object.item.videoItem instead of object.item.videoItem.movie, is WMP happy?
-                      object->m_Affiliation.album = "[Unknown Series]"; // required to make WMP to show title
-                      object->m_Title = tag->m_strTitle;                                             
-                    } else {
-                      object->m_ObjectClass.type = "object.item.videoItem.videoBroadcast";
-                      object->m_Affiliation.album = tag->m_strShowTitle;
-                      object->m_Title = tag->m_strShowTitle + " - ";
-                      object->m_Title += "S" + ("0" + NPT_String::FromInteger(tag->m_iSeason)).Right(2);
-                      object->m_Title += "E" + ("0" + NPT_String::FromInteger(tag->m_iEpisode)).Right(2);
-                      object->m_Title += " : " + tag->m_strTitle;
-                    }
-                }
-
-                StringUtils::SplitString(tag->m_strGenre, " / ", strings);                
-                for(CStdStringArray::iterator it = strings.begin(); it != strings.end(); it++) {
-                    object->m_Affiliation.genre.Add((*it).c_str());
-                }
-
-                for(CVideoInfoTag::iCast it = tag->m_cast.begin();it != tag->m_cast.end();it++) {
-                    object->m_People.actors.Add(it->strName.c_str(), it->strRole.c_str());
-                }
-                object->m_People.director = tag->m_strDirector;
-
-                object->m_Description.description = tag->m_strTagLine;
-                object->m_Description.long_description = tag->m_strPlot;
-                resource.m_Duration = StringUtils::TimeStringToSeconds(tag->m_strRuntime.c_str());
+            if (item.HasVideoInfoTag()) {
+                CVideoInfoTag *tag = (CVideoInfoTag*)item.GetVideoInfoTag();
+                PopulateObjectFromTag(*tag, *object, &file_path, &resource);
             }
-        } else if( item->IsPicture() ) {
+        } else if (item.IsPicture()) {
             object->m_ObjectClass.type = "object.item.imageItem.photo";
         } else {
             object->m_ObjectClass.type = "object.item";
         }
         
         // duration of zero is invalid
-        if(resource.m_Duration == 0) {
-          resource.m_Duration = -1;
-        }
+        if (resource.m_Duration == 0) resource.m_Duration = -1;
 
-        /* Set the resource file size */
-        resource.m_Size = (NPT_Size)item->m_dwSize;
+        // Set the resource file size
+        resource.m_Size = (NPT_Size)item.m_dwSize;
 
         // if the item is remote, add a direct link to the item
-        if( CUtil::IsRemote ( (const char*)file_path ) ) {
-            resource.m_ProtocolInfo = GetProtocolInfo(item, "");
+        if (CUtil::IsRemote((const char*)file_path)) {
+            resource.m_ProtocolInfo = CUPnPServer::GetProtocolInfo(item, "http-get"); // assumes http-get always
             resource.m_Uri = file_path;
             object->m_Resources.Add(resource);
+        } else if (upnp_server) {
+            // iterate through ip addresses and build list of resources
+            // throught http file server
+            NPT_List<NPT_String>::Iterator ip = ips.GetFirstItem();
+            while (ip) {
+                resource.m_ProtocolInfo = GetProtocolInfo(item, "http-get");
+                resource.m_Uri = BuildHttpUri(upnp_server->m_FileBaseUri, *ip, file_path);
+                object->m_Resources.Add(resource);
+                ++ip;
+            }
         }
-
-        // iterate through ip addresses and build list of resources
-        // throught http file server
-        NPT_List<NPT_String>::Iterator ip = ips.GetFirstItem();
-        while (ip) {
-            resource.m_ProtocolInfo = GetProtocolInfo(item, "http-get");
-            resource.m_Uri = BuildHttpUri(*ip, file_path);
-            object->m_Resources.Add(resource);
-
-            ++ip;
-        }
     } else {
         PLT_MediaContainer* container = new PLT_MediaContainer;
         object = container;
 
         /* Assign a title and id for this container */
-        container->m_ObjectID = item->m_strPath;
+        container->m_ObjectID = item.m_strPath;
         container->m_ObjectClass.type = "object.container";
         container->m_ChildrenCount = -1;
 
         /* this might be overkill, but hey */
-        if(item->IsMusicDb()) {
-            MUSICDATABASEDIRECTORY::NODE_TYPE node = CMusicDatabaseDirectory::GetDirectoryType(item->m_strPath);
+        if (item.IsMusicDb()) {
+            MUSICDATABASEDIRECTORY::NODE_TYPE node = CMusicDatabaseDirectory::GetDirectoryType(item.m_strPath);
             switch(node) {
                 case MUSICDATABASEDIRECTORY::NODE_TYPE_ARTIST:
                   container->m_ObjectClass.type += ".person.musicArtist";
@@ -502,8 +539,8 @@
                 default:
                   break;
             }
-        } else if(item->IsVideoDb()) {
-            VIDEODATABASEDIRECTORY::NODE_TYPE node = CVideoDatabaseDirectory::GetDirectoryType(item->m_strPath);
+        } else if (item.IsVideoDb()) {
+            VIDEODATABASEDIRECTORY::NODE_TYPE node = CVideoDatabaseDirectory::GetDirectoryType(item.m_strPath);
             switch(node) {
                 case VIDEODATABASEDIRECTORY::NODE_TYPE_GENRE:
                   container->m_ObjectClass.type += ".genre.movieGenre";
@@ -514,15 +551,15 @@
                 default:
                   break;
             }
-        } else if(item->IsPlayList()) {
+        } else if (item.IsPlayList()) {
             container->m_ObjectClass.type += ".playlistContainer";
         }
 
         /* Get the number of children for this container */
-        if (with_count) {
-            if( object->m_ObjectID.StartsWith("virtualpath://") ) {
+        if (with_count && upnp_server) {
+            if (object->m_ObjectID.StartsWith("virtualpath://")) {
                 NPT_Cardinal count = 0;
-                NPT_CHECK_LABEL(GetEntryCount(file_path, count), failure);
+                NPT_CHECK_LABEL(upnp_server->GetEntryCount(file_path, count), failure);
                 container->m_ChildrenCount = count;
             } else {
                 /* this should be a standard path */
@@ -532,25 +569,24 @@
     }
     
     // set