XBMC Media Center

Revision: 35010
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35010&view=rev
Author:   vdrfan
Date:     2010-10-25 17:19:43 +0000 (Mon, 25 Oct 2010)

Log Message:
-----------
Revert "restoring functionality broken by earlier re factor. But still remains refactored"

This reverts commit d433569c1538738ff40ebadf132bb67ab16d6d53.

Modified Paths:
--------------
    branches/Dharma/xbmc/ButtonTranslator.cpp
    branches/Dharma/xbmc/ButtonTranslator.h

Modified: branches/Dharma/xbmc/ButtonTranslator.cpp
===================================================================
--- branches/Dharma/xbmc/ButtonTranslator.cpp	2010-10-25 17:19:27 UTC (rev 35009)
+++ branches/Dharma/xbmc/ButtonTranslator.cpp	2010-10-25 17:19:43 UTC (rev 35010)
@@ -613,6 +613,8 @@
 //    CLog::Log(LOGDEBUG, "Found Joystick map for window %d using %s", windowID, it->c_str());
     it++;
   }
+
+  return;
 }
 
 bool CButtonTranslator::TranslateJoystickString(int window, const char* szDevice, int id, short inputType, int& action, CStdString& strAction, bool &fullrange)
@@ -776,15 +778,27 @@
   }
 }
 
-bool CButtonTranslator::HasDeviceType(TiXmlNode *pWindow, CStdString type)
+enum CButtonTranslator::ButtonDeviceType CButtonTranslator::GetDeviceType(TiXmlNode *pWindow)
 {
-  return pWindow->FirstChild(type) != NULL;
+  TiXmlNode *firstChild = pWindow->FirstChild();
+  if (firstChild != NULL)
+  {
+    const char *value = firstChild->Value();
+    if (value == "gamepad")
+      return Gamepad;
+    if (value == "remote")
+        return Remote;
+    if (value == "universalremote")
+        return UniversalRemote;
+    if (value == "keyboard")
+        return Keyboard;
+  }
+  return Unknown;
 }
 
 void CButtonTranslator::MapWindowActions(TiXmlNode *pWindow, int windowID)
 {
-  if (!pWindow || windowID == WINDOW_INVALID) 
-    return;
+  if (!pWindow || windowID == WINDOW_INVALID) return;
   buttonMap map;
   std::map<int, buttonMap>::iterator it = translatorMap.find(windowID);
   if (it != translatorMap.end())
@@ -793,31 +807,32 @@
     translatorMap.erase(it);
   }
   TiXmlNode* pDevice;
-
-  const char* types[] = {"gamepad", "remote", "keyboard", "universalremote", NULL};
-  for (int i = 0; types[i]; ++i)
+  ButtonDeviceType remoteType = GetDeviceType(pWindow);
+  if (remoteType != Unknown)
   {
-    CStdString type(types[i]);
-    if (HasDeviceType(pWindow, type))
+    pDevice = pWindow->FirstChild();
+    TiXmlElement *pButton = pDevice->FirstChildElement();
+    while (pButton)
     {
-      pDevice = pWindow->FirstChild(type);
-      TiXmlElement *pButton = pDevice->FirstChildElement();
-      while (pButton)
+      uint32_t buttonCode;
+      switch (remoteType)
       {
-        uint32_t buttonCode;
-        if (type == "gamepad")
-            buttonCode = TranslateGamepadString(pButton->Value());
-        else if (type == "remote")
-            buttonCode = TranslateRemoteString(pButton->Value());
-        else if (type == "universalremote")
-            buttonCode = TranslateUniversalRemoteString(pButton->Value());
-        else if (type == "keyboard")
-            buttonCode = TranslateKeyboardButton(pButton);
-
-        if (buttonCode && pButton->FirstChild())
-          MapAction(buttonCode, pButton->FirstChild()->Value(), map);
-        pButton = pButton->NextSiblingElement();
+        case Gamepad:
+          buttonCode = TranslateGamepadString(pButton->Value());
+          break;
+        case Remote:
+          buttonCode = TranslateRemoteString(pButton->Value());
+          break;
+        case UniversalRemote:
+          buttonCode = TranslateUniversalRemoteString(pButton->Value());
+          break;
+        case Keyboard:
+          buttonCode = TranslateKeyboardButton(pButton);
+          break;
       }
+      if (buttonCode && pButton->FirstChild())
+        MapAction(buttonCode, pButton->FirstChild()->Value(), map);
+      pButton = pButton->NextSiblingElement();
     }
   }
 #if defined(HAS_SDL_JOYSTICK) || defined(HAS_EVENT_SERVER)

Modified: branches/Dharma/xbmc/ButtonTranslator.h
===================================================================
--- branches/Dharma/xbmc/ButtonTranslator.h	2010-10-25 17:19:27 UTC (rev 35009)
+++ branches/Dharma/xbmc/ButtonTranslator.h	2010-10-25 17:19:43 UTC (rev 35010)
@@ -59,7 +59,15 @@
   CButtonTranslator(const CButtonTranslator&);
   CButtonTranslator const& operator=(CButtonTranslator const&);
   virtual ~CButtonTranslator();
-  bool HasDeviceType(TiXmlNode *pWindow, CStdString type);
+  enum ButtonDeviceType
+  {
+    Unknown,
+    Gamepad,
+    Remote,
+    Keyboard,
+    UniversalRemote
+  };
+  enum ButtonDeviceType GetDeviceType(TiXmlNode *pWindow);
 public:
   ///access to singleton
   static CButtonTranslator& GetInstance();


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

Revision: 35012
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35012&view=rev
Author:   vdrfan
Date:     2010-10-25 17:20:19 +0000 (Mon, 25 Oct 2010)

Log Message:
-----------
Revert "re factored: MapWindowActions less 'if'y and removed nasty assignments in if statements"

This reverts commit f3f4158a3f110885826bba6bf4aedd9b95a986b9.

Modified Paths:
--------------
    branches/Dharma/xbmc/ButtonTranslator.cpp
    branches/Dharma/xbmc/ButtonTranslator.h

Modified: branches/Dharma/xbmc/ButtonTranslator.cpp
===================================================================
--- branches/Dharma/xbmc/ButtonTranslator.cpp	2010-10-25 17:19:58 UTC (rev 35011)
+++ branches/Dharma/xbmc/ButtonTranslator.cpp	2010-10-25 17:20:19 UTC (rev 35012)
@@ -814,24 +814,6 @@
   }
 }
 
-enum CButtonTranslator::ButtonDeviceType CButtonTranslator::GetDeviceType(TiXmlNode *pWindow)
-{
-  TiXmlNode *firstChild = pWindow->FirstChild();
-  if (firstChild != NULL)
-  {
-    const char *value = firstChild->Value();
-    if (value == "gamepad")
-      return Gamepad;
-    if (value == "remote")
-        return Remote;
-    if (value == "universalremote")
-        return UniversalRemote;
-    if (value == "keyboard")
-        return Keyboard;
-  }
-  return Unknown;
-}
-
 void CButtonTranslator::MapWindowActions(TiXmlNode *pWindow, int windowID)
 {
   if (!pWindow || windowID == WINDOW_INVALID) return;
@@ -843,34 +825,50 @@
     translatorMap.erase(it);
   }
   TiXmlNode* pDevice;
-  ButtonDeviceType remoteType = GetDeviceType(pWindow);
-  if (remoteType != Unknown)
-  {
-    pDevice = pWindow->FirstChild();
+  if ((pDevice = pWindow->FirstChild("gamepad")) != NULL)
+  { // map gamepad actions
     TiXmlElement *pButton = pDevice->FirstChildElement();
     while (pButton)
     {
-      uint32_t buttonCode;
-      switch (remoteType)
-      {
-        case Gamepad:
-          buttonCode = TranslateGamepadString(pButton->Value());
-          break;
-        case Remote:
-          buttonCode = TranslateRemoteString(pButton->Value());
-          break;
-        case UniversalRemote:
-          buttonCode = TranslateUniversalRemoteString(pButton->Value());
-          break;
-        case Keyboard:
-          buttonCode = TranslateKeyboardButton(pButton);
-          break;
-      }
-      if (buttonCode && pButton->FirstChild())
+      uint32_t buttonCode = TranslateGamepadString(pButton->Value());
+      if (pButton->FirstChild())
         MapAction(buttonCode, pButton->FirstChild()->Value(), map);
       pButton = pButton->NextSiblingElement();
     }
   }
+  if ((pDevice = pWindow->FirstChild("remote")) != NULL)
+  { // map remote actions
+    TiXmlElement *pButton = pDevice->FirstChildElement();
+    while (pButton)
+    {
+      uint32_t buttonCode = TranslateRemoteString(pButton->Value());
+      if (pButton->FirstChild())
+        MapAction(buttonCode, pButton->FirstChild()->Value(), map);
+      pButton = pButton->NextSiblingElement();
+    }
+  }
+  if ((pDevice = pWindow->FirstChild("universalremote")) != NULL)
+  { // map universal remote actions
+    TiXmlElement *pButton = pDevice->FirstChildElement();
+    while (pButton)
+    {
+      uint32_t buttonCode = TranslateUniversalRemoteString(pButton->Value());
+      if (pButton->FirstChild())
+        MapAction(buttonCode, pButton->FirstChild()->Value(), map);
+      pButton = pButton->NextSiblingElement();
+    }
+  }
+  if ((pDevice = pWindow->FirstChild("keyboard")) != NULL)
+  { // map keyboard actions
+    TiXmlElement *pButton = pDevice->FirstChildElement();
+    while (pButton)
+    {
+      uint32_t buttonCode = TranslateKeyboardButton(pButton);
+      if (pButton->FirstChild())
+        MapAction(buttonCode, pButton->FirstChild()->Value(), map);
+      pButton = pButton->NextSiblingElement();
+    }
+  }
 #if defined(HAS_SDL_JOYSTICK) || defined(HAS_EVENT_SERVER)
   if ((pDevice = pWindow->FirstChild("joystick")) != NULL)
   {

Modified: branches/Dharma/xbmc/ButtonTranslator.h
===================================================================
--- branches/Dharma/xbmc/ButtonTranslator.h	2010-10-25 17:19:58 UTC (rev 35011)
+++ branches/Dharma/xbmc/ButtonTranslator.h	2010-10-25 17:20:19 UTC (rev 35012)
@@ -59,15 +59,7 @@
   CButtonTranslator(const CButtonTranslator&);
   CButtonTranslator const& operator=(CButtonTranslator const&);
   virtual ~CButtonTranslator();
-  enum ButtonDeviceType
-  {
-    Unknown,
-    Gamepad,
-    Remote,
-    Keyboard,
-    UniversalRemote
-  };
-  enum ButtonDeviceType GetDeviceType(TiXmlNode *pWindow);
+
 public:
   ///access to singleton
   static CButtonTranslator& GetInstance();


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

Revision: 35058
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35058&view=rev
Author:   theuni
Date:     2010-10-28 15:58:36 +0000 (Thu, 28 Oct 2010)

Log Message:
-----------
fixed: don't segfault on corrupt vorbiscomments in flac files

(cherry picked from commit c4cded5a6c8724369703d797c8524b8cc31d4522)

Modified Paths:
--------------
    branches/Dharma/xbmc/FlacTag.cpp
    branches/Dharma/xbmc/FlacTag.h

Modified: branches/Dharma/xbmc/FlacTag.cpp
===================================================================
--- branches/Dharma/xbmc/FlacTag.cpp	2010-10-28 15:58:29 UTC (rev 35057)
+++ branches/Dharma/xbmc/FlacTag.cpp	2010-10-28 15:58:36 UTC (rev 35058)
@@ -83,7 +83,7 @@
       {
         m_file->Read((void*)tag, size);
         // Process this tag info
-        ProcessVorbisComment(tag);
+        ProcessVorbisComment(tag,size);
         foundTag = true;
         delete[] tag;
       }
@@ -210,7 +210,7 @@
   return 0;
 }
 
-void CFlacTag::ProcessVorbisComment(const char *pBuffer)
+void CFlacTag::ProcessVorbisComment(const char *pBuffer, size_t bufsize)
 {
   unsigned int Pos = 0;      // position in the buffer
   unsigned int I1 = Endian_SwapLE32(*(unsigned int*)(pBuffer + Pos)); // length of vendor string
@@ -220,6 +220,11 @@
   char C1[CHUNK_SIZE];
   for (unsigned int I2 = 0; I2 < Count; I2++) // Run through the comments
   {
+    if (Pos >= bufsize)
+    {
+      CLog::Log(LOGWARNING,"flac tag overflow");
+      return;
+    }
     I1 = Endian_SwapLE32(*(unsigned int*)(pBuffer + Pos));   // Length of comment
     if (I1 < CHUNK_SIZE)
     {

Modified: branches/Dharma/xbmc/FlacTag.h
===================================================================
--- branches/Dharma/xbmc/FlacTag.h	2010-10-28 15:58:29 UTC (rev 35057)
+++ branches/Dharma/xbmc/FlacTag.h	2010-10-28 15:58:36 UTC (rev 35058)
@@ -41,7 +41,7 @@
 
 protected:
   XFILE::CFile* m_file;
-  void ProcessVorbisComment(const char *pBuffer);
+  void ProcessVorbisComment(const char *pBuffer, size_t bufsize);
   int ReadFlacHeader(void);    // returns the position after the STREAM_INFO metadata
   int FindFlacHeader(void);    // returns the offset in the file of the fLaC data
   unsigned int ReadUnsigned();  // reads a 32 bit unsigned int


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

Revision: 35067
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35067&view=rev
Author:   theuni
Date:     2010-10-28 20:14:05 +0000 (Thu, 28 Oct 2010)

Log Message:
-----------
changed: update version strings for beta4

Modified Paths:
--------------
    branches/Dharma/xbmc/osx/Info.plist
    branches/Dharma/xbmc/utils/GUIInfoManager.h
    branches/Dharma/xbmc/win32/XBMC_PC.rc

Modified: branches/Dharma/xbmc/osx/Info.plist
===================================================================
--- branches/Dharma/xbmc/osx/Info.plist	2010-10-28 20:11:22 UTC (rev 35066)
+++ branches/Dharma/xbmc/osx/Info.plist	2010-10-28 20:14:05 UTC (rev 35067)
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>XBMC</string>
 	<key>CFBundleGetInfoString</key>
-	<string>10.0-beta3</string>
+	<string>10.0-beta4</string>
 	<key>CFBundleIconFile</key>
 	<string>xbmc.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>10.0-beta3</string>
+	<string>10.0-beta4</string>
 	<key>CFBundleVersion</key>
 	<string>r####</string>
 	<key>CFBundleSignature</key>

Modified: branches/Dharma/xbmc/utils/GUIInfoManager.h
===================================================================
--- branches/Dharma/xbmc/utils/GUIInfoManager.h	2010-10-28 20:11:22 UTC (rev 35066)
+++ branches/Dharma/xbmc/utils/GUIInfoManager.h	2010-10-28 20:14:05 UTC (rev 35067)
@@ -431,7 +431,7 @@
 
 // Version string MUST NOT contain spaces.  It is used
 // in the HTTP request user agent.
-#define VERSION_STRING "10.0-beta3"
+#define VERSION_STRING "10.0-beta4"
 
 #define LISTITEM_START              35000
 #define LISTITEM_THUMB              (LISTITEM_START)

Modified: branches/Dharma/xbmc/win32/XBMC_PC.rc
===================================================================
--- branches/Dharma/xbmc/win32/XBMC_PC.rc	2010-10-28 20:11:22 UTC (rev 35066)
+++ branches/Dharma/xbmc/win32/XBMC_PC.rc	2010-10-28 20:14:05 UTC (rev 35067)
@@ -71,12 +71,12 @@
         BEGIN
             VALUE "CompanyName", "Team XBMC"
             VALUE "FileDescription", "XBMC"
-            VALUE "FileVersion", "10.0-beta3"
+            VALUE "FileVersion", "10.0-beta4"
             VALUE "InternalName", "XBMC.exe"
             VALUE "LegalCopyright", "Copyright (c) Team XBMC.  All rights reserved."
             VALUE "OriginalFilename", "XBMC.exe"
             VALUE "ProductName", "XBMC for Windows"
-            VALUE "ProductVersion", "10.0-beta3"
+            VALUE "ProductVersion", "10.0-beta4"
         END
     END
     BLOCK "VarFileInfo"


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

Revision: 35134
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35134&view=rev
Author:   vdrfan
Date:     2010-11-02 17:00:45 +0000 (Tue, 02 Nov 2010)

Log Message:
-----------
fixed: #10621 - "Searching..." still shown after cast results returned

(cherry picked from commit 6a77ebe39d92ea8d2753feb8ae4ec5557dc95791)

Modified Paths:
--------------
    branches/Dharma/xbmc/GUIWindowVideoBase.cpp
    branches/Dharma/xbmc/GUIWindowVideoInfo.cpp

Modified: branches/Dharma/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- branches/Dharma/xbmc/GUIWindowVideoBase.cpp	2010-11-02 17:00:28 UTC (rev 35133)
+++ branches/Dharma/xbmc/GUIWindowVideoBase.cpp	2010-11-02 17:00:45 UTC (rev 35134)
@@ -1824,6 +1824,9 @@
   CFileItemList items;
   DoSearch(strSearch, items);
 
+  if (m_dlgProgress)
+    m_dlgProgress->Close();
+
   if (items.Size())
   {
     CGUIDialogSelect* pDlgSelect = (CGUIDialogSelect*)g_windowManager.GetWindow(WINDOW_DIALOG_SELECT);
@@ -1840,25 +1843,14 @@
 
     int iItem = pDlgSelect->GetSelectedLabel();
     if (iItem < 0)
-    {
-      if (m_dlgProgress)
-        m_dlgProgress->Close();
+      return;
 
-      return ;
-    }
-
     CFileItemPtr pSelItem = items[iItem];
 
     OnSearchItemFound(pSelItem.get());
-
-    if (m_dlgProgress)
-      m_dlgProgress->Close();
   }
   else
   {
-    if (m_dlgProgress)
-      m_dlgProgress->Close();
-
     CGUIDialogOK::ShowAndGetInput(194, 284, 0, 0);
   }
 }

Modified: branches/Dharma/xbmc/GUIWindowVideoInfo.cpp
===================================================================
--- branches/Dharma/xbmc/GUIWindowVideoInfo.cpp	2010-11-02 17:00:28 UTC (rev 35133)
+++ branches/Dharma/xbmc/GUIWindowVideoInfo.cpp	2010-11-02 17:00:45 UTC (rev 35134)
@@ -461,6 +461,9 @@
   CFileItemList items;
   DoSearch(strSearch, items);
 
+  if (m_dlgProgress)
+    m_dlgProgress->Close();
+
   if (items.Size())
   {
     CGUIDialogSelect* pDlgSelect = (CGUIDialogSelect*)g_windowManager.GetWindow(WINDOW_DIALOG_SELECT);
@@ -477,21 +480,16 @@
 
     int iItem = pDlgSelect->GetSelectedLabel();
     if (iItem < 0)
-    {
-      if (m_dlgProgress) m_dlgProgress->Close();
-      return ;
-    }
+      return;
 
     CFileItem* pSelItem = new CFileItem(*items[iItem]);
 
     OnSearchItemFound(pSelItem);
 
     delete pSelItem;
-    if (m_dlgProgress) m_dlgProgress->Close();
   }
   else
   {
-    if (m_dlgProgress) m_dlgProgress->Close();
     CGUIDialogOK::ShowAndGetInput(194, 284, 0, 0);
   }
 }


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

Revision: 35183
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35183&view=rev
Author:   spiff_
Date:     2010-11-06 14:58:50 +0000 (Sat, 06 Nov 2010)

Log Message:
-----------
changed: remove broken sid (hvsc) tag loader

(cherry picked from commit f45d2d06beafde962235ffec4d0e13c0be711742)

Modified Paths:
--------------
    branches/Dharma/xbmc/Makefile.in
    branches/Dharma/xbmc/MusicInfoTagLoaderFactory.cpp
    branches/Dharma/xbmc/cores/paplayer/SIDCodec.cpp

Removed Paths:
-------------
    branches/Dharma/xbmc/MusicInfoTagLoaderSid.cpp
    branches/Dharma/xbmc/MusicInfoTagLoaderSid.h

Modified: branches/Dharma/xbmc/Makefile.in
===================================================================
--- branches/Dharma/xbmc/Makefile.in	2010-11-06 14:51:07 UTC (rev 35182)
+++ branches/Dharma/xbmc/Makefile.in	2010-11-06 14:58:50 UTC (rev 35183)
@@ -79,7 +79,6 @@
      MusicInfoTagLoaderNSF.cpp \
      MusicInfoTagLoaderOgg.cpp \
      MusicInfoTagLoaderShn.cpp \
-     MusicInfoTagLoaderSid.cpp \
      MusicInfoTagLoaderSPC.cpp \
      MusicInfoTagLoaderWav.cpp \
      MusicInfoTagLoaderWavPack.cpp \

Modified: branches/Dharma/xbmc/MusicInfoTagLoaderFactory.cpp
===================================================================
--- branches/Dharma/xbmc/MusicInfoTagLoaderFactory.cpp	2010-11-06 14:51:07 UTC (rev 35182)
+++ branches/Dharma/xbmc/MusicInfoTagLoaderFactory.cpp	2010-11-06 14:58:50 UTC (rev 35183)
@@ -30,7 +30,6 @@
 #include "MusicInfoTagLoaderApe.h"
 #include "MusicInfoTagLoaderMPC.h"
 #include "MusicInfoTagLoaderShn.h"
-#include "MusicInfoTagLoaderSid.h"
 #include "MusicInfoTagLoaderMod.h"
 #include "MusicInfoTagLoaderWav.h"
 #include "MusicInfoTagLoaderAAC.h"
@@ -121,11 +120,6 @@
     CMusicInfoTagLoaderSHN *pTagLoader = new CMusicInfoTagLoaderSHN();
     return (IMusicInfoTagLoader*)pTagLoader;
   }
-  else if (strExtension == "sid" || strExtension == "sidstream")
-  {
-    CMusicInfoTagLoaderSid *pTagLoader = new CMusicInfoTagLoaderSid();
-    return (IMusicInfoTagLoader*)pTagLoader;
-  }
 #ifdef HAS_MOD_PLAYER
   else if (ModPlayer::IsSupportedFormat(strExtension) || strExtension == "mod" || strExtension == "it" || strExtension == "s3m")
   {

Deleted: branches/Dharma/xbmc/MusicInfoTagLoaderSid.cpp
===================================================================
--- branches/Dharma/xbmc/MusicInfoTagLoaderSid.cpp	2010-11-06 14:51:07 UTC (rev 35182)
+++ branches/Dharma/xbmc/MusicInfoTagLoaderSid.cpp	2010-11-06 14:58:50 UTC (rev 35183)
@@ -1,243 +0,0 @@
-/*
- *      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 "MusicInfoTagLoaderSid.h"
-#include "utils/RegExp.h"
-#include "utils/log.h"
-#include "Util.h"
-#include "MusicInfoTag.h"
-#include "Settings.h"
-#include "FileSystem/SpecialProtocol.h"
-
-#include <cstring>
-
-#include <fstream>
-
-using namespace std;
-using namespace MUSIC_INFO;
-
-CMusicInfoTagLoaderSid::CMusicInfoTagLoaderSid(void)
-{
-}
-
-CMusicInfoTagLoaderSid::~CMusicInfoTagLoaderSid()
-{
-}
-
-bool CMusicInfoTagLoaderSid::Load(const CStdString& strFileName, CMusicInfoTag& tag)
-{
-  CStdString strFileToLoad = strFileName;
-  int iTrack = 0;
-  CStdString strExtension;
-  CUtil::GetExtension(strFileName,strExtension);
-  strExtension.MakeLower();
-  if (strExtension==".sidstream")
-  {
-    //  Extract the track to play
-    CStdString strFile=CUtil::GetFileName(strFileName);
-    int iStart=strFile.ReverseFind("-")+1;
-    iTrack = atoi(strFile.substr(iStart, strFile.size()-iStart-10).c_str());
-    //  The directory we are in, is the file
-    //  that contains the bitstream to play,
-    //  so extract it
-    CStdString strPath=strFileName;
-    CUtil::GetDirectory(strPath, strFileToLoad);
-    CUtil::RemoveSlashAtEnd(strFileToLoad);   // we want the filename
-  }
-  CStdString strFileNameLower(strFileToLoad);
-  strFileNameLower.MakeLower();
-  int iHVSC = strFileNameLower.find("hvsc"); // need hvsc in path name since our lookupfile is based on hvsc paths
-  if (iHVSC < 0)
-  {
-    iHVSC = strFileNameLower.find("c64music");
-    if (iHVSC >= 0)
-      iHVSC += 8;
-  }
-  else
-    iHVSC += 4;
-  if( iHVSC < 0 )
-  {
-    tag.SetLoaded(false);
-    return( false );
-  }
-
-  CStdString strHVSCpath = strFileToLoad.substr(iHVSC,strFileToLoad.length()-1);
-
-  strHVSCpath.Replace('\\','/'); // unix paths
-  strHVSCpath.MakeLower();
-
-  char temp[8192];
-  CRegExp reg;
-  if (!reg.RegComp("TITLE: ([^\r\n]*)\r?\n[^A]*ARTIST: ([^\r\n]*)\r?\n"))
-  {
-    CLog::Log(LOGINFO,"MusicInfoTagLoaderSid::Load(..): failed to compile regular expression");
-    tag.SetLoaded(false);
-    return( false );
-  }
-
-  ifstream f(_P(CUtil::AddFileToFolder(g_settings.GetDatabaseFolder(), "stil.txt")).c_str()); // changeme?
-  if( !f.good() ) {
-    CLog::Log(LOGINFO,"MusicInfoTagLoaderSid::Load(..) unable to locate stil.txt");
-    tag.SetLoaded(false);
-    return( false );
-  }
-
-  const char* szStart = NULL;
-  const char* szEnd = NULL;
-  char temp2[8191];
-  char* temp3 = temp2;
-  while( !f.eof() && !szEnd )
-  {
-    f.read(temp,8191);
-    CStdString strLower = temp;
-    strLower.MakeLower();
-
-    if (!szStart)
-      szStart= (char *)strstr(strLower.c_str(),strHVSCpath.c_str());
-    if (szStart)
-    {
-      szEnd = strstr(szStart+strHVSCpath.size(),".sid");
-      if (szEnd)
-      {
-        memcpy(temp3,temp+(szStart-strLower.c_str()),szEnd-szStart);
-        temp3 += szEnd-szStart;
-      }
-      else
-      {
-        memcpy(temp3,temp+(szStart-strLower.c_str()),strlen(szStart));
-        szStart = NULL;
-        temp3 += strlen(szStart);
-      }
-    }
-  }
-  f.close();
-
-  if (!f.eof() && szEnd)
-  {
-    temp2[temp3-temp2] = '\0';
-    temp3 = strstr(temp2,"TITLE:");
-  }
-  else
-    temp3 = NULL;
-  if (temp3)
-  {
-    for (int i=0;i<iTrack-1;++i) // skip tracks
-    {
-      int iStart = reg.RegFind(temp3);
-      if (!iStart)
-      {
-        tag.SetLoaded(false);
-        return false;
-      }
-      temp3 += iStart;
-    }
-    if(reg.RegFind(temp3) > -1)
-    {
-      char* szTitle = reg.GetReplaceString("\\1");
-      char* szArtist = reg.GetReplaceString("\\2");
-      char* szMins = NULL;
-      char* szSecs = NULL;
-      CRegExp reg2;
-      reg2.RegComp("(.*) \\(([0-9]*):([0-9]*)\\)");
-      if (reg2.RegFind(szTitle) > -1)
-      {
-        szMins = reg2.GetReplaceString("\\2");
-        szSecs = reg2.GetReplaceString("\\3");
-        char* szTemp = reg2.GetReplaceString("\\1");
-        free(szTitle);
-        szTitle = szTemp;
-      }
-      tag.SetLoaded(true);
-      tag.SetURL(strFileToLoad);
-      tag.SetTrackNumber(iTrack);
-      if (szMins && szSecs)
-        tag.SetDuration(atoi(szMins)*60+atoi(szSecs));
-
-      tag.SetTitle(szTitle);
-      tag.SetArtist(szArtist);
-      free(szTitle);
-      free(szArtist);
-      free(szMins);
-      free(szSecs);
-    }
-  }
-
-  ifstream f2(_P(CUtil::AddFileToFolder(g_settings.GetDatabaseFolder(),"sidlist.csv")).c_str()); // changeme?
-  if( !f2.good() ) {
-    CLog::Log(LOGINFO,"MusicInfoTagLoaderSid::Load(..) unable to locate sidlist.csv");
-    tag.SetLoaded(false);
-    return( false );
-  }
-
-  while( !f2.eof() ) {
-    f2.getline(temp,8191);
-    CStdString strTemp(temp);
-    strTemp.MakeLower();
-    int iFind = strTemp.Find(strHVSCpath);
-    if (iFind < 0)
-      continue;
-
-    char temp2[1024];
-    char temp3[1024];
-    strncpy(temp3,temp+iFind,strlen(strHVSCpath));
-    temp3[strlen(strHVSCpath)] = '\0';
-    sprintf(temp2,"\"%s\",\"[^\"]*\",\"[^\"]*\",\"([^\"]*)\",\"([^\"]*)\",\"([0-9]*)[^\"]*\",\"[0-9]*\",\"[0-9]*\",\"",temp3);
-    for (int i=0;i<iTrack-1;++i)
-      strcat(temp2,"[0-9]*:[0-9]* ");
-    strcat(temp2,"([0-9]*):([0-9]*)");
-    if( !reg.RegComp(temp2) )
-    {
-      CLog::Log(LOGINFO,"MusicInfoTagLoaderSid::Load(..): failed to compile regular expression");
-      tag.SetLoaded(false);
-      return( false );
-    }
-    if( reg.RegFind(temp) >= 0 ) {
-      char* szTitle = reg.GetReplaceString("\\1");
-      char* szArtist = reg.GetReplaceString("\\2");
-      char* szYear = reg.GetReplaceString("\\3");
-      char* szMins = reg.GetReplaceString("\\4");
-      char* szSecs = reg.GetReplaceString("\\5");
-      tag.SetLoaded(true);
-      tag.SetTrackNumber(iTrack);
-      if (tag.GetDuration() == 0)
-        tag.SetDuration(atoi(szMins)*60+atoi(szSecs));
-      if (tag.GetTitle() == "")
-        tag.SetTitle(szTitle);
-      if (tag.GetArtist() == "")
-        tag.SetArtist(szArtist);
-      SYSTEMTIME dateTime;
-      dateTime.wYear = atoi(szYear);
-      tag.SetReleaseDate(dateTime);
-      free(szTitle);
-      free(szArtist);
-      free(szYear);
-      free(szMins);
-      free(szSecs);
-      f2.close();
-      return( true );
-    }
-  }
-
-  f2.close();
-  tag.SetLoaded(false);
-  return( false );
-}
-

Deleted: branches/Dharma/xbmc/MusicInfoTagLoaderSid.h
===================================================================
--- branches/Dharma/xbmc/MusicInfoTagLoaderSid.h	2010-11-06 14:51:07 UTC (rev 35182)
+++ branches/Dharma/xbmc/MusicInfoTagLoaderSid.h	2010-11-06 14:58:50 UTC (rev 35183)
@@ -1,36 +0,0 @@
-#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
- *
- */
-
-#include "ImusicInfoTagLoader.h"
-
-namespace MUSIC_INFO
-{
-  class CMusicInfoTagLoaderSid: public IMusicInfoTagLoader
-  {
-    public:
-      CMusicInfoTagLoaderSid(void);
-      virtual ~CMusicInfoTagLoaderSid();
-
-      virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag);
-  };
-}
-

Modified: branches/Dharma/xbmc/cores/paplayer/SIDCodec.cpp
===================================================================
--- branches/Dharma/xbmc/cores/paplayer/SIDCodec.cpp	2010-11-06 14:51:07 UTC (rev 35182)
+++ branches/Dharma/xbmc/cores/paplayer/SIDCodec.cpp	2010-11-06 14:58:50 UTC (rev 35183)
@@ -22,8 +22,6 @@
 #include "SIDCodec.h"
 #include "cores/DllLoader/DllLoader.h"
 #include "Util.h"
-#include "MusicInfoTagLoaderSid.h"
-#include "MusicInfoTag.h"
 #include "FileItem.h"
 #include "utils/log.h"
 
@@ -78,17 +76,7 @@
   m_Channels = 1;
   m_SampleRate = 48000;
   m_BitsPerSample = 16;
-  CMusicInfoTagLoaderSid tagLoader;
-  CMusicInfoTag tag;
-  CFileItem item(strFile);
-  if (tagLoader.Load(strFile,tag))
-  {
-    m_TotalTime = tag.GetDuration()*1000;
-    if (m_TotalTime == 0)
-      m_TotalTime = 4*60*1000;
-  }
-  else
-    m_TotalTime = 4*60*1000;
+  m_TotalTime = 4*60*1000;
 
   return true;
 }


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

Revision: 35206
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35206&view=rev
Author:   vdrfan
Date:     2010-11-08 15:26:26 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
fixed: #10652 - add-ons not fully sorted by name

(cherry picked from commit 802a6132d1f75800c4d58331e537c3369168571d)

Modified Paths:
--------------
    branches/Dharma/xbmc/GUIViewState.cpp
    branches/Dharma/xbmc/GUIViewStateAddonBrowser.cpp

Modified: branches/Dharma/xbmc/GUIViewState.cpp
===================================================================
--- branches/Dharma/xbmc/GUIViewState.cpp	2010-11-08 15:26:06 UTC (rev 35205)
+++ branches/Dharma/xbmc/GUIViewState.cpp	2010-11-08 15:26:26 UTC (rev 35206)
@@ -57,6 +57,9 @@
 
   const CURL url=items.GetAsUrl();
 
+  if (items.IsAddonsPath())
+    return new CGUIViewStateAddonBrowser(items);
+
   if (items.HasSortDetails())
     return new CGUIViewStateFromItems(items);
 

Modified: branches/Dharma/xbmc/GUIViewStateAddonBrowser.cpp
===================================================================
--- branches/Dharma/xbmc/GUIViewStateAddonBrowser.cpp	2010-11-08 15:26:06 UTC (rev 35205)
+++ branches/Dharma/xbmc/GUIViewStateAddonBrowser.cpp	2010-11-08 15:26:26 UTC (rev 35206)
@@ -35,9 +35,9 @@
 
 CGUIViewStateAddonBrowser::CGUIViewStateAddonBrowser(const CFileItemList& items) : CGUIViewState(items)
 {
-  AddSortMethod(SORT_METHOD_LABEL, 551, LABEL_MASKS("%L", "%I", "%L", ""));  // Filename, Size | Foldername, empty
+  AddSortMethod(SORT_METHOD_LABEL_IGNORE_FOLDERS, 551, LABEL_MASKS("%L", "%I", "%L", ""));  // Filename, Size | Foldername, empty
   AddSortMethod(SORT_METHOD_DATE, 552, LABEL_MASKS("%L", "%J", "%L", "%J"));  // Filename, Date | Foldername, Date
-  SetSortMethod(SORT_METHOD_LABEL);
+  SetSortMethod(SORT_METHOD_LABEL_IGNORE_FOLDERS);
 
   SetViewAsControl(DEFAULT_VIEW_LIST);
 


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

Revision: 35209
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35209&view=rev
Author:   spiff_
Date:     2010-11-08 20:04:03 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
fixed: ticket #10666 - inconsistent behaviour of 'Album info' button

(cherry picked from commit 4effdc2c009efc90e058b8fd00c887c35e937f89)

Modified Paths:
--------------
    branches/Dharma/xbmc/GUIDialogSongInfo.cpp
    branches/Dharma/xbmc/GUIDialogSongInfo.h

Modified: branches/Dharma/xbmc/GUIDialogSongInfo.cpp
===================================================================
--- branches/Dharma/xbmc/GUIDialogSongInfo.cpp	2010-11-08 20:02:05 UTC (rev 35208)
+++ branches/Dharma/xbmc/GUIDialogSongInfo.cpp	2010-11-08 20:04:03 UTC (rev 35209)
@@ -37,6 +37,7 @@
 #include "GUISettings.h"
 #include "LocalizeStrings.h"
 #include "TextureCache.h"
+#include "Album.h"
 
 using namespace XFILE;
 
@@ -106,7 +107,7 @@
         if (window)
         {
           CFileItem item(*m_song);
-          CUtil::GetDirectory(m_song->m_strPath,item.m_strPath);
+          item.m_strPath.Format("musicdb://3/%li",m_albumId);
           item.m_bIsFolder = true;
           window->OnInfo(&item, true);
         }
@@ -146,10 +147,23 @@
 
 void CGUIDialogSongInfo::OnInitWindow()
 {
+  CMusicDatabase db;
+  db.Open();
+
+  // no known db info - check if parent dir is an album
   if (m_song->GetMusicInfoTag()->GetDatabaseId() == -1)
-    CONTROL_DISABLE(CONTROL_ALBUMINFO);
+  {
+    CStdString path;
+    CUtil::GetDirectory(m_song->m_strPath,path);
+    m_albumId = db.GetAlbumIdByPath(path);
+  }
   else
-    CONTROL_ENABLE(CONTROL_ALBUMINFO);
+  {
+    CAlbum album;
+    db.GetAlbumFromSong(m_song->GetMusicInfoTag()->GetDatabaseId(),album);
+    m_albumId = album.idAlbum;
+  }
+  CONTROL_ENABLE_ON_CONDITION(CONTROL_ALBUMINFO, m_albumId > -1);
 
   CGUIDialog::OnInitWindow();
 }

Modified: branches/Dharma/xbmc/GUIDialogSongInfo.h
===================================================================
--- branches/Dharma/xbmc/GUIDialogSongInfo.h	2010-11-08 20:02:05 UTC (rev 35208)
+++ branches/Dharma/xbmc/GUIDialogSongInfo.h	2010-11-08 20:04:03 UTC (rev 35209)
@@ -48,4 +48,5 @@
   char m_startRating;
   bool m_cancelled;
   bool m_needsUpdate;
+  long m_albumId;
 };


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

Revision: 35218
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35218&view=rev
Author:   spiff_
Date:     2010-11-08 22:41:02 +0000 (Mon, 08 Nov 2010)

Log Message:
-----------
added: use dedicated icons for the add-on categories

Modified Paths:
--------------
    branches/Dharma/xbmc/FileSystem/AddonsDirectory.cpp
    branches/Dharma/xbmc/addons/Addon.cpp
    branches/Dharma/xbmc/addons/Addon.h

Modified: branches/Dharma/xbmc/FileSystem/AddonsDirectory.cpp
===================================================================
--- branches/Dharma/xbmc/FileSystem/AddonsDirectory.cpp	2010-11-08 22:38:25 UTC (rev 35217)
+++ branches/Dharma/xbmc/FileSystem/AddonsDirectory.cpp	2010-11-08 22:41:02 UTC (rev 35218)
@@ -29,6 +29,7 @@
 #include "addons/Repository.h"
 #include "addons/PluginSource.h"
 #include "StringUtils.h"
+#include "TextureManager.h"
 #include "File.h"
 
 using namespace ADDON;
@@ -116,6 +117,9 @@
             CFileItemPtr item(new CFileItem(TranslateType((TYPE)i,true)));
             item->m_strPath = CUtil::AddFileToFolder(strPath,TranslateType((TYPE)i,false));
             item->m_bIsFolder = true;
+            CStdString thumb = GetIcon((TYPE)i);
+            if (!thumb.IsEmpty() && g_TextureManager.HasTexture(thumb))
+              item->SetThumbnailImage(thumb);
             items.Add(item);
             break;
           }

Modified: branches/Dharma/xbmc/addons/Addon.cpp
===================================================================
--- branches/Dharma/xbmc/addons/Addon.cpp	2010-11-08 22:38:25 UTC (rev 35217)
+++ branches/Dharma/xbmc/addons/Addon.cpp	2010-11-08 22:41:02 UTC (rev 35218)
@@ -125,34 +125,35 @@
   const char* name;
   TYPE        type;
   int         pretty;
+  const char* icon;
 } TypeMapping;
 
 static const TypeMapping types[] =
-  {{"unknown",                           ADDON_UNKNOWN,                 0 },
-   {"xbmc.metadata.scraper.albums",      ADDON_SCRAPER_ALBUMS,      24016 },
-   {"xbmc.metadata.scraper.artists",     ADDON_SCRAPER_ARTISTS,     24017 },
-   {"xbmc.metadata.scraper.movies",      ADDON_SCRAPER_MOVIES,      24007 },
-   {"xbmc.metadata.scraper.musicvideos", ADDON_SCRAPER_MUSICVIDEOS, 24015 },
-   {"xbmc.metadata.scraper.tvshows",     ADDON_SCRAPER_TVSHOWS,     24014 },
-   {"xbmc.metadata.scraper.library",     ADDON_SCRAPER_LIBRARY,         0 },
-   {"xbmc.ui.screensaver",               ADDON_SCREENSAVER,         24008 },
-   {"xbmc.player.musicviz",              ADDON_VIZ,                 24010 },
-   {"visualization-library",             ADDON_VIZ_LIBRARY,             0 },
-   {"xbmc.python.pluginsource",          ADDON_PLUGIN,              24005 },
-   {"xbmc.python.script",                ADDON_SCRIPT,              24009 },
-   {"xbmc.python.weather",               ADDON_SCRIPT_WEATHER,      24027 },
-   {"xbmc.python.subtitles",             ADDON_SCRIPT_SUBTITLES,    24012 },
-   {"xbmc.python.lyrics",                ADDON_SCRIPT_LYRICS,       24013 },
-   {"xbmc.python.library",               ADDON_SCRIPT_LIBRARY,      24014 },
-   {"xbmc.python.module",                ADDON_SCRIPT_MODULE,           0 },
-   {"xbmc.gui.skin",                     ADDON_SKIN,                  166 },
-   {"xbmc.gui.webinterface",             ADDON_WEB_INTERFACE,         199 },
-   {"xbmc.addon.repository",             ADDON_REPOSITORY,          24011 },
-   {"pvrclient",                         ADDON_PVRDLL,                  0 },
-   {"xbmc.addon.video",                  ADDON_VIDEO,                1037 },
-   {"xbmc.addon.audio",                  ADDON_AUDIO,                1038 },
-   {"xbmc.addon.image",                  ADDON_IMAGE,                1039 },
-   {"xbmc.addon.executable",             ADDON_EXECUTABLE,           1043 }};
+  {{"unknown",                           ADDON_UNKNOWN,                 0, "" },
+   {"xbmc.metadata.scraper.albums",      ADDON_SCRAPER_ALBUMS,      24016, "DefaultAddonAlbumInfo.png" },
+   {"xbmc.metadata.scraper.artists",     ADDON_SCRAPER_ARTISTS,     24017, "DefaultAddonArtistInfo.png" },
+   {"xbmc.metadata.scraper.movies",      ADDON_SCRAPER_MOVIES,      24007, "DefaultAddonMovieInfo.png" },
+   {"xbmc.metadata.scraper.musicvideos", ADDON_SCRAPER_MUSICVIDEOS, 24015, "DefaultAddonMusicVideoInfo.png" },
+   {"xbmc.metadata.scraper.tvshows",     ADDON_SCRAPER_TVSHOWS,     24014, "DefaultAddonTvInfo.png" },
+   {"xbmc.metadata.scraper.library",     ADDON_SCRAPER_LIBRARY,         0, "" },
+   {"xbmc.ui.screensaver",               ADDON_SCREENSAVER,         24008, "DefaultAddonScreensaver.png" },
+   {"xbmc.player.musicviz",              ADDON_VIZ,                 24010, "DefaultAddonVisualization.png" },
+   {"visualization-library",             ADDON_VIZ_LIBRARY,             0, "" },
+   {"xbmc.python.pluginsource",          ADDON_PLUGIN,              24005, "" },
+   {"xbmc.python.script",                ADDON_SCRIPT,              24009, "" },
+   {"xbmc.python.weather",               ADDON_SCRIPT_WEATHER,      24027, "DefaultAddonWeather.png" },
+   {"xbmc.python.subtitles",             ADDON_SCRIPT_SUBTITLES,    24012, "DefaultAddonSubtitles.png" },
+   {"xbmc.python.lyrics",                ADDON_SCRIPT_LYRICS,       24013, "DefaultAddonLyrics.png" },
+   {"xbmc.python.library",               ADDON_SCRIPT_LIBRARY,      24014, "" },
+   {"xbmc.python.module",                ADDON_SCRIPT_MODULE,           0, "" },
+   {"xbmc.gui.skin",                     ADDON_SKIN,                  166, "DefaultAddonSkin.png" },
+   {"xbmc.gui.webinterface",             ADDON_WEB_INTERFACE,         199, "DefaultAddonWebSkin.png" },
+   {"xbmc.addon.repository",             ADDON_REPOSITORY,          24011, "DefaultAddonRepository.png" },
+   {"pvrclient",                         ADDON_PVRDLL,                  0, "" },
+   {"xbmc.addon.video",                  ADDON_VIDEO,                1037, "DefaultAddonVideo.png" },
+   {"xbmc.addon.audio",                  ADDON_AUDIO,                1038, "DefaultAddonMusic.png" },
+   {"xbmc.addon.image",                  ADDON_IMAGE,                1039, "DefaultAddonPicture.png" },
+   {"xbmc.addon.executable",             ADDON_EXECUTABLE,           1043, "DefaultAddonProgram.png" }};
 
 const CStdString TranslateType(const ADDON::TYPE &type, bool pretty/*=false*/)
 {
@@ -181,6 +182,17 @@
   return ADDON_UNKNOWN;
 }
 
+const CStdString GetIcon(const ADDON::TYPE& type)
+{
+  for (unsigned int index=0; index < sizeof(types)/sizeof(types[0]); ++index)
+  {
+    const TypeMapping &map = types[index];
+    if (type == map.type)
+      return map.icon;
+  }
+  return "";
+}
+
 /**
  * AddonVersion
  *

Modified: branches/Dharma/xbmc/addons/Addon.h
===================================================================
--- branches/Dharma/xbmc/addons/Addon.h	2010-11-08 22:38:25 UTC (rev 35217)
+++ branches/Dharma/xbmc/addons/Addon.h	2010-11-08 22:41:02 UTC (rev 35218)
@@ -40,6 +40,7 @@
 
 // utils
 const CStdString    TranslateType(const TYPE &type, bool pretty=false);
+const CStdString    GetIcon(const TYPE &type);
 const TYPE          TranslateType(const CStdString &string);
 const CStdString    UpdateVideoScraper(const CStdString &scraper);
 const CStdString    UpdateMusicScraper(const CStdString &scraper);


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

Revision: 35230
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35230&view=rev
Author:   spiff_
Date:     2010-11-09 19:06:47 +0000 (Tue, 09 Nov 2010)

Log Message:
-----------
added: use the dedicated icons for the add-on folders in the media windows

Modified Paths:
--------------
    branches/Dharma/xbmc/GUIViewState.cpp
    branches/Dharma/xbmc/GUIViewState.h
    branches/Dharma/xbmc/GUIViewStateMusic.cpp
    branches/Dharma/xbmc/GUIViewStatePictures.cpp
    branches/Dharma/xbmc/GUIViewStatePrograms.cpp
    branches/Dharma/xbmc/GUIViewStateVideo.cpp

Modified: branches/Dharma/xbmc/GUIViewState.cpp
===================================================================
--- branches/Dharma/xbmc/GUIViewState.cpp	2010-11-09 19:05:35 UTC (rev 35229)
+++ branches/Dharma/xbmc/GUIViewState.cpp	2010-11-09 19:06:47 UTC (rev 35230)
@@ -41,6 +41,7 @@
 #include "FileItem.h"
 #include "Key.h"
 #include "FileSystem/AddonsDirectory.h"
+#include "TextureManager.h"
 
 using namespace std;
 
@@ -341,7 +342,7 @@
   return m_sources;
 }
 
-void CGUIViewState::AddAddonsSource(const CStdString &content, const CStdString &label)
+void CGUIViewState::AddAddonsSource(const CStdString &content, const CStdString &label, const CStdString &thumb)
 {
   if (!g_advancedSettings.m_bVirtualShares)
     return;
@@ -352,7 +353,8 @@
     CMediaSource source;
     source.strPath = "addons://sources/" + content + "/";    
     source.strName = label;
-    source.m_strThumbnailImage = "";
+    if (!thumb.IsEmpty() && g_TextureManager.HasTexture(thumb))
+      source.m_strThumbnailImage = thumb;
     source.m_iDriveType = CMediaSource::SOURCE_TYPE_REMOTE;
     source.m_ignore = true;
     m_sources.push_back(source);

Modified: branches/Dharma/xbmc/GUIViewState.h
===================================================================
--- branches/Dharma/xbmc/GUIViewState.h	2010-11-09 19:05:35 UTC (rev 35229)
+++ branches/Dharma/xbmc/GUIViewState.h	2010-11-09 19:06:47 UTC (rev 35230)
@@ -70,8 +70,9 @@
   /*! \brief Add the addons source for the given content type, if the user has suitable addons
    \param content the type of addon content desired
    \param label the name of the addons source
+   \param thumb the skin image to use as the icon
    */
-  void AddAddonsSource(const CStdString &content, const CStdString &label);
+  void AddAddonsSource(const CStdString &content, const CStdString &label, const CStdString& thumb);
 
   void AddSortMethod(SORT_METHOD sortMethod, int buttonLabel, LABEL_MASKS labelmasks);
   void SetSortMethod(SORT_METHOD sortMethod);

Modified: branches/Dharma/xbmc/GUIViewStateMusic.cpp
===================================================================
--- branches/Dharma/xbmc/GUIViewStateMusic.cpp	2010-11-09 19:05:35 UTC (rev 35229)
+++ branches/Dharma/xbmc/GUIViewStateMusic.cpp	2010-11-09 19:06:47 UTC (rev 35230)
@@ -63,7 +63,7 @@
 
 VECSOURCES& CGUIViewStateWindowMusic::GetSources()
 {
-  AddAddonsSource("audio", g_localizeStrings.Get(1038));
+  AddAddonsSource("audio", g_localizeStrings.Get(1038), "DefaultAddonMusic.png");
   return CGUIViewState::GetSources();
 }
 

Modified: branches/Dharma/xbmc/GUIViewStatePictures.cpp
===================================================================
--- branches/Dharma/xbmc/GUIViewStatePictures.cpp	2010-11-09 19:05:35 UTC (rev 35229)
+++ branches/Dharma/xbmc/GUIViewStatePictures.cpp	2010-11-09 19:06:47 UTC (rev 35230)
@@ -81,7 +81,7 @@
 
 VECSOURCES& CGUIViewStateWindowPictures::GetSources()
 {
-  AddAddonsSource("image", g_localizeStrings.Get(1039));
+  AddAddonsSource("image", g_localizeStrings.Get(1039), "DefaultAddonPicture.png");
   AddOrReplace(g_settings.m_pictureSources, CGUIViewState::GetSources());
   return g_settings.m_pictureSources;
 }

Modified: branches/Dharma/xbmc/GUIViewStatePrograms.cpp
===================================================================
--- branches/Dharma/xbmc/GUIViewStatePrograms.cpp	2010-11-09 19:05:35 UTC (rev 35229)
+++ branches/Dharma/xbmc/GUIViewStatePrograms.cpp	2010-11-09 19:06:47 UTC (rev 35230)
@@ -65,7 +65,7 @@
 
 VECSOURCES& CGUIViewStateWindowPrograms::GetSources()
 {
-  AddAddonsSource("executable", g_localizeStrings.Get(1043));
+  AddAddonsSource("executable", g_localizeStrings.Get(1043), "DefaultAddonProgram.png");
   AddOrReplace(g_settings.m_programSources,CGUIViewState::GetSources());
   return g_settings.m_programSources;
 }

Modified: branches/Dharma/xbmc/GUIViewStateVideo.cpp
===================================================================
--- branches/Dharma/xbmc/GUIViewStateVideo.cpp	2010-11-09 19:05:35 UTC (rev 35229)
+++ branches/Dharma/xbmc/GUIViewStateVideo.cpp	2010-11-09 19:06:47 UTC (rev 35230)
@@ -53,7 +53,7 @@
 
 VECSOURCES& CGUIViewStateWindowVideo::GetSources()
 {
-  AddAddonsSource("video", g_localizeStrings.Get(1037));
+  AddAddonsSource("video", g_localizeStrings.Get(1037), "DefaultAddonVideo.png");
   return CGUIViewState::GetSources();
 }
 


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

Revision: 35244
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35244&view=rev
Author:   spiff_
Date:     2010-11-10 18:57:28 +0000 (Wed, 10 Nov 2010)

Log Message:
-----------
added: possibility to tune the message time for toast dialogs (the minimal time before we jump to the next message in the queue)

(cherry picked from commit cbb4e106feda411aa235843ac1edf94e7a01d623)

Modified Paths:
--------------
    branches/Dharma/xbmc/GUIDialogKaiToast.cpp
    branches/Dharma/xbmc/GUIDialogKaiToast.h

Modified: branches/Dharma/xbmc/GUIDialogKaiToast.cpp
===================================================================
--- branches/Dharma/xbmc/GUIDialogKaiToast.cpp	2010-11-10 18:49:39 UTC (rev 35243)
+++ branches/Dharma/xbmc/GUIDialogKaiToast.cpp	2010-11-10 18:57:28 UTC (rev 35244)
@@ -72,7 +72,7 @@
     m_defaultIcon = image->GetFileName();
 }
 
-void CGUIDialogKaiToast::QueueNotification(eMessageType eType, const CStdString& aCaption, const CStdString& aDescription, unsigned int displayTime /*= TOAST_DISPLAY_TIME*/, bool withSound /*= true*/)
+void CGUIDialogKaiToast::QueueNotification(eMessageType eType, const CStdString& aCaption, const CStdString& aDescription, unsigned int displayTime /*= TOAST_DISPLAY_TIME*/, bool withSound /*= true*/, unsigned int messageTime /*= TOAST_MESSAGE_TIME*/)
 {
   CGUIImage *image    = NULL;
 
@@ -87,7 +87,7 @@
   if (image)
     strImage = image->GetFileName();
 
-  QueueNotification(strImage, aCaption, aDescription, displayTime, withSound);
+  QueueNotification(strImage, aCaption, aDescription, displayTime, withSound, messageTime);
 }
 
 void CGUIDialogKaiToast::QueueNotification(const CStdString& aCaption, const CStdString& aDescription)
@@ -95,7 +95,7 @@
   QueueNotification("", aCaption, aDescription);
 }
 
-void CGUIDialogKaiToast::QueueNotification(const CStdString& aImageFile, const CStdString& aCaption, const CStdString& aDescription, unsigned int displayTime /*= TOAST_DISPLAY_TIME*/, bool withSound /*= true*/)
+void CGUIDialogKaiToast::QueueNotification(const CStdString& aImageFile, const CStdString& aCaption, const CStdString& aDescription, unsigned int displayTime /*= TOAST_DISPLAY_TIME*/, bool withSound /*= true*/, unsigned int messageTime /*= TOAST_MESSAGE_TIME*/)
 {
   CSingleLock lock(m_critical);
 
@@ -104,6 +104,7 @@
   toast.caption = aCaption;
   toast.description = aDescription;
   toast.displayTime = displayTime > TOAST_MESSAGE_TIME + 500 ? displayTime : TOAST_MESSAGE_TIME + 500;
+  toast.messageTime = messageTime;
   toast.withSound = withSound;
 
   m_notifications.push(toast);
@@ -114,13 +115,14 @@
   CSingleLock lock(m_critical);
 
   if (m_notifications.size() > 0 &&
-      CTimeUtils::GetFrameTime() - m_timer > TOAST_MESSAGE_TIME)
+      CTimeUtils::GetFrameTime() - m_timer > m_toastMessageTime)
   {
     Notification toast = m_notifications.front();
     m_notifications.pop();
     lock.Leave();
 
     m_toastDisplayTime = toast.displayTime;
+    m_toastMessageTime = toast.messageTime;
 
     CSingleLock lock2(g_graphicsContext);
 

Modified: branches/Dharma/xbmc/GUIDialogKaiToast.h
===================================================================
--- branches/Dharma/xbmc/GUIDialogKaiToast.h	2010-11-10 18:49:39 UTC (rev 35243)
+++ branches/Dharma/xbmc/GUIDialogKaiToast.h	2010-11-10 18:57:28 UTC (rev 35244)
@@ -40,14 +40,15 @@
     CStdString description;
     CStdString imagefile;
     unsigned int displayTime;
+    unsigned int messageTime;
     bool withSound;
   };
 
   enum eMessageType { Info = 0, Warning, Error };
 
-  void QueueNotification(eMessageType eType, const CStdString& aCaption, const CStdString& aDescription, unsigned int displayTime = TOAST_DISPLAY_TIME, bool withSound = true);
+  void QueueNotification(eMessageType eType, const CStdString& aCaption, const CStdString& aDescription, unsigned int displayTime = TOAST_DISPLAY_TIME, bool withSound = true, unsigned int messageTime = TOAST_MESSAGE_TIME);
   void QueueNotification(const CStdString& aCaption, const CStdString& aDescription);
-  void QueueNotification(const CStdString& aImageFile, const CStdString& aCaption, const CStdString& aDescription, unsigned int displayTime = TOAST_DISPLAY_TIME, bool withSound = true);
+  void QueueNotification(const CStdString& aImageFile, const CStdString& aCaption, const CStdString& aDescription, unsigned int displayTime = TOAST_DISPLAY_TIME, bool withSound = true, unsigned int messageTime = TOAST_MESSAGE_TIME);
   bool DoWork();
 
   virtual bool OnMessage(CGUIMessage& message);
@@ -60,6 +61,7 @@
   unsigned int m_timer;
 
   unsigned int m_toastDisplayTime;
+  unsigned int m_toastMessageTime;
 
   CStdString m_defaultIcon;
 


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

Revision: 35245
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35245&view=rev
Author:   spiff_
Date:     2010-11-10 18:59:25 +0000 (Wed, 10 Nov 2010)

Log Message:
-----------
fixed: ticket #10141 - Minimum time for Add-on update notification

(cherry picked from commit f876ff853534ce1400a5e2786c4419484e704156)

Modified Paths:
--------------
    branches/Dharma/xbmc/GUIWindowAddonBrowser.cpp
    branches/Dharma/xbmc/addons/Repository.cpp

Modified: branches/Dharma/xbmc/GUIWindowAddonBrowser.cpp
===================================================================
--- branches/Dharma/xbmc/GUIWindowAddonBrowser.cpp	2010-11-10 18:57:28 UTC (rev 35244)
+++ branches/Dharma/xbmc/GUIWindowAddonBrowser.cpp	2010-11-10 18:59:25 UTC (rev 35245)
@@ -365,7 +365,8 @@
                                                   addon->Icon(),
                                                   addon->Name(),
                                                   g_localizeStrings.Get(24065),
-                                                  TOAST_DISPLAY_TIME,false);
+                                                  TOAST_DISPLAY_TIME,false,
+                                                  TOAST_DISPLAY_TIME);
             }
             else
             {
@@ -376,7 +377,8 @@
                                                    addon->Icon(),
                                                    addon->Name(),
                                                    g_localizeStrings.Get(24064),
-                                                   TOAST_DISPLAY_TIME,false);
+                                                   TOAST_DISPLAY_TIME,false,
+                                                   TOAST_DISPLAY_TIME);
             }
           }
           else

Modified: branches/Dharma/xbmc/addons/Repository.cpp
===================================================================
--- branches/Dharma/xbmc/addons/Repository.cpp	2010-11-10 18:57:28 UTC (rev 35244)
+++ branches/Dharma/xbmc/addons/Repository.cpp	2010-11-10 18:59:25 UTC (rev 35245)
@@ -204,7 +204,7 @@
       {
         g_application.m_guiDialogKaiToast.QueueNotification(addon->Icon(),
                                                             g_localizeStrings.Get(24061),
-                                                            addon->Name(),TOAST_DISPLAY_TIME,false);
+                                                            addon->Name(),TOAST_DISPLAY_TIME,false,TOAST_DISPLAY_TIME);
       }
     }
     if (!addons[i]->Props().broken.IsEmpty())


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

Revision: 35320
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35320&view=rev
Author:   jmarshallnz
Date:     2010-11-18 01:13:03 +0000 (Thu, 18 Nov 2010)

Log Message:
-----------
changed: Make OnAssignContent and OnUnassignContent static

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

Modified: branches/Dharma/xbmc/GUIWindowVideoBase.h
===================================================================
--- branches/Dharma/xbmc/GUIWindowVideoBase.h	2010-11-18 01:12:34 UTC (rev 35319)
+++ branches/Dharma/xbmc/GUIWindowVideoBase.h	2010-11-18 01:13:03 UTC (rev 35320)
@@ -71,8 +71,6 @@
   virtual void GetContextButtons(int itemNumber, CContextButtons &buttons);
   void GetNonContextButtons(int itemNumber, CContextButtons &buttons);
   virtual bool OnContextButton(int itemNumber, CONTEXT_BUTTON button);
-  virtual void OnAssignContent(int iItem, int iFound, ADDON::ScraperPtr& scraper, VIDEO::SScanSettings& settings) {};
-  virtual void OnUnAssignContent(int iItem) {};
   virtual void OnQueueItem(int iItem);
   virtual void OnDeleteItem(CFileItemPtr pItem);
   virtual void OnDeleteItem(int iItem);

Modified: branches/Dharma/xbmc/GUIWindowVideoFiles.cpp
===================================================================
--- branches/Dharma/xbmc/GUIWindowVideoFiles.cpp	2010-11-18 01:12:34 UTC (rev 35319)
+++ branches/Dharma/xbmc/GUIWindowVideoFiles.cpp	2010-11-18 01:13:03 UTC (rev 35320)
@@ -279,12 +279,15 @@
   }
 }
 
-bool CGUIWindowVideoFiles::OnUnAssignContent(int iItem, int label1, int label2, int label3)
+bool CGUIWindowVideoFiles::OnUnAssignContent(const CStdString &path, int label1, int label2, int label3)
 {
   bool bCanceled;
+  CVideoDatabase db;
+  db.Open();
   if (CGUIDialogYesNo::ShowAndGetInput(label1,label2,label3,20022,bCanceled))
   {
-    m_database.RemoveContentForPath(m_vecItems->Get(iItem)->m_strPath,m_dlgProgress);
+    db.RemoveContentForPath(path);
+    db.Close();
     CUtil::DeleteVideoDatabaseDirectoryCache();
     return true;
   }
@@ -295,20 +298,22 @@
       ADDON::ScraperPtr info;
       SScanSettings settings;
       settings.exclude = true;
-      m_database.SetScraperForPath(m_vecItems->Get(iItem)->m_strPath,info,settings);
+      db.SetScraperForPath(path,info,settings);
     }
   }
+  db.Close();
 
   return false;
 }
 
-void CGUIWindowVideoFiles::OnAssignContent(int iItem, int iFound, ADDON::ScraperPtr& info, SScanSettings& settings)
+void CGUIWindowVideoFiles::OnAssignContent(const CStdString &path, int iFound, ADDON::ScraperPtr& info, SScanSettings& settings)
 {
-  CFileItemPtr item = m_vecItems->Get(iItem);
   bool bScan=false;
+  CVideoDatabase db;
+  db.Open();
   if (iFound == 0)
   {
-    info = m_database.GetScraperForPath(item->m_strPath, settings);
+    info = db.GetScraperForPath(path, settings);
   }
 
   ADDON::ScraperPtr info2(info);
@@ -317,21 +322,21 @@
   {
     if(settings.exclude || !info)
     {
-      OnUnAssignContent(iItem,20375,20340,20341);
+      OnUnAssignContent(path,20375,20340,20341);
     }
     else if (info2)
     {
-      if (OnUnAssignContent(iItem,20442,20443,20444))
+      if (OnUnAssignContent(path,20442,20443,20444))
         bScan = true;
     }
 
-    m_database.Open();
-    m_database.SetScraperForPath(item->m_strPath,info,settings);
-    m_database.Close();
+    db.SetScraperForPath(path,info,settings);
 
     if (bScan)
     {
-      OnScan(item->m_strPath, true);
+      CGUIDialogVideoScan* pDialog = (CGUIDialogVideoScan*)g_windowManager.GetWindow(WINDOW_DIALOG_VIDEO_SCAN);
+      if (pDialog)
+        pDialog->StartScanning(path, true);
     }
   }
 }
@@ -519,7 +524,7 @@
       //TODO should we search DB for entries from plugins?
       if (button == CONTEXT_BUTTON_REMOVE_SOURCE && !item->IsPlugin())
       {
-          OnUnAssignContent(itemNumber,20375,20340,20341);
+        OnUnAssignContent(item->m_strPath,20375,20340,20341);
       }
       Update("");
       return true;
@@ -536,7 +541,7 @@
     {
       SScanSettings settings;
       ADDON::ScraperPtr info = m_database.GetScraperForPath(item->HasVideoInfoTag() ? item->GetVideoInfoTag()->m_strPath : item->m_strPath, settings);
-      OnAssignContent(itemNumber,0, info, settings);
+      OnAssignContent(item->m_strPath,0, info, settings);
       return true;
     }
 

Modified: branches/Dharma/xbmc/GUIWindowVideoFiles.h
===================================================================
--- branches/Dharma/xbmc/GUIWindowVideoFiles.h	2010-11-18 01:12:34 UTC (rev 35319)
+++ branches/Dharma/xbmc/GUIWindowVideoFiles.h	2010-11-18 01:13:03 UTC (rev 35320)
@@ -37,6 +37,10 @@
   virtual bool OnAction(const CAction &action);
 
   void GetStackedDirectory(const CStdString &strPath, CFileItemList &items);
+
+  static void OnAssignContent(const CStdString &path, int iFound, ADDON::ScraperPtr& scraper, VIDEO::SScanSettings& settings);
+  static bool OnUnAssignContent(const CStdString &path, int label1, int label2, int label3);
+
 protected:
   virtual bool GetDirectory(const CStdString &strDirectory, CFileItemList &items);
   virtual bool OnPlayMedia(int iItem);
@@ -48,8 +52,6 @@
   virtual CStdString GetStartFolder(const CStdString &dir);
 
   virtual void OnQueueItem(int iItem);
-  virtual void OnAssignContent(int iItem, int iFound, ADDON::ScraperPtr& scraper, VIDEO::SScanSettings& settings);
-  virtual bool OnUnAssignContent(int iItem, int label1, int label2, int label3);
 
   virtual void LoadPlayList(const CStdString& strFileName);
   void PlayFolder(const CFileItem* pItem);


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

Revision: 35486
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35486&view=rev
Author:   theuni
Date:     2010-11-27 17:46:35 +0000 (Sat, 27 Nov 2010)

Log Message:
-----------
Revert "changed: revert r31212 as a bandaid solution for cross fade issues with shoutcast (ticket #10373). real solution is to get rid of libshout"

Reverts Dharma r34297
This reverts commit 75f92dc223491e2c92a146da387f60bcdfad1ac0.

Modified Paths:
--------------
    branches/Dharma/xbmc/FileItem.cpp
    branches/Dharma/xbmc/FileItem.h
    branches/Dharma/xbmc/FileSystem/VirtualDirectory.cpp
    branches/Dharma/xbmc/GUIWindowMusicBase.cpp
    branches/Dharma/xbmc/GUIWindowMusicNav.cpp
    branches/Dharma/xbmc/GUIWindowMusicPlaylist.cpp
    branches/Dharma/xbmc/GUIWindowMusicSongs.cpp
    branches/Dharma/xbmc/MusicInfoScanner.cpp
    branches/Dharma/xbmc/PlayListPlayer.cpp
    branches/Dharma/xbmc/Util.cpp
    branches/Dharma/xbmc/Util.h
    branches/Dharma/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp
    branches/Dharma/xbmc/cores/paplayer/PAPlayer.cpp

Modified: branches/Dharma/xbmc/FileItem.cpp
===================================================================
--- branches/Dharma/xbmc/FileItem.cpp	2010-11-27 16:16:23 UTC (rev 35485)
+++ branches/Dharma/xbmc/FileItem.cpp	2010-11-27 17:46:35 UTC (rev 35486)
@@ -500,7 +500,6 @@
   if (HasVideoInfoTag()) return false;
   if (HasPictureInfoTag()) return false;
   if (IsCDDA()) return true;
-  if (!m_bIsFolder && IsShoutCast()) return true;
   if (!m_bIsFolder && IsLastFM()) return true;
 
   CStdString extension;
@@ -527,7 +526,7 @@
 
 bool CFileItem::IsKaraoke() const
 {
-  if ( !IsAudio() || IsLastFM() || IsShoutCast())
+  if ( !IsAudio() || IsLastFM())
     return false;
 
   return CKaraokeLyricsFactory::HasLyrics( m_strPath );
@@ -555,11 +554,6 @@
   return CUtil::GetExtension(m_strPath).Equals(".cue", false);
 }
 
-bool CFileItem::IsShoutCast() const
-{
-  return CUtil::IsShoutCast(m_strPath);
-}
-
 bool CFileItem::IsLastFM() const
 {
   return CUtil::IsLastFM(m_strPath);
@@ -584,8 +578,7 @@
     IsType(".ogg") ||
     IsType(".nsf") ||
     IsType(".sid") ||
-    IsType(".sap") ||
-    IsShoutCast()
+    IsType(".sap")
     );
 }
 

Modified: branches/Dharma/xbmc/FileItem.h
===================================================================
--- branches/Dharma/xbmc/FileItem.h	2010-11-27 16:16:23 UTC (rev 35485)
+++ branches/Dharma/xbmc/FileItem.h	2010-11-27 17:46:35 UTC (rev 35486)
@@ -89,7 +89,6 @@
   bool IsAudio() const;
   bool IsKaraoke() const;
   bool IsCUESheet() const;
-  bool IsShoutCast() const;
   bool IsLastFM() const;
   bool IsInternetStream() const;
   bool IsPlayList() const;

Modified: branches/Dharma/xbmc/FileSystem/VirtualDirectory.cpp
===================================================================
--- branches/Dharma/xbmc/FileSystem/VirtualDirectory.cpp	2010-11-27 16:16:23 UTC (rev 35485)
+++ branches/Dharma/xbmc/FileSystem/VirtualDirectory.cpp	2010-11-27 17:46:35 UTC (rev 35486)
@@ -94,7 +94,7 @@
   {
     CMediaSource& share = shares[i];
     CFileItemPtr pItem(new CFileItem(share));
-    if (pItem->IsLastFM() || pItem->IsShoutCast() || (pItem->m_strPath.Left(14).Equals("musicsearch://")))
+    if (pItem->IsLastFM() || (pItem->m_strPath.Left(14).Equals("musicsearch://")))
       pItem->SetCanQueue(false);
     CStdString strPathUpper = pItem->m_strPath;
     strPathUpper.ToUpper();
@@ -112,7 +112,6 @@
     else if (pItem->m_strPath.Left(9) == "addons://")
       strIcon = "DefaultHardDisk.png";
     else if (pItem->IsLastFM()
-          || pItem->IsShoutCast()
           || pItem->IsVideoDb()
           || pItem->IsMusicDb()
           || pItem->IsPlugin()

Modified: branches/Dharma/xbmc/GUIWindowMusicBase.cpp
===================================================================
--- branches/Dharma/xbmc/GUIWindowMusicBase.cpp	2010-11-27 16:16:23 UTC (rev 35485)
+++ branches/Dharma/xbmc/GUIWindowMusicBase.cpp	2010-11-27 17:46:35 UTC (rev 35486)
@@ -906,7 +906,7 @@
 
         if (item->IsSmartPlayList() || m_vecItems->IsSmartPlayList())
           buttons.Add(CONTEXT_BUTTON_EDIT_SMART_PLAYLIST, 586);
-        else if ((item->IsPlayList() || m_vecItems->IsPlayList()) && !item->IsShoutCast())
+        else if (item->IsPlayList() || m_vecItems->IsPlayList())
           buttons.Add(CONTEXT_BUTTON_EDIT, 586);
       }
     }

Modified: branches/Dharma/xbmc/GUIWindowMusicNav.cpp
===================================================================
--- branches/Dharma/xbmc/GUIWindowMusicNav.cpp	2010-11-27 16:16:23 UTC (rev 35485)
+++ branches/Dharma/xbmc/GUIWindowMusicNav.cpp	2010-11-27 17:46:35 UTC (rev 35486)
@@ -423,7 +423,7 @@
     CMusicDatabaseDirectory dir;
     // enable music info button on an album or on a song.
     if (item->IsAudio() && !item->IsPlayList() && !item->IsSmartPlayList() &&
-       !item->IsLastFM() && !item->IsShoutCast() && !item->m_bIsFolder)
+       !item->IsLastFM() && !item->m_bIsFolder)
     {
       buttons.Add(CONTEXT_BUTTON_SONG_INFO, 658);
     }
@@ -442,7 +442,7 @@
     else if (!inPlaylists && (dir.HasAlbumInfo(item->m_strPath)||
                               dir.IsArtistDir(item->m_strPath)   )      &&
              !dir.IsAllItem(item->m_strPath) && !item->IsParentFolder() &&
-             !item->IsLastFM() && !item->IsShoutCast()                  &&
+             !item->IsLastFM()                                          &&
              !item->m_strPath.Left(14).Equals("musicsearch://"))
     {
       if (dir.IsArtistDir(item->m_strPath))
@@ -454,7 +454,7 @@
     // enable query all albums button only in album view
     if (dir.HasAlbumInfo(item->m_strPath) && !dir.IsAllItem(item->m_strPath) &&
         item->m_bIsFolder && !item->IsVideoDb() && !item->IsParentFolder()   &&
-       !item->IsLastFM() &&  !item->IsShoutCast()                            &&
+       !item->IsLastFM()                                                     &&
        !item->IsPlugin() && !item->m_strPath.Left(14).Equals("musicsearch://"))
     {
       buttons.Add(CONTEXT_BUTTON_INFO_ALL, 20059);
@@ -513,7 +513,7 @@
       if (database.GetMatchingMusicVideo(item->GetMusicInfoTag()->GetArtist(),item->GetMusicInfoTag()->GetAlbum(),item->GetMusicInfoTag()->GetTitle()) > -1)
         buttons.Add(CONTEXT_BUTTON_PLAY_OTHER, 20401);
     }
-    if (item->HasVideoInfoTag() && !item->m_bIsFolder && !item->IsShoutCast())
+    if (item->HasVideoInfoTag() && !item->m_bIsFolder)
     {
       if (item->GetVideoInfoTag()->m_playCount > 0)
         buttons.Add(CONTEXT_BUTTON_MARK_UNWATCHED, 16104); //Mark as UnWatched

Modified: branches/Dharma/xbmc/GUIWindowMusicPlaylist.cpp
===================================================================
--- branches/Dharma/xbmc/GUIWindowMusicPlaylist.cpp	2010-11-27 16:16:23 UTC (rev 35485)
+++ branches/Dharma/xbmc/GUIWindowMusicPlaylist.cpp	2010-11-27 17:46:35 UTC (rev 35486)
@@ -527,7 +527,7 @@
     }
     else
     { // aren't in a move
-      if (!item->IsLastFM() && !item->IsShoutCast())
+      if (!item->IsLastFM())
         buttons.Add(CONTEXT_BUTTON_SONG_INFO, 658); // Song Info
       if (CFavourites::IsFavourite(item.get(), GetID()))
         buttons.Add(CONTEXT_BUTTON_ADD_FAVOURITE, 14077);     // Remove Favourite

Modified: branches/Dharma/xbmc/GUIWindowMusicSongs.cpp
===================================================================
--- branches/Dharma/xbmc/GUIWindowMusicSongs.cpp	2010-11-27 16:16:23 UTC (rev 35485)
+++ branches/Dharma/xbmc/GUIWindowMusicSongs.cpp	2010-11-27 17:46:35 UTC (rev 35486)
@@ -255,7 +255,7 @@
   }
 
   // Disable scan button if shoutcast
-  if (m_vecItems->IsVirtualDirectoryRoot() || m_vecItems->IsShoutCast() ||
+  if (m_vecItems->IsVirtualDirectoryRoot() ||
       m_vecItems->IsLastFM() || m_vecItems->IsMusicDb())
   {
     CONTROL_DISABLE(CONTROL_BTNSCAN);
@@ -316,9 +316,9 @@
         return;
       if (!item->IsPlayList())
       {
-        if (item->IsAudio() && !item->IsLastFM() && !item->IsShoutCast())
+        if (item->IsAudio() && !item->IsLastFM())
           buttons.Add(CONTEXT_BUTTON_SONG_INFO, 658); // Song Info
-        else if (!item->IsParentFolder() && !item->IsLastFM() && !item->IsShoutCast() &&
+        else if (!item->IsParentFolder() && !item->IsLastFM() &&
                  !item->m_strPath.Left(3).Equals("new") && item->m_bIsFolder)
         {
 #if 0
@@ -364,7 +364,7 @@
       if (pScanDlg->IsScanning())
         buttons.Add(CONTEXT_BUTTON_STOP_SCANNING, 13353); // Stop Scanning
       else if (!inPlaylists && !m_vecItems->IsInternetStream()           &&
-               !item->IsLastFM() && !item->IsShoutCast()                 &&
+               !item->IsLastFM()                                         &&
                !item->m_strPath.Equals("add") && !item->IsParentFolder() &&
                !item->IsPlugin()                                         &&
               (g_settings.GetCurrentProfile().canWriteDatabases() || g_passwordManager.bMasterUser))

Modified: branches/Dharma/xbmc/MusicInfoScanner.cpp
===================================================================
--- branches/Dharma/xbmc/MusicInfoScanner.cpp	2010-11-27 16:16:23 UTC (rev 35485)
+++ branches/Dharma/xbmc/MusicInfoScanner.cpp	2010-11-27 17:46:35 UTC (rev 35486)
@@ -447,7 +447,7 @@
       continue;
 
     // dont try reading id3tags for folders, playlists or shoutcast streams
-    if (!pItem->m_bIsFolder && !pItem->IsPlayList() && !pItem->IsShoutCast() && !pItem->IsPicture() && !pItem->IsLyrics() )
+    if (!pItem->m_bIsFolder && !pItem->IsPlayList() && !pItem->IsPicture() && !pItem->IsLyrics() )
     {
       m_currentItem++;
 //      CLog::Log(LOGDEBUG, "%s - Reading tag for: %s", __FUNCTION__, pItem->m_strPath.c_str());

Modified: branches/Dharma/xbmc/PlayListPlayer.cpp
===================================================================
--- branches/Dharma/xbmc/PlayListPlayer.cpp	2010-11-27 16:16:23 UTC (rev 35485)
+++ branches/Dharma/xbmc/PlayListPlayer.cpp	2010-11-27 17:46:35 UTC (rev 35486)
@@ -169,13 +169,8 @@
   }
 
   if (bAutoPlay)
-  {
     CFileItemPtr item = playlist[iSong];
-    if ( item->IsShoutCast() )
-    {
-      return ;
-    }
-  }
+
   Play(iSong, bAutoPlay);
   if (iSong < playlist.size())
   {
@@ -326,20 +321,6 @@
   m_failedSongsStart = 0;
   m_bPlaybackStarted = true;
   m_bPlayedFirstFile = true;
-
-  if (!item->IsShoutCast())
-  {
-    if (iPreviousSong < 0)
-    {
-      CGUIMessage msg(GUI_MSG_PLAYLISTPLAYER_STARTED, 0, 0, m_iCurrentPlayList, m_iCurrentSong, item);
-      g_windowManager.SendThreadMessage( msg );
-    }
-    else
-    {
-      CGUIMessage msg(GUI_MSG_PLAYLISTPLAYER_CHANGED, 0, 0, m_iCurrentPlayList, MAKELONG(m_iCurrentSong, iPreviousSong), item);
-      g_windowManager.SendThreadMessage(msg);
-    }
-  }
 }
 
 void CPlayListPlayer::SetCurrentSong(int iSong)

Modified: branches/Dharma/xbmc/Util.cpp
===================================================================
--- branches/Dharma/xbmc/Util.cpp	2010-11-27 16:16:23 UTC (rev 35485)
+++ branches/Dharma/xbmc/Util.cpp	2010-11-27 17:46:35 UTC (rev 35486)
@@ -1181,11 +1181,6 @@
   return strFile.Left(8).Equals("videodb:");
 }
 
-bool CUtil::IsShoutCast(const CStdString& strFile)
-{
-  return strFile.Left(6).Equals("shout:");
-}
-
 bool CUtil::IsLastFM(const CStdString& strFile)
 {
   return strFile.Left(7).Equals("lastfm:");

Modified: branches/Dharma/xbmc/Util.h
===================================================================
--- branches/Dharma/xbmc/Util.h	2010-11-27 16:16:23 UTC (rev 35485)
+++ branches/Dharma/xbmc/Util.h	2010-11-27 17:46:35 UTC (rev 35486)
@@ -108,7 +108,6 @@
   static bool IsLiveTV(const CStdString& strFile);
   static bool IsMusicDb(const CStdString& strFile);
   static bool IsVideoDb(const CStdString& strFile);
-  static bool IsShoutCast(const CStdString& strFile);
   static bool IsLastFM(const CStdString& strFile);
   static bool ExcludeFileOrFolder(const CStdString& strFileOrFolder, const CStdStringArray& regexps);
   static void GetFileAndProtocol(const CStdString& strURL, CStdString& strDir);

Modified: branches/Dharma/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp
===================================================================
--- branches/Dharma/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp	2010-11-27 16:16:23 UTC (rev 35485)
+++ branches/Dharma/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp	2010-11-27 17:46:35 UTC (rev 35486)
@@ -91,13 +91,6 @@
     return new CDVDInputStreamMMS();
 #endif
 
-  //else if (item.IsShoutCast())
-  //  /* this should be replaced with standard file as soon as ffmpeg can handle raw aac */
-  //  /* currently ffmpeg isn't able to detect that */
-  //  return (new CDVDInputStreamHttp());
-  //else if (item.IsInternetStream() )
-  //  return (new CDVDInputStreamHttp());
-
   // our file interface handles all these types of streams
   return (new CDVDInputStreamFile());
 }

Modified: branches/Dharma/xbmc/cores/paplayer/PAPlayer.cpp
===================================================================
--- branches/Dharma/xbmc/cores/paplayer/PAPlayer.cpp	2010-11-27 16:16:23 UTC (rev 35485)
+++ branches/Dharma/xbmc/cores/paplayer/PAPlayer.cpp	2010-11-27 17:46:35 UTC (rev 35486)
@@ -120,7 +120,7 @@
 
   m_crossFading = g_guiSettings.GetInt("musicplayer.crossfade");
   //WASAPI doesn't support multiple streams, no crossfading for cdda, cd-reading goes mad and no crossfading for last.fm doesn't like two connections
-  if (file.IsCDDA() || file.IsLastFM() || file.IsShoutCast() || g_guiSettings.GetString("audiooutput.audiodevice").find("wasapi:") != CStdString::npos) m_crossFading = 0;
+  if (file.IsCDDA() || file.IsLastFM() || g_guiSettings.GetString("audiooutput.audiodevice").find("wasapi:") != CStdString::npos) m_crossFading = 0;
   if (m_crossFading && IsPlaying())
   {
     //do a short crossfade on trackskip


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

Revision: 35495
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35495&view=rev
Author:   theuni
Date:     2010-11-27 19:54:03 +0000 (Sat, 27 Nov 2010)

Log Message:
-----------
Squashed 3 commits: Add a setting to disable ipv6. ipv6 enabled by default

fixed: Disable ipv6 for libcurl. It is known to cause long timeouts with some hardware in linux.

(cherry picked from commit 837b8662d6fd3b8003863e842fa3a06b1587fb72)

[changed] on second thought, this probably only breaks for a tiny set of users. Let's enable ipv6 by default and let affected users disable.

(cherry picked from commit eb64b9c978476f0eedbdeb719e3fabf7034abd99)

fixed build

(cherry picked from commit 91982515b4b94a0a53576b315398031e034d6266)

Modified Paths:
--------------
    branches/Dharma/xbmc/AdvancedSettings.cpp
    branches/Dharma/xbmc/AdvancedSettings.h
    branches/Dharma/xbmc/FileSystem/FileCurl.cpp

Modified: branches/Dharma/xbmc/AdvancedSettings.cpp
===================================================================
--- branches/Dharma/xbmc/AdvancedSettings.cpp	2010-11-27 19:44:50 UTC (rev 35494)
+++ branches/Dharma/xbmc/AdvancedSettings.cpp	2010-11-27 19:54:03 UTC (rev 35495)
@@ -235,6 +235,8 @@
   m_curlconnecttimeout = 10;
   m_curllowspeedtime = 20;
   m_curlretries = 2;
+  m_curlDisableIPV6 = false;      //Certain hardware/OS combinations have trouble
+                                  //with ipv6.
 
   m_fullScreen = m_startFullScreen = false;
 
@@ -496,6 +498,7 @@
     XMLUtils::GetInt(pElement, "curlclienttimeout", m_curlconnecttimeout, 1, 1000);
     XMLUtils::GetInt(pElement, "curllowspeedtime", m_curllowspeedtime, 1, 1000);
     XMLUtils::GetInt(pElement, "curlretries", m_curlretries, 0, 10);
+    XMLUtils::GetBoolean(pElement,"disableipv6", m_curlDisableIPV6);
   }
 
   pElement = pRootElement->FirstChildElement("samba");

Modified: branches/Dharma/xbmc/AdvancedSettings.h
===================================================================
--- branches/Dharma/xbmc/AdvancedSettings.h	2010-11-27 19:44:50 UTC (rev 35494)
+++ branches/Dharma/xbmc/AdvancedSettings.h	2010-11-27 19:54:03 UTC (rev 35495)
@@ -232,6 +232,7 @@
     int m_curlconnecttimeout;
     int m_curllowspeedtime;
     int m_curlretries;
+    bool m_curlDisableIPV6;
 
     bool m_fullScreen;
     bool m_startFullScreen;

Modified: branches/Dharma/xbmc/FileSystem/FileCurl.cpp
===================================================================
--- branches/Dharma/xbmc/FileSystem/FileCurl.cpp	2010-11-27 19:44:50 UTC (rev 35494)
+++ branches/Dharma/xbmc/FileSystem/FileCurl.cpp	2010-11-27 19:54:03 UTC (rev 35495)
@@ -492,6 +492,9 @@
   else
     SetRequestHeader("Connection", "keep-alive");
 
+  if (g_advancedSettings.m_curlDisableIPV6)
+    g_curlInterface.easy_setopt(h, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
+
   if (m_proxy.length() > 0)
   {
     g_curlInterface.easy_setopt(h, CURLOPT_PROXY, m_proxy.c_str());


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

Revision: 35550
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35550&view=rev
Author:   jmarshallnz
Date:     2010-11-30 19:05:13 +0000 (Tue, 30 Nov 2010)

Log Message:
-----------
merged: r35543,r35544,r35548 from trunk
fixed: #10643 - can't add local folders to "favourites" menu on win32. (cherry picked from commit 69dad5c7907b0e1f5b2eb0837b1aad0387f83a4f)
added: unit tests for Paramify() and SplitExecFunction() (cherry picked from commit 3f1b0b45194e9c9cd5f39a7cf9791a943c4d81a6)
changed: Simplify the escape character tracking in SplitExecFunction (cherry picked from commit 1a740e14b491968a54a11f5ec630e9ee2c68446f)

Modified Paths:
--------------
    branches/Dharma/xbmc/Favourites.cpp
    branches/Dharma/xbmc/Favourites.h
    branches/Dharma/xbmc/Util.cpp
    branches/Dharma/xbmc/Util.h

Modified: branches/Dharma/xbmc/Favourites.cpp
===================================================================
--- branches/Dharma/xbmc/Favourites.cpp	2010-11-30 18:59:39 UTC (rev 35549)
+++ branches/Dharma/xbmc/Favourites.cpp	2010-11-30 19:05:13 UTC (rev 35550)
@@ -152,10 +152,20 @@
 static CStdString Paramify(const CStdString& param)
 {
   CStdString result(param);
+  result.Replace("\\", "\\\\");
   result.Replace("\"", "\\\"");
   return "\"" + result + "\"";
 }
 
+#ifdef UNIT_TESTING
+bool CFavourites::TestParamify()
+{
+  return (Paramify("test") == "\"test\"" &&
+          Paramify("test\"foo\"test") == "\"test\\\"foo\\\"test\"" &&
+          Paramify("C:\\foo\\bar\\") == "\"C:\\\\foo\\\\bar\\\\\"");
+}
+#endif
+
 CStdString CFavourites::GetExecutePath(const CFileItem *item, int contextWindow)
 {
   CStdString execute;

Modified: branches/Dharma/xbmc/Favourites.h
===================================================================
--- branches/Dharma/xbmc/Favourites.h	2010-11-30 18:59:39 UTC (rev 35549)
+++ branches/Dharma/xbmc/Favourites.h	2010-11-30 19:05:13 UTC (rev 35550)
@@ -33,6 +33,10 @@
   static bool Save(const CFileItemList& items);
   static bool IsFavourite(CFileItem *item, int contextWindow);
 
+#ifdef UNIT_TESTING
+  static bool TestParamify();
+#endif
+
 private:
   static CStdString GetExecutePath(const CFileItem *item, int contextWindow);
 };

Modified: branches/Dharma/xbmc/Util.cpp
===================================================================
--- branches/Dharma/xbmc/Util.cpp	2010-11-30 18:59:39 UTC (rev 35549)
+++ branches/Dharma/xbmc/Util.cpp	2010-11-30 19:05:13 UTC (rev 35550)
@@ -2452,6 +2452,28 @@
   return CUtil::GetExtension(g_guiSettings.GetString("subtitles.font")).Equals(".ttf");
 }
 
+#ifdef UNIT_TESTING
+bool CUtil::TestSplitExec()
+{
+  CStdString function;
+  vector<CStdString> params;
+  CUtil::SplitExecFunction("ActivateWindow(Video, \"C:\\test\\foo\")", function, params);
+  if (function != "ActivateWindow" || params.size() != 2 || params[0] != "Video" || params[1] != "C:\\test\\foo")
+    return false;
+  params.clear();
+  CUtil::SplitExecFunction("ActivateWindow(Video, \"C:\\test\\foo\\\")", function, params);
+  if (function != "ActivateWindow" || params.size() != 2 || params[0] != "Video" || params[1] != "C:\\test\\foo\"")
+    return false;
+  CUtil::SplitExecFunction("ActivateWindow(Video, \"C:\\\\test\\\\foo\\\\\")", function, params);
+  if (function != "ActivateWindow" || params.size() != 2 || params[0] != "Video" || params[1] != "C:\\test\\foo\\")
+    return false;
+  CUtil::SplitExecFunction("ActivateWindow(Video, \"C:\\\\\\\\test\\\\\\foo\\\\\")", function, params);
+  if (function != "ActivateWindow" || params.size() != 2 || params[0] != "Video" || params[1] != "C:\\\\test\\\\foo\\")
+    return false;
+  return true;
+}
+#endif
+
 void CUtil::SplitExecFunction(const CStdString &execString, CStdString &function, vector<CStdString> &parameters)
 {
   CStdString paramString;
@@ -2473,6 +2495,7 @@
 
   // now split up our parameters - we may have quotes to deal with as well as brackets and whitespace
   bool inQuotes = false;
+  bool lastEscaped = false; // only every second character can be escaped
   int inFunction = 0;
   size_t whiteSpacePos = 0;
   CStdString parameter;
@@ -2480,7 +2503,8 @@
   for (size_t pos = 0; pos < paramString.size(); pos++)
   {
     char ch = paramString[pos];
-    bool escaped = (pos > 0 && paramString[pos - 1] == '\\');
+    bool escaped = (pos > 0 && paramString[pos - 1] == '\\' && !lastEscaped);
+    lastEscaped = escaped;
     if (inQuotes)
     { // if we're in a quote, we accept everything until the closing quote
       if (ch == '\"' && !escaped)
@@ -2514,8 +2538,8 @@
         continue;
       }
     }
-    if (ch == '\"' && escaped)
-    { // escape quote
+    if ((ch == '\"' || ch == '\\') && escaped)
+    { // escaped quote or backslash
       parameter[parameter.size()-1] = ch;
       continue;
     }

Modified: branches/Dharma/xbmc/Util.h
===================================================================
--- branches/Dharma/xbmc/Util.h	2010-11-30 18:59:39 UTC (rev 35549)
+++ branches/Dharma/xbmc/Util.h	2010-11-30 19:05:13 UTC (rev 35550)
@@ -206,6 +206,10 @@
   static CStdString GetCachedAlbumThumb(const CStdString &album, const CStdString &artist);
   static CStdString GetDefaultFolderThumb(const CStdString &folderThumb);
 
+#ifdef UNIT_TESTING
+  static bool TestSplitExec();
+#endif
+
   static void InitRandomSeed();
 
   // Get decimal integer representation of roman digit, ivxlcdm are valid


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

Revision: 35551
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35551&view=rev
Author:   jmarshallnz
Date:     2010-11-30 19:05:54 +0000 (Tue, 30 Nov 2010)

Log Message:
-----------
merged: r35545,r35546 from trunk:
added: [osx] Cocoa_ShowCursor to complement Cocoa_HideCursor (cherry picked from commit 1762b2e9e8fa8ff59bbf222d2a99cbbe2dc2e99b)
fixed: Ensure the mouse cursor is really hidden when in fullscreen (and that it comes back again when not).  Ideally this can be cleaned up once we move away from SDL (cherry picked from commit ed432147a55fd8b4057824e716cadd5302e90fb5)

Modified Paths:
--------------
    branches/Dharma/xbmc/Application.cpp
    branches/Dharma/xbmc/WinEventsSDL.cpp
    branches/Dharma/xbmc/osx/CocoaInterface.h
    branches/Dharma/xbmc/osx/CocoaInterface.mm

Modified: branches/Dharma/xbmc/Application.cpp
===================================================================
--- branches/Dharma/xbmc/Application.cpp	2010-11-30 19:05:13 UTC (rev 35550)
+++ branches/Dharma/xbmc/Application.cpp	2010-11-30 19:05:54 UTC (rev 35551)
@@ -4685,6 +4685,16 @@
 {
   g_powerManager.ProcessEvents();
 
+#if defined(__APPLE__)
+  // There is an issue on OS X that several system services ask the cursor to become visible
+  // during their startup routines.  Given that we can't control this, we hack it in by
+  // forcing the
+  if (g_Windowing.IsFullScreen())
+  { // SDL thinks it's hidden
+    Cocoa_HideMouse();
+  }
+#endif
+
   // Store our file state for use on close()
   UpdateFileState();
 

Modified: branches/Dharma/xbmc/WinEventsSDL.cpp
===================================================================
--- branches/Dharma/xbmc/WinEventsSDL.cpp	2010-11-30 19:05:13 UTC (rev 35550)
+++ branches/Dharma/xbmc/WinEventsSDL.cpp	2010-11-30 19:05:54 UTC (rev 35551)
@@ -28,6 +28,9 @@
 #endif
 #include "MouseStat.h"
 #include "WindowingFactory.h"
+#if defined(__APPLE__)
+#include "osx/CocoaInterface.h"
+#endif
 
 #ifdef HAS_SDL_WIN_EVENTS
 
@@ -149,6 +152,11 @@
         if (0 == (SDL_GetAppState() & SDL_APPMOUSEFOCUS))
         {
           g_Mouse.SetActive(false);
+#if defined(__APPLE__)
+          // See CApplication::ProcessSlow() for a description as to why we call Cocoa_HideMouse.
+          // this is here to restore the pointer when toggling back to window mode from fullscreen.
+          Cocoa_ShowMouse();
+#endif
           break;
         }
         XBMC_Event newEvent;

Modified: branches/Dharma/xbmc/osx/CocoaInterface.h
===================================================================
--- branches/Dharma/xbmc/osx/CocoaInterface.h	2010-11-30 19:05:13 UTC (rev 35550)
+++ branches/Dharma/xbmc/osx/CocoaInterface.h	2010-11-30 19:05:54 UTC (rev 35551)
@@ -71,6 +71,7 @@
   // Mouse.
   //
   void Cocoa_HideMouse();
+  void Cocoa_ShowMouse();
   void Cocoa_HideDock();
 
   // Smart folders.

Modified: branches/Dharma/xbmc/osx/CocoaInterface.mm
===================================================================
--- branches/Dharma/xbmc/osx/CocoaInterface.mm	2010-11-30 19:05:13 UTC (rev 35550)
+++ branches/Dharma/xbmc/osx/CocoaInterface.mm	2010-11-30 19:05:54 UTC (rev 35551)
@@ -421,6 +421,11 @@
   [NSCursor hide];
 }
 
+void Cocoa_ShowMouse()
+{
+  [NSCursor unhide];
+}
+
 void Cocoa_HideDock()
 {
   // Find which display we are on


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

Revision: 35566
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35566&view=rev
Author:   theuni
Date:     2010-12-02 04:38:34 +0000 (Thu, 02 Dec 2010)

Log Message:
-----------
bump version strings for rc2.

Modified Paths:
--------------
    branches/Dharma/xbmc/osx/Info.plist
    branches/Dharma/xbmc/utils/GUIInfoManager.h
    branches/Dharma/xbmc/win32/XBMC_PC.rc

Modified: branches/Dharma/xbmc/osx/Info.plist
===================================================================
--- branches/Dharma/xbmc/osx/Info.plist	2010-12-02 04:38:25 UTC (rev 35565)
+++ branches/Dharma/xbmc/osx/Info.plist	2010-12-02 04:38:34 UTC (rev 35566)
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>XBMC</string>
 	<key>CFBundleGetInfoString</key>
-	<string>10.0-rc1</string>
+	<string>10.0-rc2</string>
 	<key>CFBundleIconFile</key>
 	<string>xbmc.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>10.0-rc1</string>
+	<string>10.0-rc2</string>
 	<key>CFBundleVersion</key>
 	<string>r####</string>
 	<key>CFBundleSignature</key>

Modified: branches/Dharma/xbmc/utils/GUIInfoManager.h
===================================================================
--- branches/Dharma/xbmc/utils/GUIInfoManager.h	2010-12-02 04:38:25 UTC (rev 35565)
+++ branches/Dharma/xbmc/utils/GUIInfoManager.h	2010-12-02 04:38:34 UTC (rev 35566)
@@ -433,7 +433,7 @@
 
 // Version string MUST NOT contain spaces.  It is used
 // in the HTTP request user agent.
-#define VERSION_STRING "10.0-rc1"
+#define VERSION_STRING "10.0-rc2"
 
 #define LISTITEM_START              35000
 #define LISTITEM_THUMB              (LISTITEM_START)

Modified: branches/Dharma/xbmc/win32/XBMC_PC.rc
===================================================================
--- branches/Dharma/xbmc/win32/XBMC_PC.rc	2010-12-02 04:38:25 UTC (rev 35565)
+++ branches/Dharma/xbmc/win32/XBMC_PC.rc	2010-12-02 04:38:34 UTC (rev 35566)
@@ -71,12 +71,12 @@
         BEGIN
             VALUE "CompanyName", "Team XBMC"
             VALUE "FileDescription", "XBMC"
-            VALUE "FileVersion", "10.0-rc1"
+            VALUE "FileVersion", "10.0-rc2"
             VALUE "InternalName", "XBMC.exe"
             VALUE "LegalCopyright", "Copyright (c) Team XBMC.  All rights reserved."
             VALUE "OriginalFilename", "XBMC.exe"
             VALUE "ProductName", "XBMC for Windows"
-            VALUE "ProductVersion", "10.0-rc1"
+            VALUE "ProductVersion", "10.0-rc2"
         END
     END
     BLOCK "VarFileInfo"


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

Revision: 35571
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35571&view=rev
Author:   jmarshallnz
Date:     2010-12-02 08:38:48 +0000 (Thu, 02 Dec 2010)

Log Message:
-----------
fixed: crash due to race condition in prompting for skin change after install

(cherry picked from commit 3a808bfe9f37417f36186e600704d22f68ac87b1)

Modified Paths:
--------------
    branches/Dharma/xbmc/GUIWindowAddonBrowser.cpp
    branches/Dharma/xbmc/GUIWindowAddonBrowser.h

Modified: branches/Dharma/xbmc/GUIWindowAddonBrowser.cpp
===================================================================
--- branches/Dharma/xbmc/GUIWindowAddonBrowser.cpp	2010-12-02 08:38:05 UTC (rev 35570)
+++ branches/Dharma/xbmc/GUIWindowAddonBrowser.cpp	2010-12-02 08:38:48 UTC (rev 35571)
@@ -371,7 +371,10 @@
             else
             {
               if (addon->Type() == ADDON_SKIN)
+              {
+                CSingleLock lock(m_critSection);
                 m_prompt = addon;
+              }
              if (g_settings.m_bAddonNotifications)
                 g_application.m_guiDialogKaiToast.QueueNotification(
                                                    addon->Icon(),
@@ -470,25 +473,29 @@
   if (i != m_downloadJobs.end())
     m_downloadJobs.erase(i);
 
+  AddonPtr prompt;
+  if (m_downloadJobs.empty() && m_prompt)
+  {
+    prompt = m_prompt;
+    m_prompt.reset();
+  }
   lock.Leave();
-  if (m_downloadJobs.empty() && m_prompt)
-    PromptForActivation();
+  PromptForActivation(prompt);
 }
 
-void CGUIWindowAddonBrowser::PromptForActivation()
+void CGUIWindowAddonBrowser::PromptForActivation(const AddonPtr &prompt)
 {
-  if (m_prompt->Type() == ADDON_SKIN)
+  if (prompt && prompt->Type() == ADDON_SKIN)
   {
-    if (CGUIDialogYesNo::ShowAndGetInput(m_prompt->Name(),
+    if (CGUIDialogYesNo::ShowAndGetInput(prompt->Name(),
                                          g_localizeStrings.Get(24099),"",""))
     {
-      g_guiSettings.SetString("lookandfeel.skin",m_prompt->ID().c_str());
+      g_guiSettings.SetString("lookandfeel.skin",prompt->ID().c_str());
       g_application.m_guiDialogKaiToast.ResetTimer();
       g_application.m_guiDialogKaiToast.Close(true);
       g_application.getApplicationMessenger().ExecBuiltIn("ReloadSkin");
     }
   }
-  m_prompt.reset();
 }
 
 bool CGUIWindowAddonBrowser::GetDirectory(const CStdString& strDirectory,

Modified: branches/Dharma/xbmc/GUIWindowAddonBrowser.h
===================================================================
--- branches/Dharma/xbmc/GUIWindowAddonBrowser.h	2010-12-02 08:38:05 UTC (rev 35570)
+++ branches/Dharma/xbmc/GUIWindowAddonBrowser.h	2010-12-02 08:38:48 UTC (rev 35571)
@@ -106,7 +106,7 @@
    */
   bool CheckHash(const CStdString& addonZip, const CStdString& hash);
   
-  void PromptForActivation();
+  void PromptForActivation(const ADDON::AddonPtr &prompt);
 
   void RegisterJob(const CStdString& id, unsigned int jobid, const CStdString& hash="");
   void UnRegisterJob(unsigned int jobID);


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

Revision: 35632
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35632&view=rev
Author:   jmarshallnz
Date:     2010-12-13 19:44:51 +0000 (Mon, 13 Dec 2010)

Log Message:
-----------
added: UnloadSkin builtin function, and allow ApplicationMessenger::ExecBuiltIn to wait on the builtin before returning

(cherry picked from commit a249081ab2e3d4b2b5348607df6a3513522bc40f)

Modified Paths:
--------------
    branches/Dharma/xbmc/ApplicationMessenger.cpp
    branches/Dharma/xbmc/ApplicationMessenger.h
    branches/Dharma/xbmc/utils/Builtins.cpp

Modified: branches/Dharma/xbmc/ApplicationMessenger.cpp
===================================================================
--- branches/Dharma/xbmc/ApplicationMessenger.cpp	2010-12-13 19:44:12 UTC (rev 35631)
+++ branches/Dharma/xbmc/ApplicationMessenger.cpp	2010-12-13 19:44:51 UTC (rev 35632)
@@ -713,11 +713,11 @@
   SendMessage(tMsg, wait);
 }
 
-void CApplicationMessenger::ExecBuiltIn(const CStdString &command)
+void CApplicationMessenger::ExecBuiltIn(const CStdString &command, bool wait)
 {
   ThreadMessage tMsg = {TMSG_EXECUTE_BUILT_IN};
   tMsg.strParam = command;
-  SendMessage(tMsg);
+  SendMessage(tMsg, wait);
 }
 
 void CApplicationMessenger::MediaPlay(string filename)

Modified: branches/Dharma/xbmc/ApplicationMessenger.h
===================================================================
--- branches/Dharma/xbmc/ApplicationMessenger.h	2010-12-13 19:44:12 UTC (rev 35631)
+++ branches/Dharma/xbmc/ApplicationMessenger.h	2010-12-13 19:44:51 UTC (rev 35632)
@@ -147,7 +147,7 @@
   CStdString GetResponse();
   int SetResponse(CStdString response);
   void HttpApi(std::string cmd, bool wait = false);
-  void ExecBuiltIn(const CStdString &command);
+  void ExecBuiltIn(const CStdString &command, bool wait = false);
 
   void NetworkMessage(DWORD dwMessage, DWORD dwParam = 0);
 

Modified: branches/Dharma/xbmc/utils/Builtins.cpp
===================================================================
--- branches/Dharma/xbmc/utils/Builtins.cpp	2010-12-13 19:44:12 UTC (rev 35631)
+++ branches/Dharma/xbmc/utils/Builtins.cpp	2010-12-13 19:44:51 UTC (rev 35632)
@@ -124,6 +124,7 @@
   { "SlideShow",                  true,   "Run a slideshow from the specified directory" },
   { "RecursiveSlideShow",         true,   "Run a slideshow from the specified directory, including all subdirs" },
   { "ReloadSkin",                 false,  "Reload XBMC's skin" },
+  { "UnloadSkin",                 false,  "Unload XBMC's skin" },
   { "RefreshRSS",                 false,  "Reload RSS feeds from RSSFeeds.xml"},
   { "PlayerControl",              true,   "Control the music or video player" },
   { "Playlist.PlayOffset",        true,   "Start playing from a particular offset in the playlist" },
@@ -521,6 +522,10 @@
     //  Reload the skin
     g_application.ReloadSkin();
   }
+  else if (execute.Equals("unloadskin"))
+  {
+    g_application.UnloadSkin();
+  }
   else if (execute.Equals("refreshrss"))
   {
     g_rssManager.Stop();


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

Revision: 35634
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35634&view=rev
Author:   jmarshallnz
Date:     2010-12-13 19:45:59 +0000 (Mon, 13 Dec 2010)

Log Message:
-----------
fixed: #10876 - skin addon (auto-)update when using the same skin causes funkiness on win32.  We now unload the skin prior to install.

(cherry picked from commit 0d58f4ce1e8c3a48a5c36131e860d02cb7812858)

Modified Paths:
--------------
    branches/Dharma/xbmc/GUIWindowAddonBrowser.cpp
    branches/Dharma/xbmc/GUIWindowAddonBrowser.h

Modified: branches/Dharma/xbmc/GUIWindowAddonBrowser.cpp
===================================================================
--- branches/Dharma/xbmc/GUIWindowAddonBrowser.cpp	2010-12-13 19:45:26 UTC (rev 35633)
+++ branches/Dharma/xbmc/GUIWindowAddonBrowser.cpp	2010-12-13 19:45:59 UTC (rev 35634)
@@ -71,6 +71,7 @@
 : CGUIMediaWindow(WINDOW_ADDON_BROWSER, "AddonBrowser.xml")
 {
   m_thumbLoader.SetNumOfWorkers(1);
+  m_promptReload = false;
 }
 
 CGUIWindowAddonBrowser::~CGUIWindowAddonBrowser()
@@ -442,6 +443,17 @@
         return false;
       }
       list.Add(CFileItemPtr(new CFileItem(archivedFiles[0]->m_strPath,true)));
+      // check whether this is an active skin - we need to unload it if so
+      CURL url(archivedFiles[0]->m_strPath);
+      CStdString addon = url.GetFileName();
+      CUtil::RemoveSlashAtEnd(addon);
+      if (g_guiSettings.GetString("lookandfeel.skin") == addon)
+      { // we're updating the current skin - we have to unload it first
+        CSingleLock lock(m_critSection);
+        CAddonMgr::Get().GetAddon(addon, m_prompt);
+        m_promptReload = true;
+        g_application.getApplicationMessenger().ExecBuiltIn("UnloadSkin", true);
+      }
       dest = "special://home/addons/";
     }
     else
@@ -474,23 +486,26 @@
     m_downloadJobs.erase(i);
 
   AddonPtr prompt;
+  bool reload = false;
   if (m_downloadJobs.empty() && m_prompt)
   {
     prompt = m_prompt;
+    reload = m_promptReload;
     m_prompt.reset();
+    m_promptReload = false;
   }
   lock.Leave();
-  PromptForActivation(prompt);
+  PromptForActivation(prompt, reload);
 }
 
-void CGUIWindowAddonBrowser::PromptForActivation(const AddonPtr &prompt)
+void CGUIWindowAddonBrowser::PromptForActivation(const AddonPtr &addon, bool dontPrompt)
 {
-  if (prompt && prompt->Type() == ADDON_SKIN)
+  if (addon && addon->Type() == ADDON_SKIN)
   {
-    if (CGUIDialogYesNo::ShowAndGetInput(prompt->Name(),
+    if (dontPrompt || CGUIDialogYesNo::ShowAndGetInput(addon->Name(),
                                          g_localizeStrings.Get(24099),"",""))
     {
-      g_guiSettings.SetString("lookandfeel.skin",prompt->ID().c_str());
+      g_guiSettings.SetString("lookandfeel.skin",addon->ID().c_str());
       g_application.m_guiDialogKaiToast.ResetTimer();
       g_application.m_guiDialogKaiToast.Close(true);
       g_application.getApplicationMessenger().ExecBuiltIn("ReloadSkin");

Modified: branches/Dharma/xbmc/GUIWindowAddonBrowser.h
===================================================================
--- branches/Dharma/xbmc/GUIWindowAddonBrowser.h	2010-12-13 19:45:26 UTC (rev 35633)
+++ branches/Dharma/xbmc/GUIWindowAddonBrowser.h	2010-12-13 19:45:59 UTC (rev 35634)
@@ -106,7 +106,7 @@
    */
   bool CheckHash(const CStdString& addonZip, const CStdString& hash);
   
-  void PromptForActivation(const ADDON::AddonPtr &prompt);
+  void PromptForActivation(const ADDON::AddonPtr &addon, bool dontPrompt);
 
   void RegisterJob(const CStdString& id, unsigned int jobid, const CStdString& hash="");
   void UnRegisterJob(unsigned int jobID);
@@ -122,5 +122,6 @@
   CPictureThumbLoader m_thumbLoader;
 
   ADDON::AddonPtr m_prompt;
+  bool            m_promptReload;
 };
 


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

Revision: 35636
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35636&view=rev
Author:   spiff_
Date:     2010-12-13 20:15:40 +0000 (Mon, 13 Dec 2010)

Log Message:
-----------
fixed: ticket #10896 - memory leak watching videos with libass subtitles. thanks to evetsso!

(cherry picked from commit 99b4db4d04c9ae35b124e268a29d8c378d94ba10)

Modified Paths:
--------------
    branches/Dharma/xbmc/DynamicDll.h
    branches/Dharma/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp
    branches/Dharma/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h

Modified: branches/Dharma/xbmc/DynamicDll.h
===================================================================
--- branches/Dharma/xbmc/DynamicDll.h	2010-12-13 20:11:00 UTC (rev 35635)
+++ branches/Dharma/xbmc/DynamicDll.h	2010-12-13 20:15:40 UTC (rev 35636)
@@ -485,7 +485,7 @@
   virtual ~DllDynamic();
   virtual bool Load();
   virtual void Unload();
-  bool IsLoaded() { return m_dll!=NULL; }
+  virtual bool IsLoaded() { return m_dll!=NULL; }
   bool CanLoad();
   bool EnableDelayedUnload(bool bOnOff);
   bool SetFile(const CStdString& strDllName);

Modified: branches/Dharma/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp
===================================================================
--- branches/Dharma/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp	2010-12-13 20:11:00 UTC (rev 35635)
+++ branches/Dharma/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp	2010-12-13 20:15:40 UTC (rev 35636)
@@ -91,6 +91,8 @@
 {
   if(m_dll.IsLoaded())
   {
+    if(m_track)
+      m_dll.ass_free_track(m_track);
     m_dll.ass_renderer_done(m_renderer);
     m_dll.ass_library_done(m_library);
     m_dll.Unload();

Modified: branches/Dharma/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h
===================================================================
--- branches/Dharma/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h	2010-12-13 20:11:00 UTC (rev 35635)
+++ branches/Dharma/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h	2010-12-13 20:15:40 UTC (rev 35636)
@@ -126,6 +126,7 @@
         return true;
     }
     virtual void Unload() {}
+    virtual bool IsLoaded() { return true; }
 };
 
 #else


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

Revision: 35643
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35643&view=rev
Author:   theuni
Date:     2010-12-17 04:08:54 +0000 (Fri, 17 Dec 2010)

Log Message:
-----------
changed: allow cache buffer size to be configured via advancedsettings rather than hardcoded.

Thanks ralfonat. Acked by elupus.

(cherry picked from commit acf0e0874177f9b44259d06528f61e7959a375d6)

Modified Paths:
--------------
    branches/Dharma/xbmc/AdvancedSettings.cpp
    branches/Dharma/xbmc/AdvancedSettings.h
    branches/Dharma/xbmc/FileSystem/CacheMemBuffer.cpp

Modified: branches/Dharma/xbmc/AdvancedSettings.cpp
===================================================================
--- branches/Dharma/xbmc/AdvancedSettings.cpp	2010-12-16 15:33:35 UTC (rev 35642)
+++ branches/Dharma/xbmc/AdvancedSettings.cpp	2010-12-17 04:08:54 UTC (rev 35643)
@@ -271,6 +271,8 @@
   m_bgInfoLoaderMaxThreads = 5;
 
   m_measureRefreshrate = false;
+
+  m_cacheMemBufferSize = (1048576 * 5);
 }
 
 bool CAdvancedSettings::Load()
@@ -499,6 +501,7 @@
     XMLUtils::GetInt(pElement, "curllowspeedtime", m_curllowspeedtime, 1, 1000);
     XMLUtils::GetInt(pElement, "curlretries", m_curlretries, 0, 10);
     XMLUtils::GetBoolean(pElement,"disableipv6", m_curlDisableIPV6);
+    XMLUtils::GetUInt(pElement, "cachemembuffersize", m_cacheMemBufferSize);
   }
 
   pElement = pRootElement->FirstChildElement("samba");

Modified: branches/Dharma/xbmc/AdvancedSettings.h
===================================================================
--- branches/Dharma/xbmc/AdvancedSettings.h	2010-12-16 15:33:35 UTC (rev 35642)
+++ branches/Dharma/xbmc/AdvancedSettings.h	2010-12-17 04:08:54 UTC (rev 35643)
@@ -269,6 +269,8 @@
 
     DatabaseSettings m_databaseMusic; // advanced music database setup
     DatabaseSettings m_databaseVideo; // advanced video database setup
+
+    unsigned int m_cacheMemBufferSize;
 };
 
 extern CAdvancedSettings g_advancedSettings;

Modified: branches/Dharma/xbmc/FileSystem/CacheMemBuffer.cpp
===================================================================
--- branches/Dharma/xbmc/FileSystem/CacheMemBuffer.cpp	2010-12-16 15:33:35 UTC (rev 35642)
+++ branches/Dharma/xbmc/FileSystem/CacheMemBuffer.cpp	2010-12-17 04:08:54 UTC (rev 35643)
@@ -22,6 +22,7 @@
 #ifdef _LINUX
 #include "../linux/PlatformDefs.h"
 #endif
+#include "AdvancedSettings.h"
 #include "CacheMemBuffer.h"
 #include "utils/log.h"
 #include "utils/SingleLock.h"
@@ -29,8 +30,6 @@
 
 #include <math.h>
 
-#define CACHE_BUFFER_SIZE (1048576 * 5)
-
 using namespace XFILE;
 
 #define SEEK_CHECK_RET(x) if (!(x)) return -1;
@@ -39,9 +38,9 @@
  : CCacheStrategy()
 {
   m_nStartPosition = 0;
-  m_buffer.Create(CACHE_BUFFER_SIZE + 1);
-  m_HistoryBuffer.Create(CACHE_BUFFER_SIZE + 1);
-  m_forwardBuffer.Create(CACHE_BUFFER_SIZE + 1);
+  m_buffer.Create(g_advancedSettings.m_cacheMemBufferSize + 1);
+  m_HistoryBuffer.Create(g_advancedSettings.m_cacheMemBufferSize + 1);
+  m_forwardBuffer.Create(g_advancedSettings.m_cacheMemBufferSize + 1);
 }
 
 


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

Revision: 35644
          http://xbmc.svn.sourceforge.net/xbmc/?rev=35644&view=rev
Author:   theuni
Date:     2010-12-17 04:09:05 +0000 (Fri, 17 Dec 2010)

Log Message:
-----------
bump version strings for final.

Modified Paths:
--------------
    branches/Dharma/xbmc/osx/Info.plist
    branches/Dharma/xbmc/utils/GUIInfoManager.h
    branches/Dharma/xbmc/win32/XBMC_PC.rc

Modified: branches/Dharma/xbmc/osx/Info.plist
===================================================================
--- branches/Dharma/xbmc/osx/Info.plist	2010-12-17 04:08:54 UTC (rev 35643)
+++ branches/Dharma/xbmc/osx/Info.plist	2010-12-17 04:09:05 UTC (rev 35644)
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>XBMC</string>
 	<key>CFBundleGetInfoString</key>
-	<string>10.0-rc2</string>
+	<string>10.0</string>
 	<key>CFBundleIconFile</key>
 	<string>xbmc.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>10.0-rc2</string>
+	<string>10.0</string>
 	<key>CFBundleVersion</key>
 	<string>r####</string>
 	<key>CFBundleSignature</key>

Modified: branches/Dharma/xbmc/utils/GUIInfoManager.h
===================================================================
--- branches/Dharma/xbmc/utils/GUIInfoManager.h	2010-12-17 04:08:54 UTC (rev 35643)
+++ branches/Dharma/xbmc/utils/GUIInfoManager.h	2010-12-17 04:09:05 UTC (rev 35644)
@@ -433,7 +433,7 @@
 
 // Version string MUST NOT contain spaces.  It is used
 // in the HTTP request user agent.
-#define VERSION_STRING "10.0-rc2"
+#define VERSION_STRING "10.0"
 
 #define LISTITEM_START              35000
 #define LISTITEM_THUMB              (LISTITEM_START)

Modified: branches/Dharma/xbmc/win32/XBMC_PC.rc
===================================================================
--- branches/Dharma/xbmc/win32/XBMC_PC.rc	2010-12-17 04:08:54 UTC (rev 35643)
+++ branches/Dharma/xbmc/win32/XBMC_PC.rc	2010-12-17 04:09:05 UTC (rev 35644)
@@ -71,12 +71,12 @@
         BEGIN
             VALUE "CompanyName", "Team XBMC"
             VALUE "FileDescription", "XBMC"
-            VALUE "FileVersion", "10.0-rc2"
+            VALUE "FileVersion", "10.0"
             VALUE "InternalName", "XBMC.exe"
             VALUE "LegalCopyright", "Copyright (c) Team XBMC.  All rights reserved."
             VALUE "OriginalFilename", "XBMC.exe"
             VALUE "ProductName", "XBMC for Windows"
-            VALUE "ProductVersion", "10.0-rc2"
+            VALUE "ProductVersion", "10.0"
         END
     END
     BLOCK "VarFileInfo"


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