XBMC Media Center

Revision: 7134
          http://svn.sourceforge.net/xbmc/?rev=7134&view=rev
Author:   pike2k
Date:     2006-11-16 22:37:15 -0800 (Thu, 16 Nov 2006)

Log Message:
-----------
changed: versionstrings from 2.0.1 to pre-2.1

Modified Paths:
--------------
    trunk/XBMC/xbmc/FileSystem/FileCurl.cpp
    trunk/XBMC/xbmc/FileSystem/cddb.cpp
    trunk/XBMC/xbmc/utils/GUIInfoManager.h
    trunk/XBMC/xbmc/utils/RssReader.cpp

Modified: trunk/XBMC/xbmc/FileSystem/FileCurl.cpp
===================================================================
--- trunk/XBMC/xbmc/FileSystem/FileCurl.cpp	2006-11-17 03:19:19 UTC (rev 7133)
+++ trunk/XBMC/xbmc/FileSystem/FileCurl.cpp	2006-11-17 06:37:15 UTC (rev 7134)
@@ -262,7 +262,7 @@
   if (m_userAgent.length() > 0)
     g_curlInterface.easy_setopt(m_easyHandle, CURLOPT_USERAGENT, m_userAgent.c_str());
   else /* set some default agent as shoutcast doesn't return proper stuff otherwise */
-    g_curlInterface.easy_setopt(m_easyHandle, CURLOPT_USERAGENT, "XBMC/2.0.1 (compatible; MSIE 6.0; Windows NT 5.1; WinampMPEG/5.09)");
+    g_curlInterface.easy_setopt(m_easyHandle, CURLOPT_USERAGENT, "XBMC/pre-2.1 (compatible; MSIE 6.0; Windows NT 5.1; WinampMPEG/5.09)");
   
   if (m_useOldHttpVersion)
     g_curlInterface.easy_setopt(m_easyHandle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);

Modified: trunk/XBMC/xbmc/FileSystem/cddb.cpp
===================================================================
--- trunk/XBMC/xbmc/FileSystem/cddb.cpp	2006-11-17 03:19:19 UTC (rev 7133)
+++ trunk/XBMC/xbmc/FileSystem/cddb.cpp	2006-11-17 06:37:15 UTC (rev 7134)
@@ -1213,7 +1213,7 @@
 
   //##########################################################
   // Send the Hello message
-  if ( ! Send("cddb hello xbox xbox XboxMediaCenter 2.0.1"))
+  if ( ! Send("cddb hello xbox xbox XboxMediaCenter pre-2.1"))
   {
     CLog::Log(LOGERROR, "Xcddb::queryCDinfo Error sending \"%s\"", "cddb hello xbox xbox XboxMediaCenter 1.1.0");
     m_lastError = E_NETWORK_ERROR_SEND;

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.h
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.h	2006-11-17 03:19:19 UTC (rev 7133)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.h	2006-11-17 06:37:15 UTC (rev 7134)
@@ -220,7 +220,7 @@
 #define CONTROL_HAS_FOCUS           30000
 #define BUTTON_SCROLLER_HAS_ICON    30001
 
-#define VERSION_STRING "2.0.1"
+#define VERSION_STRING "pre-2.1"
 
 // the multiple information vector
 #define MULTI_INFO_START              40000

Modified: trunk/XBMC/xbmc/utils/RssReader.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/RssReader.cpp	2006-11-17 03:19:19 UTC (rev 7133)
+++ trunk/XBMC/xbmc/utils/RssReader.cpp	2006-11-17 06:37:15 UTC (rev 7134)
@@ -97,7 +97,7 @@
     }
 
     CHTTP http;
-    http.SetUserAgent("XBMC/2.0.1 (http://www.xboxmediacenter.com)");
+    http.SetUserAgent("XBMC/pre-2.1 (http://www.xboxmediacenter.com)");
     CStdString strXML;
     CStdString strUrl = m_vecUrls[iFeed];
 


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

Revision: 7144
          http://svn.sourceforge.net/xbmc/?rev=7144&view=rev
Author:   xbmcapi
Date:     2006-11-18 08:32:56 -0800 (Sat, 18 Nov 2006)

Log Message:
-----------
Added: HttpApi broadcast settings

Modified Paths:
--------------
    trunk/XBMC/xbmc/Settings.cpp
    trunk/XBMC/xbmc/Settings.h

Modified: trunk/XBMC/xbmc/Settings.cpp
===================================================================
--- trunk/XBMC/xbmc/Settings.cpp	2006-11-17 20:51:19 UTC (rev 7143)
+++ trunk/XBMC/xbmc/Settings.cpp	2006-11-18 16:32:56 UTC (rev 7144)
@@ -1059,6 +1059,8 @@
     GetInteger(pElement, "systemtotaluptime", g_stSettings.m_iSystemTimeTotalUp, 0, 0, INT_MAX);
     GetString(pElement, "kaiarenapass", g_stSettings.szOnlineArenaPassword, "");
     GetString(pElement, "kaiarenadesc", g_stSettings.szOnlineArenaDescription, "");
+	GetInteger(pElement, "httpapibroadcastlevel", g_stSettings.m_HttpApiBroadcastLevel, 0, 0,5);
+	GetInteger(pElement, "httpapibroadcastport", g_stSettings.m_HttpApiBroadcastPort, 8278, 1, 65535);
   }
   
   pElement = pRootElement->FirstChildElement("defaultvideosettings");
@@ -1738,6 +1740,8 @@
   SetString(pNode, "kaiarenapass", g_stSettings.szOnlineArenaPassword);
   SetString(pNode, "kaiarenadesc", g_stSettings.szOnlineArenaDescription);
   SetInteger(pNode, "systemtotaluptime", g_stSettings.m_iSystemTimeTotalUp);
+  SetInteger(pNode, "httpapibroadcastport", g_stSettings.m_HttpApiBroadcastPort); 
+  SetInteger(pNode, "httpapibroadcastlevel", g_stSettings.m_HttpApiBroadcastLevel);
     
   // default video settings
   TiXmlElement videoSettingsNode("defaultvideosettings");

Modified: trunk/XBMC/xbmc/Settings.h
===================================================================
--- trunk/XBMC/xbmc/Settings.h	2006-11-17 20:51:19 UTC (rev 7143)
+++ trunk/XBMC/xbmc/Settings.h	2006-11-18 16:32:56 UTC (rev 7144)
@@ -434,6 +434,8 @@
     char szOnlineArenaPassword[32]; // private arena password
     char szOnlineArenaDescription[64]; // private arena description
 
+	int m_HttpApiBroadcastPort;
+	int m_HttpApiBroadcastLevel;
     int m_nVolumeLevel;                     // measured in milliBels -60dB -> 0dB range.
     int m_dynamicRangeCompressionLevel;     // measured in milliBels  0dB -> 30dB range.
     int m_iPreMuteVolumeLevel;    // save the m_nVolumeLevel for proper restore


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

Revision: 7155
          http://svn.sourceforge.net/xbmc/?rev=7155&view=rev
Author:   jmarshallnz
Date:     2006-11-19 19:17:20 -0800 (Sun, 19 Nov 2006)

Log Message:
-----------
added: listitem.filename, listitem.duration, listitem.size, listitem.date, listitem.rating, listitem.programcount for new list control (and elsewhere)

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowFileManager.cpp
    trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
    trunk/XBMC/xbmc/utils/GUIInfoManager.h

Modified: trunk/XBMC/xbmc/GUIWindowFileManager.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowFileManager.cpp	2006-11-20 03:14:51 UTC (rev 7154)
+++ trunk/XBMC/xbmc/GUIWindowFileManager.cpp	2006-11-20 03:17:20 UTC (rev 7155)
@@ -1178,7 +1178,7 @@
   // calculate the position for our menu
   float posX = 200;
   float posY = 100;
-  CGUIListContainer *pList = (CGUIListContainer *)GetControl(list + CONTROL_LEFT_LIST);
+  const CGUIControl *pList = GetControl(CONTROL_LEFT_LIST + list);
   if (pList)
   {
     posX = pList->GetXPosition() + pList->GetWidth() / 2;

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2006-11-20 03:14:51 UTC (rev 7154)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2006-11-20 03:17:20 UTC (rev 7155)
@@ -309,6 +309,12 @@
     else if (strTest.Equals("listitem.year")) ret = LISTITEM_YEAR;
     else if (strTest.Equals("listitem.genre")) ret = LISTITEM_GENRE;
     else if (strTest.Equals("listitem.director")) ret = LISTITEM_DIRECTOR;
+    else if (strTest.Equals("listitem.filename")) ret = LISTITEM_FILENAME;
+    else if (strTest.Equals("listitem.date")) ret = LISTITEM_DATE;
+    else if (strTest.Equals("listitem.size")) ret = LISTITEM_SIZE;
+    else if (strTest.Equals("listitem.rating")) ret = LISTITEM_RATING;
+    else if (strTest.Equals("listitem.programcount")) ret = LISTITEM_PROGRAM_COUNT;
+    else if (strTest.Equals("listitem.duration")) ret = LISTITEM_DURATION;
   }
   else if (strCategory.Equals("visualisation"))
   {
@@ -669,6 +675,12 @@
   case LISTITEM_YEAR:
   case LISTITEM_GENRE:
   case LISTITEM_DIRECTOR:
+  case LISTITEM_FILENAME:
+  case LISTITEM_DATE:
+  case LISTITEM_SIZE:
+  case LISTITEM_RATING:
+  case LISTITEM_PROGRAM_COUNT:
+  case LISTITEM_DURATION:
     {
       CGUIWindow *pWindow = m_gWindowManager.GetWindow(m_gWindowManager.GetActiveWindow());
       if (pWindow && pWindow->IsMediaWindow())
@@ -1906,23 +1918,57 @@
 CStdString CGUIInfoManager::GetItemLabel(const CFileItem *item, int info)
 {
   if (!item) return "";
-  if (info == LISTITEM_LABEL) return item->GetLabel();
-  else if (info == LISTITEM_LABEL2) return item->GetLabel2();
-  else if (info == LISTITEM_TITLE) return item->m_musicInfoTag.GetTitle();
-  else if (info == LISTITEM_TRACKNUMBER)
+  switch (info)
   {
-    CStdString track;
-    track.Format("%i", item->m_musicInfoTag.GetTrackNumber());
-    return track;
-  }
-  else if (info == LISTITEM_ARTIST || info == LISTITEM_DIRECTOR)
-  {
-    // HACK - director info is injected as the artist tag
+  case LISTITEM_LABEL:
+    return item->GetLabel();
+  case LISTITEM_LABEL2:
+    return item->GetLabel2();
+  case LISTITEM_TITLE:
+    return item->m_musicInfoTag.GetTitle();
+  case LISTITEM_TRACKNUMBER:
+    {
+      CStdString track;
+      track.Format("%i", item->m_musicInfoTag.GetTrackNumber());
+      return track;
+    }
+  case LISTITEM_ARTIST:
+  case LISTITEM_DIRECTOR:// HACK - director info is injected as the artist tag
     return item->m_musicInfoTag.GetArtist();
+  case LISTITEM_ALBUM:
+    return item->m_musicInfoTag.GetAlbum();
+  case LISTITEM_YEAR:
+    return item->m_musicInfoTag.GetYear();
+  case LISTITEM_GENRE:
+    return item->m_musicInfoTag.GetGenre();
+  case LISTITEM_FILENAME:
+    return CUtil::GetFileName(item->m_strPath);
+  case LISTITEM_DATE:
+    if (item->m_dateTime.IsValid())
+      return item->m_dateTime.GetAsLocalizedDate();
+  case LISTITEM_SIZE:
+    if (!item->m_bIsFolder || item->m_dwSize)
+      return StringUtils::SizeToString(item->m_dwSize);
+  case LISTITEM_RATING:
+    {
+      CStdString rating;
+      rating.Format("%2.2f", item->m_fRating);
+      return rating;
+    }
+  case LISTITEM_PROGRAM_COUNT:
+    {
+      CStdString count;
+      count.Format("%i", item->m_iprogramCount);
+      return count;
+    }
+  case LISTITEM_DURATION:
+    {
+      CStdString duration;
+      if (item->m_musicInfoTag.GetDuration() > 0)
+        StringUtils::SecondsToTimeString(item->m_musicInfoTag.GetDuration(), duration);
+      return duration;
+    }
   }
-  else if (info == LISTITEM_ALBUM) return item->m_musicInfoTag.GetAlbum();
-  else if (info == LISTITEM_YEAR) return item->m_musicInfoTag.GetYear();
-  else if (info == LISTITEM_GENRE) return item->m_musicInfoTag.GetGenre();
   return "";
 }
 

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.h
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.h	2006-11-20 03:14:51 UTC (rev 7154)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.h	2006-11-20 03:17:20 UTC (rev 7155)
@@ -179,7 +179,8 @@
 #define LISTITEM_SIZE               324
 #define LISTITEM_RATING             325
 #define LISTITEM_PROGRAM_COUNT      326
-#define LISTITEM_END                321
+#define LISTITEM_DURATION           327
+#define LISTITEM_END                327
 
 #define MUSICPM_ENABLED             350
 #define MUSICPM_SONGSPLAYED         351


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

Revision: 7157
          http://svn.sourceforge.net/xbmc/?rev=7157&view=rev
Author:   jmarshallnz
Date:     2006-11-19 19:24:05 -0800 (Sun, 19 Nov 2006)

Log Message:
-----------
removed: unnecessary including of the listcontrol (functions only required the base class)

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIDialogFileBrowser.cpp
    trunk/XBMC/xbmc/GUIWindowLoginScreen.cpp
    trunk/XBMC/xbmc/GUIWindowMusicBase.cpp
    trunk/XBMC/xbmc/GUIWindowMusicNav.cpp
    trunk/XBMC/xbmc/GUIWindowMusicPlaylist.cpp
    trunk/XBMC/xbmc/GUIWindowSettingsProfile.cpp
    trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
    trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp
    trunk/XBMC/xbmc/GUIWindowVideoPlaylist.cpp

Modified: trunk/XBMC/xbmc/GUIDialogFileBrowser.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogFileBrowser.cpp	2006-11-20 03:18:17 UTC (rev 7156)
+++ trunk/XBMC/xbmc/GUIDialogFileBrowser.cpp	2006-11-20 03:24:05 UTC (rev 7157)
@@ -3,7 +3,6 @@
 #include "util.h"
 #include "detectdvdtype.h"
 #include "GUIDialogNetworkSetup.h"
-#include "GUIListContainer.h"
 #include "GUIDialogContextMenu.h"
 #include "MediaManager.h"
 #include "AutoSwitch.h"
@@ -655,7 +654,7 @@
     return false;
   
   float posX = 200, posY = 100;
-  CGUIListContainer *pList = (CGUIListContainer *)GetControl(CONTROL_LIST);
+  const CGUIControl *pList = GetControl(CONTROL_LIST);
   if (pList)
   {
     posX = pList->GetXPosition() + pList->GetWidth() / 2;

Modified: trunk/XBMC/xbmc/GUIWindowLoginScreen.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowLoginScreen.cpp	2006-11-20 03:18:17 UTC (rev 7156)
+++ trunk/XBMC/xbmc/GUIWindowLoginScreen.cpp	2006-11-20 03:24:05 UTC (rev 7157)
@@ -2,7 +2,6 @@
 #include "application.h"
 #include "GUIWindowLoginScreen.h"
 #include "GUIWindowSettingsProfile.h"
-#include "GUIListContainer.h"
 #include "GUIDialogContextMenu.h"
 #include "GUIDialogProfileSettings.h"
 #include "utils/guiinfomanager.h"
@@ -210,7 +209,7 @@
   if ( iItem < 0 || iItem >= m_vecItems.Size() ) return false;
   // calculate our position
   float posX = 200, posY = 100;
-  CGUIListContainer *pList = (CGUIListContainer *)GetControl(CONTROL_BIG_LIST);
+  const CGUIControl *pList = GetControl(CONTROL_BIG_LIST);
   if (pList)
   {
     posX = pList->GetXPosition() + pList->GetWidth() / 2;

Modified: trunk/XBMC/xbmc/GUIWindowMusicBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicBase.cpp	2006-11-20 03:18:17 UTC (rev 7156)
+++ trunk/XBMC/xbmc/GUIWindowMusicBase.cpp	2006-11-20 03:24:05 UTC (rev 7157)
@@ -10,7 +10,6 @@
 #include "PlayListM3U.h"
 #include "Application.h"
 #include "PlayListPlayer.h"
-#include "GUIListContainer.h"
 #include "FileSystem/DirectoryCache.h"
 #ifdef HAS_CDDA_RIPPER
 #include "CDRip/CDDARipper.h"
@@ -1233,7 +1232,7 @@
 
   // calculate our position
   float posX = 200, posY = 100;
-  CGUIListContainer *pList = (CGUIListContainer *)GetControl(CONTROL_LIST);
+  const CGUIControl *pList = GetControl(CONTROL_LIST);
   if (pList)
   {
     posX = pList->GetXPosition() + pList->GetWidth() / 2;

Modified: trunk/XBMC/xbmc/GUIWindowMusicNav.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicNav.cpp	2006-11-20 03:18:17 UTC (rev 7156)
+++ trunk/XBMC/xbmc/GUIWindowMusicNav.cpp	2006-11-20 03:24:05 UTC (rev 7157)
@@ -5,7 +5,6 @@
 #include "application.h"
 #include "playlistplayer.h"
 #include "GUIPassword.h"
-#include "GUIListContainer.h"
 #ifdef PRE_SKIN_VERSION_2_1_COMPATIBILITY
 #include "GUILabelControl.h"
 #include "GUIFontManager.h"
@@ -346,14 +345,14 @@
 void CGUIWindowMusicNav::OnWindowLoaded()
 {
 #ifdef PRE_SKIN_VERSION_2_1_COMPATIBILITY
-  CGUIListContainer *pControl = (CGUIListContainer *)GetControl(CONTROL_LIST);
-  if (pControl && !GetControl(CONTROL_LABELEMPTY))
+  const CGUIControl *pList = GetControl(CONTROL_LIST);
+  if (pList && !GetControl(CONTROL_LABELEMPTY))
   {
     CLabelInfo info;
     info.align = XBFONT_CENTER_X | XBFONT_CENTER_Y;
     info.font = g_fontManager.GetFont("font13");
-    CGUILabelControl *pLabel = new CGUILabelControl(GetID(),CONTROL_LABELEMPTY,pControl->GetXPosition(),pControl->GetYPosition(),pControl->GetWidth(),pControl->GetHeight(),"",info,false);
-    pLabel->SetAnimations(pControl->GetAnimations());
+    CGUILabelControl *pLabel = new CGUILabelControl(GetID(),CONTROL_LABELEMPTY,pList->GetXPosition(),pList->GetYPosition(),pList->GetWidth(),pList->GetHeight(),"",info,false);
+    pLabel->SetAnimations(pList->GetAnimations());
     Add(pLabel);
   }
 #endif
@@ -367,7 +366,7 @@
   // calculate our position
   float posX = 200;
   float posY = 100;
-  CGUIListContainer *pList = (CGUIListContainer *)GetControl(CONTROL_LIST);
+  const CGUIControl *pList = GetControl(CONTROL_LIST);
   if (pList)
   {
     posX = pList->GetXPosition() + pList->GetWidth() / 2;

Modified: trunk/XBMC/xbmc/GUIWindowMusicPlaylist.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicPlaylist.cpp	2006-11-20 03:18:17 UTC (rev 7156)
+++ trunk/XBMC/xbmc/GUIWindowMusicPlaylist.cpp	2006-11-20 03:24:05 UTC (rev 7157)
@@ -4,7 +4,6 @@
 #include "PlayListM3U.h"
 #include "application.h"
 #include "playlistplayer.h"
-#include "GUIListContainer.h"
 #include "GUIDialogContextMenu.h"
 #include "PartyModeManager.h"
 
@@ -599,7 +598,7 @@
   // calculate our position
   float posX = 200;
   float posY = 100;
-  CGUIListContainer *pList = (CGUIListContainer *)GetControl(CONTROL_LIST);
+  const CGUIControl *pList = GetControl(CONTROL_LIST);
   if (pList)
   {
     posX = pList->GetXPosition() + pList->GetWidth() / 2;

Modified: trunk/XBMC/xbmc/GUIWindowSettingsProfile.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowSettingsProfile.cpp	2006-11-20 03:18:17 UTC (rev 7156)
+++ trunk/XBMC/xbmc/GUIWindowSettingsProfile.cpp	2006-11-20 03:24:05 UTC (rev 7157)
@@ -2,7 +2,6 @@
 #include "GUIWindowSettingsProfile.h"
 #include "GUIWindowFileManager.h"
 #include "Profile.h"
-#include "GUIListContainer.h"
 #include "util.h"
 #include "application.h"
 #include "GUIDialogContextMenu.h"
@@ -48,7 +47,7 @@
   // calculate our position
   float posX = 200;
   float posY = 100;
-  CGUIListContainer *pList = (CGUIListContainer *)GetControl(CONTROL_PROFILES);
+  const CGUIControl *pList = GetControl(CONTROL_PROFILES);
   if (pList)
   {
     posX = pList->GetXPosition() + pList->GetWidth() / 2;

Modified: trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2006-11-20 03:18:17 UTC (rev 7156)
+++ trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2006-11-20 03:24:05 UTC (rev 7157)
@@ -12,7 +12,6 @@
 #include "utils/fstrcmp.h"
 #include "PlayListPlayer.h"
 #include "GUIThumbnailPanel.h"
-#include "GUIListContainer.h"
 #ifdef PRE_SKIN_VERSION_2_1_COMPATIBILITY
 #include "GUIFontManager.h"
 #endif
@@ -238,14 +237,14 @@
 void CGUIWindowVideoBase::OnWindowLoaded()
 {
 #ifdef PRE_SKIN_VERSION_2_1_COMPATIBILITY
-  CGUIListContainer *pControl = (CGUIListContainer *)GetControl(CONTROL_LIST);
-  if (pControl && !GetControl(CONTROL_LABELEMPTY))
+  const CGUIControl *pList = GetControl(CONTROL_LIST);
+  if (pList && !GetControl(CONTROL_LABELEMPTY))
   {
     CLabelInfo info;
     info.align = XBFONT_CENTER_X | XBFONT_CENTER_Y;
     info.font = g_fontManager.GetFont("font13");
-    CGUILabelControl *pLabel = new CGUILabelControl(GetID(),CONTROL_LABELEMPTY,pControl->GetXPosition(),pControl->GetYPosition(),pControl->GetWidth(),pControl->GetHeight(),"",info,false);
-    pLabel->SetAnimations(pControl->GetAnimations());
+    CGUILabelControl *pLabel = new CGUILabelControl(GetID(),CONTROL_LABELEMPTY,pList->GetXPosition(),pList->GetYPosition(),pList->GetWidth(),pList->GetHeight(),"",info,false);
+    pLabel->SetAnimations(pList->GetAnimations());
     Add(pLabel);
   }
 #endif
@@ -688,7 +687,7 @@
   
   // calculate our position
   float posX = 200, posY = 100;
-  CGUIListContainer *pList = (CGUIListContainer *)GetControl(CONTROL_LIST);
+  const CGUIControl *pList = GetControl(CONTROL_LIST);
   if (pList)
   {
     posX = pList->GetXPosition() + pList->GetWidth() / 2;

Modified: trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp	2006-11-20 03:18:17 UTC (rev 7156)
+++ trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp	2006-11-20 03:24:05 UTC (rev 7157)
@@ -11,7 +11,6 @@
 #include "Application.h"
 #include "NFOFile.h"
 #include "PlayListPlayer.h"
-#include "GUIListContainer.h"
 #include "GUIPassword.h"
 #include "GUIDialogContextMenu.h"
 #include "GUIDialogMediaSource.h"
@@ -663,7 +662,7 @@
   // calculate our position
   float posX = 200;
   float posY = 100;
-  CGUIListContainer *pList = (CGUIListContainer *)GetControl(CONTROL_LIST);
+  const CGUIControl *pList = GetControl(CONTROL_LIST);
   if (pList)
   {
     posX = pList->GetXPosition() + pList->GetWidth() / 2;

Modified: trunk/XBMC/xbmc/GUIWindowVideoPlaylist.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoPlaylist.cpp	2006-11-20 03:18:17 UTC (rev 7156)
+++ trunk/XBMC/xbmc/GUIWindowVideoPlaylist.cpp	2006-11-20 03:24:05 UTC (rev 7157)
@@ -5,7 +5,6 @@
 #include "PlayListM3U.h"
 #include "Application.h"
 #include "PlayListPlayer.h"
-#include "GUIListContainer.h"
 #include "GUIDialogContextMenu.h"
 
 #define CONTROL_BTNVIEWASICONS     2 
@@ -390,7 +389,7 @@
   // calculate our position
   float posX = 200;
   float posY = 100;
-  CGUIListContainer *pList = (CGUIListContainer *)GetControl(CONTROL_LIST);
+  const CGUIControl *pList = GetControl(CONTROL_LIST);
   if (pList)
   {
     posX = pList->GetXPosition() + pList->GetWidth() / 2;


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

Revision: 7184
          http://svn.sourceforge.net/xbmc/?rev=7184&view=rev
Author:   jmarshallnz
Date:     2006-11-21 13:29:06 -0800 (Tue, 21 Nov 2006)

Log Message:
-----------
fixed: Empty database message wasn't shown.

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowMusicNav.cpp
    trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
    trunk/XBMC/xbmc/GUIWindowVideoBase.h
    trunk/XBMC/xbmc/GUIWindowVideoNav.cpp

Modified: trunk/XBMC/xbmc/GUIWindowMusicNav.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicNav.cpp	2006-11-21 21:27:57 UTC (rev 7183)
+++ trunk/XBMC/xbmc/GUIWindowMusicNav.cpp	2006-11-21 21:29:06 UTC (rev 7184)
@@ -351,6 +351,7 @@
     CLabelInfo info;
     info.align = XBFONT_CENTER_X | XBFONT_CENTER_Y;
     info.font = g_fontManager.GetFont("font13");
+    info.textColor = 0xffffffff;
     CGUILabelControl *pLabel = new CGUILabelControl(GetID(),CONTROL_LABELEMPTY,pList->GetXPosition(),pList->GetYPosition(),pList->GetWidth(),pList->GetHeight(),"",info,false);
     pLabel->SetAnimations(pList->GetAnimations());
     Add(pLabel);

Modified: trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2006-11-21 21:27:57 UTC (rev 7183)
+++ trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2006-11-21 21:29:06 UTC (rev 7184)
@@ -213,25 +213,6 @@
   CGUIMediaWindow::UpdateButtons();
 }
 
-void CGUIWindowVideoBase::OnWindowLoaded()
-{
-#ifdef PRE_SKIN_VERSION_2_1_COMPATIBILITY
-  const CGUIControl *pList = GetControl(CONTROL_LIST);
-  if (pList && !GetControl(CONTROL_LABELEMPTY))
-  {
-    CLabelInfo info;
-    info.align = XBFONT_CENTER_X | XBFONT_CENTER_Y;
-    info.font = g_fontManager.GetFont("font13");
-    CGUILabelControl *pLabel = new CGUILabelControl(GetID(),CONTROL_LABELEMPTY,pList->GetXPosition(),pList->GetYPosition(),pList->GetWidth(),pList->GetHeight(),"",info,false);
-    pLabel->SetAnimations(pList->GetAnimations());
-    Add(pLabel);
-  }
-#endif
-  
-  CGUIMediaWindow::OnWindowLoaded();
-}
-
-
 void CGUIWindowVideoBase::OnInfo(int iItem)
 {
   if ( iItem < 0 || iItem >= m_vecItems.Size() ) return ;

Modified: trunk/XBMC/xbmc/GUIWindowVideoBase.h
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoBase.h	2006-11-21 21:27:57 UTC (rev 7183)
+++ trunk/XBMC/xbmc/GUIWindowVideoBase.h	2006-11-21 21:29:06 UTC (rev 7184)
@@ -22,7 +22,6 @@
 protected:
   virtual void UpdateButtons();
   virtual bool Update(const CStdString &strDirectory);
-  virtual void OnWindowLoaded();
   virtual void OnItemLoaded(CFileItem* pItem) {};
   virtual void OnPrepareFileItems(CFileItemList &items);
 

Modified: trunk/XBMC/xbmc/GUIWindowVideoNav.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoNav.cpp	2006-11-21 21:27:57 UTC (rev 7183)
+++ trunk/XBMC/xbmc/GUIWindowVideoNav.cpp	2006-11-21 21:29:06 UTC (rev 7184)
@@ -312,12 +312,12 @@
     CLabelInfo info;
     info.align = XBFONT_CENTER_X | XBFONT_CENTER_Y;
     info.font = g_fontManager.GetFont("font13");
+    info.textColor = 0xffffffff;
     CGUILabelControl *pLabel = new CGUILabelControl(GetID(),CONTROL_LABELEMPTY,pList->GetXPosition(),pList->GetYPosition(),pList->GetWidth(),pList->GetHeight(),"",info,false);
     pLabel->SetAnimations(pList->GetAnimations());
     Add(pLabel);
   }
 #endif
-  
   CGUIWindowVideoBase::OnWindowLoaded();
 }
 
@@ -330,14 +330,6 @@
 {
   if (m_bDisplayEmptyDatabaseMessage)
   {
-    CGUILabelControl* pLabel = (CGUILabelControl*)GetControl(CONTROL_LABELEMPTY);
-    CGUIListControl *pControl = (CGUIListControl *)GetControl(CONTROL_LIST);
-    float fWidth,fHeight;
-    CStdStringW utf16NoScannedInfo;
-    g_charsetConverter.utf8ToUTF16(g_localizeStrings.Get(745)+'\n'+g_localizeStrings.Get(746), utf16NoScannedInfo); // "No scanned information for this view"
-    CLabelInfo info = pLabel->GetLabelInfo();
-    info.font->GetTextExtent(utf16NoScannedInfo.c_str(), &fWidth, &fHeight);
-    pLabel->SetPosition(pLabel->GetXPosition(),pControl->GetYPosition()+pControl->GetHeight()/2-(int)fHeight/2);
     SET_CONTROL_LABEL(CONTROL_LABELEMPTY,g_localizeStrings.Get(745)+'\n'+g_localizeStrings.Get(746))
   }
   else


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

Revision: 7185
          http://svn.sourceforge.net/xbmc/?rev=7185&view=rev
Author:   jmarshallnz
Date:     2006-11-21 13:49:41 -0800 (Tue, 21 Nov 2006)

Log Message:
-----------
fixed: disabled the deletion from video library view (it could delete the actual files)

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
    trunk/XBMC/xbmc/GUIWindowVideoNav.cpp
    trunk/XBMC/xbmc/GUIWindowVideoNav.h

Modified: trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2006-11-21 21:29:06 UTC (rev 7184)
+++ trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2006-11-21 21:49:41 UTC (rev 7185)
@@ -752,10 +752,10 @@
 			// delete titles from database
 			if (GetID() == WINDOW_VIDEO_NAV && (g_settings.m_vecProfiles[g_settings.m_iLastLoadedProfileIndex].canWriteDatabases() || g_passwordManager.bMasterUser))
 			{
-		     	CVideoDatabaseDirectory dir;
-      		 	NODE_TYPE node = dir.GetDirectoryChildType(m_vecItems.m_strPath);
-      			if (node == NODE_TYPE_TITLE)
-        			btn_Delete = pMenu->AddButton(646);
+        CVideoDatabaseDirectory dir;
+        NODE_TYPE node = dir.GetDirectoryChildType(m_vecItems.m_strPath);
+        if (node == NODE_TYPE_TITLE)
+          btn_Delete = pMenu->AddButton(646);
 			}
 		}
 	} // if (bContextDriven)

Modified: trunk/XBMC/xbmc/GUIWindowVideoNav.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoNav.cpp	2006-11-21 21:29:06 UTC (rev 7184)
+++ trunk/XBMC/xbmc/GUIWindowVideoNav.cpp	2006-11-21 21:49:41 UTC (rev 7185)
@@ -338,3 +338,8 @@
   }
   CGUIWindowVideoBase::Render();
 }
+
+void CGUIWindowVideoNav::OnDeleteItem(int iItem)
+{
+  // TODO: Implement this :)
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/GUIWindowVideoNav.h
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoNav.h	2006-11-21 21:29:06 UTC (rev 7184)
+++ trunk/XBMC/xbmc/GUIWindowVideoNav.h	2006-11-21 21:49:41 UTC (rev 7185)
@@ -19,6 +19,7 @@
   virtual void UpdateButtons();
 //  virtual void DoSearch(const CStdString& strSearch, CFileItemList& items);
   virtual void PlayItem(int iItem);
+  virtual void OnDeleteItem(int iItem);
   virtual void OnWindowLoaded();
 
   void DisplayEmptyDatabaseMessage(bool bDisplay);


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

Revision: 7187
          http://svn.sourceforge.net/xbmc/?rev=7187&view=rev
Author:   jmarshallnz
Date:     2006-11-21 13:59:17 -0800 (Tue, 21 Nov 2006)

Log Message:
-----------
changed: Dialog Vis settings to use the new grouplist control (replaces area + gap controls)

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIDialogVisualisationSettings.cpp
    trunk/XBMC/xbmc/GUIDialogVisualisationSettings.h

Modified: trunk/XBMC/xbmc/GUIDialogVisualisationSettings.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogVisualisationSettings.cpp	2006-11-21 21:58:23 UTC (rev 7186)
+++ trunk/XBMC/xbmc/GUIDialogVisualisationSettings.cpp	2006-11-21 21:59:17 UTC (rev 7187)
@@ -1,14 +1,18 @@
 #include "stdafx.h"
 #include "GUIDialogVisualisationSettings.h"
 #include "GUIWindowSettingsCategory.h"
+#include "GUIControlGroupList.h"
 #include "util.h"
 #include "utils/GUIInfoManager.h"
 
 
 #define CONTROL_SETTINGS_LABEL      2
 #define CONTROL_NONE_AVAILABLE      3
+#define CONTROL_GROUP_LIST          5
+#ifdef PRE_SKIN_VERSION_2_1_COMPATIBILITY
 #define CONTROL_AREA                5
 #define CONTROL_GAP                 6
+#endif
 #define CONTROL_DEFAULT_BUTTON      7
 #define CONTROL_DEFAULT_RADIOBUTTON 8
 #define CONTROL_DEFAULT_SPIN        9
@@ -23,9 +27,6 @@
   m_pOriginalSettingsButton = NULL;
   m_pVisualisation = NULL;
   m_pSettings = NULL;
-  m_iCurrentPage = 0;
-  m_iNumPages = 0;
-  m_iNumPerPage = 0;
   LoadOnDemand(false);    // we are loaded by the vis window.
 }
 
@@ -40,14 +41,7 @@
   case GUI_MSG_CLICKED:
     {
       unsigned int iControl = message.GetSenderId();
-      if (iControl == CONTROL_PAGE)
-      {
-        CGUIMessage msg(GUI_MSG_ITEM_SELECTED, GetID(), iControl);
-        OnMessage(msg);
-        m_iCurrentPage = msg.GetParam1() - 1;
-        SetupPage();
-      }
-      else if (iControl >= CONTROL_START && iControl < CONTROL_PAGE)
+      if (iControl >= CONTROL_START && iControl < CONTROL_PAGE)
         OnClick(iControl);
       return true;
     }
@@ -63,8 +57,6 @@
   case GUI_MSG_VISUALISATION_LOADED:
     {
       SetVisualisation((CVisualisation *)message.GetLPVOID());
-      m_iCurrentPage = 0;
-      m_iNumPages = 0;
       SetupPage();
       SET_CONTROL_FOCUS(CONTROL_START, 0);
     }
@@ -90,65 +82,47 @@
   strSettings.Format("%s %s", g_infoManager.GetLabel(402).c_str(), g_localizeStrings.Get(5));
   SET_CONTROL_LABEL(CONTROL_SETTINGS_LABEL, strSettings);
 
-  // our controls for layout...
-  const CGUIControl *pControlArea = GetControl(CONTROL_AREA);
-  const CGUIControl *pControlGap = GetControl(CONTROL_GAP);
-  if (!pControlArea || !pControlGap)
+  CGUIControlGroupList *group = (CGUIControlGroupList *)GetControl(CONTROL_GROUP_LIST);
+#ifdef PRE_SKIN_VERSION_2_1_COMPATIBILITY
+  if (!group || group->GetControlType() != CGUIControl::GUICONTROL_GROUPLIST)
+  {
+    // our controls for layout...
+    CGUIControl *pArea = (CGUIControl *)GetControl(CONTROL_AREA);
+    const CGUIControl *pGap = GetControl(CONTROL_GAP);
+    if (!pArea || !pGap)
+      return;
+    Remove(CONTROL_AREA);
+    group = new CGUIControlGroupList(GetID(), CONTROL_GROUP_LIST, pArea->GetXPosition(), pArea->GetYPosition(),
+                                     pArea->GetWidth(), pArea->GetHeight(), pGap->GetHeight() - m_pOriginalSettingsButton->GetHeight(),
+                                     0, VERTICAL);
+    group->SetNavigation(CONTROL_GROUP_LIST, CONTROL_GROUP_LIST, CONTROL_GROUP_LIST, CONTROL_GROUP_LIST);
+    Insert(group, pGap);
+    pArea->FreeResources();
+    delete pArea;
+    SET_CONTROL_HIDDEN(CONTROL_PAGE);
+  }
+#endif
+  if (!group)
     return;
 
   if (!m_pSettings || !m_pSettings->size())
   { // no settings available
     SET_CONTROL_VISIBLE(CONTROL_NONE_AVAILABLE);
-    SET_CONTROL_HIDDEN(CONTROL_PAGE);
     return;
   }
   else
   {
     SET_CONTROL_HIDDEN(CONTROL_NONE_AVAILABLE);
-    SET_CONTROL_VISIBLE(CONTROL_PAGE);
   }
 
-  float posX = pControlArea->GetXPosition();
-  float width = pControlArea->GetWidth();
-  float posY = pControlArea->GetYPosition();
-  float gapY = pControlGap->GetHeight();
   int numSettings = m_pSettings->size();
-  m_iNumPerPage = (int)(pControlArea->GetHeight() / gapY);
-  if (m_iNumPerPage < 1) m_iNumPerPage = 1;
-  m_iNumPages = (numSettings + m_iNumPerPage - 1)/ m_iNumPerPage; // round up
-  if (m_iCurrentPage >= m_iNumPages - 1)
-    m_iCurrentPage = m_iNumPages - 1;
-  if (m_iCurrentPage <= 0)
-    m_iCurrentPage = 0;
-  CGUISpinControl *pPage = (CGUISpinControl *)GetControl(CONTROL_PAGE);
-  if (pPage)
-  {
-    pPage->SetRange(1, m_iNumPages);
-    pPage->SetReverse(true);
-    pPage->SetShowRange(true);
-    pPage->SetValue(m_iCurrentPage + 1);
-    pPage->SetVisible(m_iNumPages > 1);
-  }
 
   // run through and create our controls
-  int numOnPage = 0;
-  for (int i = 0; i < m_iNumPerPage && i + m_iCurrentPage * m_iNumPerPage < numSettings; i++)
+  for (unsigned int i = 0; i < m_pSettings->size(); i++)
   {
-    VisSetting &setting = m_pSettings->at(i + m_iCurrentPage * m_iNumPerPage);
-    AddSetting(setting, posX, posY, width, CONTROL_START + i);
-    posY += gapY;
-    numOnPage++;
+    VisSetting &setting = m_pSettings->at(i);
+    AddSetting(setting, group->GetWidth(), CONTROL_START + i);
   }
-  // fix first and last navigation
-  CGUIControl *pControl = (CGUIControl *)GetControl(CONTROL_START + numOnPage - 1);
-  if (pControl) pControl->SetNavigation(pControl->GetControlIdUp(), CONTROL_PAGE,
-                                          pControl->GetControlIdLeft(), pControl->GetControlIdRight());
-  pControl = (CGUIControl *)GetControl(CONTROL_START);
-  if (pControl) pControl->SetNavigation(CONTROL_PAGE, pControl->GetControlIdDown(),
-                                          pControl->GetControlIdLeft(), pControl->GetControlIdRight());
-  pControl = (CGUIControl *)GetControl(CONTROL_PAGE);
-  if (pControl) pControl->SetNavigation(CONTROL_START + numOnPage - 1, CONTROL_START,
-                                          pControl->GetControlIdLeft(), pControl->GetControlIdRight());
   UpdateSettings();
 }
 
@@ -160,7 +134,7 @@
 void CGUIDialogVisualisationSettings::OnClick(int iID)
 {
   if (!m_pSettings || !m_pVisualisation) return;
-  unsigned int settingNum = iID - CONTROL_START + m_iCurrentPage * m_iNumPerPage;
+  unsigned int settingNum = iID - CONTROL_START;
   if (settingNum >= m_pSettings->size()) return;
   VisSetting &setting = m_pSettings->at(settingNum);
   if (setting.type == VisSetting::SPIN)
@@ -179,20 +153,20 @@
 
 void CGUIDialogVisualisationSettings::FreeControls()
 {
-  // free any created controls
-  for (unsigned int i = CONTROL_START; i < CONTROL_PAGE; i++)
+  // just clear our group list
+  CGUIControlGroupList *group = (CGUIControlGroupList *)GetControl(CONTROL_GROUP_LIST);
+#ifdef PRE_SKIN_VERSION_2_1_COMPATIBILITY
+  if (group && group->GetControlType() == CGUIControl::GUICONTROL_GROUPLIST)
+#else
+  if (group)
+#endif
   {
-    CGUIControl *pControl = (CGUIControl *)GetControl(i);
-    if (pControl)
-    {
-      Remove(i);
-      pControl->FreeResources();
-      delete pControl;
-    }
+    group->FreeResources();
+    group->ClearAll();
   }
 }
 
-void CGUIDialogVisualisationSettings::AddSetting(VisSetting &setting, float posX, float posY, float width, int iControlID)
+void CGUIDialogVisualisationSettings::AddSetting(VisSetting &setting, float width, int iControlID)
 {
   CGUIControl *pControl = NULL;
   if (setting.type == VisSetting::CHECK)
@@ -200,7 +174,6 @@
     pControl = new CGUIRadioButtonControl(*m_pOriginalRadioButton);
     if (!pControl) return ;
     ((CGUIRadioButtonControl *)pControl)->SetLabel(setting.name);
-    pControl->SetPosition(posX, posY);
     pControl->SetWidth(width);
     ((CGUIRadioButtonControl *)pControl)->SetSelected(setting.current == 1);
   }
@@ -208,7 +181,6 @@
   {
     pControl = new CGUISpinControlEx(*m_pOriginalSpin);
     if (!pControl) return ;
-    pControl->SetPosition(posX, posY);
     pControl->SetWidth(width);
     ((CGUISpinControlEx *)pControl)->SetText(setting.name);
     pControl->SetWidth(width);
@@ -217,14 +189,16 @@
     ((CGUISpinControlEx *)pControl)->SetValue(setting.current);
   }
   if (!pControl) return;
-  pControl->SetNavigation(iControlID - 1,
-                          iControlID + 1,
-                          iControlID,
-                          iControlID);
   pControl->SetID(iControlID);
   pControl->SetVisible(true);
-  Add(pControl);
-  pControl->AllocResources();
+  CGUIControlGroupList *group = (CGUIControlGroupList *)GetControl(CONTROL_GROUP_LIST);
+  if (group)
+  {
+    pControl->AllocResources();
+    group->AddControl(pControl);
+  }
+  else
+    delete pControl;
 }
 
 void CGUIDialogVisualisationSettings::Render()
@@ -248,9 +222,6 @@
   g_graphicsContext.SendMessage(msg);
   SetVisualisation((CVisualisation *)msg.GetLPVOID());
 
-  m_iCurrentPage = 0;
-  m_iNumPages = 0;
-
   SetupPage();
   // reset the default control
   m_lastControlID = CONTROL_START;

Modified: trunk/XBMC/xbmc/GUIDialogVisualisationSettings.h
===================================================================
--- trunk/XBMC/xbmc/GUIDialogVisualisationSettings.h	2006-11-21 21:58:23 UTC (rev 7186)
+++ trunk/XBMC/xbmc/GUIDialogVisualisationSettings.h	2006-11-21 21:59:17 UTC (rev 7187)
@@ -21,10 +21,7 @@
   void UpdateSettings();
   virtual void FreeControls();
   void OnClick(int iControl);
-  void AddSetting(VisSetting &setting, float posX, float posY, float width, int iControlID);
-  int m_iCurrentPage;
-  int m_iNumPages;
-  int m_iNumPerPage;
+  void AddSetting(VisSetting &setting, float width, int iControlID);
 
   CGUISpinControlEx *m_pOriginalSpin;
   CGUIRadioButtonControl *m_pOriginalRadioButton;


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

Revision: 7196
          http://svn.sourceforge.net/xbmc/?rev=7196&view=rev
Author:   jmarshallnz
Date:     2006-11-21 16:49:50 -0800 (Tue, 21 Nov 2006)

Log Message:
-----------
fixed: removed missed references to GUIListControl.h 

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIDialogProfileSettings.cpp
    trunk/XBMC/xbmc/GUIWindowVideoInfo.cpp
    trunk/XBMC/xbmc/GUIWindowVideoNav.cpp

Modified: trunk/XBMC/xbmc/GUIDialogProfileSettings.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogProfileSettings.cpp	2006-11-22 00:30:25 UTC (rev 7195)
+++ trunk/XBMC/xbmc/GUIDialogProfileSettings.cpp	2006-11-22 00:49:50 UTC (rev 7196)
@@ -2,7 +2,6 @@
 #include "GUIDialogProfileSettings.h"
 #include "GUIDialogFileBrowser.h"
 #include "GUIDialogContextMenu.h"
-#include "GUIListControl.h"
 #include "GUIDialogNumeric.h"
 #include "GUIDialogKeyboard.h"
 #include "GUIDialogGamepad.h"

Modified: trunk/XBMC/xbmc/GUIWindowVideoInfo.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoInfo.cpp	2006-11-22 00:30:25 UTC (rev 7195)
+++ trunk/XBMC/xbmc/GUIWindowVideoInfo.cpp	2006-11-22 00:49:50 UTC (rev 7196)
@@ -7,7 +7,6 @@
 #include "VideoDatabase.h"
 #include "GUIImage.h"
 #include "StringUtils.h"
-#include "GUIListControl.h"
 #include "GUIWindowVideoBase.h"
 #include "GUIWindowVideoFiles.h"
 #include "GUIDialogFileBrowser.h"

Modified: trunk/XBMC/xbmc/GUIWindowVideoNav.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoNav.cpp	2006-11-22 00:30:25 UTC (rev 7195)
+++ trunk/XBMC/xbmc/GUIWindowVideoNav.cpp	2006-11-22 00:49:50 UTC (rev 7196)
@@ -5,7 +5,7 @@
 #include "application.h"
 #include "playlistplayer.h"
 #include "GUIPassword.h"
-#include "GUIListControl.h"
+#include "GUILabelControl.h"
 #include "GUIDialogContextMenu.h"
 #include "GUIDialogFileBrowser.h"
 #include "Picture.h"


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

Revision: 7211
          http://svn.sourceforge.net/xbmc/?rev=7211&view=rev
Author:   spiff_
Date:     2006-11-22 10:34:39 -0800 (Wed, 22 Nov 2006)

Log Message:
-----------
changed: moved the rip cd audio context menu item to the dvd drive context menu where it belongs.

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIDialogContextMenu.cpp
    trunk/XBMC/xbmc/GUIWindowMusicBase.cpp
    trunk/XBMC/xbmc/GUIWindowMusicBase.h

Modified: trunk/XBMC/xbmc/GUIDialogContextMenu.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogContextMenu.cpp	2006-11-22 18:17:05 UTC (rev 7210)
+++ trunk/XBMC/xbmc/GUIDialogContextMenu.cpp	2006-11-22 18:34:39 UTC (rev 7211)
@@ -10,6 +10,7 @@
 #include "GUIDialogMediaSource.h"
 #include "GUIDialogLockSettings.h"
 #include "MediaManager.h"
+#include "GUIWindowMusicBase.h"
 
 #define BACKGROUND_IMAGE 999
 #define BACKGROUND_BOTTOM 998
@@ -198,12 +199,18 @@
     // GeminiServer: DVD Drive Context menu stuff
     int btn_PlayDisc = 0;
     int btn_Eject = 0;
+    int btn_Rip;
     if (item->IsDVD() || item->IsCDDA())
     {
       // We need to check if there is a detected is inserted!
       if ( CDetectDVDMedia::IsDiscInDrive() )
       {
         btn_PlayDisc = pMenu->AddButton(341); // Play CD/DVD!
+
+        CCdInfo *pCdInfo = CDetectDVDMedia::GetCdInfo(); 
+        if ( pCdInfo->IsAudio(1) || pCdInfo->IsCDExtra(1) || pCdInfo->IsMixedMode(1) )
+          btn_Rip = pMenu->AddButton(600);
+
         bIsDVDMediaPresent = true;
       }
       btn_Eject = pMenu->AddButton(13391);  // Eject/Load CD/DVD!
@@ -410,6 +417,11 @@
           return true;
         }
       }
+      else if (btn == btn_Rip)
+      {
+        CGUIWindowMusicBase::OnRipCD();
+        return true;
+      }
       else if (btn == btn_LockShare)
       {
         bool bResult = false;

Modified: trunk/XBMC/xbmc/GUIWindowMusicBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicBase.cpp	2006-11-22 18:17:05 UTC (rev 7210)
+++ trunk/XBMC/xbmc/GUIWindowMusicBase.cpp	2006-11-22 18:34:39 UTC (rev 7211)
@@ -1253,7 +1253,6 @@
   int btn_InfoAll = 0;	// Query Information for all albums
   int btn_Scan = 0;			// Scan to library
   int btn_Search = 0;		// Library Search
-  int btn_Rip = 0;			// Rip audio cd
   int btn_RipTrack = 0;			// Rip audio track
   int btn_CDDB = 0;			// CDDB lookup
   int btn_Delete = 0;		// Delete
@@ -1319,8 +1318,7 @@
 			CCdInfo *pCdInfo = CDetectDVDMedia::GetCdInfo(); 
 			if ( pCdInfo->IsAudio(1) || pCdInfo->IsCDExtra(1) || pCdInfo->IsMixedMode(1) )
 			{
-				btn_Rip = pMenu->AddButton(600);
-                btn_RipTrack = pMenu->AddButton(610);
+		    btn_RipTrack = pMenu->AddButton(610);
 			}
 		}
 
@@ -1407,14 +1405,9 @@
     {
       OnSearch();
     }
-    // Rip CD...
-    else if (btnid == btn_Rip)
-    {
-      OnRipCD();
-    }
     else if (btnid == btn_RipTrack)
     {
-      OnRipTrack((int) iItem);
+      OnRipTrack(iItem);
     }
     // CDDB lookup
     else if (btnid == btn_CDDB)

Modified: trunk/XBMC/xbmc/GUIWindowMusicBase.h
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicBase.h	2006-11-22 18:17:05 UTC (rev 7210)
+++ trunk/XBMC/xbmc/GUIWindowMusicBase.h	2006-11-22 18:34:39 UTC (rev 7211)
@@ -29,6 +29,7 @@
   virtual ~CGUIWindowMusicBase(void);
   virtual bool OnMessage(CGUIMessage& message);
   virtual bool OnAction(const CAction& action);
+  static void OnRipCD();
 
 protected:
   /*!
@@ -63,7 +64,6 @@
   void UpdateThumb(const CMusicAlbumInfo &album, bool bSaveDb, bool bSaveDirThumb);
 
   void OnManualAlbumInfo();
-  void OnRipCD();
   void OnRipTrack(int iItem);
   void OnSearch();
   virtual void LoadPlayList(const CStdString& strPlayList);


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

Revision: 7240
          http://svn.sourceforge.net/xbmc/?rev=7240&view=rev
Author:   kraqh3d
Date:     2006-11-26 08:12:00 -0800 (Sun, 26 Nov 2006)

Log Message:
-----------
changed: playlist behaviour.  see this thread for details http://www.xboxmediacenter.com/forum/showthread.php?t=23386

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowMusicBase.cpp
    trunk/XBMC/xbmc/GUIWindowMusicBase.h

Modified: trunk/XBMC/xbmc/GUIWindowMusicBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicBase.cpp	2006-11-26 16:11:34 UTC (rev 7239)
+++ trunk/XBMC/xbmc/GUIWindowMusicBase.cpp	2006-11-26 16:12:00 UTC (rev 7240)
@@ -791,28 +791,21 @@
   if (!item.CanQueue())
     item.SetCanQueue(true);
 
-  int iPlaylist = PLAYLIST_MUSIC;
-  if (g_partyModeManager.IsEnabled())
-  { // we use the temp playlist to queue, as the partymode manager is the one
-    // that actually does the queueing to the real playlist.
-    // make sure we clear it first though
-    iPlaylist = PLAYLIST_MUSIC_TEMP;
-    g_playlistPlayer.ClearPlaylist(iPlaylist);
-  }
+  CLog::Log(LOGDEBUG, "Adding file %s%s to music playlist", item.m_strPath.c_str(), item.m_bIsFolder ? " (folder) " : "");
+  CFileItemList queuedItems;
+  AddItemToPlayList(&item, queuedItems);
 
-  CLog::Log(LOGDEBUG, "Adding file %s%s to %smusic playlist", item.m_strPath.c_str(), item.m_bIsFolder ? " (folder) " : "", iPlaylist == PLAYLIST_MUSIC ? "" : "temp ");
-  AddItemToPlayList(&item, iPlaylist);
-
   // select next item
   m_viewControl.SetSelectedItem(iItem + 1);
 
   // if party mode, add items but DONT start playing
   if (g_partyModeManager.IsEnabled())
   {
-    g_partyModeManager.AddUserSongs(g_playlistPlayer.GetPlaylist(iPlaylist), false);
+    g_partyModeManager.AddUserSongs(queuedItems, false);
     return;
   }
 
+  g_playlistPlayer.Add(PLAYLIST_MUSIC, queuedItems);
   if (g_playlistPlayer.GetPlaylist(PLAYLIST_MUSIC).size() && !g_application.IsPlayingAudio())
   {
     if (m_guiState.get())
@@ -820,10 +813,7 @@
 
     g_playlistPlayer.Reset();
     g_playlistPlayer.SetCurrentPlaylist(PLAYLIST_MUSIC);
-    if (g_playlistPlayer.IsShuffled(PLAYLIST_MUSIC))
-      g_playlistPlayer.Play();
-    else
-      g_playlistPlayer.Play(iOldSize);  //  Start playlist with the first new song added
+    g_playlistPlayer.Play(iOldSize); // start playing at the first new item
   }
 }
 
@@ -897,29 +887,6 @@
   }
 }
 
-void CGUIWindowMusicBase::AddItemToPlayList(const CFileItem *pItem, int playlist /* = PLAYLIST_MUSIC */)
-{
-  CFileItemList queuedItems;
-  queuedItems.SetFastLookup(true);
-  AddItemToPlayList(pItem, queuedItems);
-  // add these to the playlist player
-	/*
-  for (int i = 0; i < queuedItems.Size(); i++)
-  {
-    CPlayList::CPlayListItem playlistItem;
-    CUtil::ConvertFileItemToPlayListItem(queuedItems[i], playlistItem);
-    if (m_guiState.get() && m_guiState->HideExtensions())
-      playlistItem.RemoveExtension();
-    g_playlistPlayer.GetPlaylist(playlist).Add(playlistItem);
-  }
-	*/
-  // if we're playing music from the playlist, get the current song index
-  int iCurrentSong = -1;
-  if (g_application.IsPlayingAudio() && g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_MUSIC)
-    iCurrentSong = g_playlistPlayer.GetCurrentSong() + 2;
-	g_playlistPlayer.GetPlaylist(playlist).Append(queuedItems, iCurrentSong);
-}
-
 /// \brief Make the actual search for the OnSearch function.
 /// \param strSearch The search string
 /// \param items Items Found
@@ -1536,43 +1503,25 @@
     if (item.IsParentFolder())
       return;
 
-    // use PLAYLIST_MUSIC_TEMP as a holding location
-    // during party mode
-    int iPlaylist = PLAYLIST_MUSIC;
+    CFileItemList queuedItems;
+    AddItemToPlayList(&item, queuedItems);
     if (g_partyModeManager.IsEnabled())
-      iPlaylist = PLAYLIST_MUSIC_TEMP;
-
-    g_playlistPlayer.ClearPlaylist(iPlaylist);
-
-    // dont reset during party mode
-    if (!g_partyModeManager.IsEnabled())
-      g_playlistPlayer.Reset();
-
-    // recursively add items to playlist
-    AddItemToPlayList(&item, iPlaylist);
-
-    // send the playlist to party mode
-    if (g_partyModeManager.IsEnabled())
     {
-      g_partyModeManager.AddUserSongs(g_playlistPlayer.GetPlaylist(iPlaylist), true);
-      g_playlistPlayer.ClearPlaylist(iPlaylist);
+      g_partyModeManager.AddUserSongs(queuedItems, true);
       return;
     }
 
+    /*
     CStdString strPlayListDirectory = m_vecItems.m_strPath;
     if (CUtil::HasSlashAtEnd(strPlayListDirectory))
       strPlayListDirectory.Delete(strPlayListDirectory.size() - 1);
+    */
 
-    g_playlistPlayer.SetCurrentPlaylist(iPlaylist);
+    g_playlistPlayer.ClearPlaylist(PLAYLIST_MUSIC);
+    g_playlistPlayer.Reset();
+    g_playlistPlayer.Add(PLAYLIST_MUSIC, queuedItems);
+    g_playlistPlayer.SetCurrentPlaylist(PLAYLIST_MUSIC);
 
-    // Don't shuffle on load anymore - any shuffling can be performed by the normal playlist
-    // controls
-    /*
-    // shuffle playlist if folder is daap playlist folder
-    // and shuffle playlist on load is enabled
-    if (bIsDAAPplaylist && g_guiSettings.GetBool("musicplaylist.shuffleplaylistsonload"))
-      g_playlistPlayer.GetPlaylist(iPlaylist).Shuffle();*/
-
     // activate the playlist window if its not activated yet
     if (bIsDAAPplaylist && GetID() == m_gWindowManager.GetActiveWindow())
       m_gWindowManager.ActivateWindow(WINDOW_MUSIC_PLAYLIST);
@@ -1582,11 +1531,12 @@
   }
   else if (!g_advancedSettings.m_playlistAsFolders && pItem->IsPlayList())
   {
+    // load the playlist the old way
     LoadPlayList(pItem->m_strPath);
   }
-  // otherwise just play the song
   else
   {
+    // just a single item, play it
     OnClick(iItem);
   }
 }

Modified: trunk/XBMC/xbmc/GUIWindowMusicBase.h
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicBase.h	2006-11-26 16:11:34 UTC (rev 7239)
+++ trunk/XBMC/xbmc/GUIWindowMusicBase.h	2006-11-26 16:12:00 UTC (rev 7240)
@@ -44,7 +44,6 @@
 
   virtual void OnRetrieveMusicInfo(CFileItemList& items);
   void AddItemToPlayList(const CFileItem* pItem, CFileItemList &queuedItems);
-  void AddItemToPlayList(const CFileItem* pItem, int playlist = PLAYLIST_MUSIC);
   virtual void OnSearchItemFound(const CFileItem* pItem);
   virtual void DoSearch(const CStdString& strSearch, CFileItemList& items);
   virtual void OnScan() {};


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

Revision: 7241
          http://svn.sourceforge.net/xbmc/?rev=7241&view=rev
Author:   kraqh3d
Date:     2006-11-26 08:12:25 -0800 (Sun, 26 Nov 2006)

Log Message:
-----------
changed: playlist behaviour.  see this thread for details http://www.xboxmediacenter.com/forum/showthread.php?t=23386

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowMusicPlaylist.cpp
    trunk/XBMC/xbmc/GUIWindowMusicPlaylist.h

Modified: trunk/XBMC/xbmc/GUIWindowMusicPlaylist.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicPlaylist.cpp	2006-11-26 16:12:00 UTC (rev 7240)
+++ trunk/XBMC/xbmc/GUIWindowMusicPlaylist.cpp	2006-11-26 16:12:25 UTC (rev 7241)
@@ -21,11 +21,8 @@
 #define CONTROL_BTNPLAY      23
 #define CONTROL_BTNNEXT      24
 #define CONTROL_BTNPREVIOUS    25
-
 #define CONTROL_BTNREPEAT     26
-#define CONTROL_BTNRANDOMIZE  28
 
-
 CGUIWindowMusicPlayList::CGUIWindowMusicPlayList(void)
     : CGUIWindowMusicBase(WINDOW_MUSIC_PLAYLIST, "MyMusicPlaylist.xml")
 {
@@ -43,16 +40,17 @@
   switch ( message.GetMessage() )
   {
   case GUI_MSG_PLAYBACK_STOPPED:
-  case GUI_MSG_PLAYLISTPLAYER_RANDOM:
   case GUI_MSG_PLAYLISTPLAYER_REPEAT:
     {
       UpdateButtons();
     }
     break;
   
+  case GUI_MSG_PLAYLISTPLAYER_RANDOM:
   case GUI_MSG_PLAYLIST_CHANGED:
     {
       // global playlist changed outside playlist window
+      UpdateButtons();
       Update(m_vecItems.m_strPath);
 
       if (m_viewControl.HasControl(m_iLastControl) && m_vecItems.Size() <= 0)
@@ -64,6 +62,15 @@
     }
     break;
 
+  case GUI_MSG_WINDOW_DEINIT:
+    {
+      if (m_musicInfoLoader.IsLoading())
+        m_musicInfoLoader.StopThread();
+
+      iPos = -1;
+    }
+    break;
+
   case GUI_MSG_WINDOW_INIT:
     {
       // Setup item cache for tagloader
@@ -92,40 +99,20 @@
     }
     break;
 
-  case GUI_MSG_WINDOW_DEINIT:
-    {
-      if (m_musicInfoLoader.IsLoading())
-        m_musicInfoLoader.StopThread();
-
-      iPos = -1;
-    }
-    break;
-
   case GUI_MSG_CLICKED:
     {
       int iControl = message.GetSenderId();
-
-      if (iControl == CONTROL_BTNRANDOMIZE)
+      if (iControl == CONTROL_BTNSHUFFLE)
       {
-        // disable randomize button
-        /*
-        g_stSettings.m_bMyMusicPlaylistShuffle = !g_playlistPlayer.IsShuffled(PLAYLIST_MUSIC);
-        g_settings.Save();
-        g_playlistPlayer.SetShuffle(PLAYLIST_MUSIC, g_stSettings.m_bMyMusicPlaylistShuffle);
-        UpdateButtons();
-        */
+        if (!g_partyModeManager.IsEnabled())
+        {
+          g_playlistPlayer.SetShuffle(PLAYLIST_MUSIC, !(g_playlistPlayer.IsShuffled(PLAYLIST_MUSIC)));
+          g_stSettings.m_bMyMusicPlaylistShuffle = g_playlistPlayer.IsShuffled(PLAYLIST_MUSIC);
+          g_settings.Save();
+          UpdateButtons();
+          Update(m_vecItems.m_strPath);
+        }
       }
-      else if (iControl == CONTROL_BTNSHUFFLE)
-      {
-        // shuffle state is now saved, not randomize
-        ShufflePlayList();
-        if (g_playlistPlayer.GetPlaylist(PLAYLIST_MUSIC).IsShuffled())
-          g_stSettings.m_bMyMusicPlaylistShuffle = true;
-        else
-          g_stSettings.m_bMyMusicPlaylistShuffle = false;
-        g_settings.Save();
-        UpdateButtons();
-      }
       else if (iControl == CONTROL_BTNSAVE)
       {
         if (m_musicInfoLoader.IsLoading()) // needed since we destroy m_vecitems to save memory
@@ -319,41 +306,6 @@
   SET_CONTROL_FOCUS(CONTROL_BTNVIEWASICONS, 0);
 }
 
-void CGUIWindowMusicPlayList::ShufflePlayList()
-{
-  // disallow shuffle in party mode
-  if (g_partyModeManager.IsEnabled())
-    return;
-
-  int iPlaylist = PLAYLIST_MUSIC;
-  ClearFileItems();
-  CPlayList& playlist = g_playlistPlayer.GetPlaylist(iPlaylist);
-
-  CStdString strFileName;
-  if (g_application.IsPlayingAudio() && g_playlistPlayer.GetCurrentPlaylist() == iPlaylist)
-  {
-    const CPlayList::CPlayListItem& item = playlist[g_playlistPlayer.GetCurrentSong()];
-    strFileName = item.GetFileName();
-  }
-
-  // shuffle or unshuffle?
-  playlist.IsShuffled() ? playlist.UnShuffle() : playlist.Shuffle();
-  if (g_playlistPlayer.GetCurrentPlaylist() == iPlaylist)
-    g_playlistPlayer.Reset();
-
-  if (!strFileName.IsEmpty())
-  {
-    for (int i = 0; i < playlist.size(); i++)
-    {
-      const CPlayList::CPlayListItem& item = playlist[i];
-      if (item.GetFileName() == strFileName)
-        g_playlistPlayer.SetCurrentSong(i);
-    }
-  }
-
-  Update(m_vecItems.m_strPath);
-}
-
 void CGUIWindowMusicPlayList::RemovePlayListItem(int iItem)
 {
   if (iItem < 0 || iItem > m_vecItems.Size()) return;
@@ -399,7 +351,6 @@
   if (m_vecItems.Size() && !g_partyModeManager.IsEnabled())
   {
     CONTROL_ENABLE(CONTROL_BTNSHUFFLE);
-    CONTROL_ENABLE(CONTROL_BTNRANDOMIZE);
     CONTROL_ENABLE(CONTROL_BTNSAVE);
     CONTROL_ENABLE(CONTROL_BTNCLEAR);
     CONTROL_ENABLE(CONTROL_BTNREPEAT);
@@ -427,7 +378,6 @@
   {
     // disable buttons if party mode is enabled too
     CONTROL_DISABLE(CONTROL_BTNSHUFFLE);
-    CONTROL_DISABLE(CONTROL_BTNRANDOMIZE);
     CONTROL_DISABLE(CONTROL_BTNSAVE);
     CONTROL_DISABLE(CONTROL_BTNCLEAR);
     CONTROL_DISABLE(CONTROL_BTNREPEAT);
@@ -438,11 +388,8 @@
 
   // update buttons
   CONTROL_DESELECT(CONTROL_BTNSHUFFLE);
-  CONTROL_DESELECT(CONTROL_BTNRANDOMIZE);
-  if (g_playlistPlayer.GetPlaylist(PLAYLIST_MUSIC).IsShuffled())
-    CONTROL_SELECT(CONTROL_BTNSHUFFLE);
   if (g_playlistPlayer.IsShuffled(PLAYLIST_MUSIC))
-    CONTROL_SELECT(CONTROL_BTNRANDOMIZE);
+    CONTROL_SELECT(CONTROL_BTNSHUFFLE);
 
   // update repeat button
   int iRepeat = 595 + g_playlistPlayer.GetRepeat(PLAYLIST_MUSIC);
@@ -458,10 +405,6 @@
   CStdString items;
   items.Format("%i %s", iItems, g_localizeStrings.Get(127).c_str());
   SET_CONTROL_LABEL(CONTROL_LABELFILES, items);
-
-   // disable the randomize control
-  CONTROL_DESELECT(CONTROL_BTNRANDOMIZE);
-  CONTROL_DISABLE(CONTROL_BTNRANDOMIZE);
 }
 
 bool CGUIWindowMusicPlayList::OnPlayMedia(int iItem)
@@ -477,10 +420,6 @@
         m_guiState->SetPlaylistDirectory(m_vecItems.m_strPath);
 
       g_playlistPlayer.SetCurrentPlaylist( iPlaylist );
-
-      // I don't see why we should be reset'ing here.  The playlist has not
-      // been changed in anyway from what I can see
-//      g_playlistPlayer.Reset();
       g_playlistPlayer.Play( iItem );
     }
     else

Modified: trunk/XBMC/xbmc/GUIWindowMusicPlaylist.h
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicPlaylist.h	2006-11-26 16:12:00 UTC (rev 7240)
+++ trunk/XBMC/xbmc/GUIWindowMusicPlaylist.h	2006-11-26 16:12:25 UTC (rev 7241)
@@ -25,7 +25,6 @@
 
   void SavePlayList();
   void ClearPlayList();
-  void ShufflePlayList();
   
   bool MoveCurrentPlayListItem(int iItem, int iAction, bool bUpdate = true);
 


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

Revision: 7242
          http://svn.sourceforge.net/xbmc/?rev=7242&view=rev
Author:   kraqh3d
Date:     2006-11-26 08:13:08 -0800 (Sun, 26 Nov 2006)

Log Message:
-----------
changed: playlist behaviour.  see this thread for details http://www.xboxmediacenter.com/forum/showthread.php?t=23386

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
    trunk/XBMC/xbmc/GUIWindowVideoBase.h

Modified: trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2006-11-26 16:12:25 UTC (rev 7241)
+++ trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2006-11-26 16:13:08 UTC (rev 7242)
@@ -518,29 +518,91 @@
 void CGUIWindowVideoBase::OnQueueItem(int iItem)
 {
   if ( iItem < 0 || iItem >= m_vecItems.Size() ) return ;
-  // add item 2 playlist
-  CFileItem movieItem(*m_vecItems[iItem]);
-  if (movieItem.IsRAR() || movieItem.IsZIP())
+
+  int iOldSize=g_playlistPlayer.GetPlaylist(PLAYLIST_VIDEO).size();
+
+  CFileItem item(*m_vecItems[iItem]);
+  if (item.IsRAR() || item.IsZIP())
     return;
-  if (movieItem.IsStack())
+
+  //  Allow queuing of unqueueable items
+  //  when we try to queue them directly
+  if (!item.CanQueue())
+    item.SetCanQueue(true);
+
+  CFileItemList queuedItems;
+  AddItemToPlayList(&item, queuedItems);
+  g_playlistPlayer.Add(PLAYLIST_VIDEO, queuedItems);
+  // video does not auto play on queue like music
+  m_viewControl.SetSelectedItem(iItem + 1);
+}
+
+void CGUIWindowVideoBase::AddItemToPlayList(const CFileItem* pItem, CFileItemList &queuedItems)
+{
+  if (!pItem->CanQueue() || pItem->IsRAR() || pItem->IsZIP() || pItem->IsParentFolder()) // no zip/rar enques thank you!
+    return;
+
+  if (pItem->m_bIsFolder)
   {
-    // TODO: Remove this once the main player code is capable of handling the stack:// protocol
-    vector<CStdString> movies;
-    GetStackedFiles(movieItem.m_strPath, movies);
-    if (movies.size() <= 0) return;
-    for (int i = 0; i < (int)movies.size(); ++i)
+    if (pItem->IsParentFolder()) return;
+
+    // Check if we add a locked share
+    if ( pItem->m_bIsShareOrDrive )
     {
-      CFileItem movieFile(movies[i], false);
-      CStdString strFileNum;
-      strFileNum.Format("(%2.2i)",i+1);
-      movieFile.SetLabel(movieItem.GetLabel() + " " + strFileNum);
-      AddItemToPlayList(&movieFile);
+      CFileItem item = *pItem;
+      if ( !g_passwordManager.IsItemUnlocked( &item, "video" ) )
+        return ;
     }
+
+    // recursive
+    CFileItemList items;
+    GetDirectory(pItem->m_strPath, items);
+    SortItems(items);
+
+    for (int i = 0; i < items.Size(); ++i)
+    {
+      if (items[i]->m_bIsFolder)
+      {
+        CStdString strPath = items[i]->m_strPath;
+        if (CUtil::HasSlashAtEnd(strPath))
+          strPath.erase(strPath.size()-1);
+        strPath.ToLower();
+        if (strPath.size() > 6)
+        {
+          CStdString strSub = strPath.substr(strPath.size()-6);
+          if (strPath.substr(strPath.size()-6) == "sample") // skip sample folders
+            continue;
+        }
+      }
+      AddItemToPlayList(items[i], queuedItems);
+    }
   }
   else
-    AddItemToPlayList(&movieItem);
-  //move to next item
-  m_viewControl.SetSelectedItem(iItem + 1);
+  {
+    // just an item
+    if (!pItem->IsNFO() && pItem->IsVideo() && !pItem->IsPlayList())
+    {
+      queuedItems.Add(new CFileItem(*pItem));
+    }
+    if (!g_advancedSettings.m_playlistAsFolders && pItem->IsPlayList())
+    {
+      CPlayListFactory factory;
+      auto_ptr<CPlayList> pPlayList (factory.Create(pItem->m_strPath));
+      if ( NULL != pPlayList.get())
+      {
+        // load it
+        if (!pPlayList->Load(pItem->m_strPath))
+        {
+          CGUIDialogOK::ShowAndGetInput(6, 0, 477, 0);
+          return; //hmmm unable to load playlist?
+        }
+
+        CPlayList playlist = *pPlayList;
+        for (int i = 0; i < (int)playlist.size(); ++i)
+          AddItemToPlayList(&playlist[i], queuedItems);
+      }
+    }
+  }
 }
 
 void CGUIWindowVideoBase::AddItemToPlayList(const CFileItem* pItem, int iPlaylist /* = PLAYLIST_VIDEO */)
@@ -591,7 +653,7 @@
       playlistItem.SetFileName(pItem->m_strPath);
       playlistItem.SetDescription(pItem->GetLabel());
       playlistItem.SetDuration(pItem->m_musicInfoTag.GetDuration());
-      g_playlistPlayer.GetPlaylist(iPlaylist).Add(playlistItem);
+      g_playlistPlayer.Add(iPlaylist, playlistItem);
     }
   }
 }
@@ -1009,8 +1071,8 @@
   }
 
   g_playlistPlayer.Reset();
-  g_playlistPlayer.SetCurrentPlaylist(PLAYLIST_VIDEO_TEMP);
-  CPlayList& playlist = g_playlistPlayer.GetPlaylist(PLAYLIST_VIDEO_TEMP);
+  g_playlistPlayer.SetCurrentPlaylist(PLAYLIST_VIDEO);
+  CPlayList& playlist = g_playlistPlayer.GetPlaylist(PLAYLIST_VIDEO);
   playlist.Clear();
   for (int i = selectedFile - 1; i < (int)movieList.Size(); ++i)
   {
@@ -1020,9 +1082,8 @@
       playlistItem.m_lStartOffset = startoffset;
     playlist.Add(playlistItem);
   }
-
   // play movie...
-  g_playlistPlayer.PlayNext();
+  g_playlistPlayer.Play(0);
 }
 
 void CGUIWindowVideoBase::OnDeleteItem(int iItem)
@@ -1151,24 +1212,26 @@
     if (item.IsParentFolder())
       return;
 
-    // clear current temp playlist
-    g_playlistPlayer.ClearPlaylist(PLAYLIST_VIDEO_TEMP);
+    // recursively add items to list
+    CFileItemList queuedItems;
+    AddItemToPlayList(&item, queuedItems);
+
+    g_playlistPlayer.ClearPlaylist(PLAYLIST_VIDEO);
     g_playlistPlayer.Reset();
-
-    // recursively add items to temp playlist
-    AddItemToPlayList(&item, PLAYLIST_VIDEO_TEMP);
-
-    // play!
-    g_playlistPlayer.SetCurrentPlaylist(PLAYLIST_VIDEO_TEMP);
+    g_playlistPlayer.Add(PLAYLIST_VIDEO, queuedItems);
+    g_playlistPlayer.SetCurrentPlaylist(PLAYLIST_VIDEO);
     g_playlistPlayer.Play();
   }
   else if (!g_advancedSettings.m_playlistAsFolders && pItem->IsPlayList())
   {
-    LoadPlayList(pItem->m_strPath, PLAYLIST_VIDEO_TEMP);
+    // load the playlist the old way
+    LoadPlayList(pItem->m_strPath, PLAYLIST_VIDEO);
   }
-  // otherwise just play the song
   else
+  {
+    // single item, play it
     OnClick(iItem);
+  }
 }
 
 CStdString CGUIWindowVideoBase::GetnfoFile(CFileItem *item)

Modified: trunk/XBMC/xbmc/GUIWindowVideoBase.h
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoBase.h	2006-11-26 16:12:25 UTC (rev 7241)
+++ trunk/XBMC/xbmc/GUIWindowVideoBase.h	2006-11-26 16:13:08 UTC (rev 7242)
@@ -45,6 +45,7 @@
   bool CheckMovie(const CStdString& strFileName);
 
   void AddItemToPlayList(const CFileItem* pItem, int iPlaylist = PLAYLIST_VIDEO);
+  void AddItemToPlayList(const CFileItem* pItem, CFileItemList &queuedItems);
   void GetStackedFiles(const CStdString &strFileName, std::vector<CStdString> &movies);
   CStdString GetnfoFile(CFileItem *item);
 


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

Revision: 7243
          http://svn.sourceforge.net/xbmc/?rev=7243&view=rev
Author:   kraqh3d
Date:     2006-11-26 08:13:29 -0800 (Sun, 26 Nov 2006)

Log Message:
-----------
changed: playlist behaviour.  see this thread for details http://www.xboxmediacenter.com/forum/showthread.php?t=23386

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowVideoPlaylist.cpp
    trunk/XBMC/xbmc/GUIWindowVideoPlaylist.h

Modified: trunk/XBMC/xbmc/GUIWindowVideoPlaylist.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoPlaylist.cpp	2006-11-26 16:13:08 UTC (rev 7242)
+++ trunk/XBMC/xbmc/GUIWindowVideoPlaylist.cpp	2006-11-26 16:13:29 UTC (rev 7243)
@@ -20,9 +20,7 @@
 #define CONTROL_BTNPLAY      23
 #define CONTROL_BTNNEXT      24
 #define CONTROL_BTNPREVIOUS    25
-
 #define CONTROL_BTNREPEAT     26
-#define CONTROL_BTNRANDOMIZE  28
 
 CGUIWindowVideoPlaylist::CGUIWindowVideoPlaylist()
 : CGUIWindowVideoBase(WINDOW_VIDEO_PLAYLIST, "MyVideoPlaylist.xml")
@@ -39,13 +37,29 @@
   switch ( message.GetMessage() )
   {
 
-  case GUI_MSG_PLAYLISTPLAYER_RANDOM:
+  case GUI_MSG_PLAYBACK_STOPPED:
   case GUI_MSG_PLAYLISTPLAYER_REPEAT:
     {
       UpdateButtons();
     }
     break;
+  
+  case GUI_MSG_PLAYLISTPLAYER_RANDOM:
+  case GUI_MSG_PLAYLIST_CHANGED:
+    {
+      // global playlist changed outside playlist window
+      UpdateButtons();
+      Update(m_vecItems.m_strPath);
 
+      if (m_viewControl.HasControl(m_iLastControl) && m_vecItems.Size() <= 0)
+      {
+        m_iLastControl = CONTROL_BTNVIEWASICONS;
+        SET_CONTROL_FOCUS(m_iLastControl, 0);
+      }
+
+    }
+    break;
+
   case GUI_MSG_WINDOW_DEINIT:
     {
       iPos = -1;
@@ -81,18 +95,14 @@
   case GUI_MSG_CLICKED:
     {
       int iControl = message.GetSenderId();
-      if (iControl == CONTROL_BTNRANDOMIZE)
+      if (iControl == CONTROL_BTNSHUFFLE)
       {
-        g_stSettings.m_bMyVideoPlaylistShuffle = !g_playlistPlayer.IsShuffled(PLAYLIST_VIDEO);
+        g_playlistPlayer.SetShuffle(PLAYLIST_VIDEO, !(g_playlistPlayer.IsShuffled(PLAYLIST_VIDEO)));
+        g_stSettings.m_bMyVideoPlaylistShuffle = g_playlistPlayer.IsShuffled(PLAYLIST_VIDEO);
         g_settings.Save();
-        g_playlistPlayer.SetShuffle(PLAYLIST_VIDEO, g_stSettings.m_bMyVideoPlaylistShuffle);
         UpdateButtons();
+        Update(m_vecItems.m_strPath);
       }
-      else if (iControl == CONTROL_BTNSHUFFLE)
-      {
-        ShufflePlayList();
-        UpdateButtons();
-      }
       else if (iControl == CONTROL_BTNSAVE)
       {
         SavePlayList();
@@ -236,7 +246,6 @@
     CONTROL_ENABLE(CONTROL_BTNSAVE);
     CONTROL_ENABLE(CONTROL_BTNPLAY);
     CONTROL_ENABLE(CONTROL_BTNSHUFFLE);
-    CONTROL_ENABLE(CONTROL_BTNRANDOMIZE);
     CONTROL_ENABLE(CONTROL_BTNREPEAT);
 
     if (g_application.IsPlayingVideo() && g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_VIDEO)
@@ -255,7 +264,6 @@
     CONTROL_DISABLE(CONTROL_BTNCLEAR);
     CONTROL_DISABLE(CONTROL_BTNSAVE);
     CONTROL_DISABLE(CONTROL_BTNSHUFFLE);
-    CONTROL_DISABLE(CONTROL_BTNRANDOMIZE);
     CONTROL_DISABLE(CONTROL_BTNPLAY);
     CONTROL_DISABLE(CONTROL_BTNNEXT);
     CONTROL_DISABLE(CONTROL_BTNPREVIOUS);
@@ -266,11 +274,8 @@
 
   // update buttons
   CONTROL_DESELECT(CONTROL_BTNSHUFFLE);
-  CONTROL_DESELECT(CONTROL_BTNRANDOMIZE);
-  if (g_playlistPlayer.GetPlaylist(PLAYLIST_VIDEO).IsShuffled())
-    CONTROL_SELECT(CONTROL_BTNSHUFFLE);
   if (g_playlistPlayer.IsShuffled(PLAYLIST_VIDEO))
-    CONTROL_SELECT(CONTROL_BTNRANDOMIZE);
+    CONTROL_SELECT(CONTROL_BTNSHUFFLE);
 
   // update repeat button
   int iRepeat = 595 + g_playlistPlayer.GetRepeat(PLAYLIST_VIDEO);
@@ -283,7 +288,6 @@
   CFileItem* pItem = m_vecItems[iItem];
   CStdString strPath = pItem->m_strPath;
   g_playlistPlayer.SetCurrentPlaylist(PLAYLIST_VIDEO);
-  g_playlistPlayer.Reset();
   g_playlistPlayer.Play( iItem );
 
   return true;
@@ -322,37 +326,6 @@
   }
 }
 
-void CGUIWindowVideoPlaylist::ShufflePlayList()
-{
-  int iPlaylist = PLAYLIST_VIDEO;
-  ClearFileItems();
-  CPlayList& playlist = g_playlistPlayer.GetPlaylist(iPlaylist);
-
-  CStdString strFileName;
-  if (g_application.IsPlayingVideo() && g_playlistPlayer.GetCurrentPlaylist() == iPlaylist)
-  {
-    const CPlayList::CPlayListItem& item = playlist[g_playlistPlayer.GetCurrentSong()];
-    strFileName = item.GetFileName();
-  }
-
-  // shuffle or unshuffle?
-  playlist.IsShuffled() ? playlist.UnShuffle() : playlist.Shuffle();
-  if (g_playlistPlayer.GetCurrentPlaylist() == iPlaylist)
-    g_playlistPlayer.Reset();
-
-  if (!strFileName.IsEmpty())
-  {
-    for (int i = 0; i < playlist.size(); i++)
-    {
-      const CPlayList::CPlayListItem& item = playlist[i];
-      if (item.GetFileName() == strFileName)
-        g_playlistPlayer.SetCurrentSong(i);
-    }
-  }
-
-  Update(m_vecItems.m_strPath);
-}
-
 /// \brief Save current playlist to playlist folder
 void CGUIWindowVideoPlaylist::SavePlayList()
 {

Modified: trunk/XBMC/xbmc/GUIWindowVideoPlaylist.h
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoPlaylist.h	2006-11-26 16:13:08 UTC (rev 7242)
+++ trunk/XBMC/xbmc/GUIWindowVideoPlaylist.h	2006-11-26 16:13:29 UTC (rev 7243)
@@ -22,7 +22,6 @@
   bool MoveCurrentPlayListItem(int iItem, int iAction, bool bUpdate = true);
   void MoveItem(int iStart, int iDest);
 
-  void ShufflePlayList();
   void SavePlayList();
 
   int iPos;


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

Revision: 7244
          http://svn.sourceforge.net/xbmc/?rev=7244&view=rev
Author:   kraqh3d
Date:     2006-11-26 08:14:05 -0800 (Sun, 26 Nov 2006)

Log Message:
-----------
changed: playlist behaviour.  see this thread for details http://www.xboxmediacenter.com/forum/showthread.php?t=23386

Modified Paths:
--------------
    trunk/XBMC/xbmc/PlayList.cpp
    trunk/XBMC/xbmc/PlayList.h

Modified: trunk/XBMC/xbmc/PlayList.cpp
===================================================================
--- trunk/XBMC/xbmc/PlayList.cpp	2006-11-26 16:13:29 UTC (rev 7243)
+++ trunk/XBMC/xbmc/PlayList.cpp	2006-11-26 16:14:05 UTC (rev 7244)
@@ -9,7 +9,6 @@
 {
   m_lStartOffset = 0;
   m_lEndOffset = 0;
-  m_bPlayed = false;
   m_bUnPlayable = false;
 	m_iprogramCount = 0;
 }
@@ -21,7 +20,6 @@
   m_lDuration = lDuration;
   m_lStartOffset = lStartOffset;
   m_lEndOffset = lEndOffset;
-  m_bPlayed = false;
   m_bUnPlayable = false;
 	m_iprogramCount = 0;
 }
@@ -102,9 +100,9 @@
 CPlayList::CPlayList(void)
 {
   m_strPlayListName = "";
-  m_iUnplayedItems = -1;
   m_iPlayableItems = -1;
   m_bShuffled = false;
+  m_bWasPlayed = false;
 }
 
 CPlayList::~CPlayList(void)
@@ -112,79 +110,141 @@
   Clear();
 }
 
-void CPlayList::Add(CPlayListItem& item, int iOffset /* = -1 */)
+void CPlayList::Add(CPlayListItem& item, int iPosition, int iOrder)
 {
-  // when appending a playlist, the ordinals need to be offset
-	if (iOffset < 0)
-    item.m_iprogramCount = m_vecItems.size();
+  int iOldSize = size();
+  if (iPosition < 0 || iPosition >= iOldSize)
+    iPosition = iOldSize;
+  if (iOrder < 0 || iOrder >= iOldSize)
+    item.m_iprogramCount = iOldSize;
 	else
-		item.m_iprogramCount += iOffset;
+		item.m_iprogramCount = iOrder;
 
-	//CLog::Log(LOGDEBUG,"CPlayList::Add, item(%i):%s, order:%i", m_vecItems.size(), item.m_strPath.c_str(), item.m_iprogramCount);
-  m_vecItems.push_back(item);
+  // increment the playable counter
+  item.ClearUnPlayable();
+  if (m_iPlayableItems < 0)
+    m_iPlayableItems = 1;
+  else
+    m_iPlayableItems++;
 
-  // increment the unplayed song count
-  if (!item.WasPlayed())
+  //CLog::Log(LOGDEBUG,__FUNCTION__" item:(%02i/%02i)[%s]", iPosition, item.m_iprogramCount, item.m_strPath.c_str());
+  if (iPosition == iOldSize)
+    m_vecItems.push_back(item);
+  else
   {
-    if (m_iUnplayedItems < 0)
-      m_iUnplayedItems = 1;
-    else
-      m_iUnplayedItems++;
+    ivecItems it = m_vecItems.begin() + iPosition;
+    m_vecItems.insert(it, 1, item);
+    // correct any duplicate order values
+    if (iOrder < iOldSize)
+      IncrementOrder(iPosition + 1, iOrder);
   }
+}
 
-  // increment the playable counter
-  if (!item.IsUnPlayable())
-  {
-    if (m_iPlayableItems < 0)
-      m_iPlayableItems = 1;
-    else
-      m_iPlayableItems++;
-  }
+void CPlayList::Add(CPlayListItem& item)
+{
+  Add(item, -1, -1);
 }
 
+void CPlayList::Add(CPlayList& playlist)
+{
+	for (int i = 0; i < (int)playlist.size(); i++)
+		Add(playlist[i], -1, -1);
+}
+
 void CPlayList::Add(CFileItem *pItem)
 {
 	CPlayList::CPlayListItem playlistItem;
   CUtil::ConvertFileItemToPlayListItem(pItem, playlistItem);
-	Add(playlistItem);
+	Add(playlistItem, -1, -1);
 }
 
-void CPlayList::Append(CPlayList& playlist, int iShuffleAt)
+void CPlayList::Add(CFileItemList& items)
 {
-  // when appending a playlist, the ordinals need to be offset
-	int iOffset = size();
-  if (iShuffleAt < 0 || iShuffleAt > iOffset)
-    iShuffleAt = iOffset;
+	for (int i = 0; i < (int)items.Size(); i++)
+		Add(items[i]);
+}
+
+void CPlayList::Insert(CPlayList& playlist, int iPosition /* = -1 */)
+{
+  // out of bounds so just add to the end
+  int iSize = size();
+  if (iPosition < 0 || iPosition >= iSize)
+  {
+    Add(playlist);
+    return;
+  }
 	for (int i = 0; i < (int)playlist.size(); i++)
-	{
-		Add(playlist[i], iOffset);
-	}
-  // shuffle newly added items
-	if (IsShuffled())
-		Shuffle(iShuffleAt);
+  {
+    int iPos = iPosition + i;
+		Add(playlist[i], iPos, iPos);
+  }
 }
 
-void CPlayList::Append(CFileItemList& items, int iShuffleAt)
+void CPlayList::Insert(CFileItemList& items, int iPosition /* = -1 */)
 {
-  int iOffset = size();
-  if (iShuffleAt < 0 || iShuffleAt > iOffset)
-    iShuffleAt = iOffset;
-	for (int i = 0; i < (int)items.Size(); i++)
+  // out of bounds so just add to the end
+  int iSize = size();
+  if (iPosition < 0 || iPosition >= iSize)
   {
-		Add(items[i]);
+    Add(items);
+    return;
   }
-  // shuffle newly added items
-	if (IsShuffled())
-		Shuffle(iShuffleAt);
+  for (int i = 0; i < (int)items.Size(); i++)
+  {
+    int iPos = iPosition + i;
+    CPlayList::CPlayListItem playlistItem;
+    CUtil::ConvertFileItemToPlayListItem(items[i], playlistItem);
+		Add(playlistItem, iPos, iPos);
+  }
 }
 
+void CPlayList::DecrementOrder(int iOrder)
+{
+  if (iOrder < 0) return;
+
+  // it was the last item so do nothing
+  if (iOrder == size()) return;
+
+  // fix all items with an order greater than the removed iOrder
+  ivecItems it;
+  it = m_vecItems.begin();
+  while (it != m_vecItems.end())
+  {
+    CPlayListItem& item = *it;
+    if (item.m_iprogramCount > iOrder)
+    {
+      //CLog::Log(LOGDEBUG,__FUNCTION__" fixing item at order %i", item.m_iprogramCount);
+      item.m_iprogramCount--;
+    }
+    ++it;
+  }
+}
+
+void CPlayList::IncrementOrder(int iPosition, int iOrder)
+{
+  if (iOrder < 0) return;
+
+  // fix all items with an order equal or greater to the added iOrder at iPos
+  ivecItems it;
+  it = m_vecItems.begin() + iPosition;
+  while (it != m_vecItems.end())
+  {
+    CPlayListItem& item = *it;
+    if (item.m_iprogramCount >= iOrder)
+    {
+      //CLog::Log(LOGDEBUG,__FUNCTION__" fixing item at order %i", item.m_iprogramCount);
+      item.m_iprogramCount++;
+    }
+    ++it;
+  }
+}
+
 void CPlayList::Clear()
 {
   m_vecItems.erase(m_vecItems.begin(), m_vecItems.end());
   m_strPlayListName = "";
-  m_iUnplayedItems = -1;
   m_iPlayableItems = -1;
-  //m_bShuffled = false;  // dont reset the shuffled attribute on clear
+  m_bWasPlayed = false;
 }
 
 int CPlayList::size() const
@@ -202,14 +262,6 @@
   return m_vecItems[iItem];
 }
 
-bool CPlayList::CPlayListItem::WasPlayed() const
-{
-  if (IsUnPlayable())
-    return true;
-  else
-    return m_bPlayed;
-}
-
 bool CPlayList::CPlayListItem::IsUnPlayable() const
 {
   return m_bUnPlayable;
@@ -228,7 +280,7 @@
       return;
     if (iPosition < 0)
       iPosition = 0;
-    CLog::Log(LOGDEBUG,__FUNCTION__" - shuffling at pos:%i", iPosition);
+    CLog::Log(LOGDEBUG,__FUNCTION__":shuffling at pos:%i", iPosition);
 
     ivecItems it = m_vecItems.begin() + iPosition;
     random_shuffle(it, m_vecItems.end());
@@ -268,10 +320,6 @@
     CPlayListItem& item = *it;
     if (item.GetFileName() == strFileName)
     {
-      // decrement unplayed count
-      if (!item.WasPlayed())
-        m_iUnplayedItems--;
-
       iOrder = item.m_iprogramCount;
       it = m_vecItems.erase(it);
       //CLog::Log(LOGDEBUG,"PLAYLIST, removing item at order %i", iPos);
@@ -279,29 +327,17 @@
     else
       ++it;
   }
-  FixOrder(iOrder);
+  DecrementOrder(iOrder);
 }
 
-void CPlayList::FixOrder(int iOrder)
+int CPlayList::FindOrder(int iOrder)
 {
-  if (iOrder < 0) return;
-
-  // the last item was removed
-  if (iOrder == (size() + 1)) return;
-
-  // fix all items with a pos higher than position
-  ivecItems it;
-  it = m_vecItems.begin();
-  while (it != m_vecItems.end() )
+  for (int i = 0; i < size(); i++)
   {
-    CPlayListItem& item = *it;
-    if (item.m_iprogramCount > iOrder)
-    {
-      //CLog::Log(LOGDEBUG,"  fixing item at order %i", item.m_iprogramCount);
-      item.m_iprogramCount--;
-    }
-    ++it;
+    if (m_vecItems[i].m_iprogramCount == iOrder)
+      return i;
   }
+  return -1;
 }
 
 // remove item from playlist by position
@@ -311,11 +347,9 @@
   if (position < (int)m_vecItems.size())
   {
     iOrder = m_vecItems[position].m_iprogramCount;
-    if (!m_vecItems[position].WasPlayed())
-      m_iUnplayedItems--;
     m_vecItems.erase(m_vecItems.begin() + position);
   }
-  FixOrder(iOrder);
+  DecrementOrder(iOrder);
 }
 
 int CPlayList::RemoveDVDItems()
@@ -381,15 +415,6 @@
   return true;
 }
 
-void CPlayList::SetPlayed(int iItem)
-{
-  if (!m_vecItems[iItem].WasPlayed())
-  {
-    m_vecItems[iItem].SetPlayed();
-    m_iUnplayedItems--;
-  }
-}
-
 void CPlayList::SetUnPlayable(int iItem)
 {
   if (!m_vecItems[iItem].IsUnPlayable())
@@ -397,11 +422,4 @@
     m_vecItems[iItem].SetUnPlayable();
     m_iPlayableItems--;
   }
-}
-
-void CPlayList::ClearPlayed()
-{
-  for (int i = 0; i < (int)m_vecItems.size(); i++)
-    m_vecItems[i].ClearPlayed();
-  m_iUnplayedItems = m_vecItems.size();
-}
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/PlayList.h
===================================================================
--- trunk/XBMC/xbmc/PlayList.h	2006-11-26 16:13:29 UTC (rev 7243)
+++ trunk/XBMC/xbmc/PlayList.h	2006-11-26 16:14:05 UTC (rev 7244)
@@ -35,17 +35,12 @@
     void SetMusicTag(const CMusicInfoTag &tag);
     CMusicInfoTag GetMusicTag() const;
 
-    bool WasPlayed() const;
-    void SetPlayed() { m_bPlayed = true; };
-    void ClearPlayed() { m_bPlayed = false; };
-
     bool IsUnPlayable() const;
     void SetUnPlayable() { m_bUnPlayable = true; };
     void ClearUnPlayable() { m_bUnPlayable = false; };
 
   protected:
     long m_lDuration;
-    bool m_bPlayed;
     bool m_bUnPlayable;
   };
 
@@ -53,10 +48,17 @@
   virtual ~CPlayList(void);
   virtual bool Load(const CStdString& strFileName, bool bDeep = true){ return false;};
   virtual void Save(const CStdString& strFileName) const {};
-  void Add(CPlayListItem& item, int iOffset = -1);
-	void Add(CFileItem *pItem);
-	void Append(CPlayList& playlist, int iShuffleAt = -1);
-	void Append(CFileItemList& items, int iShuffleAt = -1);
+
+  void Add(CPlayListItem& item);
+  void Add(CPlayList& playlist);
+  void Add(CFileItem *pItem);
+	void Add(CFileItemList& items);
+
+  // for Party Mode
+  void Insert(CPlayList& playlist, int iPosition = -1);
+  void Insert(CFileItemList& items, int iPosition = -1);
+
+  int FindOrder(int iOrder);
   const CStdString& GetName() const;
   void Remove(const CStdString& strFileName);
   void Remove(int position);
@@ -64,26 +66,32 @@
   void Clear();
   int size() const;
   int RemoveDVDItems();
+
   const CPlayList::CPlayListItem& operator[] (int iItem) const;
   CPlayList::CPlayListItem& operator[] (int iItem);
 
-  virtual void Shuffle(int iPosition = 0);
-  virtual void UnShuffle();
-  virtual bool IsShuffled() { return m_bShuffled; }
-  void FixOrder(int iOrder);
+  // why are these virtual functions? there is no derived child class
+  void Shuffle(int iPosition = 0);
+  void UnShuffle();
+  bool IsShuffled() { return m_bShuffled; }
 
-  void SetPlayed(int iItem);
+  void SetPlayed(bool bPlayed) { m_bWasPlayed = true; };
+  bool WasPlayed() { return m_bWasPlayed; };
+
   void SetUnPlayable(int iItem);
-  void ClearPlayed();
-  int GetUnplayed() { return m_iUnplayedItems; };
   int GetPlayable() { return m_iPlayableItems; };
 
 protected:
   CStdString m_strPlayListName;
-  int m_iUnplayedItems;
   int m_iPlayableItems;
   bool m_bShuffled;
+  bool m_bWasPlayed;
   vector <CPlayListItem> m_vecItems;
   typedef vector <CPlayListItem>::iterator ivecItems;
+
+private:
+  void Add(CPlayListItem& item, int iPosition, int iOrderOffset);
+  void DecrementOrder(int iOrder);
+  void IncrementOrder(int iPosition, int iOrder);
 };
 };


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

Revision: 7245
          http://svn.sourceforge.net/xbmc/?rev=7245&view=rev
Author:   kraqh3d
Date:     2006-11-26 08:14:55 -0800 (Sun, 26 Nov 2006)

Log Message:
-----------
changed: playlist behaviour.  see this thread for details http://www.xboxmediacenter.com/forum/showthread.php?t=23386

Modified Paths:
--------------
    trunk/XBMC/xbmc/PartyModeManager.cpp
    trunk/XBMC/xbmc/PartyModeManager.h

Modified: trunk/XBMC/xbmc/PartyModeManager.cpp
===================================================================
--- trunk/XBMC/xbmc/PartyModeManager.cpp	2006-11-26 16:14:05 UTC (rev 7244)
+++ trunk/XBMC/xbmc/PartyModeManager.cpp	2006-11-26 16:14:55 UTC (rev 7245)
@@ -120,7 +120,7 @@
     m_iSongsPlayed++;
 }
 
-void CPartyModeManager::AddUserSongs(CPlayList& playlistTemp, bool bPlay /* = false */)
+void CPartyModeManager::AddUserSongs(CPlayList& tempList, bool bPlay /* = false */)
 {
   if (!IsEnabled())
     return;
@@ -132,25 +132,37 @@
   else
     iAddAt = m_iLastUserSong + 1; // under the last user added song
 
-  int iNewUserSongs = playlistTemp.size();
+  int iNewUserSongs = tempList.size();
   CLog::Log(LOGINFO,"PARTY MODE MANAGER: Adding %i user selected songs at %i", iNewUserSongs, iAddAt);
 
-  // get songs starting at the AddAt location move them to the temp playlist
-  // TODO: find a better way to do this
-  // maybe something like playlist.Add(CPlayList& playlistTemp, int iPos)?
-  CPlayList& playlist = g_playlistPlayer.GetPlaylist(PLAYLIST_MUSIC);
-  while (playlist.size() > iAddAt)
-  {
-    playlistTemp.Add(playlist[iAddAt]);
-    playlist.Remove(iAddAt);
-  }
+  g_playlistPlayer.GetPlaylist(PLAYLIST_MUSIC).Insert(tempList, iAddAt);
 
-  // now add temp playlist to back real playlist
-  for (int i=0; i<playlistTemp.size(); i++)
-  {
-    playlist.Add(playlistTemp[i]);
-  }
+  // update last user added song location
+  if (m_iLastUserSong < 0)
+    m_iLastUserSong = 0;
+  m_iLastUserSong += iNewUserSongs;
 
+  if (bPlay)
+    Play(1);
+}
+
+void CPartyModeManager::AddUserSongs(CFileItemList& tempList, bool bPlay /* = false */)
+{
+  if (!IsEnabled())
+    return;
+
+  // where do we add?
+  int iAddAt = -1;
+  if (m_iLastUserSong < 0 || bPlay)
+    iAddAt = 1; // under the currently playing song
+  else
+    iAddAt = m_iLastUserSong + 1; // under the last user added song
+
+  int iNewUserSongs = tempList.Size();
+  CLog::Log(LOGINFO,"PARTY MODE MANAGER: Adding %i user selected songs at %i", iNewUserSongs, iAddAt);
+
+  g_playlistPlayer.GetPlaylist(PLAYLIST_MUSIC).Insert(tempList, iAddAt);
+
   // update last user added song location
   if (m_iLastUserSong < 0)
     m_iLastUserSong = 0;
@@ -245,38 +257,12 @@
 
   // reap any played songs
   int iCurrentSong = g_playlistPlayer.GetCurrentSong();
-  /*vector<int> vecPlayed;
-  for (int i=0; i<playlist.size(); i++)
-  {
-    // get played song list
-    if ((playlist[i].WasPlayed() && i != iCurrentSong)
-      vecPlayed.push_back(i);
-    else if (i < iCurrentSong)
-      vecPlayed.push_back(0);
-  }
-  // dont remove them while traversing the playlist!
-  for (int i=0; i<(int)vecPlayed.size(); i++)
-  {
-    int iSong = vecPlayed[i];
-    CLog::Log(LOGINFO,"PARTY MODE MANAGER: Reaping played song at %i", iSong);
-    g_playlistPlayer.GetPlaylist(PLAYLIST_MUSIC).Remove(iSong);
-    if (iSong < iCurrentSong) iCurrentSong--;
-    if (iSong <= m_iLastUserSong) m_iLastUserSong--;
-  }*/
   int i=0;
   while (i < g_playlistPlayer.GetPlaylist(PLAYLIST_MUSIC).size())
   {
-    if (playlist[i].WasPlayed() && i != iCurrentSong)
+    if (i < iCurrentSong)
     {
       g_playlistPlayer.GetPlaylist(PLAYLIST_MUSIC).Remove(i);
-      if (i < iCurrentSong)
-        iCurrentSong--;
-      if (i <= m_iLastUserSong) 
-        m_iLastUserSong--;
-    }
-    else if (i < iCurrentSong)
-    {
-      g_playlistPlayer.GetPlaylist(PLAYLIST_MUSIC).Remove(i);
       iCurrentSong--;
       if (i <= m_iLastUserSong) 
         m_iLastUserSong--;

Modified: trunk/XBMC/xbmc/PartyModeManager.h
===================================================================
--- trunk/XBMC/xbmc/PartyModeManager.h	2006-11-26 16:14:05 UTC (rev 7244)
+++ trunk/XBMC/xbmc/PartyModeManager.h	2006-11-26 16:14:55 UTC (rev 7245)
@@ -14,7 +14,8 @@
   void Disable();
   void Play(int iPos);
   void OnSongChange(bool bUpdatePlayed = false);
-  void AddUserSongs(CPlayList& playlistTemp, bool bPlay = false);
+  void AddUserSongs(CPlayList& tempList, bool bPlay = false);
+  void AddUserSongs(CFileItemList& tempList, bool bPlay = false);
   bool IsEnabled() { return m_bEnabled; };
   int GetSongsPlayed();
   int GetMatchingSongs();


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

Revision: 7246
          http://svn.sourceforge.net/xbmc/?rev=7246&view=rev
Author:   kraqh3d
Date:     2006-11-26 08:15:32 -0800 (Sun, 26 Nov 2006)

Log Message:
-----------
changed: playlist behaviour.  see this thread for details http://www.xboxmediacenter.com/forum/showthread.php?t=23386

Modified Paths:
--------------
    trunk/XBMC/xbmc/PlayListPlayer.cpp
    trunk/XBMC/xbmc/PlayListPlayer.h

Modified: trunk/XBMC/xbmc/PlayListPlayer.cpp
===================================================================
--- trunk/XBMC/xbmc/PlayListPlayer.cpp	2006-11-26 16:14:55 UTC (rev 7245)
+++ trunk/XBMC/xbmc/PlayListPlayer.cpp	2006-11-26 16:15:32 UTC (rev 7246)
@@ -15,20 +15,15 @@
   m_bChanged = false;
   m_bPlayedFirstFile = false;
   m_iCurrentPlayList = PLAYLIST_NONE;
-  for (int i = 0; i < 4; i++)
-  {
+  for (int i = 0; i < 2; i++)
     m_repeatState[i] = REPEAT_NONE;
-    m_shuffleState[i] = false;
-  }
   m_iFailedSongs = 0;
 }
 
 CPlayListPlayer::~CPlayListPlayer(void)
 {
   m_PlaylistMusic.Clear();
-  m_PlaylistMusicTemp.Clear();
   m_PlaylistVideo.Clear();
-  m_PlaylistVideoTemp.Clear();
   m_PlaylistEmpty.Clear();
 }
 
@@ -64,17 +59,7 @@
 
   // party mode
   if (g_partyModeManager.IsEnabled() && GetCurrentPlaylist() == PLAYLIST_MUSIC)
-  {
-    if (0 != iSong)
-    {
-      // if we skipped ahead, go back to the top of the list
-      // if it hasn't been played
-      const CPlayList::CPlayListItem &item = playlist[0];
-      if (!item.WasPlayed())
-        return 0;
-    }
     return iSong + 1;
-  }
 
   // if repeat one, keep playing the current song if its valid
   if (RepeatedOne(m_iCurrentPlayList))
@@ -92,26 +77,12 @@
     return iSong;
   }
 
-  // if random, get the next random song
-  if (IsShuffled(m_iCurrentPlayList) && playlist.size() > 1)
-  {
-    while (iSong == m_iCurrentSong)
-      iSong = NextShuffleItem();
-  }
-  // if not random, increment the song
-  else
-  {
-    iSong++;
+  // if we've gone beyond the playlist and repeat all is enabled,
+  // then we clear played status and wrap around
+  iSong++;
+  if (iSong >= playlist.size() && Repeated(m_iCurrentPlayList))
+    iSong = 0;
 
-    // if we've gone beyond the playlist and repeat all is enabled,
-    // then we clear played status and wrap around
-    if (iSong >= playlist.size() && Repeated(m_iCurrentPlayList))
-    {
-      playlist.ClearPlayed();
-      iSong = 0;
-    }
-  }
-
   return iSong;
 }
 
@@ -153,22 +124,13 @@
   if (playlist.size() <= 0) return ;
   int iSong = m_iCurrentSong;
 
-  if (IsShuffled(m_iCurrentPlayList))
-  {
-    while (iSong == m_iCurrentSong)
-      iSong = PreviousShuffleItem();
-  }
-  else
-  {
-    if (!RepeatedOne(m_iCurrentPlayList))
-      iSong--;
-  }
+  if (!RepeatedOne(m_iCurrentPlayList))
+    iSong--;
 
   if (iSong < 0)
     iSong = playlist.size() - 1;
 
   Play(iSong, false, true);
-
 }
 
 void CPlayListPlayer::Play()
@@ -179,11 +141,7 @@
   CPlayList& playlist = GetPlaylist(m_iCurrentPlayList);
   if (playlist.size() <= 0) return;
 
-  int iSong = 0;
-  if (IsShuffled(m_iCurrentPlayList))
-    iSong = NextShuffleItem();
-
-  Play(iSong);
+  Play(0);
 }
 
 /// \brief Start playing entry \e iSong in current playlist
@@ -202,7 +160,7 @@
   int iPreviousSong = m_iCurrentSong;
   m_iCurrentSong = iSong;
   const CPlayList::CPlayListItem& item = playlist[m_iCurrentSong];
-  playlist.SetPlayed(m_iCurrentSong);
+  playlist.SetPlayed(true);
 
   if (!g_application.PlayFile(item, bAutoPlay))
   {
@@ -295,9 +253,7 @@
 /// Return values can be: \n
 /// - PLAYLIST_NONE \n No playlist active
 /// - PLAYLIST_MUSIC \n Playlist from music playlist window
-/// - PLAYLIST_MUSIC_TEMP \n Playlist started in a normal music window
 /// - PLAYLIST_VIDEO \n Playlist from music playlist window
-/// - PLAYLIST_VIDEO_TEMP \n Playlist started in a normal video window
 int CPlayListPlayer::GetCurrentPlaylist()
 {
   return m_iCurrentPlayList;
@@ -308,12 +264,10 @@
 /// Values can be: \n
 /// - PLAYLIST_NONE \n No playlist active
 /// - PLAYLIST_MUSIC \n Playlist from music playlist window
-/// - PLAYLIST_MUSIC_TEMP \n Playlist started in a normal music window
 /// - PLAYLIST_VIDEO \n Playlist from music playlist window
-/// - PLAYLIST_VIDEO_TEMP \n Playlist started in a normal video window
-void CPlayListPlayer::SetCurrentPlaylist(int iPlayList)
+void CPlayListPlayer::SetCurrentPlaylist(int iPlaylist)
 {
-  if (iPlayList == m_iCurrentPlayList)
+  if (iPlaylist == m_iCurrentPlayList)
     return;
 
   // changing the current playlist while party mode is on
@@ -321,33 +275,19 @@
   if (g_partyModeManager.IsEnabled())
     g_partyModeManager.Disable();
 
-  m_iCurrentPlayList = iPlayList;
+  m_iCurrentPlayList = iPlaylist;
   m_bPlayedFirstFile = false;
   m_bChanged = true;
-
-  // reset the played items
-  GetPlaylist(m_iCurrentPlayList).ClearPlayed();
 }
 
-void CPlayListPlayer::ClearPlaylist(int iPlayList)
+void CPlayListPlayer::ClearPlaylist(int iPlaylist)
 {
   // clear our applications playlist file
   g_application.m_strPlayListFile.Empty();
 
-  CPlayList& playlist = GetPlaylist(iPlayList);
+  CPlayList& playlist = GetPlaylist(iPlaylist);
   playlist.Clear();
 
-  // if clearing temp playlists, then reset options
-  if (iPlayList == PLAYLIST_MUSIC_TEMP || iPlayList == PLAYLIST_VIDEO_TEMP)
-  {
-    m_shuffleState[iPlayList] = false;
-    m_repeatState[iPlayList] = REPEAT_NONE;
-    
-    // restore repeat for music temp
-    //if (iPlayList == PLAYLIST_MUSIC_TEMP && g_guiSettings.GetBool("musicfiles.repeat"))
-    //  m_repeatState[iPlayList] = REPEAT_ALL;
-  }
-
   // its likely that the playlist changed
   CGUIMessage msg(GUI_MSG_PLAYLIST_CHANGED, 0, 0, 0, 0, NULL);
   m_gWindowManager.SendMessage(msg);
@@ -356,26 +296,18 @@
 /// \brief Get the playlist object specified in \e nPlayList
 /// \param nPlayList Values can be: \n
 /// - PLAYLIST_MUSIC \n Playlist from music playlist window
-/// - PLAYLIST_MUSIC_TEMP \n Playlist started in a normal music window
 /// - PLAYLIST_VIDEO \n Playlist from music playlist window
-/// - PLAYLIST_VIDEO_TEMP \n Playlist started in a normal video window
 /// \return A reference to the CPlayList object.
-CPlayList& CPlayListPlayer::GetPlaylist(int nPlayList)
+CPlayList& CPlayListPlayer::GetPlaylist(int iPlaylist)
 {
-  switch ( nPlayList )
+  switch ( iPlaylist )
   {
   case PLAYLIST_MUSIC:
     return m_PlaylistMusic;
     break;
-  case PLAYLIST_MUSIC_TEMP:
-    return m_PlaylistMusicTemp;
-    break;
   case PLAYLIST_VIDEO:
     return m_PlaylistVideo;
     break;
-  case PLAYLIST_VIDEO_TEMP:
-    return m_PlaylistVideoTemp;
-    break;
   default:
     m_PlaylistEmpty.Clear();
     return m_PlaylistEmpty;
@@ -388,9 +320,7 @@
 int CPlayListPlayer::RemoveDVDItems()
 {
   int nRemovedM = m_PlaylistMusic.RemoveDVDItems();
-  m_PlaylistMusicTemp.RemoveDVDItems();
   int nRemovedV = m_PlaylistVideo.RemoveDVDItems();
-  m_PlaylistVideoTemp.RemoveDVDItems();
 
   return nRemovedM + nRemovedV;
 }
@@ -401,9 +331,6 @@
   m_iCurrentSong = -1;
   m_bPlayedFirstFile = false;
 
-  // reset the played items
-  GetPlaylist(m_iCurrentPlayList).ClearPlayed();
-
   // its likely that the playlist changed
   CGUIMessage msg(GUI_MSG_PLAYLIST_CHANGED, 0, 0, 0, 0, NULL);
   m_gWindowManager.SendMessage(msg);
@@ -419,7 +346,7 @@
 /// \param iPlaylist Playlist to be asked
 bool CPlayListPlayer::Repeated(int iPlaylist)
 {
-  if (iPlaylist >= PLAYLIST_MUSIC && iPlaylist <= PLAYLIST_VIDEO_TEMP)
+  if (iPlaylist >= PLAYLIST_MUSIC && iPlaylist <= PLAYLIST_VIDEO)
     return (m_repeatState[iPlaylist] == REPEAT_ALL);
   return false;
 }
@@ -428,7 +355,7 @@
 /// \param iPlaylist Playlist to be asked
 bool CPlayListPlayer::RepeatedOne(int iPlaylist)
 {
-  if (iPlaylist >= PLAYLIST_MUSIC && iPlaylist <= PLAYLIST_VIDEO_TEMP)
+  if (iPlaylist >= PLAYLIST_MUSIC && iPlaylist <= PLAYLIST_VIDEO)
     return (m_repeatState[iPlaylist] == REPEAT_ONE);
   return false;
 }
@@ -437,111 +364,55 @@
 /// \param bYesNo To Enable shuffle play, set to \e true
 void CPlayListPlayer::SetShuffle(int iPlaylist, bool bYesNo)
 {
-  // disable randomize button for normal music playlist
-//  if (iPlaylist == PLAYLIST_MUSIC) return;
-
-  if (iPlaylist < PLAYLIST_MUSIC || iPlaylist > PLAYLIST_VIDEO_TEMP)
+  if (iPlaylist < PLAYLIST_MUSIC || iPlaylist > PLAYLIST_VIDEO)
     return;
 
   // disable shuffle in party mode
   if (g_partyModeManager.IsEnabled() && iPlaylist == PLAYLIST_MUSIC)
-  {
-    m_shuffleState[iPlaylist] = false;
     return;
-  }
 
-  bool bTest = IsShuffled(iPlaylist);
-
-  m_shuffleState[iPlaylist] = bYesNo;
-
-  if (bTest != bYesNo)
-    GetPlaylist(iPlaylist).ClearPlayed();
-}
-
-bool CPlayListPlayer::IsShuffled(int iPlaylist)
-{
-  if (iPlaylist >= PLAYLIST_MUSIC && iPlaylist <= PLAYLIST_VIDEO_TEMP)
-    return m_shuffleState[iPlaylist];
-  return false;
-}
-
-// this works reasonably well and uses less processing and memory
-int CPlayListPlayer::NextShuffleItem()
-{
-  srand( timeGetTime() );
-
-  CPlayList& playlist = GetPlaylist(m_iCurrentPlayList);
-
-  // if theres no more unplayed songs, but the playlist is in repeat mode,
-  // clear the played status
-  if ((playlist.GetUnplayed() <= 0) && (Repeated(m_iCurrentPlayList)))
-    playlist.ClearPlayed();
-  
-  if ((playlist.GetUnplayed() <= 0) || (playlist.GetPlayable() <= 0))
-    return -1;
-
-  // pick random number
-  int iNumIterations = 0;
-  int iRandom = rand() % playlist.GetUnplayed();
-  while (playlist[iRandom].WasPlayed() || playlist[iRandom].IsUnPlayable())
+  // do we even need to do anything?
+  if (bYesNo != IsShuffled(iPlaylist))
   {
-    // sanity check
-    if (iNumIterations > playlist.size())
-      return -1;
+    // save the order value of the current song so we can use it find its new location later
+    int iOrder = m_iCurrentSong;
+    if (iOrder >= 0)
+      GetPlaylist(iPlaylist)[m_iCurrentSong].m_iprogramCount;
 
-    //CLog::Log(LOGDEBUG,"CPlayListPlayer::NextShuffleItem(), skipping song at %i. WasPlayed: %s. IsUnPlayable: %s", iRandom, playlist[iRandom].WasPlayed() ? "true" : "false", playlist[iRandom].IsUnPlayable() ? "true" : "false");
-    // increment by one until an unplayed song is found
-    iRandom++;
+    // shuffle or unshuffle as necessary
+    if (bYesNo)
+      GetPlaylist(iPlaylist).Shuffle();
+    else
+      GetPlaylist(iPlaylist).UnShuffle();
 
-    // circle around if past the last song
-    if (iRandom >= playlist.size())
-      iRandom = 0;
-
-    iNumIterations++;
+    // find the previous order value and fix the current song marker
+    if (iOrder >= 0)
+    {
+      int iIndex = GetPlaylist(iPlaylist).FindOrder(iOrder);
+      if (iIndex >= 0)
+        m_iCurrentSong = iIndex;
+      // if iIndex < 0, something unexpected happened
+      // so dont do anything
+    }
   }
-  CLog::Log(LOGDEBUG,"CPlayListPlayer::NextShuffleItem(), return = %i",iRandom);
-
-  return iRandom;
 }
 
-int CPlayListPlayer::PreviousShuffleItem()
+bool CPlayListPlayer::IsShuffled(int iPlaylist)
 {
-  srand( timeGetTime() );
+  // even if shuffled, party mode says its not
+  if (g_partyModeManager.IsEnabled() && iPlaylist == PLAYLIST_MUSIC)
+    return false;
 
-  CPlayList& playlist = GetPlaylist(m_iCurrentPlayList);
-
-  // need more than one played song for previous to work!
-  int iPlayed = playlist.size() - playlist.GetUnplayed();
-  if (iPlayed <= 1)
-    return -1;
-  
-  // pick random number
-  int iNumIterations = 0;
-  int iRandom = rand() % iPlayed;
-  while (iRandom == m_iCurrentSong || !playlist[iRandom].WasPlayed())
+  if (iPlaylist >= PLAYLIST_MUSIC && iPlaylist <= PLAYLIST_VIDEO)
   {
-    // sanity check
-    if (iNumIterations > playlist.size())
-      return -1;
-
-    //CLog::Log(LOGDEBUG,"CPlayListPlayer::PreviousShuffleItem(), skipping unplayed song at %i",iRandom);
-    // increment by one until a played song is found
-    iRandom++;
-
-    // circle around if past the last song
-    if (iRandom >= playlist.size())
-      iRandom = 0;
-
-    iNumIterations++;
+    return GetPlaylist(iPlaylist).IsShuffled();
   }
-  //CLog::Log(LOGDEBUG,"CPlayListPlayer::PreviousShuffleItem(), return = %i",iRandom);
-
-  return iRandom;
+  return false;
 }
 
 void CPlayListPlayer::SetRepeat(int iPlaylist, REPEAT_STATE state)
 {
-  if (iPlaylist < PLAYLIST_MUSIC || iPlaylist > PLAYLIST_VIDEO_TEMP)
+  if (iPlaylist < PLAYLIST_MUSIC || iPlaylist > PLAYLIST_VIDEO)
     return;
 
   // disable repeat in party mode
@@ -553,7 +424,79 @@
 
 REPEAT_STATE CPlayListPlayer::GetRepeat(int iPlaylist)
 {
-  if (iPlaylist >= PLAYLIST_MUSIC && iPlaylist <= PLAYLIST_VIDEO_TEMP)
+  if (iPlaylist >= PLAYLIST_MUSIC && iPlaylist <= PLAYLIST_VIDEO)
     return m_repeatState[iPlaylist];
   return REPEAT_NONE;
-}
\ No newline at end of file
+}
+
+void CPlayListPlayer::ReShuffle(int iPlaylist, int iPosition)
+{
+  // playlist has not played yet so shuffle the entire list
+  // (this only really works for new video playlists)
+  if (!GetPlaylist(iPlaylist).WasPlayed())
+  {
+    GetPlaylist(iPlaylist).Shuffle();
+  }
+  // we're trying to shuffle new items into the curently playing playlist
+  // so we shuffle starting at two positions below the current item
+  else if (iPlaylist == m_iCurrentPlayList)
+  {
+    if (
+      (g_application.IsPlayingAudio() && iPlaylist == PLAYLIST_MUSIC) ||
+      (g_application.IsPlayingVideo() && iPlaylist == PLAYLIST_VIDEO)
+      )
+    {
+	    g_playlistPlayer.GetPlaylist(iPlaylist).Shuffle(m_iCurrentSong + 2);
+    }
+  }
+  // otherwise, shuffle from the passed position
+  // which is the position of the first new item added
+  else
+  {
+    g_playlistPlayer.GetPlaylist(iPlaylist).Shuffle(iPosition);
+  }
+}
+
+void CPlayListPlayer::Add(int iPlaylist, CPlayList::CPlayListItem& item)
+{
+  if (iPlaylist < PLAYLIST_MUSIC || iPlaylist > PLAYLIST_VIDEO)
+    return;
+  CPlayList& list = GetPlaylist(iPlaylist);
+  int iSize = list.size();
+  list.Add(item);
+	if (list.IsShuffled())
+		ReShuffle(iPlaylist, iSize);
+}
+
+void CPlayListPlayer::Add(int iPlaylist, CPlayList& playlist)
+{
+  if (iPlaylist < PLAYLIST_MUSIC || iPlaylist > PLAYLIST_VIDEO)
+    return;
+  CPlayList& list = GetPlaylist(iPlaylist);
+  int iSize = list.size();
+  list.Add(playlist);
+	if (list.IsShuffled())
+		ReShuffle(iPlaylist, iSize);
+}
+
+void CPlayListPlayer::Add(int iPlaylist, CFileItem *pItem)
+{
+  if (iPlaylist < PLAYLIST_MUSIC || iPlaylist > PLAYLIST_VIDEO)
+    return;
+  CPlayList& list = GetPlaylist(iPlaylist);
+  int iSize = list.size();
+  list.Add(pItem);
+	if (list.IsShuffled())
+		ReShuffle(iPlaylist, iSize);
+}
+
+void CPlayListPlayer::Add(int iPlaylist, CFileItemList& items)
+{
+  if (iPlaylist < PLAYLIST_MUSIC || iPlaylist > PLAYLIST_VIDEO)
+    return;
+  CPlayList& list = GetPlaylist(iPlaylist);
+  int iSize = list.size();
+  list.Add(items);
+	if (list.IsShuffled())
+		ReShuffle(iPlaylist, iSize);
+}

Modified: trunk/XBMC/xbmc/PlayListPlayer.h
===================================================================
--- trunk/XBMC/xbmc/PlayListPlayer.h	2006-11-26 16:14:55 UTC (rev 7245)
+++ trunk/XBMC/xbmc/PlayListPlayer.h	2006-11-26 16:15:32 UTC (rev 7246)
@@ -5,9 +5,7 @@
 
 #define PLAYLIST_NONE    -1
 #define PLAYLIST_MUSIC   0
-#define PLAYLIST_MUSIC_TEMP 1
-#define PLAYLIST_VIDEO   2
-#define PLAYLIST_VIDEO_TEMP 3
+#define PLAYLIST_VIDEO   1
 
 using namespace PLAYLIST;
 
@@ -34,12 +32,12 @@
   int GetNextSong();
   void SetCurrentSong(int iSong);
   bool HasChanged();
-  void SetCurrentPlaylist( int iPlayList );
+  void SetCurrentPlaylist(int iPlaylist);
   int GetCurrentPlaylist();
-  CPlayList& GetPlaylist( int nPlayList);
+  CPlayList& GetPlaylist(int iPlaylist);
   int RemoveDVDItems();
   void Reset();
-  void ClearPlaylist(int iPlayList);
+  void ClearPlaylist(int iPlaylist);
   void SetShuffle(int iPlaylist, bool bYesNo);
   bool IsShuffled(int iPlaylist);
   bool HasPlayedFirstFile();
@@ -47,24 +45,25 @@
   void SetRepeat(int iPlaylist, REPEAT_STATE state);
   REPEAT_STATE GetRepeat(int iPlaylist);
 
+  // add items via the playlist player
+  void Add(int iPlaylist, CPlayList::CPlayListItem& item);
+  void Add(int iPlaylist, CPlayList& playlist);
+  void Add(int iPlaylist, CFileItem *pItem);
+  void Add(int iPlaylist, CFileItemList& items);
+
 protected:
   bool Repeated(int iPlaylist);
   bool RepeatedOne(int iPlaylist);
-
-  int NextShuffleItem();
-  int PreviousShuffleItem();
+  void ReShuffle(int iPlaylist, int iPosition);
   bool m_bChanged;
   bool m_bPlayedFirstFile;
+  int m_iFailedSongs;
   int m_iCurrentSong;
   int m_iCurrentPlayList;
   CPlayList m_PlaylistMusic;
-  CPlayList m_PlaylistMusicTemp;
   CPlayList m_PlaylistVideo;
-  CPlayList m_PlaylistVideoTemp;
   CPlayList m_PlaylistEmpty;
-  REPEAT_STATE m_repeatState[4];
-  bool m_shuffleState[4];
-  int m_iFailedSongs;
+  REPEAT_STATE m_repeatState[2];
 };
 
 };
@@ -74,4 +73,3 @@
  \brief Global instance of playlist player
  */
 extern CPlayListPlayer g_playlistPlayer;
-


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

Revision: 7249
          http://svn.sourceforge.net/xbmc/?rev=7249&view=rev
Author:   jmarshallnz
Date:     2006-11-26 16:57:46 -0800 (Sun, 26 Nov 2006)

Log Message:
-----------
fixed: Databases with floating point version numbers could have issues (float -> string -> float conversion).  Converted all versions to integers.  Also dropped backward compatibility for databases from pre-2.0.0.

Modified Paths:
--------------
    trunk/XBMC/xbmc/Database.cpp
    trunk/XBMC/xbmc/Database.h
    trunk/XBMC/xbmc/MusicDatabase.cpp
    trunk/XBMC/xbmc/MusicDatabase.h
    trunk/XBMC/xbmc/ProgramDatabase.cpp
    trunk/XBMC/xbmc/ProgramDatabase.h
    trunk/XBMC/xbmc/VideoDatabase.cpp
    trunk/XBMC/xbmc/VideoDatabase.h

Modified: trunk/XBMC/xbmc/Database.cpp
===================================================================
--- trunk/XBMC/xbmc/Database.cpp	2006-11-26 21:19:21 UTC (rev 7248)
+++ trunk/XBMC/xbmc/Database.cpp	2006-11-27 00:57:46 UTC (rev 7249)
@@ -99,27 +99,52 @@
   else
   { // Database exists, check the version number
     m_pDS->query("SELECT * FROM sqlite_master WHERE type = 'table' AND name = 'version'\n");
-    float fVersion = 0.0f;
+    int version = 0;
     if (m_pDS->num_rows() > 0)
     {
       m_pDS->close();
       m_pDS->query("SELECT idVersion FROM version\n");
       if (m_pDS->num_rows() > 0)
-        fVersion = m_pDS->fv("idVersion").get_asFloat();
+      {
+//#ifdef PRE_2_1_DATABASE_COMPATIBILITY
+        float fVersion = m_pDS->fv("idVersion").get_asFloat();
+        if (fVersion < m_preV2version)
+        { // old version - drop db completely
+          CLog::Log(LOGERROR, "Unable to open %s (old version?)", m_strDatabaseFile.c_str());
+          Close();
+          ::DeleteFile(strDatabase.c_str());
+          return false;
+        }
+        if (fVersion < 3)
+        {
+          // has to be old version - drop the version table
+          m_pDS->close();
+          CLog::Log(LOGINFO, "dropping version table");
+          m_pDS->exec("drop table version");
+          CLog::Log(LOGINFO, "creating version table");
+          version = 3;
+          m_pDS->exec("CREATE TABLE version (idVersion integer)\n");
+          CStdString strSQL=FormatSQL("INSERT INTO version (idVersion) values(%i)\n", version);
+          m_pDS->exec(strSQL.c_str());
+        }
+        else
+//#endif
+        version = m_pDS->fv("idVersion").get_asInteger();
+      }
     }
-    if (fVersion < m_fVersion)
+    if (version < m_version)
     {
-      CLog::Log(LOGNOTICE, "Attempting to update the database %s from version %.2f to %.2f", m_strDatabaseFile.c_str(), fVersion, m_fVersion);
-      if (UpdateOldVersion(fVersion) && UpdateVersionNumber())
-        CLog::Log(LOGINFO, "Update to version %.2f successfull", m_fVersion);
+      CLog::Log(LOGNOTICE, "Attempting to update the database %s from version %i to %i", m_strDatabaseFile.c_str(), version, m_version);
+      if (UpdateOldVersion(version) && UpdateVersionNumber())
+        CLog::Log(LOGINFO, "Update to version %i successfull", m_version);
       else
       {
-        CLog::Log(LOGERROR, "Can't update the database %s from version %.2f to %.2f", m_strDatabaseFile.c_str(), fVersion, m_fVersion);
+        CLog::Log(LOGERROR, "Can't update the database %s from version %i to %i", m_strDatabaseFile.c_str(), version, m_version);
         Close();
         return false;
       }
     }
-    else if (fVersion > m_fVersion)
+    else if (version > m_version)
     {
       CLog::Log(LOGERROR, "Can't open the database %s as it is a NEWER version than what we were expecting!", m_strDatabaseFile.c_str());
       Close();
@@ -247,14 +272,14 @@
     m_pDS->exec("PRAGMA default_cache_size=16384\n");
 
     CLog::Log(LOGINFO, "creating version table");
-    m_pDS->exec("CREATE TABLE version (idVersion float)\n");
-    CStdString strSQL=FormatSQL("INSERT INTO version (idVersion) values(%f)\n", m_fVersion);
+    m_pDS->exec("CREATE TABLE version (idVersion integer)\n");
+    CStdString strSQL=FormatSQL("INSERT INTO version (idVersion) values(%i)\n", m_version);
     m_pDS->exec(strSQL.c_str());
 
     return true;
 }
 
-bool CDatabase::UpdateOldVersion(float fVersion)
+bool CDatabase::UpdateOldVersion(int version)
 {
   return false;
 }
@@ -263,7 +288,7 @@
 {
   try
   {
-    CStdString strSQL=FormatSQL("UPDATE version SET idVersion=%f\n", m_fVersion);
+    CStdString strSQL=FormatSQL("UPDATE version SET idVersion=%i\n", m_version);
     m_pDS->exec(strSQL.c_str());
   }
   catch(...)

Modified: trunk/XBMC/xbmc/Database.h
===================================================================
--- trunk/XBMC/xbmc/Database.h	2006-11-26 21:19:21 UTC (rev 7248)
+++ trunk/XBMC/xbmc/Database.h	2006-11-27 00:57:46 UTC (rev 7249)
@@ -28,14 +28,17 @@
   virtual bool CreateTables();
 
   bool m_bOpen;
-  float m_fVersion;
+  int m_version;
+//#ifdef PRE_2_1_DATABASE_COMPATIBILITY
+  float m_preV2version;
+//#endif
   CStdString m_strDatabaseFile;
   auto_ptr<SqliteDatabase> m_pDB;
   auto_ptr<Dataset> m_pDS;
   auto_ptr<Dataset> m_pDS2;
 
 private:
-  virtual bool UpdateOldVersion(float fVersion);
+  virtual bool UpdateOldVersion(int version);
   bool UpdateVersionNumber();
 
   int m_iRefCount;

Modified: trunk/XBMC/xbmc/MusicDatabase.cpp
===================================================================
--- trunk/XBMC/xbmc/MusicDatabase.cpp	2006-11-26 21:19:21 UTC (rev 7248)
+++ trunk/XBMC/xbmc/MusicDatabase.cpp	2006-11-27 00:57:46 UTC (rev 7249)
@@ -11,7 +11,8 @@
 
 using namespace DIRECTORY::MUSICDATABASEDIRECTORY;
 
-#define MUSIC_DATABASE_VERSION 1.6f
+#define MUSIC_DATABASE_OLD_VERSION 1.6f
+#define MUSIC_DATABASE_VERSION        3
 #define MUSIC_DATABASE_NAME "MyMusic6.db"
 #define RECENTLY_ADDED_LIMIT  25
 #define RECENTLY_PLAYED_LIMIT 25
@@ -20,7 +21,8 @@
 
 CMusicDatabase::CMusicDatabase(void)
 {
-  m_fVersion=MUSIC_DATABASE_VERSION;
+  m_preV2version=MUSIC_DATABASE_OLD_VERSION;
+  m_version=MUSIC_DATABASE_VERSION;
   m_strDatabaseFile=MUSIC_DATABASE_NAME;
   m_iSongsBeforeCommit = 0;
 }
@@ -3307,7 +3309,7 @@
   return false;
 }
 
-bool CMusicDatabase::UpdateOldVersion(float fVersion)
+bool CMusicDatabase::UpdateOldVersion(int version)
 {
   if (NULL == m_pDB.get()) return false;
   if (NULL == m_pDS.get()) return false;
@@ -3315,255 +3317,6 @@
 
   try
   {
-    if (fVersion < 0.5f)
-    { // Version 0 to 0.5 upgrade - we need to add the version table
-      CLog::Log(LOGINFO, "creating versions table");
-      m_pDS->exec("CREATE TABLE version (idVersion float)\n");
-    }
-    if (fVersion < 1.0f)
-    {
-      // version 0.5 to 1.0 upgrade - we need to add the thumbs table + run SetMusicThumbs()
-      // on all elements and then produce a new songs table
-      // check if we already have a thumbs table (could happen if the code below asserts for whatever reason)
-      m_pDS->query("SELECT * FROM sqlite_master WHERE type = 'table' AND name = 'thumb'\n");
-      if (m_pDS->num_rows() > 0)
-      {
-        m_pDS->close();
-      }
-      else
-      { // create it
-        CLog::Log(LOGINFO, "create thumbs table");
-        m_pDS->exec("CREATE TABLE thumb ( idThumb integer primary key, strThumb text )\n");
-      }
-      m_pDS->exec("PRAGMA cache_size=8192\n");
-      m_pDS->exec("PRAGMA synchronous='NORMAL'\n");
-      m_pDS->exec("PRAGMA count_changes='OFF'\n");
-      m_pDS2->exec("PRAGMA cache_size=8192\n");
-      m_pDS2->exec("PRAGMA synchronous='NORMAL'\n");
-      m_pDS2->exec("PRAGMA count_changes='OFF'\n");
-      m_bOpen = true;
-      // ok, now we need to run through our table + fill in all the thumbs we need
-      CGUIDialogProgress *dialog = (CGUIDialogProgress *)m_gWindowManager.GetWindow(WINDOW_DIALOG_PROGRESS);
-      if (dialog)
-      {
-        dialog->SetHeading("Updating old database version");
-        dialog->SetLine(0, "");
-        dialog->SetLine(1, "");
-        dialog->SetLine(2, "");
-        dialog->StartModal();
-        dialog->SetLine(1, "Creating newly formatted tables");
-        dialog->Progress();
-      }
-      BeginTransaction();
-      CLog::Log(LOGINFO, "Creating temporary songs table");
-      m_pDS->exec("CREATE TEMPORARY TABLE tempsong ( idSong integer primary key, idAlbum integer, idPath integer, idArtist integer, iNumArtists integer, idGenre integer, iNumGenres integer, strTitle text, iTrack integer, iDuration integer, iYear integer, dwFileNameCRC text, strFileName text, iTimesPlayed integer, iStartOffset integer, iEndOffset integer)\n");
-      CLog::Log(LOGINFO, "Copying songs into temporary song table");
-      m_pDS->exec("INSERT INTO tempsong SELECT idSong,idAlbum,idPath,idArtist,iNumArtists,idGenre,iNumGenres,strTitle,iTrack,iDuration,iYear,dwFileNameCRC,strFileName,iTimesPlayed,iStartOffset,iEndOffset FROM song");
-      CLog::Log(LOGINFO, "Destroying old songs table");
-      m_pDS->exec("DROP TABLE song");
-      CLog::Log(LOGINFO, "Creating new songs table");
-      m_pDS->exec("CREATE TABLE song ( idSong integer primary key, idAlbum integer, idPath integer, idArtist integer, iNumArtists integer, idGenre integer, iNumGenres integer, strTitle text, iTrack integer, iDuration integer, iYear integer, dwFileNameCRC text, strFileName text, iTimesPlayed integer, iStartOffset integer, iEndOffset integer, idThumb integer)\n");
-      CLog::Log(LOGINFO, "Copying songs into new songs table");
-      m_pDS->exec("INSERT INTO song(idSong,idAlbum,idPath,idArtist,iNumArtists,idGenre,iNumGenres,strTitle,iTrack,iDuration,iYear,dwFileNameCRC,strFileName,iTimesPlayed,iStartOffset,iEndOffset) SELECT * FROM tempsong");
-      CLog::Log(LOGINFO, "Deleting temporary songs table");
-      m_pDS->exec("DROP TABLE tempsong");
-      CommitTransaction();
-      BeginTransaction();
-      if (dialog)
-      {
-        dialog->SetLine(0, "Retrieving updated information on songs...");
-        dialog->SetLine(1, "");
-      }
-      CLog::Log(LOGINFO, "Finding thumbs");
-      if (!m_pDS2->query("SELECT * from song join album on song.idAlbum = album.idAlbum join path on path.idPath = song.idPath\n"))
-        return false;
-      if (m_pDS2->num_rows() > 0)
-      {
-        CStdString strProgress;
-        strProgress.Format("Processing %i of %i", 1, m_pDS2->num_rows());
-        if (dialog)
-        {
-          dialog->SetLine(2, strProgress);
-          dialog->Progress();
-        }
-        // turn on thumb caching - mayaswell make it as fast as we can
-        g_directoryCache.InitMusicThumbCache();
-        // get data from returned rows
-        int count = 1;
-        while (!m_pDS2->eof())
-        {
-          if (!(count % 10))
-          {
-            strProgress.Format("Processing %i of %i", count, m_pDS2->num_rows());
-            if (dialog)
-            {
-              dialog->SetLine(2, strProgress);
-              dialog->Progress();
-            }
-          }
-          CSong song;
-          // construct a song to be transferred to a fileitem
-          song.strAlbum = m_pDS2->fv("album.strAlbum").get_asString();
-          song.iTrack = m_pDS2->fv("song.iTrack").get_asLong() ;
-          song.iDuration = m_pDS2->fv("song.iDuration").get_asLong() ;
-          song.iYear = m_pDS2->fv("song.iYear").get_asLong() ;
-          song.strTitle = m_pDS2->fv("song.strTitle").get_asString();
-          song.iTimedPlayed = m_pDS2->fv("song.iTimesPlayed").get_asLong();
-          song.iStartOffset = m_pDS2->fv("song.iStartOffset").get_asLong();
-          song.iEndOffset = m_pDS2->fv("song.iEndOffset").get_asLong();
-          // Get filename with full path
-          song.strFileName = m_pDS2->fv("path.strPath").get_asString();
-          CUtil::AddDirectorySeperator(song.strFileName);
-          song.strFileName += m_pDS2->fv("song.strFileName").get_asString();
-          // ok, now transfer to a file item and obtain the thumb
-          CFileItem item(song);
-          item.SetMusicThumb();
-          long idSong = m_pDS2->fv("song.idSong").get_asLong();
-          // add any found thumb
-          CStdString strThumb = item.GetThumbnailImage();
-          long lThumb = AddThumb(strThumb);
-          CStdString strSQL=FormatSQL("UPDATE song SET idThumb=%i where idSong=%i", lThumb, idSong);
-          m_pDS->exec(strSQL.c_str());
-          m_pDS2->next();
-          count++;
-        }
-      }
-      // cleanup
-      m_pDS2->close();
-      g_directoryCache.ClearMusicThumbCache();
-      CommitTransaction();
-      if (dialog) dialog->Close();
-
-    }
-    if (fVersion < 1.1f)
-    {
-      // version 1.0 to 1.1 upgrade - we need to create an index on the thumb table
-      CLog::Log(LOGINFO, "create thumb index");
-      m_pDS->exec("CREATE INDEX idxThumb ON thumb(strThumb)");
-      CLog::Log(LOGINFO, "create thumb index successfull");
-      fVersion = MUSIC_DATABASE_VERSION;
-    }
-    if (fVersion < 1.2f)
-    {
-      // version 1.1 to 1.2 upgrade - we need to add the musicbrainz columns to the song table
-      CLog::Log(LOGINFO, "Updating song table with musicbrainz columns");
-      BeginTransaction();
-      CLog::Log(LOGINFO, "Creating temporary songs table");
-      m_pDS->exec("CREATE TEMPORARY TABLE tempsong ( idSong integer primary key, idAlbum integer, idPath integer, idArtist integer, iNumArtists integer, idGenre integer, iNumGenres integer, strTitle text, iTrack integer, iDuration integer, iYear integer, dwFileNameCRC text, strFileName text, iTimesPlayed integer, iStartOffset integer, iEndOffset integer, idThumb integer)\n");
-      CLog::Log(LOGINFO, "Copying songs into temporary song table");
-      m_pDS->exec("INSERT INTO tempsong SELECT idSong,idAlbum,idPath,idArtist,iNumArtists,idGenre,iNumGenres,strTitle,iTrack,iDuration,iYear,dwFileNameCRC,strFileName,iTimesPlayed,iStartOffset,iEndOffset,idThumb FROM song");
-      CLog::Log(LOGINFO, "Destroying old songs table");
-      m_pDS->exec("DROP TABLE song");
-      CLog::Log(LOGINFO, "Creating new songs table");
-      m_pDS->exec("CREATE TABLE song ( idSong integer primary key, idAlbum integer, idPath integer, idArtist integer, iNumArtists integer, idGenre integer, iNumGenres integer, strTitle text, iTrack integer, iDuration integer, iYear integer, dwFileNameCRC text, strFileName text, strMusicBrainzTrackID text, strMusicBrainzArtistID text, strMusicBrainzAlbumID text, strMusicBrainzAlbumArtistID text, strMusicBrainzTRMID text, iTimesPlayed integer, iStartOffset integer, iEndOffset integer, idThumb integer)\n");
-      CLog::Log(LOGINFO, "Copying songs into new songs table");
-      m_pDS->exec("INSERT INTO song(idSong,idAlbum,idPath,idArtist,iNumArtists,idGenre,iNumGenres,strTitle,iTrack,iDuration,iYear,dwFileNameCRC,strFileName,iTimesPlayed,iStartOffset,iEndOffset,idThumb) SELECT * FROM tempsong");
-      CLog::Log(LOGINFO, "Deleting temporary songs table");
-      m_pDS->exec("DROP TABLE tempsong");
-      CommitTransaction();
-    }
-    if (fVersion < 1.3f)
-    {
-      // version 1.2 to 1.3 upgrade - we need to create a date column when a song was played the last time
-      CLog::Log(LOGINFO, "Updating song table with lastplayed column");
-      BeginTransaction();
-      CLog::Log(LOGINFO, "Creating temporary songs table");
-      m_pDS->exec("CREATE TEMPORARY TABLE tempsong ( idSong integer primary key, idAlbum integer, idPath integer, idArtist integer, iNumArtists integer, idGenre integer, iNumGenres integer, strTitle text, iTrack integer, iDuration integer, iYear integer, dwFileNameCRC text, strFileName text, strMusicBrainzTrackID text, strMusicBrainzArtistID text, strMusicBrainzAlbumID text, strMusicBrainzAlbumArtistID text, strMusicBrainzTRMID text, iTimesPlayed integer, iStartOffset integer, iEndOffset integer, idThumb integer)\n");
-      CLog::Log(LOGINFO, "Copying songs into temporary song table");
-      m_pDS->exec("INSERT INTO tempsong SELECT idSong, idAlbum, idPath, idArtist, iNumArtists, idGenre, iNumGenres, strTitle, iTrack, iDuration, iYear, dwFileNameCRC, strFileName, strMusicBrainzTrackID, strMusicBrainzArtistID, strMusicBrainzAlbumID, strMusicBrainzAlbumArtistID, strMusicBrainzTRMID, iTimesPlayed, iStartOffset, iEndOffset, idThumb FROM song");
-      CLog::Log(LOGINFO, "Destroying old songs table");
-      m_pDS->exec("DROP TABLE song");
-      CLog::Log(LOGINFO, "Creating new songs table");
-      m_pDS->exec("CREATE TABLE song ( idSong integer primary key, idAlbum integer, idPath integer, idArtist integer, iNumArtists integer, idGenre integer, iNumGenres integer, strTitle text, iTrack integer, iDuration integer, iYear integer, dwFileNameCRC text, strFileName text, strMusicBrainzTrackID text, strMusicBrainzArtistID text, strMusicBrainzAlbumID text, strMusicBrainzAlbumArtistID text, strMusicBrainzTRMID text, iTimesPlayed integer, iStartOffset integer, iEndOffset integer, idThumb integer, lastplayed date)\n");
-      CLog::Log(LOGINFO, "Copying songs into new songs table");
-      m_pDS->exec("INSERT INTO song(idSong, idAlbum, idPath, idArtist, iNumArtists, idGenre, iNumGenres, strTitle, iTrack, iDuration, iYear, dwFileNameCRC, strFileName, strMusicBrainzTrackID, strMusicBrainzArtistID, strMusicBrainzAlbumID, strMusicBrainzAlbumArtistID, strMusicBrainzTRMID, iTimesPlayed, iStartOffset, iEndOffset, idThumb) SELECT * FROM tempsong");
-      CLog::Log(LOGINFO, "Deleting temporary songs table");
-      m_pDS->exec("DROP TABLE tempsong");
-      CLog::Log(LOGINFO, "create idxSong1 index");
-      m_pDS->exec("CREATE INDEX idxSong1 ON song(iTimesPlayed)");
-      CLog::Log(LOGINFO, "create idxSong2 index");
-      m_pDS->exec("CREATE INDEX idxSong2 ON song(lastplayed)");
-      CLog::Log(LOGINFO, "create song view");
-      m_pDS->exec("create view songview as select idSong, song.iNumArtists as iNumArtists, song.iNumGenres as iNumGenres, strTitle, iTrack, iDuration, iYear, dwFileNameCRC, strFileName, strMusicBrainzTrackID, strMusicBrainzArtistID, strMusicBrainzAlbumID, strMusicBrainzAlbumArtistID, strMusicBrainzTRMID, iTimesPlayed, iStartOffset, iEndOffset, lastplayed, strAlbum, strPath, strArtist, strGenre, strThumb from song join album on song.idAlbum=album.idAlbum join path on song.idPath=path.idPath join artist on song.idArtist=artist.idArtist join genre on song.idGenre=genre.idGenre join thumb on song.idThumb=thumb.idThumb");
-      CLog::Log(LOGINFO, "create album view");
-      m_pDS->exec("create view albumview as select idAlbum, strAlbum, iNumArtists, strArtist, strPath from album join path on album.idPath=path.idPath join artist on album.idArtist=artist.idArtist");
-      CommitTransaction();
-    }
-    if (fVersion < 1.4f)
-    {
-      // version 1.3 to 1.4 upgrade - we need to add a thumbnail column to the album table and update song and album view
-      CGUIDialogProgress *dialog = (CGUIDialogProgress *)m_gWindowManager.GetWindow(WINDOW_DIALOG_PROGRESS);
-      if (dialog)
-      {
-        dialog->SetHeading("Updating old database version");
-        dialog->SetLine(0, "");
-        dialog->SetLine(1, "");
-        dialog->SetLine(2, "This may take a couple of minutes...");
-        dialog->StartModal();
-
-        //  Let the progress dialog fade in, hopefully ;)
-        DWORD dwTicks=GetTickCount();
-        while (GetTickCount()-dwTicks<1000)
-          dialog->Progress();
-      }
-
-      BeginTransaction();
-      
-      dialog->SetLine(1, "Dropping views...");
-      dialog->Progress();
-      CLog::Log(LOGINFO, "Dropping song view");
-      m_pDS->exec("drop view songview");
-      CLog::Log(LOGINFO, "Dropping album view");
-      m_pDS->exec("drop view albumview");
-
-      dialog->SetLine(1, "Creating new album table...");
-      dialog->Progress();
-      CLog::Log(LOGINFO, "Creating temporary album table");
-      m_pDS->exec("CREATE TEMPORARY TABLE tempalbum ( idAlbum integer primary key, strAlbum text, idArtist integer, iNumArtists integer, idPath integer, idThumb integer)\n");
-      CLog::Log(LOGINFO, "Copying albums into temporary album table");
-      m_pDS->exec("INSERT INTO tempalbum SELECT distinct album.idAlbum as idAlbum, strAlbum, album.idArtist as idArtist, album.iNumArtists as iNumArtists, album.idPath as idPath, song.idThumb as idThumb FROM album join song on album.idAlbum=song.idAlbum group by album.idalbum");
-      CLog::Log(LOGINFO, "Dropping old album table");
-      m_pDS->exec("DROP TABLE album");
-      CLog::Log(LOGINFO, "Creating new album table");
-      m_pDS->exec("CREATE TABLE album ( idAlbum integer primary key, strAlbum text, idArtist integer, iNumArtists integer, idPath integer, idThumb integer)\n");
-      CLog::Log(LOGINFO, "Copying albums into new albums table");
-      m_pDS->exec("INSERT INTO album(idAlbum, strAlbum, idArtist, iNumArtists, idPath, idThumb) SELECT * FROM tempalbum");
-      CLog::Log(LOGINFO, "Dropping temporary album table");
-      m_pDS->exec("DROP TABLE tempalbum");
-      CLog::Log(LOGINFO, "create album index");
-      m_pDS->exec("CREATE INDEX idxAlbum ON album(strAlbum)");
-      
-      dialog->SetLine(1, "Creating new views...");
-      dialog->Progress();
-      CLog::Log(LOGINFO, "create song view");
-      m_pDS->exec("create view songview as select idSong, song.iNumArtists as iNumArtists, song.iNumGenres as iNumGenres, strTitle, iTrack, iDuration, iYear, dwFileNameCRC, strFileName, strMusicBrainzTrackID, strMusicBrainzArtistID, strMusicBrainzAlbumID, strMusicBrainzAlbumArtistID, strMusicBrainzTRMID, iTimesPlayed, iStartOffset, iEndOffset, lastplayed, song.idAlbum as idAlbum, strAlbum, strPath, song.idArtist as idArtist, strArtist, song.idGenre as idGenre, strGenre, strThumb from song join album on song.idAlbum=album.idAlbum join path on song.idPath=path.idPath join artist on song.idArtist=artist.idArtist join genre on song.idGenre=genre.idGenre join thumb on song.idThumb=thumb.idThumb");
-      CLog::Log(LOGINFO, "create album view");
-      m_pDS->exec("create view albumview as select idAlbum, strAlbum, iNumArtists, album.idArtist as idArtist, strArtist, strPath, strThumb from album join path on album.idPath=path.idPath join artist on album.idArtist=artist.idArtist join thumb on album.idThumb=thumb.idThumb");
-
-      CommitTransaction();
-
-      dialog->Close();
-    }
-    if (fVersion < 1.5f)
-    { // version 1.4 to 1.5 upgrade - recreate the album view with 
-      // left outer instead of inner joins to get albums without an artist
-      BeginTransaction();
-      
-      CLog::Log(LOGINFO, "Dropping album view");
-      m_pDS->exec("drop view albumview");
-      CLog::Log(LOGINFO, "create album view");
-      m_pDS->exec("create view albumview as select idAlbum, strAlbum, iNumArtists, album.idArtist as idArtist, strArtist, strPath, strThumb from album left outer join path on album.idPath=path.idPath left outer join artist on album.idArtist=artist.idArtist left outer join thumb on album.idThumb=thumb.idThumb");
-
-      CommitTransaction();
-    }
-    if (fVersion < 1.6f)
-    {
-      // upgrade from 1.5 to 1.6 - add partymode table
-      BeginTransaction();
-      CLog::Log(LOGINFO, "Adding partymode table");
-      m_pDS->exec("CREATE TABLE partymode (idRow integer primary key, idSong integer, bRelaxedRestrictions bool)\n");
-      CommitTransaction();
-    }
   }
   catch (...)
   {

Modified: trunk/XBMC/xbmc/MusicDatabase.h
===================================================================
--- trunk/XBMC/xbmc/MusicDatabase.h	2006-11-26 21:19:21 UTC (rev 7248)
+++ trunk/XBMC/xbmc/MusicDatabase.h	2006-11-27 00:57:46 UTC (rev 7249)
@@ -195,7 +195,7 @@
   bool CleanupArtists();
   bool CleanupGenres();
   bool CleanupAlbumsFromPaths(const CStdString &strPathIds);
-  virtual bool UpdateOldVersion(float fVersion);
+  virtual bool UpdateOldVersion(int version);
 
   // Fields should be ordered as they 
   // appear in the songview

Modified: trunk/XBMC/xbmc/ProgramDatabase.cpp
===================================================================
--- trunk/XBMC/xbmc/ProgramDatabase.cpp	2006-11-26 21:19:21 UTC (rev 7248)
+++ trunk/XBMC/xbmc/ProgramDatabase.cpp	2006-11-27 00:57:46 UTC (rev 7249)
@@ -5,12 +5,14 @@
 #include "xbox/xbeheader.h"
 #include "GUIWindowFileManager.h"
 
-#define PROGRAM_DATABASE_VERSION 0.9f
+#define PROGRAM_DATABASE_OLD_VERSION 0.9f
+#define PROGRAM_DATABASE_VERSION 3
 
 //********************************************************************************************************************************
 CProgramDatabase::CProgramDatabase(void)
 {
-  m_fVersion=PROGRAM_DATABASE_VERSION;
+  m_preV2version=PROGRAM_DATABASE_OLD_VERSION;
+  m_version=PROGRAM_DATABASE_VERSION;
   m_strDatabaseFile=PROGRAM_DATABASE_NAME;
 }
 
@@ -46,7 +48,7 @@
   return true;
 }
 
-bool CProgramDatabase::UpdateOldVersion(float fVersion)
+bool CProgramDatabase::UpdateOldVersion(int version)
 {
   if (NULL == m_pDB.get()) return false;
   if (NULL == m_pDS.get()) return false;
@@ -54,127 +56,6 @@
 
   try
   {
-    if (fVersion < 0.5f)
-    { // Version 0 to 0.5 upgrade - we need to add the version table
-      CLog::Log(LOGINFO, "creating versions table");
-      m_pDS->exec("CREATE TABLE version (idVersion float)\n");
-    }
-
-    if (fVersion < 0.6f)
-    { // Version 0.5 to 0.6 upgrade - we need to add the region entry
-      CGUIDialogProgress *dialog = (CGUIDialogProgress *)m_gWindowManager.GetWindow(WINDOW_DIALOG_PROGRESS);
-      if (dialog)
-      {
-        dialog->SetHeading("Updating old database version");
-        dialog->SetLine(0, "");
-        dialog->SetLine(1, "");
-        dialog->SetLine(2, "");
-        dialog->StartModal();
-        dialog->SetLine(1, "Adding table entries");
-        dialog->Progress();
-      }
-      BeginTransaction();
-      CLog::Log(LOGINFO, "Creating temporary files table");
-      m_pDS->exec("CREATE TABLE tempfiles ( idFile integer primary key, idPath integer, strFilename text, titleId integer, xbedescription text, iTimesPlayed integer, lastAccessed integer)\n");
-      CLog::Log(LOGINFO, "Copying files into temporary files table");
-      m_pDS->exec("INSERT INTO tempfiles SELECT idFile,idPath,strFilename,titleId,xbedescription,iTimesPlayed,lastAccessed FROM files");
-      CLog::Log(LOGINFO, "Destroying old files table");
-      m_pDS->exec("DROP TABLE files");
-      CLog::Log(LOGINFO, "Creating new files table");
-      m_pDS->exec("CREATE TABLE files ( idFile integer primary key, idPath integer, strFilename text, titleId integer, xbedescription text, iTimesPlayed integer, lastAccessed integer, iRegion integer)\n");
-      CLog::Log(LOGINFO, "Copying files into new files table");
-      m_pDS->exec("INSERT INTO files(idFile,idPath,strFilename,titleId,xbedescription,iTimesPlayed,lastAccessed) SELECT * FROM tempfiles");
-      CLog::Log(LOGINFO, "Deleting temporary files table");
-      m_pDS->exec("DROP TABLE tempfiles");
-
-      CStdString strSQL=FormatSQL("update files set iRegion=%i",-1);
-      m_pDS->exec(strSQL.c_str());
-      
-      CommitTransaction();
-      if (dialog) dialog->Close();
-    }
-    if (fVersion < 0.7f)
-    { // Version 0.6 to 0.7 update - need to create the trainers table
-      CLog::Log(LOGINFO,"Creating trainers table");    
-      m_pDS->exec("CREATE TABLE trainers (idKey integer auto_increment primary key, idCRC integer, idTitle integer, strTrainerPath text, strSettings text, Active integer)\n");
-    }
-    if (fVersion < 0.71f)
-    { // Version 0.7 to 0.71 update - fix the idTitle bug
-      CGUIDialogProgress *dialog = (CGUIDialogProgress *)m_gWindowManager.GetWindow(WINDOW_DIALOG_PROGRESS);
-      if (dialog)
-      {
-        dialog->SetHeading("Updating old database version");
-        dialog->SetLine(0, "");
-        dialog->SetLine(1, "Adding table entries");
-        dialog->SetLine(2, "");;
-        dialog->StartModal();
-        dialog->Progress();
-      }
-      BeginTransaction();
-      CLog::Log(LOGINFO, "Creating temporary files table");
-      m_pDS->exec("CREATE TABLE tempfiles ( idFile integer primary key, idPath integer, strFilename text, xbedescription text, iTimesPlayed integer, lastAccessed integer, iRegion integer)\n");
-      CLog::Log(LOGINFO, "Copying files into temporary files table");
-      m_pDS->exec("INSERT INTO tempfiles SELECT idFile,idPath,strFilename,xbedescription,iTimesPlayed,lastAccessed,iRegion FROM files");
-      CLog::Log(LOGINFO, "Destroying old files table");
-      m_pDS->exec("DROP TABLE files");
-      CLog::Log(LOGINFO, "Creating new files table");
-      m_pDS->exec("CREATE TABLE files ( idFile integer primary key, idPath integer, strFilename text, titleId integer, xbedescription text, iTimesPlayed integer, lastAccessed integer, iRegion integer)\n");
-      CLog::Log(LOGINFO, "Copying files into new files table");
-      m_pDS->exec("INSERT INTO files(idFile,idPath,strFilename,xbedescription,iTimesPlayed,lastAccessed,iRegion) SELECT * FROM tempfiles");
-      CLog::Log(LOGINFO, "Deleting temporary files table");
-      m_pDS->exec("DROP TABLE tempfiles");
-
-      CStdString strSQL=FormatSQL("update files set titleId=%i",-1);
-      m_pDS->exec(strSQL.c_str());
-      
-      CommitTransaction();
-      if (dialog) dialog->Close();
-    }
-    if (fVersion < 0.8f)
-    { // Version 0.71 to 0.8 update - drop old tables for single files table
-      CLog::Log(LOGINFO, "dropping old files table");
-      m_pDS->exec("DROP TABLE files");
-      CLog::Log(LOGINFO, "creating new files table");
-      m_pDS->exec("CREATE TABLE files ( idFile integer primary key, strFilename text, titleId integer, xbedescription text, iTimesPlayed integer, lastAccessed integer, iRegion integer)\n");
-      CLog::Log(LOGINFO, "dropping old program table");
-      m_pDS->exec("DROP TABLE program");
-      CLog::Log(LOGINFO, "dropping bookmark table");
-      m_pDS->exec("DROP TABLE bookmark");
-      CLog::Log(LOGINFO, "dropping path table");
-      m_pDS->exec("DROP TABLE path");
-    }
-    if (fVersion < 0.9f) // 0.81 was mistake ;)
-    { // Version 0.8 to 0.9 update - add size field
-      CGUIDialogProgress *dialog = (CGUIDialogProgress *)m_gWindowManager.GetWindow(WINDOW_DIALOG_PROGRESS);
-      if (dialog)
-      {
-        dialog->SetHeading("Updating old database version");
-        dialog->SetLine(0, "");
-        dialog->SetLine(1, "Adding table entries");
-        dialog->SetLine(2, "");;
-        dialog->StartModal();
-        dialog->Progress();
-      }
-      BeginTransaction();
-      CLog::Log(LOGINFO, "Creating temporary files table");
-      m_pDS->exec("CREATE TABLE tempfiles ( idFile integer primary key, strFilename text, titleId integer, xbedescription text, iTimesPlayed integer, lastAccessed integer, iRegion integer)\n");
-      CLog::Log(LOGINFO, "Copying files into temporary files table");
-      m_pDS->exec("INSERT INTO tempfiles SELECT idFile,strFilename,titleId,xbedescription,iTimesPlayed,lastAccessed,iRegion FROM files");
-      CLog::Log(LOGINFO, "Destroying old files table");
-      m_pDS->exec("DROP TABLE files");
-      CLog::Log(LOGINFO, "Creating new files table");
-      m_pDS->exec("CREATE TABLE files ( idFile integer primary key, strFilename text, titleId integer, xbedescription text, iTimesPlayed integer, lastAccessed integer, iRegion integer, iSize integer)\n");
-      CLog::Log(LOGINFO, "Copying files into new files table");
-      m_pDS->exec("INSERT INTO files(idFile,strFilename,titleId,xbedescription,iTimesPlayed,lastAccessed,iRegion) SELECT * FROM tempfiles");
-      CLog::Log(LOGINFO, "Deleting temporary files table");
-      m_pDS->exec("DROP TABLE tempfiles");
-
-      CStdString strSQL=FormatSQL("update files set iSize=%i",-1);
-      m_pDS->exec(strSQL.c_str());
-      
-      CommitTransaction();
-      if (dialog) dialog->Close();
-    }
   }
   catch (...)
   {

Modified: trunk/XBMC/xbmc/ProgramDatabase.h
===================================================================
--- trunk/XBMC/xbmc/ProgramDatabase.h	2006-11-26 21:19:21 UTC (rev 7248)
+++ trunk/XBMC/xbmc/ProgramDatabase.h	2006-11-27 00:57:46 UTC (rev 7249)
@@ -38,7 +38,7 @@
 
 protected:
   virtual bool CreateTables();
-  virtual bool UpdateOldVersion(float fVersion);
+  virtual bool UpdateOldVersion(int version);
 
   FILETIME TimeStampToLocalTime( unsigned __int64 timeStamp );
 };

Modified: trunk/XBMC/xbmc/VideoDatabase.cpp
===================================================================
--- trunk/XBMC/xbmc/VideoDatabase.cpp	2006-11-26 21:19:21 UTC (rev 7248)
+++ trunk/XBMC/xbmc/VideoDatabase.cpp	2006-11-27 00:57:46 UTC (rev 7249)
@@ -13,7 +13,8 @@
 #include "filesystem/VirtualPathDirectory.h"
 #include "filesystem/StackDirectory.h"
 
-#define VIDEO_DATABASE_VERSION 2.0f
+#define VIDEO_DATABASE_OLD_VERSION 2.0f
+#define VIDEO_DATABASE_VERSION 3
 #define VIDEO_DATABASE_NAME "MyVideos31.db"
 
 CBookmark::CBookmark()
@@ -25,7 +26,8 @@
 //********************************************************************************************************************************
 CVideoDatabase::CVideoDatabase(void)
 {
-  m_fVersion=VIDEO_DATABASE_VERSION;
+  m_preV2version=VIDEO_DATABASE_OLD_VERSION;
+  m_version=VIDEO_DATABASE_VERSION;
   m_strDatabaseFile=VIDEO_DATABASE_NAME;
 }
 
@@ -1642,163 +1644,8 @@
   }
 }
 
-bool CVideoDatabase::UpdateOldVersion(float fVersion)
+bool CVideoDatabase::UpdateOldVersion(int version)
 {
-  if (fVersion < 0.5f)
-  { // Version 0 to 0.5 upgrade - we need to add the version table and the settings table
-    CLog::Log(LOGINFO, "creating versions table");
-    m_pDS->exec("CREATE TABLE version (idVersion float)\n");
-
-    CLog::Log(LOGINFO, "create settings table");
-    m_pDS->exec("CREATE TABLE settings ( idFile integer, Interleaved bool, NoCache bool, Deinterlace bool, FilmGrain integer,"
-                "ViewMode integer,ZoomAmount float, PixelRatio float, AudioStream integer, SubtitleStream integer,"
-                "SubtitleDelay float, SubtitlesOn bool, Brightness integer, Contrast integer, Gamma integer,"
-                "AdjustFrameRate integer, AudioDelay float)\n");
-  }
-  // REMOVED: v 1.0 -> 1.2 updates - they just delete the settings table in order
-  // to add new settings - mayaswell just delete all the time.
-  if (fVersion < 1.3f)
-  { // v 1.0 -> 1.3 (new crop settings to video settings table)
-    // Just delete and recreate the settings table is the easiest thing to do
-    // all it means is per-video settings need recreating on playback - not a big deal
-    // and it means the code can be kept reasonably simple.
-    CLog::Log(LOGINFO, "Deleting old settings table");
-    m_pDS->exec("DROP TABLE settings");
-    CLog::Log(LOGINFO, "Creating new settings table");
-    m_pDS->exec("CREATE TABLE settings ( idFile integer, Interleaved bool, NoCache bool, Deinterlace bool, FilmGrain integer,"
-                "ViewMode integer,ZoomAmount float, PixelRatio float, AudioStream integer, SubtitleStream integer,"
-                "SubtitleDelay float, SubtitlesOn bool, Brightness integer, Contrast integer, Gamma integer,"
-                "AdjustFrameRate integer, AudioDelay float, ResumeTime integer, Crop bool, CropLeft integer,"
-                "CropRight integer, CropTop integer, CropBottom integer)\n");
-  }
-  if (fVersion < 1.4f)
-  { // v 1.3 -> 1.4 (new layout for bookmarks table)
-    // Just delete the old bookmarks table and create it fresh
-    CLog::Log(LOGINFO, "Deleting old bookmarks table");
-    m_pDS->exec("DROP TABLE bookmark");
-    CLog::Log(LOGINFO, "Creating new bookmarks table");
-    m_pDS->exec("CREATE TABLE bookmark ( idBookmark integer primary key, idFile integer, timeInSeconds integer, thumbNailImage text)\n");
-  }
-//*************
-// 2005-10-08
-// MercuryInc
-  if (fVersion < 1.5f)
-  {
-    // v 1.4 -> 1.5 (new layout for Watched tag)
-    // Add watched column to movieinfo
-    try
-    {
-      CLog::Log(LOGINFO, "Adding column to movieinfo");
-      m_pDS->exec("CREATE TABLE TMPmovieinfo ( idMovie integer, idDirector integer, strPlotOutline text, strPlot text, strTagLine text, strVotes text, strRuntime text, fRating text, strCast text,strCredits text, iYear integer, strGenre text, strPictureURL text, strTitle text, IMDBID text, bWatched bool)\n");
-      m_pDS->exec("INSERT INTO TMPmovieinfo SELECT *, 'false' FROM movieinfo\n");
-      m_pDS->exec("DROP TABLE movieinfo\n");
-      m_pDS->exec("CREATE TABLE movieinfo ( idMovie integer, idDirector integer, strPlotOutline text, strPlot text, strTagLine text, strVotes text, strRuntime text, fRating text, strCast text,strCredits text, iYear integer, strGenre text, strPictureURL text, strTitle text, IMDBID text, bWatched bool)\n");
-      m_pDS->exec("INSERT INTO movieinfo SELECT * FROM TMPmovieinfo\n");
-      m_pDS->exec("DROP TABLE TMPmovieinfo\n");      
-    }
-    catch (...)
-    {
-      CLog::Log(LOGERROR, "Failed to add bWatched to movieinfo");
-      return false;
-    }
-    
-    //vacuum movieinfo so the db is readable again
-    try
-    {
-      CLog::Log(LOGINFO, "Vacuuming movieinfo");
-      m_pDS->exec("VACUUM movieinfo\n");      
-    }
-    catch (...)
-    {
-      CLog::Log(LOGERROR, "Failed to vacuum movieinfo");
-      return false;
-    }
-  }
-//*************
-  if (fVersion < 1.6f)
-  {
-    // dropping of AdjustFrameRate setting, and addition of VolumeAmplification setting
-    CLog::Log(LOGINFO, "Deleting old settings table");
-    m_pDS->exec("DROP TABLE settings");
-    CLog::Log(LOGINFO, "Creating new settings table");
-    m_pDS->exec("CREATE TABLE settings ( idFile integer, Interleaved bool, NoCache bool, Deinterlace bool, FilmGrain integer,"
-                "ViewMode integer,ZoomAmount float, PixelRatio float, AudioStream integer, SubtitleStream integer,"
-                "SubtitleDelay float, SubtitlesOn bool, Brightness integer, Contrast integer, Gamma integer,"
-                "VolumeAmplification float, AudioDelay float, ResumeTime integer, Crop bool, CropLeft integer,"
-                "CropRight integer, CropTop integer, CropBottom integer)\n");
-  }
-
-//*************
-// 2006-02-20
-// dvdplayer state
-  if (fVersion < 1.7f)
-  {
-    try
-    {
-      CLog::Log(LOGINFO, "Adding playerState and type to bookmark");
-      m_pDS->exec("CREATE TABLE TMPbookmark ( idBookmark integer primary key, idFile integer, timeInSeconds integer, thumbNailImage text, playerState text, type integer)\n");
-      m_pDS->exec("INSERT INTO TMPbookmark SELECT idBookmark, idFile, timeInSeconds, thumbNailImage, '', 0 FROM bookmark");
-      m_pDS->exec("DROP TABLE bookmark");
-      m_pDS->exec("CREATE TABLE bookmark ( idBookmark integer primary key, idFile integer, timeInSeconds integer, thumbNailImage text, playerState text, type integer)\n");
-      m_pDS->exec("INSERT INTO bookmark SELECT * FROM TMPbookmark");
-      m_pDS->exec("DROP TABLE TMPbookmark");
-    }
-    catch(...)
-    {
-      CLog::Log(LOGERROR, "Failed to add playerState and type to bookmark");
-      return false;
-    }
-  }
-  if (fVersion < 1.8f)
-  {
-    // Adding of OutputToAllSpeakers setting
-    CLog::Log(LOGINFO, "Deleting old settings table");
-    m_pDS->exec("DROP TABLE settings");
-    CLog::Log(LOGINFO, "Creating new settings table");
-    m_pDS->exec("CREATE TABLE settings ( idFile integer, Interleaved bool, NoCache bool, Deinterlace bool, FilmGrain integer,"
-                "ViewMode integer,ZoomAmount float, PixelRatio float, AudioStream integer, SubtitleStream integer,"
-                "SubtitleDelay float, SubtitlesOn bool, Brightness integer, Contrast integer, Gamma integer,"
-                "VolumeAmplification float, AudioDelay float, OutputToAllSpeakers bool, ResumeTime integer, Crop bool, CropLeft integer,"
-                "CropRight integer, CropTop integer, CropBottom integer)\n");
-  }
-  if (fVersion < 1.9f)
-  { // Add the stacktimes table
-    try
-    {
-    CLog::Log(LOGINFO, "Adding stacktimes table");
-    m_pDS->exec("CREATE TABLE stacktimes (idFile integer, usingConversions bool, times text)\n");
-    }
-    catch (...)
-    {
-      CLog::Log(LOGERROR, "Error adding stacktimes table to the database");
-    }
-  }
-
-
-//*************
-// 2006-02-20
-// dvdplayer state
-  if (fVersion < 2.0f)
-  {
-    try
-    {
-      CLog::Log(LOGINFO, "Adding player and changing timeInSeconds to float in bookmark table");
-      m_pDS->exec("CREATE TABLE TMPbookmark ( idBookmark integer primary key, idFile integer, timeInSeconds integer, thumbNailImage text, playerState text, type integer)\n");
-      m_pDS->exec("INSERT INTO TMPbookmark SELECT idBookmark, idFile, timeInSeconds, thumbNailImage, playerState, type FROM bookmark");
-      m_pDS->exec("DROP TABLE bookmark");
-      m_pDS->exec("CREATE TABLE bookmark ( idBookmark integer primary key, idFile integer, timeInSeconds double, thumbNailImage text, player text, playerState text, type integer)\n");
-      m_pDS->exec("INSERT INTO bookmark SELECT idBookmark, idFile, timeInSeconds, thumbNailImage, '', playerState, type FROM TMPbookmark");
-      m_pDS->exec("DROP TABLE TMPbookmark");
-    }
-    catch(...)
-    {
-      CLog::Log(LOGERROR, "Failed to upgrade bookmarks");
-      return false;
-    }
-    
-  }
-
-
   return true;
 }
 

Modified: trunk/XBMC/xbmc/VideoDatabase.h
===================================================================
--- trunk/XBMC/xbmc/VideoDatabase.h	2006-11-26 21:19:21 UTC (rev 7248)
+++ trunk/XBMC/xbmc/VideoDatabase.h	2006-11-27 00:57:46 UTC (rev 7249)
@@ -116,6 +116,6 @@
 
 private:
   virtual bool CreateTables();
-  virtual bool UpdateOldVersion(float fVersion);
+  virtual bool UpdateOldVersion(int version);
 
 };


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

Revision: 7252
          http://svn.sourceforge.net/xbmc/?rev=7252&view=rev
Author:   jmarshallnz
Date:     2006-11-26 17:37:59 -0800 (Sun, 26 Nov 2006)

Log Message:
-----------
added: Genre and Year information to albums returned on Library view (taken from first song scanned into the album)

Modified Paths:
--------------
    trunk/XBMC/xbmc/MusicDatabase.cpp
    trunk/XBMC/xbmc/MusicDatabase.h
    trunk/XBMC/xbmc/musicInfoTag.cpp

Modified: trunk/XBMC/xbmc/MusicDatabase.cpp
===================================================================
--- trunk/XBMC/xbmc/MusicDatabase.cpp	2006-11-27 01:17:04 UTC (rev 7251)
+++ trunk/XBMC/xbmc/MusicDatabase.cpp	2006-11-27 01:37:59 UTC (rev 7252)
@@ -12,7 +12,7 @@
 using namespace DIRECTORY::MUSICDATABASEDIRECTORY;
 
 #define MUSIC_DATABASE_OLD_VERSION 1.6f
-#define MUSIC_DATABASE_VERSION        3
+#define MUSIC_DATABASE_VERSION        4
 #define MUSIC_DATABASE_NAME "MyMusic6.db"
 #define RECENTLY_ADDED_LIMIT  25
 #define RECENTLY_PLAYED_LIMIT 25
@@ -41,7 +41,7 @@
     CLog::Log(LOGINFO, "create artist table");
     m_pDS->exec("CREATE TABLE artist ( idArtist integer primary key, strArtist text)\n");
     CLog::Log(LOGINFO, "create album table");
-    m_pDS->exec("CREATE TABLE album ( idAlbum integer primary key, strAlbum text, idArtist integer, iNumArtists integer, idPath integer, idThumb integer)\n");
+    m_pDS->exec("CREATE TABLE album ( idAlbum integer primary key, strAlbum text, idArtist integer, iNumArtists integer, idGenre integer, iNumGenres integer, iYear integer, idPath integer, idThumb integer)\n");
     CLog::Log(LOGINFO, "create genre table");
     m_pDS->exec("CREATE TABLE genre ( idGenre integer primary key, strGenre text)\n");
     CLog::Log(LOGINFO, "create path table");
@@ -104,9 +104,9 @@
 
     // views
     CLog::Log(LOGINFO, "create song view");
-    m_pDS->exec("create view songview as select idSong, song.iNumArtists as iNumArtists, song.iNumGenres as iNumGenres, strTitle, iTrack, iDuration, iYear, dwFileNameCRC, strFileName, strMusicBrainzTrackID, strMusicBrainzArtistID, strMusicBrainzAlbumID, strMusicBrainzAlbumArtistID, strMusicBrainzTRMID, iTimesPlayed, iStartOffset, iEndOffset, lastplayed, song.idAlbum as idAlbum, strAlbum, strPath, song.idArtist as idArtist, strArtist, song.idGenre as idGenre, strGenre, strThumb from song join album on song.idAlbum=album.idAlbum join path on song.idPath=path.idPath join artist on song.idArtist=artist.idArtist join genre on song.idGenre=genre.idGenre join thumb on song.idThumb=thumb.idThumb");
+    m_pDS->exec("create view songview as select idSong, song.iNumArtists as iNumArtists, song.iNumGenres as iNumGenres, strTitle, iTrack, iDuration, song.iYear as iYear, dwFileNameCRC, strFileName, strMusicBrainzTrackID, strMusicBrainzArtistID, strMusicBrainzAlbumID, strMusicBrainzAlbumArtistID, strMusicBrainzTRMID, iTimesPlayed, iStartOffset, iEndOffset, lastplayed, song.idAlbum as idAlbum, strAlbum, strPath, song.idArtist as idArtist, strArtist, song.idGenre as idGenre, strGenre, strThumb from song join album on song.idAlbum=album.idAlbum join path on song.idPath=path.idPath join artist on song.idArtist=artist.idArtist join genre on song.idGenre=genre.idGenre join thumb on song.idThumb=thumb.idThumb");
     CLog::Log(LOGINFO, "create album view");
-    m_pDS->exec("create view albumview as select idAlbum, strAlbum, iNumArtists, album.idArtist as idArtist, strArtist, strPath, strThumb from album left outer join path on album.idPath=path.idPath left outer join artist on album.idArtist=artist.idArtist left outer join thumb on album.idThumb=thumb.idThumb");
+    m_pDS->exec("create view albumview as select idAlbum, strAlbum, iNumArtists, album.idArtist as idArtist, iNumGenres, album.idGenre as idGenre, strArtist, strGenre, iYear, strPath, strThumb from album left outer join path on album.idPath=path.idPath left outer join artist on album.idArtist=artist.idArtist left outer join genre on album.idGenre=genre.idGenre left outer join thumb on album.idThumb=thumb.idThumb");
   }
   catch (...)
   {
@@ -146,7 +146,7 @@
 
     long lPathId = AddPath(strPath);
     long lThumbId = AddThumb(song.strThumb);
-    long lAlbumId = AddAlbum(song.strAlbum, lArtistId, iNumArtists, song.strArtist, lPathId, strPath, lThumbId);
+    long lAlbumId = AddAlbum(song.strAlbum, lArtistId, iNumArtists, song.strArtist, lPathId, strPath, lThumbId, lGenreId, iNumGenres, song.iYear);
 
     DWORD crc = ComputeCRC(song.strFileName);
 
@@ -205,7 +205,7 @@
   }
 }
 
-long CMusicDatabase::AddAlbum(const CStdString& strAlbum1, long lArtistId, int iNumArtists, const CStdString &strArtist1, long lPathId, const CStdString& strPath1, long idThumb)
+long CMusicDatabase::AddAlbum(const CStdString& strAlbum1, long lArtistId, int iNumArtists, const CStdString &strArtist1, long lPathId, const CStdString& strPath1, long idThumb, long idGenre, int numGenres, long year)
 {
   CStdString strSQL;
   try
@@ -229,6 +229,9 @@
       iNumArtists=0;
       strArtist.Empty();
       idThumb=AddThumb("");
+      idGenre=-1;
+      numGenres=0;
+      year=0;
     }
 
     if (NULL == m_pDB.get()) return -1;
@@ -247,7 +250,7 @@
     {
       m_pDS->close();
       // doesnt exists, add it
-      strSQL=FormatSQL("insert into album (idAlbum, strAlbum, idArtist, iNumArtists, idPath, idThumb) values( NULL, '%s', %i, %i, %i, %i)", strAlbum.c_str(), lArtistId, iNumArtists, lPathId, idThumb);
+      strSQL=FormatSQL("insert into album (idAlbum, strAlbum, idArtist, iNumArtists, idGenre, iNumGenres, iYear, idPath, idThumb) values( NULL, '%s', %i, %i, %i, %i, %i, %i, %i)", strAlbum.c_str(), lArtistId, iNumArtists, idGenre, numGenres, year, lPathId, idThumb);
       m_pDS->exec(strSQL.c_str());
 
       CAlbumCache album;
@@ -797,7 +800,11 @@
   album.strAlbum = m_pDS->fv(album_strAlbum).get_asString();
   album.strArtist = m_pDS->fv(album_strArtist).get_asString();
   if (m_pDS->fv(album_iNumArtists).get_asLong() > 1)
-    GetExtraArtistsForAlbum(m_pDS->fv(album_idAlbum).get_asLong(), album.strArtist);
+    GetExtraArtistsForAlbum(album.idAlbum, album.strArtist);
+  album.strGenre = m_pDS->fv(album_strGenre).get_asString();
+  if (m_pDS->fv(album_iNumGenres).get_asLong() > 1)
+    GetExtraGenresForAlbum(album.idAlbum, album.strGenre);
+  album.iYear = m_pDS->fv(album_iYear).get_asLong();
   album.strPath = m_pDS->fv(album_strPath).get_asString();
   album.strThumb = m_pDS->fv(album_strThumb).get_asString();
   if (album.strThumb == "NONE")
@@ -1171,7 +1178,7 @@
     long lGenreId = AddGenre(vecGenres[0]);
 
     long lPathId = AddPath(album.strPath);
-    long lAlbumId = AddAlbum(album.strAlbum, lArtistId, iNumArtists, album.strArtist, lPathId, album.strPath, -1);
+    long lAlbumId = AddAlbum(album.strAlbum, lArtistId, iNumArtists, album.strArtist, lPathId, album.strPath, -1, lGenreId, iNumGenres, album.iYear);
 
     AddExtraArtists(vecArtists, 0, lAlbumId);
     AddExtraGenres(vecGenres, 0, lAlbumId);
@@ -1981,7 +1988,7 @@
     long lArtistId = AddArtist(vecArtists[0]);
     long lGenreId = AddGenre(vecGenres[0]);
     long lPathId = AddPath(album.strPath);
-    long lAlbumId = AddAlbum(album.strAlbum, lArtistId, iNumArtists, album.strArtist, lPathId, album.strPath, -1);
+    long lAlbumId = AddAlbum(album.strAlbum, lArtistId, iNumArtists, album.strArtist, lPathId, album.strPath, -1, lGenreId, iNumGenres, album.iYear);
     // add any extra artists/genres
     AddExtraArtists(vecArtists, 0, lAlbumId);
     AddExtraGenres(vecGenres, 0, lAlbumId);
@@ -3317,6 +3324,57 @@
 
   try
   {
+    if (version < 4)
+    {
+      // version 3 to 4 upgrade - we need to add genre/year info to the album table(s)
+      CGUIDialogProgress *dialog = (CGUIDialogProgress *)m_gWindowManager.GetWindow(WINDOW_DIALOG_PROGRESS);
+      if (dialog)
+      {
+        dialog->SetHeading("Updating old database version");
+        dialog->SetLine(0, "");
+        dialog->SetLine(1, "");
+        dialog->SetLine(2, "This may take a couple of minutes...");
+        dialog->StartModal();
+
+        //  Let the progress dialog fade in, hopefully ;)
+        DWORD dwTicks=GetTickCount();
+        while (GetTickCount()-dwTicks<1000)
+          dialog->Progress();
+      }
+
+      BeginTransaction();
+      
+      dialog->SetLine(1, "Dropping views...");
+      dialog->Progress();
+      CLog::Log(LOGINFO, "Dropping album view");
+      m_pDS->exec("drop view albumview");
+      CLog::Log(LOGINFO, "Dropping song view");
+      m_pDS->exec("drop view songview");
+
+      dialog->SetLine(1, "Creating new album table...");
+      dialog->Progress();
+      CLog::Log(LOGINFO, "Creating temporary album table");
+      m_pDS->exec("CREATE TEMPORARY TABLE tempalbum ( idAlbum integer primary key, strAlbum text, idArtist integer, iNumArtists integer, idGenre integer, iNumGenres integer, iYear integer, idPath integer, idThumb integer)\n");
+      CLog::Log(LOGINFO, "Copying albums into temporary album table");
+      m_pDS->exec("INSERT INTO tempalbum select album.idAlbum as idAlbum, strAlbum, album.idArtist as idArtist, album.iNumArtists as iNumArtists, idGenre, iNumGenres, iYear, album.idPath as idPath, album.idThumb as idThumb from album join song on song.idAlbum = album.idAlbum group by album.idAlbum");
+      CLog::Log(LOGINFO, "Dropping old album table");
+      m_pDS->exec("DROP TABLE album");
+      CLog::Log(LOGINFO, "Creating new album table");
+      m_pDS->exec("CREATE TABLE album ( idAlbum integer primary key, strAlbum text, idArtist integer, iNumArtists integer, idGenre integer, iNumGenres integer, iYear integer, idPath integer, idThumb integer)\n");
+      CLog::Log(LOGINFO, "Copying albums into new albums table");
+      m_pDS->exec("INSERT INTO album select * from tempalbum");
+      CLog::Log(LOGINFO, "Dropping temporary album table");
+      m_pDS->exec("DROP TABLE tempalbum");
+      CLog::Log(LOGINFO, "create album index");
+      m_pDS->exec("CREATE INDEX idxAlbum ON album(strAlbum)");
+      CLog::Log(LOGINFO, "create album view");
+      m_pDS->exec("create view albumview as select idAlbum, strAlbum, iNumArtists, album.idArtist as idArtist, iNumGenres, album.idGenre as idGenre, strArtist, strGenre, iYear, strPath, strThumb from album left outer join path on album.idPath=path.idPath left outer join artist on album.idArtist=artist.idArtist left outer join genre on album.idGenre=genre.idGenre left outer join thumb on album.idThumb=thumb.idThumb");
+      CLog::Log(LOGINFO, "create song view");
+      m_pDS->exec("create view songview as select idSong, song.iNumArtists as iNumArtists, song.iNumGenres as iNumGenres, strTitle, iTrack, iDuration, song.iYear as iYear, dwFileNameCRC, strFileName, strMusicBrainzTrackID, strMusicBrainzArtistID, strMusicBrainzAlbumID, strMusicBrainzAlbumArtistID, strMusicBrainzTRMID, iTimesPlayed, iStartOffset, iEndOffset, lastplayed, song.idAlbum as idAlbum, strAlbum, strPath, song.idArtist as idArtist, strArtist, song.idGenre as idGenre, strGenre, strThumb from song join album on song.idAlbum=album.idAlbum join path on song.idPath=path.idPath join artist on song.idArtist=artist.idArtist join genre on song.idGenre=genre.idGenre join thumb on song.idThumb=thumb.idThumb");
+      CommitTransaction();
+
+      dialog->Close();
+    }
   }
   catch (...)
   {

Modified: trunk/XBMC/xbmc/MusicDatabase.h
===================================================================
--- trunk/XBMC/xbmc/MusicDatabase.h	2006-11-27 01:17:04 UTC (rev 7251)
+++ trunk/XBMC/xbmc/MusicDatabase.h	2006-11-27 01:37:59 UTC (rev 7252)
@@ -168,7 +168,7 @@
   map<CStdString, int /*CPathCache*/> m_thumbCache;
   map<CStdString, CAlbumCache> m_albumCache;
   virtual bool CreateTables();
-  long AddAlbum(const CStdString& strAlbum, long lArtistId, int iNumArtists, const CStdString& strArtist, long lPathId, const CStdString& strPath, long idThumb);
+  long AddAlbum(const CStdString& strAlbum, long lArtistId, int iNumArtists, const CStdString& strArtist, long lPathId, const CStdString& strPath, long idThumb, long idGenre, int numGenres, long year);
   long AddGenre(const CStdString& strGenre);
   long AddArtist(const CStdString& strArtist);
   long AddPath(const CStdString& strPath);
@@ -237,7 +237,11 @@
     album_strAlbum, 
     album_iNumArtists, 
     album_idArtist, 
-    album_strArtist, 
+    album_iNumGenres,
+    album_idGenre,
+    album_strArtist,
+    album_strGenre,
+    album_iYear,
     album_strPath, 
     album_strThumb
   } AlbumFields;

Modified: trunk/XBMC/xbmc/musicInfoTag.cpp
===================================================================
--- trunk/XBMC/xbmc/musicInfoTag.cpp	2006-11-27 01:17:04 UTC (rev 7251)
+++ trunk/XBMC/xbmc/musicInfoTag.cpp	2006-11-27 01:37:59 UTC (rev 7252)
@@ -238,6 +238,10 @@
 {
   SetArtist(album.strArtist);
   SetAlbum(album.strAlbum);
+  SetGenre(album.strGenre);
+  SYSTEMTIME stTime;
+  stTime.wYear = album.iYear;
+  SetReleaseDate(stTime);
   m_strURL = album.strPath;
   m_bLoaded = true;
 }


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

Revision: 7272
          http://svn.sourceforge.net/xbmc/?rev=7272&view=rev
Author:   kraqh3d
Date:     2006-11-28 16:23:29 -0800 (Tue, 28 Nov 2006)

Log Message:
-----------
fixed: the current playing item is now correctly highlighted in the Now Playing windows

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowMusicPlaylist.cpp
    trunk/XBMC/xbmc/GUIWindowMusicPlaylist.h
    trunk/XBMC/xbmc/GUIWindowVideoPlaylist.cpp
    trunk/XBMC/xbmc/GUIWindowVideoPlaylist.h

Modified: trunk/XBMC/xbmc/GUIWindowMusicPlaylist.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicPlaylist.cpp	2006-11-28 23:44:36 UTC (rev 7271)
+++ trunk/XBMC/xbmc/GUIWindowMusicPlaylist.cpp	2006-11-29 00:23:29 UTC (rev 7272)
@@ -92,7 +92,10 @@
       {
         int iSong = g_playlistPlayer.GetCurrentSong();
         if (iSong >= 0 && iSong <= m_vecItems.Size())
+        {
           m_viewControl.SetSelectedItem(iSong);
+          m_vecItems[iSong]->Select(true);
+        }
       }
 
       return true;
@@ -169,6 +172,7 @@
         if (iAction == ACTION_DELETE_ITEM || iAction == ACTION_MOUSE_MIDDLE_CLICK)
         {
           RemovePlayListItem(iItem);
+          MarkPlaying();
         }
       }
     }
@@ -405,6 +409,8 @@
   CStdString items;
   items.Format("%i %s", iItems, g_localizeStrings.Get(127).c_str());
   SET_CONTROL_LABEL(CONTROL_LABELFILES, items);
+
+  MarkPlaying();
 }
 
 bool CGUIWindowMusicPlayList::OnPlayMedia(int iItem)
@@ -528,6 +534,8 @@
 
   m_musicInfoLoader.Load(m_vecItems);
 
+
+
   return true;
 }
 
@@ -656,14 +664,7 @@
       g_partyModeManager.Disable();
     }
   }
-  m_vecItems[iItem]->Select(false);
-
-  // mark the currently playing item
-  if (bIsPlaying)
-  {
-    int i = g_playlistPlayer.GetCurrentSong();
-    m_vecItems[i]->Select(true);
-  }
+  MarkPlaying();
 }
 
 void CGUIWindowMusicPlayList::OnMove(int iItem, int iAction)
@@ -716,3 +717,18 @@
   if (bRestart)
     m_musicInfoLoader.Load(m_vecItems);
 }
+
+void CGUIWindowMusicPlayList::MarkPlaying()
+{
+  // clear markings
+  for (int i = 0; i < m_vecItems.Size(); i++)
+    m_vecItems[i]->Select(false);
+
+  // mark the currently playing item
+  if ((g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_MUSIC) && (g_application.IsPlayingAudio()))
+  {
+    int iSong = g_playlistPlayer.GetCurrentSong();
+    if (iSong >= 0 && iSong <= m_vecItems.Size())
+      m_vecItems[iSong]->Select(true);
+  }
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/GUIWindowMusicPlaylist.h
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicPlaylist.h	2006-11-28 23:44:36 UTC (rev 7271)
+++ trunk/XBMC/xbmc/GUIWindowMusicPlaylist.h	2006-11-29 00:23:29 UTC (rev 7272)
@@ -25,6 +25,7 @@
 
   void SavePlayList();
   void ClearPlayList();
+  void MarkPlaying();
   
   bool MoveCurrentPlayListItem(int iItem, int iAction, bool bUpdate = true);
 

Modified: trunk/XBMC/xbmc/GUIWindowVideoPlaylist.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoPlaylist.cpp	2006-11-28 23:44:36 UTC (rev 7271)
+++ trunk/XBMC/xbmc/GUIWindowVideoPlaylist.cpp	2006-11-29 00:23:29 UTC (rev 7272)
@@ -85,6 +85,7 @@
         if (iSong >= 0 && iSong <= (int)m_vecItems.Size())
         {
           m_viewControl.SetSelectedItem(iSong);
+          m_vecItems[iSong]->Select(true);
         }
       }
 
@@ -152,6 +153,7 @@
         if (iAction == ACTION_DELETE_ITEM || iAction == ACTION_MOUSE_MIDDLE_CLICK)
         {
           RemovePlayListItem(iItem);
+          MarkPlaying();
         }
       }
     }
@@ -280,6 +282,8 @@
   // update repeat button
   int iRepeat = 595 + g_playlistPlayer.GetRepeat(PLAYLIST_VIDEO);
   SET_CONTROL_LABEL(CONTROL_BTNREPEAT, g_localizeStrings.Get(iRepeat));
+
+  MarkPlaying();
 }
 
 bool CGUIWindowVideoPlaylist::OnPlayMedia(int iItem)
@@ -462,14 +466,7 @@
       return;
     }
   }
-  m_vecItems[iItem]->Select(false);
-
-  // mark the currently playing item
-  if (bIsPlaying)
-  {
-    int i = g_playlistPlayer.GetCurrentSong();
-    m_vecItems[i]->Select(true);
-  }
+  MarkPlaying();
 }
 
 void CGUIWindowVideoPlaylist::OnMove(int iItem, int iAction)
@@ -507,3 +504,18 @@
   }
   Update(m_vecItems.m_strPath);
 }
+
+void CGUIWindowVideoPlaylist::MarkPlaying()
+{
+  // clear markings
+  for (int i = 0; i < m_vecItems.Size(); i++)
+    m_vecItems[i]->Select(false);
+
+  // mark the currently playing item
+  if ((g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_VIDEO) && (g_application.IsPlayingVideo()))
+  {
+    int iSong = g_playlistPlayer.GetCurrentSong();
+    if (iSong >= 0 && iSong <= m_vecItems.Size())
+      m_vecItems[iSong]->Select(true);
+  }
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/GUIWindowVideoPlaylist.h
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoPlaylist.h	2006-11-28 23:44:36 UTC (rev 7271)
+++ trunk/XBMC/xbmc/GUIWindowVideoPlaylist.h	2006-11-29 00:23:29 UTC (rev 7272)
@@ -13,6 +13,7 @@
 protected:
   virtual bool OnPlayMedia(int iItem);
   virtual void UpdateButtons();
+  void MarkPlaying();
 
   virtual void OnPopupMenu(int iItem, bool bContextDriven = true);
   void OnMove(int iItem, int iAction);


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

Revision: 7273
          http://svn.sourceforge.net/xbmc/?rev=7273&view=rev
Author:   spiff_
Date:     2006-11-28 16:41:52 -0800 (Tue, 28 Nov 2006)

Log Message:
-----------


Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIMediaWindow.cpp
    trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
    trunk/XBMC/xbmc/GUIWindowVideoNav.cpp
    trunk/XBMC/xbmc/GUIWindowVideoNav.h
    trunk/XBMC/xbmc/GUIWindowVideoPlaylist.cpp

Modified: trunk/XBMC/xbmc/GUIMediaWindow.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIMediaWindow.cpp	2006-11-29 00:23:29 UTC (rev 7272)
+++ trunk/XBMC/xbmc/GUIMediaWindow.cpp	2006-11-29 00:41:52 UTC (rev 7273)
@@ -363,7 +363,6 @@
 {
   FormatItemLabels();
   SortItems(m_vecItems);
-  m_viewControl.SetItems(m_vecItems);
 }
 
 /*!
@@ -473,6 +472,8 @@
   // eg. changing the label
   OnFinalizeFileItems(m_vecItems);
 
+  m_viewControl.SetItems(m_vecItems);
+
   strSelectedItem = m_history.GetSelectedItem(m_vecItems.m_strPath);
 
   const CFileItem &currentItem = g_application.CurrentFileItem();
@@ -861,6 +862,7 @@
   OnSort();
   UpdateButtons();
   
+  m_viewControl.SetItems(m_vecItems);
   m_viewControl.SetSelectedItem(strSelected);
 
   //  set the currently playing item as selected, if its in this directory

Modified: trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2006-11-29 00:23:29 UTC (rev 7272)
+++ trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2006-11-29 00:41:52 UTC (rev 7273)
@@ -1324,11 +1324,6 @@
   {
     CIMDBMovie movie = movies[i];
     // add the appropiate movies to m_vecItems based on the showmode
-    if (
-      (g_stSettings.m_iMyVideoWatchMode == VIDEO_SHOW_ALL) ||
-      (g_stSettings.m_iMyVideoWatchMode == VIDEO_SHOW_WATCHED && movie.m_bWatched == true) ||
-      (g_stSettings.m_iMyVideoWatchMode == VIDEO_SHOW_UNWATCHED && movie.m_bWatched == false)
-      )
     {
       // mark watched movies when showing all
       CStdString strTitle = movie.m_strTitle;

Modified: trunk/XBMC/xbmc/GUIWindowVideoNav.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoNav.cpp	2006-11-29 00:23:29 UTC (rev 7272)
+++ trunk/XBMC/xbmc/GUIWindowVideoNav.cpp	2006-11-29 00:41:52 UTC (rev 7273)
@@ -147,18 +147,6 @@
   bool bResult = CGUIWindowVideoBase::GetDirectory(strDirectory, items);
   if (bResult)
   {
-    int iItem=0;
-    CVideoDatabaseDirectory dir;
-    if (dir.GetDirectoryChildType(strDirectory) == NODE_TYPE_TITLE && g_stSettings.m_iMyVideoWatchMode != VIDEO_SHOW_ALL)
-    {
-      while (iItem < items.Size())
-      {
-        if (items[iItem]->m_musicInfoTag.Loaded() != (bool)(g_stSettings.m_iMyVideoWatchMode-1))
-          items.Remove(iItem);
-        else
-          iItem++;
-      }
-    }
     if (!items.IsVideoDb())  // don't need to do this for playlist, as OnRetrieveMusicInfo() should ideally set thumbs
     {
       items.SetCachedVideoThumbs();
@@ -372,3 +360,19 @@
   m_viewControl.SetSelectedItem(iItem);
   return;
 }
+
+void CGUIWindowVideoNav::OnFinalizeFileItems(CFileItemList& items)
+{
+  int iItem=0;
+  CVideoDatabaseDirectory dir;
+  if (dir.GetDirectoryChildType(items.m_strPath) == NODE_TYPE_TITLE && g_stSettings.m_iMyVideoWatchMode != VIDEO_SHOW_ALL)
+  {
+    while (iItem < items.Size())
+    {
+      if (items[iItem]->m_musicInfoTag.Loaded() != (bool)(g_stSettings.m_iMyVideoWatchMode-1))
+        items.Remove(iItem);
+      else
+        iItem++;
+    }
+  }
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/GUIWindowVideoNav.h
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoNav.h	2006-11-29 00:23:29 UTC (rev 7272)
+++ trunk/XBMC/xbmc/GUIWindowVideoNav.h	2006-11-29 00:41:52 UTC (rev 7273)
@@ -21,6 +21,7 @@
   virtual void PlayItem(int iItem);
   virtual void OnDeleteItem(int iItem);
   virtual void OnWindowLoaded();
+  virtual void OnFinalizeFileItems(CFileItemList& items);
 
   void DisplayEmptyDatabaseMessage(bool bDisplay);
 

Modified: trunk/XBMC/xbmc/GUIWindowVideoPlaylist.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoPlaylist.cpp	2006-11-29 00:23:29 UTC (rev 7272)
+++ trunk/XBMC/xbmc/GUIWindowVideoPlaylist.cpp	2006-11-29 00:41:52 UTC (rev 7273)
@@ -234,7 +234,7 @@
     g_playlistPlayer.Reset();
     g_playlistPlayer.SetCurrentPlaylist(PLAYLIST_NONE);
   }
-  OnSort();
+  m_viewControl.SetItems(m_vecItems);
   UpdateButtons();
   SET_CONTROL_FOCUS(CONTROL_BTNVIEWASICONS, 0);
 }


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

Revision: 7285
          http://svn.sourceforge.net/xbmc/?rev=7285&view=rev
Author:   elupus
Date:     2006-11-30 16:26:58 -0800 (Thu, 30 Nov 2006)

Log Message:
-----------
changed: handle fullscreen switching from renderer and player instead of application, removes a few hacks needed to get this to work previously. should give quicker startup of some files (non dvds) in dvdplayer.
removed: unused functions and unnecessary indirections.

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp
    trunk/XBMC/xbmc/Application.h
    trunk/XBMC/xbmc/ApplicationMessenger.cpp
    trunk/XBMC/xbmc/ApplicationMessenger.h
    trunk/XBMC/xbmc/GUIWindowFullScreen.cpp
    trunk/XBMC/xbmc/GUIWindowSettingsScreenCalibration.cpp
    trunk/XBMC/xbmc/cores/IPlayer.h
    trunk/XBMC/xbmc/cores/MPlayer.h
    trunk/XBMC/xbmc/cores/VideoRenderers/ComboRenderer.cpp
    trunk/XBMC/xbmc/cores/VideoRenderers/RenderManager.cpp
    trunk/XBMC/xbmc/cores/VideoRenderers/RenderManager.h
    trunk/XBMC/xbmc/cores/VideoRenderers/XBoxRenderer.cpp
    trunk/XBMC/xbmc/cores/VideoRenderers/XBoxRenderer.h
    trunk/XBMC/xbmc/cores/dvdplayer/DVDMessageQueue.cpp
    trunk/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
    trunk/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
    trunk/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.h
    trunk/XBMC/xbmc/cores/mplayer/mplayer.cpp
    trunk/XBMC/xbmc/cores/mplayer/xbox_video.cpp
    trunk/XBMC/xbmc/cores/mplayer.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2006-11-30 16:55:57 UTC (rev 7284)
+++ trunk/XBMC/xbmc/Application.cpp	2006-12-01 00:26:58 UTC (rev 7285)
@@ -250,9 +250,6 @@
   m_nextPlaylistItem = -1;
   m_playCountUpdated = false;
 
-  // true while we switch to fullscreen (while video is paused)
-  m_switchingToFullScreen = false;
-
   //true while we in IsPaused mode! Workarround for OnPaused, which must be add. after v2.0
   m_bIsPaused = false;
 
@@ -2041,11 +2038,7 @@
         {
           CSingleLock lock(g_graphicsContext);
           m_gWindowManager.UpdateModelessVisibility();
-          extern void xbox_video_render_update(bool);
-          xbox_video_render_update(true);
-#ifdef HAS_XBOX_D3D
-          m_pd3dDevice->BlockUntilVerticalBlank();
-#endif
+          g_renderManager.RenderUpdate(true);
           m_pd3dDevice->Present( NULL, NULL, NULL, NULL );
           return ;
         }
@@ -3397,6 +3390,29 @@
       eNewCore = CPlayerCoreFactory::GetDefaultPlayer(item);
   }
 
+  // this really aught to be inside !bRestart, but since PlayStack
+  // uses that to init playback, we have to keep it outside
+  int playlist = g_playlistPlayer.GetCurrentPlaylist();
+  if (playlist == PLAYLIST_VIDEO && g_playlistPlayer.GetPlaylist(playlist).size() > 1)
+  { // playing from a playlist by the looks
+    // don't switch to fullscreen if we are not playing the first item...
+    options.fullscreen = !g_playlistPlayer.HasPlayedFirstFile();
+  }
+  else if(m_itemCurrentFile.IsStack())
+  {
+    // TODO - this will fail if user seeks back to first file in stack
+    if(m_currentStackPosition == 0
+    || m_itemCurrentFile.m_lStartOffset == STARTOFFSET_RESUME)
+      options.fullscreen = true;
+    else
+      options.fullscreen = false;
+    // reset this so we don't think we are resuming on seek    
+    m_itemCurrentFile.m_lStartOffset = 0;
+  }
+  else
+    options.fullscreen = true;
+
+
   // reset any forced player
   m_eForcedNextPlayer = EPC_NONE;
 
@@ -3431,45 +3447,7 @@
   }
 
   bool bResult = m_pPlayer->OpenFile(item, options);
-  if (bResult)
-  {
-    // if file happens to contain video stream
-    if ( IsPlayingVideo())
-    {
-      // reset the screensaver
-      ResetScreenSaver();
-      ResetScreenSaverWindow();
 
-      bool bCanSwitch = true;
-      // check whether we are playing from a playlist...
-      int playlist = g_playlistPlayer.GetCurrentPlaylist();
-      if (playlist == PLAYLIST_VIDEO)
-      { // playing from a playlist by the looks
-        if (g_playlistPlayer.GetPlaylist(playlist).size() > 1 && g_playlistPlayer.HasPlayedFirstFile())
-        { // don't switch to fullscreen if we are not playing the first item...
-          bCanSwitch = false;
-        }
-      }
-      // switch to fullscreen video mode if we can
-      if (bCanSwitch)
-      {
-        // wait till the screen is configured before we pause
-        // I'm sure this can be done better than just a sleep...
-#ifdef HAS_VIDEO_PLAYBACK
-        while (!g_renderManager.IsStarted())
-          Sleep(1);
-#endif
-        // pause video until screen is setup
-        m_switchingToFullScreen = true;
-        m_pPlayer->Pause();
-        SwitchToFullScreen();
-        //screen is setup, resume playing
-        m_pPlayer->Pause();
-        m_switchingToFullScreen = false;
-      }
-    }
-
-  }
   if (!g_guiSettings.GetBool("lookandfeel.soundsduringplayback"))
     g_audioManager.Enable(false);
   return bResult;
@@ -3574,8 +3552,6 @@
     return false;
   if (!m_pPlayer->IsPlaying())
     return false;
-  if (m_pPlayer->HasVideo() && m_switchingToFullScreen)
-    return false;
   return m_pPlayer->IsPaused();
 }
 
@@ -4338,10 +4314,6 @@
         else if (item.IsAudio() || item.IsVideo())
         { // an audio or video file
           PlayFile(item);
-          if (IsPlayingVideo() && m_gWindowManager.GetActiveWindow() != WINDOW_FULLSCREEN_VIDEO)
-          {
-            SwitchToFullScreen();
-          }
         }
         else
           return false;

Modified: trunk/XBMC/xbmc/Application.h
===================================================================
--- trunk/XBMC/xbmc/Application.h	2006-11-30 16:55:57 UTC (rev 7284)
+++ trunk/XBMC/xbmc/Application.h	2006-12-01 00:26:58 UTC (rev 7285)
@@ -158,6 +158,7 @@
   bool SetControllerRumble(FLOAT m_fLeftMotorSpeed, FLOAT m_fRightMotorSpeed,int iDuration);
 
 protected:
+  friend CApplicationMessenger;
   // screensaver
   bool m_bInactive;
   bool m_bScreenSave;
@@ -179,7 +180,6 @@
   EPLAYERCORES m_eCurrentPlayer;
   bool m_bXboxMediacenterLoaded;
   bool m_bSettingsLoaded;
-  bool m_switchingToFullScreen;
   bool m_bAllSettingsLoaded;
   bool m_bInitializing;
   bool m_playCountUpdated;

Modified: trunk/XBMC/xbmc/ApplicationMessenger.cpp
===================================================================
--- trunk/XBMC/xbmc/ApplicationMessenger.cpp	2006-11-30 16:55:57 UTC (rev 7284)
+++ trunk/XBMC/xbmc/ApplicationMessenger.cpp	2006-12-01 00:26:58 UTC (rev 7285)
@@ -302,6 +302,10 @@
         g_application.m_pPlayer->Pause();
       }
       break;
+    case TMSG_SWITCHTOFULLSCREEN:
+      if( m_gWindowManager.GetActiveWindow() != WINDOW_FULLSCREEN_VIDEO )
+        g_application.SwitchToFullScreen();
+      break;
 
     case TMSG_HTTPAPI:
       if (!pXbmcHttp)
@@ -528,4 +532,10 @@
 {
   ThreadMessage tMsg = {TMSG_NETWORKMESSAGE, dwMessage, dwParam};
   SendMessage(tMsg);
+}
+
+void CApplicationMessenger::SwitchToFullscreen()
+{
+  ThreadMessage tMsg = {TMSG_SWITCHTOFULLSCREEN};
+  SendMessage(tMsg, true);
 }
\ No newline at end of file

Modified: trunk/XBMC/xbmc/ApplicationMessenger.h
===================================================================
--- trunk/XBMC/xbmc/ApplicationMessenger.h	2006-11-30 16:55:57 UTC (rev 7284)
+++ trunk/XBMC/xbmc/ApplicationMessenger.h	2006-12-01 00:26:58 UTC (rev 7285)
@@ -24,6 +24,7 @@
 #define TMSG_RESTART              302
 #define TMSG_RESET                303
 #define TMSG_RESTARTAPP           304
+#define TMSG_SWITCHTOFULLSCREEN   305
 
 #define TMSG_HTTPAPI              400
 
@@ -68,6 +69,7 @@
   void RebootToDashBoard();
   void RestartApp();
   void Reset();
+  void SwitchToFullscreen(); //
 
   CStdString GetResponse();
   int SetResponse(CStdString response);

Modified: trunk/XBMC/xbmc/GUIWindowFullScreen.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowFullScreen.cpp	2006-11-30 16:55:57 UTC (rev 7284)
+++ trunk/XBMC/xbmc/GUIWindowFullScreen.cpp	2006-12-01 00:26:58 UTC (rev 7285)
@@ -107,7 +107,7 @@
 void CGUIWindowFullScreen::PreloadDialog(unsigned int windowID)
 {
   CGUIWindow *pWindow = m_gWindowManager.GetWindow(windowID);
-  if (pWindow) 
+  if (pWindow)
   {
     pWindow->Initialize();
     pWindow->DynamicResourceAlloc(false);
@@ -225,7 +225,7 @@
       if (g_stSettings.m_currentVideoSettings.m_SubtitleStream >= g_application.m_pPlayer->GetSubtitleCount())
         g_stSettings.m_currentVideoSettings.m_SubtitleStream = 0;
       g_application.m_pPlayer->SetSubtitle(g_stSettings.m_currentVideoSettings.m_SubtitleStream);
-      return true;    
+      return true;
     }
     return true;
     break;
@@ -393,16 +393,23 @@
         g_audioManager.Enable(false);
       }
 
+
       // setup the brightness, contrast and resolution
+      CUtil::SetBrightnessContrastGammaPercent(g_stSettings.m_currentVideoSettings.m_Brightness, g_stSettings.m_currentVideoSettings.m_Contrast, g_stSettings.m_currentVideoSettings.m_Gamma, false);
+
+      // switch resolution
       CSingleLock lock (g_graphicsContext);
-      CUtil::SetBrightnessContrastGammaPercent(g_stSettings.m_currentVideoSettings.m_Brightness, g_stSettings.m_currentVideoSettings.m_Contrast, g_stSettings.m_currentVideoSettings.m_Gamma, false);      
-      g_graphicsContext.SetFullScreenVideo( true );
+      g_graphicsContext.SetFullScreenVideo(true);
+#ifdef HAS_VIDEO_PLAYBACK
+      RESOLUTION res = g_renderManager.GetResolution();
+      g_graphicsContext.SetVideoResolution(res, false, false);
+#endif
       lock.Leave();
+
 #ifdef HAS_VIDEO_PLAYBACK
-      g_renderManager.SetViewMode(g_stSettings.m_currentVideoSettings.m_ViewMode);
+      // make sure renderer is uptospeed
       g_renderManager.Update(false);
 #endif
-
       // now call the base class to load our windows
       CGUIWindow::OnMessage(message);
 
@@ -443,8 +450,10 @@
       g_graphicsContext.SetFullScreenVideo(false);
       g_graphicsContext.SetGUIResolution(g_guiSettings.m_LookAndFeelResolution);
       lock.Leave();
+
 #ifdef HAS_VIDEO_PLAYBACK
-      g_renderManager.Update(false);      
+      // make sure renderer is uptospeed
+      g_renderManager.Update(false);
 #endif
 
       CSingleLock lockFont(m_fontLock);
@@ -453,8 +462,8 @@
         g_fontManager.Unload("__subtitle__");
         m_subtitleFont = NULL;
       }
-          
 
+
       g_audioManager.Enable(true);
       return true;
     }
@@ -769,7 +778,7 @@
     bNeedsPause = true;
   }
   g_application.m_pPlayer->Seek(bPlus, bLargeStep);
-  
+
   //Make sure gui items are visible
   g_infoManager.SetDisplayAfterSeek();
 

Modified: trunk/XBMC/xbmc/GUIWindowSettingsScreenCalibration.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowSettingsScreenCalibration.cpp	2006-11-30 16:55:57 UTC (rev 7284)
+++ trunk/XBMC/xbmc/GUIWindowSettingsScreenCalibration.cpp	2006-12-01 00:26:58 UTC (rev 7285)
@@ -106,15 +106,18 @@
       m_gWindowManager.ShowOverlay(OVERLAY_STATE_HIDDEN);
       g_graphicsContext.SetCalibrating(true);
       
-#ifdef HAS_VIDEO_PLAYBACK
-      // Inform the renderer so we can update the resolution
-      g_renderManager.Update(false);
-#endif
-
       // Get the allowable resolutions that we can calibrate...
       m_Res.clear();
       if (g_application.IsPlayingVideo())
       { // don't allow resolution switching if we are playing a video
+
+#ifdef HAS_VIDEO_PLAYBACK
+        RESOLUTION res = g_renderManager.GetResolution();
+        g_graphicsContext.SetVideoResolution(res);
+        // Inform the renderer so we can update the resolution
+        g_renderManager.Update(false);
+#endif
+
         m_iCurRes = 0;
         m_Res.push_back(g_graphicsContext.GetVideoResolution());
         SET_CONTROL_VISIBLE(CONTROL_VIDEO);

Modified: trunk/XBMC/xbmc/cores/IPlayer.h
===================================================================
--- trunk/XBMC/xbmc/cores/IPlayer.h	2006-11-30 16:55:57 UTC (rev 7284)
+++ trunk/XBMC/xbmc/cores/IPlayer.h	2006-12-01 00:26:58 UTC (rev 7285)
@@ -19,10 +19,12 @@
   {
     starttime = 0LL;
     identify = false;
+    fullscreen = false;
   }
   double  starttime; /* start time in seconds */
   bool    identify;  /* identify mode, used for checking format and length of a file */
   CStdString state;  /* potential playerstate to restore to */
+  bool    fullscreen; /* player is allowed to switch to fullscreen */
 };
 
 

Modified: trunk/XBMC/xbmc/cores/MPlayer.h
===================================================================
--- trunk/XBMC/xbmc/cores/MPlayer.h	2006-11-30 16:55:57 UTC (rev 7284)
+++ trunk/XBMC/xbmc/cores/MPlayer.h	2006-12-01 00:26:58 UTC (rev 7285)
@@ -68,6 +68,7 @@
     void SetVideoCodec(const string& codec) { m_audiocodec = codec; }
     void SetDemuxer(const string& demuxer) { m_demuxer = demuxer; }
     void SetSyncSpeed(const float synccomp) { m_synccomp = synccomp; }
+    void SetFullscreen(bool fullscreen) { m_fullscreen = fullscreen; }
 
   private:
     bool m_bDeinterlace;
@@ -100,6 +101,7 @@
     string m_strHexRawAudioFormat;
     float m_synccomp;
     vector<string> m_vecOptions;
+    bool m_fullscreen;
   };
   CMPlayer(IPlayerCallback& callback);
   virtual ~CMPlayer();

Modified: trunk/XBMC/xbmc/cores/VideoRenderers/ComboRenderer.cpp
===================================================================
--- trunk/XBMC/xbmc/cores/VideoRenderers/ComboRenderer.cpp	2006-11-30 16:55:57 UTC (rev 7284)
+++ trunk/XBMC/xbmc/cores/VideoRenderers/ComboRenderer.cpp	2006-12-01 00:26:58 UTC (rev 7285)
@@ -179,9 +179,14 @@
 
 void CComboRenderer::Update(bool bPauseDrawing)
 {
+  if(!m_bConfigured) return;
   CSingleLock lock(g_graphicsContext);
-  m_pD3DDevice->EnableOverlay(!bPauseDrawing);
-  if (bPauseDrawing) return ;
+
+  if(g_graphicsContext.IsFullScreenVideo() || g_graphicsContext.IsCalibrating())
+    m_pD3DDevice->EnableOverlay(!bPauseDrawing);
+  else
+    m_pD3DDevice->EnableOverlay(FALSE);
+
   CXBoxRenderer::Update(bPauseDrawing);
 }
 
@@ -308,7 +313,7 @@
     target.y1 = rd.top;
     target.y2 = rd.bottom;
     m_pD3DDevice->Clear( 1L, &target, D3DCLEAR_TARGET, m_clearColour, 1.0f, 0L );
-    
+
     // Don't render if we are waiting an overlay event
     while (!m_pD3DDevice->GetOverlayUpdateStatus()) Sleep(1);
 

Modified: trunk/XBMC/xbmc/cores/VideoRenderers/RenderManager.cpp
===================================================================
--- trunk/XBMC/xbmc/cores/VideoRenderers/RenderManager.cpp	2006-11-30 16:55:57 UTC (rev 7284)
+++ trunk/XBMC/xbmc/cores/VideoRenderers/RenderManager.cpp	2006-12-01 00:26:58 UTC (rev 7285)
@@ -66,18 +66,30 @@
 
 bool CXBoxRenderManager::Configure(unsigned int width, unsigned int height, unsigned int d_width, unsigned int d_height, float fps, unsigned flags)
 {
+  if( flags & CONF_FLAGS_FULLSCREEN )
+  {
+    // this is abit uggly, the call to switch to fullscreen
+    // may call back into the renderer, wich will lock
+    // if we hold an exclusive lock wich is needed for
+    // configure.
+    CSharedLock lock(m_sharedSection);
+    if (m_pRenderer)
+    {
+      m_pRenderer->ChooseBestResolution(fps);
+      lock.Leave();
+      g_applicationMessenger.SwitchToFullscreen();
+    }
+  }
+
   DWORD locks = ExitCriticalSection(g_graphicsContext);
   CExclusiveLock lock(m_sharedSection);
   RestoreCriticalSection(g_graphicsContext, locks);
 
-  m_iSourceWidth = width;
-  m_iSourceHeight = height;
   m_presentdelay = 5;
   bool result = false;
   if (m_pRenderer)
   {
     result = m_pRenderer->Configure(width, height, d_width, d_height, fps, flags);
-    Update(false);
     m_bIsStarted = true;
   }
   return result;
@@ -223,7 +235,7 @@
 void CXBoxRenderManager::Present()
 {
   EINTERLACEMETHOD mInt = g_stSettings.m_currentVideoSettings.m_InterlaceMethod;
-  
+
   /* check for forced fields */
   if( mInt == VS_INTERLACEMETHOD_AUTO && m_presentfield != FS_NONE )
   {
@@ -248,7 +260,7 @@
     m_presentdelay = 20;
   else
     m_presentdelay = 40;
-  
+
   if( m_presenttime >= m_presentdelay )
     m_presenttime -=  m_presentdelay;
   else
@@ -257,7 +269,7 @@
   if( mInt == VS_INTERLACEMETHOD_RENDER_BOB || mInt == VS_INTERLACEMETHOD_RENDER_BOB_INVERTED)
     PresentBob();
   else if( mInt == VS_INTERLACEMETHOD_RENDER_WEAVE || mInt == VS_INTERLACEMETHOD_RENDER_WEAVE_INVERTED)
-    PresentWeave(); 
+    PresentWeave();
   else if( mInt == VS_INTERLACEMETHOD_RENDER_BLEND )
     PresentBlend();
   else
@@ -297,7 +309,7 @@
     m_pRenderer->RenderUpdate(true, RENDER_FLAG_ODD | RENDER_FLAG_NOLOCK, 255);
   else
     m_pRenderer->RenderUpdate(true, RENDER_FLAG_EVEN | RENDER_FLAG_NOLOCK, 255);
-  
+
   D3D__pDevice->Present( NULL, NULL, NULL, NULL );
 }
 
@@ -315,8 +327,8 @@
     m_pRenderer->RenderUpdate(true, RENDER_FLAG_ODD | RENDER_FLAG_NOOSD, 255);
     m_pRenderer->RenderUpdate(false, RENDER_FLAG_EVEN, 128);
   }
-  
 
+
   /* wait for timestamp */
   while( m_presenttime > GetTickCount() && !CThread::m_bStop ) Sleep(1);
 

Modified: trunk/XBMC/xbmc/cores/VideoRenderers/RenderManager.h
===================================================================
--- trunk/XBMC/xbmc/cores/VideoRenderers/RenderManager.h	2006-11-30 16:55:57 UTC (rev 7284)
+++ trunk/XBMC/xbmc/cores/VideoRenderers/RenderManager.h	2006-12-01 00:26:58 UTC (rev 7285)
@@ -23,12 +23,6 @@
   void SetViewMode(int iViewMode) { CSharedLock lock(m_sharedSection); if (m_pRenderer) m_pRenderer->SetViewMode(iViewMode); };
 
   // Functions called from mplayer
-  inline void WaitForFlip()
-  {
-    CSharedLock lock(m_sharedSection);
-    if (m_pRenderer)
-      m_pRenderer->WaitForFlip();
-  }
   bool Configure(unsigned int width, unsigned int height, unsigned int d_width, unsigned int d_height, float fps, unsigned flags);
 
   // a call to GetImage must be followed by a call to releaseimage if getimage was successfull
@@ -70,6 +64,14 @@
     if (m_pRenderer)
       m_pRenderer->Reset();
   }
+  RESOLUTION GetResolution()
+  {
+    CSharedLock lock(m_sharedSection);
+    if (m_pRenderer)
+      return m_pRenderer->GetResolution();
+    else
+      return INVALID;
+  }
 
   inline int GetOSDWidth() { CSharedLock lock(m_sharedSection); if (m_pRenderer) return m_pRenderer->GetNormalDisplayWidth(); else return 0;};
   inline int GetOSDHeight() { CSharedLock lock(m_sharedSection); if (m_pRenderer) return m_pRenderer->GetNormalDisplayHeight(); else return 0; };
@@ -77,7 +79,6 @@
   inline bool Paused() { return m_bPauseDrawing; };
   inline bool IsStarted() { return m_bIsStarted;}
 
-
   CXBoxRenderer *m_pRenderer;
 protected:
   inline void Present();
@@ -86,9 +87,6 @@
   void PresentBob();
   void PresentBlend();
 
-  float m_fSourceFrameRatio; // the frame aspect ratio of the source (corrected for pixel ratio)
-  unsigned int m_iSourceWidth;    // width
-  unsigned int m_iSourceHeight;   // height
   bool m_bPauseDrawing;   // true if we should pause rendering
 
   bool m_bIsStarted;

Modified: trunk/XBMC/xbmc/cores/VideoRenderers/XBoxRenderer.cpp
===================================================================
--- trunk/XBMC/xbmc/cores/VideoRenderers/XBoxRenderer.cpp	2006-11-30 16:55:57 UTC (rev 7284)
+++ trunk/XBMC/xbmc/cores/VideoRenderers/XBoxRenderer.cpp	2006-12-01 00:26:58 UTC (rev 7285)
@@ -435,17 +435,6 @@
   return g_graphicsContext.GetVideoResolution();
 }
 
-void CXBoxRenderer::WaitForFlip()
-{
-  int iTmp = 0;
-  m_bFlipped = false;
-  while (!m_bFlipped && iTmp < 3000)
-  {
-    Sleep(1);
-    iTmp++;
-  }
-}
-
 float CXBoxRenderer::GetAspectRatio()
 {
   float fWidth = (float)m_iSourceWidth - g_stSettings.m_currentVideoSettings.m_CropLeft - g_stSettings.m_currentVideoSettings.m_CropRight;
@@ -707,10 +696,6 @@
   CLog::Log(LOGNOTICE, "Display resolution AUTO : %s (%d)", g_settings.m_ResInfo[m_iResolution].strMode, m_iResolution);
 }
 
-void CXBoxRenderer::CreateTextures()
-{
-}
-
 void CXBoxRenderer::SetupSubtitles()
 {
   //set zoomamount to 1 temporary to get the default width of the destination viewwindow
@@ -734,6 +719,7 @@
   CalculateFrameAspectRatio(d_width, d_height);
   ChooseBestResolution(m_fps);
   SetViewMode(g_stSettings.m_currentVideoSettings.m_ViewMode);
+
   ManageDisplay();
   SetupSubtitles();
 
@@ -825,13 +811,9 @@
 
 void CXBoxRenderer::Update(bool bPauseDrawing)
 {
-  if (m_bConfigured)
-  {
-    CSingleLock lock(g_graphicsContext);
-    bool bFullScreen = g_graphicsContext.IsFullScreenVideo() || g_graphicsContext.IsCalibrating();
-    g_graphicsContext.SetVideoResolution(bFullScreen ? m_iResolution : g_guiSettings.m_LookAndFeelResolution, !bFullScreen);
-    RenderUpdate(false);
-  }
+  if (!m_bConfigured) return;
+  CSingleLock lock(g_graphicsContext);
+  ManageDisplay();
 }
 
 void CXBoxRenderer::RenderUpdate(bool clear, DWORD flags, DWORD alpha)

Modified: trunk/XBMC/xbmc/cores/VideoRenderers/XBoxRenderer.h
===================================================================
--- trunk/XBMC/xbmc/cores/VideoRenderers/XBoxRenderer.h	2006-11-30 16:55:57 UTC (rev 7284)
+++ trunk/XBMC/xbmc/cores/VideoRenderers/XBoxRenderer.h	2006-12-01 00:26:58 UTC (rev 7285)
@@ -57,6 +57,7 @@
 #define CONF_FLAGS_YUVCOEF_EBU   0x04
 
 #define CONF_FLAGS_YUV_FULLRANGE 0x08
+#define CONF_FLAGS_FULLSCREEN    0x10
 
 struct DRAWRECT
 {
@@ -111,7 +112,6 @@
   virtual void SetupScreenshot() {};
   virtual void SetViewMode(int iViewMode);
   void CreateThumbnail(LPDIRECT3DSURFACE8 surface, unsigned int width, unsigned int height);
-  virtual void WaitForFlip();
 
   // Player functions
   virtual unsigned int QueryFormat(unsigned int format) { return 0; };
@@ -130,17 +130,15 @@
   virtual int GetNormalDisplayHeight() { return (int)(m_iNormalDestWidth / (m_iSourceWidth / (float)m_iSourceHeight)); }
   virtual void RenderBlank();
   void AutoCrop(bool bCrop);
-  int GetBuffersCount() { return m_NumYV12Buffers; };
   void RenderUpdate(bool clear, DWORD flags = 0, DWORD alpha = 255);
+  RESOLUTION GetResolution();
+  void ChooseBestResolution(float fps);
 
 protected:
   virtual void Render(DWORD flags);
   virtual void CalcNormalDisplayRect(float fOffsetX1, float fOffsetY1, float fScreenWidth, float fScreenHeight, float fUserPixelRatio, float fZoomAmount);
   void CalculateFrameAspectRatio(int desired_width, int desired_height);
   virtual void ManageDisplay();
-  virtual void CreateTextures();
-  void ChooseBestResolution(float fps);
-  RESOLUTION GetResolution();
   void CopyAlpha(int w, int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dst, unsigned char* dsta, int dststride);
   virtual void ManageTextures();
   void DeleteOSDTextures(int index);
@@ -170,7 +168,7 @@
   unsigned int m_iNormalDestWidth;  // initial destination width in normal view
 
   bool m_bConfigured;
-  
+
   // OSD stuff
   LPDIRECT3DTEXTURE8 m_pOSDYTexture[NUM_BUFFERS];
   LPDIRECT3DTEXTURE8 m_pOSDATexture[NUM_BUFFERS];
@@ -198,8 +196,8 @@
   #define FIELD_ODD 1
   #define FIELD_EVEN 2
 
-  // YV12 decoder textures  
-  // field index 0 is full image, 1 is odd scanlines, 2 is even scanlines  
+  // YV12 decoder textures
+  // field index 0 is full image, 1 is odd scanlines, 2 is even scanlines
   YUVBUFFERS m_YUVTexture;
 
   // render device

Modified: trunk/XBMC/xbmc/cores/dvdplayer/DVDMessageQueue.cpp
===================================================================
--- trunk/XBMC/xbmc/cores/dvdplayer/DVDMessageQueue.cpp	2006-11-30 16:55:57 UTC (rev 7284)
+++ trunk/XBMC/xbmc/cores/dvdplayer/DVDMessageQueue.cpp	2006-12-01 00:26:58 UTC (rev 7285)
@@ -91,7 +91,7 @@
 {
   if (!m_bInitialized)
   {
-    CLog::Log(LOGFATAL, "CDVDMessageQueue::Put MSGQ_NOT_INITIALIZED");
+    CLog::Log(LOGWARNING, "CDVDMessageQueue::Put MSGQ_NOT_INITIALIZED");
     return MSGQ_NOT_INITIALIZED;
   }
   if (!pMsg)

Modified: trunk/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp
===================================================================
--- trunk/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2006-11-30 16:55:57 UTC (rev 7284)
+++ trunk/XBMC/xbmc/cores/dvdplayer/DVDPlayer.cpp	2006-12-01 00:26:58 UTC (rev 7285)
@@ -112,32 +112,21 @@
     /* otherwise player will think we need to be restarted */
     g_stSettings.m_currentVideoSettings.m_SubtitleCached = true;
 
+    /* allow renderer to switch to fullscreen if requested */
+    m_dvdPlayerVideo.EnableFullscreen(options.fullscreen);
+
     ResetEvent(m_hReadyEvent);
     Create();
     WaitForSingleObject(m_hReadyEvent, INFINITE);
 
+    // Playback might have been stopped due to some error
+    if (m_bStop) return false;
+
     /* check if we got a full dvd state, then use that */
     if( options.state.size() > 0 && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD))
       SetPlayerState(options.state);
     else if( options.starttime > 0 )
       SeekTime( (__int64)(options.starttime * 1000) );
-
-    // if we are playing a media file with pictures, we should wait for the video output device to be initialized
-    // if we don't wait, the fullscreen window will init with a picture that is 0 pixels width and high
-    // we also have to wait for the player to be initialized so that we can set and access all settings when playing a dvd
-    bool bProcessThreadIsAlive = true;    
-
-    while ((m_CurrentVideo.id >= 0 || m_packetcount < 10)
-      && bProcessThreadIsAlive 
-      && !m_bAbortRequest 
-      && !m_dvdPlayerVideo.InitializedOutputDevice())
-    {
-      bProcessThreadIsAlive = !WaitForThreadExit(0);
-      Sleep(1);
-    }
-
-    // m_bPlaying could be set to false in the meantime, which indicates an error
-    if (!bProcessThreadIsAlive || m_bStop) return false;
     
     // settings that can only be set after the inputstream, demuxer and or codecs are opened
     SetSubtitleVisible(g_stSettings.m_currentVideoSettings.m_SubtitleOn);
@@ -1680,7 +1669,12 @@
         m_messenger.Put(new CDVDMsgDemuxerReset());
 
         //Force an aspect ratio that is set in the dvdheaders if available
-        m_dvdPlayerVideo.m_messageQueue.Put(new CDVDMsgVideoSetAspect(pStream->GetVideoAspectRatio()));
+        CDVDMsgVideoSetAspect *aspect = new CDVDMsgVideoSetAspect(pStream->GetVideoAspectRatio());
+        if( m_dvdPlayerVideo.m_messageQueue.Put(aspect) != MSGQ_OK )
+        {
+          aspect->Release();
+          m_dvdPlayerVideo.SetAspectRatio(pStream->GetVideoAspectRatio());
+        }
 
         return NAVRESULT_HOLD;
       }

Modified: trunk/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
===================================================================
--- trunk/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp	2006-11-30 16:55:57 UTC (rev 7284)
+++ trunk/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp	2006-12-01 00:26:58 UTC (rev 7285)
@@ -44,6 +44,7 @@
   m_iCurrentPts = DVD_NOPTS_VALUE;
   m_iDroppedFrames = 0;
   m_fFrameRate = 25;
+  m_bAllowFullscreen = false;
 }
 
 CDVDPlayerVideo::~CDVDPlayerVideo()
@@ -637,6 +638,12 @@
         flags |= CONF_FLAGS_YUVCOEF_BT709;
     }
 
+    if(m_bAllowFullscreen)
+    {
+      flags |= CONF_FLAGS_FULLSCREEN;
+      m_bAllowFullscreen = false; // only allow on first configure
+    }
+
     g_renderManager.Configure(pPicture->iWidth, pPicture->iHeight, pPicture->iDisplayWidth, pPicture->iDisplayHeight, m_fFrameRate, flags);
 
     m_output.width = pPicture->iWidth;

Modified: trunk/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.h
===================================================================
--- trunk/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.h	2006-11-30 16:55:57 UTC (rev 7284)
+++ trunk/XBMC/xbmc/cores/dvdplayer/DVDPlayerVideo.h	2006-12-01 00:26:58 UTC (rev 7285)
@@ -38,6 +38,9 @@
   void UpdateMenuPicture();
  
   void EnableSubtitle(bool bEnable)                 { m_bRenderSubs = bEnable; }
+  void EnableFullscreen(bool bEnable)               { m_bAllowFullscreen = bEnable; }
+  void SetAspectRatio(float aspect)                 { m_fForcedAspectRatio = aspect; }
+
   void GetVideoRect(RECT& SrcRect, RECT& DestRect)  { g_renderManager.GetVideoRect(SrcRect, DestRect); }
   float GetAspectRatio()                            { return g_renderManager.GetAspectRatio(); }
 
@@ -97,7 +100,7 @@
     float framerate;
   } m_output; //holds currently configured output
 
-  
+  bool m_bAllowFullscreen;
   bool m_bRenderSubs;
   
   float m_fForcedAspectRatio;

Modified: trunk/XBMC/xbmc/cores/mplayer/mplayer.cpp
===================================================================
--- trunk/XBMC/xbmc/cores/mplayer/mplayer.cpp	2006-11-30 16:55:57 UTC (rev 7284)
+++ trunk/XBMC/xbmc/cores/mplayer/mplayer.cpp	2006-12-01 00:26:58 UTC (rev 7285)
@@ -280,7 +280,16 @@
 
   int mplayer_process()
   {
-    return pProcess();
+    int result;
+    __asm 
+    { /* gcc compiled dll's expect stack to be aligned */     
+      mov esi,esp;
+      and esp,~15; /* align stack */
+      call dword ptr [pProcess];      
+      mov esp,esi; /* restore stack */
+      mov result, eax;
+    }
+    return result;
   }
 
   int mplayer_init(int argc, char* argv[])
@@ -290,7 +299,22 @@
 
   int mplayer_open_file(const char* szFile)
   {
-    return pOpenFile(szFile);
+    int result;
+    __asm 
+    { /* gcc compiled dll's expect stack to be aligned */
+      mov esi,esp;
+      sub esp,4;   /* make room for paramteres */
+      and esp,~15; /* align stack */
+      add esp,4;   /* re-add what we need to push */
+
+      mov eax,dword ptr [szFile];
+      push eax;
+      call dword ptr [pOpenFile];
+      mov result, eax;
+      mov esp,esi; /* restore stack */
+    }
+
+    return result;
   }
 
   int mplayer_close_file()

Modified: trunk/XBMC/xbmc/cores/mplayer/xbox_video.cpp
===================================================================
--- trunk/XBMC/xbmc/cores/mplayer/xbox_video.cpp	2006-11-30 16:55:57 UTC (rev 7284)
+++ trunk/XBMC/xbmc/cores/mplayer/xbox_video.cpp	2006-12-01 00:26:58 UTC (rev 7285)
@@ -39,31 +39,6 @@
 
 void video_uninit(void);
 
-void xbox_video_getAR(float& fAR)
-{
-  fAR = g_renderManager.GetAspectRatio();
-}
-
-void xbox_video_getRect(RECT& SrcRect, RECT& DestRect)
-{
-  g_renderManager.GetVideoRect(SrcRect, DestRect);
-}
-
-void xbox_video_wait()
-{
-  g_renderManager.WaitForFlip();
-}
-
-void xbox_video_render_update(bool clear)
-{
-  g_renderManager.RenderUpdate(clear);
-}
-
-void xbox_video_update(bool bPauseDrawing)
-{
-  g_renderManager.Update(bPauseDrawing);
-}
-
 /********************************************************************************************************
   mplayer calls below here
 ********************************************************************************************************/
@@ -181,8 +156,12 @@
   if (g_application.m_pPlayer)
     fps = g_application.m_pPlayer->GetActualFPS();
 
+  unsigned flags = 0;
+  if(options & VOFLAG_FULLSCREEN)
+    flags |= CONF_FLAGS_FULLSCREEN;
+
   //TODO, the format parameter, should be able to give a fullrange yuv format
-  if(g_renderManager.Configure(width, height, d_width, d_height, fps, 0))
+  if(g_renderManager.Configure(width, height, d_width, d_height, fps, flags))
     return 0;
 
   return VO_ERROR;

Modified: trunk/XBMC/xbmc/cores/mplayer.cpp
===================================================================
--- trunk/XBMC/xbmc/cores/mplayer.cpp	2006-11-30 16:55:57 UTC (rev 7284)
+++ trunk/XBMC/xbmc/cores/mplayer.cpp	2006-12-01 00:26:58 UTC (rev 7285)
@@ -635,6 +635,9 @@
     m_vecOptions.push_back(m_demuxer);
   }
 
+  if( m_fullscreen )
+    m_vecOptions.push_back("-fs");
+
   m_vecOptions.push_back("1.avi");
 
   argc = (int)m_vecOptions.size();
@@ -1034,6 +1037,7 @@
       options.SetNoCache(true);
     }
 
+    options.SetFullscreen(initoptions.fullscreen);
 
     options.GetOptions(argc, argv);
 
@@ -1679,29 +1683,24 @@
                       lFramesDropped, iQuality, iCacheFilled, fTotalCorrection, fAVDelay);
 }
 
-extern void xbox_audio_registercallback(IAudioCallback* pCallback);
-extern void xbox_audio_unregistercallback();
-extern void xbox_video_getRect(RECT& SrcRect, RECT& DestRect);
-extern void xbox_video_getAR(float& fAR);
-extern void xbox_video_update(bool bPauseDrawing);
-//extern void xbox_video_update_subtitle_position();
-//extern void xbox_video_render_subtitles();
-
 void CMPlayer::Update(bool bPauseDrawing)
 {
-  xbox_video_update(bPauseDrawing);
+  g_renderManager.Update(bPauseDrawing);
 }
 
 void CMPlayer::GetVideoRect(RECT& SrcRect, RECT& DestRect)
 {
-  xbox_video_getRect(SrcRect, DestRect);
+  g_renderManager.GetVideoRect(SrcRect, DestRect);
 }
 
 void CMPlayer::GetVideoAspectRatio(float& fAR)
 {
-  xbox_video_getAR(fAR);
+  fAR = g_renderManager.GetAspectRatio();
 }
 
+extern void xbox_audio_registercallback(IAudioCallback* pCallback);
+extern void xbox_audio_unregistercallback();
+
 void CMPlayer::RegisterAudioCallback(IAudioCallback* pCallback)
 {
   xbox_audio_registercallback(pCallback);
@@ -1715,16 +1714,6 @@
 {
 }
 
-//void CMPlayer::UpdateSubtitlePosition()
-//{
-// xbox_video_update_subtitle_position();
-//}
-//
-//void CMPlayer::RenderSubtitles()
-//{
-// xbox_video_render_subtitles();
-//}
-
 bool CMPlayer::CanRecord()
 {
   if (!m_pShoutCastRipper) return false;


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

Revision: 7292
          http://svn.sourceforge.net/xbmc/?rev=7292&view=rev
Author:   kraqh3d
Date:     2006-12-02 09:45:41 -0800 (Sat, 02 Dec 2006)

Log Message:
-----------
fixed: a running music or video scan will prevent idle shutdown

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp
    trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp
    trunk/XBMC/xbmc/GUIWindowVideoFiles.h

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2006-12-02 17:28:24 UTC (rev 7291)
+++ trunk/XBMC/xbmc/Application.cpp	2006-12-02 17:45:41 UTC (rev 7292)
@@ -3848,6 +3848,8 @@
 
 void CApplication::CheckShutdown()
 {
+  CGUIDialogMusicScan *pMusicScan = (CGUIDialogMusicScan *)m_gWindowManager.GetWindow(WINDOW_DIALOG_MUSIC_SCAN);
+  CGUIWindowVideoFiles *pVideoFiles = (CGUIWindowVideoFiles *)m_gWindowManager.GetWindow(WINDOW_VIDEO_FILES);
 #ifdef HAS_XBOX_HARDWARE
   // Note: if the the screensaver is switched on, the shutdown timeout is
   // counted from when the screensaver activates.
@@ -3867,6 +3869,14 @@
       m_bInactive = false;
     }
 #endif
+    else if (pMusicScan && pMusicScan->IsScanning()) // music scanning?
+    {
+      m_bInactive = false;
+    }
+    else if (pVideoFiles && pVideoFiles->IsScanning()) // video scanning?
+    {
+      m_bInactive = false;
+    }
     else    // nothing doing here, so start the timer going
     {
       m_bInactive = true;

Modified: trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp	2006-12-02 17:28:24 UTC (rev 7291)
+++ trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp	2006-12-02 17:45:41 UTC (rev 7292)
@@ -28,6 +28,7 @@
 CGUIWindowVideoFiles::CGUIWindowVideoFiles()
 : CGUIWindowVideoBase(WINDOW_VIDEO_FILES, "MyVideo.xml")
 {
+  m_bIsScanning = false;
 }
 
 CGUIWindowVideoFiles::~CGUIWindowVideoFiles()
@@ -538,10 +539,12 @@
 void CGUIWindowVideoFiles::OnScan()
 {
   // GetStackedDirectory() now sets and restores the stack state!
+  m_bIsScanning = true;
   CFileItemList items;
   GetStackedDirectory(m_vecItems.m_strPath, items);
   DoScan(m_vecItems.m_strPath, items);
   Update(m_vecItems.m_strPath);
+  m_bIsScanning = false;
 }
 
 bool CGUIWindowVideoFiles::DoScan(const CStdString &strPath, CFileItemList& items)

Modified: trunk/XBMC/xbmc/GUIWindowVideoFiles.h
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoFiles.h	2006-12-02 17:28:24 UTC (rev 7291)
+++ trunk/XBMC/xbmc/GUIWindowVideoFiles.h	2006-12-02 17:45:41 UTC (rev 7292)
@@ -8,6 +8,7 @@
   virtual ~CGUIWindowVideoFiles(void);
   virtual bool OnMessage(CGUIMessage& message);
   virtual bool OnAction(const CAction &action);
+  bool IsScanning() { return m_bIsScanning; };
 
 protected:
   virtual bool GetDirectory(const CStdString &strDirectory, CFileItemList &items);
@@ -26,4 +27,6 @@
   virtual void LoadPlayList(const CStdString& strFileName);
   void GetIMDBDetails(CFileItem *pItem, CIMDBUrl &url);
   void PlayFolder(const CFileItem* pItem);
+
+  bool m_bIsScanning;
 };


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

Revision: 7306
          http://svn.sourceforge.net/xbmc/?rev=7306&view=rev
Author:   spiff_
Date:     2006-12-04 11:18:47 -0800 (Mon, 04 Dec 2006)

Log Message:
-----------
fixed: [ 1608258 ] Max 99 tracks supported in cue sheets

Modified Paths:
--------------
    trunk/XBMC/xbmc/CueDocument.cpp
    trunk/XBMC/xbmc/CueDocument.h

Modified: trunk/XBMC/xbmc/CueDocument.cpp
===================================================================
--- trunk/XBMC/xbmc/CueDocument.cpp	2006-12-04 18:08:49 UTC (rev 7305)
+++ trunk/XBMC/xbmc/CueDocument.cpp	2006-12-04 19:18:47 UTC (rev 7306)
@@ -90,13 +90,8 @@
       {
         m_Track[m_iTotalTracks].iTrackNumber = m_iTotalTracks + 1;
       }
-      if (m_iTotalTracks < MAX_CUE_TRACKS)
-        m_Track[m_iTotalTracks++].iStartTime = time; // start time of the next track
-      else
-      { // Warning - Max tracks exceeded!
-        CLog::Log(LOGERROR,"Max Cue Tracks (99) obtained!");
-        break;
-      }
+
+      m_Track[m_iTotalTracks++].iStartTime = time; // start time of the next track
     }
     else if (strLine.Left(5) == "TITLE")
     {
@@ -117,6 +112,8 @@
       if (m_iTotalTracks == -1) // No tracks yet
         m_iTotalTracks = 0; // Starting the first track
       iTrackNumber = ExtractNumericInfo(strLine.c_str() + 5);
+      CCueTrack track;
+      m_Track.push_back(track);
     }
     else if (strLine.Left(4) == "FILE")
     {

Modified: trunk/XBMC/xbmc/CueDocument.h
===================================================================
--- trunk/XBMC/xbmc/CueDocument.h	2006-12-04 18:08:49 UTC (rev 7305)
+++ trunk/XBMC/xbmc/CueDocument.h	2006-12-04 19:18:47 UTC (rev 7306)
@@ -3,7 +3,6 @@
 #include "musicdatabase.h"
 
 #define MAX_PATH_SIZE 1024
-#define MAX_CUE_TRACKS 99
 
 class CCueDocument
 {
@@ -52,7 +51,7 @@
   float m_replayGainAlbumPeak;
 
   // cuetrack array
-  CCueTrack m_Track[MAX_CUE_TRACKS];
+  std::vector<CCueTrack> m_Track;
 
   bool ReadNextLine(CStdString &strLine);
   bool ExtractQuoteInfo(CStdString &szData, const char *szLine);


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

Revision: 7307
          http://svn.sourceforge.net/xbmc/?rev=7307&view=rev
Author:   spiff_
Date:     2006-12-04 13:33:37 -0800 (Mon, 04 Dec 2006)

Log Message:
-----------
fixed: mockup with a locked video section and dvd playback

Modified Paths:
--------------
    trunk/XBMC/xbmc/Autorun.cpp
    trunk/XBMC/xbmc/GUIPassword.cpp

Modified: trunk/XBMC/xbmc/Autorun.cpp
===================================================================
--- trunk/XBMC/xbmc/Autorun.cpp	2006-12-04 19:18:47 UTC (rev 7306)
+++ trunk/XBMC/xbmc/Autorun.cpp	2006-12-04 21:33:37 UTC (rev 7307)
@@ -261,7 +261,7 @@
   }
 
   // check video first
-  if (!nAddedToPlaylist && !bPlaying && (bypassSettings || g_guiSettings.GetBool("autorun.video")) && bAllowVideo)
+  if (!nAddedToPlaylist && !bPlaying && (bypassSettings || g_guiSettings.GetBool("autorun.video")))
   {
     // stack video files
     CFileItemList tempItems;
@@ -292,6 +292,15 @@
     }
     if (itemlist.Size())
     {
+      if (!bAllowVideo)
+      {
+        if (!bypassSettings)
+          return false;
+        
+        if (m_gWindowManager.GetActiveWindow() != WINDOW_VIDEO_FILES)
+          if (!g_passwordManager.IsMasterLockUnlocked(true))
+            return false;
+      }
       g_playlistPlayer.ClearPlaylist(PLAYLIST_VIDEO);
       g_playlistPlayer.Add(PLAYLIST_VIDEO, itemlist);
       g_playlistPlayer.SetCurrentPlaylist(PLAYLIST_VIDEO);

Modified: trunk/XBMC/xbmc/GUIPassword.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIPassword.cpp	2006-12-04 19:18:47 UTC (rev 7306)
+++ trunk/XBMC/xbmc/GUIPassword.cpp	2006-12-04 21:33:37 UTC (rev 7307)
@@ -413,7 +413,7 @@
       iSwitch = WINDOW_VIDEO_FILES;
 
   if (iWindowID == WINDOW_VIDEO_FILES)
-    if (WINDOW_VIDEO_NAV)
+    if (m_gWindowManager.GetActiveWindow() == WINDOW_VIDEO_NAV)
       iSwitch = WINDOW_HOME;
 
   CLog::Log(LOGDEBUG, "Checking if window ID %i is locked.", iSwitch);


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

Revision: 7314
          http://svn.sourceforge.net/xbmc/?rev=7314&view=rev
Author:   elupus
Date:     2006-12-05 08:04:09 -0800 (Tue, 05 Dec 2006)

Log Message:
-----------
changed: removed unnecessary functions

if somebody knows why the use of InterlockedExchangePointer in this case would have helped in any way, please tell me.

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp
    trunk/XBMC/xbmc/Application.h
    trunk/XBMC/xbmc/CdgParser.cpp
    trunk/XBMC/xbmc/lib/libPython/xbmcmodule/player.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2006-12-05 08:30:42 UTC (rev 7313)
+++ trunk/XBMC/xbmc/Application.cpp	2006-12-05 16:04:09 UTC (rev 7314)
@@ -4746,24 +4746,6 @@
   }
 }
 
-// using InterlockedExchangePointer so the python library doesn't have to worry
-// about threads
-CMusicInfoTag* CApplication::GetCurrentSong()
-{
-  CMusicInfoTag* pointer;
-  InterlockedExchangePointer(&pointer, &g_infoManager.GetCurrentSongTag());
-  return pointer;
-}
-
-// using InterlockedExchangePointer so the python library doesn't have to worry
-// about threads
-CIMDBMovie* CApplication::GetCurrentMovie()
-{
-  CIMDBMovie* pointer;
-  InterlockedExchangePointer(&pointer, &g_infoManager.GetCurrentMovie());
-  return pointer;
-}
-
 // SwitchToFullScreen() returns true if a switch is made, else returns false
 bool CApplication::SwitchToFullScreen()
 {

Modified: trunk/XBMC/xbmc/Application.h
===================================================================
--- trunk/XBMC/xbmc/Application.h	2006-12-05 08:30:42 UTC (rev 7313)
+++ trunk/XBMC/xbmc/Application.h	2006-12-05 16:04:09 UTC (rev 7314)
@@ -99,8 +99,6 @@
   void CheckPlayingProgress();
   void CheckAudioScrobblerStatus();
   void ActivateScreenSaver(bool forceType = false);
-  CMusicInfoTag* GetCurrentSong();
-  CIMDBMovie* GetCurrentMovie();
 
   virtual void Process();
   void ProcessSlow();

Modified: trunk/XBMC/xbmc/CdgParser.cpp
===================================================================
--- trunk/XBMC/xbmc/CdgParser.cpp	2006-12-05 08:30:42 UTC (rev 7313)
+++ trunk/XBMC/xbmc/CdgParser.cpp	2006-12-05 16:04:09 UTC (rev 7314)
@@ -3,6 +3,7 @@
 #include "application.h"
 #include "util.h"
 #include "audiocontext.h"
+#include "utils\guiinfomanager.h"
 
 //CdgLoader
 CCdgLoader::CCdgLoader()
@@ -260,7 +261,7 @@
     CSingleLock lock (m_CritSection);
     double fDiff;
     //if (!g_application.IsPlaying())
-    if (g_application.GetCurrentSong()->GetURL().substr(0,strExt.size()) != strExt)
+    if (g_infoManager.GetCurrentSongTag().GetURL().substr(0,strExt.size()) != strExt)
     {
       Sleep(15);
       if (CThread::m_bStop)

Modified: trunk/XBMC/xbmc/lib/libPython/xbmcmodule/player.cpp
===================================================================
--- trunk/XBMC/xbmc/lib/libPython/xbmcmodule/player.cpp	2006-12-05 08:30:42 UTC (rev 7313)
+++ trunk/XBMC/xbmc/lib/libPython/xbmcmodule/player.cpp	2006-12-05 16:04:09 UTC (rev 7314)
@@ -1,5 +1,6 @@
 #include "../../../stdafx.h"
 #include "..\..\..\application.h"
+#include "..\..\..\utils\guiinfomanager.h"
 #include "..\..\..\playlistplayer.h"
 #include "..\..\..\util.h"
 #include "player.h"
@@ -284,7 +285,7 @@
 			return NULL;
 		}
 
-		return (PyObject*)InfoTagVideo_FromCIMDBMovie(*(g_application.GetCurrentMovie()));
+		return (PyObject*)InfoTagVideo_FromCIMDBMovie(g_infoManager.GetCurrentMovie());
 	}
 
 	// Player_GetMusicInfoTag
@@ -302,7 +303,7 @@
 			return NULL;
 		}
 
-		return (PyObject*)InfoTagMusic_FromCMusicInfoTag(*(g_application.GetCurrentSong()));
+		return (PyObject*)InfoTagMusic_FromCMusicInfoTag(g_infoManager.GetCurrentSongTag());
 	}
 
 	// Player_GetTotalTime


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

Revision: 7322
          http://svn.sourceforge.net/xbmc/?rev=7322&view=rev
Author:   kraqh3d
Date:     2006-12-06 17:27:02 -0800 (Wed, 06 Dec 2006)

Log Message:
-----------
added: the thumb for the dvd-rom source can be set by placing a folder.jpg image in the root of the disc.  (others can be added via advancedsettings.xml)

Modified Paths:
--------------
    trunk/XBMC/xbmc/DetectDVDType.cpp
    trunk/XBMC/xbmc/FileSystem/VirtualDirectory.cpp
    trunk/XBMC/xbmc/Settings.cpp
    trunk/XBMC/xbmc/Settings.h

Modified: trunk/XBMC/xbmc/DetectDVDType.cpp
===================================================================
--- trunk/XBMC/xbmc/DetectDVDType.cpp	2006-12-06 21:11:27 UTC (rev 7321)
+++ trunk/XBMC/xbmc/DetectDVDType.cpp	2006-12-07 01:27:02 UTC (rev 7322)
@@ -7,6 +7,8 @@
 #include "xbox/undocumented.h"
 #endif
 #include "application.h"
+#include "util.h"
+#include "picture.h"
 
 #ifdef AFTER2_0
 #include "utils/LED.h"
@@ -271,6 +273,31 @@
   // store it in case others want it
   m_diskLabel = strDescription;
   m_diskPath = strNewUrl;
+
+  // delete any previously cached disc thumbnail
+  CStdString strCache = "Z:\\dvdicon.tbn";
+  if (CFile::Exists(strCache))
+    CFile::Delete(strCache);
+
+  // find and cache disc thumbnail
+  if (IsDiscInDrive() && !bCDDA)
+  {
+    CStdString strThumb;
+    CStdStringArray thumbs;
+    StringUtils::SplitString(g_advancedSettings.m_dvdThumbs, "|", thumbs);
+    for (unsigned int i = 0; i < thumbs.size(); ++i)
+    {
+      CUtil::AddFileToFolder(m_diskPath, thumbs[i], strThumb);
+      CLog::Log(LOGDEBUG,__FUNCTION__": looking for disc thumb:[%s]", strThumb.c_str());
+      if (CFile::Exists(strThumb))
+      {
+        CLog::Log(LOGDEBUG,__FUNCTION__": found disc thumb:[%s], caching as:[%s]", strThumb.c_str(), strCache.c_str());
+        CPicture pic;
+        pic.DoCreateThumbnail(strThumb, strCache);
+        break;
+      }
+    }
+  }
 }
 
 DWORD CDetectDVDMedia::GetTrayState()

Modified: trunk/XBMC/xbmc/FileSystem/VirtualDirectory.cpp
===================================================================
--- trunk/XBMC/xbmc/FileSystem/VirtualDirectory.cpp	2006-12-06 21:11:27 UTC (rev 7321)
+++ trunk/XBMC/xbmc/FileSystem/VirtualDirectory.cpp	2006-12-07 01:27:02 UTC (rev 7322)
@@ -161,7 +161,13 @@
     {
       // We have the real DVD-ROM, set icon on disktype
       if (share.m_iDriveType == SHARE_TYPE_DVD)
+      {
         CUtil::GetDVDDriveIcon( pItem->m_strPath, strIcon );
+        // CDetectDVDMedia::SetNewDVDShareUrl() caches disc thumb as Z:\dvdicon.tbn
+        CStdString strThumb = "Z:\\dvdicon.tbn";
+        if (CFile::Exists(strThumb))
+          pItem->SetThumbnailImage(strThumb);
+      }
       else if (strPathUpper.Left(11) == "SOUNDTRACK:")
         strIcon = "defaultHardDisk.png";
       else if (pItem->IsRemote())

Modified: trunk/XBMC/xbmc/Settings.cpp
===================================================================
--- trunk/XBMC/xbmc/Settings.cpp	2006-12-06 21:11:27 UTC (rev 7321)
+++ trunk/XBMC/xbmc/Settings.cpp	2006-12-07 01:27:02 UTC (rev 7322)
@@ -249,6 +249,7 @@
   g_settings.bUseLoginScreen = false;
 
   g_advancedSettings.m_musicThumbs = "folder.jpg";
+  g_advancedSettings.m_dvdThumbs = "folder.jpg";
 
   xbmcXmlLoaded = false;
   bTransaction = false;
@@ -1357,14 +1358,41 @@
   XMLUtils::GetBoolean(pRootElement, "playlistasfolders", g_advancedSettings.m_playlistAsFolders);
   XMLUtils::GetBoolean(pRootElement, "detectasudf", g_advancedSettings.m_detectAsUdf);
 
+  // music thumbs
   CStdString extraThumbs;
   TiXmlElement* pThumbs = pRootElement->FirstChildElement("musicthumbs");
   if (pThumbs)
   {
+    // remove before add so that the defaults can be restored after user defined ones
+    // (ie, the list can be:cover.jpg|cover.png|folder.jpg)
+    GetString(pThumbs, "remove", extraThumbs, "");
+    if (extraThumbs != "")
+    {
+      CStdStringArray thumbs;
+      StringUtils::SplitString(extraThumbs, "|", thumbs);
+      for (unsigned int i = 0; i < thumbs.size(); ++i)
+      {
+        int iPos = g_advancedSettings.m_musicThumbs.Find(thumbs[i]);
+        if (iPos == -1)
+          continue;
+        g_advancedSettings.m_musicThumbs.erase(iPos, thumbs[i].size() + 1);
+      }
+    }
     GetString(pThumbs, "add", extraThumbs,"");
     if (extraThumbs != "")
-      g_advancedSettings.m_musicThumbs += "|" + extraThumbs;
+    {
+      if (!g_advancedSettings.m_musicThumbs.IsEmpty())
+        g_advancedSettings.m_musicThumbs += "|";
+      g_advancedSettings.m_musicThumbs += extraThumbs;
+    }
+  }
 
+  // dvd thumbs
+  pThumbs = pRootElement->FirstChildElement("dvdthumbs");
+  if (pThumbs)
+  {
+    // remove before add so that the defaults can be restored after user defined ones
+    // (ie, the list can be:cover.jpg|cover.png|folder.jpg)
     GetString(pThumbs, "remove", extraThumbs, "");
     if (extraThumbs != "")
     {
@@ -1377,7 +1405,14 @@
           continue;
         g_advancedSettings.m_musicThumbs.erase(iPos, thumbs[i].size() + 1);
       }
-    }    
+    }
+    GetString(pThumbs, "add", extraThumbs,"");
+    if (extraThumbs != "")
+    {
+      if (!g_advancedSettings.m_musicThumbs.IsEmpty())
+        g_advancedSettings.m_musicThumbs += "|";
+      g_advancedSettings.m_musicThumbs += extraThumbs;
+    }
   }
 
   // load in the GUISettings overrides:

Modified: trunk/XBMC/xbmc/Settings.h
===================================================================
--- trunk/XBMC/xbmc/Settings.h	2006-12-06 21:11:27 UTC (rev 7321)
+++ trunk/XBMC/xbmc/Settings.h	2006-12-07 01:27:02 UTC (rev 7322)
@@ -302,6 +302,7 @@
     int m_sambaclienttimeout;
     CStdString m_sambadoscodepage;
     CStdString m_musicThumbs;
+    CStdString m_dvdThumbs;
   };
   struct stSettings
   {


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

Revision: 7327
          http://svn.sourceforge.net/xbmc/?rev=7327&view=rev
Author:   kraqh3d
Date:     2006-12-09 10:52:28 -0800 (Sat, 09 Dec 2006)

Log Message:
-----------
changed: My Vidoes "Manual Add To Database" function now supports importing info from a matching FILENAME.EXT.xml file in the same folder as the file being imported. The xml file must in the same format as the cached imdb tt######.xml files.

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
    trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp
    trunk/XBMC/xbmc/utils/IMDB.cpp
    trunk/XBMC/xbmc/utils/IMDB.h

Modified: trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2006-12-09 08:08:22 UTC (rev 7326)
+++ trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2006-12-09 18:52:28 UTC (rev 7327)
@@ -1424,25 +1424,87 @@
   CFileItem* pItem;
   pItem = m_vecItems[iItem];
   if (pItem->IsParentFolder()) return;
+  if (pItem->m_bIsFolder) return;
+  
+  bool bGotXml = false;
+  CFileItemList items;
+  CIMDBMovie movie;
+  movie.Reset();
 
-  // enter a new title
-  CStdString strTitle = pItem->GetLabel();
-  if (!CGUIDialogKeyboard::ShowAndGetInput(strTitle, g_localizeStrings.Get(528), false)) // Enter Title
-    return;
-  // double check title is new
-  CFileItemList items;
+  // look for matching xml file first
+  CStdString strXml = pItem->m_strPath + ".xml";
+  CStdString strCache = "Z:\\" + CUtil::GetFileName(strXml);
+  if (CFile::Exists(strXml))
+  {
+    bGotXml = true;
+    CLog::Log(LOGDEBUG,__FUNCTION__": found matching xml file:[%s]", strXml.c_str());
+    CFile::Cache(strXml, strCache);
+    CIMDB imdb;
+    if (!imdb.LoadXML(strCache, movie, false))
+    {
+      CLog::Log(LOGERROR,__FUNCTION__": Could not parse info in file:[%s]", strXml.c_str());
+      bGotXml = false;
+    }
+  }
+
+  // prompt for data
+  if (!bGotXml) 
+  {
+    // enter a new title
+    CStdString strTitle = pItem->GetLabel();
+    if (!CGUIDialogKeyboard::ShowAndGetInput(strTitle, g_localizeStrings.Get(528), false)) // Enter Title
+      return;
+
+    // pick genre
+    CGUIDialogSelect* pSelect = (CGUIDialogSelect*)m_gWindowManager.GetWindow(WINDOW_DIALOG_SELECT);
+    if (!pSelect)
+      return;
+    pSelect->SetHeading(530); // Select Genre
+    pSelect->Reset();
+    items.ClearKeepPointer();
+    if (!CDirectory::GetDirectory("videodb://1/", items))
+      return;
+    for (int i = 0; i < items.Size(); ++i)
+      pSelect->Add(items[i]->GetLabel());
+    pSelect->EnableButton(true);
+    pSelect->SetButtonLabel(531); // New Genre
+    pSelect->DoModal();
+    CStdString strGenre;
+    int iSelected = pSelect->GetSelectedLabel();
+    if (iSelected >= 0)
+      strGenre = items[iSelected]->GetLabel();
+    else if (!pSelect->IsButtonPressed())
+      return;
+
+    // enter new genre string
+    if (strGenre.IsEmpty())
+    {
+      strGenre = g_localizeStrings.Get(532); // Manual Addition
+      if (!CGUIDialogKeyboard::ShowAndGetInput(strGenre, g_localizeStrings.Get(533), false)) // Enter Genre
+        return; // user backed out
+      if (strGenre.IsEmpty())
+        return; // no genre string
+    }
+
+    // set movie info
+    movie.m_strTitle = strTitle;
+    movie.m_strGenre = strGenre;
+  }
+
+  // double check title for uniqueness
+  items.ClearKeepPointer();
   if (!CDirectory::GetDirectory("videodb://2/", items))
     return;
   for (int i = 0; i < items.Size(); ++i)
   {
-    if (items[i]->m_strTitle.Equals(strTitle))
+    if (items[i]->m_strTitle.Equals(movie.m_strTitle))
     {
       // uh oh, duplicate title
       CGUIDialogOK *pDialog = (CGUIDialogOK*)m_gWindowManager.GetWindow(WINDOW_DIALOG_OK);
       if (pDialog)
       {
         pDialog->SetHeading(529); // Duplicate Title
-        pDialog->SetLine(0, strTitle);
+        pDialog->SetLine(0, movie.m_strTitle);
         pDialog->SetLine(1, "");
         pDialog->SetLine(2, "");
         pDialog->SetLine(3, "");
@@ -1452,54 +1514,28 @@
     }
   }
 
-  // pick genre
-  CGUIDialogSelect* pSelect = (CGUIDialogSelect*)m_gWindowManager.GetWindow(WINDOW_DIALOG_SELECT);
-  if (!pSelect)
-    return;
-  pSelect->SetHeading(530); // Select Genre
-  pSelect->Reset();
-  items.Clear();
-  if (!CDirectory::GetDirectory("videodb://1/", items))
-    return;
-  for (int i = 0; i < items.Size(); ++i)
-    pSelect->Add(items[i]->GetLabel());
-  pSelect->EnableButton(true);
-  pSelect->SetButtonLabel(531); // New Genre
-  pSelect->DoModal();
-  CStdString strGenre;
-  int iSelected = pSelect->GetSelectedLabel();
-  if (iSelected >= 0)
-    strGenre = items[iSelected]->GetLabel();
-  else if (!pSelect->IsButtonPressed())
-    return;
-  // enter new genre string
-  if (strGenre.IsEmpty())
-  {
-    strGenre = g_localizeStrings.Get(532); // Manual Addition
-    if (!CGUIDialogKeyboard::ShowAndGetInput(strGenre, g_localizeStrings.Get(533), false)) // Enter Genre
-      return; // user backed out
-    if (strGenre.IsEmpty())
-      return; // no genre string
-  }
-
-  // ok, add to database
+  // everything is ok, so add to database
   m_database.Open();
   long lMovieId = m_database.AddMovie(pItem->m_strPath, "", false);
-  CIMDBMovie movie;
-  movie.Reset();
-  movie.m_strTitle = strTitle;
-  movie.m_strGenre = strGenre;
   movie.m_strIMDBNumber.Format("xx%08i", lMovieId);
   m_database.SetMovieInfo(pItem->m_strPath, movie);
   m_database.Close();
 
+  if (bGotXml)
+  {
+    CUtil::AddFileToFolder(g_settings.GetIMDbFolder(), movie.m_strIMDBNumber, strXml);
+    strXml += ".xml";
+    CFile::Cache(strCache, strXml);
+    CFile::Delete(strCache);
+  }
+
   // done...
   CGUIDialogOK *pDialog = (CGUIDialogOK*)m_gWindowManager.GetWindow(WINDOW_DIALOG_OK);
   if (pDialog)
   {
     pDialog->SetHeading(20177); // Done
-    pDialog->SetLine(0, strTitle);
-    pDialog->SetLine(1, strGenre);
+    pDialog->SetLine(0, movie.m_strTitle);
+    pDialog->SetLine(1, movie.m_strGenre);
     pDialog->SetLine(2, movie.m_strIMDBNumber);
     pDialog->SetLine(3, "");
     pDialog->DoModal();

Modified: trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp	2006-12-09 08:08:22 UTC (rev 7326)
+++ trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp	2006-12-09 18:52:28 UTC (rev 7327)
@@ -545,6 +545,7 @@
   DoScan(m_vecItems.m_strPath, items);
   Update(m_vecItems.m_strPath);
   m_bIsScanning = false;
+  CUtil::ClearFileItemCache();
 }
 
 bool CGUIWindowVideoFiles::DoScan(const CStdString &strPath, CFileItemList& items)

Modified: trunk/XBMC/xbmc/utils/IMDB.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/IMDB.cpp	2006-12-09 08:08:22 UTC (rev 7326)
+++ trunk/XBMC/xbmc/utils/IMDB.cpp	2006-12-09 18:52:28 UTC (rev 7327)
@@ -244,16 +244,22 @@
 {
   CStdString strXMLFile;
   strXMLFile.Format("%s\\%s.xml", g_settings.GetIMDbFolder().c_str(), strIMDB.c_str());
+  bool bDownload = true;
+  if (strIMDB.Left(2).Equals("xx"))
+    bDownload = false;
+  movieDetails.m_strIMDBNumber = strIMDB;
+  return LoadXML(strXMLFile, movieDetails, bDownload);
+}
+
+bool CIMDB::LoadXML(const CStdString& strXMLFile, CIMDBMovie &movieDetails, bool bDownload /* = true */)
+{
   TiXmlBase::SetCondenseWhiteSpace(false);
   TiXmlDocument doc;
-  movieDetails.m_strIMDBNumber = strIMDB;
   if (doc.LoadFile(strXMLFile) && ParseDetails(doc, movieDetails))
   { // excellent!
     return true;
   }
-
-  // dont try to look up manual additions
-  if (strIMDB.Left(2).Equals("xx"))
+  if (!bDownload)
     return true;
 
   TiXmlBase::SetCondenseWhiteSpace(true);
@@ -269,7 +275,7 @@
   pDlgProgress->Progress();
   CIMDBUrl url;
   url.m_strTitle = movieDetails.m_strTitle;
-  url.m_strURL.Format("http://%s/title/%s", g_advancedSettings.m_imdbAddress.c_str(), strIMDB.c_str());
+  url.m_strURL.Format("http://%s/title/%s", g_advancedSettings.m_imdbAddress.c_str(), movieDetails.m_strIMDBNumber.c_str());
   bool ret = GetDetails(url, movieDetails, pDlgProgress);
   pDlgProgress->Close();
   return ret;

Modified: trunk/XBMC/xbmc/utils/IMDB.h
===================================================================
--- trunk/XBMC/xbmc/utils/IMDB.h	2006-12-09 08:08:22 UTC (rev 7326)
+++ trunk/XBMC/xbmc/utils/IMDB.h	2006-12-09 18:52:28 UTC (rev 7327)
@@ -68,6 +68,7 @@
   bool InternalGetDetails(const CIMDBUrl& url, CIMDBMovie& movieDetails);
   bool ParseDetails(TiXmlDocument &doc, CIMDBMovie &movieDetails);
   bool LoadDetails(const CStdString& strIMDB, CIMDBMovie &movieDetails);
+  bool LoadXML(const CStdString& strXMLFile, CIMDBMovie &movieDetails, bool bDownload = true);
   bool Download(const CStdString &strURL, const CStdString &strFileName);
   void GetURL(const CStdString& strMovie, CStdString& strURL, CStdString& strYear);
 


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

Revision: 7335
          http://svn.sourceforge.net/xbmc/?rev=7335&view=rev
Author:   jmarshallnz
Date:     2006-12-09 19:25:03 -0800 (Sat, 09 Dec 2006)

Log Message:
-----------
fixed: Smartplaylists failed if they contained a '

Modified Paths:
--------------
    trunk/XBMC/xbmc/Database.h
    trunk/XBMC/xbmc/SmartPlaylist.cpp

Modified: trunk/XBMC/xbmc/Database.h
===================================================================
--- trunk/XBMC/xbmc/Database.h	2006-12-10 00:49:04 UTC (rev 7334)
+++ trunk/XBMC/xbmc/Database.h	2006-12-10 03:25:03 UTC (rev 7335)
@@ -19,12 +19,11 @@
   void RollbackTransaction();
   bool InTransaction();
 
+  static CStdString FormatSQL(CStdString strStmt, ...);
 protected:
   void Split(const CStdString& strFileNameAndPath, CStdString& strPath, CStdString& strFileName);
   DWORD ComputeCRC(const CStdString &text);
 
-  CStdString FormatSQL(CStdString strStmt, ...);
-
   virtual bool CreateTables();
 
   bool m_bOpen;

Modified: trunk/XBMC/xbmc/SmartPlaylist.cpp
===================================================================
--- trunk/XBMC/xbmc/SmartPlaylist.cpp	2006-12-10 00:49:04 UTC (rev 7334)
+++ trunk/XBMC/xbmc/SmartPlaylist.cpp	2006-12-10 03:25:03 UTC (rev 7335)
@@ -4,6 +4,7 @@
 #include "FileSystem/SmartPlaylistDirectory.h"
 #include "utils/CharsetConverter.h"
 #include "XMLUtils.h"
+#include "Database.h"
 
 typedef struct
 {
@@ -134,9 +135,7 @@
   case OPERATOR_LESS_THAN:
     operatorString = " < '%s'"; break;
   }
-  // TODO: This needs to be FormatSQL
-  CStdString parameter;
-  parameter.Format(operatorString.c_str(), m_parameter.c_str());
+  CStdString parameter = CDatabase::FormatSQL(operatorString.c_str(), m_parameter.c_str());
   // now the query parameter
   CStdString query;
   if (m_field == SONG_GENRE)


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

Revision: 7340
          http://svn.sourceforge.net/xbmc/?rev=7340&view=rev
Author:   spiff_
Date:     2006-12-10 13:25:14 -0800 (Sun, 10 Dec 2006)

Log Message:
-----------
fixed: crash in settings profile if you played music/videos.

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowSettingsProfile.cpp
    trunk/XBMC/xbmc/GUIWindowSettingsProfile.h

Modified: trunk/XBMC/xbmc/GUIWindowSettingsProfile.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowSettingsProfile.cpp	2006-12-10 18:31:57 UTC (rev 7339)
+++ trunk/XBMC/xbmc/GUIWindowSettingsProfile.cpp	2006-12-10 21:25:14 UTC (rev 7340)
@@ -195,7 +195,8 @@
   for (UCHAR i = 0; i < g_settings.m_vecProfiles.size(); i++)
   {
     CProfile& profile = g_settings.m_vecProfiles.at(i);
-    CGUIListItem* item = new CGUIListItem(profile.getName());
+    CFileItem* item = new CFileItem(profile.getName());
+    item->m_strPath.Empty();
     item->SetLabel2(profile.getDate());
     item->SetThumbnailImage(profile.getThumb());
     item->SetOverlayImage(profile.getLockMode() == LOCK_MODE_EVERYONE ? CGUIListItem::ICON_OVERLAY_NONE : CGUIListItem::ICON_OVERLAY_LOCKED);
@@ -204,9 +205,10 @@
     m_vecListItems.push_back(item);
   }
   {
-    CGUIListItem* item = new CGUIListItem(g_localizeStrings.Get(20058));
+    CFileItem* item = new CFileItem(g_localizeStrings.Get(20058));
     CGUIMessage msg(GUI_MSG_LABEL_ADD, GetID(), CONTROL_PROFILES, 0, 0, (void*)item);
     g_graphicsContext.SendMessage(msg);
+    item->m_strPath.Empty();
     m_vecListItems.push_back(item);
   }
 

Modified: trunk/XBMC/xbmc/GUIWindowSettingsProfile.h
===================================================================
--- trunk/XBMC/xbmc/GUIWindowSettingsProfile.h	2006-12-10 18:31:57 UTC (rev 7339)
+++ trunk/XBMC/xbmc/GUIWindowSettingsProfile.h	2006-12-10 21:25:14 UTC (rev 7340)
@@ -12,7 +12,7 @@
 
 protected:
   virtual void OnInitWindow();
-  vector<CGUIListItem*> m_vecListItems;
+  vector<CFileItem*> m_vecListItems;
 
   void OnPopupMenu(int iItem);
   void DoRename(int iItem);


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

Revision: 7342
          http://svn.sourceforge.net/xbmc/?rev=7342&view=rev
Author:   Darkdonno
Date:     2006-12-11 03:37:21 -0800 (Mon, 11 Dec 2006)

Log Message:
-----------
changed: removed download gamesave feature, as the website went down.

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowGameSaves.cpp
    trunk/XBMC/xbmc/GUIWindowGameSaves.h

Modified: trunk/XBMC/xbmc/GUIWindowGameSaves.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowGameSaves.cpp	2006-12-11 07:06:15 UTC (rev 7341)
+++ trunk/XBMC/xbmc/GUIWindowGameSaves.cpp	2006-12-11 11:37:21 UTC (rev 7342)
@@ -312,6 +312,7 @@
   return true;
 }
 
+/*
 bool CGUIWindowGameSaves::DownloadSaves(CFileItem item)
 {
   CStdString strURL;
@@ -373,7 +374,6 @@
                   CLog::Log(LOGINFO,"GSM: Failed to download: %s",  vecSaveUrl[iSelectedSave].c_str());
                   return true;
                 }
-                CGUIDialogOK::ShowAndGetInput(20317, 0, 16200, 0);  // Aborted
                 CLog::Log(LOGINFO,"GSM: Action Aborted: %s",  vecSaveUrl[iSelectedSave].c_str());
                 return true;
               }
@@ -384,7 +384,7 @@
     }
   }
   return false;
-}
+}*/
 
 void CGUIWindowGameSaves::OnPopupMenu(int iItem)
 {
@@ -416,9 +416,9 @@
   int btnMove = pMenu->AddButton(116);
   int btnDelete = pMenu->AddButton(117);
   // ONly add if we are on E:\udata\    /
-  int btnDownload = pMenu->AddButton(20317);
+  /*int btnDownload = pMenu->AddButton(20317);
 
-  pMenu->EnableButton(btnDownload, !strFileName.Equals("savemeta.xbx"));
+  pMenu->EnableButton(btnDownload, !strFileName.Equals("savemeta.xbx"));*/
   // position it correctly
 
   pMenu->SetPosition(posX - pMenu->GetWidth() / 2, posY - pMenu->GetHeight() / 2);
@@ -523,6 +523,7 @@
     CDirectory::Remove(item.m_strPath);
     Update(m_vecItems.m_strPath);
   }
+  /*
   if (iButton == btnDownload)
   {
     CFileItem item(*pItem);
@@ -541,7 +542,7 @@
         Update(m_vecItems.m_strPath);
       }
     }
-  }
+  }*/
   //CGUIMessage msg(GUI_MSG_ITEM_SELECT, GetID(),CONTROL_LIST,iItem);
   //OnMessage(msg);
 }

Modified: trunk/XBMC/xbmc/GUIWindowGameSaves.h
===================================================================
--- trunk/XBMC/xbmc/GUIWindowGameSaves.h	2006-12-11 07:06:15 UTC (rev 7341)
+++ trunk/XBMC/xbmc/GUIWindowGameSaves.h	2006-12-11 11:37:21 UTC (rev 7342)
@@ -18,7 +18,7 @@
   virtual bool GetDirectory(const CStdString& strDirectory, CFileItemList& items);
   virtual bool OnClick(int iItem);
   virtual void OnPopupMenu(int iItem);
-  bool DownloadSaves(CFileItem item);
+  //bool DownloadSaves(CFileItem item);
   bool m_bViewOutput;
   VECSHARES m_shares;
   CStdString m_strParentPath;


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

Revision: 7355
          http://svn.sourceforge.net/xbmc/?rev=7355&view=rev
Author:   spiff_
Date:     2006-12-13 10:41:33 -0800 (Wed, 13 Dec 2006)

Log Message:
-----------
added: enabling stacking flattens CDx/ folders with one video file in it prior to stacking.

Modified Paths:
--------------
    trunk/XBMC/xbmc/FileItem.cpp
    trunk/XBMC/xbmc/FileSystem/StackDirectory.cpp

Modified: trunk/XBMC/xbmc/FileItem.cpp
===================================================================
--- trunk/XBMC/xbmc/FileItem.cpp	2006-12-13 17:33:24 UTC (rev 7354)
+++ trunk/XBMC/xbmc/FileItem.cpp	2006-12-13 18:41:33 UTC (rev 7355)
@@ -926,6 +926,9 @@
 
 bool CFileItem::IsSamePath(const CFileItem *item)
 {
+  if (!item)
+    return false;
+
   if (item->m_strPath == m_strPath && item->m_lStartOffset == m_lStartOffset) return true;
   if (IsMusicDb() || IsVideoDb())
   {
@@ -1578,6 +1581,19 @@
         isDVDFolder = true;
         break;
       }
+      if (item->m_bIsFolder && (item->GetLabel().Mid(0,2).Equals("CD") && item->GetLabel().size() == 3))
+      {
+        if (atoi(item->GetLabel().c_str()+2) > 0)
+        {
+          CFileItemList items;
+          CDirectory::GetDirectory(item->m_strPath,items,g_stSettings.m_videoExtensions,true);
+          if (items.Size() == 1)
+          {
+            if (items[0]->IsVideo())
+              *item = *items[0];
+          }
+        }
+      }
     }
     if (isDVDFolder)
     { // remove any other ifo files in this folder
@@ -1663,7 +1679,7 @@
           //if (CUtil::GetVolumeFromFileName(fileName2, fileTitle2, volumeNumber2))
           if (CUtil::GetVolumeFromFileName(Get(j)->GetLabel(), fileTitle2, volumeNumber2))
           {
-            if (fileTitle2.Equals(fileTitle, false) && filePath2.Equals(filePath, false))
+            if (fileTitle2.Equals(fileTitle, false))
             {
               //CLog::Log(LOGDEBUG,"  adding item: [%03i] %s", j, Get(j)->GetLabel().c_str());
               stack.push_back(j);

Modified: trunk/XBMC/xbmc/FileSystem/StackDirectory.cpp
===================================================================
--- trunk/XBMC/xbmc/FileSystem/StackDirectory.cpp	2006-12-13 17:33:24 UTC (rev 7354)
+++ trunk/XBMC/xbmc/FileSystem/StackDirectory.cpp	2006-12-13 18:41:33 UTC (rev 7355)
@@ -4,6 +4,7 @@
 #include "../utils/log.h"
 #include "../Util.h"
 
+#define PRE_2_1_STACK_COMPATIBILITY
 
 namespace DIRECTORY
 {
@@ -19,24 +20,35 @@
   {
     items.Clear();
     // format is:
-    // stack://<path>/file1 , file2 , file3 , file4
+    // stack://file1 , file2 , file3 , file4
     // filenames with commas are double escaped (ie replaced with ,,), thus the " , " separator used.
-    CStdString folder, file;
-    CUtil::Split(strPath, folder, file);
+    //CStdString folder, file;
+    //CUtil::Split(strPath, folder, file);
     // split files on the single comma
     CStdStringArray files;
-    StringUtils::SplitString(file, " , ", files);
+    StringUtils::SplitString(strPath, " , ", files);
     if (files.empty())
       return false;   // error in path
     // remove "stack://" from the folder
-    folder = folder.Mid(8);
     for (unsigned int i = 0; i < files.size(); i++)
     {
       CStdString file = files[i];
+      if (i == 0)
+        file = file.Mid(8);
+#ifdef PRE_2_1_STACK_COMPATIBILITY
+      if (i > 0 && file.Find("\\") == -1 && file.Find('/') == -1)
+      {
+        CStdString strPath;
+        CUtil::GetDirectory(items[0]->m_strPath,strPath);
+        CStdString strFile = file;
+        CUtil::AddFileToFolder(strPath,strFile,file);
+      }
+#endif
       // replace double comma's with single ones.
       file.Replace(",,", ",");
       CFileItem *item = new CFileItem(file);
-      CUtil::AddFileToFolder(folder, file, item->m_strPath);
+      //CUtil::AddFileToFolder(folder, file, item->m_strPath);
+      item->m_strPath = file;
       item->m_bIsFolder = false;
       items.Add(item);
     }
@@ -46,13 +58,12 @@
   CStdString CStackDirectory::GetStackedTitlePath(const CStdString &strPath)
   {
     CStdString path, file, folder;
-    CUtil::Split(strPath, folder, file);
     int pos = file.Find(" , ");
     // remove "stack://" from the folder
     folder = folder.Mid(8);
     if (pos > 0)
     {
-      file = file.Left(pos);
+      CUtil::Split(strPath.Left(pos), folder, file);
       file.Replace(",,", ",");
       CStdString title, volume;
       CUtil::GetVolumeFromFileName(file, title, volume);
@@ -66,16 +77,17 @@
     // the stacked files are always in volume order, so just get up to the first filename
     // occurence of " , "
     CStdString path, file, folder;
-    CUtil::Split(strPath, folder, file);
-    int pos = file.Find(" , ");
-    // remove "stack://" from the folder
+    int pos = strPath.Find(" , ");
+    if (pos > 0)
+      CUtil::Split(strPath.Left(pos), folder, file);
+    else
+      CUtil::Split(strPath, folder, file); // single filed stacks - should really not happen
+
+    // remove "stack://" from the folder    
     folder = folder.Mid(8);
-    if (pos > 0)
-    {
-      file = file.Left(pos);
-      file.Replace(",,", ",");
-      CUtil::AddFileToFolder(folder, file, path);
-    }
+    file.Replace(",,", ",");
+    CUtil::AddFileToFolder(folder, file, path);
+    
     return path;
   }
 
@@ -94,7 +106,8 @@
     for (unsigned int i = 1; i < stack.size(); ++i)
     {
       stackedPath += " , ";
-      file = CUtil::GetFileName(items[stack[i]]->m_strPath);
+      file = items[stack[i]]->m_strPath;
+      
       // double escape any occurence of commas
       file.Replace(",", ",,");
       stackedPath += file;


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

Revision: 7366
          http://svn.sourceforge.net/xbmc/?rev=7366&view=rev
Author:   elupus
Date:     2006-12-15 14:29:07 -0800 (Fri, 15 Dec 2006)

Log Message:
-----------
fixed: web stream pointing to a playlist that points to a playlist (nasa), would fail to play
fixed: strm files where not possible to queue into current playlist
fixed: webserver would crash xbmc if asked to add a specific url to playlist
added: parsing of file based .asx and .ram playlist (web based worked partially before)

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp
    trunk/XBMC/xbmc/FileItem.cpp
    trunk/XBMC/xbmc/FileSystem/FactoryFileDirectory.cpp
    trunk/XBMC/xbmc/FileSystem/PlaylistFileDirectory.cpp
    trunk/XBMC/xbmc/GUIMediaWindow.cpp
    trunk/XBMC/xbmc/GUIWindowFileManager.cpp
    trunk/XBMC/xbmc/GUIWindowMusicBase.cpp
    trunk/XBMC/xbmc/GUIWindowMusicNav.cpp
    trunk/XBMC/xbmc/GUIWindowPictures.cpp
    trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
    trunk/XBMC/xbmc/GUIWindowVideoBase.h
    trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp
    trunk/XBMC/xbmc/PlayList.cpp
    trunk/XBMC/xbmc/PlayList.h
    trunk/XBMC/xbmc/PlayListB4S.cpp
    trunk/XBMC/xbmc/PlayListB4S.h
    trunk/XBMC/xbmc/PlayListFactory.cpp
    trunk/XBMC/xbmc/PlayListFactory.h
    trunk/XBMC/xbmc/PlayListM3U.cpp
    trunk/XBMC/xbmc/PlayListM3U.h
    trunk/XBMC/xbmc/PlayListPLS.cpp
    trunk/XBMC/xbmc/PlayListPLS.h
    trunk/XBMC/xbmc/PlayListPlayer.cpp
    trunk/XBMC/xbmc/PlayListWPL.cpp
    trunk/XBMC/xbmc/PlayListWPL.h
    trunk/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp
    trunk/XBMC/xbmc/lib/libGoAhead/XBMCweb.cpp
    trunk/XBMC/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/Application.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -3191,23 +3191,14 @@
     return false;
   }
   //playlist
-  CStdString strPath = item.m_strPath;
-  if ((!item.IsPlayList()) && (item.IsInternetStream()))
-  {
-    //we got an url, create a dummy .strm playlist,
-    //pPlayList->Load will handle loading it from url instead of from a file
-    strPath = "temp.strm";
-  }
-
-  CPlayListFactory factory;
-  auto_ptr<CPlayList> pPlayList (factory.Create(strPath));
+  auto_ptr<CPlayList> pPlayList (CPlayListFactory::Create(item));
   if ( NULL == pPlayList.get())
     return false;
   // load it
   if (!pPlayList->Load(item.m_strPath))
     return false;
 
-  return ProcessAndStartPlaylist(strPath, *pPlayList, iPlaylist);
+  return ProcessAndStartPlaylist(item.m_strPath, *pPlayList, iPlaylist);
 }
 
 // PlayStack()

Modified: trunk/XBMC/xbmc/FileItem.cpp
===================================================================
--- trunk/XBMC/xbmc/FileItem.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/FileItem.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -353,15 +353,7 @@
 
 bool CFileItem::IsPlayList() const
 {
-  CStdString strExtension;
-  CUtil::GetExtension(m_strPath, strExtension);
-  strExtension.ToLower();
-  if (strExtension == ".m3u") return true;
-  if (strExtension == ".b4s") return true;
-  if (strExtension == ".pls") return true;
-  if (strExtension == ".strm") return true;
-  if (strExtension == ".wpl") return true;
-  return false;
+  return CPlayListFactory::IsPlaylist(m_strPath);
 }
 
 bool CFileItem::IsPythonScript() const

Modified: trunk/XBMC/xbmc/FileSystem/FactoryFileDirectory.cpp
===================================================================
--- trunk/XBMC/xbmc/FileSystem/FactoryFileDirectory.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/FileSystem/FactoryFileDirectory.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -12,6 +12,7 @@
 #include "SmartPlaylistDirectory.h"
 #include "../SmartPlaylist.h"
 #include "PlaylistFileDirectory.h"
+#include "../PlayListFactory.h"
 
 CFactoryFileDirectory::CFactoryFileDirectory(void)
 {}
@@ -152,19 +153,17 @@
     IFileDirectory* pDir=new CSmartPlaylistDirectory;
     return pDir; // treat as directory
   }
-  if (g_advancedSettings.m_playlistAsFolders)
-  if (strExtension == ".m3u" || strExtension == ".b4s" || strExtension == ".pls" ||
-      strExtension == ".wpl")
+  if (g_advancedSettings.m_playlistAsFolders && CPlayListFactory::IsPlaylist(strPath))
   { // Playlist file
     // currently we only return the directory if it contains
     // more than one file.  Reason is that .pls and .m3u may be used
     // for links to http streams etc. 
-    IFileDirectory *pDir = new CPlaylistFileDirectory;
+    IFileDirectory *pDir = new CPlaylistFileDirectory();
     CFileItemList items;
     if (pDir->GetDirectory(strPath, items))
     {
       if (items.Size() > 1)
-        return pDir;
+        return new CPlaylistFileDirectory;
     }
     delete pDir;
     return NULL;

Modified: trunk/XBMC/xbmc/FileSystem/PlaylistFileDirectory.cpp
===================================================================
--- trunk/XBMC/xbmc/FileSystem/PlaylistFileDirectory.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/FileSystem/PlaylistFileDirectory.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -16,12 +16,11 @@
 
   bool CPlaylistFileDirectory::GetDirectory(const CStdString& strPath, CFileItemList& items)
   {
-    CPlayListFactory factory;
-    auto_ptr<CPlayList> pPlayList (factory.Create(strPath));
+    auto_ptr<CPlayList> pPlayList (CPlayListFactory::Create(strPath));
     if ( NULL != pPlayList.get())
     {
       // load it
-      if (!pPlayList->Load(strPath, false))
+      if (!pPlayList->Load(strPath))
         return false; //hmmm unable to load playlist?
 
       CPlayList playlist = *pPlayList;
@@ -39,12 +38,11 @@
 
   bool CPlaylistFileDirectory::ContainsFiles(const CStdString& strPath)
   {
-    CPlayListFactory factory;
-    auto_ptr<CPlayList> pPlayList (factory.Create(strPath));
+    auto_ptr<CPlayList> pPlayList (CPlayListFactory::Create(strPath));
     if ( NULL != pPlayList.get())
     {
       // load it
-      if (!pPlayList->Load(strPath, false))
+      if (!pPlayList->Load(strPath))
         return false; //hmmm unable to load playlist?
 
       return (pPlayList->size() > 1);

Modified: trunk/XBMC/xbmc/GUIMediaWindow.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIMediaWindow.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/GUIMediaWindow.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -508,19 +508,8 @@
   {
     m_iSelectedItem = m_viewControl.GetSelectedItem();
 
-    if (pItem->IsInternetStream())
-    {
-      CFileItem item = (CFileItem)*pItem;
-      return g_application.PlayMedia(item, m_guiState->GetPlaylist());
-    }
-    if (pItem->IsPlayList())
-    {
-      CStdString strPath=pItem->m_strPath;
-      LoadPlayList(pItem->m_strPath);
-      return true;
-    }
     // this is particular to music as only music allows "auto play next item"
-    else if (m_guiState.get() && m_guiState->AutoPlayNextItem() && !g_partyModeManager.IsEnabled())
+    if (m_guiState.get() && m_guiState->AutoPlayNextItem() && !g_partyModeManager.IsEnabled())
     {
       if (pItem->m_strPath == "add" && pItem->GetLabel() == g_localizeStrings.Get(1026)) // 'add source button' in empty root
       {
@@ -774,7 +763,12 @@
   g_playlistPlayer.SetCurrentPlaylist(PLAYLIST_NONE);
   CFileItem* pItem=m_vecItems[iItem];
 
-  bool bResult = g_application.PlayFile(*pItem);
+  bool bResult = false;
+  if (pItem->IsInternetStream() || pItem->IsPlayList())
+    bResult = g_application.PlayMedia(*pItem, m_guiState->GetPlaylist());
+  else
+    bResult = g_application.PlayFile(*pItem);
+
   if (pItem->m_lStartOffset == STARTOFFSET_RESUME)
     pItem->m_lStartOffset = 0;
   

Modified: trunk/XBMC/xbmc/GUIWindowFileManager.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowFileManager.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/GUIWindowFileManager.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -506,8 +506,7 @@
   if (pItem->IsPlayList())
   {
     CStdString strPlayList = pItem->m_strPath;
-    CPlayListFactory factory;
-    auto_ptr<CPlayList> pPlayList (factory.Create(strPlayList));
+    auto_ptr<CPlayList> pPlayList (CPlayListFactory::Create(strPlayList));
     if (NULL != pPlayList.get())
     {
       if (!pPlayList->Load(strPlayList))

Modified: trunk/XBMC/xbmc/GUIWindowMusicBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicBase.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/GUIWindowMusicBase.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -850,19 +850,9 @@
   }
   else
   {
-    if (!pItem->IsNFO() && pItem->IsAudio() && !pItem->IsPlayList())
+    if (pItem->IsPlayList())
     {
-      CFileItem *itemCheck = queuedItems.Get(pItem->m_strPath);
-      if (!itemCheck || itemCheck->m_lStartOffset != pItem->m_lStartOffset)
-      { // add item
-        CLog::Log(LOGDEBUG, "Adding item (%s) to playlist", pItem->m_strPath.c_str());
-        queuedItems.Add(new CFileItem(*pItem));
-      }
-    }
-    if (!g_advancedSettings.m_playlistAsFolders && pItem->IsPlayList())
-    {
-      CPlayListFactory factory;
-      auto_ptr<CPlayList> pPlayList (factory.Create(pItem->m_strPath));
+      auto_ptr<CPlayList> pPlayList (CPlayListFactory::Create(*pItem));
       if ( NULL != pPlayList.get())
       {
         // load it
@@ -875,8 +865,22 @@
         CPlayList playlist = *pPlayList;
         for (int i = 0; i < (int)playlist.size(); ++i)
           AddItemToPlayList(&playlist[i], queuedItems);
+        return;
       }
     }
+    else if(pItem->IsInternetStream())
+    { // just queue the internet stream, it will be expanded on play
+      queuedItems.Add(new CFileItem(*pItem));
+    }
+    else if (!pItem->IsNFO() && pItem->IsAudio())
+    {
+      CFileItem *itemCheck = queuedItems.Get(pItem->m_strPath);
+      if (!itemCheck || itemCheck->m_lStartOffset != pItem->m_lStartOffset)
+      { // add item
+        CLog::Log(LOGDEBUG, "Adding item (%s) to playlist", pItem->m_strPath.c_str());
+        queuedItems.Add(new CFileItem(*pItem));
+      }
+    }
   }
 }
 
@@ -1517,7 +1521,7 @@
     // play!
     g_playlistPlayer.Play();
   }
-  else if (!g_advancedSettings.m_playlistAsFolders && pItem->IsPlayList())
+  else if (pItem->IsPlayList())
   {
     // load the playlist the old way
     LoadPlayList(pItem->m_strPath);
@@ -1537,8 +1541,7 @@
 
   // load a playlist like .m3u, .pls
   // first get correct factory to load playlist
-  CPlayListFactory factory;
-  auto_ptr<CPlayList> pPlayList (factory.Create(strPlayList));
+  auto_ptr<CPlayList> pPlayList (CPlayListFactory::Create(strPlayList));
   if ( NULL != pPlayList.get())
   {
     // load it
@@ -1713,8 +1716,7 @@
       strPlaylist += ".m3u";
   }
 
-  CPlayListFactory factory;
-  auto_ptr<CPlayList> pPlaylist (factory.Create(strPlaylist));
+  auto_ptr<CPlayList> pPlaylist (CPlayListFactory::Create(strPlaylist));
   // load existing playlist
   if (!bNew)
   {

Modified: trunk/XBMC/xbmc/GUIWindowMusicNav.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicNav.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/GUIWindowMusicNav.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -583,8 +583,8 @@
 
   items.m_strPath=strPlayList;
   CLog::Log(LOGDEBUG,"CGUIWindowMusicNav, opening playlist [%s]", strPlayList.c_str());
-  CPlayListFactory factory;
-  auto_ptr<CPlayList> pPlayList (factory.Create(strPlayList));
+
+  auto_ptr<CPlayList> pPlayList (CPlayListFactory::Create(strPlayList));
   if ( NULL != pPlayList.get())
   {
     // load it

Modified: trunk/XBMC/xbmc/GUIWindowPictures.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowPictures.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/GUIWindowPictures.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -667,8 +667,7 @@
 void CGUIWindowPictures::LoadPlayList(const CStdString& strPlayList)
 {
   CLog::Log(LOGDEBUG,"CGUIWindowPictures::LoadPlayList()... converting playlist into slideshow: %s", strPlayList.c_str());
-  CPlayListFactory factory;
-  auto_ptr<CPlayList> pPlayList (factory.Create(strPlayList));
+  auto_ptr<CPlayList> pPlayList (CPlayListFactory::Create(strPlayList));
   if ( NULL != pPlayList.get())
   {
     if (!pPlayList->Load(strPlayList))

Modified: trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -579,14 +579,9 @@
   else
   {
     // just an item
-    if (!pItem->IsNFO() && pItem->IsVideo() && !pItem->IsPlayList())
+    if (pItem->IsPlayList())
     {
-      queuedItems.Add(new CFileItem(*pItem));
-    }
-    if (!g_advancedSettings.m_playlistAsFolders && pItem->IsPlayList())
-    {
-      CPlayListFactory factory;
-      auto_ptr<CPlayList> pPlayList (factory.Create(pItem->m_strPath));
+      auto_ptr<CPlayList> pPlayList (CPlayListFactory::Create(*pItem));
       if ( NULL != pPlayList.get())
       {
         // load it
@@ -599,62 +594,19 @@
         CPlayList playlist = *pPlayList;
         for (int i = 0; i < (int)playlist.size(); ++i)
           AddItemToPlayList(&playlist[i], queuedItems);
+        return;
       }
     }
-  }
-}
-
-void CGUIWindowVideoBase::AddItemToPlayList(const CFileItem* pItem, int iPlaylist /* = PLAYLIST_VIDEO */)
-{
-  if (pItem->m_bIsFolder)
-  {
-    // Check if we add a locked share
-    if ( pItem->m_bIsShareOrDrive )
-    {
-      CFileItem item = *pItem;
-      if ( !g_passwordManager.IsItemUnlocked( &item, "video" ) )
-        return ;
+    else if(pItem->IsInternetStream())
+    { // just queue the internet stream, it will be expanded on play
+      queuedItems.Add(new CFileItem(*pItem));
     }
-
-    // recursive
-    if (pItem->IsParentFolder()) return ;
-    CStdString strDirectory = m_vecItems.m_strPath;
-    m_vecItems.m_strPath = pItem->m_strPath;
-    CFileItemList items;
-    GetDirectory(m_vecItems.m_strPath, items);
-
-    SortItems(items);
-
-    for (int i = 0; i < items.Size(); ++i)
+    else if (!pItem->IsNFO() && pItem->IsVideo())
     {
-      if (items[i]->m_bIsFolder)
-      {
-        CStdString strPath = items[i]->m_strPath;
-        if (CUtil::HasSlashAtEnd(strPath))
-          strPath.erase(strPath.size()-1);
-        strPath.ToLower();
-        if (strPath.size() > 6)
-        {
-          CStdString strSub = strPath.substr(strPath.size()-6);
-          if (strPath.substr(strPath.size()-6) == "sample") // skip sample folders
-            continue;
-        }
-      }
-      AddItemToPlayList(items[i], iPlaylist);
+      queuedItems.Add(new CFileItem(*pItem));
     }
-    m_vecItems.m_strPath = strDirectory;
+
   }
-  else
-  {
-    if (!pItem->IsNFO() && pItem->IsVideo() && !pItem->IsPlayList())
-    {
-      CPlayList::CPlayListItem playlistItem ;
-      playlistItem.SetFileName(pItem->m_strPath);
-      playlistItem.SetDescription(pItem->GetLabel());
-      playlistItem.SetDuration(pItem->m_musicInfoTag.GetDuration());
-      g_playlistPlayer.Add(iPlaylist, playlistItem);
-    }
-  }
 }
 
 void CGUIWindowVideoBase::DisplayEmptyDatabaseMessage(bool bDisplay)
@@ -1222,8 +1174,7 @@
 {
   // load a playlist like .m3u, .pls
   // first get correct factory to load playlist
-  CPlayListFactory factory;
-  auto_ptr<CPlayList> pPlayList (factory.Create(strPlayList));
+  auto_ptr<CPlayList> pPlayList (CPlayListFactory::Create(strPlayList));
   if ( NULL != pPlayList.get())
   {
     // load it
@@ -1272,7 +1223,7 @@
     g_playlistPlayer.SetCurrentPlaylist(PLAYLIST_VIDEO);
     g_playlistPlayer.Play();
   }
-  else if (!g_advancedSettings.m_playlistAsFolders && pItem->IsPlayList())
+  else if (pItem->IsPlayList())
   {
     // load the playlist the old way
     LoadPlayList(pItem->m_strPath, PLAYLIST_VIDEO);

Modified: trunk/XBMC/xbmc/GUIWindowVideoBase.h
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoBase.h	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/GUIWindowVideoBase.h	2006-12-15 22:29:07 UTC (rev 7366)
@@ -45,7 +45,6 @@
   void OnManualIMDB();
   bool CheckMovie(const CStdString& strFileName);
 
-  void AddItemToPlayList(const CFileItem* pItem, int iPlaylist = PLAYLIST_VIDEO);
   void AddItemToPlayList(const CFileItem* pItem, CFileItemList &queuedItems);
   void GetStackedFiles(const CStdString &strFileName, std::vector<CStdString> &movies);
   CStdString GetnfoFile(CFileItem *item);

Modified: trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -636,8 +636,7 @@
 {
   // load a playlist like .m3u, .pls
   // first get correct factory to load playlist
-  CPlayListFactory factory;
-  auto_ptr<CPlayList> pPlayList (factory.Create(strPlayList));
+  auto_ptr<CPlayList> pPlayList (CPlayListFactory::Create(strPlayList));
   if ( NULL != pPlayList.get())
   {
     // load it

Modified: trunk/XBMC/xbmc/PlayList.cpp
===================================================================
--- trunk/XBMC/xbmc/PlayList.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/PlayList.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -2,6 +2,7 @@
 #include "stdafx.h"
 #include "playlist.h"
 #include "util.h"
+#include "playlistfactory.h"
 
 using namespace PLAYLIST;
 
@@ -422,4 +423,74 @@
     m_vecItems[iItem].SetUnPlayable();
     m_iPlayableItems--;
   }
+}
+
+bool CPlayList::Load(const CStdString& strFileName)
+{
+  CFile file;
+  if (!file.Open(strFileName, false) )
+  {
+    file.Close();
+    return false;
+  }
+
+  __int64 size = file.GetLength();
+
+  if (size>1024*1024)
+  {
+    CLog::Log(LOGWARNING, __FUNCTION__" - File is larger than 1 MB, most likely not a playlist");
+    return false;
+  }
+
+
+  int len;
+  CStdString data;
+  char line[4096];
+
+  if (size>0)
+    data.reserve((int)size);
+
+  len = file.Read(line, sizeof(line)-1);
+  while(len>0)
+  {    
+    data.append(line,len);
+    len = file.Read(line, sizeof(line)-1);
+  }
+
+  if(len<0)
+    return false;
+
+  return LoadData(data);
+}
+
+bool CPlayList::LoadData(const CStdString& strData)
+{
+  return false;
+}
+
+bool CPlayList::Expand(int position)
+{
+  auto_ptr<CPlayList> playlist (CPlayListFactory::Create(m_vecItems[position]));
+  if ( NULL == playlist.get())
+    return false;
+
+  if(!playlist->Load(m_vecItems[position].m_strPath))
+    return false;
+
+  // remove any item that points back to itself
+  for(int i = 0;i<playlist->size();i++)
+  {
+    if( (*playlist)[i].m_strPath.Equals( m_vecItems[position].m_strPath ) )
+    {
+      playlist->Remove(i);
+      i--;
+    }
+  }
+
+  if(playlist->size() <= 0)
+    return false;
+
+  Remove(position);
+  Insert(*playlist, position);
+  return true;
 }
\ No newline at end of file

Modified: trunk/XBMC/xbmc/PlayList.h
===================================================================
--- trunk/XBMC/xbmc/PlayList.h	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/PlayList.h	2006-12-15 22:29:07 UTC (rev 7366)
@@ -46,7 +46,8 @@
 
   CPlayList(void);
   virtual ~CPlayList(void);
-  virtual bool Load(const CStdString& strFileName, bool bDeep = true){ return false;};
+  virtual bool Load(const CStdString& strFileName);
+  virtual bool LoadData(const CStdString& strData);
   virtual void Save(const CStdString& strFileName) const {};
 
   void Add(CPlayListItem& item);
@@ -63,6 +64,7 @@
   void Remove(const CStdString& strFileName);
   void Remove(int position);
   bool Swap(int position1, int position2);
+  bool Expand(int position); // expands any playlist at position into this playlist
   void Clear();
   int size() const;
   int RemoveDVDItems();

Modified: trunk/XBMC/xbmc/PlayListB4S.cpp
===================================================================
--- trunk/XBMC/xbmc/PlayListB4S.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/PlayListB4S.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -27,7 +27,7 @@
 {}
 
 
-bool CPlayListB4S::Load(const CStdString& strFileName, bool bDeep)
+bool CPlayListB4S::Load(const CStdString& strFileName)
 {
   CStdString strBasePath;
   CUtil::GetParentPath(strFileName, strBasePath);

Modified: trunk/XBMC/xbmc/PlayListB4S.h
===================================================================
--- trunk/XBMC/xbmc/PlayListB4S.h	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/PlayListB4S.h	2006-12-15 22:29:07 UTC (rev 7366)
@@ -10,7 +10,7 @@
 public:
   CPlayListB4S(void);
   virtual ~CPlayListB4S(void);
-  virtual bool Load(const CStdString& strFileName, bool bDeep);
+  virtual bool Load(const CStdString& strFileName);
   virtual void Save(const CStdString& strFileName) const;
 };
 };

Modified: trunk/XBMC/xbmc/PlayListFactory.cpp
===================================================================
--- trunk/XBMC/xbmc/PlayListFactory.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/PlayListFactory.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -10,33 +10,72 @@
 
 using namespace PLAYLIST;
 
-CPlayListFactory::CPlayListFactory(void)
-{}
 
-CPlayListFactory::~CPlayListFactory(void)
-{}
+CPlayList* CPlayListFactory::Create(const CStdString& filename)
+{
+  CFileItem item(filename,false);
+  return Create(item);
+}
 
+CPlayList* CPlayListFactory::Create(const CFileItem& item)
+{  
+  if(item.IsLastFM()) //lastfm is always a stream, and just silly to check content
+    return NULL;
 
-CPlayList* CPlayListFactory::Create(const CStdString& strFileName) const
-{
-  CStdString strExtension;
-  CUtil::GetExtension(strFileName, strExtension);
-  strExtension.ToLower();
-  if (strExtension == ".m3u")
+  if( item.IsInternetStream() )
   {
+    CStdString strContentType = item.GetContentType();
+    strContentType.MakeLower();
+
+    if (strContentType == "video/x-ms-asf" 
+    || strContentType == "video/x-ms-asx")
+      return new CPlayListASX();
+
+    if (strContentType == "audio/x-pn-realaudio")
+      return new CPlayListRAM();
+
+    if (strContentType == "audio/x-scpls" 
+    || strContentType == "playlist"
+    || strContentType == "text/html")
+      return new CPlayListPLS();
+  }
+
+  CStdString extension = CUtil::GetExtension(item.m_strPath);
+  extension.MakeLower();
+
+  if (extension == ".m3u")
     return new CPlayListM3U();
-  }
-  if (strExtension == ".pls" || strExtension == ".strm")
-  {
+
+  if (extension == ".pls" || extension == ".strm")
     return new CPlayListPLS();
-  }
-  if (strExtension == ".b4s")
-  {
+
+  if (extension == ".b4s")
     return new CPlayListB4S();
-  }
-  if (strExtension == ".wpl")
-  {
+
+  if (extension == ".wpl")
     return new CPlayListWPL();
-  }
+
+  if (extension == ".asx")
+    return new CPlayListASX();
+
+  if (extension == ".ram")
+    return new CPlayListRAM();
+
   return NULL;
+
 }
+
+bool CPlayListFactory::IsPlaylist(const CStdString& filename)
+{
+  CStdString extension = CUtil::GetExtension(filename);
+  extension.ToLower();
+
+  if (extension == ".m3u") return true;
+  if (extension == ".b4s") return true;
+  if (extension == ".pls") return true;
+  if (extension == ".strm") return true;
+  if (extension == ".wpl") return true;
+  if (extension == ".asx") return true;
+  if (extension == ".ram") return true;
+  return false;
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/PlayListFactory.h
===================================================================
--- trunk/XBMC/xbmc/PlayListFactory.h	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/PlayListFactory.h	2006-12-15 22:29:07 UTC (rev 7366)
@@ -8,8 +8,8 @@
 class CPlayListFactory
 {
 public:
-  CPlayListFactory(void);
-  virtual ~CPlayListFactory(void);
-  CPlayList* Create(const CStdString& strFileName) const;
+  static CPlayList* Create(const CStdString& filename);
+  static CPlayList* Create(const CFileItem& item);
+  static bool IsPlaylist(const CStdString& filename);
 };
 };

Modified: trunk/XBMC/xbmc/PlayListM3U.cpp
===================================================================
--- trunk/XBMC/xbmc/PlayListM3U.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/PlayListM3U.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -33,7 +33,7 @@
 {}
 
 
-bool CPlayListM3U::Load(const CStdString& strFileName, bool bDeep)
+bool CPlayListM3U::Load(const CStdString& strFileName)
 {
   char szLine[4096];
   CStdString strLine;

Modified: trunk/XBMC/xbmc/PlayListM3U.h
===================================================================
--- trunk/XBMC/xbmc/PlayListM3U.h	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/PlayListM3U.h	2006-12-15 22:29:07 UTC (rev 7366)
@@ -9,7 +9,7 @@
 public:
   CPlayListM3U(void);
   virtual ~CPlayListM3U(void);
-  virtual bool Load(const CStdString& strFileName, bool bDeep);
+  virtual bool Load(const CStdString& strFileName);
   virtual void Save(const CStdString& strFileName) const;
 };
 };

Modified: trunk/XBMC/xbmc/PlayListPLS.cpp
===================================================================
--- trunk/XBMC/xbmc/PlayListPLS.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/PlayListPLS.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -1,6 +1,7 @@
 
 #include "stdafx.h"
 #include "playlistpls.h"
+#include "playlistfactory.h"
 #include "util.h"
 #include "utils\HTTP.h"
 
@@ -26,25 +27,23 @@
 CPlayListPLS::~CPlayListPLS(void)
 {}
 
-bool CPlayListPLS::LoadPLSInfo(CStdString strFileName, const CStdString& content, bool bDeep)
+bool CPlayListPLS::Load(const CStdString &strFile)
 {
   //read it from the file
   CStdString strBasePath;
+  CStdString strFileName(strFile);
   m_strPlayListName = CUtil::GetFileName(strFileName);
 
   Clear();
 
   bool bShoutCast = false;
-  if ( content.Equals("audio/x-scpls") || content.Equals("playlist")) 
+  if( strFileName.Left(8).Equals("shout://") )
   {
-    bShoutCast = true;
-    if( strFileName.Left(8).Equals("shout://") )
-    {
-      strFileName.Delete(0, 8);
-      strFileName.Insert(0, "http://");
-    }
+    strFileName.Delete(0, 8);
+    strFileName.Insert(0, "http://");
     strBasePath = "";
-  }
+    bShoutCast = true;
+  }    
   else
     CUtil::GetParentPath(strFileName, strBasePath);
 
@@ -79,14 +78,6 @@
         strLine.Replace("http:", "shout:");
       }
 
-      if (bDeep && !bShoutCast && strProtocol == "http")
-      {
-        if (LoadFromWeb(strLine))
-        {
-          file.Close();
-          return true;
-        }
-      }
       CPlayListItem newItem(strLine, strLine, 0);
       Add(newItem);
 
@@ -182,78 +173,66 @@
   return true;
 }
 
-bool CPlayListPLS::Load(const CStdString& strFileName, bool bDeep)
+void CPlayListPLS::Save(const CStdString& strFileName) const
 {
-  m_vecItems.clear();
-  CFileItem item(strFileName, false);
-  if (bDeep && item.IsInternetStream())
+  if (!m_vecItems.size()) return ;
+  CStdString strPlaylist = strFileName;
+  // force HD saved playlists into fatx compliance
+  if (CUtil::IsHD(strPlaylist))
+    CUtil::GetFatXQualifiedPath(strPlaylist);
+  FILE *fd = fopen(strPlaylist.c_str(), "w+");
+  if (!fd)
   {
-    //load it from the url
-    if (item.IsLastFM() || !LoadFromWeb(item.m_strPath))
-    {
-      CPlayListItem newItem(item.m_strPath, item.m_strPath, 0);
-      Add(newItem);
-    }
-    return true;
+    CLog::Log(LOGERROR, "Could not save PLS playlist: [%s]", strPlaylist.c_str());
+    return ;
   }
-  return LoadPLSInfo(strFileName, "", bDeep);
-}
+  fprintf(fd, "%s\n", START_PLAYLIST_MARKER);
+  CStdString strPlayListName=m_strPlayListName;
+  g_charsetConverter.utf8ToStringCharset(strPlayListName);
+  fprintf(fd, "PlaylistName=%s\n", strPlayListName.c_str() );
 
-bool CPlayListPLS::LoadFromWeb(CStdString& strURL)
-{
-  CLog::Log(LOGINFO, "Loading web playlist %s", strURL.c_str());
-
-  CHTTP httpUtil;
-  CStdString strData;
-
-  // Load up the page's header from the internet.  It is necessary to
-  // load the header only, as some HTTP link will be to actual streams
-  if (!httpUtil.Head(strURL))
+  for (int i = 0; i < (int)m_vecItems.size(); ++i)
   {
-    CLog::Log(LOGNOTICE, "URL %s not found", strURL.c_str());
-    return false;
+    const CPlayListItem& item = m_vecItems[i];
+    CStdString strFileName=item.GetFileName();
+    g_charsetConverter.utf8ToStringCharset(strFileName);
+    CStdString strDescription=item.GetDescription();
+    g_charsetConverter.utf8ToStringCharset(strDescription);
+    fprintf(fd, "File%i=%s\n", i + 1, strFileName.c_str() );
+    fprintf(fd, "Title%i=%s\n", i + 1, strDescription.c_str() );
+    fprintf(fd, "Length%i=%i\n", i + 1, item.GetDuration() / 1000 );
   }
 
-  CStdString strContentType;
-  if (!httpUtil.GetHeader("Content-Type", strContentType))
-  {
-    // Unable to deterine Content-Type
-    CLog::Log(LOGNOTICE, "No content type for URL %s", strURL.c_str());
-    return false;
-  }
+  fprintf(fd, "NumberOfEntries=%i\n", m_vecItems.size());
+  fprintf(fd, "Version=2\n");
+  fclose(fd);
+}
 
-  CLog::Log(LOGINFO, "Content-Type is %s", strContentType.c_str());
-  if ((strContentType == "video/x-ms-asf") || (strContentType == "video/x-ms-asx"))
+bool CPlayListASX::LoadAsxIniInfo(const CStdString& strData)
+{
+  CLog::Log(LOGINFO, "Parsing INI style ASX");
+  string::size_type equals = 0, end = 0;
+  CStdString strMMS;
+
+  while ((equals = strData.find('=', end)) != string::npos)
   {
-    httpUtil.Get(strURL, strData);
-    return LoadAsxInfo(strData);
+    end = strData.find('\r', equals);
+    if (end == string::npos)
+    {
+      strMMS = strData.substr(equals + 1);
+    }
+    else
+    {
+      strMMS = strData.substr(equals + 1, end - equals - 1);
+    }
+    CLog::Log(LOGINFO, "Adding element %s", strMMS.c_str());
+    CPlayListItem newItem(strMMS, strMMS, 0);
+    Add(newItem);
   }
-  if (strContentType == "audio/x-pn-realaudio")
-  {
-    httpUtil.Get(strURL, strData);
-    return LoadRAMInfo(strData);
-  }
-  if (strContentType == "audio/x-scpls" || strContentType == "playlist")
-  {
-    return LoadPLSInfo(strURL, strContentType, true);
-  }
-  if (strContentType == "text/html")
-  { // most probably a server is b0rking - try pls
-    return LoadPLSInfo(strURL, "playlist", true);
-  }
-  
-  CLog::Log(LOGWARNING, __FUNCTION__" - Unknown playlist contenttype %s", strContentType.c_str());
-  if (strContentType.Left(5) == "text/" && g_advancedSettings.m_logLevel > LOG_LEVEL_NORMAL)
-  {
-    httpUtil.Get(strURL, strData);
-    CLog::Log(LOGDEBUG, __FUNCTION__" - Sample %s\n%s", strURL.c_str(), strData.c_str());    
-  }
-
-  // Unknown type
-  return false;
+  return true;
 }
 
-bool CPlayListPLS::LoadAsxInfo(CStdString& strData)
+bool CPlayListASX::LoadData(const CStdString& strData)
 {
   CLog::Log(LOGNOTICE, "Parsing ASX");
 
@@ -274,82 +253,100 @@
       return false;
     }
 
-    TiXmlElement *pRootElement = xmlDoc.RootElement();
-    //TODO: can timy xml parse case-insensitive?
-    TiXmlElement *pElement = pRootElement->FirstChildElement("entry");
-    if (!pElement) pElement = pRootElement->FirstChildElement("Entry");
-    if (!pElement) pElement = pRootElement->FirstChildElement("ENTRY");
-    if (!pElement)
-    { // no entry, let's see if there's any entryref's
-      pElement = pRootElement->FirstChildElement("entryref");
-      if (!pElement) pElement = pRootElement->FirstChildElement("Entryref");
-      if (!pElement) pElement = pRootElement->FirstChildElement("EntryRef");
-      if (!pElement) pElement = pRootElement->FirstChildElement("ENTRYREF");
-      while (pElement)
+    TiXmlElement *pRootElement = xmlDoc.RootElement();    
+
+    // lowercase every element
+    TiXmlNode *pNode = pRootElement;
+    TiXmlNode *pChild = NULL;
+    CStdString value;
+    value = pNode->Value();
+    value.ToLower();
+    pNode->SetValue(value);
+    while(pNode)
+    {
+      pChild = pNode->IterateChildren(pChild);
+      if(pChild)
       {
-        CStdString strRef = pElement->Attribute("href");
-        if (strRef == "") strRef = pElement->Attribute("Href");
-        if (strRef == "") strRef = pElement->Attribute("HRef");
-        if (strRef == "") strRef = pElement->Attribute("HREF");
+        if (pChild->Type() == TiXmlNode::ELEMENT)
+        {
+          value = pChild->Value();
+          value.ToLower();
+          pChild->SetValue(value);
 
-        if (strRef != "")
-        { // found an entryref, let's try loading that url
-          LoadFromWeb(strRef);
+          TiXmlAttribute* pAttr = pChild->ToElement()->FirstAttribute();
+          while(pAttr)
+          {
+            value = pAttr->Name();
+            value.ToLower();
+            pAttr->SetName(value);
+            pAttr = pAttr->Next();
+          }
         }
-        pElement = pElement->NextSiblingElement();
+
+        pNode = pChild;
+        pChild = NULL;
+        continue;
       }
-    }
-    else while (pElement)
+
+      pChild = pNode;
+      pNode = pNode->Parent();
+    }    
+    CStdString roottitle = "";
+    TiXmlElement *pElement = pRootElement->FirstChildElement();
+    while (pElement)
+    {
+      value = pElement->Value();
+      if (value == "title")
       {
+        roottitle = pElement->GetText();
+      }
+      else if (value == "entry")
+      {
+        CStdString title(roottitle);        
+
         TiXmlElement *pRef = pElement->FirstChildElement("ref");
-        if (!pRef) pRef = pElement->FirstChildElement("Ref");
-        if (!pRef) pRef = pElement->FirstChildElement("REF");
-        if (pRef)
-        {
-          CStdString strMMS = pRef->Attribute("href");
-          if (strMMS == "") strMMS = pRef->Attribute("Href");
-          if (strMMS == "") strMMS = pRef->Attribute("HRef");
-          if (strMMS == "") strMMS = pRef->Attribute("HREF");
+        TiXmlElement *pTitle = pElement->FirstChildElement("title");
+        TiXmlElement *pDuration = pElement->FirstChildElement("duration"); /* <DURATION VALUE="hh:mm:ss.fract"/> */
 
-          if (strMMS != "")
+        if(pTitle) 
+          title = pTitle->GetText();
+
+        while (pRef)
+        { // multiple references may apear for one entry
+          // duration may exist on this level too
+          value = pRef->Attribute("href");
+          if (value != "")
           {
-            CLog::Log(LOGINFO, "Adding element %s", strMMS.c_str());
-            CPlayListItem newItem(strMMS, strMMS, 0);
+            if(title.IsEmpty()) 
+              title = value;
+
+            CLog::Log(LOGINFO, "Adding element %s, %s", title.c_str(), value.c_str());
+            CPlayListItem newItem(title, value, 0);
             Add(newItem);
           }
+          pRef = pRef->NextSiblingElement("ref");
         }
-        pElement = pElement->NextSiblingElement();
       }
+      else if (value == "entryref") 
+      {
+        value = pElement->Attribute("href");
+        if (value != "")
+        { // found an entryref, let's try loading that url
+          auto_ptr<CPlayList> playlist(CPlayListFactory::Create(value));
+          if (NULL != playlist.get())
+            if (playlist->Load(value))
+              Add(*playlist);
+        }
+      }
+      pElement = pElement->NextSiblingElement();
+    }
   }
 
   return true;
 }
 
-bool CPlayListPLS::LoadAsxIniInfo(CStdString& strData)
-{
-  CLog::Log(LOGINFO, "Parsing INI style ASX");
-  string::size_type equals = 0, end = 0;
-  CStdString strMMS;
 
-  while ((equals = strData.find('=', end)) != string::npos)
-  {
-    end = strData.find('\r', equals);
-    if (end == string::npos)
-    {
-      strMMS = strData.substr(equals + 1);
-    }
-    else
-    {
-      strMMS = strData.substr(equals + 1, end - equals - 1);
-    }
-    CLog::Log(LOGINFO, "Adding element %s", strMMS.c_str());
-    CPlayListItem newItem(strMMS, strMMS, 0);
-    Add(newItem);
-  }
-  return true;
-}
-
-bool CPlayListPLS::LoadRAMInfo(CStdString& strData)
+bool CPlayListRAM::LoadData(const CStdString& strData)
 {
   CLog::Log(LOGINFO, "Parsing RAM");
   CLog::Log(LOGDEBUG, "%s", strData.c_str());
@@ -359,41 +356,5 @@
   CLog::Log(LOGINFO, "Adding element %s", strMMS.c_str());
   CPlayListItem newItem(strMMS, strMMS, 0);
   Add(newItem);
-
   return true;
-}
-
-void CPlayListPLS::Save(const CStdString& strFileName) const
-{
-  if (!m_vecItems.size()) return ;
-  CStdString strPlaylist = strFileName;
-  // force HD saved playlists into fatx compliance
-  if (CUtil::IsHD(strPlaylist))
-    CUtil::GetFatXQualifiedPath(strPlaylist);
-  FILE *fd = fopen(strPlaylist.c_str(), "w+");
-  if (!fd)
-  {
-    CLog::Log(LOGERROR, "Could not save PLS playlist: [%s]", strPlaylist.c_str());
-    return ;
-  }
-  fprintf(fd, "%s\n", START_PLAYLIST_MARKER);
-  CStdString strPlayListName=m_strPlayListName;
-  g_charsetConverter.utf8ToStringCharset(strPlayListName);
-  fprintf(fd, "PlaylistName=%s\n", strPlayListName.c_str() );
-
-  for (int i = 0; i < (int)m_vecItems.size(); ++i)
-  {
-    const CPlayListItem& item = m_vecItems[i];
-    CStdString strFileName=item.GetFileName();
-    g_charsetConverter.utf8ToStringCharset(strFileName);
-    CStdString strDescription=item.GetDescription();
-    g_charsetConverter.utf8ToStringCharset(strDescription);
-    fprintf(fd, "File%i=%s\n", i + 1, strFileName.c_str() );
-    fprintf(fd, "Title%i=%s\n", i + 1, strDescription.c_str() );
-    fprintf(fd, "Length%i=%i\n", i + 1, item.GetDuration() / 1000 );
-  }
-
-  fprintf(fd, "NumberOfEntries=%i\n", m_vecItems.size());
-  fprintf(fd, "Version=2\n");
-  fclose(fd);
-}
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/PlayListPLS.h
===================================================================
--- trunk/XBMC/xbmc/PlayListPLS.h	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/PlayListPLS.h	2006-12-15 22:29:07 UTC (rev 7366)
@@ -9,14 +9,23 @@
 public:
   CPlayListPLS(void);
   virtual ~CPlayListPLS(void);
-  virtual bool Load(const CStdString& strFileName, bool bDeep);
+  virtual bool Load(const CStdString& strFileName);
   virtual void Save(const CStdString& strFileName) const;
+};
 
+class CPlayListASX : public CPlayList
+{
+public:
+  virtual bool LoadData(const CStdString& strData);
 protected:
-  bool LoadFromWeb(CStdString& strURL);
-  bool LoadAsxInfo(CStdString& strData);
-  bool LoadAsxIniInfo(CStdString& strData);
-  bool LoadRAMInfo(CStdString& strData);
-  bool LoadPLSInfo(CStdString strFileName, const CStdString &content, bool bDeep);
+  bool LoadAsxIniInfo(const CStdString& strData);
 };
+
+class CPlayListRAM : public CPlayList
+{
+public:
+  virtual bool LoadData(const CStdString& strData);
 };
+
+
+};

Modified: trunk/XBMC/xbmc/PlayListPlayer.cpp
===================================================================
--- trunk/XBMC/xbmc/PlayListPlayer.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/PlayListPlayer.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -1,6 +1,7 @@
 
 #include "stdafx.h"
 #include "PlayListPlayer.h"
+#include "PlayListFactory.h"
 #include "application.h"
 #include "util.h"
 #include "PartyModeManager.h"
@@ -156,6 +157,16 @@
   if (iSong < 0) iSong = 0;
   if (iSong >= playlist.size()) iSong = playlist.size() - 1;
 
+
+  // check if the item itself is a playlist, and can be expanded
+  // only allow a few levels, this could end up in a loop 
+  // if they refer to each other in a loop
+  for(int i=0;i<5;i++)
+  {
+    if(!playlist.Expand(iSong))
+      break;
+  }
+
   m_bChanged = true;
   int iPreviousSong = m_iCurrentSong;
   m_iCurrentSong = iSong;

Modified: trunk/XBMC/xbmc/PlayListWPL.cpp
===================================================================
--- trunk/XBMC/xbmc/PlayListWPL.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/PlayListWPL.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -30,7 +30,7 @@
 {}
 
 
-bool CPlayListWPL::Load(const CStdString& strFileName, bool bDeep)
+bool CPlayListWPL::Load(const CStdString& strFileName)
 {
   CStdString strBasePath;
   CUtil::GetParentPath(strFileName, strBasePath);

Modified: trunk/XBMC/xbmc/PlayListWPL.h
===================================================================
--- trunk/XBMC/xbmc/PlayListWPL.h	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/PlayListWPL.h	2006-12-15 22:29:07 UTC (rev 7366)
@@ -10,7 +10,7 @@
 public:
   CPlayListWPL(void);
   virtual ~CPlayListWPL(void);
-  virtual bool Load(const CStdString& strFileName, bool bDeep);
+  virtual bool Load(const CStdString& strFileName);
   virtual void Save(const CStdString& strFileName) const;
 };
 };

Modified: trunk/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp
===================================================================
--- trunk/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -504,8 +504,7 @@
 {
   // load a playlist like .m3u, .pls
   // first get correct factory to load playlist
-  CPlayListFactory factory;
-  auto_ptr<CPlayList> pPlayList (factory.Create(strPlayList));
+  auto_ptr<CPlayList> pPlayList (CPlayListFactory::Create(strPlayList));
   if ( NULL != pPlayList.get())
   {
     if (!pPlayList->Load(strPlayList))
@@ -535,8 +534,7 @@
     //pPlayList->Load will handle loading it from url instead of from a file
     strPath = "temp.strm";
   }
-  CPlayListFactory factory;
-  auto_ptr<CPlayList> pPlayList (factory.Create(strPath));
+  auto_ptr<CPlayList> pPlayList (CPlayListFactory::Create(strPath));
   if ( NULL == pPlayList.get())
     return false;
   if (!pPlayList->Load(item->m_strPath))
@@ -955,9 +953,8 @@
     if (pItem->IsPlayList())
       changed=LoadPlayList(pItem->m_strPath, playList, false, false);
     else
-    {
-      IDirectory *pDirectory = CFactoryDirectory::Create(pItem->m_strPath);
-      bool bResult=pDirectory->Exists(pItem->m_strPath);
+    {      
+      bool bResult = CDirectory::Exists(pItem->m_strPath);
       pItem->m_bIsFolder=bResult;
       pItem->m_bIsShareOrDrive=false;
       if (bResult || CFile::Exists(pItem->m_strPath))

Modified: trunk/XBMC/xbmc/lib/libGoAhead/XBMCweb.cpp
===================================================================
--- trunk/XBMC/xbmc/lib/libGoAhead/XBMCweb.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/lib/libGoAhead/XBMCweb.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -772,8 +772,7 @@
 
                 // load a playlist like .m3u, .pls
                 // first get correct factory to load playlist
-                CPlayListFactory factory;
-                auto_ptr<CPlayList> pPlayList (factory.Create(itm->m_strPath));
+                auto_ptr<CPlayList> pPlayList (CPlayListFactory::Create(*itm));
                 if ( NULL != pPlayList.get())
                 {
                   // load it

Modified: trunk/XBMC/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp
===================================================================
--- trunk/XBMC/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp	2006-12-15 01:02:47 UTC (rev 7365)
+++ trunk/XBMC/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp	2006-12-15 22:29:07 UTC (rev 7366)
@@ -142,8 +142,7 @@
 
 			// load a playlist like .m3u, .pls
 			// first get correct factory to load playlist
-			CPlayListFactory factory;
-			auto_ptr<CPlayList> pPlayList (factory.Create(item.m_strPath));
+            auto_ptr<CPlayList> pPlayList (CPlayListFactory::Create(item));
 			if ( NULL != pPlayList.get())
 			{
 				// load it


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

Revision: 7368
          http://svn.sourceforge.net/xbmc/?rev=7368&view=rev
Author:   elupus
Date:     2006-12-15 14:36:05 -0800 (Fri, 15 Dec 2006)

Log Message:
-----------
changed: force calls to mplayer to align the stack to 16 byte boundary on function call. 
added: helper defines to make aligned function calls using dllloader

GCC compiled dlls assumes stack is aligned on function entry, it will only ensure that the alignment is kept when going deeper, but this will be wrong if the caller is non gcc based. This misalignment will result in worse performance for mmx based rutines that uses variables on stack, and segfaults for sse based ones (no segfaults in current mplayer/libavcodec as I know of). Thus this change may increase performance for codecs wich are heavly mmx optimized.

Modified Paths:
--------------
    trunk/XBMC/xbmc/DynamicDll.h
    trunk/XBMC/xbmc/cores/mplayer/mplayer.h
    trunk/XBMC/xbmc/cores/mplayer/xbox_video.cpp

Modified: trunk/XBMC/xbmc/DynamicDll.h
===================================================================
--- trunk/XBMC/xbmc/DynamicDll.h	2006-12-15 22:31:06 UTC (rev 7367)
+++ trunk/XBMC/xbmc/DynamicDll.h	2006-12-15 22:36:05 UTC (rev 7368)
@@ -224,7 +224,110 @@
 #define DEFINE_METHOD10(result, name, args) DEFINE_METHOD_LINKAGE10(result, __cdecl, name, args)
 #define DEFINE_METHOD11(result, name, args) DEFINE_METHOD_LINKAGE11(result, __cdecl, name, args)
 
+///////////////////////////////////////////////////////////
+//
+//  DEFINE_FUNC_ALIGNED 0-X
+//
+//  Defines a function for an export from a dll, wich
+//  require a aligned stack on function call
+//  Use DEFINE_FUNC_ALIGNED for each function to be resolved.
+//
+//  result:  Result of the function
+//  linkage: Calling convention of the function
+//  name:    Name of the function
+//  args:    Argument types of the function
+//  
+//  Actual function call will expand to something like this
+//  this will align the stack (esp) at the point of function
+//  entry as required by gcc compiled dlls, it is abit abfuscated
+//  to allow for different sized variables
+//
+//  __int64 test(__int64 p1, char p2, char p3) 
+//  { 
+//    int o,s = ((sizeof(p1)+3)&~3)+((sizeof(p2)+3)&~3)+((sizeof(p3)+3)&~3); 
+//    __asm mov [o],esp;
+//    __asm sub esp, [s];
+//    __asm and esp, ~15;
+//    __asm add esp, [s] 
+//    m_test(p1, p2, p3);  //return value will still be correct aslong as we don't mess with it
+//    __asm mov esp,[o]; 
+//  };
 
+#define ALS(a) ((sizeof(a)+3)&~3)
+#define DEFINE_FUNC_PART1(result, linkage, name, args) \
+  private:                                             \
+    typedef result (linkage * name##_type)##args;      \
+    name##_type m_##name;                              \
+  public:                                              \
+    virtual result name##args
+
+#define DEFINE_FUNC_PART2(size) \
+  {                             \
+    int o,s = size;             \
+    __asm {                     \
+      __asm mov [o], esp        \
+      __asm sub esp, [s]        \
+      __asm and esp, ~15        \
+      __asm add esp, [s]        \
+    }
+
+#define DEFINE_FUNC_PART3(name,args) \
+    m_##name##args;                  \
+    __asm {                          \
+      __asm mov esp,[o]              \
+    }                                \
+  }
+
+#define DEFINE_FUNC_ALIGNED0(result, linkage, name) \
+    DEFINE_FUNC_PART1(result, linkage, name, ()) \
+    DEFINE_FUNC_PART2(0) \
+    DEFINE_FUNC_PART3(name,())
+
+#define DEFINE_FUNC_ALIGNED1(result, linkage, name, t1) \
+    DEFINE_FUNC_PART1(result, linkage, name, (t1 p1)) \
+    DEFINE_FUNC_PART2(ALS(p1)) \
+    DEFINE_FUNC_PART3(name,(p1))
+
+#define DEFINE_FUNC_ALIGNED2(result, linkage, name, t1, t2) \
+    DEFINE_FUNC_PART1(result, linkage, name, (t1 p1, t2 p2)) \
+    DEFINE_FUNC_PART2(ALS(p1)+ALS(p2)) \
+    DEFINE_FUNC_PART3(name,(p1, p2))
+
+#define DEFINE_FUNC_ALIGNED3(result, linkage, name, t1, t2, t3) \
+    DEFINE_FUNC_PART1(result, linkage, name, (t1 p1, t2 p2, t3 p3)) \
+    DEFINE_FUNC_PART2(ALS(p1)+ALS(p2)+ALS(p3)) \
+    DEFINE_FUNC_PART3(name,(p1, p2, p3))
+
+#define DEFINE_FUNC_ALIGNED4(result, linkage, name, t1, t2, t3, t4) \
+    DEFINE_FUNC_PART1(result, linkage, name, (t1 p1, t2 p2, t3 p3, t4 p4)) \
+    DEFINE_FUNC_PART2(ALS(p1)+ALS(p2)+ALS(p3)+ALS(p4)) \
+    DEFINE_FUNC_PART3(name,(p1, p2, p3, p4))
+
+#define DEFINE_FUNC_ALIGNED5(result, linkage, name, t1, t2, t3, t4, t5) \
+    DEFINE_FUNC_PART1(result, linkage, name, (t1 p1, t2 p2, t3 p3, t4 p4, t5 p5)) \
+    DEFINE_FUNC_PART2(ALS(p1)+ALS(p2)+ALS(p3)+ALS(p4)+ALS(p5)) \
+    DEFINE_FUNC_PART3(name,(p1, p2, p3, p4, p5))
+
+#define DEFINE_FUNC_ALIGNED6(result, linkage, name, t1, t2, t3, t4, t5, t6) \
+    DEFINE_FUNC_PART1(result, linkage, name, (t1 p1, t2 p2, t3 p3, t4 p4, t5 p5, t6 p6)) \
+    DEFINE_FUNC_PART2(ALS(p1)+ALS(p2)+ALS(p3)+ALS(p4)+ALS(p5)+ALS(p6)) \
+    DEFINE_FUNC_PART3(name,(p1, p2, p3, p4, p5, p6))
+
+#define DEFINE_FUNC_ALIGNED7(result, linkage, name, t1, t2, t3, t4, t5, t6, t7) \
+    DEFINE_FUNC_PART1(result, linkage, name, (t1 p1, t2 p2, t3 p3, t4 p4, t5 p5, t6 p6, t7 p7)) \
+    DEFINE_FUNC_PART2(ALS(p1)+ALS(p2)+ALS(p3)+ALS(p4)+ALS(p5)+ALS(p6)+ALS(p7)) \
+    DEFINE_FUNC_PART3(name,(p1, p2, p3, p4, p5, p6, p7))
+
+#define DEFINE_FUNC_ALIGNED8(result, linkage, name, t1, t2, t3, t4, t5, t6, t7, t8) \
+    DEFINE_FUNC_PART1(result, linkage, name, (t1 p1, t2 p2, t3 p3, t4 p4, t5 p5, t6 p6, t7 p7, t8 p8)) \
+    DEFINE_FUNC_PART2(ALS(p1)+ALS(p2)+ALS(p3)+ALS(p4)+ALS(p5)+ALS(p6)+ALS(p7)+ALS(p8)) \
+    DEFINE_FUNC_PART3(name,(p1, p2, p3, p4, p5, p6, p7, p8))
+
+#define DEFINE_FUNC_ALIGNED9(result, linkage, name, t1, t2, t3, t4, t5, t6, t7, t8, t9) \
+    DEFINE_FUNC_PART1(result, linkage, name, (t1 p1, t2 p2, t3 p3, t4 p4, t5 p5, t6 p6, t7 p7, t8 p8, t9 p9)) \
+    DEFINE_FUNC_PART2(ALS(p1)+ALS(p2)+ALS(p3)+ALS(p4)+ALS(p5)+ALS(p6)+ALS(p7)+ALS(p8)+ALS(p9)) \
+    DEFINE_FUNC_PART3(name,(p1, p2, p3, p4, p5, p6, p7, p8, p9))
+
 ///////////////////////////////////////////////////////////
 //
 //  BEGIN_METHOD_RESOLVE/END_METHOD_RESOLVE

Modified: trunk/XBMC/xbmc/cores/mplayer/mplayer.h
===================================================================
--- trunk/XBMC/xbmc/cores/mplayer/mplayer.h	2006-12-15 22:31:06 UTC (rev 7367)
+++ trunk/XBMC/xbmc/cores/mplayer/mplayer.h	2006-12-15 22:36:05 UTC (rev 7368)
@@ -1,10 +1,12 @@
 #pragma once
+
+class DllLoader;
+
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-#include "../DllLoader/DllLoader.h"
 
 #define SUB_MAX_TEXT 10
 #define SUB_ALIGNMENT_HLEFT 1

Modified: trunk/XBMC/xbmc/cores/mplayer/xbox_video.cpp
===================================================================
--- trunk/XBMC/xbmc/cores/mplayer/xbox_video.cpp	2006-12-15 22:31:06 UTC (rev 7367)
+++ trunk/XBMC/xbmc/cores/mplayer/xbox_video.cpp	2006-12-15 22:36:05 UTC (rev 7368)
@@ -64,9 +64,9 @@
 static void video_draw_osd(void)
 {
   if (g_renderManager.Paused()) return ;
-  int m_iWidth = g_renderManager.GetOSDWidth();
-  int m_iHeight = g_renderManager.GetOSDHeight();
-  vo_draw_text(g_renderManager.GetOSDWidth(), g_renderManager.GetOSDHeight(), draw_alpha);
+  RECT rs, rd;
+  g_renderManager.GetVideoRect(rs, rd);
+  vo_draw_text(rd.right-rd.left, rd.bottom-rd.top, draw_alpha);
 }
 
 


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

Revision: 7370
          http://svn.sourceforge.net/xbmc/?rev=7370&view=rev
Author:   kraqh3d
Date:     2006-12-16 09:46:32 -0800 (Sat, 16 Dec 2006)

Log Message:
-----------
added: music db function to get primary album artists only

Modified Paths:
--------------
    trunk/XBMC/xbmc/MusicDatabase.cpp
    trunk/XBMC/xbmc/MusicDatabase.h

Modified: trunk/XBMC/xbmc/MusicDatabase.cpp
===================================================================
--- trunk/XBMC/xbmc/MusicDatabase.cpp	2006-12-16 03:11:26 UTC (rev 7369)
+++ trunk/XBMC/xbmc/MusicDatabase.cpp	2006-12-16 17:46:32 UTC (rev 7370)
@@ -2938,6 +2938,49 @@
   return false;
 }
 
+bool CMusicDatabase::GetAlbumArtists(const CStdString& strBaseDir, CFileItemList& items)
+{
+  try
+  {
+    if (NULL == m_pDB.get()) return false;
+    if (NULL == m_pDS.get()) return false;
+
+    CStdString strSQL = "select distinct idArtist, strArtist from albumview";
+    CLog::Log(LOGDEBUG, "CMusicDatabase::GetAlbumArtists() query: %s", strSQL.c_str());
+    if (!m_pDS->query(strSQL.c_str())) return false;
+    int iRowsFound = m_pDS->num_rows();
+    if (iRowsFound == 0)
+    {
+      m_pDS->close();
+      return false;
+    }
+
+    items.Reserve(iRowsFound);
+    while (!m_pDS->eof())
+    {
+      CFileItem* pItem=new CFileItem(m_pDS->fv("strArtist").get_asString());
+      pItem->m_musicInfoTag.SetArtist(m_pDS->fv("strArtist").get_asString());
+      CStdString strDir;
+      strDir.Format("%ld/", m_pDS->fv("idArtist").get_asLong());
+      pItem->m_strPath=strBaseDir + strDir;
+      pItem->m_bIsFolder=true;
+      pItem->SetCachedArtistThumb();
+      items.Add(pItem);
+
+      m_pDS->next();
+    }
+    // cleanup
+    m_pDS->close();
+
+    return true;
+  }
+  catch (...)
+  {
+    CLog::Log(LOGERROR, "CMusicDatabase::GetAlbumArtists() failed");
+  }
+  return false;
+}
+
 bool CMusicDatabase::GetArtistsNav(const CStdString& strBaseDir, CFileItemList& items, long idGenre)
 {
   try

Modified: trunk/XBMC/xbmc/MusicDatabase.h
===================================================================
--- trunk/XBMC/xbmc/MusicDatabase.h	2006-12-16 03:11:26 UTC (rev 7369)
+++ trunk/XBMC/xbmc/MusicDatabase.h	2006-12-16 17:46:32 UTC (rev 7370)
@@ -131,6 +131,7 @@
   bool GetGenresNav(const CStdString& strBaseDir, CFileItemList& items);
   bool GetArtistsNav(const CStdString& strBaseDir, CFileItemList& items, long idGenre);
   bool GetAlbumsNav(const CStdString& strBaseDir, CFileItemList& items, long idGenre, long idArtist);
+  bool GetAlbumArtists(const CStdString& strBaseDir, CFileItemList& items);
   bool GetSongsNav(const CStdString& strBaseDir, CFileItemList& items, long idGenre, long idArtist,long idAlbum);
   bool GetSongsByWhere(const CStdString &whereClause, CFileItemList& items);
   bool GetRandomSong(CFileItem* item);


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

Revision: 7371
          http://svn.sourceforge.net/xbmc/?rev=7371&view=rev
Author:   kraqh3d
Date:     2006-12-16 09:50:00 -0800 (Sat, 16 Dec 2006)

Log Message:
-----------


Modified Paths:
--------------
    trunk/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp
    trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
    trunk/XBMC/xbmc/utils/GUIInfoManager.h

Modified: trunk/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp
===================================================================
--- trunk/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp	2006-12-16 17:46:32 UTC (rev 7370)
+++ trunk/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp	2006-12-16 17:50:00 UTC (rev 7371)
@@ -30,7 +30,12 @@
   CQueryParams params;
   CollectQueryParams(params);
 
-  bool bSuccess=musicdatabase.GetArtistsNav(BuildPath(), items, params.GetGenreId());
+  bool bSuccess = false;
+  
+  if (params.GetGenreId() < 0)
+    bSuccess=musicdatabase.GetAlbumArtists(BuildPath(), items); // this hides artists only found in compilations
+  else
+    bSuccess=musicdatabase.GetArtistsNav(BuildPath(), items, params.GetGenreId());
 
   musicdatabase.Close();
 

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2006-12-16 17:46:32 UTC (rev 7370)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2006-12-16 17:50:00 UTC (rev 7371)
@@ -232,25 +232,74 @@
   }
   else if (strCategory.Equals("musicplayer"))
   {
-    if (strTest.Equals("musicplayer.title")) ret = MUSICPLAYER_TITLE;
-    else if (strTest.Equals("musicplayer.album")) ret = MUSICPLAYER_ALBUM;
-    else if (strTest.Equals("musicplayer.artist")) ret = MUSICPLAYER_ARTIST;
-    else if (strTest.Equals("musicplayer.year")) ret = MUSICPLAYER_YEAR;
-    else if (strTest.Equals("musicplayer.genre")) ret = MUSICPLAYER_GENRE;
-    else if (strTest.Equals("musicplayer.time")) ret = MUSICPLAYER_TIME;
-    else if (strTest.Equals("musicplayer.timeremaining")) ret = MUSICPLAYER_TIME_REMAINING;
-    else if (strTest.Equals("musicplayer.timespeed")) ret = MUSICPLAYER_TIME_SPEED;
-    else if (strTest.Equals("musicplayer.tracknumber")) ret = MUSICPLAYER_TRACK_NUMBER;
-    else if (strTest.Equals("musicplayer.duration")) ret = MUSICPLAYER_DURATION;
-    else if (strTest.Equals("musicplayer.cover")) ret = MUSICPLAYER_COVER;
-    else if (strTest.Equals("musicplayer.bitrate")) ret = MUSICPLAYER_BITRATE;
-    else if (strTest.Equals("musicplayer.playlistlength")) ret = MUSICPLAYER_PLAYLISTLEN;
-    else if (strTest.Equals("musicplayer.playlistposition")) ret = MUSICPLAYER_PLAYLISTPOS;
-    else if (strTest.Equals("musicplayer.channels")) ret = MUSICPLAYER_CHANNELS;
-    else if (strTest.Equals("musicplayer.bitspersample")) ret = MUSICPLAYER_BITSPERSAMPLE;
-    else if (strTest.Equals("musicplayer.samplerate")) ret = MUSICPLAYER_SAMPLERATE;
-    else if (strTest.Equals("musicplayer.codec")) ret = MUSICPLAYER_CODEC;
-    else if (strTest.Equals("musicplayer.discnumber")) ret = MUSICPLAYER_DISC_NUMBER;
+    CStdStringArray section;
+    StringUtils::SplitString(strTest, ".", section);
+    int info  = 0; // info type
+    int data1 = 0; // playlist index
+    int data2 = 0; // type (0 = current playing item, positive = absolute index, negative = relative index)
+    if (section[1].Left(9).Equals("position("))
+    {
+      CStdString strNumber = section[1].Mid(9, section[1].GetLength() - 10);
+      data1 = atoi(strNumber.c_str());
+      data2 = 1;
+      strTest = section[2];
+    }
+    else if (section[1].Left(17).Equals("relativeposition("))
+    {
+      CStdString strNumber = section[1].Mid(17, section[1].GetLength() - 18);
+      data1 = atoi(strNumber.c_str());
+      data2 = -1;
+      strTest = section[2];
+    }
+    // shortcut for next and previous items
+    else if (section[1].Equals("next"))
+    {
+      data1 = 1;
+      data2 = -1;
+      strTest = section[2];
+    }
+    // shortcut for previous item
+    else if (section[1].Equals("previous"))
+    {
+      data1 = -1;
+      data2 = -1;
+      strTest = section[2];
+    }
+    else
+      strTest = section[1];
+
+    // supported by position() and relativeposition()
+    if (strTest.Equals("title")) info = MUSICPLAYER_TITLE;
+    else if (strTest.Equals("album")) info = MUSICPLAYER_ALBUM;
+    else if (strTest.Equals("artist")) info = MUSICPLAYER_ARTIST;
+    else if (strTest.Equals("year")) info = MUSICPLAYER_YEAR;
+    else if (strTest.Equals("genre")) info = MUSICPLAYER_GENRE;
+    else if (strTest.Equals("discnumber")) info = MUSICPLAYER_DISC_NUMBER;
+    else if (strTest.Equals("tracknumber")) info = MUSICPLAYER_TRACK_NUMBER;
+    else if (strTest.Equals("duration")) info = MUSICPLAYER_DURATION;
+    else if (strTest.Equals("playlistposition")) info = MUSICPLAYER_PLAYLISTPOS;
+    else if (strTest.Equals("cover")) info = MUSICPLAYER_COVER;
+    else if (strTest.Equals("exists")) info = MUSICPLAYER_EXISTS;
+
+    // only supported for the currently playing item
+    else if (strTest.Equals("time")) info = MUSICPLAYER_TIME;
+    else if (strTest.Equals("timeremaining")) info = MUSICPLAYER_TIME_REMAINING;
+    else if (strTest.Equals("timespeed")) info = MUSICPLAYER_TIME_SPEED;
+    else if (strTest.Equals("bitrate")) info = MUSICPLAYER_BITRATE;
+    else if (strTest.Equals("playlistlength")) info = MUSICPLAYER_PLAYLISTLEN;
+    else if (strTest.Equals("channels")) info = MUSICPLAYER_CHANNELS;
+    else if (strTest.Equals("bitspersample")) info = MUSICPLAYER_BITSPERSAMPLE;
+    else if (strTest.Equals("samplerate")) info = MUSICPLAYER_SAMPLERATE;
+    else if (strTest.Equals("codec")) info = MUSICPLAYER_CODEC;
+    else if (strTest.Equals("hasprevious")) info = MUSICPLAYER_HASPREV;
+    else if (strTest.Equals("hasnext")) info = MUSICPLAYER_HASNEXT;
+    else if (strTest.Equals("playlistplaying")) info = MUSICPLAYER_PLAYLISTPLAYING;
+
+    // only build a multiinfo item if necessary
+    if (data2 != 0)
+      ret = AddMultiInfo(GUIInfo(info, data1, data2));
+    else
+      ret = info;
   }
   else if (strCategory.Equals("videoplayer"))
   {
@@ -419,7 +468,20 @@
   CStdString strLabel;
   if (info >= MULTI_INFO_START && info <= MULTI_INFO_END)
   {
-    strLabel = GetMultiInfoLabel(m_multiInfo[info - MULTI_INFO_START]);
+    GUIInfo& multiInfo = m_multiInfo[info - MULTI_INFO_START];
+
+    // is this a musicplayer multiinfo item?
+    if (multiInfo.m_info >= MUSICPLAYER_TITLE && multiInfo.m_info <= MUSICPLAYER_DISC_NUMBER)
+    {
+      // if m_data2 == 0, something went wrong
+      if (multiInfo.m_data2 != 0)
+        strLabel = GetMusicPlaylistLabel(multiInfo);
+    }
+    // not musicplayer related, proceed as normal
+    else
+      strLabel = GetMultiInfoLabel(multiInfo);
+
+    return strLabel;
   }
   switch (info)
   {
@@ -455,7 +517,7 @@
     break;
   case PLAYER_DURATION:
     if (g_application.IsPlayingAudio())
-      strLabel = GetMusicLabel(info);
+      strLabel = GetMusicInfoTagLabel(info, GetCurrentSongTag());
     else
       strLabel = GetVideoLabel(info);
     break;
@@ -464,11 +526,14 @@
   case MUSICPLAYER_ARTIST:
   case MUSICPLAYER_GENRE:
   case MUSICPLAYER_YEAR:
+  case MUSICPLAYER_DISC_NUMBER:
+  case MUSICPLAYER_TRACK_NUMBER:
+  case MUSICPLAYER_DURATION:
+    strLabel = GetMusicInfoTagLabel(info, GetCurrentSongTag());
+  break;
   case MUSICPLAYER_TIME:
   case MUSICPLAYER_TIME_SPEED:
   case MUSICPLAYER_TIME_REMAINING:
-  case MUSICPLAYER_TRACK_NUMBER:
-  case MUSICPLAYER_DURATION:
   case MUSICPLAYER_BITRATE:
   case MUSICPLAYER_PLAYLISTLEN:
   case MUSICPLAYER_PLAYLISTPOS:
@@ -476,7 +541,6 @@
   case MUSICPLAYER_BITSPERSAMPLE:
   case MUSICPLAYER_SAMPLERATE:
   case MUSICPLAYER_CODEC:
-  case MUSICPLAYER_DISC_NUMBER:
     strLabel = GetMusicLabel(info);
   break;
   case VIDEOPLAYER_TITLE:
@@ -927,6 +991,29 @@
     case MUSICPM_ENABLED:
       bReturn = g_partyModeManager.IsEnabled();
     break;
+    case MUSICPLAYER_HASPREV:
+      {
+        // requires current playlist be PLAYLIST_MUSIC
+        bReturn = false;
+        if (g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_MUSIC)
+          bReturn = (g_playlistPlayer.GetCurrentSong() > 0); // not first song
+      }
+      break;
+    case MUSICPLAYER_HASNEXT:
+      {
+        // requires current playlist be PLAYLIST_MUSIC
+        bReturn = false;
+        if (g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_MUSIC)
+          bReturn = (g_playlistPlayer.GetCurrentSong() < (g_playlistPlayer.GetPlaylist(PLAYLIST_MUSIC).size() - 1)); // not last song
+      }
+      break;
+    case MUSICPLAYER_PLAYLISTPLAYING:
+      {
+        bReturn = false;
+        if (g_application.IsPlayingAudio() && g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_MUSIC)
+          bReturn = true;
+      }
+      break;
     case AUDIOSCROBBLER_ENABLED:
       bReturn = g_guiSettings.GetBool("lastfm.enable");
     break;
@@ -1049,6 +1136,22 @@
     case SYSTEM_HAS_ALARM:
       bReturn = g_alarmClock.hasAlarm(m_stringParameters[info.m_data1]);
       break;
+    case MUSICPLAYER_EXISTS:
+      {
+        int index = info.m_data1;
+        // relative index requires current playlist is PLAYLIST_MUSIC
+        if (info.m_data2 < 0)
+        {
+          if (g_playlistPlayer.GetCurrentPlaylist() != PLAYLIST_MUSIC)
+            return false;
+          index += g_playlistPlayer.GetCurrentSong();
+        }
+        // is the index within bounds?
+        if (index >= 0 && index < g_playlistPlayer.GetPlaylist(PLAYLIST_MUSIC).size())
+          return true;
+        return false;
+      }
+      break;
   }
   return (info.m_info < 0) ? !bReturn : bReturn;
 }
@@ -1074,7 +1177,17 @@
 {
   if (info >= MULTI_INFO_START && info <= MULTI_INFO_END)
   {
-    return GetMultiInfoLabel(m_multiInfo[info - MULTI_INFO_START]);
+    GUIInfo& multiInfo = m_multiInfo[info - MULTI_INFO_START];
+
+    // is this a musicplayer multiinfo item?
+    if (multiInfo.m_info == MUSICPLAYER_COVER)
+    {
+      // if m_data2 == 0, something went wrong
+      if (multiInfo.m_data2 != 0)
+        return GetMusicPlaylistCover(multiInfo);
+    }
+    else
+      return GetMultiInfoLabel(multiInfo);
   }
   else if (info == WEATHER_CONDITIONS)
     return g_weatherManager.GetInfo(WEATHER_IMAGE_CURRENT_ICON);
@@ -1174,6 +1287,136 @@
   return "";
 }
 
+CStdString CGUIInfoManager::GetMusicPlaylistLabel(const GUIInfo& info)
+{
+  CPlayList& playlist = g_playlistPlayer.GetPlaylist(PLAYLIST_MUSIC);
+  if (playlist.size() < 1)
+    return "";
+  int index = info.m_data1;
+  // negative means the index is relative
+  // relative index requires current playlist is PLAYLIST_MUSIC
+  if (info.m_data2 < 0)
+  {
+    if (g_playlistPlayer.GetCurrentPlaylist() != PLAYLIST_MUSIC)
+      return "";
+    index += g_playlistPlayer.GetCurrentSong();
+  }
+  if (index < 0 || index >= playlist.size())
+    return "";
+  CPlayList::CPlayListItem &playlistItem = playlist[index];
+  if (playlistItem.m_musicInfoTag.GetTitle().IsEmpty())
+  {
+    playlistItem.LoadMusicTag();
+    // couldnt get data?
+    if (playlistItem.m_musicInfoTag.GetTitle().IsEmpty())
+      // just set the title to the filename
+      // setting tag.loaded() prevents the now playing window from loading other info like duration!
+      playlistItem.m_musicInfoTag.SetTitle(CUtil::GetTitleFromPath(playlistItem.m_strPath));
+  }
+  if (info.m_info == MUSICPLAYER_PLAYLISTPOS)
+  {
+    CStdString strPosition = "";
+    strPosition.Format("%i", index + 1);
+    return strPosition;
+  }
+  return GetMusicInfoTagLabel(info.m_info, playlistItem.m_musicInfoTag);
+}
+
+CStdString CGUIInfoManager::GetMusicPlaylistCover(const GUIInfo& info)
+{
+  CPlayList& playlist = g_playlistPlayer.GetPlaylist(PLAYLIST_MUSIC);
+  if (playlist.size() < 1)
+    return "";
+  int index = info.m_data1;
+  // negative means the index is relative
+  // relative index requires current playlist is PLAYLIST_MUSIC
+  if (info.m_data2 < 0)
+  {
+    if (g_playlistPlayer.GetCurrentPlaylist() != PLAYLIST_MUSIC)
+      return "";
+    index += g_playlistPlayer.GetCurrentSong();
+  }
+  if (index < 0 || index >= playlist.size())
+    return "";
+  CPlayList::CPlayListItem &playlistItem = playlist[index];
+  // set music thumb needs tag info
+  if (playlistItem.m_musicInfoTag.GetTitle().IsEmpty())
+  {
+    playlistItem.LoadMusicTag();
+    // couldnt get data?
+    if (playlistItem.m_musicInfoTag.GetTitle().IsEmpty())
+      // just set the title to the filename
+      // setting tag.loaded() prevents the now playing window from loading other info like duration!
+      playlistItem.m_musicInfoTag.SetTitle(CUtil::GetTitleFromPath(playlistItem.m_strPath));
+  }
+  // try to set a thumbnail
+  if (!playlistItem.HasThumbnail())
+  {
+    playlistItem.SetMusicThumb(true);
+    // still no thumb? then just the set the default cover
+    if (!playlistItem.HasThumbnail())
+      playlistItem.SetThumbnailImage("defaultAlbumCover.png");
+  }
+  return playlistItem.GetThumbnailImage();
+}
+
+CStdString CGUIInfoManager::GetMusicInfoTagLabel(int item, const CMusicInfoTag& tag)
+{
+  switch (item)
+  {
+  case MUSICPLAYER_TITLE:
+    if (tag.GetTitle().size()) { return tag.GetTitle(); }
+    break;
+  case MUSICPLAYER_ALBUM: 
+    if (tag.GetAlbum().size()) { return tag.GetAlbum(); }
+    break;
+  case MUSICPLAYER_ARTIST: 
+    if (tag.GetArtist().size()) { return tag.GetArtist(); }
+    break;
+  case MUSICPLAYER_YEAR: 
+    if (tag.GetYear().size()) { return tag.GetYear(); }
+    break;
+  case MUSICPLAYER_GENRE: 
+    if (tag.GetGenre().size()) { return tag.GetGenre(); }
+    break;
+  case MUSICPLAYER_DISC_NUMBER:
+    {
+      CStdString strDisc;
+      if (tag.Loaded() && tag.GetDiscNumber() > 0)
+      {
+        strDisc.Format("%02i", tag.GetDiscNumber());
+        return strDisc;
+      } 
+    }
+    break;
+  case MUSICPLAYER_TRACK_NUMBER:
+    {
+      CStdString strTrack;
+      if (tag.Loaded() && tag.GetTrackNumber() > 0)
+      {
+        strTrack.Format("%02i", tag.GetTrackNumber());
+        return strTrack;
+      }
+    }
+    break;
+  case MUSICPLAYER_DURATION:
+  case PLAYER_DURATION:
+    {
+      CStdString strDuration;
+      if (tag.GetDuration() > 0)
+        StringUtils::SecondsToTimeString(tag.GetDuration(), strDuration);
+      else
+      {
+        unsigned int iTotal = (unsigned int)g_application.GetTotalTime();
+        if (iTotal > 0)
+          StringUtils::SecondsToTimeString(iTotal, strDuration);
+      }
+      return strDuration;
+    }
+    break;
+  }
+  return "";
+}
 CStdString CGUIInfoManager::GetPlaylistLabel(int item)
 {
   if (!g_application.IsPlaying()) return "";
@@ -1217,24 +1460,10 @@
 CStdString CGUIInfoManager::GetMusicLabel(int item)
 {
   if (!g_application.IsPlayingAudio()) return "";
-  CMusicInfoTag& tag = m_currentFile.m_musicInfoTag;
+  //CMusicInfoTag& tag = m_currentFile.m_musicInfoTag;
+  // tag related items were moved into GetMusicInfoTagLabel()
   switch (item)
   {
-  case MUSICPLAYER_TITLE:
-    if (tag.GetTitle().size()) { return tag.GetTitle(); }
-    break;
-  case MUSICPLAYER_ALBUM: 
-    if (tag.GetAlbum().size()) { return tag.GetAlbum(); }
-    break;
-  case MUSICPLAYER_ARTIST: 
-    if (tag.GetArtist().size()) { return tag.GetArtist(); }
-    break;
-  case MUSICPLAYER_YEAR: 
-    if (tag.GetYear().size()) { return tag.GetYear(); }
-    break;
-  case MUSICPLAYER_GENRE: 
-    if (tag.GetGenre().size()) { return tag.GetGenre(); }
-    break;
   case MUSICPLAYER_TIME:
     return GetCurrentPlayTime();
   case MUSICPLAYER_TIME_REMAINING:
@@ -1249,32 +1478,6 @@
       return strTime;
     }
     break;
-  case MUSICPLAYER_TRACK_NUMBER:
-    {
-      CStdString strTrack;
-      if (tag.Loaded() && tag.GetTrackNumber() > 0)
-      {
-        strTrack.Format("%02i", tag.GetTrackNumber());
-        return strTrack;
-      }
-    }
-    break;
-  case MUSICPLAYER_DURATION:
-  case PLAYER_DURATION:
-    {
-      CStdString strDuration;
-      if (tag.GetDuration() > 0)
-        StringUtils::SecondsToTimeString(tag.GetDuration(), strDuration);
-      else
-      {
-        unsigned int iTotal = (unsigned int)g_application.GetTotalTime();
-        if (iTotal > 0)
-          StringUtils::SecondsToTimeString(iTotal, strDuration);
-
-      }
-      return strDuration;
-    }
-    break;
   case MUSICPLAYER_PLAYLISTLEN:
     {
       if (g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_MUSIC)
@@ -1338,16 +1541,6 @@
       return strCodec;
     }
     break;
-  case MUSICPLAYER_DISC_NUMBER:
-    {
-      CStdString strDisc;
-      if (tag.Loaded() && tag.GetDiscNumber() > 0)
-      {
-        strDisc.Format("%02i", tag.GetDiscNumber());
-        return strDisc;
-      } 
-    }
-    break;
   }
   return "";
 }
@@ -1571,14 +1764,14 @@
     {
       CLog::Log(LOGDEBUG,"Streaming media detected... using %s to find a thumb", g_application.m_strPlayListFile.c_str());
       CFileItem streamingItem(g_application.m_strPlayListFile,false);
-      streamingItem.SetMusicThumb();
+      streamingItem.SetMusicThumb(true);
       CStdString strThumb = streamingItem.GetThumbnailImage();
       if (CFile::Exists(strThumb))
         m_currentFile.SetThumbnailImage(strThumb);
     }
   }
   else
-    m_currentFile.SetMusicThumb();
+    m_currentFile.SetMusicThumb(true);
   m_currentFile.FillInDefaultIcon();
 }
 

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.h
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.h	2006-12-16 17:46:32 UTC (rev 7370)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.h	2006-12-16 17:50:00 UTC (rev 7371)
@@ -13,6 +13,7 @@
 #include "../StringUtils.h"
 #include "../Temperature.h"
 #include "../utils/criticalsection.h"
+#include "../PlaylistPlayer.h"
 
 #define OPERATOR_NOT  3
 #define OPERATOR_AND  2
@@ -142,6 +143,11 @@
 #define MUSICPLAYER_SAMPLERATE      216
 #define MUSICPLAYER_CODEC           217
 #define MUSICPLAYER_DISC_NUMBER     218
+// conditionals
+#define MUSICPLAYER_HASPREV         221
+#define MUSICPLAYER_HASNEXT         222
+#define MUSICPLAYER_EXISTS          223
+#define MUSICPLAYER_PLAYLISTPLAYING 224
 
 #define VIDEOPLAYER_TITLE           250
 #define VIDEOPLAYER_GENRE           251
@@ -303,6 +309,9 @@
   CStdString GetVideoLabel(int item);
   CStdString GetPlaylistLabel(int item);
   CStdString GetMusicPartyModeLabel(int item);
+  CStdString GetMusicInfoTagLabel(int item, const CMusicInfoTag& tag);
+  CStdString GetMusicPlaylistLabel(const GUIInfo& info);
+  CStdString GetMusicPlaylistCover(const GUIInfo& info);
   string GetFreeSpace(int drive, bool shortText = false);
   __int64 GetPlayTime();  // in ms
   CStdString GetCurrentPlayTime();


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

Revision: 7396
          http://svn.sourceforge.net/xbmc/?rev=7396&view=rev
Author:   kraqh3d
Date:     2006-12-20 14:52:15 -0800 (Wed, 20 Dec 2006)

Log Message:
-----------
changed: converted the music library "hideallitems" and "allitemsonbottom" options into proper advanced settings, and added a new option "hidecompilationartists".  see the wiki advancedsettings.xml page for details.

Modified Paths:
--------------
    trunk/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNode.cpp
    trunk/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp
    trunk/XBMC/xbmc/GUISettings.cpp
    trunk/XBMC/xbmc/Settings.cpp
    trunk/XBMC/xbmc/Settings.h

Modified: trunk/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNode.cpp
===================================================================
--- trunk/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNode.cpp	2006-12-20 22:43:04 UTC (rev 7395)
+++ trunk/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNode.cpp	2006-12-20 22:52:15 UTC (rev 7396)
@@ -228,7 +228,7 @@
   CFileItem* pItem=NULL;
 
   // always hide "all" items
-  if (g_guiSettings.GetBool("musicfiles.hideallitems"))
+  if (g_advancedSettings.m_bMusicLibraryHideAllItems)
     return;
 
   // no need for "all" item when only one item
@@ -285,7 +285,7 @@
     CStdString strFake;
     //  HACK: This item will stay on top of a list
     strFake.Format("%c", 0x01);
-    if (g_guiSettings.GetBool("musicfiles.allitemsonbottom"))
+    if (g_advancedSettings.m_bMusicLibraryAllItemsOnBottom)
       //  HACK: This item will stay on bottom of a list
       strFake.Format("%c", 0xff);
     pItem->m_musicInfoTag.SetAlbum(strFake);

Modified: trunk/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp
===================================================================
--- trunk/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp	2006-12-20 22:43:04 UTC (rev 7395)
+++ trunk/XBMC/xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp	2006-12-20 22:52:15 UTC (rev 7396)
@@ -30,8 +30,14 @@
   CQueryParams params;
   CollectQueryParams(params);
 
-  bool bSuccess=musicdatabase.GetArtistsNav(BuildPath(), items, params.GetGenreId());
+  bool bSuccess = false;
 
+  // hide compilation artists only gets the primary album artists, including "Various Artists"
+  if (params.GetGenreId() < 0 && g_advancedSettings.m_bMusicLibraryHideCompilationArtists)
+    bSuccess=musicdatabase.GetAlbumArtists(BuildPath(), items); 
+  else
+    bSuccess=musicdatabase.GetArtistsNav(BuildPath(), items, params.GetGenreId());
+
   musicdatabase.Close();
 
   return bSuccess;

Modified: trunk/XBMC/xbmc/GUISettings.cpp
===================================================================
--- trunk/XBMC/xbmc/GUISettings.cpp	2006-12-20 22:43:04 UTC (rev 7395)
+++ trunk/XBMC/xbmc/GUISettings.cpp	2006-12-20 22:52:15 UTC (rev 7396)
@@ -250,9 +250,6 @@
   AddSeparator(7, "musicfiles.sep2");
   AddBool(8, "musicfiles.usecddb", 227, true);
   AddBool(9, "musicfiles.findremotethumbs", 14059, true);
-  // advanced library options
-  AddBool(0, "musicfiles.hideallitems", 0, false);
-  AddBool(0, "musicfiles.allitemsonbottom", 0, false);
 
   AddCategory(3, "lastfm", 15200);
   AddBool(1, "lastfm.enable", 15201, false);

Modified: trunk/XBMC/xbmc/Settings.cpp
===================================================================
--- trunk/XBMC/xbmc/Settings.cpp	2006-12-20 22:43:04 UTC (rev 7395)
+++ trunk/XBMC/xbmc/Settings.cpp	2006-12-20 22:52:15 UTC (rev 7396)
@@ -250,6 +250,9 @@
 
   g_advancedSettings.m_musicThumbs = "folder.jpg";
   g_advancedSettings.m_dvdThumbs = "folder.jpg";
+  g_advancedSettings.m_bMusicLibraryHideAllItems = false;
+  g_advancedSettings.m_bMusicLibraryAllItemsOnBottom = false;
+  g_advancedSettings.m_bMusicLibraryHideCompilationArtists = false;
 
   xbmcXmlLoaded = false;
   bTransaction = false;
@@ -1175,6 +1178,14 @@
     GetInteger(pElement, "blackbarcolour", g_advancedSettings.m_videoBlackBarColour, 1, 0, 255);
   }
 
+  pElement = pRootElement->FirstChildElement("musiclibrary");
+  if (pElement)
+  {
+    XMLUtils::GetBoolean(pElement, "hideallitems", g_advancedSettings.m_bMusicLibraryHideAllItems);
+    XMLUtils::GetBoolean(pElement, "allitemsonbottom", g_advancedSettings.m_bMusicLibraryAllItemsOnBottom);
+    XMLUtils::GetBoolean(pElement, "hidecompilationartists", g_advancedSettings.m_bMusicLibraryHideCompilationArtists);
+  }
+
   pElement = pRootElement->FirstChildElement("slideshow");
   if (pElement)
   {
@@ -1208,7 +1219,7 @@
     GetInteger(pElement, "clienttimeout", g_advancedSettings.m_sambaclienttimeout, 10, 5, 100);
   }
 
-  GetInteger(pRootElement, "loglevel", g_advancedSettings.m_logLevel, LOG_LEVEL_NONE, LOG_LEVEL_NORMAL, LOG_LEVEL_MAX);
+  GetInteger(pRootElement, "loglevel", g_advancedSettings.m_logLevel, LOG_LEVEL_NORMAL, LOG_LEVEL_NONE, LOG_LEVEL_MAX);
   GetString(pRootElement, "cddbaddress", g_advancedSettings.m_cddbAddress, "freedb.freedb.org");
   GetString(pRootElement, "imdbaddress", g_advancedSettings.m_imdbAddress, "akas.imdb.com");
 

Modified: trunk/XBMC/xbmc/Settings.h
===================================================================
--- trunk/XBMC/xbmc/Settings.h	2006-12-20 22:43:04 UTC (rev 7395)
+++ trunk/XBMC/xbmc/Settings.h	2006-12-20 22:52:15 UTC (rev 7396)
@@ -303,6 +303,11 @@
     CStdString m_sambadoscodepage;
     CStdString m_musicThumbs;
     CStdString m_dvdThumbs;
+
+    bool m_bMusicLibraryHideAllItems;
+    bool m_bMusicLibraryAllItemsOnBottom;
+    bool m_bMusicLibraryHideCompilationArtists;
+
   };
   struct stSettings
   {


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

Revision: 7432
          http://svn.sourceforge.net/xbmc/?rev=7432&view=rev
Author:   jmarshallnz
Date:     2006-12-25 14:46:18 -0800 (Mon, 25 Dec 2006)

Log Message:
-----------
changed: Bumped thumbcache size to 192 (up to 192*192 pixels)

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIDialogVideoBookmarks.cpp
    trunk/XBMC/xbmc/Settings.cpp

Modified: trunk/XBMC/xbmc/GUIDialogVideoBookmarks.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogVideoBookmarks.cpp	2006-12-25 22:45:25 UTC (rev 7431)
+++ trunk/XBMC/xbmc/GUIDialogVideoBookmarks.cpp	2006-12-25 22:46:18 UTC (rev 7432)
@@ -9,7 +9,7 @@
 #endif
 #include "Picture.h"
 
-#define BOOKMARK_THUMB_WIDTH 128
+#define BOOKMARK_THUMB_WIDTH g_advancedSettings.m_thumbSize
 
 #define CONTROL_ADD_BOOKMARK     2
 #define CONTROL_CLEAR_BOOKMARKS  3

Modified: trunk/XBMC/xbmc/Settings.cpp
===================================================================
--- trunk/XBMC/xbmc/Settings.cpp	2006-12-25 22:45:25 UTC (rev 7431)
+++ trunk/XBMC/xbmc/Settings.cpp	2006-12-25 22:46:18 UTC (rev 7432)
@@ -194,7 +194,7 @@
   g_advancedSettings.m_controllerDeadzone = 0.2f;
   g_advancedSettings.m_displayRemoteCodes = false;
 
-  g_advancedSettings.m_thumbSize = 128;
+  g_advancedSettings.m_thumbSize = 192;
 
   g_advancedSettings.m_sambadoscodepage = "";
   g_advancedSettings.m_sambaclienttimeout = 10;
@@ -1202,7 +1202,7 @@
 
   GetInteger(pRootElement, "remoterepeat", g_advancedSettings.m_remoteRepeat, 480, 1, INT_MAX);
   GetFloat(pRootElement, "controllerdeadzone", g_advancedSettings.m_controllerDeadzone, 0.2f, 0.0f, 1.0f);
-  GetInteger(pRootElement, "thumbsize", g_advancedSettings.m_thumbSize, 128, 64, 512);
+  GetInteger(pRootElement, "thumbsize", g_advancedSettings.m_thumbSize, 192, 64, 512);
 
   XMLUtils::GetBoolean(pRootElement, "playlistasfolders", g_advancedSettings.m_playlistAsFolders);
   XMLUtils::GetBoolean(pRootElement, "detectasudf", g_advancedSettings.m_detectAsUdf);


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

Revision: 7433
          http://svn.sourceforge.net/xbmc/?rev=7433&view=rev
Author:   jmarshallnz
Date:     2006-12-26 00:34:53 -0800 (Tue, 26 Dec 2006)

Log Message:
-----------
added: Default viewmodes for various categories in MyMusic are now saved, so that newly navigated to folders will use more appropriate views.

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIViewState.cpp
    trunk/XBMC/xbmc/GUIViewState.h
    trunk/XBMC/xbmc/GUIViewStateMusic.cpp
    trunk/XBMC/xbmc/Settings.cpp
    trunk/XBMC/xbmc/Settings.h
    trunk/XBMC/xbmc/ViewDatabase.h

Modified: trunk/XBMC/xbmc/GUIViewState.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIViewState.cpp	2006-12-25 22:46:18 UTC (rev 7432)
+++ trunk/XBMC/xbmc/GUIViewState.cpp	2006-12-26 08:34:53 UTC (rev 7433)
@@ -280,11 +280,21 @@
 
 void CGUIViewState::SaveViewToDb(const CStdString &path, int windowID)
 {
+  CViewState state(m_currentViewAsControl, GetSortMethod(), m_sortOrder);
+  SaveViewToDb(path, windowID, state, false);
+}
+
+void CGUIViewState::SaveViewToDb(const CStdString &path, int windowID, CViewState &viewState, bool saveSettings)
+{
   CViewDatabase db;
   if (db.Open())
   {
-    CViewState state(m_currentViewAsControl, GetSortMethod(), m_sortOrder);
-    db.SetViewState(path, windowID, state);
+    viewState.m_viewMode = m_currentViewAsControl;
+    viewState.m_sortMethod = GetSortMethod();
+    viewState.m_sortOrder = m_sortOrder;
+    db.SetViewState(path, windowID, viewState);
     db.Close();
+    if (saveSettings)
+      g_settings.Save();
   }
 }
\ No newline at end of file

Modified: trunk/XBMC/xbmc/GUIViewState.h
===================================================================
--- trunk/XBMC/xbmc/GUIViewState.h	2006-12-25 22:46:18 UTC (rev 7432)
+++ trunk/XBMC/xbmc/GUIViewState.h	2006-12-26 08:34:53 UTC (rev 7433)
@@ -3,6 +3,8 @@
 #include "settings.h"
 #include "GUIBaseContainer.h"
 
+class CViewState; // forward
+
 class CGUIViewState
 {
 public:
@@ -52,6 +54,7 @@
   CGUIViewState(const CFileItemList& items);  // no direct object creation, use GetViewState()
   virtual void SaveViewState()=0;
   void SaveViewToDb(const CStdString &path, int windowID);
+  void SaveViewToDb(const CStdString &path, int windowID, CViewState &viewState, bool saveSettings = true);
   void LoadViewState(const CStdString &path, int windowID);
 
   void AddSortMethod(SORT_METHOD sortMethod, int buttonLabel, LABEL_MASKS labelmasks);

Modified: trunk/XBMC/xbmc/GUIViewStateMusic.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIViewStateMusic.cpp	2006-12-25 22:46:18 UTC (rev 7432)
+++ trunk/XBMC/xbmc/GUIViewStateMusic.cpp	2006-12-26 08:34:53 UTC (rev 7433)
@@ -93,9 +93,9 @@
         SetSortMethod(SORT_METHOD_ARTIST);
       }
       
-      SetViewAsControl(DEFAULT_VIEW_LIST);
+      SetViewAsControl(g_stSettings.m_viewStateMusicNavArtists.m_viewMode);
 
-      SetSortOrder(SORT_ORDER_ASC);
+      SetSortOrder(g_stSettings.m_viewStateMusicNavArtists.m_sortOrder);
     }
     break;
   case NODE_TYPE_ALBUM_COMPILATIONS:
@@ -109,11 +109,11 @@
         AddSortMethod(SORT_METHOD_ARTIST_IGNORE_THE, 269, LABEL_MASKS("%F", "", "%B", "%A"));  // Filename, empty | Album, Artist
       else
         AddSortMethod(SORT_METHOD_ARTIST, 269, LABEL_MASKS("%F", "", "%B", "%A"));  // Filename, empty | Album, Artist
-      SetSortMethod(SORT_METHOD_ALBUM);
+      SetSortMethod(g_stSettings.m_viewStateMusicNavAlbums.m_sortMethod);
       
-      SetViewAsControl(DEFAULT_VIEW_LIST);
+      SetViewAsControl(g_stSettings.m_viewStateMusicNavAlbums.m_viewMode);
 
-      SetSortOrder(SORT_ORDER_ASC);
+      SetSortOrder(g_stSettings.m_viewStateMusicNavAlbums.m_sortOrder);
     }
     break;
   case NODE_TYPE_ALBUM_RECENTLY_ADDED:
@@ -121,7 +121,7 @@
       AddSortMethod(SORT_METHOD_NONE, 103, LABEL_MASKS("%F", "", "%B", "%A"));  // Filename, empty | Album, Artist
       SetSortMethod(SORT_METHOD_NONE);
       
-      SetViewAsControl(DEFAULT_VIEW_LIST);
+      SetViewAsControl(g_stSettings.m_viewStateMusicNavAlbums.m_viewMode);
 
       SetSortOrder(SORT_ORDER_NONE);
     }
@@ -131,7 +131,7 @@
       AddSortMethod(SORT_METHOD_NONE, 103, LABEL_MASKS(strTrackLeft, strTrackRight));  // Userdefined, Userdefined | empty, empty
       SetSortMethod(SORT_METHOD_NONE);
       
-      SetViewAsControl(DEFAULT_VIEW_LIST);
+      SetViewAsControl(g_stSettings.m_viewStateMusicNavSongs.m_viewMode);
 
       SetSortOrder(SORT_ORDER_NONE);
     }
@@ -141,7 +141,7 @@
       AddSortMethod(SORT_METHOD_NONE, 103, LABEL_MASKS("%F", "", "%B", "%A"));  // Filename, empty | Album, Artist
       SetSortMethod(SORT_METHOD_NONE);
       
-      SetViewAsControl(DEFAULT_VIEW_LIST);
+      SetViewAsControl(g_stSettings.m_viewStateMusicNavAlbums.m_viewMode);
 
       SetSortOrder(SORT_ORDER_NONE);
     }
@@ -151,7 +151,7 @@
       AddSortMethod(SORT_METHOD_NONE, 103, LABEL_MASKS(strTrackLeft, strTrackRight));  // Userdefined, Userdefined | empty, empty
       SetSortMethod(SORT_METHOD_NONE);
       
-      SetViewAsControl(DEFAULT_VIEW_LIST);
+      SetViewAsControl(g_stSettings.m_viewStateMusicNavAlbums.m_viewMode);
 
       SetSortOrder(SORT_ORDER_NONE);
     }
@@ -183,11 +183,11 @@
       else
         AddSortMethod(SORT_METHOD_ARTIST, 269, LABEL_MASKS("%A - %T", "%D"));  // Artist, Titel, Duration| empty, empty
       AddSortMethod(SORT_METHOD_DURATION, 267, LABEL_MASKS("%T - %A", "%D"));  // Titel, Artist, Duration| empty, empty
-      SetSortMethod(SORT_METHOD_TRACKNUM);
+      SetSortMethod(g_stSettings.m_viewStateMusicNavSongs.m_sortMethod);
       
-      SetViewAsControl(DEFAULT_VIEW_LIST);
+      SetViewAsControl(g_stSettings.m_viewStateMusicNavSongs.m_viewMode);
 
-      SetSortOrder(SORT_ORDER_ASC);
+      SetSortOrder(g_stSettings.m_viewStateMusicNavSongs.m_sortOrder);
     }
     break;
   case NODE_TYPE_SONG_TOP100:
@@ -195,7 +195,7 @@
       AddSortMethod(SORT_METHOD_NONE, 266, LABEL_MASKS(strTrackLeft, strTrackRight));  // Userdefined, Userdefined | empty, empty
       SetSortMethod(SORT_METHOD_NONE);
       
-      SetViewAsControl(DEFAULT_VIEW_LIST);
+      SetViewAsControl(g_stSettings.m_viewStateMusicNavSongs.m_viewMode);
 
       SetSortOrder(SORT_ORDER_NONE);
     }
@@ -207,7 +207,32 @@
 
 void CGUIViewStateMusicDatabase::SaveViewState()
 {
-  SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_NAV);
+  CMusicDatabaseDirectory dir; 	 
+	NODE_TYPE NodeType=dir.GetDirectoryChildType(m_items.m_strPath); 	 
+	
+	switch (NodeType) 	 
+	{ 	 
+	  case NODE_TYPE_ARTIST: 	 
+      SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_NAV, g_stSettings.m_viewStateMusicNavArtists);
+	    break;
+	  case NODE_TYPE_ALBUM_COMPILATIONS: 	 
+	  case NODE_TYPE_ALBUM: 	 
+	  case NODE_TYPE_ALBUM_RECENTLY_ADDED: 	 
+	  case NODE_TYPE_ALBUM_TOP100: 	 
+	  case NODE_TYPE_ALBUM_RECENTLY_PLAYED: 	 
+      SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_NAV, g_stSettings.m_viewStateMusicNavAlbums);
+	    break;
+	  case NODE_TYPE_ALBUM_RECENTLY_PLAYED_SONGS: 	 
+	  case NODE_TYPE_ALBUM_RECENTLY_ADDED_SONGS: 	 
+	  case NODE_TYPE_ALBUM_COMPILATIONS_SONGS: 	 
+	  case NODE_TYPE_SONG: 	 
+	  case NODE_TYPE_SONG_TOP100: 	 
+      SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_NAV, g_stSettings.m_viewStateMusicNavSongs);
+      break;
+    default:
+      SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_NAV);
+      break;
+	}
 }
 
 
@@ -231,24 +256,24 @@
   else
     AddSortMethod(SORT_METHOD_ARTIST, 269, LABEL_MASKS("%A - %T", "%D"));  // Artist, Titel, Duration| empty, empty
   AddSortMethod(SORT_METHOD_DURATION, 267, LABEL_MASKS("%T - %A", "%D"));  // Titel, Artist, Duration| empty, empty
-  SetSortMethod(SORT_METHOD_TRACKNUM);
+  SetSortMethod(g_stSettings.m_viewStateMusicNavSongs.m_sortMethod);
       
-  SetViewAsControl(DEFAULT_VIEW_LIST);
+  SetViewAsControl(g_stSettings.m_viewStateMusicNavSongs.m_viewMode);
 
-  SetSortOrder(SORT_ORDER_ASC);
+  SetSortOrder(g_stSettings.m_viewStateMusicNavSongs.m_sortOrder);
   LoadViewState(items.m_strPath, WINDOW_MUSIC_NAV);
 }
 
 void CGUIViewStateMusicSmartPlaylist::SaveViewState()
 {
-  SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_NAV);
+  SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_NAV, g_stSettings.m_viewStateMusicNavSongs);
 }
 
 CGUIViewStateMusicPlaylist::CGUIViewStateMusicPlaylist(const CFileItemList& items) : CGUIViewStateWindowMusic(items)
 {
   CStdString strTrackLeft=g_guiSettings.GetString("musicfiles.trackformat");
   CStdString strTrackRight=g_guiSettings.GetString("musicfiles.trackformatright");
-  // TODO: localize 2.0
+
   AddSortMethod(SORT_METHOD_PLAYLIST_ORDER, 20014, LABEL_MASKS(strTrackLeft, strTrackRight));
   AddSortMethod(SORT_METHOD_TRACKNUM, 266, LABEL_MASKS(strTrackLeft, strTrackRight));  // Userdefined, Userdefined| empty, empty
   if (g_guiSettings.GetBool("filelists.ignorethewhensorting"))
@@ -264,17 +289,17 @@
   else
     AddSortMethod(SORT_METHOD_ARTIST, 269, LABEL_MASKS("%A - %T", "%D"));  // Artist, Titel, Duration| empty, empty
   AddSortMethod(SORT_METHOD_DURATION, 267, LABEL_MASKS("%T - %A", "%D"));  // Titel, Artist, Duration| empty, empty
-  SetSortMethod(SORT_METHOD_LABEL);
+  SetSortMethod(g_stSettings.m_viewStateMusicFiles.m_sortMethod);
       
-  SetViewAsControl(DEFAULT_VIEW_LIST);
+  SetViewAsControl(g_stSettings.m_viewStateMusicFiles.m_viewMode);
 
-  SetSortOrder(SORT_ORDER_ASC);
-  LoadViewState(items.m_strPath, WINDOW_MUSIC_NAV);
+  SetSortOrder(g_stSettings.m_viewStateMusicFiles.m_sortOrder);
+  LoadViewState(items.m_strPath, WINDOW_MUSIC_FILES);
 }
 
 void CGUIViewStateMusicPlaylist::SaveViewState()
 {
-  SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_NAV);
+  SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_FILES, g_stSettings.m_viewStateMusicFiles);
 }
 
 
@@ -356,7 +381,7 @@
     AddSortMethod(SORT_METHOD_SIZE, 105, LABEL_MASKS(strTrackLeft, "%I", "%L", "%I"));  // Userdefined, Size | FolderName, Size
     AddSortMethod(SORT_METHOD_DATE, 104, LABEL_MASKS(strTrackLeft, "%J", "%L", "%J"));  // Userdefined, Date | FolderName, Date
     AddSortMethod(SORT_METHOD_FILE, 363, LABEL_MASKS(strTrackLeft, strTrackRight, "%L", ""));  // Userdefined, Userdefined | FolderName, empty
-    SetSortMethod(SORT_METHOD_LABEL);
+    SetSortMethod(g_stSettings.m_viewStateMusicFiles.m_sortMethod);
 
     if (g_guiSettings.GetBool("musicfiles.useautoswitching"))
     {
@@ -364,17 +389,17 @@
     }
     else
     {
-      SetViewAsControl(DEFAULT_VIEW_LIST);
+      SetViewAsControl(g_stSettings.m_viewStateMusicFiles.m_viewMode);
     }
 
-    SetSortOrder(SORT_ORDER_ASC);
+    SetSortOrder(g_stSettings.m_viewStateMusicFiles.m_sortOrder);
   }
   LoadViewState(items.m_strPath, WINDOW_MUSIC_FILES);
 }
 
 void CGUIViewStateWindowMusicSongs::SaveViewState()
 {
-  SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_FILES);
+  SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_FILES, g_stSettings.m_viewStateMusicFiles);
 }
 
 VECSHARES& CGUIViewStateWindowMusicSongs::GetShares()
@@ -401,7 +426,6 @@
 
 void CGUIViewStateWindowMusicPlaylist::SaveViewState()
 {
-  g_settings.Save();
 }
 
 int CGUIViewStateWindowMusicPlaylist::GetPlaylist()
@@ -443,8 +467,8 @@
     AddSortMethod(SORT_METHOD_VIDEO_RATING, 507, LABEL_MASKS("%K", "%A listeners", "%K", ""));  // Titel, Listeners | Titel, nothing
     AddSortMethod(SORT_METHOD_SIZE, 105, LABEL_MASKS("%K", "%B kbps", "%K", ""));  // Title, Bitrate | Title, nothing
 
-    SetSortMethod(SORT_METHOD_VIDEO_RATING);
-    SetSortOrder(SORT_ORDER_DESC);
+    SetSortMethod(g_stSettings.m_viewStateMusicShoutcast.m_sortMethod);
+    SetSortOrder(g_stSettings.m_viewStateMusicShoutcast.m_sortOrder);
   }
   else
   { /* genre list */
@@ -464,7 +488,7 @@
 
 void CGUIViewStateMusicShoutcast::SaveViewState()
 {
-  SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_FILES);
+  SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_FILES, g_stSettings.m_viewStateMusicShoutcast);
 }
 
 CGUIViewStateMusicLastFM::CGUIViewStateMusicLastFM(const CFileItemList& items) : CGUIViewStateWindowMusic(items)
@@ -475,8 +499,8 @@
   AddSortMethod(SORT_METHOD_LABEL, 103, LABEL_MASKS(strTrackLeft, strTrackRight, "%L", ""));  // Userdefined, Userdefined | FolderName, empty
   AddSortMethod(SORT_METHOD_SIZE, 507, LABEL_MASKS(strTrackLeft, "%I", "%L", "%I"));  // Userdefined, Size | FolderName, Size
 
-  SetSortMethod(SORT_METHOD_LABEL);
-  SetSortOrder(SORT_ORDER_ASC);
+  SetSortMethod(g_stSettings.m_viewStateMusicLastFM.m_sortMethod);
+  SetSortOrder(g_stSettings.m_viewStateMusicLastFM.m_sortOrder);
   
   SetViewAsControl(DEFAULT_VIEW_LIST);
   LoadViewState(items.m_strPath, WINDOW_MUSIC_FILES);
@@ -489,5 +513,5 @@
 
 void CGUIViewStateMusicLastFM::SaveViewState()
 {
-  SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_FILES);
+  SaveViewToDb(m_items.m_strPath, WINDOW_MUSIC_FILES, g_stSettings.m_viewStateMusicLastFM);
 }
\ No newline at end of file

Modified: trunk/XBMC/xbmc/Settings.cpp
===================================================================
--- trunk/XBMC/xbmc/Settings.cpp	2006-12-25 22:46:18 UTC (rev 7432)
+++ trunk/XBMC/xbmc/Settings.cpp	2006-12-26 08:34:53 UTC (rev 7433)
@@ -704,6 +704,15 @@
   CLog::Log(LOGDEBUG, "  %s: %f", tagName, fValue);
 }
 
+void CSettings::GetViewState(const TiXmlElement *pRootElement, const CStdString &strTagName, CViewState &viewState)
+{
+  const TiXmlElement* pNode = pRootElement->FirstChildElement(strTagName);
+  if (!pNode) return;
+  GetInteger(pNode, "viewmode", viewState.m_viewMode, DEFAULT_VIEW_LIST, DEFAULT_VIEW_LIST, DEFAULT_VIEW_MAX);
+  GetInteger(pNode, "sortmethod", (int&)viewState.m_sortMethod, SORT_METHOD_LABEL, SORT_METHOD_NONE, SORT_METHOD_MAX);
+  GetInteger(pNode, "sortorder", (int&)viewState.m_sortOrder, SORT_ORDER_ASC, SORT_ORDER_NONE, SORT_ORDER_DESC);
+}
+
 void CSettings::SetString(TiXmlNode* pRootNode, const CStdString& strTagName, const CStdString& strValue) const
 {
   CStdString strPersistedValue = strValue;
@@ -728,6 +737,18 @@
   SetString(pRootNode, strTagName, strValue);
 }
 
+void CSettings::SetViewState(TiXmlNode *pRootNode, const CStdString &strTagName, const CViewState &viewState) const
+{
+  TiXmlElement newElement(strTagName);
+  TiXmlNode *pNewNode = pRootNode->InsertEndChild(newElement);
+  if (pNewNode)
+  {
+    SetInteger(pNewNode, "viewmode", viewState.m_viewMode);
+    SetInteger(pNewNode, "sortmethod", (int)viewState.m_sortMethod);
+    SetInteger(pNewNode, "sortorder", (int)viewState.m_sortOrder);
+  }
+}
+
 void CSettings::SetFloat(TiXmlNode* pRootNode, const CStdString& strTagName, float fValue) const
 {
   CStdString strValue;
@@ -869,6 +890,12 @@
     {
       XMLUtils::GetBoolean(pChild, "isscanning", g_stSettings.m_bMyMusicIsScanning);
     }
+    GetViewState(pElement, "viewstatenavartists", g_stSettings.m_viewStateMusicNavArtists);
+    GetViewState(pElement, "viewstatenavalbums", g_stSettings.m_viewStateMusicNavAlbums);
+    GetViewState(pElement, "viewstatenavsongs", g_stSettings.m_viewStateMusicNavSongs);
+    GetViewState(pElement, "viewstatefiles", g_stSettings.m_viewStateMusicFiles);
+    GetViewState(pElement, "viewstateshoutcast", g_stSettings.m_viewStateMusicShoutcast);
+    GetViewState(pElement, "viewstatelastfm", g_stSettings.m_viewStateMusicLastFM);
     GetInteger(pElement, "startwindow", g_stSettings.m_iMyMusicStartWindow, WINDOW_MUSIC_FILES, WINDOW_MUSIC_FILES, WINDOW_MUSIC_NAV); //501; view songs
     XMLUtils::GetBoolean(pElement, "songinfoinvis", g_stSettings.m_bMyMusicSongInfoInVis);
     XMLUtils::GetBoolean(pElement, "songthumbinvis", g_stSettings.m_bMyMusicSongThumbInVis);
@@ -1454,6 +1481,12 @@
     if (!pChild) return false;
     SetBoolean(pChild, "isscanning", g_stSettings.m_bMyMusicIsScanning);
   }
+  SetViewState(pNode, "viewstatenavartists", g_stSettings.m_viewStateMusicNavArtists);
+  SetViewState(pNode, "viewstatenavalbums", g_stSettings.m_viewStateMusicNavAlbums);
+  SetViewState(pNode, "viewstatenavsongs", g_stSettings.m_viewStateMusicNavSongs);
+  SetViewState(pNode, "viewstatefiles", g_stSettings.m_viewStateMusicFiles);
+  SetViewState(pNode, "viewstateshoutcast", g_stSettings.m_viewStateMusicShoutcast);
+  SetViewState(pNode, "viewstatelastfm", g_stSettings.m_viewStateMusicLastFM);
 
   SetInteger(pNode, "startwindow", g_stSettings.m_iMyMusicStartWindow);
   SetBoolean(pNode, "songinfoinvis", g_stSettings.m_bMyMusicSongInfoInVis);

Modified: trunk/XBMC/xbmc/Settings.h
===================================================================
--- trunk/XBMC/xbmc/Settings.h	2006-12-25 22:46:18 UTC (rev 7432)
+++ trunk/XBMC/xbmc/Settings.h	2006-12-26 08:34:53 UTC (rev 7433)
@@ -57,6 +57,27 @@
 #define DEFAULT_VIEW_BIG_ICONS (VIEW_TYPE_BIG_ICON << 16)
 #define DEFAULT_VIEW_MAX (((VIEW_TYPE_MAX - 1) << 16) | 60)
 
+class CViewState
+{
+public:
+  CViewState(int viewMode, SORT_METHOD sortMethod, SORT_ORDER sortOrder)
+  {
+    m_viewMode = viewMode;
+    m_sortMethod = sortMethod;
+    m_sortOrder = sortOrder;
+  };
+  CViewState()
+  {
+    m_viewMode = 0;
+    m_sortMethod = SORT_METHOD_LABEL;
+    m_sortOrder = SORT_ORDER_ASC;
+  };
+
+  int m_viewMode;
+  SORT_METHOD m_sortMethod;
+  SORT_ORDER m_sortOrder;
+};
+
 /*!
 \ingroup windows
 \brief Represents a share.
@@ -296,6 +317,13 @@
     bool m_bMyMusicSongInfoInVis;
     bool m_bMyMusicSongThumbInVis;
 
+    CViewState m_viewStateMusicNavArtists;
+    CViewState m_viewStateMusicNavAlbums;
+    CViewState m_viewStateMusicNavSongs;
+    CViewState m_viewStateMusicFiles;
+    CViewState m_viewStateMusicShoutcast;
+    CViewState m_viewStateMusicLastFM;
+
     bool m_bMyMusicPlaylistRepeat;
     bool m_bMyMusicPlaylistShuffle;
     int m_iMyMusicStartWindow;
@@ -396,6 +424,8 @@
   void GetString(const TiXmlElement* pRootElement, const char *strTagName, char *szValue, const CStdString& strDefaultValue);
   bool GetShare(const CStdString &category, const TiXmlNode *bookmark, CShare &share);
   void GetShares(const TiXmlElement* pRootElement, const CStdString& strTagName, VECSHARES& items, CStdString& strDefault);
+  void GetViewState(const TiXmlElement* pRootElement, const CStdString& strTagName, CViewState &viewState);
+
   void ConvertHomeVar(CStdString& strText);
   // functions for writing xml files
   void SetString(TiXmlNode* pRootNode, const CStdString& strTagName, const CStdString& strValue) const;
@@ -403,6 +433,7 @@
   void SetFloat(TiXmlNode* pRootNode, const CStdString& strTagName, float fValue) const;
   void SetBoolean(TiXmlNode* pRootNode, const CStdString& strTagName, bool bValue) const;
   void SetHex(TiXmlNode* pRootNode, const CStdString& strTagName, DWORD dwHexValue) const;
+  void SetViewState(TiXmlNode* pRootNode, const CStdString& strTagName, const CViewState &viewState) const;
 
   bool LoadCalibration(const TiXmlElement* pElement, const CStdString& strSettingsFile);
   bool SaveCalibration(TiXmlNode* pRootNode) const;

Modified: trunk/XBMC/xbmc/ViewDatabase.h
===================================================================
--- trunk/XBMC/xbmc/ViewDatabase.h	2006-12-25 22:46:18 UTC (rev 7432)
+++ trunk/XBMC/xbmc/ViewDatabase.h	2006-12-26 08:34:53 UTC (rev 7433)
@@ -3,27 +3,6 @@
 
 #define VIEW_DATABASE_NAME "ViewModes.db"
 
-class CViewState
-{
-public:
-  CViewState(int viewMode, SORT_METHOD sortMethod, SORT_ORDER sortOrder)
-  {
-    m_viewMode = viewMode;
-    m_sortMethod = sortMethod;
-    m_sortOrder = sortOrder;
-  };
-  CViewState()
-  {
-    m_viewMode = 0;
-    m_sortMethod = SORT_METHOD_LABEL;
-    m_sortOrder = SORT_ORDER_ASC;
-  };
-
-  int m_viewMode;
-  SORT_METHOD m_sortMethod;
-  SORT_ORDER m_sortOrder;
-};
-
 class CViewDatabase : public CDatabase
 {
 public:


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

Revision: 7449
          http://svn.sourceforge.net/xbmc/?rev=7449&view=rev
Author:   spiff_
Date:     2006-12-29 06:14:17 -0800 (Fri, 29 Dec 2006)

Log Message:
-----------
fixed: nasty bug in the filemanager rar code that could lead to deletion of random files.

Modified Paths:
--------------
    trunk/XBMC/xbmc/FileSystem/RarManager.cpp
    trunk/XBMC/xbmc/FileSystem/RarManager.h
    trunk/XBMC/xbmc/GUIWindowFileManager.cpp

Modified: trunk/XBMC/xbmc/FileSystem/RarManager.cpp
===================================================================
--- trunk/XBMC/xbmc/FileSystem/RarManager.cpp	2006-12-28 10:58:51 UTC (rev 7448)
+++ trunk/XBMC/xbmc/FileSystem/RarManager.cpp	2006-12-29 14:14:17 UTC (rev 7449)
@@ -26,7 +26,9 @@
 /////////////////////////////////////////////////
 CRarManager::CRarManager()
 {
+  m_bWipe = true;
 }
+
 CRarManager::~CRarManager()
 {
 	ClearCache(true);
@@ -84,7 +86,10 @@
     ClearCache();
     if (CheckFreeSpace(strDir.Left(3)) < iSize)
     {
-      // wipe at will
+      // wipe at will - if allowed. fixes the evil file manager bug
+      if (!m_bWipe)
+        return false;
+
       CFileItemList items;
       CDirectory::GetDirectory(g_advancedSettings.m_cachePath,items);
       items.Sort(SORT_METHOD_SIZE, SORT_ORDER_DESC);

Modified: trunk/XBMC/xbmc/FileSystem/RarManager.h
===================================================================
--- trunk/XBMC/xbmc/FileSystem/RarManager.h	2006-12-28 10:58:51 UTC (rev 7448)
+++ trunk/XBMC/xbmc/FileSystem/RarManager.h	2006-12-29 14:14:17 UTC (rev 7449)
@@ -22,20 +22,20 @@
 
 class CFileInfo{
 public:
-	CFileInfo();
-	~CFileInfo();
-	CStdString m_strCachedPath;
+  CFileInfo();
+  ~CFileInfo();
+  CStdString m_strCachedPath;
   CStdString m_strPathInRar;
-	bool	m_bAutoDel;
+  bool	m_bAutoDel;
   int m_iUsed;
   __int64 m_iOffset;
-  
+
   bool m_bIsCanceled()
   {
     if (watch.IsRunning())
       if (watch.GetElapsedSeconds() < 3)
         return true;
-    
+
     watch.Stop();
     return false;
   }
@@ -46,25 +46,28 @@
 class CRarManager
 {
 public:
-	CRarManager();
-	~CRarManager();
-	bool CacheRarredFile(CStdString& strPathInCache, const CStdString& strRarPath, const CStdString& strPathInRar, BYTE bOptions = EXFILE_AUTODELETE, const CStdString& strDir =RAR_DEFAULT_CACHE, const __int64 iSize=-1);
-	bool GetPathInCache(CStdString& strPathInCache, const CStdString& strRarPath, const CStdString& strPathInRar = "");
-	bool HasMultipleEntries(const CStdString& strPath);
-    bool GetFilesInRar(CFileItemList& vecpItems, const CStdString& strRarPath, bool bMask=true, const CStdString& strPathInRar="");
-	CFileInfo* GetFileInRar(const CStdString& strRarPath, const CStdString& strPathInRar);
+  CRarManager();
+  ~CRarManager();
+  bool CacheRarredFile(CStdString& strPathInCache, const CStdString& strRarPath, const CStdString& strPathInRar, BYTE bOptions = EXFILE_AUTODELETE, const CStdString& strDir =RAR_DEFAULT_CACHE, const __int64 iSize=-1);
+  bool GetPathInCache(CStdString& strPathInCache, const CStdString& strRarPath, const CStdString& strPathInRar = "");
+  bool HasMultipleEntries(const CStdString& strPath);
+  bool GetFilesInRar(CFileItemList& vecpItems, const CStdString& strRarPath, bool bMask=true, const CStdString& strPathInRar="");
+  CFileInfo* GetFileInRar(const CStdString& strRarPath, const CStdString& strPathInRar);
   bool IsFileInRar(bool& bResult, const CStdString& strRarPath, const CStdString& strPathInRar);
-	void ClearCache(bool force=false);
+  void ClearCache(bool force=false);
   void ClearCachedFile(const CStdString& strRarPath, const CStdString& strPathInRar);
   void ExtractArchive(const CStdString& strArchive, const CStdString& strPath);
+  void SetWipeAtWill(bool bWipe) { m_bWipe = bWipe; }
 protected:
-  
+
   bool ListArchive(const CStdString& strRarPath, ArchiveList_struct* &pArchiveList);
   std::map<CStdString, std::pair<ArchiveList_struct*,std::vector<CFileInfo> > > m_ExFiles;
-	CCriticalSection m_CritSection;
+  CCriticalSection m_CritSection;
 
   __int64 CheckFreeSpace(const CStdString& strDrive);
+
+  bool m_bWipe;
 };
 
-  extern CRarManager g_RarManager;
+extern CRarManager g_RarManager;
 #endif
\ No newline at end of file

Modified: trunk/XBMC/xbmc/GUIWindowFileManager.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowFileManager.cpp	2006-12-28 10:58:51 UTC (rev 7448)
+++ trunk/XBMC/xbmc/GUIWindowFileManager.cpp	2006-12-29 14:14:17 UTC (rev 7449)
@@ -644,6 +644,7 @@
 
       if (url.GetProtocol() == "rar")
       {
+        g_RarManager.SetWipeAtWill(false);
         CStdString strOriginalCachePath = g_advancedSettings.m_cachePath;
         CStdString strDestPath;
         CUtil::GetDirectory(strDestFile,strDestPath);
@@ -651,6 +652,7 @@
         CLog::Log(LOGDEBUG, "CacheRarredFile: dest=%s, file=%s",strDestPath.c_str(), url.GetFileName().c_str());
         bool bResult = g_RarManager.CacheRarredFile(strDestPath,url.GetHostName(),url.GetFileName(),0,strDestPath,1);
         g_advancedSettings.m_cachePath = strOriginalCachePath;
+        g_RarManager.SetWipeAtWill(true);
         return bResult;
       }
       else


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

Revision: 7470
          http://svn.sourceforge.net/xbmc/?rev=7470&view=rev
Author:   jmarshallnz
Date:     2007-01-03 00:25:53 -0800 (Wed, 03 Jan 2007)

Log Message:
-----------
fixed: Couldn't cancel query info for all albums easily.

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowMusicBase.cpp
    trunk/XBMC/xbmc/utils/MusicInfoScraper.cpp

Modified: trunk/XBMC/xbmc/GUIWindowMusicBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicBase.cpp	2007-01-02 00:17:57 UTC (rev 7469)
+++ trunk/XBMC/xbmc/GUIWindowMusicBase.cpp	2007-01-03 08:25:53 UTC (rev 7470)
@@ -1042,7 +1042,7 @@
 
     while (!scraper.Completed())
     {
-      if (m_dlgProgress && bShowInfo)
+      if (m_dlgProgress && m_dlgProgress->IsRunning())
       {
         if (m_dlgProgress->IsCanceled())
           scraper.Cancel();

Modified: trunk/XBMC/xbmc/utils/MusicInfoScraper.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/MusicInfoScraper.cpp	2007-01-02 00:17:57 UTC (rev 7469)
+++ trunk/XBMC/xbmc/utils/MusicInfoScraper.cpp	2007-01-03 08:25:53 UTC (rev 7470)
@@ -192,7 +192,7 @@
 
 bool CMusicInfoScraper::Successfull()
 {
-  return m_bSuccessfull;
+  return !m_bCanceled && m_bSuccessfull;
 }
 
 void CMusicInfoScraper::Cancel()


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

Revision: 7472
          http://svn.sourceforge.net/xbmc/?rev=7472&view=rev
Author:   kraqh3d
Date:     2007-01-03 15:51:01 -0800 (Wed, 03 Jan 2007)

Log Message:
-----------
fixed: newly scanned items not showing up in the library view after scanning due to cached info.

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIDialogMusicScan.cpp
    trunk/XBMC/xbmc/GUIWindowMusicSongs.cpp

Modified: trunk/XBMC/xbmc/GUIDialogMusicScan.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogMusicScan.cpp	2007-01-03 23:46:49 UTC (rev 7471)
+++ trunk/XBMC/xbmc/GUIDialogMusicScan.cpp	2007-01-03 23:51:01 UTC (rev 7472)
@@ -2,6 +2,7 @@
 #include "GUIDialogMusicScan.h"
 #include "GUIProgressControl.h"
 #include "application.h"
+#include "util.h"
 
 
 #define CONTROL_LABELSTATUS     401
@@ -108,6 +109,9 @@
   CLog::Log(LOGINFO,"Music scan was stopped or finished ... restoring FindRemoteThumbs");
   g_application.RestoreMusicScanSettings();
 
+  // clear cache after finished
+  CUtil::DeleteDatabaseDirectoryCache();
+
   Close();
 }
 

Modified: trunk/XBMC/xbmc/GUIWindowMusicSongs.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicSongs.cpp	2007-01-03 23:46:49 UTC (rev 7471)
+++ trunk/XBMC/xbmc/GUIWindowMusicSongs.cpp	2007-01-03 23:51:01 UTC (rev 7472)
@@ -219,7 +219,8 @@
       return;
   }
 
-  CUtil::DeleteDatabaseDirectoryCache();
+  // the scanner clears the cache when complete
+  //CUtil::DeleteDatabaseDirectoryCache();
 
   // Start background loader
   int iControl=GetFocusedControlID();


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

Revision: 7474
          http://svn.sourceforge.net/xbmc/?rev=7474&view=rev
Author:   elupus
Date:     2007-01-03 18:53:09 -0800 (Wed, 03 Jan 2007)

Log Message:
-----------
updated: platinum upnp libs
added: better support for contenttype based decision of what is audio and what is video.
added: upnp client now properly autoselects videos/music and pictures view against latest windows media player.

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp
    trunk/XBMC/xbmc/FileItem.cpp
    trunk/XBMC/xbmc/FileSystem/UPnPDirectory.cpp
    trunk/XBMC/xbmc/lib/libUPnP/Neptune.h
    trunk/XBMC/xbmc/lib/libUPnP/NptBufferedStreams.h
    trunk/XBMC/xbmc/lib/libUPnP/NptConfig.h
    trunk/XBMC/xbmc/lib/libUPnP/NptDataBuffer.h
    trunk/XBMC/xbmc/lib/libUPnP/NptDirectory.h
    trunk/XBMC/xbmc/lib/libUPnP/NptHttp.h
    trunk/XBMC/xbmc/lib/libUPnP/NptStreams.h
    trunk/XBMC/xbmc/lib/libUPnP/NptTypes.h
    trunk/XBMC/xbmc/lib/libUPnP/NptUri.h
    trunk/XBMC/xbmc/lib/libUPnP/NptUtils.h
    trunk/XBMC/xbmc/lib/libUPnP/NptVersion.h
    trunk/XBMC/xbmc/lib/libUPnP/Platinum.h
    trunk/XBMC/xbmc/lib/libUPnP/PltArgument.h
    trunk/XBMC/xbmc/lib/libUPnP/PltCtrlPoint.h
    trunk/XBMC/xbmc/lib/libUPnP/PltDeviceData.h
    trunk/XBMC/xbmc/lib/libUPnP/PltDeviceHost.h
    trunk/XBMC/xbmc/lib/libUPnP/PltHttp.h
    trunk/XBMC/xbmc/lib/libUPnP/PltHttpClientTask.h
    trunk/XBMC/xbmc/lib/libUPnP/PltLog.h
    trunk/XBMC/xbmc/lib/libUPnP/PltMediaBrowser.h
    trunk/XBMC/xbmc/lib/libUPnP/PltMediaBrowserListener.h
    trunk/XBMC/xbmc/lib/libUPnP/PltMediaItem.h
    trunk/XBMC/xbmc/lib/libUPnP/PltMediaServer.h
    trunk/XBMC/xbmc/lib/libUPnP/PltSsdpListener.h
    trunk/XBMC/xbmc/lib/libUPnP/PltSyncMediaBrowser.h
    trunk/XBMC/xbmc/lib/libUPnP/PltTaskManager.h
    trunk/XBMC/xbmc/lib/libUPnP/PltThreadTask.h
    trunk/XBMC/xbmc/lib/libUPnP/PltUPnP.h

Added Paths:
-----------
    trunk/XBMC/xbmc/lib/libUPnP/Neptune.lib
    trunk/XBMC/xbmc/lib/libUPnP/Neptuned.lib
    trunk/XBMC/xbmc/lib/libUPnP/Platinum.lib
    trunk/XBMC/xbmc/lib/libUPnP/Platinumd.lib
    trunk/XBMC/xbmc/lib/libUPnP/PltCtrlPointTask.h
    trunk/XBMC/xbmc/lib/libUPnP/PltDatagramStream.h
    trunk/XBMC/xbmc/lib/libUPnP/PltDidl.h
    trunk/XBMC/xbmc/lib/libUPnP/PltDownloader.h
    trunk/XBMC/xbmc/lib/libUPnP/PltFileMediaServer.h
    trunk/XBMC/xbmc/lib/libUPnP/PltHttpServer.h
    trunk/XBMC/xbmc/lib/libUPnP/PltHttpServerTask.h
    trunk/XBMC/xbmc/lib/libUPnP/PltLeaks.h
    trunk/XBMC/xbmc/lib/libUPnP/PltMediaController.h
    trunk/XBMC/xbmc/lib/libUPnP/PltMediaControllerListener.h
    trunk/XBMC/xbmc/lib/libUPnP/PltMediaPlaylist.h
    trunk/XBMC/xbmc/lib/libUPnP/PltMediaRenderer.h
    trunk/XBMC/xbmc/lib/libUPnP/PltMediaServer.lib
    trunk/XBMC/xbmc/lib/libUPnP/PltMediaServerd.lib

Removed Paths:
-------------
    trunk/XBMC/xbmc/lib/libUPnP/libPlatinum.lib
    trunk/XBMC/xbmc/lib/libUPnP/libPlatinumd.lib

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/Application.cpp	2007-01-04 02:53:09 UTC (rev 7474)
@@ -156,7 +156,9 @@
   #pragma comment (lib,"xbmc/lib/libRTV/libRTVd.lib")    // SECTIONNAME=LIBRTV
  #endif
  #ifdef HAS_UPNP
-  #pragma comment (lib,"xbmc/lib/libUPnP/libPlatinumd.lib")
+  #pragma comment (lib,"xbmc/lib/libUPnP/Neptuned.lib")
+  #pragma comment (lib,"xbmc/lib/libUPnP/Platinumd.lib")
+  #pragma comment (lib,"xbmc/lib/libUPnP/PltMediaServerd.lib")
  #endif
  #ifdef _XBOX
   #pragma comment (lib,"xbmc/lib/unrarXlib/unrarxlibd.lib") 
@@ -186,7 +188,9 @@
   #pragma comment (lib,"xbmc/lib/libRTV/libRTV.lib")
  #endif
  #ifdef HAS_UPNP
-  #pragma comment (lib,"xbmc/lib/libUPnP/libPlatinum.lib")
+  #pragma comment (lib,"xbmc/lib/libUPnP/Neptune.lib")
+  #pragma comment (lib,"xbmc/lib/libUPnP/Platinum.lib")
+  #pragma comment (lib,"xbmc/lib/libUPnP/PltMediaServer.lib")  
  #endif
  #ifdef _XBOX
   #pragma comment (lib,"xbmc/lib/unrarXlib/unrarxlib.lib") 

Modified: trunk/XBMC/xbmc/FileItem.cpp
===================================================================
--- trunk/XBMC/xbmc/FileItem.cpp	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/FileItem.cpp	2007-01-04 02:53:09 UTC (rev 7474)
@@ -247,28 +247,60 @@
 
 bool CFileItem::IsVideo() const
 {
-  CStdString strExtension;
-  CUtil::GetExtension(m_strPath, strExtension);
-  if (strExtension.size() < 2) return false;
-  strExtension.ToLower();
-  if (g_stSettings.m_videoExtensions.Find(strExtension) != -1)
+  /* check preset content type */
+  if( m_contenttype.Left(7).Equals("video/") )
     return true;
 
+  CStdString extension;
+  if( m_contenttype.Left(12).Equals("application/") )
+  { /* check for some standard types */
+    extension = m_contenttype.Mid(12);
+    if( extension.Equals("ogg")
+     || extension.Equals("mp4")
+     || extension.Equals("mxf") )
+     return true;
+  }
+
+  CUtil::GetExtension(m_strPath, extension);
+
+  if (extension.IsEmpty())
+    return false;
+
+  extension.ToLower();
+
+  if (g_stSettings.m_videoExtensions.Find(extension) != -1)
+    return true;
+
   return false;
 }
 
 bool CFileItem::IsAudio() const
 {
-  if (strstr(m_strPath.c_str(), ".cdda") ) return true;
-  if (IsShoutCast() ) return true;
-  if (strstr(m_strPath.c_str(), "lastfm:") ) return true;
+  if (IsCDDA()) return true;
+  if (IsShoutCast()) return true;
+  if (IsLastFM()) return true;
+  
+  /* check preset content type */
+  if( m_contenttype.Left(7).Equals("audio/") )
+    return true;
 
-  CStdString strExtension;
-  CUtil::GetExtension(m_strPath, strExtension);
-  if (strExtension.size() < 2) return false;
-  strExtension.ToLower();
+  CStdString extension;
+  if( m_contenttype.Left(12).Equals("application/") )
+  { /* check for some standard types */
+    extension = m_contenttype.Mid(12);
+    if( extension.Equals("ogg")
+     || extension.Equals("mp4")
+     || extension.Equals("mxf") )
+     return true;
+  }
 
-  if (g_stSettings.m_musicExtensions.Find(strExtension) != -1)
+  CUtil::GetExtension(m_strPath, extension);
+
+  if (extension.IsEmpty())
+    return false;
+
+  extension.ToLower();
+  if (g_stSettings.m_musicExtensions.Find(extension) != -1)
     return true;
 
   return false;
@@ -276,15 +308,21 @@
 
 bool CFileItem::IsPicture() const
 {
-  CStdString strExtension;
-  CUtil::GetExtension(m_strPath, strExtension);
-  if (strExtension.size() < 2) return false;
-  strExtension.ToLower();
+  if( m_contenttype.Left(7).Equals("image/") )
+    return true;
 
-  if (g_stSettings.m_pictureExtensions.Find(strExtension) != -1)
+  CStdString extension;
+  CUtil::GetExtension(m_strPath, extension);    
+
+  if (extension.IsEmpty())
+    return false;
+
+  extension.ToLower();
+  if (g_stSettings.m_pictureExtensions.Find(extension) != -1)
     return true;
 
-  if (strExtension == ".tbn") return true;
+  if (extension == ".tbn") 
+    return true;
 
   return false;
 }
@@ -895,7 +933,8 @@
     if( m_bIsFolder )
       m_ref = "x-directory/normal";
     else if( m_strPath.Left(8).Equals("shout://") 
-     || m_strPath.Left(7).Equals("http://"))
+          || m_strPath.Left(7).Equals("http://")
+          || m_strPath.Left(7).Equals("upnp://"))
     {
       CURL url(m_strPath);
       url.SetProtocol("http");
@@ -1886,6 +1925,7 @@
   if (IsMusicDb()) return "";
   CURL url(m_strPath);
   if (url.GetProtocol() == "rar" || url.GetProtocol() == "zip") return "";
+  if (url.GetProtocol() == "upnp") return "";
 
   // we first check for <filename>.tbn or <foldername>.tbn
   CStdString fileThumb(GetTBNFile());
@@ -2004,6 +2044,7 @@
   if (IsParentFolder()) return "";
   CURL url(m_strPath);
   if (url.GetProtocol() == "rar" || url.GetProtocol() == "zip") return "";
+  if (url.GetProtocol() == "upnp") return "";
 
   // 1. check <filename>.tbn or <foldername>.tbn
   CStdString fileThumb;

Modified: trunk/XBMC/xbmc/FileSystem/UPnPDirectory.cpp
===================================================================
--- trunk/XBMC/xbmc/FileSystem/UPnPDirectory.cpp	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/FileSystem/UPnPDirectory.cpp	2007-01-04 02:53:09 UTC (rev 7474)
@@ -175,28 +175,42 @@
         // issue a browse request with object id, if id is empty use root id = 0 
         NPT_String root_id = object_id.IsEmpty()?"0":object_id;
 
+        // just a guess as to what types of files we want */
+        bool video = true;
+        bool audio = true;
+        bool image = true;
+        if( !m_strFileMask.IsEmpty() )
+        {
+          video = m_strFileMask.Find(".wmv") >= 0;
+          audio = m_strFileMask.Find(".wma") >= 0;
+          image = m_strFileMask.Find(".jpg") >= 0;
+        }
+
         // special case for Windows Media Connect
         // Since we know it is WMC, we can target which folder we want based on directory mask
-        if (root_id == "0" && (*device)->GetFriendlyName().Find("Windows Media Connect", 0, true) >= 0) {
+        if (root_id == "0" 
+         && ( (*device)->GetFriendlyName().Find("Windows Media Connect", 0, true) >= 0
+           || (*device)->m_ModelName == "Windows Media Player Sharing")) {
+
             // look for a specific type to differentiate which folder we want
-            if (m_strFileMask.Find(".wma") >= 0) {
+            if (audio && !video && !image) {
                 // music
                 root_id = "1";
-            } else if (m_strFileMask.Find(".wmv") >= 0) {
+            } else if (!audio && video && !image) {
                 // video
                 root_id = "2";
-            } else if (m_strFileMask.Find(".jpg") >= 0) {
+            } else if (!audio && !video && image) {
                 // pictures
                 root_id = "3";
             }
         }
 
-        PLT_MediaItemListReference list;
+        PLT_MediaObjectListReference list;
         // if error, the list could be partial and that's ok
         // we still want to process it
         upnp->m_MediaBrowser->Browse(*device, root_id, list);
 
-        NPT_List<PLT_MediaItem*>::Iterator entry = list->GetFirstItem();
+        NPT_List<PLT_MediaObject*>::Iterator entry = list->GetFirstItem();
         while (entry) {
             CFileItem *pItem = new CFileItem((const char*)(*entry)->m_Title);
             pItem->m_bIsFolder = (*entry)->IsContainer();
@@ -205,9 +219,33 @@
             if (pItem->m_bIsFolder) {
                 pItem->m_strPath = (const char*) NPT_String("upnp://") + uuid + "/" + (*entry)->m_ObjectID;
                 if (!CUtil::HasSlashAtEnd(pItem->m_strPath)) pItem->m_strPath += '/';
+
             } else {
                 if ((*entry)->m_Resources.GetItemCount()) {
-                    // if http protocol, override url with upnp so that it triggers the use of PAPLAYER instead of MPLAYER
+                  
+                    // look for content type in protocol info
+                    if ((*entry)->m_Resources[0].m_ProtocolInfo.GetLength()) {
+                        char proto[1024];
+                        char dummy1[1024];
+                        char ct[1204];
+                        char dummy2[1024];
+                        int fields = sscanf((*entry)->m_Resources[0].m_ProtocolInfo, "%[^:]:%[^:]:%[^:]:%[^:]", proto, dummy1, ct, dummy2);
+                        if (fields == 4) {
+                            // for now always allow anything else as we can't be sure
+                            if ((!video && strstr(ct, "video/") == ct)
+                             || (!audio && strstr(ct, "audio/") == ct)
+                             || (!image && strstr(ct, "image/") == ct))
+                            {
+                                delete pItem;
+                                ++entry;
+                                continue;
+                            }
+                            pItem->SetContentType(ct);
+                        }
+                    }
+                  
+                  
+                  // if http protocol, override url with upnp so that it triggers the use of PAPLAYER instead of MPLAYER
                     // somehow MPLAYER tries to http stream the wma even though the server doesn't support it.
                     if ((*entry)->m_Resources[0].m_Uri.Left(4).Compare("http", true) == 0) {
                         pItem->m_strPath = (const char*) NPT_String("upnp") + (*entry)->m_Resources[0].m_Uri.SubString(4);
@@ -219,32 +257,34 @@
                         pItem->m_dwSize  = (*entry)->m_Resources[0].m_Size;
                     }
                     pItem->m_musicInfoTag.SetDuration((*entry)->m_Resources[0].m_Duration);
-                    pItem->m_musicInfoTag.SetGenre((const char*) (*entry)->m_Genre);
-                    pItem->m_musicInfoTag.SetAlbum((const char*) (*entry)->m_Album);
+                    pItem->m_musicInfoTag.SetGenre((const char*) (*entry)->m_Affiliation.genre);
+                    pItem->m_musicInfoTag.SetAlbum((const char*) (*entry)->m_Affiliation.album);
                     
                     // some servers (like WMC) use upnp:artist instead of dc:creator
                     if ((*entry)->m_Creator.GetLength() == 0) {
-                        pItem->m_musicInfoTag.SetArtist((const char*) (*entry)->m_Artist);
+                        pItem->m_musicInfoTag.SetArtist((const char*) (*entry)->m_People.artist);
                     } else {
                         pItem->m_musicInfoTag.SetArtist((const char*) (*entry)->m_Creator);
                     }
-                    pItem->m_musicInfoTag.SetTitle((const char*) (*entry)->m_Title);
+                    pItem->m_musicInfoTag.SetTitle((const char*) (*entry)->m_Title);                    
+                    pItem->m_musicInfoTag.SetLoaded();
 
-                    // look for content type in protocol info
-                    if ((*entry)->m_Resources[0].m_ProtocolInfo.GetLength()) {
-                        char proto[1024];
-                        char dummy1[1024];
-                        char ct[1204];
-                        char dummy2[1024];
-                        int fields = sscanf((*entry)->m_Resources[0].m_ProtocolInfo, "%s:%s:%s:%s", proto, dummy1, ct, dummy2);
-                        if (fields == 4) {
-                            pItem->SetContentType(ct);
-                        }
+                    //TODO, current thumbnail and icon of CFileItem is expected to be a local
+                    //      image file in the normal thumbnail directories, we have no way to
+                    //      specify an external filename on the filelayer
+                    //if((*entry)->m_ExtraInfo.album_art_uri.GetLength())
+                    //  pItem->SetThumbnailImage((const char*) (*entry)->m_ExtraInfo.album_art_uri);
+                    //else
+                    //  pItem->SetThumbnailImage((const char*) (*entry)->m_Description.icon_uri);
+
+                    if( (*entry)->m_Description.date.GetLength() )
+                    {
+                      SYSTEMTIME time = {};
+                      int count = sscanf((*entry)->m_Description.date, "%hu-%hu-%huT%hu:%hu:%hu",
+                                          &time.wYear, &time.wMonth, &time.wDay, &time.wHour, &time.wMinute, &time.wSecond);
+                      pItem->m_dateTime = time;
                     }
                     
-                    pItem->m_musicInfoTag.SetLoaded();
-
-                    //TODO: figure out howto set the album art
                 }
             }
 

Modified: trunk/XBMC/xbmc/lib/libUPnP/Neptune.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/Neptune.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/Neptune.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -18,6 +18,7 @@
 /*----------------------------------------------------------------------
 |   includes
 +---------------------------------------------------------------------*/
+#include "NptConfig.h"
 #include "NptCommon.h"
 #include "NptResults.h"
 #include "NptTypes.h"
@@ -49,5 +50,4 @@
 #include "NptBase64.h"
 #include "NptVersion.h"
 
-
 #endif // _NEPTUNE_H_

Added: trunk/XBMC/xbmc/lib/libUPnP/Neptune.lib
===================================================================
(Binary files differ)


Property changes on: trunk/XBMC/xbmc/lib/libUPnP/Neptune.lib
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/XBMC/xbmc/lib/libUPnP/Neptuned.lib
===================================================================
(Binary files differ)


Property changes on: trunk/XBMC/xbmc/lib/libUPnP/Neptuned.lib
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/XBMC/xbmc/lib/libUPnP/NptBufferedStreams.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/NptBufferedStreams.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/NptBufferedStreams.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -71,4 +71,29 @@
 
 typedef NPT_Reference<NPT_BufferedInputStream> NPT_BufferedInputStreamReference;
 
+/*----------------------------------------------------------------------
+|   NPT_StringOutputStream
++---------------------------------------------------------------------*/
+class NPT_StringOutputStream : public NPT_OutputStream
+{
+public:
+    // methods
+    NPT_StringOutputStream(NPT_Size size = 4096);
+    NPT_StringOutputStream(NPT_String* data);
+    virtual ~NPT_StringOutputStream() ;
+
+    const NPT_String* GetData() const { return m_Data; }
+
+    // NPT_OutputStream methods
+    NPT_Result Write(const void* buffer, NPT_Size bytes_to_write, NPT_Size* bytes_written = NULL);
+    NPT_Result Flush();
+
+    NPT_Result Seek(NPT_Position offset)  { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
+    NPT_Result Tell(NPT_Position& offset) { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
+
+protected:
+    NPT_String* m_Data;
+    bool        m_Local;
+};
+
 #endif // _NPT_BUFFERED_STREAMS_H_

Modified: trunk/XBMC/xbmc/lib/libUPnP/NptConfig.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/NptConfig.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/NptConfig.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -116,14 +116,27 @@
 typedef __w64 long NPT_PointerLong;
 #define NPT_POINTER_TO_LONG(_p) ((long)(NPT_PointerLong) (_p) )
 #define NPT_CONFIG_HAVE_FOPEN_S
+#define NPT_vsnprintf(s,c,f,a)  _vsnprintf_s(s,c,_TRUNCATE,f,a)
+#define NPT_snprintf(s,c,f,...) _snprintf_s(s,c,_TRUNCATE,f,__VA_ARGS__)
+#define NPT_strncpy(d,s,c)       strncpy_s(d,c,s,_TRUNCATE)
+#else
+#define NPT_vsnprintf  _vsnprintf
+#define NPT_snprintf   _snprintf
 #endif
 #if defined(_DEBUG)
 #define _CRTDBG_MAP_ALLOC
 #endif
 #endif
 
+/* Windows CE */
+#if defined(UNDER_CE)
+#if defined(NPT_CONFIG_HAVE_FOPEN_S)
+#undef NPT_CONFIG_HAVE_FOPEN_S
+#endif
+#endif
+
 /* Symbian */
-#if defined(__SYMBIAN32__)
+#if defined(__symbian__)
 #undef NPT_CONFIG_HAVE_NEW_H
 #include "e32std.h"
 #define explicit

Modified: trunk/XBMC/xbmc/lib/libUPnP/NptDataBuffer.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/NptDataBuffer.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/NptDataBuffer.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -25,8 +25,7 @@
     // constructors & destructor
     NPT_DataBuffer();              // size unknown until first set 
     NPT_DataBuffer(NPT_Size size); // initial size specified
-    NPT_DataBuffer(const void* data, NPT_Size size); // initial data and size specified
-    NPT_DataBuffer(void* data, NPT_Size size, bool copy = true); // initial data and size specified
+    NPT_DataBuffer(const void* data, NPT_Size size, bool copy = true); // initial data and size specified
     NPT_DataBuffer(const NPT_DataBuffer& other);
     virtual ~NPT_DataBuffer();
 

Modified: trunk/XBMC/xbmc/lib/libUPnP/NptDirectory.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/NptDirectory.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/NptDirectory.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -46,7 +46,7 @@
 };
 
 /*----------------------------------------------------------------------
-|       NPT_Directory
+|       NPT_DirectoryEntry
 +---------------------------------------------------------------------*/
 class NPT_DirectoryEntry : public NPT_DirectoryEntryInterface
 {

Modified: trunk/XBMC/xbmc/lib/libUPnP/NptHttp.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/NptHttp.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/NptHttp.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -17,6 +17,8 @@
 #include "NptTypes.h"
 #include "NptList.h"
 #include "NptBufferedStreams.h"
+#include "NptSockets.h"
+#include "NptMap.h"
 
 /*----------------------------------------------------------------------
 |   constants
@@ -92,8 +94,9 @@
     NPT_List<Field>& GetFields() { return m_Fields; }
 
     // methods
-    NPT_Result AddField(const char* name, const char* value);
-    NPT_String ToString();
+    NPT_Result  AddField(const char* name, const char* value);
+    const char* GetField(const char* name);
+    NPT_String  ToString();
 
 private:
     // members
@@ -107,7 +110,7 @@
 public:
     // constructors and destructor
     NPT_HttpUrl();
-    NPT_HttpUrl(const char* url);
+    NPT_HttpUrl(const char* url, bool ignore_scheme = false);
     NPT_HttpUrl(const char* host, 
                 NPT_UInt16  port, 
                 const char* path,
@@ -121,12 +124,16 @@
     const NPT_String& GetQuery() const    { return m_Query;    }
     const NPT_String& GetFragment() const { return m_Fragment; }
     bool              IsValid() const;
-    NPT_Result        SetHost(const char*     host);
-    NPT_Result        SetPath(const char*     path);
-    NPT_Result        SetQuery(const char*    query);
+    bool              HasQuery()    const { return m_HasQuery;    } 
+    bool              HasFragment() const { return m_HasFragment; }
+    NPT_Result        SetHost(const char*  host);
+    NPT_Result        SetPort(NPT_UInt16 port);
+    NPT_Result        SetPath(const char*  path);
+    NPT_Result        SetPathPlus(const char* path_plus);
+    NPT_Result        SetQuery(const char* query);
     NPT_Result        SetFragment(const char* fragment);
     NPT_String        ToRequestString(bool with_fragment = false) const;
-    NPT_String        ToString(bool with_fragment = false) const;
+    NPT_String        ToString(bool with_fragment = true) const;
 
 private:
     // members
@@ -196,6 +203,9 @@
     // methods
     NPT_Result SetInputStream(const NPT_InputStreamReference& stream,
                               bool update_content_length = false);
+    NPT_Result SetInputStream(const void* data, NPT_Size size);
+    NPT_Result SetInputStream(const NPT_String& string);
+    NPT_Result SetInputStream(const char* string);
     NPT_Result GetInputStream(NPT_InputStreamReference& stream);
     NPT_Result Load(NPT_DataBuffer& buffer);
     NPT_Result SetHeaders(const NPT_HttpHeaders& headers);
@@ -235,8 +245,7 @@
     NPT_HttpEntity* GetEntity() {
         return m_Entity;
     }
-    virtual NPT_Result ParseHeaders(NPT_BufferedInputStream& stream,
-                                    NPT_Timeout              timeout = NPT_TIMEOUT_INFINITE);
+    virtual NPT_Result ParseHeaders(NPT_BufferedInputStream& stream);
 
 protected:
     // constructors
@@ -255,8 +264,8 @@
 public:
     // class methods
     static NPT_Result Parse(NPT_BufferedInputStream& stream, 
-                            NPT_HttpRequest*&        request,
-                            NPT_Timeout              timeout = NPT_TIMEOUT_INFINITE);
+                            const NPT_SocketAddress* endpoint,
+                            NPT_HttpRequest*&        request);
 
     // constructors and destructor
     NPT_HttpRequest(const NPT_HttpUrl& url,
@@ -268,8 +277,10 @@
     virtual ~NPT_HttpRequest();
 
     // methods
-    const NPT_HttpUrl& GetUrl() { return m_Url; }
+    const NPT_HttpUrl& GetUrl() const { return m_Url; }
+    NPT_HttpUrl&       GetUrl()       { return m_Url; }
     NPT_Result         SetUrl(const char* url);
+    NPT_Result         SetUrl(const NPT_HttpUrl& url);
     const NPT_String&  GetMethod() const { return m_Method; }
     virtual NPT_Result Emit(NPT_OutputStream& stream, bool use_proxy=false) const;
     
@@ -286,8 +297,7 @@
 public:
     // class methods
     static NPT_Result Parse(NPT_BufferedInputStream& stream, 
-                            NPT_HttpResponse*&       response,
-                            NPT_Timeout              timeout = NPT_TIMEOUT_INFINITE);
+                            NPT_HttpResponse*&       response);
 
     // constructors and destructor
              NPT_HttpResponse(NPT_HttpStatusCode status_code,
@@ -348,6 +358,79 @@
 };
 
 /*----------------------------------------------------------------------
+|   NPT_HttpRequestHandler
++---------------------------------------------------------------------*/
+class NPT_HttpRequestHandler 
+{
+public:
+    // destructor
+    virtual ~NPT_HttpRequestHandler() {}
+
+    // methods
+    virtual NPT_Result SetupResponse(NPT_HttpRequest&  request,
+                                     NPT_HttpResponse& response) = 0;
+};
+
+/*----------------------------------------------------------------------
+|   NPT_HttpStaticRequestHandler
++---------------------------------------------------------------------*/
+class NPT_HttpStaticRequestHandler : public NPT_HttpRequestHandler
+{
+public:
+    // constructors
+    NPT_HttpStaticRequestHandler(const char* document, 
+                                 const char* mime_type,
+                                 bool        copy = true);
+    NPT_HttpStaticRequestHandler(const void* data,
+                                 NPT_Size    size,
+                                 const char* mime_type,
+                                 bool        copy = true);
+
+    // NPT_HttpRequetsHandler methods
+    virtual NPT_Result SetupResponse(NPT_HttpRequest&  request, 
+                                     NPT_HttpResponse& response);
+
+private:
+    NPT_String     m_MimeType;
+    NPT_DataBuffer m_Buffer;
+};
+
+/*----------------------------------------------------------------------
+|   NPT_HttpFileRequestHandler
++---------------------------------------------------------------------*/
+class NPT_HttpFileRequestHandler : public NPT_HttpRequestHandler
+{
+public:
+    // constructors
+    NPT_HttpFileRequestHandler(const char* url_root,
+                               const char* file_root);
+
+    // NPT_HttpRequetsHandler methods
+    virtual NPT_Result SetupResponse(NPT_HttpRequest&  request, 
+                                     NPT_HttpResponse& response);
+
+    // accessors
+    NPT_Map<NPT_String,NPT_String>& GetFileTypeMap() { return m_FileTypeMap; }
+    void SetDefaultMimeType(const char* mime_type) {
+        m_DefaultMimeType = mime_type;
+    }
+    void SetUseDefaultFileTypeMap(bool use_default) {
+        m_UseDefaultFileTypeMap = use_default;
+    }
+
+protected:
+    // methods
+    const char* GetContentType(const NPT_String& filename);
+
+private:
+    NPT_String                      m_UrlRoot;
+    NPT_String                      m_FileRoot;
+    NPT_Map<NPT_String, NPT_String> m_FileTypeMap;
+    NPT_String                      m_DefaultMimeType;
+    bool                            m_UseDefaultFileTypeMap;
+};
+
+/*----------------------------------------------------------------------
 |   NPT_HttpServer
 +---------------------------------------------------------------------*/
 class NPT_HttpServer {
@@ -367,13 +450,76 @@
     NPT_Result SetConfig(const Config& config);
     NPT_Result SetListenPort(NPT_UInt16 port);
     NPT_Result SetTimeouts(NPT_Timeout connection_timeout, NPT_Timeout io_timeout);
-    NPT_Result WaitForRequest(NPT_HttpRequest*&          request,
-                              NPT_OutputStreamReference& stream);
-    NPT_Result SendResponse(NPT_HttpResponse& response, NPT_OutputStream& stream);
+    NPT_Result WaitForNewClient(NPT_InputStreamReference&  input,
+                                NPT_OutputStreamReference& output,
+                                NPT_SocketAddress*         local_address  = NULL,
+                                NPT_SocketAddress*         remote_address = NULL);
+    
+    /**
+     *  Add a request handler. The ownership of the handler is NOT transfered to this object,
+     *  so the caller is responsible for the lifetime management of the handler object.
+     */
+    NPT_Result AddRequestHandler(NPT_HttpRequestHandler* handler, const char* path, bool include_children = false);
+    NPT_HttpRequestHandler* FindRequestHandler(NPT_HttpRequest& request);
 
+    /**
+     * Simple 
+     */
+    NPT_Result RespondToClient(NPT_InputStreamReference&  input,
+                               NPT_OutputStreamReference& output,
+                               NPT_SocketAddress*         local_address = NULL);
+
 protected:
+    // types
+    struct HandlerConfig {
+        HandlerConfig(NPT_HttpRequestHandler* handler,
+                      const char*             path,
+                      bool                    include_children);
+        ~HandlerConfig();
+
+        // methods
+        bool WillHandle(NPT_HttpRequest& request);
+
+        // members
+        NPT_HttpRequestHandler* m_Handler;
+        NPT_String              m_Path;
+        bool                    m_IncludeChildren;
+    };
+
     // members
-    Config m_Config;
+    NPT_TcpServerSocket      m_Socket;
+    Config                   m_Config;
+    NPT_List<HandlerConfig*> m_RequestHandlers;
 };
 
+/*----------------------------------------------------------------------
+|   NPT_HttpResponder
++---------------------------------------------------------------------*/
+class NPT_HttpResponder {
+public:
+    // types
+    struct Config {
+        NPT_Timeout m_IoTimeout;
+    };
+
+    // constructors and destructor
+    NPT_HttpResponder(NPT_InputStreamReference&  input,
+                      NPT_OutputStreamReference& output);
+    virtual ~NPT_HttpResponder();
+
+    // methods
+    NPT_Result SetConfig(const Config& config);
+    NPT_Result SetTimeout(NPT_Timeout io_timeout);
+    NPT_Result ParseRequest(NPT_HttpRequest*&  request,
+                            NPT_SocketAddress* local_address = NULL);
+    NPT_Result SendResponse(NPT_HttpResponse& response,
+                            bool              headers_only = false);
+
+protected:
+    // members
+    Config                           m_Config;
+    NPT_BufferedInputStreamReference m_Input;
+    NPT_OutputStreamReference        m_Output;
+};
+
 #endif // _NPT_HTTP_H_

Modified: trunk/XBMC/xbmc/lib/libUPnP/NptStreams.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/NptStreams.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/NptStreams.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -150,7 +150,7 @@
 public:
     // constructor and destructor
     NPT_MemoryStream();
-    NPT_MemoryStream(void* data, NPT_Size size);
+    NPT_MemoryStream(const void* data, NPT_Size size);
     virtual ~NPT_MemoryStream() {}
 
     // accessors

Modified: trunk/XBMC/xbmc/lib/libUPnP/NptTypes.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/NptTypes.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/NptTypes.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -28,6 +28,8 @@
 typedef unsigned char NPT_Byte;
 typedef unsigned int  NPT_Flags;
 typedef int           NPT_Integer;
+typedef void*         NPT_Any;
+typedef const void*   NPT_AnyConst;
 
 /*----------------------------------------------------------------------
 |   sized types

Modified: trunk/XBMC/xbmc/lib/libUPnP/NptUri.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/NptUri.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/NptUri.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -43,6 +43,7 @@
         return m_Scheme;
     }
     void SetScheme(const char* scheme);
+    NPT_Result SetSchemeFromUri(const char* uri);
     SchemeId GetSchemeId() const {
         return m_SchemeId;
     }

Modified: trunk/XBMC/xbmc/lib/libUPnP/NptUtils.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/NptUtils.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/NptUtils.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -61,7 +61,7 @@
 #endif
 
 #if defined (NPT_CONFIG_HAVE_SNPRINTF)
-#define NPT_FormatString snprintf
+#define NPT_FormatString NPT_snprintf
 #else
 int NPT_FormatString(char* str, NPT_Size size, const char* format, ...);
 #endif
@@ -93,6 +93,18 @@
 extern unsigned long NPT_StringLength(const char* s);
 #endif
 
+#if defined(NPT_CONFIG_HAVE_STRCPY)
+#define NPT_CopyString(dst, src) ((void)strcpy((dst), (src)))
+#else
+extern void NPT_CopyString(char* dst, const char* src);
+#endif
+
+#if defined(NPT_CONFIG_HAVE_STRNCPY)
+#define NPT_CopyStringN(dst, src, n) ((void)strncpy((dst), (src), n))
+#else
+extern int NPT_CopyStringN(char* dst, const char* src, unsigned long n);
+#endif
+
 #if defined(NPT_CONFIG_HAVE_MEMSET)
 #define NPT_SetMemory memset
 #else

Modified: trunk/XBMC/xbmc/lib/libUPnP/NptVersion.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/NptVersion.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/NptVersion.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -13,6 +13,6 @@
 /*----------------------------------------------------------------------
 |   includes
 +---------------------------------------------------------------------*/
-#define NPT_NEPTUNE_VERSION_STRING "0.6.0"
+#define NPT_NEPTUNE_VERSION_STRING "0.7.0"
 
 #endif // _NPT_VERSION_H_

Modified: trunk/XBMC/xbmc/lib/libUPnP/Platinum.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/Platinum.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/Platinum.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -16,9 +16,12 @@
 #include "PltUPnP.h"
 #include "PltCtrlPoint.h"
 #include "PltDeviceData.h"
-//#include "PltMediaServer.h"
-//#include "PltMediaBrowser.h"
-//#include "PltMediaRenderer.h"
-//#include "PltMediaController.h"
 
+#ifdef PLT_DEVICE_HEADERS_INCLUDE
+#include "PltMediaServer.h"
+#include "PltMediaBrowser.h"
+#include "PltMediaRenderer.h"
+#include "PltMediaController.h"
+#endif
+
 #endif /* _PLATINUM_H_ */

Added: trunk/XBMC/xbmc/lib/libUPnP/Platinum.lib
===================================================================
(Binary files differ)


Property changes on: trunk/XBMC/xbmc/lib/libUPnP/Platinum.lib
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/XBMC/xbmc/lib/libUPnP/Platinumd.lib
===================================================================
(Binary files differ)


Property changes on: trunk/XBMC/xbmc/lib/libUPnP/Platinumd.lib
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/XBMC/xbmc/lib/libUPnP/PltArgument.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltArgument.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltArgument.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -66,7 +66,7 @@
 
 private:
     // members
-    NPT_String   m_Name;
+    NPT_String m_Name;
 };
 
 #endif /* _PLT_ARGUMENT_H_ */

Modified: trunk/XBMC/xbmc/lib/libUPnP/PltCtrlPoint.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltCtrlPoint.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltCtrlPoint.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -25,6 +25,7 @@
 +---------------------------------------------------------------------*/
 class PLT_HttpServer;
 class PLT_CtrlPointHouseKeepingTask;
+class PLT_SsdpSearchTask;
 
 /*----------------------------------------------------------------------
 |   PLT_CtrlPointListener class
@@ -43,77 +44,6 @@
 typedef NPT_List<PLT_CtrlPointListener*> PLT_CtrlPointListenerList;
 
 /*----------------------------------------------------------------------
-|   PLT_CtrlPointListenerOnDeviceAddedIterator class
-+---------------------------------------------------------------------*/
-class PLT_CtrlPointListenerOnDeviceAddedIterator
-{
-public:
-    PLT_CtrlPointListenerOnDeviceAddedIterator(PLT_DeviceDataReference& device) :
-      m_Device(device) {}
-
-    NPT_Result operator()(PLT_CtrlPointListener*& listener) const {
-        return listener->OnDeviceAdded(m_Device);
-    }
-
-private:
-    PLT_DeviceDataReference& m_Device;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_CtrlPointListenerOnDeviceRemovedIterator class
-+---------------------------------------------------------------------*/
-class PLT_CtrlPointListenerOnDeviceRemovedIterator
-{
-public:
-    PLT_CtrlPointListenerOnDeviceRemovedIterator(PLT_DeviceDataReference& device) :
-      m_Device(device) {}
-
-    NPT_Result operator()(PLT_CtrlPointListener*& listener) const {
-        return listener->OnDeviceRemoved(m_Device);
-    }
-
-private:
-    PLT_DeviceDataReference& m_Device;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_CtrlPointListenerOnActionResponseIterator class
-+---------------------------------------------------------------------*/
-class PLT_CtrlPointListenerOnActionResponseIterator
-{
-public:
-    PLT_CtrlPointListenerOnActionResponseIterator(NPT_Result res, PLT_Action* action, void* userdata) :
-      m_Res(res), m_Action(action), m_Userdata(userdata) {}
-
-    NPT_Result operator()(PLT_CtrlPointListener*& listener) const {
-        return listener->OnActionResponse(m_Res, m_Action, m_Userdata);
-    }
-
-private:
-    NPT_Result  m_Res;
-    PLT_Action* m_Action;
-    void*       m_Userdata;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_CtrlPointListenerOnEventNotifyIterator class
-+---------------------------------------------------------------------*/
-class PLT_CtrlPointListenerOnEventNotifyIterator
-{
-public:
-    PLT_CtrlPointListenerOnEventNotifyIterator(PLT_Service* service, NPT_List<PLT_StateVariable*>* vars) :
-      m_Service(service), m_Vars(vars) {}
-
-    NPT_Result operator()(PLT_CtrlPointListener*& listener) const {
-        return listener->OnEventNotify(m_Service, m_Vars);
-    }
-
-private:
-    PLT_Service*                  m_Service;
-    NPT_List<PLT_StateVariable*>* m_Vars;
-};
-
-/*----------------------------------------------------------------------
 |   PLT_CtrlPoint class
 +---------------------------------------------------------------------*/
 class PLT_CtrlPoint : public PLT_HttpServerListener,
@@ -121,7 +51,7 @@
                       public PLT_SsdpSearchResponseListener
 {
 public:
-    PLT_CtrlPoint(const char* autosearch = "upnp:rootdevice");
+    PLT_CtrlPoint(const char* autosearch = "upnp:rootdevice"); // pass NULL to bypass the multicast search
 
     NPT_Result   AddListener(PLT_CtrlPointListener* listener);
     NPT_Result   RemoveListener(PLT_CtrlPointListener* listener);
@@ -137,14 +67,12 @@
     NPT_Result   Search(const NPT_HttpUrl& url = NPT_HttpUrl("239.255.255.250", 1900, "*"), 
                         const char*        target = "upnp:rootdevice", 
                         const NPT_Cardinal MX = 5);
-    
     NPT_Result   Discover(const NPT_HttpUrl& url = NPT_HttpUrl("239.255.255.250", 1900, "*"), 
                           const char*        target = "ssdp:all", 
                           const NPT_Cardinal MX = 5,
                           NPT_Timeout        repeat = 50000);
     
     NPT_Result   InvokeAction(PLT_Action* action, PLT_Arguments& arguments, void* userdata = NULL);
-
     NPT_Result   Subscribe(PLT_Service* service, bool renew = false, void* userdata = NULL);
 
     // PLT_HttpServerListener methods
@@ -213,64 +141,24 @@
 
 private:
     friend class NPT_Reference<PLT_CtrlPoint>;
-    friend class PLT_SsdpCtrlPointSearchTask;
 	friend class PLT_CtrlPointGetDescriptionTask;
     friend class PLT_CtrlPointGetSCPDTask;
     friend class PLT_CtrlPointInvokeActionTask;
     friend class PLT_CtrlPointHouseKeepingTask;
     friend class PLT_CtrlPointSubscribeEventTask;
 
-    NPT_AtomicVariable                      m_ReferenceCount;
-    NPT_String                              m_UUIDToIgnore;
-    PLT_CtrlPointHouseKeepingTask*          m_HouseKeepingTask;
-    NPT_Lock<PLT_CtrlPointListenerList>     m_ListenerList;
-    PLT_HttpServer*                         m_EventHttpServer;
-    PLT_TaskManager*                        m_TaskManager;
-    NPT_Lock<NPT_List<PLT_DeviceDataReference> >       m_Devices;
-    NPT_List<PLT_EventSubscriber*>          m_Subscribers;
-    NPT_String                              m_AutoSearch;
+    NPT_AtomicVariable                              m_ReferenceCount;
+    NPT_String                                      m_UUIDToIgnore;
+    PLT_CtrlPointHouseKeepingTask*                  m_HouseKeepingTask;
+    NPT_List<PLT_SsdpSearchTask*>                   m_SsdpSearchTasks;
+    NPT_Lock<PLT_CtrlPointListenerList>             m_ListenerList;
+    PLT_HttpServer*                                 m_EventHttpServer;
+    PLT_TaskManager*                                m_TaskManager;
+    NPT_Lock<NPT_List<PLT_DeviceDataReference> >    m_Devices;
+    NPT_List<PLT_EventSubscriber*>                  m_Subscribers;
+    NPT_String                                      m_AutoSearch;
 };
 
 typedef NPT_Reference<PLT_CtrlPoint> PLT_CtrlPointReference;
 
-/*----------------------------------------------------------------------
-|   PLT_AddGetSCPDRequestIterator class
-+---------------------------------------------------------------------*/
-class PLT_AddGetSCPDRequestIterator
-{
-public:
-    PLT_AddGetSCPDRequestIterator(PLT_TaskManager*         task_manager, 
-                                  PLT_CtrlPoint*           ctrl_point, 
-                                  PLT_DeviceDataReference& device) :
-        m_TaskManager(task_manager), m_CtrlPoint(ctrl_point), m_Device(device) {}
-
-    NPT_Result operator()(PLT_Service*& service) const;
-    
-private:
-    PLT_TaskManager*        m_TaskManager;
-    PLT_CtrlPoint*          m_CtrlPoint;
-    PLT_DeviceDataReference m_Device;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_ServiceReadyIterator class
-+---------------------------------------------------------------------*/
-class PLT_ServiceReadyIterator
-{
-public:
-    PLT_ServiceReadyIterator() {}
-
-    NPT_Result operator()(PLT_Service*& service) const;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_DeviceReadyIterator class
-+---------------------------------------------------------------------*/
-class PLT_DeviceReadyIterator
-{
-public:
-    PLT_DeviceReadyIterator() {}
-    NPT_Result operator()(PLT_DeviceDataReference& device) const;
-};
-
 #endif /* _PLT_CONTROL_POINT_H_ */

Added: trunk/XBMC/xbmc/lib/libUPnP/PltCtrlPointTask.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltCtrlPointTask.h	                        (rev 0)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltCtrlPointTask.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -0,0 +1,144 @@
+/*****************************************************************
+|
+|   Platinum - Control Point Tasks
+|
+|   Copyright (c) 2004-2006 Sylvain Rebaud
+|   Author: Sylvain Rebaud (sylvain@...)
+|
+ ****************************************************************/
+
+#ifndef _PLT_CONTROL_POINT_TASK_H_
+#define _PLT_CONTROL_POINT_TASK_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "NptDefs.h"
+#include "NptStrings.h"
+#include "NptHttp.h"
+#include "PltHttpClientTask.h"
+#include "PltDatagramStream.h"
+#include "PltDeviceData.h"
+#include "PltCtrlPoint.h"
+
+/*----------------------------------------------------------------------
+|   forward declarations
++---------------------------------------------------------------------*/
+class PLT_Action;
+
+/*----------------------------------------------------------------------
+|   PLT_CtrlPointGetDescriptionTask class
++---------------------------------------------------------------------*/
+class PLT_CtrlPointGetDescriptionTask : public PLT_HttpClientSocketTask
+{
+public:
+    PLT_CtrlPointGetDescriptionTask(const NPT_HttpUrl&       url,
+                                    PLT_CtrlPoint*           ctrl_point, 
+                                    PLT_DeviceDataReference& device);
+    virtual ~PLT_CtrlPointGetDescriptionTask();
+
+protected:
+    // PLT_HttpClientSocketTask methods
+    NPT_Result ProcessResponse(NPT_Result        res, 
+                               NPT_HttpRequest*  request, 
+                               NPT_SocketInfo&   info, 
+                               NPT_HttpResponse* response);
+
+protected:
+    PLT_CtrlPoint*          m_CtrlPoint;
+    PLT_DeviceDataReference m_Device;
+};
+
+/*----------------------------------------------------------------------
+|   PLT_CtrlPointGetSCPDTask class
++---------------------------------------------------------------------*/
+class PLT_CtrlPointGetSCPDTask : public PLT_HttpClientSocketTask
+{
+public:
+    PLT_CtrlPointGetSCPDTask(const NPT_HttpUrl&       url,
+                             PLT_CtrlPoint*           ctrl_point, 
+                             PLT_DeviceDataReference& m_Device);
+    virtual ~PLT_CtrlPointGetSCPDTask();
+
+protected:
+    // PLT_HttpClientSocketTask methods
+    NPT_Result ProcessResponse(NPT_Result        res, 
+                               NPT_HttpRequest*  request, 
+                               NPT_SocketInfo&   info, 
+                               NPT_HttpResponse* response);   
+
+protected:
+    PLT_CtrlPoint*          m_CtrlPoint;
+    PLT_DeviceDataReference m_Device;
+};
+
+/*----------------------------------------------------------------------
+|   PLT_CtrlPointInvokeActionTask class
++---------------------------------------------------------------------*/
+class PLT_CtrlPointInvokeActionTask : public PLT_HttpClientSocketTask
+{
+public:
+    PLT_CtrlPointInvokeActionTask(NPT_HttpRequest* request,
+                                  PLT_CtrlPoint*   ctrl_point, 
+                                  PLT_Action*      action,
+                                  void*            userdata);
+    virtual ~PLT_CtrlPointInvokeActionTask();
+
+protected:
+    // PLT_HttpClientSocketTask methods
+    NPT_Result ProcessResponse(NPT_Result        res, 
+                               NPT_HttpRequest*  request, 
+                               NPT_SocketInfo&   info, 
+                               NPT_HttpResponse* response);   
+
+protected:
+    PLT_CtrlPoint*  m_CtrlPoint;
+    PLT_Action*     m_Action;
+    void*           m_Userdata;
+};
+
+/*----------------------------------------------------------------------
+|   PLT_CtrlPointHouseKeepingTask class
++---------------------------------------------------------------------*/
+class PLT_CtrlPointHouseKeepingTask : public PLT_ThreadTask
+{
+public:
+    PLT_CtrlPointHouseKeepingTask(PLT_CtrlPoint* ctrl_point, NPT_TimeInterval timer = NPT_TimeInterval(10, 0));
+
+protected:
+    ~PLT_CtrlPointHouseKeepingTask() {}
+
+    // PLT_ThreadTask methods
+    virtual void DoRun();
+
+protected:
+    PLT_CtrlPoint*   m_CtrlPoint;
+    NPT_TimeInterval m_Timer;
+};
+
+/*----------------------------------------------------------------------
+|   PLT_CtrlPointSubscribeEventTask class
++---------------------------------------------------------------------*/
+class PLT_CtrlPointSubscribeEventTask : public PLT_HttpClientSocketTask
+{
+public:
+    PLT_CtrlPointSubscribeEventTask(NPT_HttpRequest* request,
+                                    PLT_CtrlPoint*   ctrl_point, 
+                                    PLT_Service*     service,
+                                    void*            userdata);
+    virtual ~PLT_CtrlPointSubscribeEventTask();
+    
+protected:
+    // PLT_HttpClientSocketTask methods
+    NPT_Result ProcessResponse(NPT_Result        res, 
+                               NPT_HttpRequest*  request, 
+                               NPT_SocketInfo&   info, 
+                               NPT_HttpResponse* response);
+
+protected:
+    PLT_CtrlPoint*  m_CtrlPoint;
+    PLT_Service*    m_Service;
+    void*           m_Userdata;
+};
+
+#endif /* _PLT_CONTROL_POINT_TASK_H_ */

Added: trunk/XBMC/xbmc/lib/libUPnP/PltDatagramStream.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltDatagramStream.h	                        (rev 0)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltDatagramStream.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -0,0 +1,77 @@
+/*****************************************************************
+|
+|   Platinum - Datagram Stream
+|
+|   Copyright (c) 2004-2006 Sylvain Rebaud
+|   Author: Sylvain Rebaud (sylvain@...)
+|
+ ****************************************************************/
+
+#ifndef _PLT_DATAGRAM_H_
+#define _PLT_DATAGRAM_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "NptStreams.h"
+#include "NptSockets.h"
+
+/*----------------------------------------------------------------------
+|   PLT_InputDatagramStream
++---------------------------------------------------------------------*/
+class PLT_InputDatagramStream : public NPT_InputStream
+{
+public:
+    // methods
+    PLT_InputDatagramStream(NPT_UdpSocket* socket);
+    virtual ~PLT_InputDatagramStream();
+    
+    NPT_Result GetInfo(NPT_SocketInfo& info);
+
+    // NPT_InputStream methods
+    NPT_Result Read(void*     buffer, 
+                    NPT_Size  bytes_to_read, 
+                    NPT_Size* bytes_read = 0);
+
+    NPT_Result Seek(NPT_Position offset) { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
+    NPT_Result Skip(NPT_Position offset) { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
+    NPT_Result Tell(NPT_Position& offset){ NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
+    NPT_Result GetSize(NPT_Size& size)   { NPT_COMPILER_UNUSED(size); return NPT_FAILURE; }
+    NPT_Result GetAvailable(NPT_Size& available) { NPT_COMPILER_UNUSED(available); return NPT_FAILURE; }
+
+        
+protected:
+    NPT_UdpSocket*      m_Socket;
+    NPT_SocketInfo      m_Info;
+};
+
+typedef NPT_Reference<PLT_InputDatagramStream> PLT_InputDatagramStreamReference;
+
+/*----------------------------------------------------------------------
+|   PLT_OutputDatagramStream
++---------------------------------------------------------------------*/
+class PLT_OutputDatagramStream : public NPT_OutputStream
+{
+public:
+    // methods
+    PLT_OutputDatagramStream(NPT_UdpSocket*           socket, 
+                             NPT_Size                 size = 4096,
+                             const NPT_SocketAddress* address = NULL);
+    virtual ~PLT_OutputDatagramStream();
+
+    // NPT_OutputStream methods
+    NPT_Result Write(const void* buffer, NPT_Size bytes_to_write, NPT_Size* bytes_written = NULL);
+    NPT_Result Flush();
+
+    NPT_Result Seek(NPT_Position offset)  { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
+    NPT_Result Tell(NPT_Position& offset) { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
+
+protected:
+    NPT_UdpSocket*     m_Socket;
+    NPT_DataBuffer     m_Buffer;
+    NPT_SocketAddress* m_Address;
+};
+
+typedef NPT_Reference<PLT_OutputDatagramStream> PLT_OutputDatagramStreamReference;
+
+#endif /* _PLT_DATAGRAM_H_ */

Modified: trunk/XBMC/xbmc/lib/libUPnP/PltDeviceData.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltDeviceData.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltDeviceData.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -5,7 +5,7 @@
 |   Copyright (c) 2004-2006 Sylvain Rebaud
 |   Author: Sylvain Rebaud (sylvain@...)
 |
- ****************************************************************/
+****************************************************************/
 
 #ifndef _PLT_DEVICE_DATA_H_
 #define _PLT_DEVICE_DATA_H_
@@ -37,7 +37,7 @@
 {
 public:
     PLT_DeviceData(
-        const char*      url_description_path = "/", 
+        NPT_HttpUrl      description_url = NPT_HttpUrl(NULL, 0, "/"), 
         const char*      uuid = "",
         NPT_TimeInterval lease_time = NPT_TimeInterval(40, 0),
         const char*      device_type = "",
@@ -52,8 +52,8 @@
     const NPT_String&       GetUUID()         const { return m_UUID;         }
     const NPT_String&       GetFriendlyName() const { return m_FriendlyName; }
     const NPT_String&       GetType()         const { return m_DeviceType;   }
-    
 
+
     NPT_Result FindServiceByType(const char* type, PLT_Service*& service);
     NPT_Result FindServiceById(const char* id, PLT_Service*& service);
     NPT_Result FindServiceByDescriptionURI(const char* uri, PLT_Service*& service);
@@ -91,14 +91,12 @@
     friend class PLT_CtrlPoint;
     friend class PLT_DeviceReadyIterator;
     friend class PLT_DeviceHost;
-    
+
     //members
     NPT_AtomicVariable  m_ReferenceCount;
     bool                m_Root;
     NPT_String          m_UUID;
-    NPT_String          m_URLDescriptionPath;
-    NPT_String          m_URLBaseHost;
-    unsigned int        m_Port;
+    NPT_HttpUrl         m_URLDescription;
     NPT_String          m_URLBasePath;
     NPT_String          m_DeviceType;
     NPT_String          m_FriendlyName;

Modified: trunk/XBMC/xbmc/lib/libUPnP/PltDeviceHost.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltDeviceHost.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltDeviceHost.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -37,7 +37,7 @@
 {
 public:
     PLT_DeviceHost(
-        const char*  url_base = "/", 
+        const char*  description_path = "/",
         const char*  uuid = "",
         const char*  device_type = "",
         const char*  friendly_name = "",
@@ -62,9 +62,9 @@
     virtual NPT_Result ProcessSsdpSearchRequest(NPT_HttpRequest* request, NPT_SocketInfo info);
 
     /* PLT_SsdpDeviceSearchResponseTask */
-    virtual NPT_Result SendSsdpSearchResponse(PLT_DeviceData* device, NPT_SocketAddress& addr, NPT_HttpResponse& response, NPT_UdpSocket& socket, const char* st);
-    virtual NPT_Result SendSsdpSearchResponse(NPT_SocketAddress& addr, NPT_HttpResponse& response, NPT_UdpSocket& socket, const char* ST) {
-        return SendSsdpSearchResponse(this, addr, response, socket, ST);
+    virtual NPT_Result SendSsdpSearchResponse(PLT_DeviceData* device, NPT_HttpResponse& response, NPT_UdpSocket& socket, const char* st);
+    virtual NPT_Result SendSsdpSearchResponse(NPT_HttpResponse& response, NPT_UdpSocket& socket, const char* ST) {
+        return SendSsdpSearchResponse(this, response, socket, ST);
     }
 
     NPT_Result VerifyArgumentInput(PLT_Action* action, NPT_String name, NPT_String value);
@@ -100,13 +100,10 @@
     virtual ~PLT_HttpServerHandler() {}
 
     // PLT_HttpServerListener methods
-    NPT_Result ProcessHttpRequest(NPT_HttpRequest* request, NPT_SocketInfo info, NPT_HttpResponse*& response) {
-        response = new NPT_HttpResponse(200, "OK", "HTTP/1.1");
-        response->GetHeaders().SetHeader("Server", "Platinum");
+    NPT_Result ProcessHttpRequest(NPT_HttpRequest*   request, 
+                                  NPT_SocketInfo     info, 
+                                  NPT_HttpResponse*& response);
 
-        return m_Device->ProcessHttpRequest(request, info, response);
-    }
-
 private:
     PLT_DeviceHost* m_Device;
 };

Added: trunk/XBMC/xbmc/lib/libUPnP/PltDidl.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltDidl.h	                        (rev 0)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltDidl.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -0,0 +1,86 @@
+/*****************************************************************
+|
+|   Platinum - DIDL
+|
+|   Copyright (c) 2004-2006 Sylvain Rebaud
+|   Author: Sylvain Rebaud (sylvain@...)
+|
+****************************************************************/
+
+#ifndef _PLT_DIDL_H_
+#define _PLT_DIDL_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "NptStrings.h"
+#include "NptTime.h"
+#include "NptXml.h"
+#include "PltMediaItem.h"
+
+/*----------------------------------------------------------------------
+|   constants
++---------------------------------------------------------------------*/
+#define PLT_FILTER_MASK_ALL                         0xFFFFFFFF
+
+#define PLT_FILTER_MASK_CREATOR                     0x00000001
+#define PLT_FILTER_MASK_ARTIST                      0x00000002
+#define PLT_FILTER_MASK_ALBUM                       0x00000004
+#define PLT_FILTER_MASK_GENRE                       0x00000008
+#define PLT_FILTER_MASK_ALBUMARTURI                 0x00000010
+#define PLT_FILTER_MASK_DESCRIPTION                 0x00000020
+#define PLT_FILTER_MASK_SEARCHABLE                  0x00000040
+#define PLT_FILTER_MASK_CHILDCOUNT                  0x00000080
+
+#define PLT_FILTER_MASK_RES                         0x00010000
+#define PLT_FILTER_MASK_RES_DURATION                0x00020000
+#define PLT_FILTER_MASK_RES_SIZE                    0x00040000
+#define PLT_FILTER_MASK_RES_PROTECTION              0x00080000
+
+#define PLT_FILTER_FIELD_CREATOR                    "dc:creator"
+#define PLT_FILTER_FIELD_ARTIST                     "upnp:artist"
+#define PLT_FILTER_FIELD_ALBUM                      "upnp:album"
+#define PLT_FILTER_FIELD_GENRE                      "upnp:genre"
+#define PLT_FILTER_FIELD_ALBUMARTURI                "upnp:albumArtURI"
+#define PLT_FILTER_FIELD_DESCRIPTION                "upnp:longDescription"
+#define PLT_FILTER_FIELD_SEARCHABLE                 "@searchable"
+#define PLT_FILTER_FIELD_CHILDCOUNT                 "@childcount"
+#define PLT_FILTER_FIELD_CONTAINER_CHILDCOUNT       "container@..."
+#define PLT_FILTER_FIELD_CONTAINER_SEARCHABLE       "container@..."
+
+#define PLT_FILTER_FIELD_RES                        "res"
+#define PLT_FILTER_FIELD_RES_DURATION               "res@..."
+#define PLT_FILTER_FIELD_RES_SIZE                   "res@..."
+#define PLT_FILTER_FIELD_RES_PROTECTION             "res@..."
+
+extern const char* didl_header;
+extern const char* didl_footer;
+extern const char* didl_namespace_dc;
+extern const char* didl_namespace_upnp;
+
+/*----------------------------------------------------------------------
+|   PLT_Didl class
++---------------------------------------------------------------------*/
+class PLT_Didl
+{
+public:
+    static NPT_Result  ToDidl(PLT_MediaObject& object, NPT_String filter, NPT_String& didl);
+    static NPT_Result  FromDidl(const char* didl, PLT_MediaObjectListReference& objects);
+
+    static const char* AppendXmlEscape(NPT_String& out, NPT_String& in);
+    static const char* AppendXmlUnEscape(NPT_String& out, NPT_String& in);
+    static NPT_Result  ParseTimeStamp(NPT_String timestamp, NPT_UInt32& seconds);
+    static const char* FormatTimeStamp(NPT_String& out, NPT_UInt32 seconds);
+
+    static NPT_Result  ParseTimeStamp(NPT_String in, NPT_TimeStamp& timestamp) {
+        NPT_UInt32 seconds;
+        NPT_Result res = ParseTimeStamp(in, seconds);
+        timestamp = NPT_TimeStamp(seconds, 0);
+        return res;
+    }
+
+private:
+    static NPT_UInt32  ConvertFilterToMask(NPT_String filter);
+};
+
+#endif /* _PLT_DIDL_H_ */

Added: trunk/XBMC/xbmc/lib/libUPnP/PltDownloader.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltDownloader.h	                        (rev 0)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltDownloader.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -0,0 +1,67 @@
+/*****************************************************************
+|
+|   Platinum - Downloader
+|
+|   Copyright (c) 2004-2006 Sylvain Rebaud
+|   Author: Sylvain Rebaud (sylvain@...)
+|
+ ****************************************************************/
+
+#ifndef _PLT_DOWNLOADER_H_
+#define _PLT_DOWNLOADER_H_
+
+/*----------------------------------------------------------------------
+|   Includes
++---------------------------------------------------------------------*/
+#include "Neptune.h"
+#include "PltHttpClientTask.h"
+
+/*----------------------------------------------------------------------
+|   forward declarations
++---------------------------------------------------------------------*/
+class PLT_Downloader;
+
+/*----------------------------------------------------------------------
+|   types
++---------------------------------------------------------------------*/
+typedef PLT_HttpClientTask<PLT_Downloader> PLT_HttpDownloadTask;
+
+typedef enum {
+    PLT_DOWNLOADER_IDLE,
+    PLT_DOWNLOADER_STARTED,
+    PLT_DOWNLOADER_DOWNLOADING,
+    PLT_DOWNLOADER_ERROR,
+    PLT_DOWNLOADER_SUCCESS
+} Plt_DowloaderState;
+
+/*----------------------------------------------------------------------
+|   PLT_Downloader class
++---------------------------------------------------------------------*/
+class PLT_Downloader
+{
+public:
+    PLT_Downloader(PLT_TaskManager*           task_manager, 
+                   const char*                url, 
+                   NPT_OutputStreamReference& output);
+    virtual ~PLT_Downloader();
+
+    NPT_Result Start();
+    NPT_Result Stop();
+
+    NPT_Result ProcessResponse(NPT_Result        res, 
+                               NPT_HttpRequest*  request, 
+                               NPT_SocketInfo&   info, 
+                               NPT_HttpResponse* response);
+
+    Plt_DowloaderState GetState() { return m_State; }
+
+private:
+    // members
+    NPT_String                      m_URL;
+    NPT_OutputStreamReference       m_Output;
+    PLT_TaskManager*                m_TaskManager;
+    PLT_HttpDownloadTask*           m_Task;
+    Plt_DowloaderState              m_State;
+};
+
+#endif /* _PLT_DOWNLOADER_H_ */

Added: trunk/XBMC/xbmc/lib/libUPnP/PltFileMediaServer.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltFileMediaServer.h	                        (rev 0)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltFileMediaServer.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -0,0 +1,73 @@
+/*****************************************************************
+|
+|   Platinum - File Media Server
+|
+|   Copyright (c) 2004-2006 Sylvain Rebaud
+|   Author: Sylvain Rebaud (sylvain@...)
+|
+ ****************************************************************/
+
+#ifndef _PLT_FILE_MEDIA_SERVER_H_
+#define _PLT_FILE_MEDIA_SERVER_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "NptDirectory.h"
+#include "PltMediaServer.h"
+
+/*----------------------------------------------------------------------
+|   constants
++---------------------------------------------------------------------*/
+#define MAX_PATH_LENGTH 1024
+
+/*----------------------------------------------------------------------
+|   forward declarations
++---------------------------------------------------------------------*/
+class PLT_MetadataHandler;
+
+/*----------------------------------------------------------------------
+|   PLT_MediaServer class
++---------------------------------------------------------------------*/
+class PLT_FileMediaServer : public PLT_MediaServer
+{
+public:
+    PLT_FileMediaServer(const char*  path, 
+                        const char*  friendly_name,
+                        bool         show_ip = false,
+                        const char*  uuid = NULL,
+                        unsigned int port = 0);
+
+    // PLT_DeviceHost methods
+    virtual NPT_Result Start(PLT_TaskManager* task_manager);
+    virtual NPT_Result Stop();
+
+    NPT_Result AddMetadataHandler(PLT_MetadataHandler* handler);
+
+protected:
+    virtual ~PLT_FileMediaServer();
+    
+protected:
+    NPT_Result OnBrowseMetadata(PLT_Action* action, const char* object_id);
+    NPT_Result OnBrowseDirectChildren(PLT_Action* action, const char* object_id);
+    NPT_Result ProcessFileRequest(NPT_HttpRequest* request, NPT_SocketInfo info, NPT_HttpResponse*& response);
+
+private:
+    NPT_Result OnAlbumArtRequest(NPT_String filepath, NPT_HttpResponse* response);
+    PLT_MediaObject* BuildFromFilePath(const NPT_String& filepath, bool with_count = true);
+    bool       ProceedWithEntry(const NPT_String filepath, NPT_DirectoryEntryType& type);
+    NPT_Result GetEntryCount(const char* path, NPT_Cardinal& count); 
+    NPT_Result GetFilePath(const char* object_id, NPT_String& filepath);
+
+protected:
+    friend class PLT_MediaItem;
+
+    NPT_String    m_Path;
+    NPT_String    m_DirDelimiter;
+    NPT_String    m_FileBaseUri;
+    NPT_String    m_AlbumArtBaseUri;
+
+    NPT_List<PLT_MetadataHandler*> m_MetadataHandlers;
+};
+
+#endif /* _PLT_FILE_MEDIA_SERVER_H_ */

Modified: trunk/XBMC/xbmc/lib/libUPnP/PltHttp.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltHttp.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltHttp.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -1,14 +1,14 @@
 /*****************************************************************
 |
-|   Platinum - HTTP Protocol Helper
+|   Platinum - HTTP Helper
 |
 |   Copyright (c) 2004-2006 Sylvain Rebaud
 |   Author: Sylvain Rebaud (sylvain@...)
 |
  ****************************************************************/
 
-#ifndef _NPT_HTTP_HELPER_H_
-#define _NPT_HTTP_HELPER_H_
+#ifndef _PLT_HTTP_H_
+#define _PLT_HTTP_H_
 
 /*----------------------------------------------------------------------
 |   includes
@@ -46,8 +46,8 @@
     static NPT_Result   SetBody(NPT_HttpMessage* message, NPT_InputStreamReference& stream, NPT_Size len = 0);
 
 
-    static NPT_Result GetBody(NPT_HttpMessage& message, NPT_String& body);
-    static NPT_Result ParseBody(NPT_HttpMessage& message, NPT_XmlElementNode*& xml);
+    static NPT_Result   GetBody(NPT_HttpMessage& message, NPT_String& body);
+    static NPT_Result   ParseBody(NPT_HttpMessage& message, NPT_XmlElementNode*& xml);
 };
 
 /*----------------------------------------------------------------------
@@ -71,11 +71,10 @@
     NPT_Result WaitForResponse(NPT_InputStreamReference& input_stream,
                                NPT_HttpRequest&          request, 
                                NPT_SocketInfo&           info, 
-                               NPT_HttpResponse*&        response, 
-                               NPT_Timeout               timeout = NPT_TIMEOUT_INFINITE);
+                               NPT_HttpResponse*&        response);
 
 protected:
     // members
 };
 
-#endif // _PLT_HTTP_HELPER_H_
+#endif /* _PLT_HTTP_H_ */

Modified: trunk/XBMC/xbmc/lib/libUPnP/PltHttpClientTask.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltHttpClientTask.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltHttpClientTask.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -13,7 +13,6 @@
 /*----------------------------------------------------------------------
 |   includes
 +---------------------------------------------------------------------*/
-//#include "NptUtils.h"
 #include "PltLog.h"
 #include "NptSockets.h"
 #include "PltHttp.h"
@@ -24,25 +23,19 @@
 +---------------------------------------------------------------------*/
 class PLT_HttpClientSocketTask : public PLT_ThreadTask
 {
+friend class PLT_ThreadTask;
+
 public:
-    PLT_HttpClientSocketTask(NPT_Socket*       socket,
-                             NPT_HttpRequest*  request);
+    PLT_HttpClientSocketTask(NPT_Socket* socket, NPT_HttpRequest* request);
+
+protected:
     virtual ~PLT_HttpClientSocketTask();
 
+protected:
     // PLT_ThreadTask methods
-    virtual NPT_Result Abort() { 
-        // abort first PLT_ThreadTask to set the aborted flag
-        NPT_Result res = PLT_ThreadTask::Abort();
+    virtual void DoAbort() { m_Socket->Disconnect(); }
+    virtual void DoRun();
 
-        // unblock socket if necessary
-        m_Socket->Disconnect();
-        return res;
-    }
-
-    virtual NPT_Result DoRun();
-
-protected:
-
     virtual NPT_Result ProcessResponse(NPT_Result        res, 
                                        NPT_HttpRequest*  request, 
                                        NPT_SocketInfo&   info, 
@@ -61,17 +54,19 @@
 {
 public:
     PLT_HttpClientTask<T>(const NPT_HttpUrl& url, T* data) : 
-        PLT_HttpClientSocketTask(new NPT_TcpClientSocket, new NPT_HttpRequest(url, "GET")), m_Data(data) {}
+        PLT_HttpClientSocketTask(new NPT_TcpClientSocket, 
+                                 new NPT_HttpRequest(url, "GET")), 
+                                 m_Data(data) {}
+ protected:
     virtual ~PLT_HttpClientTask<T>() {}
 
+protected:
+    // PLT_HttpClientSocketTask method
     NPT_Result ProcessResponse(NPT_Result        res, 
                                NPT_HttpRequest*  request, 
                                NPT_SocketInfo&   info, 
                                NPT_HttpResponse* response) {
-        return m_Data->ProcessResponse(res,
-                                       request,
-                                       info,
-                                       response);
+        return m_Data->ProcessResponse(res, request, info, response);
     }
 
 protected:
@@ -85,9 +80,14 @@
 {
 public:
     PLT_FileHttpClientTask(const NPT_HttpUrl& url) : 
-        PLT_HttpClientSocketTask(new NPT_TcpClientSocket, new NPT_HttpRequest(url, "GET")) {}
+        PLT_HttpClientSocketTask(new NPT_TcpClientSocket, 
+                                 new NPT_HttpRequest(url, "GET")) {}
+
+protected:
     virtual ~PLT_FileHttpClientTask() {}
 
+protected:
+    // PLT_HttpClientSocketTask method
     NPT_Result ProcessResponse(NPT_Result        res, 
                                NPT_HttpRequest*  request, 
                                NPT_SocketInfo&   info, 
@@ -99,10 +99,6 @@
         PLT_Log(PLT_LOG_LEVEL_3, "PLT_FileHttpClientTask::ProcessResponse (status=%d)\n", res);
         return NPT_SUCCESS;
     }
-
-// members
-private:
-    // body?
 };
 
 #endif /* _PLT_HTTP_CLIENT_TASK_H_ */

Added: trunk/XBMC/xbmc/lib/libUPnP/PltHttpServer.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltHttpServer.h	                        (rev 0)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltHttpServer.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -0,0 +1,80 @@
+/*****************************************************************
+|
+|   Platinum - HTTP Server
+|
+|   Copyright (c) 2004-2006 Sylvain Rebaud
+|   Author: Sylvain Rebaud (sylvain@...)
+|
+ ****************************************************************/
+
+#ifndef _PLT_HTTP_SERVER_H_
+#define _PLT_HTTP_SERVER_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "NptDefs.h"
+#include "NptStrings.h"
+#include "NptSockets.h"
+#include "NptHttp.h"
+#include "NptFile.h"
+#include "PltHttpServerListener.h"
+#include "PltHttpServerTask.h"
+
+/*----------------------------------------------------------------------
+|   forward declarations
++---------------------------------------------------------------------*/
+class PLT_HttpServerStartIterator;
+
+/*----------------------------------------------------------------------
+|   PLT_HttpServer class
++---------------------------------------------------------------------*/
+class PLT_HttpServer
+{
+    friend class PLT_HttpServerTask<class PLT_HttpServer>;
+    friend class PLT_HttpServerStartIterator;
+
+ public:
+    PLT_HttpServer(PLT_HttpServerListener* listener, 
+                   unsigned int            port = 0,
+                   NPT_Cardinal            max_clients = 0);
+    virtual ~PLT_HttpServer();
+
+    virtual NPT_Result   Start();
+    virtual NPT_Result   Stop();
+    virtual unsigned int GetPort() { return m_Port; }
+
+ private:
+    PLT_TaskManager*          m_TaskManager;
+    PLT_HttpServerListener*   m_Listener;
+    unsigned int              m_Port;
+    PLT_HttpServerListenTask* m_HttpListenTask;
+};
+
+/*----------------------------------------------------------------------
+|   PLT_FileServer class
++---------------------------------------------------------------------*/
+class PLT_FileServer : public PLT_HttpServerListener
+{
+public:
+    // class methods
+    static NPT_Result ServeFile(NPT_String        filename, 
+                                NPT_HttpResponse* response, 
+                                NPT_Integer       start = -1, 
+                                NPT_Integer       end = -1,
+                                bool              request_is_head = false);
+
+    // constructor & destructor
+    PLT_FileServer(const char* local_path) : m_LocalPath(local_path) {}
+    virtual ~PLT_FileServer() {}
+
+    // PLT_HttpServerListener method
+    NPT_Result ProcessHttpRequest(NPT_HttpRequest*   request, 
+                                  NPT_SocketInfo     info, 
+                                  NPT_HttpResponse*& response);
+
+protected:
+    NPT_String m_LocalPath;
+};
+
+#endif /* _PLT_HTTP_SERVER_H_ */

Added: trunk/XBMC/xbmc/lib/libUPnP/PltHttpServerTask.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltHttpServerTask.h	                        (rev 0)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltHttpServerTask.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -0,0 +1,136 @@
+/*****************************************************************
+|
+|   Platinum - HTTP Server Tasks
+|
+|   Copyright (c) 2004-2006 Sylvain Rebaud
+|   Author: Sylvain Rebaud (sylvain@...)
+|
+ ****************************************************************/
+
+#ifndef _PLT_HTTP_SERVER_TASK_H_
+#define _PLT_HTTP_SERVER_TASK_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "NptDefs.h"
+#include "NptStrings.h"
+#include "NptSockets.h"
+#include "NptSystem.h"
+#include "NptHttp.h"
+#include "NptFile.h"
+#include "PltHttp.h"
+#include "PltDatagramStream.h"
+#include "PltThreadTask.h"
+
+/*----------------------------------------------------------------------
+|   forward declarations
++---------------------------------------------------------------------*/
+template <class T> class PLT_HttpListenTask;
+class PLT_HttpServerListener; 
+typedef PLT_HttpListenTask<PLT_HttpServerListener> PLT_HttpServerListenTask;
+
+/*----------------------------------------------------------------------
+|   PLT_HttpServerSocketTask class
++---------------------------------------------------------------------*/
+class PLT_HttpServerSocketTask : public PLT_ThreadTask
+{
+    friend class PLT_ThreadTask;
+
+public:
+    PLT_HttpServerSocketTask(NPT_Socket* socket, bool stay_alive_forever = false);
+
+protected:
+    virtual ~PLT_HttpServerSocketTask();
+
+protected:
+    // Request callback handler
+    virtual NPT_Result ProcessRequest(NPT_HttpRequest*   request, 
+                                      NPT_SocketInfo     info, 
+                                      NPT_HttpResponse*& response) = 0;
+
+    // overridables
+    virtual NPT_Result GetInputStream(NPT_InputStreamReference& stream);
+    virtual NPT_Result GetInfo(NPT_SocketInfo& info);
+
+    // PLT_ThreadTask methods
+    virtual void DoAbort() { m_Socket->Disconnect(); }
+    virtual void DoRun();
+
+private:
+    virtual NPT_Result Read(NPT_BufferedInputStreamReference& buffered_input_stream, 
+                            NPT_HttpRequest*&                 request, 
+                            NPT_SocketInfo&                   info);
+    virtual NPT_Result Write(NPT_HttpResponse* response, bool keep_alive);
+
+protected:
+    NPT_Socket*         m_Socket;
+    bool                m_StayAliveForever;
+};
+
+/*----------------------------------------------------------------------
+|   PLT_HttpServerTask class
++---------------------------------------------------------------------*/
+template <class T>
+class PLT_HttpServerTask : public PLT_HttpServerSocketTask
+{
+public:
+    PLT_HttpServerTask<T>(T*          data, 
+                          NPT_Socket* socket, 
+                          bool        keep_alive = false) : 
+        PLT_HttpServerSocketTask(socket, keep_alive), m_Data(data) {}
+
+protected:
+    virtual ~PLT_HttpServerTask<T>() {}
+
+protected:
+    NPT_Result ProcessRequest(NPT_HttpRequest*   request, 
+                              NPT_SocketInfo     info, 
+                              NPT_HttpResponse*& response) {
+        return m_Data->ProcessHttpRequest(request, info, response);
+    }
+
+protected:
+    T* m_Data;
+};
+
+/*----------------------------------------------------------------------
+|   PLT_HttpListenTask class
++---------------------------------------------------------------------*/
+template <class T>
+class PLT_HttpListenTask : public PLT_ThreadTask
+{
+public:
+    PLT_HttpListenTask<T>(T* data, NPT_TcpServerSocket* socket) : 
+        m_Data(data), m_Socket(socket) {}
+
+protected:
+    virtual ~PLT_HttpListenTask<T>() { 
+        delete m_Socket;
+    }
+
+protected:
+    // PLT_ThreadTask methods
+    virtual void DoAbort() { m_Socket->Disconnect(); }
+    virtual void DoRun() {
+        while (1) {
+            NPT_Socket* client = NULL;
+            NPT_Result  result = m_Socket->WaitForNewClient(client, 5000);
+            if (IsAborting(0) || (NPT_FAILED(result) && result != NPT_ERROR_TIMEOUT)) {
+                if (client) delete client;
+                break;
+            }
+
+            if (NPT_SUCCEEDED(result)) {
+                PLT_ThreadTask* task = new PLT_HttpServerTask<T>(m_Data, client);
+                if (NPT_FAILED(m_TaskManager->StartTask(task))) task->Kill();
+            }
+        }
+    }
+
+protected:
+    T*                   m_Data;
+    NPT_TcpServerSocket* m_Socket;
+};
+
+#endif /* _PLT_HTTP_SERVER_TASK_H_ */

Added: trunk/XBMC/xbmc/lib/libUPnP/PltLeaks.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltLeaks.h	                        (rev 0)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltLeaks.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -0,0 +1,26 @@
+/*****************************************************************
+|
+|   Platinum - Leaks
+|
+|   Copyright (c) 2004-2006 Sylvain Rebaud
+|   Author: Sylvain Rebaud (sylvain@...)
+|
+****************************************************************/
+
+#ifndef _PLT_LEAKS_H_
+#define _PLT_LEAKS_H_ 
+
+/*----------------------------------------------------------------------
+|   functions
++---------------------------------------------------------------------*/
+#if defined(__cplusplus)
+extern "C" {
+#endif 
+
+void PLT_Leak_Enable(void);
+
+#if defined(__cplusplus)
+}
+#endif 
+
+#endif /* _PLT_LEAKS_H_ */

Modified: trunk/XBMC/xbmc/lib/libUPnP/PltLog.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltLog.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltLog.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -34,4 +34,4 @@
 void PLT_SetLogLevel(unsigned long level);
 
 
-#endif // _PLT_LOG_H_
+#endif /* _PLT_LOG_H_ */

Modified: trunk/XBMC/xbmc/lib/libUPnP/PltMediaBrowser.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltMediaBrowser.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltMediaBrowser.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -1,6 +1,6 @@
 /*****************************************************************
 |
-|   Platinum - AV Media Server Control Point
+|   Platinum - AV Media Browser (Media Server Control Point)
 |
 |   Copyright (c) 2004-2006 Sylvain Rebaud
 |   Author: Sylvain Rebaud (sylvain@...)

Modified: trunk/XBMC/xbmc/lib/libUPnP/PltMediaBrowserListener.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltMediaBrowserListener.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltMediaBrowserListener.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -1,6 +1,6 @@
 /*****************************************************************
 |
-|   Platinum - AV Media Server Control Point Listener
+|   Platinum - AV Media Browser Listener
 |
 |   Copyright (c) 2004-2006 Sylvain Rebaud
 |   Author: Sylvain Rebaud (sylvain@...)
@@ -23,11 +23,11 @@
 public:
     PLT_BrowseInfo() : nr(0), tm(0), uid(0) {}
 
-    NPT_String                 object_id;
-    PLT_MediaItemListReference items;
-    unsigned long              nr;
-    unsigned long              tm;
-    unsigned long              uid;
+    NPT_String                   object_id;
+    PLT_MediaObjectListReference items;
+    unsigned long                nr;
+    unsigned long                tm;
+    unsigned long                uid;
 };
 
 /*----------------------------------------------------------------------

Added: trunk/XBMC/xbmc/lib/libUPnP/PltMediaController.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltMediaController.h	                        (rev 0)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltMediaController.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -0,0 +1,108 @@
+/*****************************************************************
+|
+|   Platinum - AV Media Controller (Media Renderer Control Point)
+|
+|   Copyright (c) 2004-2006 Sylvain Rebaud
+|   Author: Sylvain Rebaud (sylvain@...)
+|
+ ****************************************************************/
+
+#ifndef _PLT_MEDIA_CONTROLLER_H_
+#define _PLT_MEDIA_CONTROLLER_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "PltCtrlPoint.h"
+#include "PltMediaControllerListener.h"
+
+/*----------------------------------------------------------------------
+|   PLT_MediaController class
++---------------------------------------------------------------------*/
+class PLT_MediaController : public PLT_CtrlPointListener
+{
+public:
+    PLT_MediaController(PLT_CtrlPointReference& ctrl_point, PLT_MediaControllerListener* listener);
+    virtual ~PLT_MediaController();
+
+    // PLT_CtrlPointListener methods
+    virtual NPT_Result OnDeviceAdded(PLT_DeviceDataReference& device);
+    virtual NPT_Result OnDeviceRemoved(PLT_DeviceDataReference& device);
+    virtual NPT_Result OnActionResponse(NPT_Result res, PLT_Action* action, void* userdata);
+    virtual NPT_Result OnEventNotify(PLT_Service* service, NPT_List<PLT_StateVariable*>* vars);
+
+    // AVTransport
+    NPT_Result GetCurrentTransportActions(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
+    NPT_Result GetDeviceCapabilities(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
+    NPT_Result GetMediaInfo(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
+    NPT_Result GetPositionInfo(PLT_DeviceDataReference& device,  NPT_UInt32 instance_id, void* userdata);
+    NPT_Result GetTransportInfo(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
+    NPT_Result GetTransportSettings(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
+    NPT_Result Next(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
+    NPT_Result Pause(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
+    NPT_Result Play(PLT_DeviceDataReference&  device, NPT_UInt32 instance_id, NPT_String speed, void* userdata);
+    NPT_Result Previous(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
+    NPT_Result Seek(PLT_DeviceDataReference&  device, NPT_UInt32 instance_id, NPT_String unit, NPT_String target, void* userdata);
+    NPT_Result SetAVTransportURI(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, const char* uri, const char* metadata, void* userdata);
+    NPT_Result SetPlayMode(PLT_DeviceDataReference&  device, NPT_UInt32 instance_id, NPT_String new_play_mode, void* userdata);
+    NPT_Result Stop(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
+
+    // ConnectionManager
+    NPT_Result GetCurrentConnectionIDs(PLT_DeviceDataReference& device, void* userdata);
+    NPT_Result GetCurrentConnectionInfo(PLT_DeviceDataReference& device, NPT_UInt32 connection_id, void* userdata);
+    NPT_Result GetProtocolInfo(PLT_DeviceDataReference& device, void* userdata);
+
+private:
+    NPT_Result FindAction(PLT_DeviceDataReference& device, 
+                          const char*              service_type,
+                          const char*              action_name,
+                          PLT_Action*&             action);
+    NPT_Result CallAVTransportAction(PLT_DeviceDataReference&    device, 
+                                    const char*                  action_name,
+                                    NPT_UInt32                   instance_id,
+                                    PLT_Arguments*               args = NULL,
+                                    void*                        userdata = NULL);
+
+    NPT_Result OnGetCurrentTransportActionsResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_Action* action, void* userdata);
+    NPT_Result OnGetDeviceCapabilitiesResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_Action* action, void* userdata);
+    NPT_Result OnGetMediaInfoResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_Action* action, void* userdata);
+    NPT_Result OnGetPositionInfoResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_Action* action, void* userdata);
+    NPT_Result OnGetTransportInfoResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_Action* action, void* userdata);
+    NPT_Result OnGetTransportSettingsResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_Action* action, void* userdata);
+
+    NPT_Result OnGetCurrentConnectionIDsResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_Action* action, void* userdata);
+    NPT_Result OnGetCurrentConnectionInfoResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_Action* action, void* userdata);
+    NPT_Result OnGetProtocolInfoResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_Action* action, void* userdata);
+
+    static void ParseCSV(const char* csv, PLT_StringList& values) {
+        const char* start = csv;
+        const char* p = start;
+
+        // look for the , character
+        while (*p) {
+            if (*p == ',') {
+                NPT_String val(start, (int)(p-start));
+                val.Trim(' ');
+                values.Add(val);
+                start = p + 1;
+            }
+            p++;
+        }
+
+        // last one
+        NPT_String last(start, (int)(p-start));
+        last.Trim(' ');
+        if (last.GetLength()) {
+            values.Add(last);
+        }
+    }
+
+protected:
+    PLT_CtrlPointReference       m_CtrlPoint;
+    PLT_MediaControllerListener* m_Listener;
+
+private:
+    NPT_List<PLT_DeviceDataReference> m_MediaRenderers;
+};
+
+#endif /* _PLT_MEDIA_CONTROLLER_H_ */

Added: trunk/XBMC/xbmc/lib/libUPnP/PltMediaControllerListener.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltMediaControllerListener.h	                        (rev 0)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltMediaControllerListener.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -0,0 +1,179 @@
+/*****************************************************************
+|
+|   Platinum - AV Media Controller Listener
+|
+|   Copyright (c) 2004-2006 Sylvain Rebaud
+|   Author: Sylvain Rebaud (sylvain@...)
+|
+****************************************************************/
+
+#ifndef _PLT_MEDIA_CONTROLLER_LISTENER_H_
+#define _PLT_MEDIA_CONTROLLER_LISTENER_H_
+
+/*----------------------------------------------------------------------
+|   Defines
++---------------------------------------------------------------------*/
+typedef NPT_List<NPT_String> PLT_StringList;
+
+struct PLT_DeviceCapabilities {
+    PLT_StringList play_media;
+    PLT_StringList rec_media;
+    PLT_StringList rec_quality_modes;
+};
+
+struct PLT_MediaInfo {
+    NPT_UInt32    num_tracks;
+    NPT_TimeStamp media_duration;
+    NPT_String    cur_uri;
+    NPT_String    cur_metadata;
+    NPT_String    next_uri;
+    NPT_String    next_metadata;
+    NPT_String    play_medium;
+    NPT_String    rec_medium;
+    NPT_String    write_status;
+};
+
+struct PLT_PositionInfo {
+    NPT_UInt32    track;
+    NPT_TimeStamp track_duration;
+    NPT_String    track_metadata;
+    NPT_String    track_uri;
+    NPT_TimeStamp rel_time;
+    NPT_TimeStamp abs_time;
+    NPT_Int32     rel_count;
+    NPT_Int32     abs_count;
+};
+
+struct PLT_TransportInfo {
+    NPT_String cur_transport_state;
+    NPT_String cur_transport_status;
+    NPT_String cur_speed;
+};
+
+struct PLT_TransportSettings {
+    NPT_String play_mode;
+    NPT_String rec_quality_mode;
+};
+
+struct PLT_ConnectionInfo {
+    NPT_UInt32 rcs_id;
+    NPT_UInt32 avtransport_id;
+    NPT_String protocol_info;
+    NPT_String peer_connection_mgr;
+    NPT_UInt32 peer_connection_id;
+    NPT_String direction;
+    NPT_String status;
+};
+
+/*----------------------------------------------------------------------
+|   PLT_MediaControllerListener class
++---------------------------------------------------------------------*/
+class PLT_MediaControllerListener
+{
+public:
+    virtual ~PLT_MediaControllerListener() {}
+
+    virtual void OnMRAddedRemoved(PLT_DeviceDataReference& /* device */, 
+                                  int                      /* added */) {}
+    virtual void OnMRStateVariablesChanged(PLT_Service*                  /* service */, 
+                                           NPT_List<PLT_StateVariable*>* /* vars */) {}
+
+    // AVTransport
+    virtual void OnGetCurrentTransportActionsResult(
+        NPT_Result               /* res */, 
+        PLT_DeviceDataReference& /* device */,
+        PLT_StringList*          /* actions */, 
+        void*                    /* userdata */) {}
+
+    virtual void OnGetDeviceCapabilitiesResult(
+        NPT_Result               /* res */, 
+        PLT_DeviceDataReference& /* device */,
+        PLT_DeviceCapabilities*  /* capabilities */,
+        void*                    /* userdata */) {}
+
+    virtual void OnGetMediaInfoResult(
+        NPT_Result               /* res */,
+        PLT_DeviceDataReference& /* device */,
+        PLT_MediaInfo*           /* info */,
+        void*                    /* userdata */) {}
+
+    virtual void OnGetPositionInfoResult(
+        NPT_Result               /* res */,
+        PLT_DeviceDataReference& /* device */,
+        PLT_PositionInfo*        /* info */,
+        void*                    /* userdata */) {}
+
+    virtual void OnGetTransportInfoResult(
+        NPT_Result               /* res */,
+        PLT_DeviceDataReference& /* device */,
+        PLT_TransportInfo*       /* info */,
+        void*                    /* userdata */) {}
+
+    virtual void OnGetTransportSettingsResult(
+        NPT_Result               /* res */,
+        PLT_DeviceDataReference& /* device */,
+        PLT_TransportSettings*   /* settings */,
+        void*                    /* userdata */) {}
+
+    virtual void OnNextResult(
+        NPT_Result               /* res */,
+        PLT_DeviceDataReference& /* device */,
+        void*                    /* userdata */) {}
+
+    virtual void OnPauseResult(
+        NPT_Result               /* res */,
+        PLT_DeviceDataReference& /* device */,
+        void*                    /* userdata */) {}  
+
+    virtual void OnPlayResult(
+        NPT_Result               /* res */,
+        PLT_DeviceDataReference& /* device */,
+        void*                    /* userdata */) {}
+
+    virtual void OnPreviousResult(
+        NPT_Result               /* res */,
+        PLT_DeviceDataReference& /* device */,
+        void*                    /* userdata */) {}
+
+    virtual void OnSeekResult(
+        NPT_Result               /* res */,
+        PLT_DeviceDataReference& /* device */,
+        void*                    /* userdata */) {}
+
+    virtual void OnSetAVTransportURIResult(
+        NPT_Result               /* res */,
+        PLT_DeviceDataReference& /* device */,
+        void*                    /* userdata */) {}
+
+    virtual void OnSetPlayModeResult(
+        NPT_Result               /* res */,
+        PLT_DeviceDataReference& /* device */,
+        void*                    /* userdata */) {}
+
+    virtual void OnStopResult(
+        NPT_Result               /* res */,
+        PLT_DeviceDataReference& /* device */,
+        void*                    /* userdata */) {}
+
+    // ConnectionManager
+    virtual void OnGetCurrentConnectionIDsResult(
+        NPT_Result               /* res */,
+        PLT_DeviceDataReference& /* device */,
+        PLT_StringList*          /* ids */,
+        void*                    /* userdata */) {}
+
+    virtual void OnGetCurrentConnectionInfoResult(
+        NPT_Result               /* res */,
+        PLT_DeviceDataReference& /* device */,
+        PLT_ConnectionInfo*      /* info */,
+        void*                    /* userdata */) {}
+
+    virtual void OnGetProtocolInfoResult(
+        NPT_Result               /* res */,
+        PLT_DeviceDataReference& /* device */,
+        PLT_StringList*          /* sources */,
+        PLT_StringList*          /* sinks */,
+        void*                    /* userdata */) {}
+};
+
+#endif /* _PLT_MEDIA_CONTROLLER_LISTENER_H_ */

Modified: trunk/XBMC/xbmc/lib/libUPnP/PltMediaItem.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltMediaItem.h	2007-01-04 00:11:41 UTC (rev 7473)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltMediaItem.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -17,6 +17,7 @@
 #include "NptList.h"
 #include "NptArray.h"
 #include "NptReferences.h"
+#include "NptXml.h"
 
 /*----------------------------------------------------------------------
 |   forward declarations
@@ -24,13 +25,76 @@
 class PLT_MediaServer;
 
 /*----------------------------------------------------------------------
-|   constants
+|   typedefs
 +---------------------------------------------------------------------*/
-typedef enum {
-    PLT_PROPERTIES_SEARCHABLE = 0x00000001,
-    PLT_PROPERTIES_RESTRICTED = 0x00000002
-} PLT_PropertiesType;
+typedef struct { 
+    NPT_String type;
+    NPT_String friendly_name;
+} PLT_ObjectClass;
 
+typedef struct { 
+    NPT_String type;
+    NPT_String friendly_name;
+    bool       include_derived;
+} PLT_SearchClass;
+
+typedef struct {
+    NPT_String allowed_use; // (CSV)
+    NPT_String validity_start;
+    NPT_String validity_end;
+    NPT_String remaining_time;
+    NPT_String usage_info;
+    NPT_String rights_info_uri;
+    NPT_String content_info_uri;
+} PLT_Constraint;
+
+typedef struct {
+    NPT_String artist;
+    NPT_String artist_role;
+    NPT_String actor;
+    NPT_String actor_role;
+    NPT_String author;
+    NPT_String author_role;
+    NPT_String producer;
+    NPT_String director;
+    NPT_String publisher;
+    NPT_String contributor; // should match m_Creator (dc:creator)
+} PLT_PeopleInfo;
+
+typedef struct {
+    NPT_String genre;
+    NPT_String genre_id;
+    NPT_String genre_extended; // (CSV)
+    NPT_String album;
+    NPT_String playlist; // dc:title of the playlist item the content belongs too
+} PLT_AffiliationInfo;
+
+typedef struct {
+    NPT_String description;
+    NPT_String long_description;
+    NPT_String icon_uri;
+    NPT_String region;
+    NPT_String rating;
+    NPT_String rights;
+    NPT_String date;
+    NPT_String language;
+} PLT_Description;
+
+typedef struct {
+    NPT_String album_art_uri;
+    NPT_String artist_discography_uri;
+    NPT_String lyrics_uri;
+    NPT_List<NPT_String> relation; // dc:relation
+} PLT_ExtraInfo;
+
+typedef struct {
+    NPT_Integer total;
+    NPT_Integer used;
+    NPT_Integer free;
+    NPT_Integer max_partition;
+    NPT_String  medium;
+} PLT_StorageInfo;
+
 /*----------------------------------------------------------------------
 |   PLT_MediaItemResource class
 +---------------------------------------------------------------------*/
@@ -45,70 +109,112 @@
     NPT_Integer m_Duration; /* seconds */
     NPT_Integer m_Size;
     NPT_String  m_Protection;
+    NPT_UInt32  m_Bitrate; /* bytes/seconds */
+    NPT_UInt32  m_BitsPerSample;
+    NPT_UInt32  m_SampleFrequency;
+    NPT_UInt32  m_NbAudioChannels;
+    NPT_String  m_Resolution;
+    NPT_UInt32  m_ColorDepth;
 };
 
 /*----------------------------------------------------------------------
-|   PLT_MediaItem class
+|   PLT_MediaObject class
 +---------------------------------------------------------------------*/
-class PLT_MediaItem
+class PLT_MediaObject
 {
 public:
-    PLT_MediaItem();
-    ~PLT_MediaItem(void);
+    PLT_MediaObject() {}
+    virtual ~PLT_MediaObject() {}
 
-    void        Reset();
-    bool        IsContainer() { return m_ObjectClass.StartsWith("object.container"); }
+    bool IsContainer() { return m_ObjectClass.type.StartsWith("object.container"); }
 
     static const char* GetExtFromFilePath(const NPT_String filepath, const char* dir_delimiter);
     static const char* GetProtInfoFromExt(const char* ext);
     static const char* GetUPnPClassFromExt(const char* ext);
 
+    virtual NPT_Result Reset();
+    virtual NPT_Result ToDidl(NPT_UInt32 mask, NPT_String& didl);
+    virtual NPT_Result FromDidl(NPT_XmlElementNode* entry);
+
+public:
     /* common properties */
-    NPT_String m_ObjectClass;
-    NPT_String m_ObjectID;
-    NPT_String m_ParentID;
+    PLT_ObjectClass m_ObjectClass;
+    NPT_String      m_ObjectID;
+    NPT_String      m_ParentID;
 
     /* metadata */
-    NPT_String m_Title;
-    NPT_String m_Creator;
-    NPT_String m_Artist;
-    NPT_String m_Album;
-    NPT_String m_Genre;
+    NPT_String          m_Title;
+    NPT_String          m_Creator;
+    PLT_PeopleInfo      m_People;
+    PLT_AffiliationInfo m_Affiliation;
+    PLT_Description     m_Description;
 
+    /* properties */
+    bool m_Restricted;
+
     /* extras */
-    NPT_String m_Description;
-    NPT_String m_AlbumArtURI;
+    PLT_ExtraInfo m_ExtraInfo;
 
     /* resources related */
     NPT_Array<PLT_MediaItemResource> m_Resources;
 
-    /* type */
-    NPT_UInt8 m_Flags;
+    /* original DIDL for Control Points to pass to a renderer when invoking SetAVTransportURI */
+    NPT_String      m_Didl;    
+};
 
-    /* container info related */
-    NPT_Int32 m_ChildrenCount;
+/*----------------------------------------------------------------------
+|   PLT_MediaItem class
++---------------------------------------------------------------------*/
+class PLT_MediaItem : public PLT_MediaObject
+{
+public:
+    PLT_MediaItem();
+    virtual ~PLT_MediaItem();
 
-    /* original DIDL for Control Points to pass to a renderer when invoking SetAVTransportURI */
-    NPT_String m_Didl;
+    // PLT_MediaObject methods
+    NPT_Result ToDidl(NPT_UInt32 mask, NPT_String& didl);
+    NPT_Result FromDidl(NPT_XmlElementNode* entry);
+};
 
-private:
-    friend class PLT_MediaServer;
+/*----------------------------------------------------------------------
+|   PLT_MediaContainer class
++---------------------------------------------------------------------*/
+class PLT_MediaContainer : public PLT_MediaObject
+{
+public:
+    PLT_MediaContainer();
+    virtual ~PLT_MediaContainer();
+
+    // PLT_MediaObject methods
+    NPT_Result Reset();
+    NPT_Result ToDidl(NPT_UInt32 mask, NPT_String& didl);
+    NPT_Result FromDidl(NPT_XmlElementNode* entry);
+
+public:
+    NPT_List<PLT_SearchClass> m_SearchClasses;
+
+    /* properties */
+    bool m_Searchable;
+
+    /* container info related */
+    NPT_Int32 m_ChildrenCount;    
 };
 
 /*----------------------------------------------------------------------
-|   PLT_MediaItemList class
+|   PLT_MediaObjectList class
 +---------------------------------------------------------------------*/
-class PLT_MediaItemList : public NPT_List<PLT_MediaItem*>
+class PLT_MediaObjectList : public NPT_List<PLT_MediaObject*>
 {
 public:
-    PLT_MediaItemList();
+    PLT_MediaObjectList();
 
 protected:
-    virtual ~PLT_MediaItemList(void);
-    friend class NPT_Reference<PLT_MediaItemList>;
+    virtual ~PLT_MediaObjectList(void);
+    friend class NPT_Reference<PLT_MediaObjectList>;
 };
 
-typedef NPT_Reference<PLT_MediaItemList> PLT_MediaItemListReference;
+typedef NPT_Reference<PLT_MediaObjectList> PLT_MediaObjectListReference;
+typedef NPT_Reference<PLT_MediaObject> PLT_MediaObjectReference;
 
 
 #endif /* _PLT_MEDIA_ITEM_H_ */

Added: trunk/XBMC/xbmc/lib/libUPnP/PltMediaPlaylist.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltMediaPlaylist.h	                        (rev 0)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltMediaPlaylist.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -0,0 +1,62 @@
+/*****************************************************************
+|
+|   Platinum - AV Media Playlist
+|
+|   Copyright (c) 2004-2006 Sylvain Rebaud
+|   Author: Sylvain Rebaud (sylvain@...)
+|
+****************************************************************/
+
+#ifndef _PLT_MEDIA_PLAYLIST_H_
+#define _PLT_MEDIA_PLAYLIST_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "NptStrings.h"
+#include "NptList.h"
+#include "PltMediaItem.h"
+
+/*----------------------------------------------------------------------
+|   typedefs
++---------------------------------------------------------------------*/
+typedef NPT_List<PLT_MediaItem*> PLT_MediaItemList;
+typedef NPT_Reference<PLT_MediaItemList> PLT_MediaItemListReference;
+
+/*----------------------------------------------------------------------
+|   PLT_MediaPlaylist class
++---------------------------------------------------------------------*/
+class PLT_MediaPlaylist
+{
+public:
+    PLT_MediaPlaylist();
+    ~PLT_MediaPlaylist(void);
+
+    NPT_Result  Clear();
+    NPT_Result  Queue(PLT_MediaItem* item);
+    NPT_Result  Queue(PLT_MediaItemList* list);
+    template <typename X> 
+    NPT_Result  Apply(const X& function) {
+        return m_List->Apply(function);
+    }
+
+private:
+    PLT_MediaItemListReference m_List;
+};
+
+/*----------------------------------------------------------------------
+|   PLT_MediaItemQueueIterator class
++---------------------------------------------------------------------*/
+class PLT_MediaItemQueueIterator
+{
+public:
+    PLT_MediaItemQueueIterator(PLT_MediaPlaylist* playlist) : m_Playlist(playlist) {}
+    NPT_Result operator()(PLT_MediaItem*& item) const {
+        return m_Playlist->Queue(item);
+    }
+
+private:
+    PLT_MediaPlaylist* m_Playlist;
+};
+
+#endif /* _PLT_MEDIA_PLAYLIST_H_ */

Added: trunk/XBMC/xbmc/lib/libUPnP/PltMediaRenderer.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltMediaRenderer.h	                        (rev 0)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltMediaRenderer.h	2007-01-04 02:53:09 UTC (rev 7474)
@@ -0,0 +1,74 @@
+/*****************************************************************
+|
+|   Platinum - AV Media Renderer Device
+|
+|   Copyright (c) 2004-2006 Sylvain Rebaud
+|   Author: Sylvain Rebaud (sylvain@...)
+|
+ ****************************************************************/
+
+#ifndef _PLT_MEDIA_RENDERER_H_
+#define _PLT_MEDIA_RENDERER_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "PltDeviceHost.h"
+

@@ Diff output truncated at 100000 characters. @@

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

Revision: 7491
          http://svn.sourceforge.net/xbmc/?rev=7491&view=rev
Author:   c0diq
Date:     2007-01-06 00:21:30 -0800 (Sat, 06 Jan 2007)

Log Message:
-----------
- putting UPnP CtrlPoint Reference in a holder class so we can access it later to set a UUID to ignore

Modified Paths:
--------------
    trunk/XBMC/xbmc/FileSystem/UPnPDirectory.cpp
    trunk/XBMC/xbmc/FileSystem/UPnPDirectory.h
    trunk/XBMC/xbmc/lib/libUPnP/libPlatinumd.lib

Modified: trunk/XBMC/xbmc/FileSystem/UPnPDirectory.cpp
===================================================================
--- trunk/XBMC/xbmc/FileSystem/UPnPDirectory.cpp	2007-01-06 04:15:39 UTC (rev 7490)
+++ trunk/XBMC/xbmc/FileSystem/UPnPDirectory.cpp	2007-01-06 08:21:30 UTC (rev 7491)
@@ -33,6 +33,18 @@
 
 CUPnP* CUPnP::upnp = NULL;
 
+/*----------------------------------------------------------------------
+|   CCtrlPointReferenceHolder class
++---------------------------------------------------------------------*/
+class CCtrlPointReferenceHolder
+{
+public:
+    PLT_CtrlPointReference m_CtrlPoint;
+};
+
+/*----------------------------------------------------------------------
+|   CUPnPCleaner class
++---------------------------------------------------------------------*/
 class CUPnPCleaner : public NPT_Thread
 {
 public:
@@ -44,28 +56,40 @@
     CUPnP* m_UPnP;
 };
 
-CUPnP::CUPnP()
+/*----------------------------------------------------------------------
+|   CUPnP::CUPnP
++---------------------------------------------------------------------*/
+CUPnP::CUPnP() :
+    m_CtrlPointHolder(new CCtrlPointReferenceHolder())
 {
     //PLT_SetLogLevel(PLT_LOG_LEVEL_4);
     m_UPnP = new PLT_UPnP(1900, false);
-    PLT_CtrlPointReference ctrl_point(new PLT_CtrlPoint());
-    m_UPnP->AddCtrlPoint(ctrl_point);
+    m_CtrlPointHolder->m_CtrlPoint = new PLT_CtrlPoint();
+    m_UPnP->AddCtrlPoint(m_CtrlPointHolder->m_CtrlPoint);
     m_UPnP->Start();
-    m_MediaBrowser = new PLT_SyncMediaBrowser(ctrl_point);
 
+    m_MediaBrowser = new PLT_SyncMediaBrowser(m_CtrlPointHolder->m_CtrlPoint);
+
     // Issue a search request on the broadcast address instead of the upnp multicast address 239.255.255.250
     // since the xbox does not support multicast. UPnP devices will still respond to us
     // Repeat every 6 seconds
-    ctrl_point->Discover(NPT_HttpUrl("255.255.255.255", 1900, "*"), "upnp:rootdevice", 1, 6000);
+    m_CtrlPointHolder->m_CtrlPoint->Discover(NPT_HttpUrl("255.255.255.255", 1900, "*"), "upnp:rootdevice", 1, 6000);
 }
 
+/*----------------------------------------------------------------------
+|   CUPnP::~CUPnP
++---------------------------------------------------------------------*/
 CUPnP::~CUPnP()
 {
     m_UPnP->Stop();
     delete m_UPnP;
     delete m_MediaBrowser;
+    delete m_CtrlPointHolder;
 }
 
+/*----------------------------------------------------------------------
+|   CUPnP::GetInstance
++---------------------------------------------------------------------*/
 CUPnP*
 CUPnP::GetInstance()
 {
@@ -76,6 +100,9 @@
     return upnp;
 }
 
+/*----------------------------------------------------------------------
+|   CUPnP::ReleaseInstance
++---------------------------------------------------------------------*/
 void
 CUPnP::ReleaseInstance()
 {
@@ -88,6 +115,18 @@
     }
 }
 
+/*----------------------------------------------------------------------
+|   CUPnP::IgnoreUUID
++---------------------------------------------------------------------*/
+void
+CUPnP::IgnoreUUID(const char* uuid)
+{
+    m_CtrlPointHolder->m_CtrlPoint->SetUUIDToIgnore(uuid);
+}
+
+/*----------------------------------------------------------------------
+|   CUPnPDirectory::GetFriendlyName
++---------------------------------------------------------------------*/
 const char* 
 CUPnPDirectory::GetFriendlyName(const char* url)
 {
@@ -117,6 +156,9 @@
     return (const char*)(*device)->GetFriendlyName();
 }
 
+/*----------------------------------------------------------------------
+|   CUPnPDirectory::GetDirectory
++---------------------------------------------------------------------*/
 bool 
 CUPnPDirectory::GetDirectory(const CStdString& strPath, CFileItemList &items)
 {
@@ -231,11 +273,11 @@
                 if ((*entry)->m_Resources.GetItemCount()) {
                     // if http protocol, override url with upnp so that it triggers the use of PAPLAYER instead of MPLAYER
                     // somehow MPLAYER tries to http stream the wma even though the server doesn't support it.
-                    if ((*entry)->m_Resources[0].m_Uri.Left(4).Compare("http", true) == 0) {
-                        pItem->m_strPath = (const char*) NPT_String("upnp") + (*entry)->m_Resources[0].m_Uri.SubString(4);
-                    } else {
+                    //if ((*entry)->m_Resources[0].m_Uri.Left(4).Compare("http", true) == 0) {
+                    //    pItem->m_strPath = (const char*) NPT_String("upnp") + (*entry)->m_Resources[0].m_Uri.SubString(4);
+                    //} else {
                         pItem->m_strPath = (const char*) (*entry)->m_Resources[0].m_Uri;
-                    }
+                    //}
 
                     if ((*entry)->m_Resources[0].m_Size > 0) {
                         pItem->m_dwSize  = (*entry)->m_Resources[0].m_Size;

Modified: trunk/XBMC/xbmc/FileSystem/UPnPDirectory.h
===================================================================
--- trunk/XBMC/xbmc/FileSystem/UPnPDirectory.h	2007-01-06 04:15:39 UTC (rev 7490)
+++ trunk/XBMC/xbmc/FileSystem/UPnPDirectory.h	2007-01-06 08:21:30 UTC (rev 7491)
@@ -28,6 +28,7 @@
 /* forward declarations */
 class PLT_UPnP;
 class PLT_SyncMediaBrowser;
+class CCtrlPointReferenceHolder;
 
 using namespace DIRECTORY;
 
@@ -41,7 +42,9 @@
     CUPnP();
     ~CUPnP();
 
-    // methods
+    void IgnoreUUID(const char* uuid);
+
+    // class methods
     static CUPnP* GetInstance();
     static void   ReleaseInstance();
     static bool   IsInstantiated() { return upnp != NULL; }
@@ -49,8 +52,9 @@
 private:
     friend class CUPnPDirectory;
 
-    PLT_UPnP*              m_UPnP;
-    PLT_SyncMediaBrowser*  m_MediaBrowser;
+    PLT_UPnP*                   m_UPnP;
+    PLT_SyncMediaBrowser*       m_MediaBrowser;
+    CCtrlPointReferenceHolder*  m_CtrlPointHolder;
 
     static CUPnP* upnp;
 };

Modified: trunk/XBMC/xbmc/lib/libUPnP/libPlatinumd.lib
===================================================================
(Binary files differ)


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

Revision: 7494
          http://svn.sourceforge.net/xbmc/?rev=7494&view=rev
Author:   kraqh3d
Date:     2007-01-06 10:55:15 -0800 (Sat, 06 Jan 2007)

Log Message:
-----------
fixed: music windows will auto-update when the music scan completes.

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIDialogMusicScan.cpp
    trunk/XBMC/xbmc/GUIWindowMusicBase.cpp
    trunk/XBMC/xbmc/GUIWindowMusicSongs.cpp

Modified: trunk/XBMC/xbmc/GUIDialogMusicScan.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogMusicScan.cpp	2007-01-06 17:02:17 UTC (rev 7493)
+++ trunk/XBMC/xbmc/GUIDialogMusicScan.cpp	2007-01-06 18:55:15 UTC (rev 7494)
@@ -102,6 +102,10 @@
 
 void CGUIDialogMusicScan::OnFinished()
 {
+  // clear cache
+  CUtil::DeleteDatabaseDirectoryCache();
+
+  // send message
   CGUIMessage msg(GUI_MSG_SCAN_FINISHED, 0, 0, 0);
   m_gWindowManager.SendThreadMessage(msg);
 
@@ -109,9 +113,6 @@
   CLog::Log(LOGINFO,"Music scan was stopped or finished ... restoring FindRemoteThumbs");
   g_application.RestoreMusicScanSettings();
 
-  // clear cache after finished
-  CUtil::DeleteDatabaseDirectoryCache();
-
   Close();
 }
 

Modified: trunk/XBMC/xbmc/GUIWindowMusicBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicBase.cpp	2007-01-06 17:02:17 UTC (rev 7493)
+++ trunk/XBMC/xbmc/GUIWindowMusicBase.cpp	2007-01-06 18:55:15 UTC (rev 7494)
@@ -129,11 +129,13 @@
     }
     break;
 
-   case GUI_MSG_REFRESH_THUMBS:
-     {
-       Update(m_vecItems.m_strPath);
-     }
-     break;
+    // update the display
+    case GUI_MSG_SCAN_FINISHED:
+    case GUI_MSG_REFRESH_THUMBS:
+    {
+      Update(m_vecItems.m_strPath);
+    }
+    break;
 
   case GUI_MSG_CLICKED:
     {

Modified: trunk/XBMC/xbmc/GUIWindowMusicSongs.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicSongs.cpp	2007-01-06 17:02:17 UTC (rev 7493)
+++ trunk/XBMC/xbmc/GUIWindowMusicSongs.cpp	2007-01-06 18:55:15 UTC (rev 7494)
@@ -154,12 +154,6 @@
     }
     break;
 
-  case GUI_MSG_SCAN_FINISHED:
-    {
-      Update(m_vecItems.m_strPath);
-    }
-    break;
-
   case GUI_MSG_CLICKED:
     {
       int iControl = message.GetSenderId();


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

Revision: 7511
          http://svn.sourceforge.net/xbmc/?rev=7511&view=rev
Author:   darkdonno
Date:     2007-01-06 19:41:10 -0800 (Sat, 06 Jan 2007)

Log Message:
-----------
changed: cleaned up settings.cpp/.h

Modified Paths:
--------------
    trunk/XBMC/xbmc/Settings.cpp
    trunk/XBMC/xbmc/Settings.h

Modified: trunk/XBMC/xbmc/Settings.cpp
===================================================================
--- trunk/XBMC/xbmc/Settings.cpp	2007-01-07 03:40:48 UTC (rev 7510)
+++ trunk/XBMC/xbmc/Settings.cpp	2007-01-07 03:41:10 UTC (rev 7511)
@@ -15,7 +15,9 @@
 #include "xbox/Network.h"
 #include "filesystem/MultiPathDirectory.h"
 #include "GUIBaseContainer.h" // for VIEW_TYPE enum
-
+#ifdef HAS_XBOX_HARDWARE
+#include "utils/MemoryUnitManager.h"
+#endif
 struct CSettings::stSettings g_stSettings;
 struct CSettings::AdvancedSettings g_advancedSettings;
 class CSettings g_settings;
@@ -25,6 +27,24 @@
 //uncomment to use new multipath:// protocol while still in development
 //#define	MULTIPATH 1
 
+bool CShare::isWritable()
+{
+  if (strPath[1] == ':' && (strPath[0] != 'D' && strPath[0] != 'd'))
+    return true; // local disk
+  if (strPath.size() > 4)
+  {
+    if (strPath.substr(0,4) == "smb:")
+      return true; // smb path
+    #ifdef HAS_XBOX_HARDWARE
+    else if (strPath.substr(0,4) == "mem:")
+    {
+      return g_memoryUnitManager.IsDriveWriteable(strPath);
+    }
+    #endif
+  }
+
+  return false;
+}
 void CShare::FromNameAndPaths(const CStdString &category, const CStdString &name, const vector<CStdString> &paths)
 {
   vecPaths = paths;
@@ -109,7 +129,7 @@
   strcpy( g_stSettings.m_szDefaultPictures, "");
   strcpy( g_stSettings.m_szDefaultFiles, "");
   strcpy( g_stSettings.m_szDefaultVideos, "");
-  
+
   g_stSettings.m_bMyMusicSongInfoInVis = true;    // UNUSED - depreciated.
   g_stSettings.m_bMyMusicSongThumbInVis = false;  // used for music info in vis screen
 
@@ -246,14 +266,14 @@
   // load settings file...
   bXboxMediacenter = bSettings = false;
 
-  char szDevicePath[1024]; 
+  char szDevicePath[1024];
   CIoSupport helper;
   CStdString strMnt = GetProfileUserDataFolder();
   if (GetProfileUserDataFolder().Left(2).Equals("Q:"))
   {
     CUtil::GetHomePath(strMnt);
     strMnt += GetProfileUserDataFolder().substr(2);
-  }    
+  }
   helper.GetPartition(strMnt, szDevicePath);
   strcat(szDevicePath,strMnt.c_str()+2);
   helper.Unmount("P:");
@@ -546,7 +566,7 @@
     }
     pPathName = pPathName->NextSibling("path");
   }
-  
+
   const TiXmlNode *pCacheNode = bookmark->FirstChild("cache");
   const TiXmlNode *pDepthNode = bookmark->FirstChild("depth");
   const TiXmlNode *pLockMode = bookmark->FirstChild("lockmode");
@@ -591,9 +611,9 @@
           else
             bIsInvalid = true;
         }
-        
+
         // error message
-        if (bIsInvalid)   
+        if (bIsInvalid)
           CLog::Log(LOGERROR,"    Invalid path type (%s) for multipath bookmark", vecPaths[j].c_str());
       }
 
@@ -945,7 +965,7 @@
 	  GetInteger(pElement, "httpapibroadcastlevel", g_stSettings.m_HttpApiBroadcastLevel, 0, 0,5);
 	  GetInteger(pElement, "httpapibroadcastport", g_stSettings.m_HttpApiBroadcastPort, 8278, 1, 65535);
   }
-  
+
   pElement = pRootElement->FirstChildElement("defaultvideosettings");
   if (pElement)
   {
@@ -1084,7 +1104,7 @@
   }
 
   GetFloat(pRootElement, "playcountminimumpercent", g_advancedSettings.m_playCountMinimumPercent, 10.0f, 1.0f, 100.0f);
-  
+
   pElement = pRootElement->FirstChildElement("samba");
   if (pElement)
   {
@@ -1124,7 +1144,7 @@
           continue;
         g_stSettings.m_pictureExtensions.erase(iPos,exts[i].size()+1);
       }
-    }    
+    }
   }
   pExts = pRootElement->FirstChildElement("musicextensions");
   if (pExts)
@@ -1144,7 +1164,7 @@
           continue;
         g_stSettings.m_musicExtensions.erase(iPos,exts[i].size()+1);
       }
-    }    
+    }
   }
   pExts = pRootElement->FirstChildElement("videoextensions");
   if (pExts)
@@ -1164,9 +1184,9 @@
           continue;
         g_stSettings.m_videoExtensions.erase(iPos,exts[i].size()+1);
       }
-    }    
+    }
   }
-  
+
   XMLUtils::GetBoolean(pRootElement, "displayremotecodes", g_advancedSettings.m_displayRemoteCodes);
 
   // TODO: Should cache path be given in terms of our predefined paths??
@@ -1227,7 +1247,7 @@
         if (strFrom.IsEmpty())
           CLog::Log(LOGERROR,"  Missing <from> tag");
         else
-          CLog::Log(LOGERROR,"  Missing <to> tag");          
+          CLog::Log(LOGERROR,"  Missing <to> tag");
       }
 
       // get next one
@@ -1381,7 +1401,7 @@
   }
 
   // Delete the plugged avpack root if it exists, then recreate it
-  // TODO : to support custom avpack settings, the two XMLs should 
+  // TODO : to support custom avpack settings, the two XMLs should
   // be synchronized, not just overwrite the old one
   TiXmlNode *pRoot = pMainElement->FirstChild(GetPluggedAvpack());
   if (pRoot)
@@ -1505,7 +1525,7 @@
   SetBoolean(pNode, "cleantitles", g_stSettings.m_bMyVideoCleanTitles);
   SetString(pNode, "cleantokens", g_stSettings.m_szMyVideoCleanTokens);
   SetString(pNode, "cleanseparators", g_stSettings.m_szMyVideoCleanSeparators);
-  
+
   SetInteger(pNode, "watchmode", g_stSettings.m_iMyVideoWatchMode);
 
   { // playlist window
@@ -1539,9 +1559,9 @@
   SetString(pNode, "kaiarenapass", g_stSettings.szOnlineArenaPassword);
   SetString(pNode, "kaiarenadesc", g_stSettings.szOnlineArenaDescription);
   SetInteger(pNode, "systemtotaluptime", g_stSettings.m_iSystemTimeTotalUp);
-  SetInteger(pNode, "httpapibroadcastport", g_stSettings.m_HttpApiBroadcastPort); 
+  SetInteger(pNode, "httpapibroadcastport", g_stSettings.m_HttpApiBroadcastPort);
   SetInteger(pNode, "httpapibroadcastlevel", g_stSettings.m_HttpApiBroadcastLevel);
-    
+
   // default video settings
   TiXmlElement videoSettingsNode("defaultvideosettings");
   pNode = pRoot->InsertEndChild(videoSettingsNode);
@@ -1591,7 +1611,7 @@
 }
 
 bool CSettings::LoadProfile(int index)
-{  
+{
   int iOldIndex = m_iLastLoadedProfileIndex;
   m_iLastLoadedProfileIndex = index;
   bool bSourcesXML=true;
@@ -1633,7 +1653,7 @@
     }
     else
     {
-      g_audioManager.DeInitialize(CAudioContext::DEFAULT_DEVICE); // needs to reset 
+      g_audioManager.DeInitialize(CAudioContext::DEFAULT_DEVICE); // needs to reset
       g_audioManager.Initialize(CAudioContext::DEFAULT_DEVICE);
       g_audioManager.Load();
     }
@@ -1684,7 +1704,7 @@
   }
 
   m_iLastLoadedProfileIndex = iOldIndex;
- 
+
   return false;
 }
 
@@ -1775,7 +1795,7 @@
     CStdString strName;
     XMLUtils::GetString(pProfile,"name",strName);
     profile.setName(strName);
-    
+
     CStdString strDirectory;
     XMLUtils::GetString(pProfile,"directory",strDirectory);
     profile.setDirectory(strDirectory);
@@ -1791,11 +1811,11 @@
     bHas = true;
     XMLUtils::GetBoolean(pProfile, "canwritedatabases", bHas);
     profile.setWriteDatabases(bHas);
-    
+
     bHas = true;
     XMLUtils::GetBoolean(pProfile, "hassources", bHas);
     profile.setSources(bHas);
-    
+
     bHas = true;
     XMLUtils::GetBoolean(pProfile, "canwritesources", bHas);
     profile.setWriteSources(bHas);
@@ -1803,7 +1823,7 @@
     bHas = false;
     XMLUtils::GetBoolean(pProfile, "locksettings", bHas);
     profile.setSettingsLocked(bHas);
-    
+
     bHas = false;
     XMLUtils::GetBoolean(pProfile, "lockfiles", bHas);
     profile.setFilesLocked(bHas);
@@ -1811,7 +1831,7 @@
     bHas = false;
     XMLUtils::GetBoolean(pProfile, "lockmusic", bHas);
     profile.setMusicLocked(bHas);
-    
+
     bHas = false;
     XMLUtils::GetBoolean(pProfile, "lockvideo", bHas);
     profile.setVideoLocked(bHas);
@@ -1830,7 +1850,7 @@
     int iLockMode=LOCK_MODE_EVERYONE;
     XMLUtils::GetInt(pProfile,"lockmode",iLockMode);
     if (iLockMode > LOCK_MODE_QWERTY || iLockMode < 0)
-      iLockMode = LOCK_MODE_EVERYONE; 
+      iLockMode = LOCK_MODE_EVERYONE;
     profile.setLockMode(iLockMode);
 
     CStdString strLockCode;
@@ -1868,7 +1888,7 @@
     SetString(pNode,"thumbnail",g_settings.m_vecProfiles[iProfile].getThumb());
     SetString(pNode,"lastdate",g_settings.m_vecProfiles[iProfile].getDate());
     SetBoolean(pNode,"useavpacksettings",g_settings.m_vecProfiles[iProfile].useAvpackSettings());
-    
+
     if (g_settings.m_vecProfiles[0].getLockMode() != LOCK_MODE_EVERYONE)
     {
       SetInteger(pNode,"lockmode",g_settings.m_vecProfiles[iProfile].getLockMode());
@@ -1934,7 +1954,7 @@
 {
   if (!LoadXml()) return false;
   VECSHARES *pShares = GetSharesFromType(type);
-  
+
   if (!pShares) return false;
 
   // update our current share list
@@ -2025,7 +2045,7 @@
   if (!LoadXml()) return false;
 
   VECSHARES *pShares = GetSharesFromType(strType);
-  
+
   if (!pShares) return false;
 
   // disallow virtual paths
@@ -2063,7 +2083,7 @@
 
   // Update our XML file as well
   TiXmlElement *pRootElement = xbmcXml.RootElement();
-  
+
   TiXmlNode *pNode = NULL;
   TiXmlNode *pIt = NULL;
 
@@ -2110,7 +2130,7 @@
             TiXmlNode* pChild2 = pIt->FirstChild("thumbnail");
             if (pChild2)
               pIt->RemoveChild(pChild2);
-          } 
+          }
           break;
         }
       }
@@ -2136,7 +2156,7 @@
   if (!LoadXml()) return false;
   //<strFirstChild>
   //    <strChild>strChildValue</strChild>
-  
+
   TiXmlElement *pRootElement = xbmcXml.RootElement();
   if (!pRootElement) return false;
   TiXmlNode *pNode = pRootElement->FirstChild(strFirstChild);
@@ -2169,10 +2189,10 @@
 bool CSettings::UpDateXbmcXML(const CStdString &strFirstChild, const CStdString &strFirstChildValue)
 {
   if (!LoadXml()) return false;
-  
+
   //
   //<strFirstChild>strFirstChildValue<strFirstChild>
-  
+
   TiXmlElement *pRootElement = xbmcXml.RootElement();
   TiXmlNode *pNode = pRootElement->FirstChild(strFirstChild);;
   if (pNode)
@@ -2492,7 +2512,7 @@
     CStdString skinName = (*it).second.name;
     if (skinName.Left(currentSkin.size()) == currentSkin)
       (*it).second.value = false;
-    
+
     it++;
   }
   std::map<int, CSkinString>::iterator it2 = m_skinStrings.begin();
@@ -2501,7 +2521,7 @@
     CStdString skinName = (*it2).second.name;
     if (skinName.Left(currentSkin.size()) == currentSkin)
       (*it2).second.value = "";
-    
+
     it2++;
   }
   g_infoManager.ResetCache();
@@ -2541,7 +2561,7 @@
     return GetUserDataFolder();
 
   CUtil::AddFileToFolder(GetUserDataFolder(),m_vecProfiles[m_iLastLoadedProfileIndex].getDirectory(),folder);
-  
+
   return folder;
 }
 
@@ -2552,7 +2572,7 @@
   if (!CFile::Exists(folder))
     folder = "T:\\"+strFile;
   return folder;
-} 
+}
 
 CStdString CSettings::GetUserDataFolder() const
 {
@@ -2577,7 +2597,7 @@
     CUtil::AddFileToFolder(g_settings.GetProfileUserDataFolder(), "Database\\CDDB", folder);
   else
     CUtil::AddFileToFolder(GetUserDataFolder(), "Database\\CDDB", folder);
-  
+
   return folder;
 }
 
@@ -2588,7 +2608,7 @@
     CUtil::AddFileToFolder(g_settings.GetProfileUserDataFolder(), "Database\\IMDb", folder);
   else
     CUtil::AddFileToFolder(g_settings.GetUserDataFolder(), "Database\\IMDb", folder);
-  
+
   return folder;
 }
 
@@ -2599,7 +2619,7 @@
     CUtil::AddFileToFolder(g_settings.GetProfileUserDataFolder(), "Thumbnails", folder);
   else
     CUtil::AddFileToFolder(g_settings.GetUserDataFolder(), "Thumbnails", folder);
-  
+
   return folder;
 }
 
@@ -2610,7 +2630,7 @@
     CUtil::AddFileToFolder(g_settings.GetProfileUserDataFolder(), "Thumbnails\\Music", folder);
   else
     CUtil::AddFileToFolder(g_settings.GetUserDataFolder(), "Thumbnails\\Music", folder);
-  
+
   return folder;
 }
 
@@ -2621,7 +2641,7 @@
     CUtil::AddFileToFolder(g_settings.GetProfileUserDataFolder(), "Thumbnails\\Music\\Artists", folder);
   else
     CUtil::AddFileToFolder(g_settings.GetUserDataFolder(), "Thumbnails\\Music\\Artists", folder);
-  
+
   return folder;
 }
 
@@ -2632,7 +2652,7 @@
     CUtil::AddFileToFolder(g_settings.GetProfileUserDataFolder(), "Thumbnails\\Video", folder);
   else
     CUtil::AddFileToFolder(g_settings.GetUserDataFolder(), "Thumbnails\\Video", folder);
-  
+
   return folder;
 }
 
@@ -2643,7 +2663,7 @@
     CUtil::AddFileToFolder(g_settings.GetProfileUserDataFolder(), "Thumbnails\\Video\\Bookmarks", folder);
   else
     CUtil::AddFileToFolder(g_settings.GetUserDataFolder(), "Thumbnails\\Video\\Bookmarks", folder);
-  
+
   return folder;
 }
 
@@ -2654,7 +2674,7 @@
     CUtil::AddFileToFolder(g_settings.GetProfileUserDataFolder(), "Thumbnails\\Pictures", folder);
   else
     CUtil::AddFileToFolder(g_settings.GetUserDataFolder(), "Thumbnails\\Pictures", folder);
-  
+
   return folder;
 }
 
@@ -2665,7 +2685,7 @@
     CUtil::AddFileToFolder(g_settings.GetProfileUserDataFolder(), "Thumbnails\\Programs", folder);
   else
     CUtil::AddFileToFolder(g_settings.GetUserDataFolder(), "Thumbnails\\Programs", folder);
-  
+
   return folder;
 }
 
@@ -2676,7 +2696,7 @@
     CUtil::AddFileToFolder(g_settings.GetProfileUserDataFolder(), "Thumbnails\\GameSaves", folder);
   else
     CUtil::AddFileToFolder(g_settings.GetUserDataFolder(), "Thumbnails\\GameSaves", folder);
-  
+
   return folder;
 }
 
@@ -2684,7 +2704,7 @@
 {
   CStdString folder;
   CUtil::AddFileToFolder(g_settings.GetUserDataFolder(), "Thumbnails\\Profiles", folder);
-  
+
   return folder;
 }
 
@@ -2696,7 +2716,7 @@
     CUtil::AddFileToFolder(g_settings.GetProfileUserDataFolder(), "Thumbnails\\Programs\\XLinkKai", folder);
   else
     CUtil::AddFileToFolder(g_settings.GetUserDataFolder(), "Thumbnails\\Programs\\XlinkKai", folder);
-  
+
   return folder;
 }
 
@@ -2715,7 +2735,7 @@
 {
   CStdString folder;
 
-  // Get the Current Skin Path 
+  // Get the Current Skin Path
   CUtil::AddFileToFolder("Q:\\skin\\",g_guiSettings.GetString("lookandfeel.skin"),folder);
 
   return folder;
@@ -2773,8 +2793,8 @@
         pFeed = pFeed->NextSiblingElement("feed");
       }
       g_settings.m_mapRssUrls.insert(std::make_pair<int,std::pair<std::vector<int>,std::vector<string> > >(iId,std::make_pair<std::vector<int>,std::vector<string> >(vecIntervals,vecSet)));
-    } 
-    else 
+    }
+    else
       CLog::Log(LOGERROR,"found rss url set with no id in RssFeeds.xml, ignored");
 
     pSet = pSet->NextSiblingElement("set");

Modified: trunk/XBMC/xbmc/Settings.h
===================================================================
--- trunk/XBMC/xbmc/Settings.h	2007-01-07 03:40:48 UTC (rev 7510)
+++ trunk/XBMC/xbmc/Settings.h	2007-01-07 03:41:10 UTC (rev 7511)
@@ -89,20 +89,9 @@
 public:
   CShare() { m_iBufferSize=0; m_iDriveType=SHARE_TYPE_UNKNOWN; m_iLockMode=LOCK_MODE_EVERYONE; m_iBadPwdCount=0; };
   virtual ~CShare() {};
-  bool isWritable()
-  {
-    if (strPath[1] == ':' && (strPath[0] != 'D' && strPath[0] != 'd'))
-      return true; // local disk
-    if (strPath.size() > 4)
-    {
-      if (strPath.substr(0,4) == "smb:")
-        return true; // smb path
-    }
 
-    return false;
-  }
   void FromNameAndPaths(const CStdString &category, const CStdString &name, const vector<CStdString> &paths);
-
+  bool isWritable();
   CStdString strName; ///< Name of the share, can be choosen freely.
   CStdString strStatus; ///< Status of the share (eg has disk etc.)
   CStdString strPath; ///< Path of the share, eg. iso9660:// or F:
@@ -232,7 +221,7 @@
 
   void ResetSkinSetting(const CStdString &setting);
   void ResetSkinSettings();
-  
+
   struct AdvancedSettings
   {
 public:
@@ -420,7 +409,7 @@
 
   bool SaveSettings(const CStdString& strSettingsFile) const;
   TiXmlDocument xbmcXml;  // for editing the xml file from within XBMC
-  
+
 protected:
   void GetInteger(const TiXmlElement* pRootElement, const char *strTagName, int& iValue, const int iDefault, const int iMin, const int iMax);
   void GetFloat(const TiXmlElement* pRootElement, const char *strTagName, float& fValue, const float fDefault, const float fMin, const float fMax);


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

Revision: 7525
          http://svn.sourceforge.net/xbmc/?rev=7525&view=rev
Author:   darkdonno
Date:     2007-01-07 06:25:10 -0800 (Sun, 07 Jan 2007)

Log Message:
-----------
changed: file cosmetics removed: trailing whitespace fixed: some TAB usage added: GPL Header

Modified Paths:
--------------
    trunk/XBMC/xbmc/APEv2Tag.cpp
    trunk/XBMC/xbmc/Application.cpp
    trunk/XBMC/xbmc/ApplicationMessenger.cpp
    trunk/XBMC/xbmc/ArenaItem.cpp
    trunk/XBMC/xbmc/AutoPtrHandle.cpp
    trunk/XBMC/xbmc/AutoSwitch.cpp
    trunk/XBMC/xbmc/Autorun.cpp
    trunk/XBMC/xbmc/BackgroundInfoLoader.cpp
    trunk/XBMC/xbmc/BuddyItem.cpp
    trunk/XBMC/xbmc/ButtonTranslator.cpp
    trunk/XBMC/xbmc/Cdg.cpp
    trunk/XBMC/xbmc/CdgParser.cpp
    trunk/XBMC/xbmc/CdgVoiceManager.cpp
    trunk/XBMC/xbmc/Crc32.cpp
    trunk/XBMC/xbmc/Credits.cpp
    trunk/XBMC/xbmc/CueDocument.cpp
    trunk/XBMC/xbmc/DNSNameCache.cpp
    trunk/XBMC/xbmc/Database.cpp
    trunk/XBMC/xbmc/DateTime.cpp
    trunk/XBMC/xbmc/DetectDVDType.cpp
    trunk/XBMC/xbmc/DynamicDll.cpp
    trunk/XBMC/xbmc/FileItem.cpp
    trunk/XBMC/xbmc/FlacTag.cpp
    trunk/XBMC/xbmc/GUIDialogAudioSubtitleSettings.cpp
    trunk/XBMC/xbmc/GUIDialogBoxBase.cpp
    trunk/XBMC/xbmc/GUIDialogButtonMenu.cpp
    trunk/XBMC/xbmc/GUIDialogContextMenu.cpp
    trunk/XBMC/xbmc/GUIDialogFileBrowser.cpp
    trunk/XBMC/xbmc/GUIDialogFileStacking.cpp
    trunk/XBMC/xbmc/GUIDialogGamepad.cpp
    trunk/XBMC/xbmc/GUIDialogHost.cpp
    trunk/XBMC/xbmc/GUIDialogInvite.cpp
    trunk/XBMC/xbmc/GUIDialogKaiToast.cpp
    trunk/XBMC/xbmc/GUIDialogKeyboard.cpp
    trunk/XBMC/xbmc/GUIDialogLockSettings.cpp
    trunk/XBMC/xbmc/GUIDialogMediaSource.cpp
    trunk/XBMC/xbmc/GUIDialogMusicOSD.cpp
    trunk/XBMC/xbmc/GUIDialogMusicScan.cpp
    trunk/XBMC/xbmc/GUIDialogMuteBug.cpp
    trunk/XBMC/xbmc/GUIDialogNetworkSetup.cpp
    trunk/XBMC/xbmc/GUIDialogNumeric.cpp
    trunk/XBMC/xbmc/GUIDialogOK.cpp
    trunk/XBMC/xbmc/GUIDialogPlayerControls.cpp
    trunk/XBMC/xbmc/GUIDialogProfileSettings.cpp
    trunk/XBMC/xbmc/GUIDialogProgress.cpp
    trunk/XBMC/xbmc/GUIDialogSeekBar.cpp
    trunk/XBMC/xbmc/GUIDialogSelect.cpp
    trunk/XBMC/xbmc/GUIDialogSettings.cpp
    trunk/XBMC/xbmc/GUIDialogSubMenu.cpp
    trunk/XBMC/xbmc/GUIDialogTrainerSettings.cpp
    trunk/XBMC/xbmc/GUIDialogVideoBookmarks.cpp
    trunk/XBMC/xbmc/GUIDialogVideoSettings.cpp
    trunk/XBMC/xbmc/GUIDialogVisualisationPresetList.cpp
    trunk/XBMC/xbmc/GUIDialogVisualisationSettings.cpp
    trunk/XBMC/xbmc/GUIDialogVolumeBar.cpp
    trunk/XBMC/xbmc/GUIDialogYesNo.cpp
    trunk/XBMC/xbmc/GUIMediaWindow.cpp
    trunk/XBMC/xbmc/GUIPassword.cpp
    trunk/XBMC/xbmc/GUISettings.cpp
    trunk/XBMC/xbmc/GUIViewControl.cpp
    trunk/XBMC/xbmc/GUIViewState.cpp
    trunk/XBMC/xbmc/GUIViewStateMusic.cpp
    trunk/XBMC/xbmc/GUIViewStatePicturesProgramsScripts.cpp
    trunk/XBMC/xbmc/GUIViewStateVideo.cpp
    trunk/XBMC/xbmc/GUIWindowBuddies.cpp
    trunk/XBMC/xbmc/GUIWindowFileManager.cpp
    trunk/XBMC/xbmc/GUIWindowFullScreen.cpp
    trunk/XBMC/xbmc/GUIWindowGameSaves.cpp
    trunk/XBMC/xbmc/GUIWindowHome.cpp
    trunk/XBMC/xbmc/GUIWindowLoginScreen.cpp
    trunk/XBMC/xbmc/GUIWindowMusicBase.cpp
    trunk/XBMC/xbmc/GUIWindowMusicInfo.cpp
    trunk/XBMC/xbmc/GUIWindowMusicNav.cpp
    trunk/XBMC/xbmc/GUIWindowMusicOverlay.cpp
    trunk/XBMC/xbmc/GUIWindowMusicPlaylist.cpp
    trunk/XBMC/xbmc/GUIWindowMusicSongs.cpp
    trunk/XBMC/xbmc/GUIWindowMusicTop100.cpp
    trunk/XBMC/xbmc/GUIWindowOSD.cpp
    trunk/XBMC/xbmc/GUIWindowPictures.cpp
    trunk/XBMC/xbmc/GUIWindowPointer.cpp
    trunk/XBMC/xbmc/GUIWindowPrograms.cpp
    trunk/XBMC/xbmc/GUIWindowScreensaver.cpp
    trunk/XBMC/xbmc/GUIWindowScripts.cpp
    trunk/XBMC/xbmc/GUIWindowScriptsInfo.cpp
    trunk/XBMC/xbmc/GUIWindowSettings.cpp
    trunk/XBMC/xbmc/GUIWindowSettingsCategory.cpp
    trunk/XBMC/xbmc/GUIWindowSettingsProfile.cpp
    trunk/XBMC/xbmc/GUIWindowSettingsScreenCalibration.cpp
    trunk/XBMC/xbmc/GUIWindowSettingsUICalibration.cpp
    trunk/XBMC/xbmc/GUIWindowSlideShow.cpp
    trunk/XBMC/xbmc/GUIWindowSystemInfo.cpp
    trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
    trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp
    trunk/XBMC/xbmc/GUIWindowVideoInfo.cpp
    trunk/XBMC/xbmc/GUIWindowVideoNav.cpp
    trunk/XBMC/xbmc/GUIWindowVideoOverlay.cpp
    trunk/XBMC/xbmc/GUIWindowVideoPlaylist.cpp
    trunk/XBMC/xbmc/GUIWindowVisualisation.cpp
    trunk/XBMC/xbmc/GUIWindowWeather.cpp
    trunk/XBMC/xbmc/Id3Tag.cpp
    trunk/XBMC/xbmc/KaiItem.cpp
    trunk/XBMC/xbmc/KaiVector.cpp
    trunk/XBMC/xbmc/LangCodeExpander.cpp
    trunk/XBMC/xbmc/LangInfo.cpp
    trunk/XBMC/xbmc/MediaManager.cpp
    trunk/XBMC/xbmc/MusicDatabase.cpp
    trunk/XBMC/xbmc/MusicInfoLoader.cpp
    trunk/XBMC/xbmc/MusicInfoScanner.cpp
    trunk/XBMC/xbmc/MusicInfoTagLoaderAAC.cpp
    trunk/XBMC/xbmc/MusicInfoTagLoaderAdplug.cpp
    trunk/XBMC/xbmc/MusicInfoTagLoaderApe.cpp
    trunk/XBMC/xbmc/MusicInfoTagLoaderCDDA.cpp
    trunk/XBMC/xbmc/MusicInfoTagLoaderDatabase.cpp
    trunk/XBMC/xbmc/MusicInfoTagLoaderFlac.cpp
    trunk/XBMC/xbmc/MusicInfoTagLoaderGYM.cpp
    trunk/XBMC/xbmc/MusicInfoTagLoaderMP3.cpp
    trunk/XBMC/xbmc/MusicInfoTagLoaderMP4.cpp
    trunk/XBMC/xbmc/MusicInfoTagLoaderMPC.cpp
    trunk/XBMC/xbmc/MusicInfoTagLoaderMod.cpp
    trunk/XBMC/xbmc/MusicInfoTagLoaderNSF.cpp
    trunk/XBMC/xbmc/MusicInfoTagLoaderOgg.cpp
    trunk/XBMC/xbmc/MusicInfoTagLoaderSPC.cpp
    trunk/XBMC/xbmc/MusicInfoTagLoaderShn.cpp
    trunk/XBMC/xbmc/MusicInfoTagLoaderSid.cpp
    trunk/XBMC/xbmc/MusicInfoTagLoaderWMA.cpp
    trunk/XBMC/xbmc/MusicInfoTagLoaderWav.cpp
    trunk/XBMC/xbmc/MusicInfoTagLoaderWavPack.cpp
    trunk/XBMC/xbmc/MusicInfoTagLoaderYM.cpp
    trunk/XBMC/xbmc/OggTag.cpp
    trunk/XBMC/xbmc/PartyModeManager.cpp
    trunk/XBMC/xbmc/Picture.cpp
    trunk/XBMC/xbmc/PictureThumbLoader.cpp
    trunk/XBMC/xbmc/PlayList.cpp
    trunk/XBMC/xbmc/PlayListB4S.cpp
    trunk/XBMC/xbmc/PlayListFactory.cpp
    trunk/XBMC/xbmc/PlayListM3U.cpp
    trunk/XBMC/xbmc/PlayListPLS.cpp
    trunk/XBMC/xbmc/PlayListPlayer.cpp
    trunk/XBMC/xbmc/PlayListWPL.cpp
    trunk/XBMC/xbmc/PlaylistDirectory.cpp
    trunk/XBMC/xbmc/Profile.cpp
    trunk/XBMC/xbmc/ProgramDatabase.cpp
    trunk/XBMC/xbmc/SectionLoader.cpp
    trunk/XBMC/xbmc/Settings.cpp
    trunk/XBMC/xbmc/SettingsControls.cpp
    trunk/XBMC/xbmc/SlideShowPicture.cpp
    trunk/XBMC/xbmc/SmartPlaylist.cpp
    trunk/XBMC/xbmc/Song.cpp
    trunk/XBMC/xbmc/SortFileItem.cpp
    trunk/XBMC/xbmc/Temperature.cpp
    trunk/XBMC/xbmc/ThumbLoader.cpp
    trunk/XBMC/xbmc/ThumbnailCache.cpp
    trunk/XBMC/xbmc/URL.cpp
    trunk/XBMC/xbmc/Util.cpp
    trunk/XBMC/xbmc/VideoDatabase.cpp
    trunk/XBMC/xbmc/ViewDatabase.cpp
    trunk/XBMC/xbmc/VorbisTag.cpp
    trunk/XBMC/xbmc/XBAudioConfig.cpp
    trunk/XBMC/xbmc/XBVideoConfig.cpp
    trunk/XBMC/xbmc/XMP4File.cpp
    trunk/XBMC/xbmc/XboxMediaCenter.cpp
    trunk/XBMC/xbmc/memutil.cpp
    trunk/XBMC/xbmc/musicInfoTag.cpp
    trunk/XBMC/xbmc/musicInfoTagLoaderFactory.cpp

Modified: trunk/XBMC/xbmc/APEv2Tag.cpp
===================================================================
--- trunk/XBMC/xbmc/APEv2Tag.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/APEv2Tag.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,23 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
 
 #include "stdafx.h"
 #include "APEv2tag.h"
@@ -67,7 +87,7 @@
   if (!tag) return;
   char buffer[16];
   int chars = 16;
-  
+
   //  foobar2000 saves gain info as lowercase key items
   if (tag->GetFieldString(L"replaygain_track_gain", buffer, &chars, TRUE) != -1)
   {
@@ -119,4 +139,3 @@
     m_replayGain.iHasGainInfo |= REPLAY_GAIN_HAS_ALBUM_PEAK;
   }
 }
-

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/Application.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 #include "application.h"
 #ifdef HAS_XBOX_HARDWARE
@@ -163,7 +184,7 @@
   #endif
  #endif
  #ifdef _XBOX
-  #pragma comment (lib,"xbmc/lib/unrarXlib/unrarxlibd.lib") 
+  #pragma comment (lib,"xbmc/lib/unrarXlib/unrarxlibd.lib")
   #pragma comment (lib,"xbmc/lib/libGoAhead/goaheadd.lib") // SECTIONNAME=LIBHTTP
   #pragma comment (lib,"xbmc/lib/sqlLite/libSQLite3d.lib")
   #pragma comment (lib,"xbmc/lib/libshout/libshoutd.lib" )
@@ -171,7 +192,7 @@
   #pragma comment (lib,"xbmc/lib/libiconv/libiconvd.lib")
   #pragma comment (lib,"xbmc/lib/libfribidi/libfribidid.lib")
  #else
-  #pragma comment (lib,"../../xbmc/lib/unrarXlib/unrarxlibd.lib") 
+  #pragma comment (lib,"../../xbmc/lib/unrarXlib/unrarxlibd.lib")
   #pragma comment (lib,"../../xbmc/lib/libGoAhead/goahead_win32d.lib") // SECTIONNAME=LIBHTTP
   #pragma comment (lib,"../../xbmc/lib/sqlLite/libSQLite3_win32d.lib")
   #pragma comment (lib,"../../xbmc/lib/libshout/libshout_win32d.lib" )
@@ -197,7 +218,7 @@
   #endif
  #endif
  #ifdef _XBOX
-  #pragma comment (lib,"xbmc/lib/unrarXlib/unrarxlib.lib") 
+  #pragma comment (lib,"xbmc/lib/unrarXlib/unrarxlib.lib")
   #pragma comment (lib,"xbmc/lib/libGoAhead/goahead.lib")
   #pragma comment (lib,"xbmc/lib/sqlLite/libSQLite3.lib")
   #pragma comment (lib,"xbmc/lib/libcdio/libcdio.lib")
@@ -205,7 +226,7 @@
   #pragma comment (lib,"xbmc/lib/libiconv/libiconv.lib")
   #pragma comment (lib,"xbmc/lib/libfribidi/libfribidi.lib")
  #else
-  #pragma comment (lib,"../../xbmc/lib/unrarXlib/unrarxlib.lib") 
+  #pragma comment (lib,"../../xbmc/lib/unrarXlib/unrarxlib.lib")
   #pragma comment (lib,"../../xbmc/lib/libGoAhead/goahead_win32.lib")
   #pragma comment (lib,"../../xbmc/lib/sqlLite/libSQLite3_win32.lib")
   #pragma comment (lib,"../../xbmc/lib/libshout/libshout_win32.lib" )
@@ -225,7 +246,7 @@
 #ifdef HAS_XBOX_HARDWARE
 extern "C"
 {
-	extern bool WINAPI NtSetSystemTime(LPFILETIME SystemTime , LPFILETIME PreviousTime );
+  extern bool WINAPI NtSetSystemTime(LPFILETIME SystemTime , LPFILETIME PreviousTime );
 };
 #endif
 
@@ -484,7 +505,7 @@
           FEH_TextOut(pFont, iLine, L"Network cable unplugged");
           break;
         }
-#endif        
+#endif
         switch( (*it) )
         {
           case NETWORK_DASH:
@@ -499,17 +520,17 @@
             FEH_TextOut(pFont, iLine, L"Init network using static ip...");
             if( m_bXboxMediacenterLoaded )
             {
-              g_network.Initialize(NETWORK_STATIC, 
-                    g_guiSettings.GetString("network.ipaddress").c_str(), 
-                    g_guiSettings.GetString("network.subnet").c_str(), 
+              g_network.Initialize(NETWORK_STATIC,
+                    g_guiSettings.GetString("network.ipaddress").c_str(),
+                    g_guiSettings.GetString("network.subnet").c_str(),
                     g_guiSettings.GetString("network.gateway").c_str(),
                     g_guiSettings.GetString("network.dns").c_str() );
             }
             else
             {
-              g_network.Initialize(NETWORK_STATIC, 
-                    "192.168.0.42", 
-                    "255.255.255.0", 
+              g_network.Initialize(NETWORK_STATIC,
+                    "192.168.0.42",
+                    "255.255.255.0",
                     "192.168.0.1",
                     "192.168.0.1" );
             }
@@ -544,7 +565,7 @@
 #endif
         /* increment line before next attempt */
         ++iLine;
-      }      
+      }
 
       /* break out of the continous loop if we have network*/
       if( NetworkUp )
@@ -703,7 +724,7 @@
   /* install win32 exception translator, win32 exceptions
    * can now be caught using c++ try catch */
   win32_exception::install_handler();
-  
+
   CIoSupport helper;
   CStdString strExecutablePath;
   char szDevicePath[1024];
@@ -724,7 +745,7 @@
 
   ::DeleteFile(strLogFileOld.c_str());
   ::MoveFile(strLogFile.c_str(), strLogFileOld.c_str());
-  
+
   CLog::Log(LOGNOTICE, "-----------------------------------------------------------------------");
   CLog::Log(LOGNOTICE, "Starting XBoxMediaCenter.  Built on %s", __DATE__);
   CLog::Log(LOGNOTICE, "Q is mapped to: %s",szDevicePath );
@@ -756,7 +777,7 @@
       CFileItemList items;
       CUtil::GetRecursiveListing("q:\\userdata",items,"");
       for (int i=0;i<items.Size();++i)
-          CFile::Cache(items[i]->m_strPath,"T:\\"+CUtil::GetFileName(items[i]->m_strPath));      
+          CFile::Cache(items[i]->m_strPath,"T:\\"+CUtil::GetFileName(items[i]->m_strPath));
     }
     g_settings.m_vecProfiles[0].setDirectory("T:\\");
     g_stSettings.m_logFolder = "T:\\";
@@ -769,7 +790,7 @@
     {
       CUtil::GetHomePath(strMnt);
       strMnt += g_settings.GetUserDataFolder().substr(2);
-    }    
+    }
 
     helper.GetPartition(strMnt, szDevicePath);
     strcat(szDevicePath, &strMnt.c_str()[2]);
@@ -823,7 +844,7 @@
     ReadInput();
   }
   Sleep(10); // needed or the readinput doesnt fetch anything
-  ReadInput(); 
+  ReadInput();
 #endif
 #ifdef HAS_GAMEPAD
   //Check for LTHUMBCLICK+RTHUMBCLICK and BLACK+WHITE, no LTRIGGER+RTRIGGER
@@ -853,7 +874,7 @@
     {
       ReadInput();
     }
-    while (m_DefaultGamepad.wPressedButtons == XBGAMEPAD_NONE && !bAnyAnalogKey) 
+    while (m_DefaultGamepad.wPressedButtons == XBGAMEPAD_NONE && !bAnyAnalogKey)
     {
       ReadInput();
       bAnyAnalogKey = m_DefaultGamepad.bPressedAnalogButtons[0] || m_DefaultGamepad.bPressedAnalogButtons[1] || m_DefaultGamepad.bPressedAnalogButtons[2] || m_DefaultGamepad.bPressedAnalogButtons[3] || m_DefaultGamepad.bPressedAnalogButtons[4] || m_DefaultGamepad.bPressedAnalogButtons[5] || m_DefaultGamepad.bPressedAnalogButtons[6] || m_DefaultGamepad.bPressedAnalogButtons[7];
@@ -864,12 +885,12 @@
       CUtil::WipeDir(g_settings.GetUserDataFolder()+"\\database\\");
       CUtil::WipeDir(g_settings.GetUserDataFolder()+"\\thumbnails\\");
       CUtil::WipeDir(g_settings.GetUserDataFolder()+"\\playlists\\");
-      CUtil::WipeDir(g_settings.GetUserDataFolder()+"\\cache\\");      
+      CUtil::WipeDir(g_settings.GetUserDataFolder()+"\\cache\\");
       CUtil::WipeDir(g_settings.GetUserDataFolder()+"\\profiles\\");
       CUtil::WipeDir(g_settings.GetUserDataFolder()+"\\visualisations\\");
       CFile::Delete(g_settings.GetUserDataFolder()+"\\avpacksettings.xml");
       g_settings.m_vecProfiles.erase(g_settings.m_vecProfiles.begin()+1,g_settings.m_vecProfiles.end());
-      
+
       g_settings.SaveProfiles("q:\\system\\profiles.xml");
 
       char szXBEFileName[1024];
@@ -915,7 +936,7 @@
   strcat(temp2,strTemp.substr(0,iLastSlash).c_str());
   F_VIDEO ForceVideo = VIDEO_NULL;
   F_COUNTRY ForceCountry = COUNTRY_NULL;
-  
+
   if (CUtil::RemoveTrainer())
     bNeedReboot = true;
 
@@ -923,12 +944,12 @@
   if (g_guiSettings.GetBool("myprograms.gameautoregion"))
   {
     bool fDoPatchTest = false;
-    
+
     // should use xkeeprom.h :/
     EEPROMDATA EEPROM;
-  	ZeroMemory(&EEPROM, sizeof(EEPROMDATA));
+    ZeroMemory(&EEPROM, sizeof(EEPROMDATA));
 
-    if( XKUtils::ReadEEPROMFromXBOX((LPBYTE)&(EEPROM),0,255) ) 
+    if( XKUtils::ReadEEPROMFromXBOX((LPBYTE)&(EEPROM),0,255) )
     {
       DWORD DWVideo = *(LPDWORD)(&EEPROM.VideoStandard[0]);
       char temp[1024];
@@ -966,10 +987,10 @@
         fDoPatchTest = true;
       }
       else
-        CUtil::RemoveKernelPatch(); // This removes the Resolution patch from the kernel if it is not needed (if actual resolution matches eeprom setting)	
+        CUtil::RemoveKernelPatch(); // This removes the Resolution patch from the kernel if it is not needed (if actual resolution matches eeprom setting)
 
       if (fDoPatchTest) // Is set if we have to test whether our patch is in the kernel & therefore responsible for the mismatch of resolution & eeprom setting
-      {	
+      {
         if (!CUtil::LookForKernelPatch()) // If our patch is not present we are not responsible for the mismatch of current resolution & eeprom setting
         {
           // We do a hard reset to come back to default resolution and avoid infinite reboots
@@ -978,8 +999,8 @@
         }
       }
     }
-  } 
-  
+  }
+
   if (bNeedReboot)
   {
     Destroy();
@@ -1026,7 +1047,7 @@
   CStdString strHomePath = "Q:";
   CLog::Log(LOGINFO, "Checking skinpath existance, and existence of keymap.xml:%s...", (strHomePath + "\\skin").c_str());
   CStdString keymapPath;
-  
+
   keymapPath = g_settings.GetUserDataItem("keymap.xml");
   //CUtil::AddFileToFolder(g_settings.GetUserDataFolder(), "Keymap.xml", keymapPath);
 #ifdef _XBOX
@@ -1154,7 +1175,7 @@
   CLog::Log(LOGINFO, "userdata folder: %s", g_settings.GetProfileUserDataFolder().c_str());
   CLog::Log(LOGINFO, "  recording folder:%s", g_guiSettings.GetString("mymusic.recordingpath",false).c_str());
   CLog::Log(LOGINFO, "  screenshots folder:%s", g_guiSettings.GetString("pictures.screenshotpath",false).c_str());
-	
+
   // UserData folder layout:
   // UserData/
   //   Database/
@@ -1212,7 +1233,7 @@
     g_guiSettings.SetBool("servers.webserver", false);
     g_guiSettings.SetBool("locale.timeserver", false);
   }
-  
+
   StartServices();
 
   m_gWindowManager.Add(new CGUIWindowHome);                     // window id = 0
@@ -1267,7 +1288,7 @@
   strPath = g_SkinInfo.GetSkinPath("LockSettings.xml", &res2);
   if (CFile::Exists(strPath))
     pDialog = new CGUIDialogLockSettings;
-  
+
   if (pDialog)
     m_gWindowManager.Add(pDialog); // window id = 131
 
@@ -1300,15 +1321,15 @@
 
   SAFE_DELETE(m_splash);
 
-  if (g_guiSettings.GetBool("masterlock.startuplock") && g_settings.m_vecProfiles[0].getLockMode() != LOCK_MODE_EVERYONE && !g_settings.m_vecProfiles[0].getLockCode().IsEmpty()) 
-  	g_passwordManager.CheckStartUpLock();
+  if (g_guiSettings.GetBool("masterlock.startuplock") && g_settings.m_vecProfiles[0].getLockMode() != LOCK_MODE_EVERYONE && !g_settings.m_vecProfiles[0].getLockCode().IsEmpty())
+    g_passwordManager.CheckStartUpLock();
 
   // check if we should use the login screen
   if (g_settings.bUseLoginScreen)
   {
     m_gWindowManager.ActivateWindow(WINDOW_LOGIN_SCREEN);
   }
-  else 
+  else
   {
     RESOLUTION res = INVALID;
     CStdString startupPath = g_SkinInfo.GetSkinPath("startup.xml", &res);
@@ -1454,7 +1475,7 @@
   if (m_pFileZilla)
   {
     CLog::Log(LOGINFO, "XBFileZilla: Stopping...");
-    
+
     std::vector<SXFConnection> mConnections;
     std::vector<SXFConnection>::iterator it;
 
@@ -1570,7 +1591,7 @@
       }
       if ( ((IsPlayingVideo() || IsPlayingAudio())) && (g_guiSettings.GetInt("system.leddisableonplayback") == LED_PLAYBACK_VIDEO_MUSIC))
       {
-        //CLog::Log(LOGNOTICE, "LED Control: Playing Video Or Music LED is switched OFF!"); 
+        //CLog::Log(LOGNOTICE, "LED Control: Playing Video Or Music LED is switched OFF!");
         ILED::CLEDControl(LED_COLOUR_OFF);
       }
 #ifdef AFTER2_0
@@ -1605,7 +1626,7 @@
       g_lcd->SetBackLight(0);
     }
   }
-  else if(!dim) 
+  else if(!dim)
   {
     g_lcd->SetBackLight(g_guiSettings.GetInt("lcd.backlight"));
   }
@@ -1623,7 +1644,7 @@
 
   CLog::Log(LOGNOTICE, "initializing playlistplayer");
   g_playlistPlayer.SetRepeat(PLAYLIST_MUSIC, g_stSettings.m_bMyMusicPlaylistRepeat ? PLAYLIST::REPEAT_ALL : PLAYLIST::REPEAT_NONE);
-  g_playlistPlayer.SetShuffle(PLAYLIST_MUSIC, g_stSettings.m_bMyMusicPlaylistShuffle); 
+  g_playlistPlayer.SetShuffle(PLAYLIST_MUSIC, g_stSettings.m_bMyMusicPlaylistShuffle);
   g_playlistPlayer.SetRepeat(PLAYLIST_VIDEO, g_stSettings.m_bMyVideoPlaylistRepeat ? PLAYLIST::REPEAT_ALL : PLAYLIST::REPEAT_NONE);
   g_playlistPlayer.SetShuffle(PLAYLIST_VIDEO, g_stSettings.m_bMyVideoPlaylistShuffle);
   CLog::Log(LOGNOTICE, "DONE initializing playlistplayer");
@@ -1653,32 +1674,32 @@
 }
 void CApplication::CheckDate()
 {
-  CLog::Log(LOGNOTICE, "Checking the Date!");	//GeminiServer Date Check
-	// Check the Date: Year, if it is  above 2099 set to 2004!
-	SYSTEMTIME CurTime;
-	SYSTEMTIME NewTime;
-	GetLocalTime(&CurTime);
-	GetLocalTime(&NewTime);
-	CLog::Log(LOGINFO, "- Current Date is: %i-%i-%i",CurTime.wDay, CurTime.wMonth, CurTime.wYear);
-	if ((CurTime.wYear > 2099) || (CurTime.wYear < 2001) )	// XBOX MS Dashboard also uses min/max DateYear 2001/2099 !!
-	{
-		CLog::Log(LOGNOTICE, "- The Date is Wrong: Setting New Date!");
-		NewTime.wYear		= 2004;	// 2004
-		NewTime.wMonth		= 1;	// January
-		NewTime.wDayOfWeek	= 1;	// Monday
-		NewTime.wDay		= 5;	// Monday 05.01.2004!!	
-		NewTime.wHour		= 12;
-		NewTime.wMinute		= 0;
+  CLog::Log(LOGNOTICE, "Checking the Date!"); //GeminiServer Date Check
+  // Check the Date: Year, if it is  above 2099 set to 2004!
+  SYSTEMTIME CurTime;
+  SYSTEMTIME NewTime;
+  GetLocalTime(&CurTime);
+  GetLocalTime(&NewTime);
+  CLog::Log(LOGINFO, "- Current Date is: %i-%i-%i",CurTime.wDay, CurTime.wMonth, CurTime.wYear);
+  if ((CurTime.wYear > 2099) || (CurTime.wYear < 2001) )	// XBOX MS Dashboard also uses min/max DateYear 2001/2099 !!
+  {
+    CLog::Log(LOGNOTICE, "- The Date is Wrong: Setting New Date!");
+    NewTime.wYear		= 2004;	// 2004
+    NewTime.wMonth		= 1;	// January
+    NewTime.wDayOfWeek	= 1;	// Monday
+    NewTime.wDay		= 5;	// Monday 05.01.2004!!
+    NewTime.wHour		= 12;
+    NewTime.wMinute		= 0;
 
-		FILETIME stNewTime, stCurTime;
-		SystemTimeToFileTime(&NewTime, &stNewTime);
-		SystemTimeToFileTime(&CurTime, &stCurTime);
+    FILETIME stNewTime, stCurTime;
+    SystemTimeToFileTime(&NewTime, &stNewTime);
+    SystemTimeToFileTime(&CurTime, &stCurTime);
 #ifdef HAS_XBOX_HARDWARE
     NtSetSystemTime(&stNewTime, &stCurTime);	// Set a Default Year 2004!
 #endif
-		CLog::Log(LOGNOTICE, "- New Date is now: %i-%i-%i",NewTime.wDay, NewTime.wMonth, NewTime.wYear);
-	}
-	return ;
+    CLog::Log(LOGNOTICE, "- New Date is now: %i-%i-%i",NewTime.wDay, NewTime.wMonth, NewTime.wYear);
+  }
+  return ;
 }
 void CApplication::StopServices()
 {
@@ -1900,7 +1921,7 @@
   if (resToUse == HDTV_1080i)
     vecSkinPath.push_back(strSkinPath+g_SkinInfo.GetDirFromRes(HDTV_1080i));
   if (resToUse == HDTV_720p)
-    vecSkinPath.push_back(strSkinPath+g_SkinInfo.GetDirFromRes(HDTV_720p));  
+    vecSkinPath.push_back(strSkinPath+g_SkinInfo.GetDirFromRes(HDTV_720p));
   if (resToUse == PAL_16x9 || resToUse == NTSC_16x9 || resToUse == HDTV_480p_16x9 || resToUse == HDTV_720p || resToUse == HDTV_1080i)
     vecSkinPath.push_back(strSkinPath+g_SkinInfo.GetDirFromRes(g_SkinInfo.GetDefaultWideResolution()));
   vecSkinPath.push_back(strSkinPath+g_SkinInfo.GetDirFromRes(g_SkinInfo.GetDefaultResolution()));
@@ -1986,7 +2007,7 @@
       pWindow->SetXMLFile(FindFileData.cFileName);
       pWindow->SetID(WINDOW_HOME + id);
       m_gWindowManager.AddCustomWindow(pWindow);
-    } 
+    }
     CloseHandle(hFind);
   }
   return true;
@@ -2079,7 +2100,7 @@
 #endif
 
   m_gWindowManager.UpdateModelessVisibility();
-  
+
   // draw GUI
   g_graphicsContext.Clear();
   //SWATHWIDTH of 4 improves fillrates (performance investigator)
@@ -2233,7 +2254,7 @@
     // reset harddisk spindown timer
     m_bSpinDown = false;
     m_bNetworkSpinDown = false;
-    
+
     // reset Idle Timer
     m_idleTimer.StartZero();
 
@@ -2417,7 +2438,7 @@
     }
 
     g_playlistPlayer.PlayNext();
-    
+
     return true;
   }
 
@@ -2523,7 +2544,7 @@
       volume += (int)(action.fAmount1 * action.fAmount1 * speed);
     else
       volume -= (int)(action.fAmount1 * action.fAmount1 * speed);
-    
+
     SetHardwareVolume(volume);
 
     // show visual feedback of volume change...
@@ -3154,7 +3175,7 @@
     //  Shutdown as much as possible of the
     //  application, to reduce the leaks dumped
     //  to the vc output window before calling
-    //  _CrtDumpMemoryLeaks(). Most of the leaks 
+    //  _CrtDumpMemoryLeaks(). Most of the leaks
     //  shown are no real leaks, as parts of the app
     //  are still allocated.
 
@@ -3204,7 +3225,7 @@
       {
         CLog::Log(LOGWARNING, "CApplication::PlayMedia called to play a playlist %s but no idea which playlist to use, playing first item", item.m_strPath.c_str());
         if(pPlayList->size())
-          return PlayFile((*pPlayList)[0], false);   
+          return PlayFile((*pPlayList)[0], false);
       }
     }
   }
@@ -3223,7 +3244,7 @@
 {
   if (!item.IsStack())
     return false;
-  
+
   // see if we have the info in the database
   // TODO: If user changes the time speed (FPS via framerate conversion stuff)
   //       then these times will be wrong.
@@ -3265,7 +3286,7 @@
 
       CPlayerOptions options;
       options.identify = true;
-    
+
       if (!m_pPlayer->OpenFile(*m_currentStack[i], options))
       {
         m_currentStack.Clear();
@@ -3310,7 +3331,7 @@
 
   if (seconds > 0)
   {
-    // work out where to seek to    
+    // work out where to seek to
     for (int i = 0; i < m_currentStack.Size(); i++)
     {
       if (seconds < m_currentStack[i]->m_lEndOffset)
@@ -3323,7 +3344,7 @@
       }
     }
   }
-  
+
   return PlayFile(*m_currentStack[0], true);
 }
 
@@ -3340,17 +3361,17 @@
     m_itemCurrentFile = item;
     m_nextPlaylistItem = -1;
   }
- 
+
   if (item.IsPlayList())
     return false;
-  
+
   // if we have a stacked set of files, we need to setup our stack routines for
   // "seamless" seeking and total time of the movie etc.
   // will recall with restart set to true
   if (item.IsStack())
     return PlayStack(item, bRestart);
 
-  CPlayerOptions options;  
+  CPlayerOptions options;
   EPLAYERCORES eNewCore = EPC_NONE;
   if( bRestart )
   {
@@ -3370,14 +3391,14 @@
 
     if (item.IsVideo())
     {
-      // open the d/b and retrieve the bookmarks for the current movie      
+      // open the d/b and retrieve the bookmarks for the current movie
       CVideoDatabase dbs;
       dbs.Open();
-      dbs.GetVideoSettings(item.m_strPath, g_stSettings.m_currentVideoSettings);      
+      dbs.GetVideoSettings(item.m_strPath, g_stSettings.m_currentVideoSettings);
 
       if( item.m_lStartOffset == STARTOFFSET_RESUME )
       {
-        options.starttime = 0.0f;        
+        options.starttime = 0.0f;
         CBookmark bookmark;
         if(dbs.GetResumeBookMark(item.m_strPath, bookmark))
         {
@@ -3385,7 +3406,7 @@
           options.state = bookmark.playerState;
         }
       }
-      
+
       dbs.Close();
     }
 
@@ -3411,7 +3432,7 @@
       options.fullscreen = true;
     else
       options.fullscreen = false;
-    // reset this so we don't think we are resuming on seek    
+    // reset this so we don't think we are resuming on seek
     m_itemCurrentFile.m_lStartOffset = 0;
   }
   else
@@ -3438,7 +3459,7 @@
       m_pPlayer = NULL;
     }
   }
-  
+
   if (!m_pPlayer)
   {
     m_eCurrentPlayer = eNewCore;
@@ -3452,13 +3473,13 @@
   }
 
   bool bResult = m_pPlayer->OpenFile(item, options);
-  
+
   if(bResult)
   {
 #ifdef HAS_VIDEO_PLAYBACK
     if( IsPlayingVideo() )
     {
-      // if player didn't manange to switch to fullscreen by itself do it here 
+      // if player didn't manange to switch to fullscreen by itself do it here
       if( options.fullscreen && g_renderManager.IsStarted()
        && m_gWindowManager.GetActiveWindow() != WINDOW_FULLSCREEN_VIDEO )
        SwitchToFullScreen();
@@ -3484,14 +3505,14 @@
     pXbmcHttp->xbmcBroadcast("OnPlayBackEnded", 1);
 
   CLog::Log(LOGDEBUG, "Playback has finished");
-  
+
   CGUIMessage msg(GUI_MSG_PLAYBACK_ENDED, 0, 0, 0, 0, NULL);
   m_gWindowManager.SendThreadMessage(msg);
   StartLEDControl(false);
   DimLCDOnPlayback(false);
 
   g_audioManager.Enable(true);
-  
+
   //  Reset audioscrobbler submit status
   CScrobbler::GetInstance()->SetSubmitSong(false);
 }
@@ -3501,7 +3522,7 @@
   // informs python script currently running playback has started
   // (does nothing if python is not loaded)
   g_pythonParser.OnPlayBackStarted();
-  
+
   // Let's tell the outside world as well
   if (pXbmcHttp)
     pXbmcHttp->xbmcBroadcast("OnPlayBackStarted", 1);
@@ -3522,7 +3543,7 @@
   // informs python script currently running that we are requesting the next track
   // (does nothing if python is not loaded)
   g_pythonParser.OnQueueNextItem(); // currently unimplemented
-  
+
   // Let's tell the outside world as well
   if (pXbmcHttp)
     pXbmcHttp->xbmcBroadcast("OnQueueNextItem", 1);
@@ -3538,7 +3559,7 @@
   // informs python script currently running playback has ended
   // (does nothing if python is not loaded)
   g_pythonParser.OnPlayBackStopped();
-    
+
   // Let's tell the outside world as well
   if (pXbmcHttp)
     pXbmcHttp->xbmcBroadcast("OnPlayBackStoped", 1);
@@ -3548,7 +3569,7 @@
   m_gWindowManager.SendMessage(msg);
   StartLEDControl(false);
   DimLCDOnPlayback(false);
-  
+
   g_audioManager.Enable(true);
 
   //  Reset audioscrobbler submit status
@@ -3685,7 +3706,7 @@
     return false;
 
   m_bInactive = false;  // reset the inactive flag as a key has been pressed
-  
+
   // if Screen saver is active
   if (m_bScreenSave)
   {
@@ -3701,7 +3722,7 @@
       m_iScreenSaveLock = 0;
       return true;
     }
-    
+
     // disable screensaver
     m_bScreenSave = false;
     m_iScreenSaveLock = 0;
@@ -4135,7 +4156,7 @@
           if (m_itemCurrentFile.IsMusicDb())
           {
             if (!m_itemCurrentFile.m_musicInfoTag.Loaded())
-            {              
+            {
               IMusicInfoTagLoader* tagloader = CMusicInfoTagLoaderFactory::CreateLoader(m_itemCurrentFile.m_strPath);
               tagloader->Load(m_itemCurrentFile.m_strPath,m_itemCurrentFile.m_musicInfoTag);
               delete tagloader;
@@ -4249,7 +4270,7 @@
       }
 
       // reset the audio playlist on finish
-      if (!IsPlayingAudio() && (g_guiSettings.GetBool("mymusic.clearplaylistsonend")) && (g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_MUSIC)) 
+      if (!IsPlayingAudio() && (g_guiSettings.GetBool("mymusic.clearplaylistsonend")) && (g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_MUSIC))
       {
         g_playlistPlayer.ClearPlaylist(PLAYLIST_MUSIC);
         g_playlistPlayer.Reset();
@@ -4301,7 +4322,7 @@
     }
     break;
   case GUI_MSG_EXECUTE:
-    { 
+    {
       // see if it is a user set string
       CLog::Log(LOGDEBUG,__FUNCTION__" : Translating %s", message.GetStringParam().c_str());
       vector<CInfoPortion> info;
@@ -4386,7 +4407,7 @@
   if (g_memoryUnitManager.Update())
   { // changes have occured - update our shares
     CGUIMessage msg(GUI_MSG_NOTIFY_ALL,0,0,GUI_MSG_REMOVED_MEDIA);
-    m_gWindowManager.SendThreadMessage(msg);        
+    m_gWindowManager.SendThreadMessage(msg);
   }
 #endif
 
@@ -4441,9 +4462,9 @@
   if(IsPaused() != m_bIsPaused)
   {
     if(g_guiSettings.GetBool("system.ledenableonpaused"))
-      StartLEDControl(m_bIsPaused); 
+      StartLEDControl(m_bIsPaused);
     if(g_guiSettings.GetBool("lcd.enableonpaused"))
-      DimLCDOnPlayback(m_bIsPaused); 
+      DimLCDOnPlayback(m_bIsPaused);
     m_bIsPaused = IsPaused();
   }
 }
@@ -4534,7 +4555,7 @@
 void CApplication::Mute(void)
 {
   if (g_stSettings.m_bMute)
-  { // muted - unmute.    
+  { // muted - unmute.
     // check so we don't get stuck in some muted state
     if( g_stSettings.m_iPreMuteVolumeLevel == 0 ) g_stSettings.m_iPreMuteVolumeLevel = 1;
     SetVolume(g_stSettings.m_iPreMuteVolumeLevel);
@@ -4838,7 +4859,7 @@
 
 void CApplication::CheckAudioScrobblerStatus()
 {
-  if (IsPlayingAudio() && !m_itemCurrentFile.IsInternetStream() && 
+  if (IsPlayingAudio() && !m_itemCurrentFile.IsInternetStream() &&
       !CScrobbler::GetInstance()->ShouldSubmit() && GetTime()==0.0)
   {
     //  We seeked to the beginning of the file
@@ -4899,13 +4920,13 @@
   g_playlistPlayer.ClearPlaylist(iPlaylist);
 
   // if the playlist contains an internet stream, this file will be used
-  // to generate a thumbnail for musicplayer.cover 
+  // to generate a thumbnail for musicplayer.cover
   g_application.m_strPlayListFile = strPlayList;
 
   // add the items to the playlist player
   g_playlistPlayer.Add(iPlaylist, playlist);
 
-  // if we have a playlist 
+  // if we have a playlist
   if (g_playlistPlayer.GetPlaylist(iPlaylist).size())
   {
     // start playing it
@@ -4924,7 +4945,7 @@
   for( DWORD i=0; i<4; i++ )
   {
     if( m_Gamepad[i].hDevice )
-    { 
+    {
       if( m_Gamepad[i].Feedback.Header.dwStatus != ERROR_IO_PENDING )
       {
         m_Gamepad[i].Feedback.Rumble.wLeftMotorSpeed  = WORD( m_fLeftMotorSpeed  * 65535.0f );
@@ -4956,5 +4977,4 @@
   g_advancedSettings.m_logLevel = LOG_LEVEL_DEBUG_FREEMEM;
 #endif
 #endif
-}
-
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/ApplicationMessenger.cpp
===================================================================
--- trunk/XBMC/xbmc/ApplicationMessenger.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/ApplicationMessenger.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,23 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
 
 #include "stdafx.h"
 #include "ApplicationMessenger.h"
@@ -97,7 +117,7 @@
     ProcessMessage(pMsg);
 
     if (pMsg->hWaitEvent)
-      SetEvent(pMsg->hWaitEvent);      
+      SetEvent(pMsg->hWaitEvent);
 
     delete pMsg;
 
@@ -112,7 +132,7 @@
   {
     case TMSG_SHUTDOWN:
       {
-        g_application.Stop(); 
+        g_application.Stop();
         Sleep(200);
 #ifdef _XBOX
 #ifndef _DEBUG  // don't actually shut off if debug build, it hangs VS for a long time
@@ -273,7 +293,7 @@
 
         if (m_gWindowManager.GetActiveWindow() != WINDOW_SLIDESHOW)
           m_gWindowManager.ActivateWindow(WINDOW_SLIDESHOW);
-        
+
         g_graphicsContext.Unlock();
       }
       break;

Modified: trunk/XBMC/xbmc/ArenaItem.cpp
===================================================================
--- trunk/XBMC/xbmc/ArenaItem.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/ArenaItem.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,23 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
 
 #include "stdafx.h"
 #include "ArenaItem.h"
@@ -3,5 +23,4 @@
 #include "Utils/KaiClient.h"
 
-
 CGUIImage* CArenaItem::m_pPrivateIcon = NULL;
 
@@ -173,4 +192,4 @@
       RenderText(fPosX, fPosY, (FLOAT)pDC->m_pButton->GetWidth(), dwColor, (WCHAR*) strInfoUnicode.c_str(), pDC->m_label);
     }
   }
-}
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/AutoPtrHandle.cpp
===================================================================
--- trunk/XBMC/xbmc/AutoPtrHandle.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/AutoPtrHandle.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 
 

Modified: trunk/XBMC/xbmc/AutoSwitch.cpp
===================================================================
--- trunk/XBMC/xbmc/AutoSwitch.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/AutoSwitch.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,23 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
 
 #include "stdafx.h"
 #include "AutoSwitch.h"

Modified: trunk/XBMC/xbmc/Autorun.cpp
===================================================================
--- trunk/XBMC/xbmc/Autorun.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/Autorun.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 #include "autorun.h"
 #include "application.h"
@@ -215,7 +236,7 @@
           bPlaying = true;
           return true;
         }
-        else if (pItem->m_strPath.Find("MPEGAV") != -1 && bAllowVideo 
+        else if (pItem->m_strPath.Find("MPEGAV") != -1 && bAllowVideo
              && (bypassSettings || g_guiSettings.GetBool("autorun.vcd")))
         {
           CFileItemList items;
@@ -245,7 +266,7 @@
             g_playlistPlayer.Play(0);
             bPlaying = true;
             return true;
-          }          
+          }
         }
         else if (pItem->m_strPath.Find("PICTURES") != -1 && bAllowPictures
               && (bypassSettings || g_guiSettings.GetBool("autorun.pictures")))
@@ -296,7 +317,7 @@
       {
         if (!bypassSettings)
           return false;
-        
+
         if (m_gWindowManager.GetActiveWindow() != WINDOW_VIDEO_FILES)
           if (!g_passwordManager.IsMasterLockUnlocked(true))
             return false;

Modified: trunk/XBMC/xbmc/BackgroundInfoLoader.cpp
===================================================================
--- trunk/XBMC/xbmc/BackgroundInfoLoader.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/BackgroundInfoLoader.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,7 +1,27 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 #include "BackgroundInfoLoader.h"
 
-
 CBackgroundInfoLoader::CBackgroundInfoLoader()
 {
   m_bRunning = false;
@@ -84,4 +104,4 @@
 void CBackgroundInfoLoader::SetProgressCallback(IProgressCallback* pCallback)
 {
   m_pProgressCallback = pCallback;
-}
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/BuddyItem.cpp
===================================================================
--- trunk/XBMC/xbmc/BuddyItem.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/BuddyItem.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,23 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
 
 #include "stdafx.h"
 #include "BuddyItem.h"
@@ -270,4 +290,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/ButtonTranslator.cpp
===================================================================
--- trunk/XBMC/xbmc/ButtonTranslator.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/ButtonTranslator.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 #include "ButtonTranslator.h"
 #include "util.h"
@@ -158,7 +179,7 @@
     while (pButton)
     {
       WORD wButtonCode = TranslateGamepadString(pButton->Value());
-      if (pButton->FirstChild()) 
+      if (pButton->FirstChild())
         MapAction(wButtonCode, pButton->FirstChild()->Value(), map);
       pButton = pButton->NextSiblingElement();
     }
@@ -169,7 +190,7 @@
     while (pButton)
     {
       WORD wButtonCode = TranslateRemoteString(pButton->Value());
-      if (pButton->FirstChild()) 
+      if (pButton->FirstChild())
         MapAction(wButtonCode, pButton->FirstChild()->Value(), map);
       pButton = pButton->NextSiblingElement();
     }
@@ -180,7 +201,7 @@
     while (pButton)
     {
       WORD wButtonCode = TranslateUniversalRemoteString(pButton->Value());
-      if (pButton->FirstChild()) 
+      if (pButton->FirstChild())
         MapAction(wButtonCode, pButton->FirstChild()->Value(), map);
       pButton = pButton->NextSiblingElement();
     }
@@ -191,7 +212,7 @@
     while (pButton)
     {
       WORD wButtonCode = TranslateKeyboardString(pButton->Value());
-      if (pButton->FirstChild()) 
+      if (pButton->FirstChild())
         MapAction(wButtonCode, pButton->FirstChild()->Value(), map);
       pButton = pButton->NextSiblingElement();
     }
@@ -354,9 +375,9 @@
   {
     // allow a full window id or a delta id
     int iWindow = atoi(strWindow.c_str());
-    if (iWindow > WINDOW_INVALID) 
+    if (iWindow > WINDOW_INVALID)
       wWindowID = iWindow;
-    else 
+    else
       wWindowID = WINDOW_HOME + iWindow;
   }
   else if (strWindow.Equals("home")) wWindowID = WINDOW_HOME;
@@ -641,5 +662,4 @@
 {
   translatorMap.clear();
 
-}
-
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/Cdg.cpp
===================================================================
--- trunk/XBMC/xbmc/Cdg.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/Cdg.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,7 +1,27 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 #include "Cdg.h"
 
-
 CCdg::CCdg()
 {
   m_hOffset = NULL;
@@ -293,4 +313,4 @@
     }
     break;
   }
-}
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/CdgParser.cpp
===================================================================
--- trunk/XBMC/xbmc/CdgParser.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/CdgParser.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 #include "CdgParser.h"
 #include "application.h"
@@ -266,7 +287,7 @@
       Sleep(15);
       if (CThread::m_bStop)
         return;
-      
+
       CUtil::GetExtension(m_pLoader->GetFileName(),strExt);
       strExt = m_pLoader->GetFileName().substr(0,m_pLoader->GetFileName().size()-strExt.size());
 
@@ -290,7 +311,7 @@
     }
     else
       ReadUpToTime((float)fNewTime-m_fAVDelay);
-    
+
     fCurTime = fNewTime;
     lock.Leave();
     Sleep(15);
@@ -476,7 +497,7 @@
 }
 
 void CCdgRenderer::SetBGalpha(TEX_COLOR alpha)
-{ 
+{
   m_bgAlpha = alpha;
 }
 
@@ -611,7 +632,7 @@
 {
   CSingleLock lock (m_CritSection);
   if (!AllocLoader()) return false;
-  
+
   CUtil::RemoveExtension(strSongPath);
   strSongPath += ".cdg";
   if (CFile::Exists(strSongPath))
@@ -693,4 +714,4 @@
   if (m_pVoiceManager)
     m_pVoiceManager->ProcessVoice();
 }
-// ... Karaoke patch (114097)
+// ... Karaoke patch (114097)
\ No newline at end of file

Modified: trunk/XBMC/xbmc/CdgVoiceManager.cpp
===================================================================
--- trunk/XBMC/xbmc/CdgVoiceManager.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/CdgVoiceManager.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 #include "CdgVoiceManager.h"
 #include "AudioContext.h"
@@ -646,6 +667,4 @@
   // Check for insertions and removals
   CheckDeviceChanges();
   return S_OK;
-}
-
-
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/Crc32.cpp
===================================================================
--- trunk/XBMC/xbmc/Crc32.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/Crc32.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,5 +1,5 @@
 
-#include "stdafx.h" 
+#include "stdafx.h"
 //------------------------------------------------------------------------
 // Copyright (C) Sewell Development Corporation, 1994 - 2000.
 //     Web: http://www.sewelld.com      E-mail: support@...
@@ -56,4 +56,4 @@
   CStdString strLower = strValue;
   strLower.MakeLower();
   Compute(strLower.c_str(), strLower.size());
-}
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/Credits.cpp
===================================================================
--- trunk/XBMC/xbmc/Credits.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/Credits.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 #define _WCTYPE_INLINE_DEFINED
 #include <process.h>
@@ -97,12 +118,12 @@
     { 50, 62, 0, 5400, 420, 1920, EFF_IN_FADE | EFF_OUT_FADE , 24, L"MrC" },
     { 50, 72, 0, 5400, 420, 1920, EFF_IN_FADE | EFF_OUT_FADE , 24, L"c0diq" },
     { 50, 82, 0, 5400, 420, 1920, EFF_IN_FADE | EFF_OUT_FADE , 24, L"Ysbox" },
-    
+
     // Project management (16 beats)
     { 50, 30, 7740, 6360, 60, 420, EFF_IN_FLASH | EFF_OUT_FADE , 42, L"Project Managers" },
     { 50, 45, 0, 6360, 60, 420, EFF_IN_FLASH | EFF_OUT_FADE , 24, L"Gamester17" },
     { 50, 55, 0, 6360, 60, 420, EFF_IN_FLASH | EFF_OUT_FADE , 24, L"Pike" },
-    
+
     // Tech support (8 beats per group - 16 total)
     { 50, 25, 6960+420, 7200, 420, 420, EFF_IN_FADE | EFF_OUT_FADE , 42, L"Technical Support" },
     { 50, 40, 0, 3840, 420, 420, EFF_IN_FADE | EFF_OUT_FADE , 24, L"DDay (a.k.a. JayDee on Xbox-Scene.com)" },
@@ -113,7 +134,7 @@
     { 50, 40, 3840, 3360, 420, 420, EFF_IN_FADE | EFF_OUT_FADE , 24, L"MattAaron (IRC)" },
     { 50, 50, 0, 3360, 420, 420, EFF_IN_FADE | EFF_OUT_FADE , 24, L"No1CaNTeL (IRC)" },
     { 50, 60, 0, 3360, 420, 420, EFF_IN_FADE | EFF_OUT_FADE , 24, L"xLoial (IRC)" },
-    
+
     // Testers (8 beats per group - 24 total + 8 beats blank)
     { 50, 25, 4200, 7560 + 7560/2, 60, 840, EFF_IN_FLASH | EFF_OUT_FADE , 42, L"Testers" },
     { 50, 40, 0, 7560/2, 60, 420, EFF_IN_FLASH | EFF_OUT_FADE , 24, L"Caldor" },
@@ -180,13 +201,13 @@
     { 50, 65, 0, 7320/2, 360, 960, EFF_IN_FADE | EFF_OUT_FADE , 24, L"djoens (Indonesian)" },
     { 50, 75, 0, 7320/2, 360, 960, EFF_IN_FADE | EFF_OUT_FADE , 24, L"napek (Polish)" },
     { 50, 85, 0, 7320/2, 360, 960, EFF_IN_FADE | EFF_OUT_FADE , 24, L"smuto (Polish)" },
-    
+
     { 50, 35, 7320/2, 7320/2, 360, 960, EFF_IN_FADE | EFF_OUT_FADE , 24, L"mvbm (Portuguese (Brazil))" },
     { 50, 45, 0, 7320/2, 360, 960, EFF_IN_FADE | EFF_OUT_FADE , 24, L"que_ (Russian)" },
     { 50, 55, 0, 7320/2, 360, 960, EFF_IN_FADE | EFF_OUT_FADE , 24, L"xsiluro (Slovenian)" },
     { 50, 65, 0, 7320/2, 360, 960, EFF_IN_FADE | EFF_OUT_FADE , 24, L"jose_t (Spanish)" },
     { 50, 75, 0, 7320/2, 360, 960, EFF_IN_FADE | EFF_OUT_FADE , 24, L"blittan (Swedish)" },
- 
+
     // note pause here of 8 beats as more translators pop up
 
     // Skin credits (16 beats)
@@ -338,13 +359,13 @@
     { 50, 50, 4000, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 36, L"DDay" },
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"Special thanks to:" },
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"Liza, for putting up with me." },
-    { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"Liza, for understanding that it" }, 
+    { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"Liza, for understanding that it" },
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"sometimes is normal to have five" },
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"xbox's hooked up at home." },
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"Liza, for giving me Emil" },
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"Pike, for doing a great job" },
 
-    // section bobbin007    
+    // section bobbin007
     { 50, 50, 4000, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 36, L"Bobbin007" },
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"Thanks to" },
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"Mr. Lucas for the Arts," },
@@ -372,7 +393,7 @@
     { 50, 50, 4000, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 36, L"chadoe" },
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"Thanks to whoever invented the internet" },
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"thus making this kind of team work possible" },
-    
+
     // section geminiserver
     { 50, 50, 4000, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 36, L"GeminiServer" },
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"Thanks to everybody involved in this Project" },
@@ -403,7 +424,7 @@
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"Thanks to all of Team-XBMC for" },
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"their hard work. Thanks to Pike" },
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"for his cool chats and support." },
-    { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"And thanks to Mumbles for his" }, 
+    { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"And thanks to Mumbles for his" },
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"Vortex textures." },
 
     // section c0diq
@@ -439,13 +460,13 @@
 
     // section modhack
     { 50, 50, 4000, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 36, L"Modhack" },
-    { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"Thanks to my job for giving me" }, 
+    { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"Thanks to my job for giving me" },
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"free time to play with XBMC" },
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"Thanks to gueux.be community" },
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"for the french support" },
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"Thanks Mathias for your mighty skin!" },
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"Big thanks to Alexsolex for the script MyCine" },
-    { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"Thanks to Thibaud, Greg (Mgt1275)" }, 
+    { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"Thanks to Thibaud, Greg (Mgt1275)" },
     { 50, 50, 800, 0, 4000, 4000, EFF_IN_ASCEND | EFF_OUT_ASCEND , 22, L"and Mathieu (Sergent M@...)" },
 
     // section scape

Modified: trunk/XBMC/xbmc/CueDocument.cpp
===================================================================
--- trunk/XBMC/xbmc/CueDocument.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/CueDocument.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -109,7 +109,7 @@
     {
       iTrackNumber = ExtractNumericInfo(strLine.c_str() + 5);
       m_iTotalTracks++;
-      
+
       CCueTrack track;
       m_Track.push_back(track);
       m_Track[m_iTotalTracks].iTrackNumber = iTrackNumber;

Modified: trunk/XBMC/xbmc/DNSNameCache.cpp
===================================================================
--- trunk/XBMC/xbmc/DNSNameCache.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/DNSNameCache.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 #include "dnsnamecache.h"
 
@@ -38,73 +59,73 @@
   // do a DNS lookup
 #ifndef _XBOX
   {
-	  WSADATA wsaData;		/* Used to open Windows connection */
-	  SOCKET sd;				/* Socket descriptor */
-	  struct sockaddr_in socket_address;
-	  struct hostent *host;
-	  int count = 0;
+    WSADATA wsaData;    /* Used to open Windows connection */
+    SOCKET sd;          /* Socket descriptor */
+    struct sockaddr_in socket_address;
+    struct hostent *host;
+    int count = 0;
 
-	  /* Open a windows connection */
-	  if (WSAStartup(0x0101, &wsaData) != 0)
-	  {
-		  OutputDebugString("Could not open Windows connection\n");
+    /* Open a windows connection */
+    if (WSAStartup(0x0101, &wsaData) != 0)
+    {
+      OutputDebugString("Could not open Windows connection\n");
       return false;
-	  }
+    }
 
-	  /* Open up a socket */
-	  sd = socket(AF_INET, SOCK_STREAM, 0);
+    /* Open up a socket */
+    sd = socket(AF_INET, SOCK_STREAM, 0);
 
-	  /* Make sure the socket was opened */
-	  if (sd == INVALID_SOCKET)
-	  {
-		  OutputDebugString("Could not open socket.\n");
-		  WSACleanup();
-		  return false;
-	  }
+    /* Make sure the socket was opened */
+    if (sd == INVALID_SOCKET)
+    {
+      OutputDebugString("Could not open socket.\n");
+      WSACleanup();
+      return false;
+    }
 
-	  /* Bind with IP address */
-	  memset(&socket_address, '\0', sizeof(struct sockaddr_in));
-	  socket_address.sin_family = AF_INET;
-	  socket_address.sin_port = htons((short)4000);
+    /* Bind with IP address */
+    memset(&socket_address, '\0', sizeof(struct sockaddr_in));
+    socket_address.sin_family = AF_INET;
+    socket_address.sin_port = htons((short)4000);
 
-	  /* Get host by name */
-	  host = gethostbyname(strHostName.c_str());
-  	
-	  /* Print error message if could not find host */
-	  if (host == NULL || host->h_addr_list[0] == NULL)
-	  {
-		  OutputDebugString("Could not find host\n");
-		  closesocket(sd);
-		  WSACleanup();
-		  return false;
-	  }
+    /* Get host by name */
+    host = gethostbyname(strHostName.c_str());
 
-	  /* Print out host name */
+    /* Print error message if could not find host */
+    if (host == NULL || host->h_addr_list[0] == NULL)
+    {
+      OutputDebugString("Could not find host\n");
+      closesocket(sd);
+      WSACleanup();
+      return false;
+    }
+
+    /* Print out host name */
     CLog::Log(LOGDEBUG, "host name = %s\n", host->h_name);
-  	
-	  /* Loop through and print out any aliases */
-	  while(1)
-	  {
-		  if(host->h_aliases[count] == NULL)
-		  {
-			  break;
-		  }
+
+    /* Loop through and print out any aliases */
+    while(1)
+    {
+      if(host->h_aliases[count] == NULL)
+      {
+        break;
+      }
       CLog::Log(LOGDEBUG, "alias %d: %s\n", count + 1, host->h_aliases[count]);
-		  ++count;
-	  }
-  	
-	  /* Print out all IP addresses of name */
-	  if (host->h_addr_list[0])
-	  {
+      ++count;
+    }
+
+    /* Print out all IP addresses of name */
+    if (host->h_addr_list[0])
+    {
       strIpAdres.Format("%d.%d.%d.%d", (unsigned char)host->h_addr_list[0][0], (unsigned char)host->h_addr_list[0][1], (unsigned char)host->h_addr_list[0][2], (unsigned char)host->h_addr_list[0][3]);
       CDNSName dnsName;
       dnsName.m_strHostName = strHostName;
       dnsName.m_strIpAdres = strIpAdres;
       g_DNSCache.m_vecDNSNames.push_back(dnsName);
-	  }
+    }
 
-	  closesocket(sd);
-	  WSACleanup();
+    closesocket(sd);
+    WSACleanup();
 
     return true;
   }
@@ -141,4 +162,4 @@
   WSACloseEvent(hEvent);
 #endif
   return false;
-}
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/Database.cpp
===================================================================
--- trunk/XBMC/xbmc/Database.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/Database.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 #include "database.h"
 #include "util.h"
@@ -2,2 +23,3 @@
 
+
 CDatabase::CDatabase(void)
@@ -260,10 +282,10 @@
 
 bool CDatabase::CreateTables()
 {
-    //  all fatx formatted partitions, except the utility drive, 
-    //  have a cluster size of 16k. To gain better performance 
-    //  when performing write operations to the database, set 
-    //  the page size of the database file to 16k. 
+    //  all fatx formatted partitions, except the utility drive,
+    //  have a cluster size of 16k. To gain better performance
+    //  when performing write operations to the database, set
+    //  the page size of the database file to 16k.
     //  This needs to be done before any table is created.
     CLog::Log(LOGINFO, "Set page size");
     m_pDS->exec("PRAGMA page_size=16384\n");
@@ -297,4 +319,4 @@
   }
 
   return true;
-}
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/DateTime.cpp
===================================================================
--- trunk/XBMC/xbmc/DateTime.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/DateTime.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 #include "DateTime.h"
 
@@ -61,13 +82,13 @@
 CDateTimeSpan CDateTimeSpan::operator +(const CDateTimeSpan& right) const
 {
   CDateTimeSpan left(*this);
-  
+
   ULARGE_INTEGER timeLeft;
   left.ToULargeInt(timeLeft);
 
   ULARGE_INTEGER timeRight;
   right.ToULargeInt(timeRight);
-  
+
   timeLeft.QuadPart+=timeRight.QuadPart;
 
   left.FromULargeInt(timeLeft);
@@ -78,13 +99,13 @@
 CDateTimeSpan CDateTimeSpan::operator -(const CDateTimeSpan& right) const
 {
   CDateTimeSpan left(*this);
-  
+
   ULARGE_INTEGER timeLeft;
   left.ToULargeInt(timeLeft);
 
   ULARGE_INTEGER timeRight;
   right.ToULargeInt(timeRight);
-  
+
   timeLeft.QuadPart-=timeRight.QuadPart;
 
   left.FromULargeInt(timeLeft);
@@ -99,7 +120,7 @@
 
   ULARGE_INTEGER timeRight;
   right.ToULargeInt(timeRight);
-  
+
   timeThis.QuadPart+=timeRight.QuadPart;
 
   FromULargeInt(timeThis);
@@ -114,7 +135,7 @@
 
   ULARGE_INTEGER timeRight;
   right.ToULargeInt(timeRight);
-  
+
   timeThis.QuadPart-=timeRight.QuadPart;
 
   FromULargeInt(timeThis);
@@ -458,13 +479,13 @@
 CDateTime CDateTime::operator +(const CDateTimeSpan& right) const
 {
   CDateTime left(*this);
-  
+
   ULARGE_INTEGER timeLeft;
   left.ToULargeInt(timeLeft);
 
   ULARGE_INTEGER timeRight;
   right.ToULargeInt(timeRight);
-  
+
   timeLeft.QuadPart+=timeRight.QuadPart;
 
   left.FromULargeInt(timeLeft);
@@ -475,13 +496,13 @@
 CDateTime CDateTime::operator -(const CDateTimeSpan& right) const
 {
   CDateTime left(*this);
-  
+
   ULARGE_INTEGER timeLeft;
   left.ToULargeInt(timeLeft);
 
   ULARGE_INTEGER timeRight;
   right.ToULargeInt(timeRight);
-  
+
   timeLeft.QuadPart-=timeRight.QuadPart;
 
   left.FromULargeInt(timeLeft);
@@ -496,7 +517,7 @@
 
   ULARGE_INTEGER timeRight;
   right.ToULargeInt(timeRight);
-  
+
   timeThis.QuadPart+=timeRight.QuadPart;
 
   FromULargeInt(timeThis);
@@ -511,7 +532,7 @@
 
   ULARGE_INTEGER timeRight;
   right.ToULargeInt(timeRight);
-  
+
   timeThis.QuadPart-=timeRight.QuadPart;
 
   FromULargeInt(timeThis);
@@ -522,10 +543,10 @@
 CDateTimeSpan CDateTime::operator -(const CDateTime& right) const
 {
   CDateTimeSpan left;
-  
+
   ULARGE_INTEGER timeLeft;
   left.ToULargeInt(timeLeft);
-  
+
   ULARGE_INTEGER timeThis;
   ToULargeInt(timeThis);
 
@@ -592,10 +613,10 @@
 
 bool CDateTime::ToFileTime(const time_t& time, FILETIME& fileTime) const
 {
-	LONGLONG ll = Int32x32To64(time, 10000000)+0x19DB1DED53E8000;
+  LONGLONG ll = Int32x32To64(time, 10000000)+0x19DB1DED53E8000;
 
-	fileTime.dwLowDateTime  = (DWORD)&ll;
-	fileTime.dwHighDateTime = (DWORD)(ll >> 32);
+  fileTime.dwLowDateTime  = (DWORD)&ll;
+  fileTime.dwHighDateTime = (DWORD)(ll >> 32);
 
   return true;
 }
@@ -686,15 +707,15 @@
 
 void CDateTime::SetDateTime(int year, int month, int day, int hour, int minute, int second)
 {
-	SYSTEMTIME st;
+  SYSTEMTIME st;
   ZeroMemory(&st, sizeof(SYSTEMTIME));
 
-	st.wYear=year;
-	st.wMonth=month;
-	st.wDay=day;
+  st.wYear=year;
+  st.wMonth=month;
+  st.wDay=day;
   st.wHour=hour;
-	st.wMinute=minute;
-	st.wSecond=second;
+  st.wMinute=minute;
+  st.wSecond=second;
 
   m_state = ToFileTime(st, m_time) ? valid : invalid;
 }
@@ -720,7 +741,7 @@
   ULARGE_INTEGER filetime;
   ToULargeInt(filetime);
 
-  time=(time_t)(filetime.QuadPart-0x19DB1DED53E8000UL)/10000000UL; 
+  time=(time_t)(filetime.QuadPart-0x19DB1DED53E8000UL)/10000000UL;
 }
 
 void CDateTime::GetAsTm(tm& time) const
@@ -772,7 +793,7 @@
     char c=strFormat[i];
     if (c=='\'')
     {
-      // To be able to display a "'" in the string, 
+      // To be able to display a "'" in the string,
       // find the last "'" that doesn't follow a "'"
       int pos=i+1;
       while(((pos=strFormat.Find(c,pos+1))>-1 && pos<strFormat.GetLength()) && strFormat[pos+1]=='\'');
@@ -780,7 +801,7 @@
       CStdString strPart;
       if (pos>-1)
       {
-        // Extract string between ' ' 
+        // Extract string between ' '
         strPart=strFormat.Mid(i+1, pos-i-1);
         i=pos;
       }
@@ -932,7 +953,7 @@
     char c=strFormat[i];
     if (c=='\'')
     {
-      // To be able to display a "'" in the string, 
+      // To be able to display a "'" in the string,
       // find the last "'" that doesn't follow a "'"
       int pos=i+1;
       while(((pos=strFormat.Find(c,pos+1))>-1 && pos<strFormat.GetLength()) && strFormat[pos+1]=='\'');
@@ -940,7 +961,7 @@
       CStdString strPart;
       if (pos>-1)
       {
-        // Extract string between ' ' 
+        // Extract string between ' '
         strPart=strFormat.Mid(i+1, pos-i-1);
         i=pos;
       }
@@ -980,13 +1001,13 @@
       {
         switch (dateTime.wDayOfWeek)
         {
-        case 1 : str = g_localizeStrings.Get(11); break;
-        case 2 : str = g_localizeStrings.Get(12); break;
-        case 3 : str = g_localizeStrings.Get(13); break;
-        case 4 : str = g_localizeStrings.Get(14); break;
-        case 5 : str = g_localizeStrings.Get(15); break;
-        case 6 : str = g_localizeStrings.Get(16); break;
-        default: str = g_localizeStrings.Get(17); break;
+          case 1 : str = g_localizeStrings.Get(11); break;
+          case 2 : str = g_localizeStrings.Get(12); break;
+          case 3 : str = g_localizeStrings.Get(13); break;
+          case 4 : str = g_localizeStrings.Get(14); break;
+          case 5 : str = g_localizeStrings.Get(15); break;
+          case 6 : str = g_localizeStrings.Get(16); break;
+          default: str = g_localizeStrings.Get(17); break;
         }
       }
       strOut+=str;
@@ -1019,18 +1040,18 @@
       {
         switch (dateTime.wMonth)
         {
-        case 1 : str = g_localizeStrings.Get(21); break;
-        case 2 : str = g_localizeStrings.Get(22); break;
-        case 3 : str = g_localizeStrings.Get(23); break;
-        case 4 : str = g_localizeStrings.Get(24); break;
-        case 5 : str = g_localizeStrings.Get(25); break;
-        case 6 : str = g_localizeStrings.Get(26); break;
-        case 7 : str = g_localizeStrings.Get(27); break;
-        case 8 : str = g_localizeStrings.Get(28); break;
-        case 9 : str = g_localizeStrings.Get(29); break;
-        case 10: str = g_localizeStrings.Get(30); break;
-        case 11: str = g_localizeStrings.Get(31); break;
-        default: str = g_localizeStrings.Get(32); break;
+          case 1 : str = g_localizeStrings.Get(21); break;
+          case 2 : str = g_localizeStrings.Get(22); break;
+          case 3 : str = g_localizeStrings.Get(23); break;
+          case 4 : str = g_localizeStrings.Get(24); break;
+          case 5 : str = g_localizeStrings.Get(25); break;
+          case 6 : str = g_localizeStrings.Get(26); break;
+          case 7 : str = g_localizeStrings.Get(27); break;
+          case 8 : str = g_localizeStrings.Get(28); break;
+          case 9 : str = g_localizeStrings.Get(29); break;
+          case 10: str = g_localizeStrings.Get(30); break;
+          case 11: str = g_localizeStrings.Get(31); break;
+          default: str = g_localizeStrings.Get(32); break;
         }
       }
       strOut+=str;
@@ -1071,4 +1092,4 @@
 CStdString CDateTime::GetAsLocalizedDateTime(bool longDate/*=false*/, bool withSeconds/*=true*/) const
 {
   return GetAsLocalizedDate(longDate)+" "+GetAsLocalizedTime(withSeconds);
-}
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/DetectDVDType.cpp
===================================================================
--- trunk/XBMC/xbmc/DetectDVDType.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/DetectDVDType.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,23 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
 
 #include "stdafx.h"
 #include "DetectDVDType.h"

Modified: trunk/XBMC/xbmc/DynamicDll.cpp
===================================================================
--- trunk/XBMC/xbmc/DynamicDll.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/DynamicDll.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 #include "DynamicDll.h"
 
@@ -65,4 +86,4 @@
 
   m_strDllName=strDllName;
   return true;
-}
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/FileItem.cpp
===================================================================
--- trunk/XBMC/xbmc/FileItem.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/FileItem.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 #include "fileitem.h"
 #include "Util.h"
@@ -279,7 +300,7 @@
   if (IsCDDA()) return true;
   if (IsShoutCast()) return true;
   if (IsLastFM()) return true;
-  
+
   /* check preset content type */
   if( m_contenttype.Left(6).Equals("audio/") )
     return true;
@@ -312,7 +333,7 @@
     return true;
 
   CStdString extension;
-  CUtil::GetExtension(m_strPath, extension);    
+  CUtil::GetExtension(m_strPath, extension);
 
   if (extension.IsEmpty())
     return false;
@@ -321,7 +342,7 @@
   if (g_stSettings.m_pictureExtensions.Find(extension) != -1)
     return true;
 
-  if (extension == ".tbn") 
+  if (extension == ".tbn")
     return true;
 
   return false;
@@ -396,34 +417,34 @@
 
 bool CFileItem::IsPythonScript() const
 {
-  return CUtil::GetExtension(m_strPath).Equals(".py", false);  
+  return CUtil::GetExtension(m_strPath).Equals(".py", false);
 }
 
 bool CFileItem::IsXBE() const
 {
-  return CUtil::GetExtension(m_strPath).Equals(".xbe", false);  
+  return CUtil::GetExtension(m_strPath).Equals(".xbe", false);
 }
 
 bool CFileItem::IsType(const char *ext) const
 {
-  return CUtil::GetExtension(m_strPath).Equals(ext, false);  
+  return CUtil::GetExtension(m_strPath).Equals(ext, false);
 }
 
 bool CFileItem::IsDefaultXBE() const
 {
-  CStdString filename = CUtil::GetFileName(m_strPath);  
+  CStdString filename = CUtil::GetFileName(m_strPath);
   if (filename.Equals("default.xbe")) return true;
   return false;
 }
 
 bool CFileItem::IsShortCut() const
 {
-  return CUtil::GetExtension(m_strPath).Equals(".cut", false);  
+  return CUtil::GetExtension(m_strPath).Equals(".cut", false);
 }
 
 bool CFileItem::IsNFO() const
 {
-  return CUtil::GetExtension(m_strPath).Equals(".nfo", false);  
+  return CUtil::GetExtension(m_strPath).Equals(".nfo", false);
 }
 
 bool CFileItem::IsDVDImage() const
@@ -461,17 +482,17 @@
 
 bool CFileItem::IsZIP() const
 {
-  return CUtil::GetExtension(m_strPath).Equals(".zip", false);  
+  return CUtil::GetExtension(m_strPath).Equals(".zip", false);
 }
 
 bool CFileItem::IsCBZ() const
 {
-  return CUtil::GetExtension(m_strPath).Equals(".cbz", false);  
+  return CUtil::GetExtension(m_strPath).Equals(".cbz", false);
 }
 
 bool CFileItem::IsCBR() const
 {
-  return CUtil::GetExtension(m_strPath).Equals(".cbr", false);  
+  return CUtil::GetExtension(m_strPath).Equals(".cbr", false);
 }
 
 bool CFileItem::IsStack() const
@@ -685,7 +706,7 @@
 
 // set the album thumb for a file or folder
 void CFileItem::SetMusicThumb(bool alwaysCheckRemote /* = true */)
-{ 
+{
   if (HasThumbnail()) return;
   SetCachedMusicThumb();
   if (!HasThumbnail())
@@ -809,7 +830,7 @@
     if( (iPos2 > iPos1) && bDoneSomething )
     {
       strLabel += strMask.Mid(iPos1, iPos2 - iPos1);
-      bDoneSomething = false;  
+      bDoneSomething = false;
     }
     CStdString str;
     if (strMask[iPos2 + 1] == 'N' && tag.GetTrackNumber() > 0)
@@ -932,7 +953,7 @@
 
     if( m_bIsFolder )
       m_ref = "x-directory/normal";
-    else if( m_strPath.Left(8).Equals("shout://") 
+    else if( m_strPath.Left(8).Equals("shout://")
           || m_strPath.Left(7).Equals("http://")
           || m_strPath.Left(7).Equals("upnp://"))
     {
@@ -942,7 +963,7 @@
     }
     else if( m_strPath.Left(8).Equals("https://") )
     {
-      CURL url(m_strPath);      
+      CURL url(m_strPath);
       CFileCurl::GetContent(url, m_ref);
     }
 
@@ -1653,9 +1674,9 @@
         // check for any dvd directories, only on known fast types
         // i'm adding xbms even thou it really isn't fast due to
         // opening file to check for existance
-        if( !item->IsRemote() 
-         || item->IsSmb() 
-         || CUtil::IsInRAR(item->m_strPath) 
+        if( !item->IsRemote()
+         || item->IsSmb()
+         || CUtil::IsInRAR(item->m_strPath)
          || CUtil::IsInZIP(item->m_strPath)
          || item->m_strPath.Left(5).Equals("xbms", false)
          )
@@ -1680,10 +1701,10 @@
             /* will allways be set on the video_ts.ifo file */
             CStdString thumb(item->GetCachedVideoThumb());
             if(CFile::Exists(thumb))
-              item->SetThumbnailImage(thumb);              
+              item->SetThumbnailImage(thumb);
             else
               item->SetUserVideoThumb();
-              
+
           }
         }
         continue;
@@ -1873,7 +1894,7 @@
 }
 
 CStdString CFileItem::GetPreviouslyCachedMusicThumb()
-{ 
+{
   // the highest priority thumb is album name + album path
   CStdString strPath;
   if (!m_bIsFolder)
@@ -1963,7 +1984,7 @@
 
 void CFileItem::SetUserMusicThumb(bool alwaysCheckRemote /* = false */)
 {
-  // caches as the local thumb 
+  // caches as the local thumb
   CStdString thumb(GetUserMusicThumb(alwaysCheckRemote));
   if (!thumb.IsEmpty())
   {
@@ -2083,7 +2104,7 @@
   if (m_bIsShareOrDrive) return;
   if (IsParentFolder()) return;
 
-  // caches as the local thumb 
+  // caches as the local thumb
   CStdString thumb(GetUserVideoThumb());
   if (!thumb.IsEmpty())
   {
@@ -2159,7 +2180,7 @@
 
         CUtil::AddFileToFolder(m_strPath, "titleimage.xbx", titleimageXBX);
         CUtil::AddFileToFolder(m_strPath,"saveimage.xbx",saveimageXBX);
-        
+
         /*if (CFile::Exists(saveimageXBX))
         {
           CUtil::CacheXBEIcon(saveimageXBX, thumb);
@@ -2323,4 +2344,4 @@
       continue;
     pItem->SetCachedGameSavesThumb();  // was  pItem->SetCachedProgramThumb(); oringally
   }
-}
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/FlacTag.cpp
===================================================================
--- trunk/XBMC/xbmc/FlacTag.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/FlacTag.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,23 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
 
 #include "stdafx.h"
 #include "flactag.h"
@@ -2,3 +22,2 @@
 
-
 #define BYTES_TO_CHECK_FOR_BAD_TAGS 8192
@@ -136,4 +155,4 @@
     // Increment our position in the file buffer
     Pos += I1[0] + 4;
   }
-}
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/GUIDialogAudioSubtitleSettings.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogAudioSubtitleSettings.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/GUIDialogAudioSubtitleSettings.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 #include "GUIDialogAudioSubtitleSettings.h"
 #include "GUIDialogFileBrowser.h"
@@ -132,10 +153,10 @@
 
   // cycle through each subtitle and add it to our entry list
   for (int i = 0; i <= setting.max; ++i)
-  {    
+  {
     CStdString strItem;
     CStdString strName;
-    g_application.m_pPlayer->GetSubtitleName(i, strName);    
+    g_application.m_pPlayer->GetSubtitleName(i, strName);
     if (strName.length() == 0)
       strName = "Unnamed";
 
@@ -231,7 +252,7 @@
 
     const CStdString strMask = ".utf|.utf8|.utf-8|.sub|.srt|.smi|.rt|.txt|.ssa|.aqt|.jss|.ass|.idx|.ifo|.rar|.zip";
     if (CGUIDialogFileBrowser::ShowAndGetFile(g_settings.m_vecMyVideoShares,strMask,g_localizeStrings.Get(293),strPath,false,true)) // "subtitles"
-    {      
+    {
       CStdString strExt;
       CUtil::GetExtension(strPath,strExt);
       if (strExt.CompareNoCase(".idx") == 0 || strExt.CompareNoCase(".sub") == 0)
@@ -259,7 +280,7 @@
           }
           if (CFile::Exists(strPath2))
             CFile::Cache(strPath2,strPath3);
-          else 
+          else
           {
             CFileItemList items;
             CStdString strDir,strFileNameNoExtNoCase;
@@ -274,7 +295,7 @@
           }
           g_stSettings.m_currentVideoSettings.m_SubtitleCached = false;
           g_stSettings.m_currentVideoSettings.m_SubtitleOn = true;
-          
+
           // reopen the file
           if ( g_application.PlayFile(g_application.CurrentFileItem(), true) && g_application.m_pPlayer )
           {
@@ -282,7 +303,7 @@
             g_application.m_pPlayer->SetPlayerState(state);
             g_application.SeekTime(time);
           }
-          
+
           Close();
         }
       }

Modified: trunk/XBMC/xbmc/GUIDialogBoxBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogBoxBase.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/GUIDialogBoxBase.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 #include "GUIDialogBoxBase.h"
 

Modified: trunk/XBMC/xbmc/GUIDialogButtonMenu.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogButtonMenu.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/GUIDialogButtonMenu.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 #include "GUIDialogButtonMenu.h"
 #include "GUILabelControl.h"

Modified: trunk/XBMC/xbmc/GUIDialogContextMenu.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogContextMenu.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/GUIDialogContextMenu.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 #include "GUIDialogContextMenu.h"
 #include "GUIButtonControl.h"
@@ -192,7 +213,7 @@
     // For DVD Drive Context menu stuff, we can also check where we are, so playin dvd can be dependet to the section!
     bool bIsDVDContextMenu  = false;
     bool bIsDVDMediaPresent = false;
-    
+
     // load our menu
     pMenu->Initialize();
 
@@ -207,7 +228,7 @@
       {
         btn_PlayDisc = pMenu->AddButton(341); // Play CD/DVD!
 
-        CCdInfo *pCdInfo = CDetectDVDMedia::GetCdInfo(); 
+        CCdInfo *pCdInfo = CDetectDVDMedia::GetCdInfo();
         if ( pCdInfo->IsAudio(1) || pCdInfo->IsCDExtra(1) || pCdInfo->IsMixedMode(1) )
           btn_Rip = pMenu->AddButton(600);
 
@@ -218,7 +239,7 @@
     }
 
     CStdString strDefault = GetDefaultShareNameByType(strType);
-    
+
     // add the needed buttons
     int btn_AddShare=0;
     int btn_EditPath=0;
@@ -278,7 +299,7 @@
     // set the correct position
     pMenu->SetPosition(posX - pMenu->GetWidth() / 2, posY - pMenu->GetHeight() / 2);
     pMenu->DoModal();
-    
+
     int btn = pMenu->GetButton();
     if (btn > 0)
     {
@@ -292,7 +313,7 @@
         else
           if (!g_passwordManager.IsProfileLockUnlocked())
             return false;
-        
+
         return CGUIDialogMediaSource::ShowAndEditMediaSource(strType, *share);
       }
       else if (btn == btn_Delete)
@@ -313,7 +334,7 @@
             if (share->strName.Equals(strDefault))
               ClearDefault(strType);
           }
-          
+
           // delete this share
           g_settings.DeleteBookmark(strType, share->strName, share->strPath);
           return true;
@@ -328,7 +349,7 @@
         }
         else if (!g_passwordManager.IsMasterLockUnlocked(true))
           return false;
-        
+
         return CGUIDialogMediaSource::ShowAndAddMediaSource(strType);
       }
       else if (btn == btn_Default)
@@ -340,7 +361,7 @@
         }
         else if (!g_passwordManager.IsMasterLockUnlocked(true))
           return false;
-        
+
         // make share default
         SetDefault(strType, share->strName);
         return true;
@@ -375,9 +396,9 @@
         if (CGUIDialogFileBrowser::ShowAndGetImage(shares,g_localizeStrings.Get(20056),strThumb))
         {
           g_settings.UpdateBookmark(strType,share->strName,"thumbnail",strThumb);
-          
+
           CGUIMessage msg(GUI_MSG_NOTIFY_ALL,0,0,GUI_MSG_UPDATE_BOOKMARKS);
-          m_gWindowManager.SendThreadMessage(msg);        
+          m_gWindowManager.SendThreadMessage(msg);
           return true;
         }
 
@@ -395,7 +416,7 @@
 
         g_settings.UpdateBookmark(strType,share->strName,"thumbnail","");
         CGUIMessage msg(GUI_MSG_NOTIFY_ALL,0,0,GUI_MSG_UPDATE_BOOKMARKS);
-        m_gWindowManager.SendThreadMessage(msg);        
+        m_gWindowManager.SendThreadMessage(msg);
         return true;
       }
       else if (btn == btn_PlayDisc)
@@ -428,7 +449,7 @@
         CStdString strNewPassword = "";
         int iButton=0;
         // prompt user for mastercode when changing lock settings) only for default user
-        if (!g_passwordManager.IsMasterLockUnlocked(true))    
+        if (!g_passwordManager.IsMasterLockUnlocked(true))
           return false;
 
         CGUIDialogLockSettings* pDialog = (CGUIDialogLockSettings*)m_gWindowManager.GetWindow(WINDOW_DIALOG_LOCK_SETTINGS);
@@ -487,7 +508,7 @@
         g_settings.CommitBookmarkTransaction();
 
         CGUIMessage msg(GUI_MSG_NOTIFY_ALL,0,0,GUI_MSG_UPDATE_BOOKMARKS);
-        m_gWindowManager.SendThreadMessage(msg);        
+        m_gWindowManager.SendThreadMessage(msg);
         return true;
 
       }
@@ -499,7 +520,7 @@
 
         g_settings.UpdateBookmark(strType, share->strName, "badpwdcount", "0");
         CGUIMessage msg(GUI_MSG_NOTIFY_ALL,0,0,GUI_MSG_UPDATE_BOOKMARKS);
-        m_gWindowManager.SendThreadMessage(msg);        
+        m_gWindowManager.SendThreadMessage(msg);
         return true;
       }
       else if (btn == btn_RemoveLock)
@@ -509,7 +530,7 @@
 
         if (!CGUIDialogYesNo::ShowAndGetInput(12335, 0, 750, 0))
           return false;
-        
+
         share->m_iHasLock = 0;
         g_settings.BeginBookmarkTransaction();
         g_settings.UpdateBookmark(strType, share->strName, "lockmode", "0");
@@ -517,7 +538,7 @@
         g_settings.UpdateBookmark(strType, share->strName, "badpwdcount", "0");
         g_settings.CommitBookmarkTransaction();
         CGUIMessage msg(GUI_MSG_NOTIFY_ALL,0,0,GUI_MSG_UPDATE_BOOKMARKS);
-        m_gWindowManager.SendThreadMessage(msg);        
+        m_gWindowManager.SendThreadMessage(msg);
 
         return true;
       }
@@ -534,12 +555,12 @@
       }
       else if (btn == btn_ChangeLock)
       {
-        if (!g_passwordManager.IsMasterLockUnlocked(true))    
+        if (!g_passwordManager.IsMasterLockUnlocked(true))
           return false;
 
         CStdString strNewPW;
 	      CStdString strNewLockMode;
-        bool bResult=false;		    
+        bool bResult=false;
         CGUIDialogLockSettings* pDialog = (CGUIDialogLockSettings*)m_gWindowManager.GetWindow(WINDOW_DIALOG_LOCK_SETTINGS);
         if (pDialog)
         {
@@ -574,18 +595,18 @@
         }
         if (!bResult)
           return false;
-		    // password ReSet and re-entry succeeded, write out the lock data
+        // password ReSet and re-entry succeeded, write out the lock data
         g_settings.BeginBookmarkTransaction();
-		    g_settings.UpdateBookmark(strType, share->strName, "lockcode", strNewPW);
-		    g_settings.UpdateBookmark(strType, share->strName, "lockmode", strNewLockMode);
-		    g_settings.UpdateBookmark(strType, share->strName, "badpwdcount", "0");
+        g_settings.UpdateBookmark(strType, share->strName, "lockcode", strNewPW);
+        g_settings.UpdateBookmark(strType, share->strName, "lockmode", strNewLockMode);
+        g_settings.UpdateBookmark(strType, share->strName, "badpwdcount", "0");
         g_settings.CommitBookmarkTransaction();
-		    return true;
+        return true;
       }
       else if (btn == btn_Settings)
-      { 
+      {
         if (strType == "video")
-          m_gWindowManager.ActivateWindow(WINDOW_SETTINGS_MYVIDEOS); 
+          m_gWindowManager.ActivateWindow(WINDOW_SETTINGS_MYVIDEOS);
         else if (strType == "music")
           m_gWindowManager.ActivateWindow(WINDOW_SETTINGS_MYMUSIC);
         else if (strType == "myprograms")
@@ -647,31 +668,31 @@
 
 void CGUIDialogContextMenu::SwitchMedia(const CStdString& strType, const CStdString& strPath, float posX, float posY)
 {
-	// what should we display?
-	vector <CStdString> vecTypes;
-	if (!strType.Equals("music"))
-		vecTypes.push_back(g_localizeStrings.Get(2));	// My Music
-	if (!strType.Equals("video"))
-		vecTypes.push_back(g_localizeStrings.Get(3));	// My Videos
-	if (!strType.Equals("pictures"))
-		vecTypes.push_back(g_localizeStrings.Get(1));	// My Pictures
-	if (!strType.Equals("files"))
-		vecTypes.push_back(g_localizeStrings.Get(7));	// My Files
+  // what should we display?
+  vector <CStdString> vecTypes;
+  if (!strType.Equals("music"))
+    vecTypes.push_back(g_localizeStrings.Get(2));	// My Music
+  if (!strType.Equals("video"))
+    vecTypes.push_back(g_localizeStrings.Get(3));	// My Videos
+  if (!strType.Equals("pictures"))
+    vecTypes.push_back(g_localizeStrings.Get(1));	// My Pictures
+  if (!strType.Equals("files"))
+    vecTypes.push_back(g_localizeStrings.Get(7));	// My Files
 
-	// something went wrong
-	if (vecTypes.size() != 3)
-		return;
+  // something went wrong
+  if (vecTypes.size() != 3)
+    return;
 
-	// create menu
-	CGUIDialogContextMenu *pMenu = (CGUIDialogContextMenu *)m_gWindowManager.GetWindow(WINDOW_DIALOG_CONTEXT_MENU);
+  // create menu
+  CGUIDialogContextMenu *pMenu = (CGUIDialogContextMenu *)m_gWindowManager.GetWindow(WINDOW_DIALOG_CONTEXT_MENU);
   pMenu->Initialize();
 
-	// add buttons
+  // add buttons
   int btn_Type[3];
-	for (int i=0; i<3; i++)
-	{
-		btn_Type[i] = pMenu->AddButton(vecTypes[i]);
-	}
+  for (int i=0; i<3; i++)
+  {
+    btn_Type[i] = pMenu->AddButton(vecTypes[i]);
+  }
 
   // display menu
   pMenu->SetPosition(posX - pMenu->GetWidth() / 2, posY - pMenu->GetHeight() / 2);
@@ -683,21 +704,21 @@
   {
     if (btn == btn_Type[i])
     {
-			// map back to correct window
-			int iWindow = WINDOW_INVALID;
-			if (vecTypes[i].Equals(g_localizeStrings.Get(2)))
-				iWindow = WINDOW_MUSIC_FILES;
-			else if (vecTypes[i].Equals(g_localizeStrings.Get(3)))
-				iWindow = WINDOW_VIDEO_FILES;
-			else if (vecTypes[i].Equals(g_localizeStrings.Get(1)))
-				iWindow = WINDOW_PICTURES;
-			else if (vecTypes[i].Equals(g_localizeStrings.Get(7)))
-				iWindow = WINDOW_FILES;
+      // map back to correct window
+      int iWindow = WINDOW_INVALID;
+      if (vecTypes[i].Equals(g_localizeStrings.Get(2)))
+        iWindow = WINDOW_MUSIC_FILES;
+      else if (vecTypes[i].Equals(g_localizeStrings.Get(3)))
+        iWindow = WINDOW_VIDEO_FILES;
+      else if (vecTypes[i].Equals(g_localizeStrings.Get(1)))
+        iWindow = WINDOW_PICTURES;
+      else if (vecTypes[i].Equals(g_localizeStrings.Get(7)))
+        iWindow = WINDOW_FILES;
 
       //m_gWindowManager.ActivateWindow(iWindow, strPath);
       m_gWindowManager.ChangeActiveWindow(iWindow, strPath);
-			return;
+      return;
     }
   }
-	return;
+  return;
 }
\ No newline at end of file

Modified: trunk/XBMC/xbmc/GUIDialogFileBrowser.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogFileBrowser.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/GUIDialogFileBrowser.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 #include "GUIDialogFileBrowser.h"
 #include "util.h"
@@ -42,13 +63,13 @@
   }
   if ((action.wID == ACTION_CONTEXT_MENU || action.wID == ACTION_MOUSE_RIGHT_CLICK) && m_Directory.m_strPath.IsEmpty())
   {
-    int iItem = m_viewControl.GetSelectedItem();  
+    int iItem = m_viewControl.GetSelectedItem();
     if (g_mediaManager.HasLocation(m_selectedPath))
       return OnPopupMenu(iItem);
-    
+
     return false;
   }
-  
+
   return CGUIDialog::OnAction(action);
 }
 
@@ -184,7 +205,7 @@
           if (!m_rootDir.IsInShare(m_Directory.m_strPath))
           { // don't have this share any more
             if (IsActive()) Update("");
-            else 
+            else
             {
               m_history.ClearPathHistory();
               m_Directory.m_strPath="";
@@ -650,7 +671,7 @@
   CGUIDialogContextMenu* pMenu = (CGUIDialogContextMenu*)m_gWindowManager.GetWindow(WINDOW_DIALOG_CONTEXT_MENU);
   if (!pMenu)
     return false;
-  
+
   float posX = 200, posY = 100;
   const CGUIControl *pList = GetControl(CONTROL_LIST);
   if (pList)
@@ -660,7 +681,7 @@
   }
 
   pMenu->Initialize();
-  
+
   int btn_Edit = pMenu->AddButton(20133);
   int btn_Remove = pMenu->AddButton(20134);
 
@@ -690,13 +711,13 @@
       m_browsingForFolders = true;
       m_addNetworkShareEnabled = true;
       m_selectedPath = newPath;
-      DoModal();    
+      DoModal();
     }
   }
   if (btnid == btn_Remove)
   {
     g_mediaManager.RemoveLocation(m_selectedPath);
-    
+
     for (unsigned int i=0;i<m_shares.size();++i)
     {
       if (m_shares[i].strPath.Equals(m_selectedPath)) // getPath().Equals(m_selectedPath))
@@ -714,7 +735,7 @@
 
     Update(m_Directory.m_strPath);
   }
-  
+
   return true;
 }
 

Modified: trunk/XBMC/xbmc/GUIDialogFileStacking.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogFileStacking.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/GUIDialogFileStacking.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 #include "GUIDialogFileStacking.h"
 

Modified: trunk/XBMC/xbmc/GUIDialogGamepad.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogGamepad.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/GUIDialogGamepad.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -62,7 +62,7 @@
   {
     m_bConfirmed = false;
     m_bCanceled = false;
-    
+
     md5_state_t md5state;
     unsigned char md5pword[16];
     char md5pword2[64];
@@ -70,7 +70,7 @@
     md5_append(&md5state, (unsigned const char *)m_strUserInput.c_str(), (int)m_strUserInput.size());
     md5_close(&md5state, md5pword);
     XKGeneral::BytesToHexStr(md5pword,16,md5pword2);
-    
+
     if (m_strPassword != md5pword2)
     {
       // incorrect password entered
@@ -164,8 +164,8 @@
   if (ShowAndVerifyInput(strUserInput, "12340", "12330", "12331", "", true, true))
   {
     // TODO: Show error to user saying the password entry was blank
-	  CGUIDialogOK::ShowAndGetInput(12357, 12358, 0, 0); // Password is empty/blank
-	  return false;
+    CGUIDialogOK::ShowAndGetInput(12357, 12358, 0, 0); // Password is empty/blank
+    return false;
   }
 
   if (strUserInput.IsEmpty())
@@ -176,7 +176,7 @@
   if (!ShowAndVerifyInput(strUserInput, "12341", "12330", "12331", "", false, true))
   {
     // TODO: Show error to user saying the password re-entry failed
-	  CGUIDialogOK::ShowAndGetInput(12357, 12344, 0, 0); // Password do not match
+    CGUIDialogOK::ShowAndGetInput(12357, 12344, 0, 0); // Password do not match
     return false;
   }
 
@@ -283,5 +283,4 @@
 bool CGUIDialogGamepad::IsCanceled() const
 {
   return m_bCanceled;
-}
-
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/GUIDialogHost.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogHost.cpp	2007-01-07 11:00:33 UTC (rev 7524)
+++ trunk/XBMC/xbmc/GUIDialogHost.cpp	2007-01-07 14:25:10 UTC (rev 7525)
@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2007 Team XboxMediaCenter
+ *      http://www.xboxmediacenter.com
+ *
+ *  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 GNU Make; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 #include "stdafx.h"
 #include "GUIDialogHost.h"
 #include "GUISpinControl.h"
@@ -161,4 +182,4 @@
   aPassword = m_strPassword;
   aDescription = m_strDescription;
   aPlayerLimit = m_nPlayerLimit;
-}
+}
\ No newline at end of file

Modified: trunk/XBMC/xbmc/GUIDialogInvite.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogInvite.cpp	2007-01-07 11:00:33 UTC (rev 7524)

@@ Diff output truncated at 100000 characters. @@

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

Revision: 7558
          http://svn.sourceforge.net/xbmc/?rev=7558&view=rev
Author:   kraqh3d
Date:     2007-01-09 16:03:05 -0800 (Tue, 09 Jan 2007)

Log Message:
-----------
fixed: [ 1618819 ] batch album query sometimes interupted. also fixed the music library view so that the cached listings are updated when a scan completes. (yes, both are really fixed this time.)

Modified Paths:
--------------
    trunk/XBMC/xbmc/FileItem.cpp
    trunk/XBMC/xbmc/GUIDialogMusicScan.cpp
    trunk/XBMC/xbmc/GUIWindowMusicBase.cpp
    trunk/XBMC/xbmc/GUIWindowMusicSongs.cpp
    trunk/XBMC/xbmc/GUIWindowSettingsCategory.cpp
    trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
    trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp
    trunk/XBMC/xbmc/GUIWindowVideoNav.cpp
    trunk/XBMC/xbmc/Util.cpp
    trunk/XBMC/xbmc/Util.h

Modified: trunk/XBMC/xbmc/FileItem.cpp
===================================================================
--- trunk/XBMC/xbmc/FileItem.cpp	2007-01-09 22:58:24 UTC (rev 7557)
+++ trunk/XBMC/xbmc/FileItem.cpp	2007-01-10 00:03:05 UTC (rev 7558)
@@ -1777,6 +1777,10 @@
   CStdString strFileName;
   if (IsCDDA() || IsOnDVD())
     strFileName.Format("Z:\\r-%08x.fi", (unsigned __int32)crc);
+  else if (IsMusicDb())
+    strFileName.Format("Z:\\mdb-%08x.fi", (unsigned __int32)crc);
+  else if (IsVideoDb())
+    strFileName.Format("Z:\\vdb-%08x.fi", (unsigned __int32)crc);
   else
     strFileName.Format("Z:\\%08x.fi", (unsigned __int32)crc);
 
@@ -1814,6 +1818,10 @@
   CStdString strFileName;
   if (IsCDDA() || IsOnDVD())
     strFileName.Format("Z:\\r-%08x.fi", (unsigned __int32)crc);
+  else if (IsMusicDb())
+    strFileName.Format("Z:\\mdb-%08x.fi", (unsigned __int32)crc);
+  else if (IsVideoDb())
+    strFileName.Format("Z:\\vdb-%08x.fi", (unsigned __int32)crc);
   else
     strFileName.Format("Z:\\%08x.fi", (unsigned __int32)crc);
 

Modified: trunk/XBMC/xbmc/GUIDialogMusicScan.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogMusicScan.cpp	2007-01-09 22:58:24 UTC (rev 7557)
+++ trunk/XBMC/xbmc/GUIDialogMusicScan.cpp	2007-01-10 00:03:05 UTC (rev 7558)
@@ -124,7 +124,7 @@
 void CGUIDialogMusicScan::OnFinished()
 {
   // clear cache
-  CUtil::DeleteDatabaseDirectoryCache();
+  CUtil::DeleteMusicDatabaseDirectoryCache();
 
   // send message
   CGUIMessage msg(GUI_MSG_SCAN_FINISHED, 0, 0, 0);

Modified: trunk/XBMC/xbmc/GUIWindowMusicBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicBase.cpp	2007-01-09 22:58:24 UTC (rev 7557)
+++ trunk/XBMC/xbmc/GUIWindowMusicBase.cpp	2007-01-10 00:03:05 UTC (rev 7558)
@@ -716,7 +716,7 @@
 
         if (pDlgAlbumInfo->NeedRefresh())
         {
-          ShowAlbumInfo(strAlbum, strArtist, strPath, bSaveDb, bSaveDirThumb, bShowInfo);
+          ShowAlbumInfo(strAlbum, strArtist, strPath, bSaveDb, bSaveDirThumb, true, bShowInfo);
           return ;
         }
       }

Modified: trunk/XBMC/xbmc/GUIWindowMusicSongs.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicSongs.cpp	2007-01-09 22:58:24 UTC (rev 7557)
+++ trunk/XBMC/xbmc/GUIWindowMusicSongs.cpp	2007-01-10 00:03:05 UTC (rev 7558)
@@ -233,9 +233,6 @@
       return;
   }
 
-  // the scanner clears the cache when complete
-  //CUtil::DeleteDatabaseDirectoryCache();
-
   // Start background loader
   int iControl=GetFocusedControlID();
   if (musicScan) musicScan->StartScanning(m_vecItems.m_strPath, bUpdateAll);

Modified: trunk/XBMC/xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2007-01-09 22:58:24 UTC (rev 7557)
+++ trunk/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2007-01-10 00:03:05 UTC (rev 7558)
@@ -909,7 +909,7 @@
     {
       if (m_strOldTrackFormat != g_guiSettings.GetString("musicfiles.trackformat"))
       {
-        CUtil::DeleteDatabaseDirectoryCache();
+        CUtil::DeleteMusicDatabaseDirectoryCache();
         m_strOldTrackFormat = g_guiSettings.GetString("musicfiles.trackformat");
       }
     }
@@ -917,7 +917,7 @@
     {
       if (m_strOldTrackFormatRight != g_guiSettings.GetString("musicfiles.trackformatright"))
       {
-        CUtil::DeleteDatabaseDirectoryCache();
+        CUtil::DeleteMusicDatabaseDirectoryCache();
         m_strOldTrackFormatRight = g_guiSettings.GetString("musicfiles.trackformatright");
       }
     }
@@ -1081,7 +1081,7 @@
   {
     CMusicDatabase musicdatabase;
     musicdatabase.Clean();
-    CUtil::DeleteDatabaseDirectoryCache();
+    CUtil::DeleteMusicDatabaseDirectoryCache();
   }
   else if (strSetting.Equals("myvideos.cleanupvideolibrary"))
   {

Modified: trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2007-01-09 22:58:24 UTC (rev 7557)
+++ trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2007-01-10 00:03:05 UTC (rev 7558)
@@ -1125,7 +1125,8 @@
   if ( iItem < 0 || iItem >= m_vecItems.Size() ) return ;
   CFileItem* pItem = m_vecItems[iItem];
   m_database.MarkAsUnWatched(atol(pItem->m_musicInfoTag.GetURL()));
-  CUtil::ClearFileItemCache();
+  //CUtil::ClearFileItemCache();
+  CUtil::DeleteVideoDatabaseDirectoryCache();
   m_viewControl.SetSelectedItem(iItem);
   Update(m_vecItems.m_strPath);
 }
@@ -1136,7 +1137,8 @@
   if ( iItem < 0 || iItem >= m_vecItems.Size() ) return ;
   CFileItem* pItem = m_vecItems[iItem];
   m_database.MarkAsWatched(atol(pItem->m_musicInfoTag.GetURL()));
-  CUtil::ClearFileItemCache();
+  //CUtil::ClearFileItemCache();
+  CUtil::DeleteVideoDatabaseDirectoryCache();
   m_viewControl.SetSelectedItem(iItem);
   Update(m_vecItems.m_strPath);
 }
@@ -1157,7 +1159,8 @@
   if (!CGUIDialogKeyboard::ShowAndGetInput(strInput, g_localizeStrings.Get(16105), false)) return ;
   m_database.UpdateMovieTitle(atol(pItem->m_musicInfoTag.GetURL()), strInput);
   UpdateVideoTitleXML(detail.m_strIMDBNumber, strInput);
-  CUtil::ClearFileItemCache();
+  //CUtil::ClearFileItemCache();
+  CUtil::DeleteVideoDatabaseDirectoryCache();
   m_viewControl.SetSelectedItem(iItem);
   Update(m_vecItems.m_strPath);
 }
@@ -1514,5 +1517,6 @@
   }
 
   // library view cache needs to be cleared
-  CUtil::ClearFileItemCache();
+  //CUtil::ClearFileItemCache();
+  CUtil::DeleteVideoDatabaseDirectoryCache();
 }
\ No newline at end of file

Modified: trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp	2007-01-09 22:58:24 UTC (rev 7557)
+++ trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp	2007-01-10 00:03:05 UTC (rev 7558)
@@ -545,7 +545,8 @@
   DoScan(m_vecItems.m_strPath, items);
   Update(m_vecItems.m_strPath);
   m_bIsScanning = false;
-  CUtil::ClearFileItemCache();
+  //CUtil::ClearFileItemCache();
+  CUtil::DeleteVideoDatabaseDirectoryCache();
 }
 
 bool CGUIWindowVideoFiles::DoScan(const CStdString &strPath, CFileItemList& items)

Modified: trunk/XBMC/xbmc/GUIWindowVideoNav.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoNav.cpp	2007-01-09 22:58:24 UTC (rev 7557)
+++ trunk/XBMC/xbmc/GUIWindowVideoNav.cpp	2007-01-10 00:03:05 UTC (rev 7558)
@@ -368,10 +368,9 @@
   CStdString thumb(pItem->GetCachedVideoThumb());
   CFile::Delete(thumb);
 
-  //CVideoDatabaseDirectory dir;
-  //dir.ClearDirectoryCache(m_vecItems.m_strPath);
+  //CUtil::ClearFileItemCache();
+  CUtil::DeleteVideoDatabaseDirectoryCache();
 
-  CUtil::ClearFileItemCache();
   DisplayEmptyDatabaseMessage(m_database.GetMovieCount() <= 0);
   Update( m_vecItems.m_strPath );
   m_viewControl.SetSelectedItem(iItem);

Modified: trunk/XBMC/xbmc/Util.cpp
===================================================================
--- trunk/XBMC/xbmc/Util.cpp	2007-01-09 22:58:24 UTC (rev 7557)
+++ trunk/XBMC/xbmc/Util.cpp	2007-01-10 00:03:05 UTC (rev 7558)
@@ -3987,12 +3987,31 @@
   return strReturn;
 }
 
-void CUtil::DeleteDatabaseDirectoryCache()
+void CUtil::DeleteMusicDatabaseDirectoryCache()
 {
+  CUtil::DeleteDirectoryCache("mdb");
+}
+
+void CUtil::DeleteVideoDatabaseDirectoryCache()
+{
+  CUtil::DeleteDirectoryCache("vdb");
+}
+
+void CUtil::DeleteDirectoryCache(const CStdString strType /* = ""*/)
+{
   WIN32_FIND_DATA wfd;
   memset(&wfd, 0, sizeof(wfd));
 
-  CAutoPtrFind hFind( FindFirstFile("Z:\\db-*.fi", &wfd));
+  CStdString strFile = "Z:\\";
+  if (!strType.IsEmpty())
+  {
+    strFile += strType;
+    if (!strFile.Right(1).Equals("-"))
+      strFile += "-";
+  }
+  strFile += "*.fi";
+
+  CAutoPtrFind hFind(FindFirstFile(strFile.c_str(), &wfd));
   if (!hFind.isValid())
     return;
   do
@@ -4006,6 +4025,7 @@
   }
   while (FindNextFile(hFind, &wfd));
 }
+
 bool CUtil::IsLeapYear(int iLYear, int iLMonth, int iLTag, int &iMonMax, int &iWeekDay)  // GeminiServer
 {
   // R\xFCckgabewert: FALSE, wenn kein Schaltjahr,   TRUE, wenn Schaltjahr
@@ -4819,6 +4839,6 @@
   for (int i = 0; i < items.Size(); ++i)
   {
     if (!items[i]->m_bIsFolder)
-  CFile::Delete(items[i]->m_strPath);
+      CFile::Delete(items[i]->m_strPath);
   }
 }
\ No newline at end of file

Modified: trunk/XBMC/xbmc/Util.h
===================================================================
--- trunk/XBMC/xbmc/Util.h	2007-01-09 22:58:24 UTC (rev 7557)
+++ trunk/XBMC/xbmc/Util.h	2007-01-10 00:03:05 UTC (rev 7558)
@@ -331,7 +331,9 @@
   static int GetMatchingShare(const CStdString& strPath, VECSHARES& vecShares, bool& bIsBookmarkName);
   static CStdString TranslateSpecialPath(const CStdString &strSpecial);
   static CStdString TranslateSpecialSource(const CStdString &strSpecial);
-  static void DeleteDatabaseDirectoryCache();
+  static void DeleteDirectoryCache(const CStdString strType = "");
+  static void DeleteMusicDatabaseDirectoryCache();
+  static void DeleteVideoDatabaseDirectoryCache();
   static CStdString MusicPlaylistsLocation();
   static CStdString VideoPlaylistsLocation();
   static CStdString SubstitutePath(const CStdString& strFileName);


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

Revision: 7592
          http://svn.sourceforge.net/xbmc/?rev=7592&view=rev
Author:   kraqh3d
Date:     2007-01-11 14:54:28 -0800 (Thu, 11 Jan 2007)

Log Message:
-----------
added: [ 1618284 ] advancedsetting option to change album sort by artist to sort by year as well.

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIViewStateMusic.cpp
    trunk/XBMC/xbmc/Settings.cpp
    trunk/XBMC/xbmc/Settings.h
    trunk/XBMC/xbmc/SortFileItem.cpp

Modified: trunk/XBMC/xbmc/GUIViewStateMusic.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIViewStateMusic.cpp	2007-01-11 20:35:05 UTC (rev 7591)
+++ trunk/XBMC/xbmc/GUIViewStateMusic.cpp	2007-01-11 22:54:28 UTC (rev 7592)
@@ -121,14 +121,20 @@
   case NODE_TYPE_ALBUM_COMPILATIONS:
   case NODE_TYPE_ALBUM:
     {
+      CStdString strLabel = "%B";
       if (g_guiSettings.GetBool("filelists.ignorethewhensorting"))
-        AddSortMethod(SORT_METHOD_ALBUM_IGNORE_THE, 558, LABEL_MASKS("%F", "", "%B", "%A"));  // Filename, empty | Album, Artist
+        AddSortMethod(SORT_METHOD_ALBUM_IGNORE_THE, 558, LABEL_MASKS("%F", "", strLabel, "%A"));  // Filename, empty | Album, Artist
       else
-        AddSortMethod(SORT_METHOD_ALBUM, 558, LABEL_MASKS("%F", "", "%B", "%A"));  // Filename, empty | Album, Artist
+        AddSortMethod(SORT_METHOD_ALBUM, 558, LABEL_MASKS("%F", "", strLabel, "%A"));  // Filename, empty | Album, Artist
+
+      // only displayed when sorting by artist + year
+      if (g_advancedSettings.m_bMusicLibraryAlbumsSortByArtistThenYear)
+        strLabel += " (%Y)";
       if (g_guiSettings.GetBool("filelists.ignorethewhensorting"))
-        AddSortMethod(SORT_METHOD_ARTIST_IGNORE_THE, 557, LABEL_MASKS("%F", "", "%B", "%A"));  // Filename, empty | Album, Artist
+        AddSortMethod(SORT_METHOD_ARTIST_IGNORE_THE, 557, LABEL_MASKS("%F", "", strLabel, "%A"));  // Filename, empty | Album, Artist
       else
-        AddSortMethod(SORT_METHOD_ARTIST, 557, LABEL_MASKS("%F", "", "%B", "%A"));  // Filename, empty | Album, Artist
+        AddSortMethod(SORT_METHOD_ARTIST, 557, LABEL_MASKS("%F", "", strLabel, "%A"));  // Filename, empty | Album, Artist
+
       SetSortMethod(g_stSettings.m_viewStateMusicNavAlbums.m_sortMethod);
 
       SetViewAsControl(g_stSettings.m_viewStateMusicNavAlbums.m_viewMode);

Modified: trunk/XBMC/xbmc/Settings.cpp
===================================================================
--- trunk/XBMC/xbmc/Settings.cpp	2007-01-11 20:35:05 UTC (rev 7591)
+++ trunk/XBMC/xbmc/Settings.cpp	2007-01-11 22:54:28 UTC (rev 7592)
@@ -249,6 +249,7 @@
   g_advancedSettings.m_bMusicLibraryHideAllItems = false;
   g_advancedSettings.m_bMusicLibraryAllItemsOnBottom = false;
   g_advancedSettings.m_bMusicLibraryHideCompilationArtists = false;
+  g_advancedSettings.m_bMusicLibraryAlbumsSortByArtistThenYear = false;
 
   xbmcXmlLoaded = false;
   bTransaction = false;
@@ -1098,6 +1099,7 @@
     XMLUtils::GetBoolean(pElement, "hideallitems", g_advancedSettings.m_bMusicLibraryHideAllItems);
     XMLUtils::GetBoolean(pElement, "allitemsonbottom", g_advancedSettings.m_bMusicLibraryAllItemsOnBottom);
     XMLUtils::GetBoolean(pElement, "hidecompilationartists", g_advancedSettings.m_bMusicLibraryHideCompilationArtists);
+    XMLUtils::GetBoolean(pElement, "albumssortbyartistthenyear", g_advancedSettings.m_bMusicLibraryAlbumsSortByArtistThenYear);
   }
 
   pElement = pRootElement->FirstChildElement("slideshow");

Modified: trunk/XBMC/xbmc/Settings.h
===================================================================
--- trunk/XBMC/xbmc/Settings.h	2007-01-11 20:35:05 UTC (rev 7591)
+++ trunk/XBMC/xbmc/Settings.h	2007-01-11 22:54:28 UTC (rev 7592)
@@ -287,6 +287,7 @@
     bool m_bMusicLibraryHideAllItems;
     bool m_bMusicLibraryAllItemsOnBottom;
     bool m_bMusicLibraryHideCompilationArtists;
+    bool m_bMusicLibraryAlbumsSortByArtistThenYear;
 
   };
   struct stSettings

Modified: trunk/XBMC/xbmc/SortFileItem.cpp
===================================================================
--- trunk/XBMC/xbmc/SortFileItem.cpp	2007-01-11 20:35:05 UTC (rev 7591)
+++ trunk/XBMC/xbmc/SortFileItem.cpp	2007-01-11 22:54:28 UTC (rev 7592)
@@ -318,6 +318,15 @@
     int result = StringUtils::AlphaNumericCompare(l, r);
     if (result < 0) return true;
     if (result > 0) return false;
+    // test year
+    if (g_advancedSettings.m_bMusicLibraryAlbumsSortByArtistThenYear)
+    {
+      l = (char *)left->m_musicInfoTag.GetYear().c_str();
+      r = (char *)right->m_musicInfoTag.GetYear().c_str();
+      result = StringUtils::AlphaNumericCompare(l, r);
+      if (result < 0) return true;
+      if (result > 0) return false;
+    }
     // artists agree, test the album
     l = (char *)left->m_musicInfoTag.GetAlbum().c_str();
     r = (char *)right->m_musicInfoTag.GetAlbum().c_str();
@@ -343,6 +352,15 @@
     int result = StringUtils::AlphaNumericCompare(l, r);
     if (result < 0) return false;
     if (result > 0) return true;
+    // test year
+    if (g_advancedSettings.m_bMusicLibraryAlbumsSortByArtistThenYear)
+    {
+      l = (char *)left->m_musicInfoTag.GetYear().c_str();
+      r = (char *)right->m_musicInfoTag.GetYear().c_str();
+      result = StringUtils::AlphaNumericCompare(l, r);
+      if (result < 0) return false;
+      if (result > 0) return true;
+    }
     // artists agree, test the album
     l = (char *)left->m_musicInfoTag.GetAlbum().c_str();
     r = (char *)right->m_musicInfoTag.GetAlbum().c_str();


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

Revision: 7628
          http://svn.sourceforge.net/xbmc/?rev=7628&view=rev
Author:   jmarshallnz
Date:     2007-01-15 00:41:40 -0800 (Mon, 15 Jan 2007)

Log Message:
-----------
fixed: Login screen didn't work with ListItem.*

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowLoginScreen.cpp
    trunk/XBMC/xbmc/GUIWindowLoginScreen.h

Modified: trunk/XBMC/xbmc/GUIWindowLoginScreen.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowLoginScreen.cpp	2007-01-15 08:27:40 UTC (rev 7627)
+++ trunk/XBMC/xbmc/GUIWindowLoginScreen.cpp	2007-01-15 08:41:40 UTC (rev 7628)
@@ -291,4 +291,11 @@
     m_vecItems[iItem]->Select(bSelect);
 
   return (btnid > 0);
-}
\ No newline at end of file
+}
+
+CFileItem* CGUIWindowLoginScreen::GetCurrentListItem()
+{
+  int iItem = m_viewControl.GetSelectedItem();
+  if (iItem < 0) return NULL;
+  return m_vecItems[iItem];
+}

Modified: trunk/XBMC/xbmc/GUIWindowLoginScreen.h
===================================================================
--- trunk/XBMC/xbmc/GUIWindowLoginScreen.h	2007-01-15 08:27:40 UTC (rev 7627)
+++ trunk/XBMC/xbmc/GUIWindowLoginScreen.h	2007-01-15 08:41:40 UTC (rev 7628)
@@ -11,6 +11,8 @@
   virtual bool OnMessage(CGUIMessage& message);
   virtual bool OnAction(const CAction &action);
   virtual void Render();
+  virtual bool IsMediaWindow() const { return true; };
+  CFileItem* GetCurrentListItem();
 
 protected:
   virtual void OnInitWindow();


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

Revision: 7621
          http://svn.sourceforge.net/xbmc/?rev=7621&view=rev
Author:   jmarshallnz
Date:     2007-01-14 13:52:24 -0800 (Sun, 14 Jan 2007)

Log Message:
-----------
changed: "Auto" view mode uses big icons as first priority then falls back to icons if unavailable.

Modified Paths:
--------------
    trunk/XBMC/xbmc/AutoSwitch.cpp
    trunk/XBMC/xbmc/GUIViewControl.cpp

Modified: trunk/XBMC/xbmc/AutoSwitch.cpp
===================================================================
--- trunk/XBMC/xbmc/AutoSwitch.cpp	2007-01-14 21:51:12 UTC (rev 7620)
+++ trunk/XBMC/xbmc/AutoSwitch.cpp	2007-01-14 21:52:24 UTC (rev 7621)
@@ -41,7 +41,6 @@
 int CAutoSwitch::GetView(const CFileItemList &vecItems)
 {
   int iSortMethod = -1;
-  bool bBigThumbs = false;
   int iPercent = 0;
   int iCurrentWindow = m_gWindowManager.GetActiveWindow();
   bool bHideParentFolderItems = g_guiSettings.GetBool("filelists.hideparentdiritems");
@@ -51,7 +50,6 @@
   case WINDOW_MUSIC_FILES:
     {
       iSortMethod = METHOD_BYFOLDERTHUMBS;
-      bBigThumbs = false;
       iPercent = 50;
     }
     break;
@@ -59,7 +57,6 @@
   case WINDOW_VIDEO_FILES:
     {
       iSortMethod = METHOD_BYTHUMBPERCENT;
-      bBigThumbs = false;
       iPercent = 50;  // 50% of thumbs -> use thumbs.
     }
     break;
@@ -67,14 +64,12 @@
   case WINDOW_PICTURES:
     {
       iSortMethod = METHOD_BYFILECOUNT;
-      bBigThumbs = false;
     }
     break;
 
   case WINDOW_PROGRAMS:
     {
       iSortMethod = METHOD_BYTHUMBPERCENT;
-      bBigThumbs = false;
       iPercent = 50;  // 50% of thumbs -> use thumbs.
     }
     break;
@@ -105,13 +100,9 @@
     break;
   }
 
-  if (bThumbs)
-  {
-    if (bBigThumbs)
-      return DEFAULT_VIEW_BIG_ICONS;
-    return DEFAULT_VIEW_ICONS;
-  }
-  return DEFAULT_VIEW_LIST;
+  // the GUIViewControl object will default down to small icons if a big icon
+  // view is not available.
+  return bThumbs ? DEFAULT_VIEW_BIG_ICONS : DEFAULT_VIEW_LIST;
 }
 
 /// \brief Auto Switch method based on the current directory \e containing ALL folders and \e atleast one non-default thumb

Modified: trunk/XBMC/xbmc/GUIViewControl.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIViewControl.cpp	2007-01-14 21:51:12 UTC (rev 7620)
+++ trunk/XBMC/xbmc/GUIViewControl.cpp	2007-01-14 21:52:24 UTC (rev 7621)
@@ -67,6 +67,8 @@
   int newView = GetView(type, id);
   if (newView < 0) // no suitable view that matches both id and type, so try just type
     newView = GetView(type, 0);
+  if (newView < 0 && type == VIEW_TYPE_BIG_ICON) // try icon view if they want big icon
+    newView = GetView(VIEW_TYPE_ICON, 0);
   if (newView < 0) // try a list view
     newView = GetView(VIEW_TYPE_LIST, 0);
   if (newView < 0) // try anything!


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

Revision: 7638
          http://svn.sourceforge.net/xbmc/?rev=7638&view=rev
Author:   kraqh3d
Date:     2007-01-15 14:09:44 -0800 (Mon, 15 Jan 2007)

Log Message:
-----------
fixed: issue with the label parser
fixed: advanced setting for sorting albums by year
added: advanced setting for user defined album format templates

Modified Paths:
--------------
    trunk/XBMC/xbmc/FileItem.cpp
    trunk/XBMC/xbmc/GUIViewStateMusic.cpp
    trunk/XBMC/xbmc/MusicDatabase.cpp
    trunk/XBMC/xbmc/Settings.cpp
    trunk/XBMC/xbmc/Settings.h
    trunk/XBMC/xbmc/SortFileItem.cpp

Modified: trunk/XBMC/xbmc/FileItem.cpp
===================================================================
--- trunk/XBMC/xbmc/FileItem.cpp	2007-01-15 21:47:13 UTC (rev 7637)
+++ trunk/XBMC/xbmc/FileItem.cpp	2007-01-15 22:09:44 UTC (rev 7638)
@@ -813,8 +813,8 @@
   if (!strMask.IsEmpty())
   {
     const CStdString& strLabel2=ParseFormat(strMask);
-    if (!strLabel2.IsEmpty())
-      SetLabel2(strLabel2);
+    //if (!strLabel2.IsEmpty()) // allow label2 to be empty
+    SetLabel2(strLabel2);
   }
   else
     SetLabel2(strMask);
@@ -829,56 +829,49 @@
   CMusicInfoTag& tag = m_musicInfoTag;
   int iPos1 = 0;
   int iPos2 = strMask.Find('%', iPos1);
+  if (iPos2 > iPos1)
+    strLabel += strMask.Mid(iPos1, iPos2 - iPos1);
+
+  /*
   bool bDoneSomething = !(iPos1 == iPos2); // stuff in front should be applied - everything using this bool is added by spiff
                                            // when true, it should add in anything extra in the mask (ie the content before the next %)
+  */
+
   bool hasContent = false; // when true, we've actually added some content
   while (iPos2 >= 0)
-  {
-    if( (iPos2 > iPos1) && bDoneSomething )
-    {
-      strLabel += strMask.Mid(iPos1, iPos2 - iPos1);
-      bDoneSomething = false;
-    }
+  { 
     CStdString str;
     if (strMask[iPos2 + 1] == 'N' && tag.GetTrackNumber() > 0)
     { // track number
       str.Format("%02.2i", tag.GetTrackNumber());
-      bDoneSomething = hasContent = true;
     }
     else if (strMask[iPos2 + 1] == 'S' && tag.GetDiscNumber() > 0)
     { // disc number
       str.Format("%02.2i", tag.GetDiscNumber());
-      bDoneSomething = hasContent = true;
     }
     else if (strMask[iPos2 + 1] == 'A' && tag.GetArtist().size())
     { // artist
       str = tag.GetArtist();
-      bDoneSomething = hasContent = true;
     }
     else if (strMask[iPos2 + 1] == 'T' && tag.GetTitle().size())
     { // title
       str = tag.GetTitle();
-      bDoneSomething = hasContent = true;
     }
     else if (strMask[iPos2 + 1] == 'B' && tag.GetAlbum().size())
     { // album
       str = tag.GetAlbum();
-      bDoneSomething = hasContent = true;
     }
     else if (strMask[iPos2 + 1] == 'G' && tag.GetGenre().size())
     { // genre
       str = tag.GetGenre();
-      bDoneSomething = hasContent = true;
     }
     else if (strMask[iPos2 + 1] == 'Y')
     { // year
       str = tag.GetYear();
-      bDoneSomething = hasContent = true;
     }
     else if (strMask[iPos2 + 1] == 'F')
     { // filename
       str = CUtil::GetTitleFromPath(m_strPath, m_bIsFolder && !IsFileFolder());
-      bDoneSomething = hasContent = true;
     }
     else if (strMask[iPos2 + 1] == 'L')
     { // pre-existing label
@@ -888,17 +881,14 @@
       { // label is the same as filename, clean it up as appropriate
         str = CUtil::GetTitleFromPath(m_strPath, m_bIsFolder && !IsFileFolder());
       }
-      bDoneSomething = hasContent = true;
     }
     else if (strMask[iPos2 + 1] == 'D')
     { // duration
       int nDuration = tag.GetDuration();
-
       if (nDuration > 0)
         StringUtils::SecondsToTimeString(nDuration, str);
       else if (m_dwSize > 0)
         str = StringUtils::SizeToString(m_dwSize);
-      bDoneSomething = hasContent = true;
     }
     else if (strMask[iPos2 + 1] == 'I')
     { // size
@@ -906,39 +896,41 @@
         str="";
       else
         str=StringUtils::SizeToString(m_dwSize);
-      bDoneSomething = hasContent = true;
     }
     else if (strMask[iPos2 + 1] == 'J' && m_dateTime.IsValid())
     { // date
       str = m_dateTime.GetAsLocalizedDate();
-      bDoneSomething = hasContent = true;
     }
     else if (strMask[iPos2 + 1] == 'R')
     { // movie rating
       str.Format("%2.2f", m_fRating);
-      bDoneSomething = hasContent = true;
     }
     else if (strMask[iPos2 + 1] == 'Q')
     { // movie Year
       str=m_musicInfoTag.GetYear();
-      bDoneSomething = hasContent = true;
     }
     else if (strMask[iPos2 + 1] == 'C')
     { // programs count
       str.Format("%i", m_iprogramCount);
-      bDoneSomething = hasContent = true;
     }
     else if (strMask[iPos2 + 1] == 'K')
     { // moview/game title
       str=m_strTitle;
-      bDoneSomething = hasContent = true;
     }
     else if (strMask[iPos2 + 1] == '%')
     { // %% to print %
-      str = '%';
-      bDoneSomething = hasContent = true;
+      // not actual content so just add it directly to the output string
+      strLabel += '%';
     }
-    strLabel += str;
+    // did we translate anything?
+    if (str.size())
+    {
+      hasContent = true;
+      if (iPos2 > iPos1)
+        strLabel += strMask.Mid(iPos1, iPos2 - iPos1);
+      strLabel += str;
+    }
+    // advance to the next position
     iPos1 = iPos2 + 2;
     iPos2 = strMask.Find('%', iPos1);
   }

Modified: trunk/XBMC/xbmc/GUIViewStateMusic.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIViewStateMusic.cpp	2007-01-15 21:47:13 UTC (rev 7637)
+++ trunk/XBMC/xbmc/GUIViewStateMusic.cpp	2007-01-15 22:09:44 UTC (rev 7638)
@@ -68,6 +68,16 @@
   if (strTrackRight.IsEmpty())
     strTrackRight = g_guiSettings.GetString("musicfiles.trackformatright");
 
+  CStdString strAlbumLeft = g_advancedSettings.m_strMusicLibraryAlbumFormat;
+  if (strAlbumLeft.IsEmpty())
+    strAlbumLeft = "%B"; // album
+  CStdString strAlbumRight = g_advancedSettings.m_strMusicLibraryAlbumFormatRight;
+  if (strAlbumRight.IsEmpty())
+    strAlbumRight = "%A"; // artist
+
+  CLog::Log(LOGDEBUG,"Album format left  = [%s]", strAlbumLeft.c_str());
+  CLog::Log(LOGDEBUG,"Album format right = [%s]", strAlbumRight.c_str());
+
   switch (NodeType)
   {
   case NODE_TYPE_OVERVIEW:
@@ -121,19 +131,17 @@
   case NODE_TYPE_ALBUM_COMPILATIONS:
   case NODE_TYPE_ALBUM:
     {
-      CStdString strLabel = "%B";
+      // album
       if (g_guiSettings.GetBool("filelists.ignorethewhensorting"))
-        AddSortMethod(SORT_METHOD_ALBUM_IGNORE_THE, 558, LABEL_MASKS("%F", "", strLabel, "%A"));  // Filename, empty | Album, Artist
+        AddSortMethod(SORT_METHOD_ALBUM_IGNORE_THE, 558, LABEL_MASKS("%F", "", strAlbumLeft, strAlbumRight));  // Filename, empty | Userdefined, Userdefined
       else
-        AddSortMethod(SORT_METHOD_ALBUM, 558, LABEL_MASKS("%F", "", strLabel, "%A"));  // Filename, empty | Album, Artist
+        AddSortMethod(SORT_METHOD_ALBUM, 558, LABEL_MASKS("%F", "", strAlbumLeft, strAlbumRight));  // Filename, empty | Userdefined, Userdefined
 
-      // only displayed when sorting by artist + year
-      if (g_advancedSettings.m_bMusicLibraryAlbumsSortByArtistThenYear)
-        strLabel += " (%Y)";
+      // artist
       if (g_guiSettings.GetBool("filelists.ignorethewhensorting"))
-        AddSortMethod(SORT_METHOD_ARTIST_IGNORE_THE, 557, LABEL_MASKS("%F", "", strLabel, "%A"));  // Filename, empty | Album, Artist
+        AddSortMethod(SORT_METHOD_ARTIST_IGNORE_THE, 557, LABEL_MASKS("%F", "", strAlbumLeft, strAlbumRight));  // Filename, empty | Userdefined, Userdefined
       else
-        AddSortMethod(SORT_METHOD_ARTIST, 557, LABEL_MASKS("%F", "", strLabel, "%A"));  // Filename, empty | Album, Artist
+        AddSortMethod(SORT_METHOD_ARTIST, 557, LABEL_MASKS("%F", "", strAlbumLeft, strAlbumRight));  // Filename, empty | Userdefined, Userdefined
 
       SetSortMethod(g_stSettings.m_viewStateMusicNavAlbums.m_sortMethod);
 
@@ -144,7 +152,7 @@
     break;
   case NODE_TYPE_ALBUM_RECENTLY_ADDED:
     {
-      AddSortMethod(SORT_METHOD_NONE, 551, LABEL_MASKS("%F", "", "%B", "%A"));  // Filename, empty | Album, Artist
+      AddSortMethod(SORT_METHOD_NONE, 551, LABEL_MASKS("%F", "", strAlbumLeft, strAlbumRight));  // Filename, empty | Userdefined, Userdefined
       SetSortMethod(SORT_METHOD_NONE);
 
       SetViewAsControl(g_stSettings.m_viewStateMusicNavAlbums.m_viewMode);
@@ -164,7 +172,7 @@
     break;
   case NODE_TYPE_ALBUM_RECENTLY_PLAYED:
     {
-      AddSortMethod(SORT_METHOD_NONE, 551, LABEL_MASKS("%F", "", "%B", "%A"));  // Filename, empty | Album, Artist
+      AddSortMethod(SORT_METHOD_NONE, 551, LABEL_MASKS("%F", "", strAlbumLeft, strAlbumRight));  // Filename, empty | Userdefined, Userdefined
       SetSortMethod(SORT_METHOD_NONE);
 
       SetViewAsControl(g_stSettings.m_viewStateMusicNavAlbums.m_viewMode);
@@ -184,7 +192,7 @@
     break;
   case NODE_TYPE_ALBUM_TOP100:
     {
-      AddSortMethod(SORT_METHOD_NONE, 551, LABEL_MASKS("%F", "", "%B", "%A"));  // Filename, empty | Album, Artist
+      AddSortMethod(SORT_METHOD_NONE, 551, LABEL_MASKS("%F", "", strAlbumLeft, strAlbumRight));  // Filename, empty | Userdefined, Userdefined
       SetSortMethod(SORT_METHOD_NONE);
 
       SetViewAsControl(DEFAULT_VIEW_LIST);

Modified: trunk/XBMC/xbmc/MusicDatabase.cpp
===================================================================
--- trunk/XBMC/xbmc/MusicDatabase.cpp	2007-01-15 21:47:13 UTC (rev 7637)
+++ trunk/XBMC/xbmc/MusicDatabase.cpp	2007-01-15 22:09:44 UTC (rev 7638)
@@ -822,6 +822,11 @@
   album.strArtist = m_pDS->fv(album_strArtist).get_asString();
   if (m_pDS->fv(album_iNumArtists).get_asLong() > 1)
     GetExtraArtistsForAlbum(album.idAlbum, album.strArtist);
+  // workaround... the fake "Unknown" album usually has a NULL artist.
+  // since it can contain songs from lots of different artists, lets set
+  // it to "Various Artists" instead
+  if (m_pDS->fv("artist.idArtist").get_asLong() == -1)
+    album.strArtist = g_localizeStrings.Get(340);
   album.strGenre = m_pDS->fv(album_strGenre).get_asString();
   if (m_pDS->fv(album_iNumGenres).get_asLong() > 1)
     GetExtraGenresForAlbum(album.idAlbum, album.strGenre);
@@ -2966,7 +2971,7 @@
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS.get()) return false;
 
-    CStdString strSQL = "select distinct idArtist, strArtist from albumview";
+    CStdString strSQL = "select distinct idArtist, strArtist from albumview where idArtist <> -1";
     CLog::Log(LOGDEBUG, "CMusicDatabase::GetAlbumArtists() query: %s", strSQL.c_str());
     if (!m_pDS->query(strSQL.c_str())) return false;
     int iRowsFound = m_pDS->num_rows();

Modified: trunk/XBMC/xbmc/Settings.cpp
===================================================================
--- trunk/XBMC/xbmc/Settings.cpp	2007-01-15 21:47:13 UTC (rev 7637)
+++ trunk/XBMC/xbmc/Settings.cpp	2007-01-15 22:09:44 UTC (rev 7638)
@@ -249,6 +249,8 @@
   g_advancedSettings.m_bMusicLibraryAllItemsOnBottom = false;
   g_advancedSettings.m_bMusicLibraryHideCompilationArtists = false;
   g_advancedSettings.m_bMusicLibraryAlbumsSortByArtistThenYear = false;
+  g_advancedSettings.m_strMusicLibraryAlbumFormat = "";
+  g_advancedSettings.m_strMusicLibraryAlbumFormatRight = "";
 
   g_advancedSettings.m_bTuxBoxAudioChannelSelection = false;
   g_advancedSettings.m_bTuxBoxSubMenuSelection = false;
@@ -1107,6 +1109,8 @@
     XMLUtils::GetBoolean(pElement, "allitemsonbottom", g_advancedSettings.m_bMusicLibraryAllItemsOnBottom);
     XMLUtils::GetBoolean(pElement, "hidecompilationartists", g_advancedSettings.m_bMusicLibraryHideCompilationArtists);
     XMLUtils::GetBoolean(pElement, "albumssortbyartistthenyear", g_advancedSettings.m_bMusicLibraryAlbumsSortByArtistThenYear);
+    GetString(pElement, "albumformat", g_advancedSettings.m_strMusicLibraryAlbumFormat, "");
+    GetString(pElement, "albumformatright", g_advancedSettings.m_strMusicLibraryAlbumFormatRight, "");
   }
 
   pElement = pRootElement->FirstChildElement("slideshow");

Modified: trunk/XBMC/xbmc/Settings.h
===================================================================
--- trunk/XBMC/xbmc/Settings.h	2007-01-15 21:47:13 UTC (rev 7637)
+++ trunk/XBMC/xbmc/Settings.h	2007-01-15 22:09:44 UTC (rev 7638)
@@ -287,6 +287,8 @@
     bool m_bMusicLibraryAllItemsOnBottom;
     bool m_bMusicLibraryHideCompilationArtists;
     bool m_bMusicLibraryAlbumsSortByArtistThenYear;
+    CStdString m_strMusicLibraryAlbumFormat;
+    CStdString m_strMusicLibraryAlbumFormatRight;
 
     //TuxBox
     bool m_bTuxBoxSubMenuSelection;

Modified: trunk/XBMC/xbmc/SortFileItem.cpp
===================================================================
--- trunk/XBMC/xbmc/SortFileItem.cpp	2007-01-15 21:47:13 UTC (rev 7637)
+++ trunk/XBMC/xbmc/SortFileItem.cpp	2007-01-15 22:09:44 UTC (rev 7638)
@@ -321,9 +321,7 @@
     // test year
     if (g_advancedSettings.m_bMusicLibraryAlbumsSortByArtistThenYear)
     {
-      l = (char *)left->m_musicInfoTag.GetYear().c_str();
-      r = (char *)right->m_musicInfoTag.GetYear().c_str();
-      result = StringUtils::AlphaNumericCompare(l, r);
+      result = StringUtils::AlphaNumericCompare(left->m_musicInfoTag.GetYear().c_str(), right->m_musicInfoTag.GetYear().c_str());
       if (result < 0) return true;
       if (result > 0) return false;
     }
@@ -355,9 +353,7 @@
     // test year
     if (g_advancedSettings.m_bMusicLibraryAlbumsSortByArtistThenYear)
     {
-      l = (char *)left->m_musicInfoTag.GetYear().c_str();
-      r = (char *)right->m_musicInfoTag.GetYear().c_str();
-      result = StringUtils::AlphaNumericCompare(l, r);
+      result = StringUtils::AlphaNumericCompare(left->m_musicInfoTag.GetYear().c_str(), right->m_musicInfoTag.GetYear().c_str());
       if (result < 0) return false;
       if (result > 0) return true;
     }
@@ -388,6 +384,13 @@
     int result = StringUtils::AlphaNumericCompare(l, r);
     if (result < 0) return true;
     if (result > 0) return false;
+    // test year
+    if (g_advancedSettings.m_bMusicLibraryAlbumsSortByArtistThenYear)
+    {
+      result = StringUtils::AlphaNumericCompare(left->m_musicInfoTag.GetYear().c_str(), right->m_musicInfoTag.GetYear().c_str());
+      if (result < 0) return true;
+      if (result > 0) return false;
+    }
     // artists agree, test the album
     l = (char *)left->m_musicInfoTag.GetAlbum().c_str();
     r = (char *)right->m_musicInfoTag.GetAlbum().c_str();
@@ -417,6 +420,13 @@
     int result = StringUtils::AlphaNumericCompare(l, r);
     if (result < 0) return false;
     if (result > 0) return true;
+    // test year
+    if (g_advancedSettings.m_bMusicLibraryAlbumsSortByArtistThenYear)
+    {
+      result = StringUtils::AlphaNumericCompare(left->m_musicInfoTag.GetYear().c_str(), right->m_musicInfoTag.GetYear().c_str());
+      if (result < 0) return false;
+      if (result > 0) return true;
+    }
     // artists agree, test the album
     l = (char *)left->m_musicInfoTag.GetAlbum().c_str();
     r = (char *)right->m_musicInfoTag.GetAlbum().c_str();


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

Revision: 7640
          http://svn.sourceforge.net/xbmc/?rev=7640&view=rev
Author:   elupus
Date:     2007-01-15 14:34:12 -0800 (Mon, 15 Jan 2007)

Log Message:
-----------
reverted some cosmetics from tuxbox merge

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp
    trunk/XBMC/xbmc/utils/GUIInfoManager.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2007-01-15 22:22:50 UTC (rev 7639)
+++ trunk/XBMC/xbmc/Application.cpp	2007-01-15 22:34:12 UTC (rev 7640)
@@ -3486,16 +3486,8 @@
     return false;
   }
 
-  bool bResult;
-  bResult = m_pPlayer->OpenFile(item, options);
-  /*
-  if(bTuxBox)
-    bResult = m_pPlayer->OpenFile(item_new, options);
-  else
-    bResult = m_pPlayer->OpenFile(item, options);
-  */
+  bool bResult = m_pPlayer->OpenFile(item, options);
 
-  
   if(bResult)
   {
 #ifdef HAS_VIDEO_PLAYBACK
@@ -3678,8 +3670,6 @@
         dbs.Close();
       }
     }
-
-
     m_pPlayer->CloseFile();
     g_partyModeManager.Disable();
   }

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-01-15 22:22:50 UTC (rev 7639)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-01-15 22:34:12 UTC (rev 7640)
@@ -1378,27 +1378,15 @@
   switch (item)
   {
   case VIDEOPLAYER_DURATION:
-    {
-      if (!bIsTuxBox && m_currentMovieDuration.IsEmpty())
-        m_currentMovieDuration = "";
       return m_currentMovieDuration;
-    }
   case VIDEOPLAYER_TITLE:
-    {
-      return m_currentMovie.m_strTitle;
-    }
+    return m_currentMovie.m_strTitle;
     break;
   case VIDEOPLAYER_GENRE:
-    {
-      if (!bIsTuxBox && m_currentMovie.m_strGenre.IsEmpty())
-        m_currentMovie.m_strGenre = "";
-      return m_currentMovie.m_strGenre;
-    }
+    return m_currentMovie.m_strGenre;
     break;
   case VIDEOPLAYER_DIRECTOR:
-    {
-      return m_currentMovie.m_strDirector;
-    }
+    return m_currentMovie.m_strDirector;
     break;
   case VIDEOPLAYER_YEAR:
     if (m_currentMovie.m_iYear > 0)


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

Revision: 7657
          http://svn.sourceforge.net/xbmc/?rev=7657&view=rev
Author:   spiff_
Date:     2007-01-16 10:31:52 -0800 (Tue, 16 Jan 2007)

Log Message:
-----------
fixed: scroll bars didn't work.

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIMediaWindow.cpp
    trunk/XBMC/xbmc/GUIWindowVideoBase.cpp

Modified: trunk/XBMC/xbmc/GUIMediaWindow.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIMediaWindow.cpp	2007-01-16 18:11:20 UTC (rev 7656)
+++ trunk/XBMC/xbmc/GUIMediaWindow.cpp	2007-01-16 18:31:52 UTC (rev 7657)
@@ -173,14 +173,13 @@
         m_vecItems.m_strPath = "?";
         return true;
       }
-
-      if ( message.GetParam1() == GUI_MSG_REFRESH_THUMBS )
+      else if ( message.GetParam1() == GUI_MSG_REFRESH_THUMBS )
       {
         for (int i = 0; i < m_vecItems.Size(); i++)
           m_vecItems[i]->FreeMemory();
         break;  // the window will take care of any info images
       }
-      if (message.GetParam1() == GUI_MSG_REMOVED_MEDIA)
+      else if (message.GetParam1() == GUI_MSG_REMOVED_MEDIA)
       {
         if (m_vecItems.IsVirtualDirectoryRoot() && IsActive())
         {
@@ -200,6 +199,7 @@
             }
           }
         }
+
         return true;
       }
       else if (message.GetParam1()==GUI_MSG_UPDATE_BOOKMARKS)
@@ -218,6 +218,9 @@
         Update(m_vecItems.m_strPath);
         m_viewControl.SetSelectedItem(iItem);        
       }
+      else
+        return CGUIWindow::OnMessage(message);
+
       return true;
     }
     break;

Modified: trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2007-01-16 18:11:20 UTC (rev 7656)
+++ trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2007-01-16 18:31:52 UTC (rev 7657)
@@ -193,6 +193,7 @@
             OnDeleteItem(iItem);
           else
             return false;
+          
           return true;
         }
       }


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

Revision: 7690
          http://svn.sourceforge.net/xbmc/?rev=7690&view=rev
Author:   jmarshallnz
Date:     2007-01-18 00:46:25 -0800 (Thu, 18 Jan 2007)

Log Message:
-----------
fixed: Library/Files view setting wasn't remembered in PM3 unless you altered a different setting.

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowMusicBase.cpp
    trunk/XBMC/xbmc/GUIWindowVideoBase.cpp

Modified: trunk/XBMC/xbmc/GUIWindowMusicBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicBase.cpp	2007-01-18 08:16:38 UTC (rev 7689)
+++ trunk/XBMC/xbmc/GUIWindowMusicBase.cpp	2007-01-18 08:46:25 UTC (rev 7690)
@@ -143,8 +143,11 @@
         return false;
 
       // save current window, unless the current window is the music playlist window
-      if (GetID() != WINDOW_MUSIC_PLAYLIST)
+      if (GetID() != WINDOW_MUSIC_PLAYLIST && g_stSettings.m_iMyMusicStartWindow != GetID())
+      {
         g_stSettings.m_iMyMusicStartWindow = GetID();
+        g_settings.Save();
+      }
 
       return true;
     }

Modified: trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2007-01-18 08:16:38 UTC (rev 7689)
+++ trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2007-01-18 08:46:25 UTC (rev 7690)
@@ -93,10 +93,12 @@
       m_dlgProgress = (CGUIDialogProgress*)m_gWindowManager.GetWindow(WINDOW_DIALOG_PROGRESS);
 
       // save current window, unless the current window is the video playlist window
-      if (GetID() != WINDOW_VIDEO_PLAYLIST)
+      if (GetID() != WINDOW_VIDEO_PLAYLIST && g_stSettings.m_iVideoStartWindow != GetID())
+      {
         g_stSettings.m_iVideoStartWindow = GetID();
+        g_settings.Save();
+      }
 
-
       return CGUIMediaWindow::OnMessage(message);
     }
     break;


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

Revision: 7692
          http://svn.sourceforge.net/xbmc/?rev=7692&view=rev
Author:   spiff_
Date:     2007-01-18 10:55:13 -0800 (Thu, 18 Jan 2007)

Log Message:
-----------
fixed: fan controller didn't respect profile changes.

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowLoginScreen.cpp
    trunk/XBMC/xbmc/Settings.cpp
    trunk/XBMC/xbmc/Util.cpp

Modified: trunk/XBMC/xbmc/GUIWindowLoginScreen.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowLoginScreen.cpp	2007-01-18 09:51:30 UTC (rev 7691)
+++ trunk/XBMC/xbmc/GUIWindowLoginScreen.cpp	2007-01-18 18:55:13 UTC (rev 7692)
@@ -30,6 +30,7 @@
 #include "lib/libPython/XBPython.h"
 #include "lib/libscrobbler/scrobbler.h"
 #include "utils/weather.h"
+#include "utils/fancontroller.h"
 #include "xbox/network.h"
 #include "skininfo.h"
 
@@ -99,6 +100,19 @@
             {
               g_network.NetworkMessage(CNetwork::SERVICES_DOWN,1);
               g_network.Deinitialize();
+              #ifdef HAS_XBOX_HARDWARE
+              if (g_guiSettings.GetBool("system.autotemperature"))
+              {
+                CLog::Log(LOGNOTICE, "stop fancontroller");
+                CFanController::Instance()->Stop();
+              }
+              else
+              {
+                CLog::Log(LOGNOTICE, "set fanspeed to default");
+                CFanController::Instance()->RestoreStartupSpeed();
+              }
+              #endif
+              
               g_settings.LoadProfile(m_viewControl.GetSelectedItem());
               g_network.Initialize(g_guiSettings.GetInt("network.assignment"),
                 g_guiSettings.GetString("network.ipaddress").c_str(),

Modified: trunk/XBMC/xbmc/Settings.cpp
===================================================================
--- trunk/XBMC/xbmc/Settings.cpp	2007-01-18 09:51:30 UTC (rev 7691)
+++ trunk/XBMC/xbmc/Settings.cpp	2007-01-18 18:55:13 UTC (rev 7692)
@@ -36,6 +36,7 @@
 #include "xbox/Network.h"
 #include "filesystem/MultiPathDirectory.h"
 #include "GUIBaseContainer.h" // for VIEW_TYPE enum
+#include "utils/fancontroller.h"
 #ifdef HAS_XBOX_HARDWARE
 #include "utils/MemoryUnitManager.h"
 #endif
@@ -1751,6 +1752,19 @@
         g_guiSettings.LoadMasterLock(doc.RootElement());
     }
 
+#ifdef HAS_XBOX_HARDWARE
+    if (g_guiSettings.GetBool("system.autotemperature"))
+    {
+      CLog::Log(LOGNOTICE, "start fancontroller");
+      CFanController::Instance()->Start(g_guiSettings.GetInt("system.targettemperature"));
+    }
+    else if (g_guiSettings.GetBool("system.fanspeedcontrol"))
+    {
+      CLog::Log(LOGNOTICE, "setting fanspeed");
+      CFanController::Instance()->SetFanSpeed(g_guiSettings.GetInt("system.fanspeed"));
+    }
+#endif
+
     // to set labels - shares are reloaded
     CDetectDVDMedia::UpdateState();
     // init windows

Modified: trunk/XBMC/xbmc/Util.cpp
===================================================================
--- trunk/XBMC/xbmc/Util.cpp	2007-01-18 09:51:30 UTC (rev 7691)
+++ trunk/XBMC/xbmc/Util.cpp	2007-01-18 18:55:13 UTC (rev 7692)
@@ -65,6 +65,7 @@
 #include "utils/MemoryUnitManager.h"
 #include "utils/FilterFlickerPatch.h"
 #include "utils/LED.h"
+#include "utils/fancontroller.h"
 #endif
 #include "MediaManager.h"
 #ifdef _XBOX
@@ -3752,6 +3753,18 @@
 
     g_network.NetworkMessage(CNetwork::SERVICES_DOWN,1);
     g_network.Deinitialize();
+#ifdef HAS_XBOX_HARDWARE
+    if (g_guiSettings.GetBool("system.autotemperature"))
+    {
+      CLog::Log(LOGNOTICE, "stop fancontroller");
+      CFanController::Instance()->Stop();
+    }
+    else
+    {
+      CLog::Log(LOGNOTICE, "set fanspeed to default");
+      CFanController::Instance()->RestoreStartupSpeed();
+    }
+#endif
     g_settings.LoadProfile(0); // login screen always runs as default user
     g_passwordManager.m_mapSMBPasswordCache.clear();
     g_passwordManager.bMasterUser = false;


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

Revision: 7700
          http://svn.sourceforge.net/xbmc/?rev=7700&view=rev
Author:   c0diq
Date:     2007-01-20 02:07:46 -0800 (Sat, 20 Jan 2007)

Log Message:
-----------
changed: adding a broadcast flag that can be set to false manually for XBMC_PC if you want true multicast UPnP support (and see it show under XP) = of course this won't work for the xbox

Modified Paths:
--------------
    trunk/XBMC/xbmc/UPnP.cpp
    trunk/XBMC/xbmc/UPnP.h

Modified: trunk/XBMC/xbmc/UPnP.cpp
===================================================================
--- trunk/XBMC/xbmc/UPnP.cpp	2007-01-20 09:48:10 UTC (rev 7699)
+++ trunk/XBMC/xbmc/UPnP.cpp	2007-01-20 10:07:46 UTC (rev 7700)
@@ -34,8 +34,17 @@
 #include "lib/libUPnP/PltSyncMediaBrowser.h"
 #include "lib/libUPnP/PltDidl.h"
 
+
+/*----------------------------------------------------------------------
+|   static
++---------------------------------------------------------------------*/
 CUPnP* CUPnP::upnp = NULL;
 
+// change to false for XBMC_PC if you want real UPnP functionality
+// otherwise keep to true for xbmc as it doesn't support multicast
+// don't change unless you know what you're doing!
+bool CUPnP::broadcast = true; 
+
 /*----------------------------------------------------------------------
 |   CDeviceHostReferenceHolder class
 +---------------------------------------------------------------------*/
@@ -515,8 +524,8 @@
 {
     //PLT_SetLogLevel(PLT_LOG_LEVEL_4);
 
-    // initialize upnp in broadcast listening mode
-    m_UPnP = new PLT_UPnP(1900, false);
+    // initialize upnp in broadcast listening mode for xbmc
+    m_UPnP = new PLT_UPnP(1900, !broadcast);
 
     // start upnp monitoring
     m_UPnP->Start();
@@ -590,7 +599,7 @@
     // since the xbox does not support multicast. UPnP devices will still receive our request and respond to us
     // since they're listening on port 1900 in multicast
     // Repeat every 6 seconds
-    m_CtrlPointHolder->m_CtrlPoint->Discover(NPT_HttpUrl("255.255.255.255", 1900, "*"), "upnp:rootdevice", 1, 6000);
+    if (broadcast) m_CtrlPointHolder->m_CtrlPoint->Discover(NPT_HttpUrl("255.255.255.255", 1900, "*"), "upnp:rootdevice", 1, 6000);
 }
 
 /*----------------------------------------------------------------------
@@ -644,7 +653,7 @@
 
     // since the xbox doesn't support multicast
     // we use broadcast but we advertise more often
-    m_ServerHolder->m_Device->SetBroadcast(true);
+    if (broadcast) m_ServerHolder->m_Device->SetBroadcast(true);
 
     // tell controller to ignore ourselves from list of upnp servers
     if (!m_CtrlPointHolder->m_CtrlPoint.IsNull()) {

Modified: trunk/XBMC/xbmc/UPnP.h
===================================================================
--- trunk/XBMC/xbmc/UPnP.h	2007-01-20 09:48:10 UTC (rev 7699)
+++ trunk/XBMC/xbmc/UPnP.h	2007-01-20 10:07:46 UTC (rev 7700)
@@ -57,4 +57,5 @@
     CCtrlPointReferenceHolder*  m_CtrlPointHolder;
 
     static CUPnP* upnp;
+    static bool   broadcast;
 };


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

Revision: 7716
          http://svn.sourceforge.net/xbmc/?rev=7716&view=rev
Author:   jmarshallnz
Date:     2007-01-23 19:47:18 -0800 (Tue, 23 Jan 2007)

Log Message:
-----------
changed: List/panel container support in DialogFileStacking.xml (old method should be changed to use this new one)

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIDialogFileStacking.cpp
    trunk/XBMC/xbmc/GUIDialogFileStacking.h

Modified: trunk/XBMC/xbmc/GUIDialogFileStacking.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogFileStacking.cpp	2007-01-23 21:43:05 UTC (rev 7715)
+++ trunk/XBMC/xbmc/GUIDialogFileStacking.cpp	2007-01-24 03:47:18 UTC (rev 7716)
@@ -22,6 +22,7 @@
 #include "stdafx.h"
 #include "GUIDialogFileStacking.h"
 
+#define STACK_LIST 450
 
 CGUIDialogFileStacking::CGUIDialogFileStacking(void)
     : CGUIDialog(WINDOW_DIALOG_FILESTACKING, "DialogFileStacking.xml")
@@ -37,10 +38,15 @@
 {
   switch ( message.GetMessage() )
   {
+  case GUI_MSG_WINDOW_DEINIT:
+    CGUIDialog::OnMessage(message);
+    m_stackItems.Clear();
+    return true;
   case GUI_MSG_WINDOW_INIT:
     {
       CGUIDialog::OnMessage(message);
       m_iSelectedFile = -1;
+#ifdef PRE_SKIN_VERSION_2_1_COMPATIBILITY
       m_iFrames = 0;
 
       // enable the CD's
@@ -56,14 +62,38 @@
         SET_CONTROL_HIDDEN(i);
         CONTROL_DISABLE(i);
       }
-
+#endif
+      if (GetControl(STACK_LIST))
+      { // have the new stack list instead - fill it up
+        CGUIMessage msg(GUI_MSG_LABEL_RESET, GetID(), STACK_LIST);
+        OnMessage(msg);
+        for (int i = 0; i < m_iNumberOfFiles; i++)
+        {
+          CStdString label;
+          label.Format("Part %i", i+1);
+          CFileItem *item = new CFileItem(label);
+          m_stackItems.Add(item);
+          CGUIMessage msg(GUI_MSG_LABEL_ADD, GetID(), STACK_LIST, 0, 0, item);
+          OnMessage(msg);
+        }
+      }
       return true;
     }
     break;
 
   case GUI_MSG_CLICKED:
     {
-      m_iSelectedFile = message.GetSenderId();
+#ifdef PRE_SKIN_VERSION_2_1_COMPATIBILITY
+      if (message.GetSenderId() != STACK_LIST)
+        m_iSelectedFile = message.GetSenderId();
+      else if (message.GetParam1() == ACTION_SELECT_ITEM)
+      {
+        // grab the selected item
+        CGUIMessage msg(GUI_MSG_ITEM_SELECTED, GetID(), STACK_LIST);
+        OnMessage(msg);
+        m_iSelectedFile = msg.GetParam1() + 1;
+      }
+#endif
       Close();
       return true;
     }
@@ -79,12 +109,17 @@
 
 void CGUIDialogFileStacking::SetNumberOfFiles(int iFiles)
 {
-  // maximum number of files is 20 (as we have 20 cd images)
-  m_iNumberOfFiles = min(iFiles,20);
+#ifdef PRE_SKIN_VERSION_2_1_COMPATIBILITY
+  if (!GetControl(STACK_LIST))  // maximum number of files is 20 in the old system
+    m_iNumberOfFiles = min(iFiles,20);
+  else
+    m_iNumberOfFiles = iFiles;
+#endif
 }
 
 void CGUIDialogFileStacking::Render()
 {
+#ifdef PRE_SKIN_VERSION_2_1_COMPATIBILITY
   if (m_iFrames <= 25)
   {
     // slide in...
@@ -104,5 +139,6 @@
     }
     m_iFrames++;
   }
+#endif
   CGUIDialog::Render();
-}
\ No newline at end of file
+}

Modified: trunk/XBMC/xbmc/GUIDialogFileStacking.h
===================================================================
--- trunk/XBMC/xbmc/GUIDialogFileStacking.h	2007-01-23 21:43:05 UTC (rev 7715)
+++ trunk/XBMC/xbmc/GUIDialogFileStacking.h	2007-01-24 03:47:18 UTC (rev 7716)
@@ -16,4 +16,5 @@
   int m_iSelectedFile;
   int m_iNumberOfFiles;
   int m_iFrames;
+  CFileItemList m_stackItems;
 };


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

Revision: 7720
          http://svn.sourceforge.net/xbmc/?rev=7720&view=rev
Author:   c0diq
Date:     2007-01-24 09:49:49 -0800 (Wed, 24 Jan 2007)

Log Message:
-----------
changed: verbose log when browsing upnp server 
changed: better network support for UPnP - can now get access to netmask

Modified Paths:
--------------
    trunk/XBMC/xbmc/FileSystem/VirtualPathDirectory.cpp
    trunk/XBMC/xbmc/UPnP.cpp
    trunk/XBMC/xbmc/lib/libUPnP/NptHttp.h
    trunk/XBMC/xbmc/lib/libUPnP/NptSockets.h
    trunk/XBMC/xbmc/lib/libUPnP/NptUtils.h
    trunk/XBMC/xbmc/lib/libUPnP/PltDeviceHost.h
    trunk/XBMC/xbmc/lib/libUPnP/PltSsdp.h
    trunk/XBMC/xbmc/lib/libUPnP/libPlatinum.lib
    trunk/XBMC/xbmc/lib/libUPnP/libPlatinum_PC.lib
    trunk/XBMC/xbmc/lib/libUPnP/libPlatinum_PCd.lib
    trunk/XBMC/xbmc/lib/libUPnP/libPlatinumd.lib

Added Paths:
-----------
    trunk/XBMC/xbmc/lib/libUPnP/NptXboxNetwork.h

Modified: trunk/XBMC/xbmc/FileSystem/VirtualPathDirectory.cpp
===================================================================
--- trunk/XBMC/xbmc/FileSystem/VirtualPathDirectory.cpp	2007-01-24 08:52:33 UTC (rev 7719)
+++ trunk/XBMC/xbmc/FileSystem/VirtualPathDirectory.cpp	2007-01-24 17:49:49 UTC (rev 7720)
@@ -129,7 +129,7 @@
       return false;
     strType = strTemp.Mid(0, iPos);
     strBookmark = strTemp.Mid(iPos + 1);
-    CLog::Log(LOGDEBUG,"CVirtualPathDirectory::GetTypeAndBookmark(%s) = [%s],[%s]", strPath.c_str(), strType.c_str(), strBookmark.c_str());
+    //CLog::Log(LOGDEBUG,"CVirtualPathDirectory::GetTypeAndBookmark(%s) = [%s],[%s]", strPath.c_str(), strType.c_str(), strBookmark.c_str());
     return true;
   }
   return false;

Modified: trunk/XBMC/xbmc/UPnP.cpp
===================================================================
--- trunk/XBMC/xbmc/UPnP.cpp	2007-01-24 08:52:33 UTC (rev 7719)
+++ trunk/XBMC/xbmc/UPnP.cpp	2007-01-24 17:49:49 UTC (rev 7720)
@@ -33,19 +33,102 @@
 #include "lib/libUPnP/PltMediaBrowser.h"
 #include "lib/libUPnP/PltSyncMediaBrowser.h"
 #include "lib/libUPnP/PltDidl.h"
+#include "lib/libUPnP/NptNetwork.h"
+#include "lib/libUPnP/NptXboxNetwork.h"
 
-
 /*----------------------------------------------------------------------
 |   static
 +---------------------------------------------------------------------*/
 CUPnP* CUPnP::upnp = NULL;
-
 // change to false for XBMC_PC if you want real UPnP functionality
 // otherwise keep to true for xbmc as it doesn't support multicast
 // don't change unless you know what you're doing!
 bool CUPnP::broadcast = true; 
 
+#ifdef HAS_XBOX_NETWORK
+#include <xtl.h>
+#include <winsockx.h>
+
 /*----------------------------------------------------------------------
+|   static initializer
++---------------------------------------------------------------------*/
+NPT_WinsockSystem::NPT_WinsockSystem() 
+{
+}
+
+NPT_WinsockSystem::~NPT_WinsockSystem() 
+{
+}
+
+NPT_WinsockSystem NPT_WinsockSystem::Initializer;
+
+/*----------------------------------------------------------------------
+|       NPT_NetworkInterface::GetNetworkInterfaces
++---------------------------------------------------------------------*/
+NPT_Result
+NPT_NetworkInterface::GetNetworkInterfaces(NPT_List<NPT_NetworkInterface*>& interfaces)
+{
+    XNADDR xna;
+    DWORD  state;
+    do {
+        state = XNetGetTitleXnAddr(&xna);
+        Sleep(100);
+    } while (state == XNET_GET_XNADDR_PENDING);
+
+    if (state & XNET_GET_XNADDR_STATIC || state & XNET_GET_XNADDR_DHCP) {
+        NPT_IpAddress primary_address;
+        primary_address.ResolveName(g_network.m_networkinfo.ip);
+
+        NPT_IpAddress netmask;
+        netmask.ResolveName(g_network.m_networkinfo.subnet);
+
+        NPT_IpAddress broadcast_address;        
+        broadcast_address.ResolveName("255.255.255.255");
+
+//        {
+//            // broadcast address is incorrect
+//            unsigned char addr[4];
+//            for(int i=0; i<4; i++) {
+//                addr[i] = (primary_address.AsBytes()[i] & netmask.AsBytes()[i]) | 
+//                    ~netmask.AsBytes()[i];
+//            }
+//            broadcast_address.Set(addr);
+//        }
+
+
+        NPT_Flags     flags = NPT_NETWORK_INTERFACE_FLAG_BROADCAST;
+
+        NPT_MacAddress mac;
+        if (state & XNET_GET_XNADDR_ETHERNET) {
+            mac.SetAddress(NPT_MacAddress::TYPE_ETHERNET, xna.abEnet, 6);
+        }
+
+        // create an interface object
+        char iface_name[5];
+        iface_name[0] = 'i';
+        iface_name[1] = 'f';
+        iface_name[2] = '0';
+        iface_name[3] = '0';
+        iface_name[4] = '\0';
+        NPT_NetworkInterface* iface = new NPT_NetworkInterface(iface_name, mac, flags);
+
+        // set the interface address
+        NPT_NetworkInterfaceAddress iface_address(
+            primary_address,
+            broadcast_address,
+            NPT_IpAddress::Any,
+            netmask);
+        iface->AddAddress(iface_address);  
+
+        // add the interface to the list
+        interfaces.Add(iface);  
+    }
+
+    return NPT_SUCCESS;
+}
+#endif
+
+/*----------------------------------------------------------------------
 |   CDeviceHostReferenceHolder class
 +---------------------------------------------------------------------*/
 class CDeviceHostReferenceHolder
@@ -599,7 +682,9 @@
     // since the xbox does not support multicast. UPnP devices will still receive our request and respond to us
     // since they're listening on port 1900 in multicast
     // Repeat every 6 seconds
-    if (broadcast) m_CtrlPointHolder->m_CtrlPoint->Discover(NPT_HttpUrl("255.255.255.255", 1900, "*"), "upnp:rootdevice", 1, 6000);
+    if (broadcast) {
+        m_CtrlPointHolder->m_CtrlPoint->Discover(NPT_HttpUrl("255.255.255.255", 1900, "*"), "upnp:rootdevice", 1, 6000);
+    }
 }
 
 /*----------------------------------------------------------------------
@@ -630,12 +715,10 @@
     // create the server with the friendlyname and UUID from upnpserver.xml if found
     m_ServerHolder->m_Device = new CUPnPServer(
         g_settings.m_UPnPServerFriendlyName.length()?g_settings.m_UPnPServerFriendlyName.c_str():"Xbox Media Center",
-        g_settings.m_UPnPUUID.length()?g_settings.m_UPnPUUID.c_str():NULL
-        );
+        g_settings.m_UPnPUUID.length()?g_settings.m_UPnPUUID.c_str():NULL);
 
     // trying to set optional upnp values for XP UPnP UI Icons to detect us
     // but it doesn't work anyways as it requires multicast for XP to detect us
-    m_ServerHolder->m_Device->m_ModelName = "Xbox Media Center";
     NPT_String ip = g_network.m_networkinfo.ip;
 #ifndef HAS_XBOX_NETWORK
     NPT_List<NPT_String> list;
@@ -644,6 +727,7 @@
     }
 #endif
     m_ServerHolder->m_Device->m_PresentationURL = NPT_HttpUrl(ip, atoi(g_guiSettings.GetString("servers.webserverport")), "/").ToString();
+    m_ServerHolder->m_Device->m_ModelName = "Xbox Media Center";
     m_ServerHolder->m_Device->m_ModelDescription = "Xbox Media Center";
     m_ServerHolder->m_Device->m_ModelURL = "http://www.xboxmediacenter.com/";
     m_ServerHolder->m_Device->m_ModelNumber = "2.0";
@@ -653,7 +737,7 @@
 
     // since the xbox doesn't support multicast
     // we use broadcast but we advertise more often
-    if (broadcast) m_ServerHolder->m_Device->SetBroadcast(true);
+    m_ServerHolder->m_Device->SetBroadcast(broadcast);
 
     // tell controller to ignore ourselves from list of upnp servers
     if (!m_CtrlPointHolder->m_CtrlPoint.IsNull()) {

Modified: trunk/XBMC/xbmc/lib/libUPnP/NptHttp.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/NptHttp.h	2007-01-24 08:52:33 UTC (rev 7719)
+++ trunk/XBMC/xbmc/lib/libUPnP/NptHttp.h	2007-01-24 17:49:49 UTC (rev 7720)
@@ -372,7 +372,8 @@
 
     // methods
     virtual NPT_Result SetupResponse(NPT_HttpRequest&  request,
-                                     NPT_HttpResponse& response) = 0;
+                                     NPT_HttpResponse& response,
+                                     NPT_SocketInfo&   client_info) = 0;
 };
 
 /*----------------------------------------------------------------------
@@ -392,7 +393,8 @@
 
     // NPT_HttpRequetsHandler methods
     virtual NPT_Result SetupResponse(NPT_HttpRequest&  request, 
-                                     NPT_HttpResponse& response);
+                                     NPT_HttpResponse& response,
+                                     NPT_SocketInfo&   client_info);
 
 private:
     NPT_String     m_MimeType;
@@ -411,7 +413,8 @@
 
     // NPT_HttpRequetsHandler methods
     virtual NPT_Result SetupResponse(NPT_HttpRequest&  request, 
-                                     NPT_HttpResponse& response);
+                                     NPT_HttpResponse& response,
+                                     NPT_SocketInfo&   client_info);
 
     // accessors
     NPT_Map<NPT_String,NPT_String>& GetFileTypeMap() { return m_FileTypeMap; }
@@ -456,8 +459,7 @@
     NPT_Result SetTimeouts(NPT_Timeout connection_timeout, NPT_Timeout io_timeout);
     NPT_Result WaitForNewClient(NPT_InputStreamReference&  input,
                                 NPT_OutputStreamReference& output,
-                                NPT_SocketAddress*         local_address  = NULL,
-                                NPT_SocketAddress*         remote_address = NULL);
+                                NPT_SocketInfo&            client_info);
     
     /**
      *  Add a request handler. The ownership of the handler is NOT transfered to this object,
@@ -471,7 +473,7 @@
      */
     NPT_Result RespondToClient(NPT_InputStreamReference&  input,
                                NPT_OutputStreamReference& output,
-                               NPT_SocketAddress*         local_address = NULL);
+                               NPT_SocketInfo&            client_info);
 
 protected:
     // types
@@ -493,6 +495,7 @@
     // members
     NPT_TcpServerSocket      m_Socket;
     Config                   m_Config;
+    bool                     m_Bound;
     NPT_List<HandlerConfig*> m_RequestHandlers;
 };
 

Modified: trunk/XBMC/xbmc/lib/libUPnP/NptSockets.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/NptSockets.h	2007-01-24 08:52:33 UTC (rev 7719)
+++ trunk/XBMC/xbmc/lib/libUPnP/NptSockets.h	2007-01-24 17:49:49 UTC (rev 7720)
@@ -296,7 +296,7 @@
         return m_TcpServerSocketDelegate->Listen(max_clients);
     }
     NPT_Result WaitForNewClient(NPT_Socket*& client, 
-                                NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) {
+                                NPT_Timeout  timeout = NPT_TIMEOUT_INFINITE) {
         return m_TcpServerSocketDelegate->WaitForNewClient(client, timeout);
     }
 

Modified: trunk/XBMC/xbmc/lib/libUPnP/NptUtils.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/NptUtils.h	2007-01-24 08:52:33 UTC (rev 7719)
+++ trunk/XBMC/xbmc/lib/libUPnP/NptUtils.h	2007-01-24 17:49:49 UTC (rev 7720)
@@ -61,7 +61,7 @@
 #endif
 
 #if defined (NPT_CONFIG_HAVE_SNPRINTF)
-#define NPT_FormatString NPT_snprintf
+#define NPT_FormatString _snprintf
 #else
 int NPT_FormatString(char* str, NPT_Size size, const char* format, ...);
 #endif

Added: trunk/XBMC/xbmc/lib/libUPnP/NptXboxNetwork.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/NptXboxNetwork.h	                        (rev 0)
+++ trunk/XBMC/xbmc/lib/libUPnP/NptXboxNetwork.h	2007-01-24 17:49:49 UTC (rev 7720)
@@ -0,0 +1,19 @@
+/*****************************************************************
+|
+|   Neptune - Network :: Winsock Implementation
+|
+|   (c) 2001-2006 Gilles Boccon-Gibod
+|   Author: Sylvain Rebaud (sylvain@...)
+|
+ ****************************************************************/
+
+/*----------------------------------------------------------------------
+|   static initializer
++---------------------------------------------------------------------*/
+class NPT_WinsockSystem {
+public:
+    static NPT_WinsockSystem Initializer;
+private:
+    NPT_WinsockSystem();
+    ~NPT_WinsockSystem();
+};

Modified: trunk/XBMC/xbmc/lib/libUPnP/PltDeviceHost.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltDeviceHost.h	2007-01-24 08:52:33 UTC (rev 7719)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltDeviceHost.h	2007-01-24 17:49:49 UTC (rev 7720)
@@ -77,11 +77,13 @@
     virtual NPT_Result SendSsdpSearchResponse(PLT_DeviceData*   device, 
                                               NPT_HttpResponse& response, 
                                               NPT_UdpSocket&    socket, 
-                                              const char*       st);
+                                              const char*       st,
+                                              NPT_SocketAddress* addr  = NULL);
     virtual NPT_Result SendSsdpSearchResponse(NPT_HttpResponse& response, 
                                               NPT_UdpSocket&    socket, 
-                                              const char*       ST) {
-        return SendSsdpSearchResponse(this, response, socket, ST);
+                                              const char*       ST,
+                                              NPT_SocketAddress* addr = NULL) {
+        return SendSsdpSearchResponse(this, response, socket, ST, addr);
     }
     
 protected:
@@ -114,11 +116,11 @@
     friend class NPT_Reference<PLT_DeviceHost>;
 
 private:
-    bool                        m_Broadcast;
     PLT_TaskManager*            m_TaskManager;
     PLT_HttpServerHandler*      m_HttpServerHandler;
     PLT_HttpServer*             m_HttpServer;
     PLT_SsdpDeviceAnnounceTask* m_SsdpAnnounceTask;
+    bool                        m_Broadcast;
 };
 
 typedef NPT_Reference<PLT_DeviceHost> PLT_DeviceHostReference;

Modified: trunk/XBMC/xbmc/lib/libUPnP/PltSsdp.h
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/PltSsdp.h	2007-01-24 08:52:33 UTC (rev 7719)
+++ trunk/XBMC/xbmc/lib/libUPnP/PltSsdp.h	2007-01-24 17:49:49 UTC (rev 7720)
@@ -147,7 +147,7 @@
                                NPT_TimeInterval repeat,
                                bool             is_byebye_first = false,
                                bool             broadcast = false) : 
-        m_Repeat(repeat), m_Device(device), m_IsByeByeFirst(is_byebye_first), m_IsBroadcast(broadcast) {}
+        m_Device(device), m_Repeat(repeat), m_IsByeByeFirst(is_byebye_first), m_IsBroadcast(broadcast) {}
 
 protected:
     virtual ~PLT_SsdpDeviceAnnounceTask() {}

Modified: trunk/XBMC/xbmc/lib/libUPnP/libPlatinum.lib
===================================================================
(Binary files differ)

Modified: trunk/XBMC/xbmc/lib/libUPnP/libPlatinum_PC.lib
===================================================================
(Binary files differ)

Modified: trunk/XBMC/xbmc/lib/libUPnP/libPlatinum_PCd.lib
===================================================================
(Binary files differ)

Modified: trunk/XBMC/xbmc/lib/libUPnP/libPlatinumd.lib
===================================================================
(Binary files differ)


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

Revision: 7722
          http://svn.sourceforge.net/xbmc/?rev=7722&view=rev
Author:   jmarshallnz
Date:     2007-01-24 11:13:26 -0800 (Wed, 24 Jan 2007)

Log Message:
-----------
changed: Format of exported/imported videodb file cast section.

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowVideoInfo.cpp
    trunk/XBMC/xbmc/VideoDatabase.cpp
    trunk/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp
    trunk/XBMC/xbmc/lib/libPython/xbmcmodule/infotagvideo.cpp
    trunk/XBMC/xbmc/utils/IMDB.cpp
    trunk/XBMC/xbmc/utils/IMDB.h

Modified: trunk/XBMC/xbmc/GUIWindowVideoInfo.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoInfo.cpp	2007-01-24 18:21:47 UTC (rev 7721)
+++ trunk/XBMC/xbmc/GUIWindowVideoInfo.cpp	2007-01-24 19:13:26 UTC (rev 7722)
@@ -303,15 +303,12 @@
   SET_CONTROL_LABEL(CONTROL_TEXTAREA, strTmp.c_str() );
 
   // setup cast list
-  strTmp = m_Movie.m_strCast; strTmp.Trim();
   m_vecStrCast.clear();
-  vector<CStdString> vecCast;
-  int iNumItems = StringUtils::SplitString(strTmp, "\n", vecCast);
-  for (int i = 0; i < (int)vecCast.size(); i++)
+  for (CIMDBMovie::iCast it = m_Movie.m_cast.begin(); it != m_Movie.m_cast.end(); ++it)
   {
-    int iPos = vecCast[i].Find(" as ");
-    if (iPos > 0)
-      m_vecStrCast.push_back(vecCast[i]);
+    CStdString character;
+    character.Format("%s %s %s", it->first.c_str(), g_localizeStrings.Get(20347).c_str(), it->second.c_str());
+    m_vecStrCast.push_back(character);
   }
   AddItemsToList(m_vecStrCast);
 

Modified: trunk/XBMC/xbmc/VideoDatabase.cpp
===================================================================
--- trunk/XBMC/xbmc/VideoDatabase.cpp	2007-01-24 18:21:47 UTC (rev 7721)
+++ trunk/XBMC/xbmc/VideoDatabase.cpp	2007-01-24 19:13:26 UTC (rev 7722)
@@ -737,22 +737,10 @@
     }
   
     // add cast...
-    vector<std::pair<long,CStdString> > vecActors;
-    CStdString strCast;
-    int ipos = 0;
-    strCast = details.m_strCast.c_str();
-    CRegExp reg;
-    reg.RegComp("([^\n]*) as ([^\n]*)\n");
-    const char* szFoo=strCast.c_str();
-    while ((ipos = reg.RegFind(szFoo)) > -1)
+    for (CIMDBMovie::iCast it = details.m_cast.begin(); it != details.m_cast.end(); ++it)
     {
-      char* actor = reg.GetReplaceString("\\1");
-      char* role = reg.GetReplaceString("\\2");
-      long lActor = AddActor(actor);
-      vecActors.push_back(std::make_pair<long,CStdString>(lActor,role));
-      free(actor);
-      free(role);
-      szFoo += ipos+reg.GetFindLen();
+      long lActor = AddActor(it->first);
+      AddActorToMovie(lMovieId, lActor, it->second);
     }
     
     for (int i = 0; i < (int)vecGenres.size(); ++i)
@@ -760,11 +748,6 @@
       AddGenreToMovie(lMovieId, vecGenres[i]);
     }
 
-    for (i = 0; i < (int)vecActors.size(); ++i)
-    {
-      AddActorToMovie(lMovieId, vecActors[i].first, vecActors[i].second);
-    }
-
     for (i = 0; i < (int)vecDirectors.size(); ++i)
     {
       AddDirectorToMovie(lMovieId, vecDirectors[i]);
@@ -1113,7 +1096,7 @@
   m_pDS2->query(strSQL.c_str());
   while (!m_pDS2->eof())
   {
-    details.m_strCast += m_pDS2->fv("actors.strActor").get_asString()+" "+g_localizeStrings.Get(20347)+" "+m_pDS2->fv("actorlinkmovie.strRole").get_asString()+'\n';
+    details.m_cast.push_back(make_pair(m_pDS2->fv("actors.strActor").get_asString(), m_pDS2->fv("actorlinkmovie.strRole").get_asString()));
     m_pDS2->next();
   }
   castTime += timeGetTime() - time; time = timeGetTime();
@@ -2497,6 +2480,7 @@
     {
       CIMDBMovie info;
       info.Load(movie);
+      DeleteMovieInfo(info.m_strFileNameAndPath);
       SetMovieInfo(info.m_strFileNameAndPath, info);
       movie = movie->NextSibling("movie");
       if (/*(current % 50) == 0 && */ progress)

Modified: trunk/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp
===================================================================
--- trunk/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp	2007-01-24 18:21:47 UTC (rev 7721)
+++ trunk/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp	2007-01-24 19:13:26 UTC (rev 7722)
@@ -1136,7 +1136,14 @@
         strRating.Format("%3.3f", aMovieRec.m_fRating);
         if (strRating=="") strRating="0.0";
         output += closeTag+openTag+"Rating:" + strRating;
-        output += closeTag+openTag+"Cast:" + aMovieRec.m_strCast;
+        CStdString cast;
+        for (CIMDBMovie::iCast it = aMovieRec.m_cast.begin(); it != aMovieRec.m_cast.end(); ++it)
+        {
+          CStdString character;
+          character.Format("%s %s %s\n", it->first.c_str(), g_localizeStrings.Get(20347).c_str(), it->second.c_str());
+          cast += character;
+        }
+        output += closeTag+openTag+"Cast:" + cast;
         item->SetVideoThumb();
         if (!item->HasThumbnail())
           thumb = "[None]";

Modified: trunk/XBMC/xbmc/lib/libPython/xbmcmodule/infotagvideo.cpp
===================================================================
--- trunk/XBMC/xbmc/lib/libPython/xbmcmodule/infotagvideo.cpp	2007-01-24 18:21:47 UTC (rev 7721)
+++ trunk/XBMC/xbmc/lib/libPython/xbmcmodule/infotagvideo.cpp	2007-01-24 19:13:26 UTC (rev 7722)
@@ -119,7 +119,14 @@
 
 	PyObject* InfoTagVideo_GetCast(InfoTagVideo *self, PyObject *args)
 	{
-		return Py_BuildValue("s", self->infoTag.m_strCast.c_str());
+    CStdString cast;
+    for (CIMDBMovie::iCast it = self->infoTag.m_cast.begin(); it != self->infoTag.m_cast.end(); ++it)
+    {
+      CStdString character;
+      character.Format("%s %s %s\n", it->first.c_str(), g_localizeStrings.Get(20347).c_str(), it->second.c_str());
+      cast += character;
+    }
+		return Py_BuildValue("s", cast.c_str());
 	}
 
 	// InfoTagVideo_GetFile

Modified: trunk/XBMC/xbmc/utils/IMDB.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/IMDB.cpp	2007-01-24 18:21:47 UTC (rev 7721)
+++ trunk/XBMC/xbmc/utils/IMDB.cpp	2007-01-24 19:13:26 UTC (rev 7722)
@@ -137,7 +137,7 @@
   movieDetails.m_iYear = 0;
   movieDetails.m_fRating = 0.0;
   movieDetails.m_strVotes = strLocNotAvail;
-  movieDetails.m_strCast = strLocNotAvail;
+  movieDetails.m_cast.clear();
   movieDetails.m_iTop250 = 0;
   movieDetails.m_strIMDBNumber = url.m_strID;
   movieDetails.m_bWatched = false;
@@ -196,7 +196,7 @@
   movieDetails.m_strPlot = strLocNotAvail;
   movieDetails.m_strPictureURL = "";
   movieDetails.m_strVotes = strLocNotAvail;
-  movieDetails.m_strCast = strLocNotAvail;
+  movieDetails.m_cast.clear();
   movieDetails.m_strMPAARating = strLocNotAvail;
   movieDetails.m_iTop250 = 0;
 
@@ -208,28 +208,11 @@
     return false;
   }
 
-  CStdString strTemp;
-  XMLUtils::GetString(details, "title", movieDetails.m_strTitle);
+  movieDetails.Load(details);
+
   g_charsetConverter.stringCharsetToUtf8(movieDetails.m_strTitle);
-  if (XMLUtils::GetString(details, "rating", strTemp)) movieDetails.m_fRating = (float)atof(strTemp);
-  if (XMLUtils::GetString(details, "year", strTemp)) movieDetails.m_iYear = atoi(strTemp);
-  if (XMLUtils::GetString(details, "top250", strTemp)) movieDetails.m_iTop250 = atoi(strTemp);
-
-  XMLUtils::GetString(details, "votes", movieDetails.m_strVotes);
-  XMLUtils::GetString(details, "cast", movieDetails.m_strCast);
-  XMLUtils::GetString(details, "outline", movieDetails.m_strPlotOutline);
   g_charsetConverter.stringCharsetToUtf8(movieDetails.m_strPlotOutline);
-  
-  XMLUtils::GetString(details, "runtime", movieDetails.m_strRuntime);
-  XMLUtils::GetString(details, "thumb", movieDetails.m_strPictureURL);
-  XMLUtils::GetString(details, "tagline", movieDetails.m_strTagLine);
-  XMLUtils::GetString(details, "genre", movieDetails.m_strGenre);
-  XMLUtils::GetString(details, "credits", movieDetails.m_strWritingCredits);
-  XMLUtils::GetString(details, "director", movieDetails.m_strDirector);
-  XMLUtils::GetString(details, "plot", movieDetails.m_strPlot);
   g_charsetConverter.stringCharsetToUtf8(movieDetails.m_strPlot);
-  
-  XMLUtils::GetString(details, "mpaa", movieDetails.m_strMPAARating);
   g_charsetConverter.stringCharsetToUtf8(movieDetails.m_strMPAARating);
   
   CHTMLUtil::RemoveTags(movieDetails.m_strPlot);
@@ -260,7 +243,7 @@
   m_strPictureURL = "";
   m_strTitle = "";
   m_strVotes = "";
-  m_strCast = "";
+  m_cast.clear();
   m_strSearchString = "";
   m_strFile = "";
   m_strPath = "";
@@ -299,12 +282,25 @@
   XMLUtils::SetString(movie, "path", m_strPath);
   XMLUtils::SetString(movie, "imdbnumber", m_strIMDBNumber);
   XMLUtils::SetString(movie, "filenameandpath", m_strFileNameAndPath);
-  // TODO: each of these should be xml-ized
-  XMLUtils::SetString(movie, "cast", m_strCast);
   XMLUtils::SetString(movie, "genre", m_strGenre);
   XMLUtils::SetString(movie, "credits", m_strWritingCredits);
   XMLUtils::SetString(movie, "director", m_strDirector);
 
+  // cast
+  for (iCast it = m_cast.begin(); it != m_cast.end(); ++it)
+  {
+    // add a <cast> tag
+    TiXmlElement cast("cast");
+    TiXmlNode *node = movie->InsertEndChild(cast);
+    TiXmlElement actor("actor");
+    TiXmlNode *actorNode = node->InsertEndChild(actor);
+    TiXmlText name(it->first);
+    actorNode->InsertEndChild(name);
+    TiXmlElement role("role");
+    TiXmlNode *roleNode = node->InsertEndChild(role);
+    TiXmlText character(it->second);
+    roleNode->InsertEndChild(character);
+  }
   return true;
 }
 
@@ -328,11 +324,40 @@
   XMLUtils::GetString(movie, "path", m_strPath);
   XMLUtils::GetString(movie, "imdbnumber", m_strIMDBNumber);
   XMLUtils::GetString(movie, "filenameandpath", m_strFileNameAndPath);
-  // TODO: each of these should be xml-ized
-  XMLUtils::GetString(movie, "cast", m_strCast);
+
   XMLUtils::GetString(movie, "genre", m_strGenre);
   XMLUtils::GetString(movie, "credits", m_strWritingCredits);
   XMLUtils::GetString(movie, "director", m_strDirector);
+
+  // cast
+  const TiXmlNode *node = movie->FirstChild("cast");
+  while (node)
+  {
+    const TiXmlNode *actor = node->FirstChild("actor");
+    if (actor && actor->FirstChild())
+    {
+      CStdString name = actor->FirstChild()->Value();
+      CStdString role;
+      const TiXmlNode *roleNode = node->FirstChild("role");
+      if (roleNode && roleNode->FirstChild())
+        role = roleNode->FirstChild()->Value();
+      m_cast.push_back(make_pair(name, role));
+    }
+    node = node->NextSibling("cast");
+  }
+  if (m_cast.empty())
+  { // old method for back-compatibility
+    CStdString cast;
+    XMLUtils::GetString(movie, "cast", cast);
+    vector<CStdString> vecCast;
+    int iNumItems = StringUtils::SplitString(cast, "\n", vecCast);
+    for (unsigned int i = 0; i < vecCast.size(); i++)
+    {
+      int iPos = vecCast[i].Find(" as ");
+      if (iPos > 0)
+        m_cast.push_back(make_pair(vecCast[i].Left(iPos), vecCast[i].Mid(iPos + 4)));
+    }
+  }
   return true;
 }
 

Modified: trunk/XBMC/xbmc/utils/IMDB.h
===================================================================
--- trunk/XBMC/xbmc/utils/IMDB.h	2007-01-24 18:21:47 UTC (rev 7721)
+++ trunk/XBMC/xbmc/utils/IMDB.h	2007-01-24 19:13:26 UTC (rev 7722)
@@ -49,7 +49,8 @@
   CStdString m_strPictureURL;
   CStdString m_strTitle;
   CStdString m_strVotes;
-  CStdString m_strCast;
+  vector< pair<CStdString, CStdString> > m_cast;
+  typedef vector< pair<CStdString, CStdString> >::iterator iCast;
   CStdString m_strSearchString;
   CStdString m_strRuntime;
   CStdString m_strFile;


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

Revision: 7736
          http://svn.sourceforge.net/xbmc/?rev=7736&view=rev
Author:   spiff_
Date:     2007-01-25 09:30:06 -0800 (Thu, 25 Jan 2007)

Log Message:
-----------
added: start of chaining to the scraper parser. add <url function="nameofhandler">theurl</url> to the details xml. handy if some details isnt available from the info returned from a search.

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp
    trunk/XBMC/xbmc/utils/IMDB.cpp
    trunk/XBMC/xbmc/utils/IMDB.h

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2007-01-25 16:40:25 UTC (rev 7735)
+++ trunk/XBMC/xbmc/Application.cpp	2007-01-25 17:30:06 UTC (rev 7736)
@@ -1173,7 +1173,6 @@
   // UserData/
   //   Database/
   //     CDDb/
-  //     IMDb/
   //   Thumbnails/
   //     Music/
   //       temp/

Modified: trunk/XBMC/xbmc/utils/IMDB.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/IMDB.cpp	2007-01-25 16:40:25 UTC (rev 7735)
+++ trunk/XBMC/xbmc/utils/IMDB.cpp	2007-01-25 17:30:06 UTC (rev 7736)
@@ -67,7 +67,7 @@
     return false;
   }
   TiXmlHandle docHandle( &doc );
-  TiXmlElement *movie = docHandle.FirstChild( "results" ).FirstChild( "movie" ).Element();
+  TiXmlElement *movie = docHandle.FirstChild( "results" ).FirstChild( "entity" ).Element();
 
   int iYear = atoi(strYear);
 
@@ -114,7 +114,7 @@
   return true;
 }
 
-bool CIMDB::InternalGetDetails(const CIMDBUrl& url, CIMDBMovie& movieDetails)
+bool CIMDB::InternalGetDetails(const CIMDBUrl& url, CIMDBMovie& movieDetails, const CStdString& strFunction)
 {
   // load our scraper xml
   if (!m_parser.Load("q:\\system\\scrapers\\video\\"+m_info.strPath))
@@ -122,26 +122,6 @@
 
   std::vector<CStdString> strHTML;
 
-  // fill in the defaults
-  CStdString strLocNotAvail = g_localizeStrings.Get(416); // Not available
-  movieDetails.m_strTitle = url.m_strTitle;
-  movieDetails.m_strDirector = strLocNotAvail;
-  movieDetails.m_strWritingCredits = strLocNotAvail;
-  movieDetails.m_strGenre = strLocNotAvail;
-  movieDetails.m_strTagLine = strLocNotAvail;
-  movieDetails.m_strPlotOutline = strLocNotAvail;
-  movieDetails.m_strPlot = strLocNotAvail;
-  movieDetails.m_strPictureURL = "";
-  movieDetails.m_strRuntime = strLocNotAvail;
-  movieDetails.m_strMPAARating = strLocNotAvail;
-  movieDetails.m_iYear = 0;
-  movieDetails.m_fRating = 0.0;
-  movieDetails.m_strVotes = strLocNotAvail;
-  movieDetails.m_cast.clear();
-  movieDetails.m_iTop250 = 0;
-  movieDetails.m_strIMDBNumber = url.m_strID;
-  movieDetails.m_bWatched = false;
-
   for (unsigned int i=0;i<url.m_strURL.size();++i)
   {
     CStdString strCurrHTML;
@@ -157,7 +137,7 @@
 
   m_parser.m_param[strHTML.size()] = url.m_strID;
 
-  CStdString strXML = m_parser.Parse("GetDetails");
+  CStdString strXML = m_parser.Parse(strFunction);
   if (strXML.IsEmpty())
   {
     CLog::Log(LOGERROR, "IMDB: Unable to parse web site");
@@ -179,6 +159,19 @@
   }
 
   bool ret = ParseDetails(doc, movieDetails);
+  TiXmlElement* pRoot = doc.RootElement();
+  TiXmlElement* url = pRoot->FirstChildElement("url");
+  while (url && url->FirstChild())
+  {
+    const char* szFunction = url->Attribute("function");
+    if (szFunction)
+    {
+      CIMDBUrl url2;
+      url2.m_strURL.push_back(url->FirstChild()->Value());
+      InternalGetDetails(url2,movieDetails,szFunction);
+    }
+    url = url->NextSiblingElement("url");
+  }
   TiXmlBase::SetCondenseWhiteSpace(true);
   
   return ret;
@@ -186,20 +179,6 @@
 
 bool CIMDB::ParseDetails(TiXmlDocument &doc, CIMDBMovie &movieDetails)
 {
-  // fill in the defaults
-  CStdString strLocNotAvail = g_localizeStrings.Get(416); // Not available
-  movieDetails.m_strDirector = strLocNotAvail;
-  movieDetails.m_strWritingCredits = strLocNotAvail;
-  movieDetails.m_strGenre = strLocNotAvail;
-  movieDetails.m_strTagLine = strLocNotAvail;
-  movieDetails.m_strPlotOutline = strLocNotAvail;
-  movieDetails.m_strPlot = strLocNotAvail;
-  movieDetails.m_strPictureURL = "";
-  movieDetails.m_strVotes = strLocNotAvail;
-  movieDetails.m_cast.clear();
-  movieDetails.m_strMPAARating = strLocNotAvail;
-  movieDetails.m_iTop250 = 0;
-
   TiXmlNode *details = doc.FirstChild( "details" );
 
   if (!details)
@@ -325,10 +304,25 @@
   XMLUtils::GetString(movie, "imdbnumber", m_strIMDBNumber);
   XMLUtils::GetString(movie, "filenameandpath", m_strFileNameAndPath);
 
-  XMLUtils::GetString(movie, "genre", m_strGenre);
-  XMLUtils::GetString(movie, "credits", m_strWritingCredits);
-  XMLUtils::GetString(movie, "director", m_strDirector);
+  CStdString strTemp;
+  XMLUtils::GetString(movie, "genre", strTemp);
+  if (m_strGenre.Equals(g_localizeStrings.Get(416)))
+    m_strGenre = strTemp;
+  else
+    m_strGenre += " / "+strTemp;
 
+  XMLUtils::GetString(movie, "credits", strTemp);
+  if (m_strWritingCredits.Equals(g_localizeStrings.Get(416)))
+    m_strWritingCredits = strTemp;
+  else
+    m_strWritingCredits += " / "+strTemp;
+
+  XMLUtils::GetString(movie, "director", strTemp);
+  if (m_strDirector.Equals(g_localizeStrings.Get(416)))
+    m_strDirector = strTemp;
+  else
+    m_strDirector += " / "+strTemp;
+
   // cast
   const TiXmlNode *node = movie->FirstChild("actor");
   while (node)
@@ -341,6 +335,7 @@
       const TiXmlNode *roleNode = node->FirstChild("role");
       if (roleNode && roleNode->FirstChild())
         role = roleNode->FirstChild()->Value();
+
       m_cast.push_back(make_pair(name, role));
     }
     node = node->NextSibling("actor");
@@ -365,6 +360,19 @@
 {
   TiXmlBase::SetCondenseWhiteSpace(false);
   TiXmlDocument doc;
+    // fill in the defaults
+  CStdString strLocNotAvail = g_localizeStrings.Get(416); // Not available
+  movieDetails.m_strDirector = strLocNotAvail;
+  movieDetails.m_strWritingCredits = strLocNotAvail;
+  movieDetails.m_strGenre = strLocNotAvail;
+  movieDetails.m_strTagLine = strLocNotAvail;
+  movieDetails.m_strPlotOutline = strLocNotAvail;
+  movieDetails.m_strPlot = strLocNotAvail;
+  movieDetails.m_strPictureURL = "";
+  movieDetails.m_strVotes = strLocNotAvail;
+  movieDetails.m_cast.clear();
+  movieDetails.m_strMPAARating = strLocNotAvail;
+  movieDetails.m_iTop250 = 0;
   if (doc.LoadFile(strXMLFile) && ParseDetails(doc, movieDetails))
   { // excellent!
     return true;
@@ -491,6 +499,26 @@
   //CLog::Log(LOGDEBUG,"CIMDB::GetDetails(%s)", url.m_strURL.c_str());
   m_url = url;
   m_movieDetails = movieDetails;
+  // fill in the defaults
+  CStdString strLocNotAvail = g_localizeStrings.Get(416); // Not available
+  movieDetails.m_strTitle = url.m_strTitle;
+  movieDetails.m_strDirector = strLocNotAvail;
+  movieDetails.m_strWritingCredits = strLocNotAvail;
+  movieDetails.m_strGenre = strLocNotAvail;
+  movieDetails.m_strTagLine = strLocNotAvail;
+  movieDetails.m_strPlotOutline = strLocNotAvail;
+  movieDetails.m_strPlot = strLocNotAvail;
+  movieDetails.m_strPictureURL = "";
+  movieDetails.m_strRuntime = strLocNotAvail;
+  movieDetails.m_strMPAARating = strLocNotAvail;
+  movieDetails.m_iYear = 0;
+  movieDetails.m_fRating = 0.0;
+  movieDetails.m_strVotes = strLocNotAvail;
+  movieDetails.m_cast.clear();
+  movieDetails.m_iTop250 = 0;
+  movieDetails.m_strIMDBNumber = url.m_strID;
+  movieDetails.m_bWatched = false;
+
   if (pProgress)
   { // threaded version
     m_state = GET_DETAILS;

Modified: trunk/XBMC/xbmc/utils/IMDB.h
===================================================================
--- trunk/XBMC/xbmc/utils/IMDB.h	2007-01-25 16:40:25 UTC (rev 7735)
+++ trunk/XBMC/xbmc/utils/IMDB.h	2007-01-25 17:30:06 UTC (rev 7736)
@@ -74,7 +74,7 @@
 
   bool LoadDLL();
   bool InternalFindMovie(const CStdString& strMovie, IMDB_MOVIELIST& movielist);
-  bool InternalGetDetails(const CIMDBUrl& url, CIMDBMovie& movieDetails);
+  bool InternalGetDetails(const CIMDBUrl& url, CIMDBMovie& movieDetails, const CStdString& strFunction="GetDetails");
   bool ParseDetails(TiXmlDocument &doc, CIMDBMovie &movieDetails);
   bool LoadXML(const CStdString& strXMLFile, CIMDBMovie &movieDetails, bool bDownload = true);
   bool Download(const CStdString &strURL, const CStdString &strFileName);


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

Revision: 7742
          http://svn.sourceforge.net/xbmc/?rev=7742&view=rev
Author:   c0diq
Date:     2007-01-25 14:34:08 -0800 (Thu, 25 Jan 2007)

Log Message:
-----------
fixed: extra trailing slash added to upnp id
fixed: Copy files from UPnP Server now works

Modified Paths:
--------------
    trunk/XBMC/xbmc/FileSystem/UPnPDirectory.cpp
    trunk/XBMC/xbmc/GUIWindowFileManager.cpp
    trunk/XBMC/xbmc/Util.cpp
    trunk/XBMC/xbmc/Util.h

Modified: trunk/XBMC/xbmc/FileSystem/UPnPDirectory.cpp
===================================================================
--- trunk/XBMC/xbmc/FileSystem/UPnPDirectory.cpp	2007-01-25 21:26:46 UTC (rev 7741)
+++ trunk/XBMC/xbmc/FileSystem/UPnPDirectory.cpp	2007-01-25 22:34:08 UTC (rev 7742)
@@ -76,14 +76,8 @@
     // start client if it hasn't been done yet
     upnp->StartClient();
                      
-
     // We accept upnp://devuuid[/item_id]
-    // make sure we have a slash to look for at the end
-    CStdString strRoot = strPath;
-    if (!CUtil::HasSlashAtEnd(strRoot)) strRoot += "/";
-
     NPT_String path = strPath.c_str();
-
     if (path.Left(7).Compare("upnp://", true) != 0) {
         return false;
     } 
@@ -112,11 +106,9 @@
     } else {
         // look for nextslash 
         int next_slash = path.Find('/', 7);
-        if (next_slash == -1) 
-            return false;
 
-        NPT_String uuid = path.SubString(7, next_slash-7);
-        NPT_String object_id = path.SubString(next_slash+1, path.GetLength()-next_slash-2);
+        NPT_String uuid = (next_slash==-1)?path.SubString(7):path.SubString(7, next_slash-7);
+        NPT_String object_id = (next_slash==-1)?"":path.SubString(next_slash+1);
 
         // look for device 
         PLT_DeviceDataReference* device;
@@ -196,8 +188,6 @@
             // if it's a container, format a string as upnp://uuid/object_id/ 
             if (pItem->m_bIsFolder) {
                 pItem->m_strPath = (const char*) NPT_String("upnp://") + uuid + "/" + (*entry)->m_ObjectID;
-                if (!CUtil::HasSlashAtEnd(pItem->m_strPath)) pItem->m_strPath += '/';
-
             } else {
                 if ((*entry)->m_Resources.GetItemCount()) {
                     // if it's an item, path is the first url to the item

Modified: trunk/XBMC/xbmc/GUIWindowFileManager.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowFileManager.cpp	2007-01-25 21:26:46 UTC (rev 7741)
+++ trunk/XBMC/xbmc/GUIWindowFileManager.cpp	2007-01-25 22:34:08 UTC (rev 7742)
@@ -807,13 +807,35 @@
     if (pItem->IsSelected())
     {
       CStdString strCorrectedPath = pItem->m_strPath;
-      if (CUtil::HasSlashAtEnd(strCorrectedPath))
+      // remove trailing slash only if it's not a upnp path (upnp folder)
+      if (!CUtil::IsUPnP(strCorrectedPath) && CUtil::HasSlashAtEnd(strCorrectedPath))
       {
         strCorrectedPath = strCorrectedPath.Left(strCorrectedPath.size() - 1);
       }
       CStdString strFileName = CUtil::GetFileName(strCorrectedPath);
       CStdString strnewDestFile;
-      CUtil::AddFileToFolder(strDestFile, strFileName.c_str(), strnewDestFile);
+      
+      // special case for upnp
+      if (CUtil::IsUPnP(items.m_strPath))
+      {
+        // get filename from label instead of path
+        strFileName = CUtil::GetFileName(pItem->GetLabel());
+        // FIXME: for now we only work well if the url has the extension
+        // we should map the content type to the extension otherwise
+        CStdString strExtension = CUtil::GetExtension(pItem->m_strPath);
+        if (CUtil::GetExtension(strFileName).length() == 0 && strExtension.length() > 0) 
+        {
+          strFileName += strExtension;
+        }
+        CUtil::AddFileToFolder(strDestFile, strFileName.c_str(), strnewDestFile);
+        // make sure the path is qualified
+        CUtil::GetFatXQualifiedPath(strnewDestFile);
+      } 
+      else 
+      {
+        CUtil::AddFileToFolder(strDestFile, strFileName.c_str(), strnewDestFile);
+      }
+
       if (pItem->m_bIsFolder)
       {
         // create folder on dest. drive

Modified: trunk/XBMC/xbmc/Util.cpp
===================================================================
--- trunk/XBMC/xbmc/Util.cpp	2007-01-25 21:26:46 UTC (rev 7741)
+++ trunk/XBMC/xbmc/Util.cpp	2007-01-25 22:34:08 UTC (rev 7742)
@@ -1458,6 +1458,11 @@
   return strFile.Left(5).Equals("daap:");
 }
 
+bool CUtil::IsUPnP(const CStdString& strFile)
+{
+    return strFile.Left(5).Equals("upnp:");
+}
+
 bool CUtil::IsMemCard(const CStdString& strFile)
 {
   return strFile.Left(3).Equals("mem");

Modified: trunk/XBMC/xbmc/Util.h
===================================================================
--- trunk/XBMC/xbmc/Util.h	2007-01-25 21:26:46 UTC (rev 7741)
+++ trunk/XBMC/xbmc/Util.h	2007-01-25 22:34:08 UTC (rev 7742)
@@ -279,6 +279,7 @@
   static bool IsISO9660(const CStdString& strFile);
   static bool IsSmb(const CStdString& strFile);
   static bool IsDAAP(const CStdString& strFile);
+  static bool IsUPnP(const CStdString& strFile);
   static void ConvertPathToUrl( const CStdString& strPath, const CStdString& strProtocol, CStdString& strOutUrl );
   static void GetDVDDriveIcon( const CStdString& strPath, CStdString& strIcon );
   static void RemoveTempFiles();


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

Revision: 7744
          http://svn.sourceforge.net/xbmc/?rev=7744&view=rev
Author:   c0diq
Date:     2007-01-25 15:15:56 -0800 (Thu, 25 Jan 2007)

Log Message:
-----------
fixed: couldn't go navigate back up while browsing upnp server in File manager

Modified Paths:
--------------
    trunk/XBMC/xbmc/FileSystem/UPnPDirectory.cpp
    trunk/XBMC/xbmc/GUIWindowFileManager.cpp

Modified: trunk/XBMC/xbmc/FileSystem/UPnPDirectory.cpp
===================================================================
--- trunk/XBMC/xbmc/FileSystem/UPnPDirectory.cpp	2007-01-25 22:51:46 UTC (rev 7743)
+++ trunk/XBMC/xbmc/FileSystem/UPnPDirectory.cpp	2007-01-25 23:15:56 UTC (rev 7744)
@@ -109,6 +109,11 @@
 
         NPT_String uuid = (next_slash==-1)?path.SubString(7):path.SubString(7, next_slash-7);
         NPT_String object_id = (next_slash==-1)?"":path.SubString(next_slash+1);
+        if (object_id.GetLength()) {
+            CStdString tmp = object_id;
+            CUtil::UrlDecode(tmp);
+            object_id = tmp;
+        }
 
         // look for device 
         PLT_DeviceDataReference* device;
@@ -187,7 +192,9 @@
 
             // if it's a container, format a string as upnp://uuid/object_id/ 
             if (pItem->m_bIsFolder) {
-                pItem->m_strPath = (const char*) NPT_String("upnp://") + uuid + "/" + (*entry)->m_ObjectID;
+                CStdString object_id = (*entry)->m_ObjectID;
+                CUtil::URLEncode(object_id);
+                pItem->m_strPath = (const char*) NPT_String("upnp://") + uuid + "/" + object_id.c_str();
             } else {
                 if ((*entry)->m_Resources.GetItemCount()) {
                     // if it's an item, path is the first url to the item

Modified: trunk/XBMC/xbmc/GUIWindowFileManager.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowFileManager.cpp	2007-01-25 22:51:46 UTC (rev 7743)
+++ trunk/XBMC/xbmc/GUIWindowFileManager.cpp	2007-01-25 23:15:56 UTC (rev 7744)
@@ -1091,7 +1091,7 @@
     {
       // Other items in virual directory
       CStdString strPath = pItem->m_strPath;
-      while (CUtil::HasSlashAtEnd(strPath))
+      while (!CUtil::IsUPnP(strPath) && CUtil::HasSlashAtEnd(strPath))
         strPath.Delete(strPath.size() - 1);
 
       strHistoryString = pItem->GetLabel() + strPath;
@@ -1102,7 +1102,7 @@
     // Normal directory items
     strHistoryString = pItem->m_strPath;
 
-    if (CUtil::HasSlashAtEnd(strHistoryString))
+    if (!CUtil::IsUPnP(strHistoryString) && CUtil::HasSlashAtEnd(strHistoryString))
       strHistoryString.Delete(strHistoryString.size() - 1);
   }
 }


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

Revision: 7745
          http://svn.sourceforge.net/xbmc/?rev=7745&view=rev
Author:   jmarshallnz
Date:     2007-01-25 19:09:56 -0800 (Thu, 25 Jan 2007)

Log Message:
-----------
changed: movie table layout in the db for much faster lookups.
fixed:   blank genre/director/writing credits entry on import.

Modified Paths:
--------------
    trunk/XBMC/xbmc/VideoDatabase.cpp
    trunk/XBMC/xbmc/VideoDatabase.h
    trunk/XBMC/xbmc/utils/IMDB.cpp

Modified: trunk/XBMC/xbmc/VideoDatabase.cpp
===================================================================
--- trunk/XBMC/xbmc/VideoDatabase.cpp	2007-01-25 23:15:56 UTC (rev 7744)
+++ trunk/XBMC/xbmc/VideoDatabase.cpp	2007-01-26 03:09:56 UTC (rev 7745)
@@ -34,7 +34,7 @@
 
 #define VIDEO_DATABASE_VERSION 3
 #define VIDEO_DATABASE_OLD_VERSION 3.f
-#define VIDEO_DATABASE_NAME "MyVideos32.db"
+#define VIDEO_DATABASE_NAME "MyVideos33.db"
 
 CBookmark::CBookmark()
 {
@@ -96,8 +96,16 @@
     m_pDS->exec("CREATE UNIQUE INDEX ix_genrelinkmovie_2 ON genrelinkmovie ( idMovie, idGenre)\n");
 
     CLog::Log(LOGINFO, "create movie table");
-    m_pDS->exec("CREATE TABLE movie ( idMovie integer, idType integer, strValue text)\n");
-    m_pDS->exec("CREATE UNIQUE INDEX ix_movie ON movie ( idMovie, idType )\n");
+    CStdString columns = "CREATE TABLE movie ( idMovie integer";
+    for (int i = 0; i < VIDEODB_MAX_COLUMNS; i++)
+    {
+      CStdString column;
+      column.Format(",c%02d text", i);
+      columns += column;
+    }
+    columns += ")";
+    m_pDS->exec(columns.c_str());
+    m_pDS->exec("CREATE UNIQUE INDEX ix_movie ON movie ( idMovie )\n");
 
     CLog::Log(LOGINFO, "create actorlinkmovie table");
     m_pDS->exec("CREATE TABLE actorlinkmovie ( idActor integer, idMovie integer, strRole text)\n");
@@ -389,10 +397,10 @@
       lFileId = AddFile(strFilenameAndPath);
     if (lMovieId < 0)
     {
-      CStdString strSQL=FormatSQL("insert into movie (idMovie,idType,strValue) values (0,%u,'')",VIDEODB_ID_TITLE);
+      CStdString strSQL=FormatSQL("insert into movie (idMovie) values (0)");
       m_pDS->exec(strSQL.c_str());
       lMovieId = (long)sqlite3_last_insert_rowid(m_pDB->getHandle());
-      strSQL=FormatSQL("update movie set idMovie=%i where idMovie=0 and idType=%i",lMovieId,VIDEODB_ID_TITLE);
+      strSQL=FormatSQL("update movie set idMovie=%i where idMovie=0",lMovieId);
       m_pDS->exec(strSQL.c_str());
       
       // update file info to reflect it points to this movie
@@ -568,7 +576,7 @@
     long lMovieId = GetMovieInfo(strFilenameAndPath);
     if ( lMovieId < 0) return false;
 
-    CStdString strSQL=FormatSQL("select idType from movie where movie.idmovie=%i", lMovieId);
+    CStdString strSQL=FormatSQL("select idMovie from movie where movie.idmovie=%i", lMovieId);
     m_pDS->query(strSQL.c_str());
     if (m_pDS->num_rows() == 0)
     {
@@ -607,7 +615,25 @@
     strSQL=FormatSQL("delete from directorlinkmovie where idmovie=%i", lMovieId);
     m_pDS->exec(strSQL.c_str());
 
-    strSQL=FormatSQL("delete from movie where idmovie=%i and NOT (idType=%u)", lMovieId, VIDEODB_ID_TITLE);
+    // remove all info other than the id
+    // we do this due to the way we have the link between the file + movie tables.
+
+    // IMO it may be better to link from the movie->file table instead of vice-versa
+    // (ie have movie.idFile and movie.idPath instead of file.idMovie)
+    // then when we remove from the movie table, we don't care if it's still in the file table
+    // Alternatively, we could remove from the file table as well (I don't see any point in keeping it there, unless
+    // we're planning on having stuff linked to the file table for settings or whatever).  In fact,
+    // the file table is pretty useless as is, except for the link to the path table.  Shouldn't the movie
+    // table be the base, as movie->file is a 1:1 mapping?  In this case, there's no reason why the filename can be
+    // directly in the movie table, and idPath in the movie table as well.
+    strSQL = "update movie set ";
+    for (int iType = VIDEODB_ID_MIN + 1; iType < VIDEODB_ID_MAX; iType++)
+    {
+      CStdString column;
+      column.Format("c%02d=NULL,", iType);
+      strSQL += column;
+    }
+    strSQL = strSQL.Mid(0, strSQL.size() - 1) + FormatSQL(" where idMovie=%i", lMovieId);
     m_pDS->exec(strSQL.c_str());
   }
   catch (...)
@@ -625,30 +651,13 @@
     if (NULL == m_pDB.get()) return ;
     if (NULL == m_pDS.get()) return ;
 
-    CStdString strSQL=FormatSQL("select movie.idMovie from actorlinkmovie,actors,movie where actors.idActor=actorlinkmovie.idActor and actorlinkmovie.idmovie=movie.idmovie and movie.idType=1 and actors.stractor='%s'", strActor.c_str());
+    CStdString strSQL=FormatSQL("select movie.*,files.strFileName,path.strPath from movie join files on files.idMovie=movie.idMovie join path on files.idPath=path.idPath join actorlinkmovie on actorlinkmovie.idmovie=movie.idmovie join actors on actors.idActor=actorlinkmovie.idActor where actors.stractor='%s'", strActor.c_str());
     m_pDS->query( strSQL.c_str() );
 
     long lLastPathId = -1;
     while (!m_pDS->eof())
     {
-      // if the current path is the same as the last path tested and unlocked,
-      // just add the movie without retesting
-      //long lPathId = m_pDS->fv("path.idPath").get_asLong(); // TODO
-      long lMovieId = m_pDS->fv("movie.idMovie").get_asLong();
-      movies.push_back(GetDetailsForMovie(lMovieId));
-      /*      if (lPathId == lLastPathId)
-        movies.push_back(GetDetailsForMovie());
-      // we have a new path so test it.
-      else
-      {
-        CStdString strPath = m_pDS->fv("path.strPath").get_asString();
-        if (g_passwordManager.IsDatabasePathUnlocked(strPath, g_settings.m_vecMyVideoShares))
-        {
-          // the path is unlocked so set last path to current path
-          lLastPathId = lPathId;
-          movies.push_back(GetDetailsFromDataset(m_pDS));
-        }
-      }*/
+      movies.push_back(GetDetailsForMovie(m_pDS));
       m_pDS->next();
     }
     m_pDS->close();
@@ -665,12 +674,15 @@
 {
   try
   {
+    // TODO: Optimize this - no need for all the queries!
     if (lMovieId < 0)
       lMovieId = GetMovieInfo(strFilenameAndPath);
     if (lMovieId < 0) return ;
 
-    details = GetDetailsForMovie(lMovieId);
-    m_pDS->close();
+    CStdString sql = FormatSQL("select movie.*,files.strFileName,path.strPath from movie join files on files.idMovie=movie.idMovie join path on files.idPath=path.idPath where movie.idMovie=%i", lMovieId);
+    if (!m_pDS->query(sql.c_str()))
+      return;
+    details = GetDetailsForMovie(m_pDS, true);
   }
   catch (...)
   {
@@ -752,10 +764,17 @@
     {
       AddDirectorToMovie(lMovieId, vecDirectors[i]);
     }
-    
-    CStdString strValue;
+
+    // delete the current row for this movie
+    CStdString sql = FormatSQL("delete from movie where movie.idMovie=%i", lMovieId);
+    m_pDS->exec(sql.c_str());
+
+    // and insert the new row
+    CStdString sqlColumns = "insert into movie (idMovie";
+    CStdString strValues = FormatSQL(") values (%i", lMovieId);
     for (int iType=VIDEODB_ID_MIN+1;iType<VIDEODB_ID_MAX;++iType)
     {
+      CStdString strValue;
       switch (DbMovieOffsets[iType].type)
       {
       case VIDEODB_TYPE_STRING:
@@ -771,16 +790,11 @@
         strValue.Format("%f",*(float*)(((char*)&details)+DbMovieOffsets[iType].offset));
         break;
       }
-      CStdString strSQL;
-      if (iType == VIDEODB_ID_TITLE)
-      {
-        strSQL=FormatSQL("update movie set strValue='%s' where idMovie=%u and idType=%u",strValue.c_str(),lMovieId,iType);
-      }
-      else
-        strSQL=FormatSQL("insert into movie (idMovie,idType,strValue) values (%u,%u,'%s')",lMovieId,iType,strValue.c_str());
-
-      m_pDS->exec(strSQL.c_str());
+      sqlColumns += FormatSQL(",c%02d", iType);
+      strValues += FormatSQL(",'%s'", strValue.c_str());
     }
+    CStdString strSQL = sqlColumns + strValues + ")";
+    m_pDS->exec(strSQL.c_str());
     CommitTransaction();
   }
   catch (...)
@@ -1055,85 +1069,51 @@
 }
 
 DWORD movieTime = 0;
-DWORD genreTime = 0;
-DWORD directorTime = 0;
 DWORD castTime = 0;
 
-CIMDBMovie CVideoDatabase::GetDetailsForMovie(long lMovieId)
+CIMDBMovie CVideoDatabase::GetDetailsForMovie(auto_ptr<Dataset> &pDS, bool needsCast /* = false */)
 {
   CIMDBMovie details;
 
   DWORD time = timeGetTime();
-  CStdString strSQL=FormatSQL("select * from movie where idMovie=%u",lMovieId);
-  m_pDS2->query(strSQL.c_str());
-  if (m_pDS2->eof()) 
-    return details;
+  long lMovieId = pDS->fv(0).get_asLong();
 
-  while (!m_pDS2->eof())
+  for (int iType = VIDEODB_ID_MIN + 1; iType < VIDEODB_ID_MAX; iType++)
   {
-    int iType = m_pDS2->fv(1).get_asInteger();
     switch (DbMovieOffsets[iType].type)
     {
     case VIDEODB_TYPE_STRING:
-      *(CStdString*)(((char*)&details)+DbMovieOffsets[iType].offset) = m_pDS2->fv(2).get_asString();
+      *(CStdString*)(((char*)&details)+DbMovieOffsets[iType].offset) = pDS->fv(iType+1).get_asString();
       break;
     case VIDEODB_TYPE_INT:
-      *(int*)(((char*)&details)+DbMovieOffsets[iType].offset) = m_pDS2->fv(2).get_asInteger();
+      *(int*)(((char*)&details)+DbMovieOffsets[iType].offset) = pDS->fv(iType+1).get_asInteger();
       break;
     case VIDEODB_TYPE_BOOL:
-      *(bool*)(((char*)&details)+DbMovieOffsets[iType].offset) = m_pDS2->fv(2).get_asBool();
+      *(bool*)(((char*)&details)+DbMovieOffsets[iType].offset) = pDS->fv(iType+1).get_asBool();
       break;
     case VIDEODB_TYPE_FLOAT:
-      *(float*)(((char*)&details)+DbMovieOffsets[iType].offset) = m_pDS2->fv(2).get_asFloat();
+      *(float*)(((char*)&details)+DbMovieOffsets[iType].offset) = pDS->fv(iType+1).get_asFloat();
       break;
     }
-    m_pDS2->next();
   }
+  details.m_strSearchString.Format("%i", lMovieId);
+
+  details.m_strPath = m_pDS->fv(VIDEODB_DETAILS_PATH).get_asString();
+  CUtil::AddFileToFolder(details.m_strPath, m_pDS->fv(VIDEODB_DETAILS_FILE).get_asString(),details.m_strFileNameAndPath);
   movieTime += timeGetTime() - time; time = timeGetTime();
 
-  // create cast string
-  strSQL = FormatSQL("select actors.strActor,actorlinkmovie.strRole from actorlinkmovie,actors where actorlinkmovie.idMovie=%u and actorlinkmovie.idActor = actors.idActor",lMovieId);
-  m_pDS2->query(strSQL.c_str());
-  while (!m_pDS2->eof())
+  if (needsCast)
   {
-    details.m_cast.push_back(make_pair(m_pDS2->fv("actors.strActor").get_asString(), m_pDS2->fv("actorlinkmovie.strRole").get_asString()));
-    m_pDS2->next();
+    // create cast string
+    CStdString strSQL = FormatSQL("select actors.strActor,actorlinkmovie.strRole from actorlinkmovie,actors where actorlinkmovie.idMovie=%u and actorlinkmovie.idActor = actors.idActor",lMovieId);
+    m_pDS2->query(strSQL.c_str());
+    while (!m_pDS2->eof())
+    {
+      details.m_cast.push_back(make_pair(m_pDS2->fv("actors.strActor").get_asString(), m_pDS2->fv("actorlinkmovie.strRole").get_asString()));
+      m_pDS2->next();
+    }
+    castTime += timeGetTime() - time; time = timeGetTime();
   }
-  castTime += timeGetTime() - time; time = timeGetTime();
-
-  // create genre string
-  strSQL = FormatSQL("select genre.strGenre from genrelinkmovie,genre where genrelinkmovie.idMovie=%u and genrelinkmovie.idGenre = genre.idGenre",lMovieId);
-  m_pDS2->query(strSQL.c_str());
-  while (!m_pDS2->eof())
-  {
-    details.m_strGenre += m_pDS2->fv("genre.strGenre").get_asString()+" / ";
-    m_pDS2->next();
-  }
-  details.m_strGenre = details.m_strGenre.Mid(0,details.m_strGenre.size()-3);
-  genreTime += timeGetTime() - time; time = timeGetTime();
-
-  // create directors string
-  strSQL = FormatSQL("select actors.strActor from directorlinkmovie,actors where directorlinkmovie.idMovie=%u and directorlinkmovie.idDirector = actors.idActor",lMovieId);
-  m_pDS2->query(strSQL.c_str());
-  while (!m_pDS2->eof())
-  {
-    details.m_strDirector += m_pDS2->fv("actors.strActor").get_asString()+" / ";
-    m_pDS2->next();
-  }
-  details.m_strDirector = details.m_strDirector.Mid(0,details.m_strDirector.size()-3);
-  directorTime += timeGetTime() - time; time = timeGetTime();
-
-  // file and path (only draw 2 items from the db, so we can lookup based on offset)
-  strSQL=FormatSQL("select files.strFileName,path.strPath from files join path on files.idPath=path.idPath where files.idMovie=%u",lMovieId);
-  m_pDS2->query(strSQL.c_str());
-  if (!m_pDS2->eof())
-  {
-    details.m_strPath = m_pDS2->fv(1).get_asString();
-    CUtil::AddFileToFolder(details.m_strPath, m_pDS2->fv(0).get_asString(),details.m_strFileNameAndPath);
-  }
-
-  details.m_strSearchString.Format("%i", lMovieId);
-
   return details;
 }
 
@@ -1437,7 +1417,7 @@
     if (NULL == m_pDS.get()) return ;
     CLog::Log(LOGINFO, "Updating Movie:%i as Watched", lMovieId);
     CStdString strSQL;
-    strSQL.Format("UPDATE movie set strValue='true' WHERE idMovie=%u and idType=%i", lMovieId, VIDEODB_ID_WATCHED);
+    strSQL.Format("UPDATE movie set c%02d='true' WHERE idMovie=%u", VIDEODB_ID_WATCHED, lMovieId);
     m_pDS->exec(strSQL.c_str());
   }
   catch (...)
@@ -1454,7 +1434,7 @@
     if (NULL == m_pDS.get()) return ;
     CLog::Log(LOGINFO, "Updating Movie:%i as UnWatched", lMovieId);
     CStdString strSQL;
-    strSQL.Format("UPDATE movie set strValue='false' WHERE idMovie=%i and idType=%i", lMovieId, VIDEODB_ID_WATCHED );
+    strSQL.Format("UPDATE movie set c%02d='false' WHERE idMovie=%i", VIDEODB_ID_WATCHED, lMovieId );
     m_pDS->exec(strSQL.c_str());
   }
   catch (...)
@@ -1471,7 +1451,7 @@
     if (NULL == m_pDS.get()) return ;
     CLog::Log(LOGINFO, "Changing Movie:id:%i New Title:%s", lMovieId, strNewMovieTitle.c_str());
     CStdString strSQL;
-    strSQL.Format("UPDATE movie SET strValue='%s' WHERE idMovie=%i and idType=%i", strNewMovieTitle.c_str(), lMovieId, VIDEODB_ID_TITLE );
+    strSQL.Format("UPDATE movie SET c%02d='%s' WHERE idMovie=%i", VIDEODB_ID_TITLE, strNewMovieTitle.c_str(), lMovieId );
     m_pDS->exec(strSQL.c_str());
   }
   catch (...)
@@ -1504,15 +1484,15 @@
     // get primary genres for movies
     CStdString strSQL;
     if (g_settings.m_vecProfiles[0].getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
-      strSQL=FormatSQL("select genre.idgenre,genre.strgenre,path.strPath from genre,genrelinkmovie,movie,path,files where genre.idGenre=genrelinkMovie.idGenre and genrelinkMovie.idMovie = movie.idMovie and movie.idType=%i and files.idMovie=movie.idMovie and path.idPath = files.idPath",VIDEODB_ID_WATCHED);
+      strSQL=FormatSQL("select genre.idgenre,genre.strgenre,path.strPath from genre,genrelinkmovie,movie,path,files where genre.idGenre=genrelinkMovie.idGenre and genrelinkMovie.idMovie = movie.idMovie and files.idMovie=movie.idMovie and path.idPath = files.idPath");
     else
-      strSQL=FormatSQL("select genre.idgenre,genre.strgenre from genre,genrelinkmovie,movie where genre.idGenre=genrelinkMovie.idGenre and genrelinkMovie.idMovie = movie.idMovie and movie.idType=%i",VIDEODB_ID_WATCHED);
+      strSQL=FormatSQL("select genre.idgenre,genre.strgenre from genre,genrelinkmovie,movie where genre.idGenre=genrelinkMovie.idGenre and genrelinkMovie.idMovie = movie.idMovie");
 
     if (g_stSettings.m_iMyVideoWatchMode == 1)
-      strSQL += FormatSQL(" and NOT (movie.strValue='true')");
+      strSQL += FormatSQL(" and movie.c%02d='false'", VIDEODB_ID_WATCHED);
 
     if (g_stSettings.m_iMyVideoWatchMode == 2)
-      strSQL += FormatSQL(" and movie.strValue='true'");
+      strSQL += FormatSQL(" and movie.c%02d='true'", VIDEODB_ID_WATCHED);
 
     // run query
     CLog::Log(LOGDEBUG, "CVideoDatabase::GetGenresNav() query: %s", strSQL.c_str());
@@ -1581,15 +1561,15 @@
     // get primary genres for movies
     CStdString strSQL;
     if (g_settings.m_vecProfiles[0].getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
-      strSQL=FormatSQL("select actors.idActor,actors.strActor,path.strPath from actors,directorlinkmovie,movie,path,files where actor.idActor=directorlinkMovie.idDirector and directorlinkMovie.idMovie = movie.idMovie and movie.idType=%i and files.idMovie=movie.idMovie and path.idPath = files.idPath",VIDEODB_ID_WATCHED);
+      strSQL=FormatSQL("select actors.idActor,actors.strActor,path.strPath from actors,directorlinkmovie,movie,path,files where actor.idActor=directorlinkMovie.idDirector and directorlinkMovie.idMovie = movie.idMovie and files.idMovie=movie.idMovie and path.idPath = files.idPath");
     else
-      strSQL=FormatSQL("select actors.idActor,actors.strActor from actors,directorlinkmovie,movie where actors.idActor=directorlinkMovie.idDirector and directorlinkMovie.idMovie = movie.idMovie and movie.idType=%i",VIDEODB_ID_WATCHED);
+      strSQL=FormatSQL("select actors.idActor,actors.strActor from actors,directorlinkmovie,movie where actors.idActor=directorlinkMovie.idDirector and directorlinkMovie.idMovie = movie.idMovie");
 
     if (g_stSettings.m_iMyVideoWatchMode == 1)
-      strSQL += FormatSQL(" and NOT (movie.strValue='true')");
+      strSQL += FormatSQL(" and movie.c%02d='true')", VIDEODB_ID_WATCHED);
 
     if (g_stSettings.m_iMyVideoWatchMode == 2)
-      strSQL += FormatSQL(" and movie.strValue='true'");
+      strSQL += FormatSQL(" and movie.c%02d='true'", VIDEODB_ID_WATCHED);
 
     // run query
     CLog::Log(LOGDEBUG, "CVideoDatabase::GetDirectorsNav() query: %s", strSQL.c_str());
@@ -1657,15 +1637,15 @@
 
     CStdString strSQL;
     if (g_settings.m_vecProfiles[0].getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
-      strSQL=FormatSQL("select actors.idactor,actors.strActor,path.strPath from actorlinkmovie,actors,movie,files,path where actors.idActor=actorlinkmovie.idActor and actorlinkmovie.idmovie=movie.idmovie and files.idMovie = movie.idMovie and files.idPath = path.idPath and movie.idType=%i",VIDEODB_ID_WATCHED);
+      strSQL=FormatSQL("select actors.idactor,actors.strActor,path.strPath from actorlinkmovie,actors,movie,files,path where actors.idActor=actorlinkmovie.idActor and actorlinkmovie.idmovie=movie.idmovie and files.idMovie = movie.idMovie and files.idPath = path.idPath");
     else
-      strSQL=FormatSQL("select actors.idactor,actors.strActor from actorlinkmovie,actors,movie where actors.idActor=actorlinkmovie.idActor and actorlinkmovie.idmovie=movie.idmovie and movie.idType=%i",VIDEODB_ID_WATCHED);
+      strSQL=FormatSQL("select actors.idactor,actors.strActor from actorlinkmovie,actors,movie where actors.idActor=actorlinkmovie.idActor and actorlinkmovie.idmovie=movie.idmovie");
     
     if (g_stSettings.m_iMyVideoWatchMode == 1)
-      strSQL += FormatSQL(" and NOT (movie.strValue='true')");
+      strSQL += FormatSQL(" and movie.c%02d='false'", VIDEODB_ID_WATCHED);
 
     if (g_stSettings.m_iMyVideoWatchMode == 2)
-      strSQL += FormatSQL(" and movie.strValue='true'");
+      strSQL += FormatSQL(" and movie.c%02d='true'", VIDEODB_ID_WATCHED);
 
     if (!m_pDS->query(strSQL.c_str())) return false;
     int iRowsFound = m_pDS->num_rows();
@@ -1734,16 +1714,16 @@
     // get primary genres for movies
     CStdString strSQL;
     if (g_settings.m_vecProfiles[0].getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
-      strSQL = FormatSQL("select movie.idmovie,path.strPath from movie,files,path where idType=%i and movie.idMovie = files.idMovie and files.idPath = path.idPath",VIDEODB_ID_WATCHED);
+      strSQL = FormatSQL("select movie.idmovie,path.strPath from movie,files,path where movie.idMovie = files.idMovie and files.idPath = path.idPath");
     else    
-      strSQL = FormatSQL("select movie.idmovie from movie where idType=%i",VIDEODB_ID_WATCHED);
+      strSQL = FormatSQL("select movie.idmovie from movie");
     CStdString addParam;
 
     if (g_stSettings.m_iMyVideoWatchMode == 1)
-      strSQL += FormatSQL(" and NOT (strValue='true')");
+      strSQL += FormatSQL(" and movie.c%02d='false'", VIDEODB_ID_WATCHED);
 
     if (g_stSettings.m_iMyVideoWatchMode == 2)
-      strSQL += FormatSQL(" and strValue='true'");
+      strSQL += FormatSQL(" and movie.c%02d='true'", VIDEODB_ID_WATCHED);
 
     // run query
     CLog::Log(LOGDEBUG, "CVideoDatabase::GetGenresNav() query: %s", strSQL.c_str());
@@ -1760,12 +1740,12 @@
     long lLastPathId = -1;
     while (!m_pDS->eof())
     {
-      strSQL=FormatSQL("select movie.strValue from movie where idMovie=%u and idType=%i",m_pDS->fv("movie.idMovie").get_asLong(),VIDEODB_ID_YEAR);
+      strSQL=FormatSQL("select movie.c%02d from movie where idMovie=%u",VIDEODB_ID_YEAR,m_pDS->fv("movie.idMovie").get_asLong());
       m_pDS2->query(strSQL.c_str());
       if (m_pDS2->eof())
         continue;
 
-      CStdString strYear = m_pDS2->fv("movie.strValue").get_asString();
+      CStdString strYear = m_pDS2->fv(0).get_asString();
       long lYear = atol(strYear.c_str());
       it = mapYears.find(lYear);
       if (it == mapYears.end())
@@ -1810,35 +1790,32 @@
   try
   {
     DWORD time = timeGetTime();
-	movieTime = 0;
-	castTime = 0;
-	directorTime = 0;
-	genreTime = 0;
+	  movieTime = 0;
+	  castTime = 0;
 	
     if (NULL == m_pDB.get()) return false;
     if (NULL == m_pDS.get()) return false;
-    //CStdString strSQL="select * from movie,movieinfo,actors,path,files where movieinfo.idmovie=movie.idmovie and movieinfo.iddirector=actors.idActor and movie.idpath=path.idpath and files.idmovie = movie.idmovie";
 
-    CStdString strSQL = FormatSQL("select movie.idmovie from movie where idType=%i",VIDEODB_ID_TITLE);
+    CStdString strSQL = "select movie.*,files.strFileName,path.strPath from movie join files on files.idMovie=movie.idMovie join path on files.idPath=path.idPath";
 
     if (idGenre != -1)
     {
-      strSQL=FormatSQL("select movie.idmovie from movie, genrelinkmovie where genrelinkmovie.idGenre=%u and genrelinkmovie.idmovie=movie.idmovie and movie.idType=%i", idGenre, VIDEODB_ID_TITLE);
+      strSQL=FormatSQL("select movie.*,files.strFileName,path.strPath from movie join files on files.idMovie=movie.idMovie join path on files.idPath=path.idPath join genrelinkmovie on genrelinkmovie.idmovie=movie.idmovie where genrelinkmovie.idGenre=%u", idGenre);
     }
 
     if (idDirector != -1)
     {
-      strSQL=FormatSQL("select movie.idmovie from movie, directorlinkmovie where directorlinkmovie.idDirector=%u and directorlinkmovie.idmovie=movie.idmovie and movie.idType=%i", idDirector, VIDEODB_ID_TITLE);
+      strSQL=FormatSQL("select movie.*,files.strFileName,path.strPath from movie join files on files.idMovie=movie.idMovie join path on files.idPath=path.idPath join directorlinkmovie on directorlinkmovie.idmovie=movie.idmovie where directorlinkmovie.idDirector=%u", idDirector);
     }
 
     if (idYear !=-1)
     {
-      strSQL=FormatSQL("select movie.idmovie from movie where idType=%i and strValue='%i'",VIDEODB_ID_YEAR,idYear);
+      strSQL=FormatSQL("select movie.*,files.strFileName,path.strPath from movie join files on files.idMovie=movie.idMovie join path on files.idPath=path.idPath where c%02d='%i'",VIDEODB_ID_YEAR,idYear);
     }
 
     if (idActor != -1)
     {
-      strSQL=FormatSQL("select movie.idmovie from movie, actorlinkmovie, actors where actorlinkmovie.idActor=actors.idActor and movie.idType=%i and actorlinkmovie.idMovie=movie.idMovie and actors.idActor=%u",VIDEODB_ID_TITLE,idActor);
+      strSQL=FormatSQL("select movie.*,files.strFileName,path.strPath from movie join files on files.idMovie=movie.idMovie join path on files.idPath=path.idPath join actorlinkmovie on actorlinkmovie.idmovie=movie.idmovie join actors on actors.idActor=actorlinkmovie.idActor where actors.idActor=%u",idActor);
     }
 
     // get all songs out of the database in fixed size chunks
@@ -1879,13 +1856,13 @@
           {
             long lMovieId = m_pDS->fv("movie.idMovie").get_asLong();
             
-            CIMDBMovie movie = GetDetailsForMovie(lMovieId);
+            CIMDBMovie movie = GetDetailsForMovie(m_pDS);
             movies.push_back(movie);
             iSONGS++;
             m_pDS->next();
           }
           CLog::DebugLog("Time to retrieve movies from dataset = %d", timeGetTime() - time);
-		  CLog::Log(LOGDEBUG, __FUNCTION__" times: Info %d, Cast %d, Genres %d, Director %d", movieTime, castTime, genreTime, directorTime);
+    		  CLog::Log(LOGDEBUG, __FUNCTION__" times: Info %d, Cast %d", movieTime, castTime);
         }
         catch (...)
         {
@@ -1924,8 +1901,7 @@
 
     while (!m_pDS->eof())
     {
-      long lMovieId = m_pDS->fv("movie.idMovie").get_asLong();
-      CIMDBMovie movie = GetDetailsForMovie(lMovieId);
+      CIMDBMovie movie = GetDetailsForMovie(m_pDS);
       movies.push_back(movie);
 
       m_pDS->next();
@@ -1978,7 +1954,7 @@
     if (NULL == m_pDB.get()) return 0;
     if (NULL == m_pDS.get()) return 0;
 
-    CStdString strSQL=FormatSQL("select count (idMovie) as nummovies from movie where idType=%i", VIDEODB_ID_TITLE);
+    CStdString strSQL=FormatSQL("select count (idMovie) as nummovies from movie");
     m_pDS->query( strSQL.c_str() );
 
     int iResult = 0;
@@ -2084,7 +2060,7 @@
     if (NULL == m_pDS.get()) return;
 
     if (g_settings.m_vecProfiles[0].getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
-      strSQL=FormatSQL("select genre.idgenre,genre.strgenre,path.strPath from genre,genrelinkmovie,movie,path,files where genre.idGenre=genrelinkMovie.idGenre and genrelinkMovie.idMovie = movie.idMovie and movie.idType=%i and files.idMovie=movie.idMovie and path.idPath = files.idPath and genre.strGenre like '%%%s%%'",VIDEODB_ID_TITLE,strSearch.c_str());
+      strSQL=FormatSQL("select genre.idgenre,genre.strgenre,path.strPath from genre,genrelinkmovie,movie,path,files where genre.idGenre=genrelinkMovie.idGenre and genrelinkMovie.idMovie = movie.idMovie and files.idMovie=movie.idMovie and path.idPath = files.idPath and genre.strGenre like '%%%s%%'",strSearch.c_str());
     else
       strSQL=FormatSQL("select genre.idgenre,genre.strgenre from genre where strGenre like '%%%s%%'", strSearch.c_str());
     m_pDS->query( strSQL.c_str() );
@@ -2124,9 +2100,9 @@
     if (NULL == m_pDS.get()) return;
 
     if (g_settings.m_vecProfiles[0].getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
-      strSQL=FormatSQL("select actors.idactor,actors.strActor,path.strPath from actorlinkmovie,actors,movie,files,path where actors.idActor=actorlinkmovie.idActor and actorlinkmovie.idmovie=movie.idmovie and files.idMovie = movie.idMovie and files.idPath = path.idPath and movie.idType=%i and actors.strActor like '%%%s%%'",VIDEODB_ID_TITLE,strSearch.c_str());
+      strSQL=FormatSQL("select actors.idactor,actors.strActor,path.strPath from actorlinkmovie,actors,movie,files,path where actors.idActor=actorlinkmovie.idActor and actorlinkmovie.idmovie=movie.idmovie and files.idMovie = movie.idMovie and files.idPath = path.idPath and actors.strActor like '%%%s%%'",strSearch.c_str());
     else
-      strSQL=FormatSQL("select actors.idactor,actors.strActor from actorlinkmovie,actors,movie where actors.idActor=actorlinkmovie.idActor and actorlinkmovie.idmovie=movie.idmovie and movie.idType=%i and actors.strActor like '%%%s%%'",VIDEODB_ID_TITLE,strSearch.c_str());
+      strSQL=FormatSQL("select actors.idactor,actors.strActor from actorlinkmovie,actors,movie where actors.idActor=actorlinkmovie.idActor and actorlinkmovie.idmovie=movie.idmovie and actors.strActor like '%%%s%%'",strSearch.c_str());
     m_pDS->query( strSQL.c_str() );
 
     while (!m_pDS->eof())
@@ -2164,9 +2140,9 @@
     if (NULL == m_pDS.get()) return;
 
     if (g_settings.m_vecProfiles[0].getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
-      strSQL = FormatSQL("select movie.idmovie,movie.strValue,path.strPath from movie,file,path where movie.idType=%i and file.idMovie=movie.idMovie and file.idPath=path.idPath and movie.strValue like '%%%s%%'",VIDEODB_ID_TITLE,strSearch.c_str());
+      strSQL = FormatSQL("select movie.idmovie,movie.c%02d,path.strPath from movie,file,path where file.idMovie=movie.idMovie and file.idPath=path.idPath and movie.strValue like '%%%s%%'",VIDEODB_ID_TITLE,strSearch.c_str());
     else
-      strSQL = FormatSQL("select movie.idmovie,movie.strValue from movie where idType=%i and movie.strValue like '%%%s%%'",VIDEODB_ID_TITLE,strSearch.c_str());
+      strSQL = FormatSQL("select movie.idmovie,movie.c%02d from movie where movie.strValue like '%%%s%%'",VIDEODB_ID_TITLE,strSearch.c_str());
     m_pDS->query( strSQL.c_str() );
 
     while (!m_pDS->eof())
@@ -2178,7 +2154,7 @@
           continue;
         }
 
-      CFileItem* pItem=new CFileItem(m_pDS->fv("movie.strValue").get_asString());
+      CFileItem* pItem=new CFileItem(m_pDS->fv(2).get_asString());
       CStdString strDir;
       strSQL = FormatSQL("select * from genrelinkmovie where genrelinkmovie.idMovie=%u",m_pDS->fv("movie.idMovie").get_asLong());
       m_pDS2->query(strSQL);
@@ -2207,9 +2183,9 @@
     if (NULL == m_pDS.get()) return;
 
     if (g_settings.m_vecProfiles[0].getLockMode() != LOCK_MODE_EVERYONE && !g_passwordManager.bMasterUser)
-      strSQL = FormatSQL("select directorlinkmovie.idDirector,actors.strActor,path.strPath from movie,file,path,actors,directorlinkmovie where movie.idType=%i and file.idMovie=movie.idMovie and file.idPath=path.idPath and directorlinkmovie.idmovie = movie.idMovie and directorlinkmovie.idDirector = actors.idActor and actors.strActor like '%%%s%%'",VIDEODB_ID_TITLE,strSearch.c_str());
+      strSQL = FormatSQL("select directorlinkmovie.idDirector,actors.strActor,path.strPath from movie,file,path,actors,directorlinkmovie where file.idMovie=movie.idMovie and file.idPath=path.idPath and directorlinkmovie.idmovie = movie.idMovie and directorlinkmovie.idDirector = actors.idActor and actors.strActor like '%%%s%%'",strSearch.c_str());
     else
-      strSQL = FormatSQL("select directorlinkmovie.idDirector,actors.strActor from movie,actors,directorlinkmovie where movie.idType=%i and directorlinkmovie.idmovie = movie.idMovie and directorlinkmovie.idDirector = actors.idActor and actors.strActor like '%%%s%%'",VIDEODB_ID_TITLE,strSearch.c_str());
+      strSQL = FormatSQL("select directorlinkmovie.idDirector,actors.strActor from movie,actors,directorlinkmovie where directorlinkmovie.idmovie = movie.idMovie and directorlinkmovie.idDirector = actors.idActor and actors.strActor like '%%%s%%'",strSearch.c_str());
 
     m_pDS->query( strSQL.c_str() );
 
@@ -2392,7 +2368,7 @@
     if (NULL == m_pDS.get()) return;
 
     // find all movies
-    CStdString sql = FormatSQL("select idMovie from movie where idType=%i", VIDEODB_ID_TITLE);
+    CStdString sql = "select movie.*,files.strFileName,path.strPath from movie join files on files.idMovie=movie.idMovie join path on files.idPath=path.idPath";
  
     m_pDS->query(sql.c_str());
     if (m_pDS->num_rows() == 0) return;
@@ -2418,7 +2394,7 @@
     TiXmlNode *pMain = xmlDoc.InsertEndChild(xmlMainElement);
     while (!m_pDS->eof())
     {
-      CIMDBMovie movie = GetDetailsForMovie(m_pDS->fv("idMovie").get_asLong());
+      CIMDBMovie movie = GetDetailsForMovie(m_pDS);
       movie.Save(pMain);
       if ((current % 50) == 0 && progress)
       {

Modified: trunk/XBMC/xbmc/VideoDatabase.h
===================================================================
--- trunk/XBMC/xbmc/VideoDatabase.h	2007-01-25 23:15:56 UTC (rev 7744)
+++ trunk/XBMC/xbmc/VideoDatabase.h	2007-01-26 03:09:56 UTC (rev 7745)
@@ -30,9 +30,17 @@
   VIDEODB_ID_RUNTIME = 11,
   VIDEODB_ID_MPAA = 12,
   VIDEODB_ID_TOP250 = 13,
+  VIDEODB_ID_GENRE = 14,
+  VIDEODB_ID_DIRECTOR = 15,
   VIDEODB_ID_MAX
 } VIDEODB_IDS;
 
+// these defines are based on how many columns we have and which column certain data is going to be in
+// when we do GetDetailsForMovie()
+#define VIDEODB_MAX_COLUMNS 21
+#define VIDEODB_DETAILS_FILE VIDEODB_MAX_COLUMNS + 1
+#define VIDEODB_DETAILS_PATH VIDEODB_MAX_COLUMNS + 2
+
 #define VIDEODB_TYPE_STRING 1
 #define VIDEODB_TYPE_INT 2
 #define VIDEODB_TYPE_FLOAT 3
@@ -57,7 +65,9 @@
   { VIDEODB_TYPE_BOOL, offsetof(CIMDBMovie,m_bWatched) },
   { VIDEODB_TYPE_STRING, offsetof(CIMDBMovie,m_strRuntime) },
   { VIDEODB_TYPE_STRING, offsetof(CIMDBMovie,m_strMPAARating) },
-  { VIDEODB_TYPE_INT, offsetof(CIMDBMovie,m_iTop250) }
+  { VIDEODB_TYPE_INT, offsetof(CIMDBMovie,m_iTop250) },
+  { VIDEODB_TYPE_STRING, offsetof(CIMDBMovie,m_strGenre) },
+  { VIDEODB_TYPE_STRING, offsetof(CIMDBMovie,m_strDirector) }
 };
 
 class CBookmark
@@ -161,7 +171,7 @@
   void AddDirectorToMovie(long lMovieId, long lDirectorId);
   void AddGenreToMovie(long lMovieId, long lGenreId);
 
-  CIMDBMovie GetDetailsForMovie(long lMovieId);
+  CIMDBMovie GetDetailsForMovie(auto_ptr<Dataset> &pDS, bool needsCast = false);
 
 private:
   virtual bool CreateTables();

Modified: trunk/XBMC/xbmc/utils/IMDB.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/IMDB.cpp	2007-01-25 23:15:56 UTC (rev 7744)
+++ trunk/XBMC/xbmc/utils/IMDB.cpp	2007-01-26 03:09:56 UTC (rev 7745)
@@ -304,10 +304,13 @@
   XMLUtils::GetString(movie, "imdbnumber", m_strIMDBNumber);
   XMLUtils::GetString(movie, "filenameandpath", m_strFileNameAndPath);
 
+  // Are these here for chaining purposes?  If so, why not allow multiple <genre> tags
+  // at the same time, and check for empty and assign "Not Available" at the display level
+  // rather than the db level?
   CStdString strTemp;
   if (XMLUtils::GetString(movie, "genre", strTemp))
   {
-    if (m_strGenre.Equals(g_localizeStrings.Get(416)))
+    if (m_strGenre.Equals(g_localizeStrings.Get(416)) || m_strGenre.IsEmpty())
       m_strGenre = strTemp;
     else
       m_strGenre += " / "+strTemp;
@@ -315,7 +318,7 @@
 
   if (XMLUtils::GetString(movie, "credits", strTemp))
   {
-    if (m_strWritingCredits.Equals(g_localizeStrings.Get(416)))
+    if (m_strWritingCredits.Equals(g_localizeStrings.Get(416)) || m_strWritingCredits.IsEmpty())
       m_strWritingCredits = strTemp;
     else
       m_strWritingCredits += " / "+strTemp;
@@ -323,7 +326,7 @@
   
   if (XMLUtils::GetString(movie, "director", strTemp))
   {
-    if (m_strDirector.Equals(g_localizeStrings.Get(416)))
+    if (m_strDirector.Equals(g_localizeStrings.Get(416)) || m_strDirector.IsEmpty())
       m_strDirector = strTemp;
     else
       m_strDirector += " / "+strTemp;


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

Revision: 7764
          http://svn.sourceforge.net/xbmc/?rev=7764&view=rev
Author:   elupus
Date:     2007-02-01 04:51:48 -0800 (Thu, 01 Feb 2007)

Log Message:
-----------
added: osd option to switch audio output mode between analog and digital

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIDialogAudioSubtitleSettings.cpp
    trunk/XBMC/xbmc/GUIDialogAudioSubtitleSettings.h
    trunk/XBMC/xbmc/GUIDialogSettings.cpp
    trunk/XBMC/xbmc/GUIDialogSettings.h

Modified: trunk/XBMC/xbmc/GUIDialogAudioSubtitleSettings.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogAudioSubtitleSettings.cpp	2007-02-01 11:15:23 UTC (rev 7763)
+++ trunk/XBMC/xbmc/GUIDialogAudioSubtitleSettings.cpp	2007-02-01 12:51:48 UTC (rev 7764)
@@ -26,6 +26,7 @@
 #include "util.h"
 #include "application.h"
 #include "VideoDatabase.h"
+#include "XBAudioConfig.h"
 
 using namespace XFILE;
 using namespace DIRECTORY;
@@ -48,13 +49,14 @@
 #define AUDIO_SETTINGS_DELAY              3
 #define AUDIO_SETTINGS_STREAM             4
 #define AUDIO_SETTINGS_OUTPUT_TO_ALL_SPEAKERS 5
+#define AUDIO_SETTINGS_DIGITAL_ANALOG 6
 
-// separator 6
-#define SUBTITLE_SETTINGS_ENABLE          7
-#define SUBTITLE_SETTINGS_DELAY           8
-#define SUBTITLE_SETTINGS_STREAM          9
-#define SUBTITLE_SETTINGS_BROWSER        10
-#define AUDIO_SETTINGS_MAKE_DEFAULT      11
+// separator 7
+#define SUBTITLE_SETTINGS_ENABLE          8
+#define SUBTITLE_SETTINGS_DELAY           9
+#define SUBTITLE_SETTINGS_STREAM          10
+#define SUBTITLE_SETTINGS_BROWSER        11
+#define AUDIO_SETTINGS_MAKE_DEFAULT      12
 
 void CGUIDialogAudioSubtitleSettings::CreateSettings()
 {
@@ -66,8 +68,18 @@
   AddSlider(AUDIO_SETTINGS_VOLUME_AMPLIFICATION, 290, &g_stSettings.m_currentVideoSettings.m_VolumeAmplification, VOLUME_DRC_MINIMUM * 0.01f, (VOLUME_DRC_MAXIMUM - VOLUME_DRC_MINIMUM) * 0.001f, VOLUME_DRC_MAXIMUM * 0.01f, "%2.1f dB");
   AddSlider(AUDIO_SETTINGS_DELAY, 297, &g_stSettings.m_currentVideoSettings.m_AudioDelay, -g_advancedSettings.m_videoAudioDelayRange, 0.1f, g_advancedSettings.m_videoAudioDelayRange, "%2.1fs");
   AddAudioStreams(AUDIO_SETTINGS_STREAM);
-  AddBool(AUDIO_SETTINGS_OUTPUT_TO_ALL_SPEAKERS, 252, &g_stSettings.m_currentVideoSettings.m_OutputToAllSpeakers, g_guiSettings.GetInt("audiooutput.mode") == AUDIO_DIGITAL);
-  AddSeparator(6);
+
+  // only show stuff available in digital mode if we have digital output
+  if(g_audioConfig.HasDigitalOutput())
+  {
+    AddBool(AUDIO_SETTINGS_OUTPUT_TO_ALL_SPEAKERS, 252, &g_stSettings.m_currentVideoSettings.m_OutputToAllSpeakers, g_guiSettings.GetInt("audiooutput.mode") == AUDIO_DIGITAL);
+
+    int settings[2] = { 338, 339 }; //ANALOG, DIGITAL
+    m_outputmode = g_guiSettings.GetInt("audiooutput.mode");
+    AddSpin(AUDIO_SETTINGS_DIGITAL_ANALOG, 337, &m_outputmode, 2, settings);
+  }
+
+  AddSeparator(7);
   AddBool(SUBTITLE_SETTINGS_ENABLE, 13397, &g_stSettings.m_currentVideoSettings.m_SubtitleOn);
   AddSlider(SUBTITLE_SETTINGS_DELAY, 303, &g_stSettings.m_currentVideoSettings.m_SubtitleDelay, -g_advancedSettings.m_videoSubsDelayRange, 0.1f, g_advancedSettings.m_videoSubsDelayRange, "%2.1fs");
   AddSubtitleStreams(SUBTITLE_SETTINGS_STREAM);
@@ -226,6 +238,16 @@
   {
     g_application.Restart();
   }
+  else if (setting.id == AUDIO_SETTINGS_DIGITAL_ANALOG)
+  {
+    if(m_outputmode == 0) // might be unneccesary (indexes match), but just for clearity
+      g_guiSettings.SetInt("audiooutput.mode", AUDIO_ANALOG);
+    else
+      g_guiSettings.SetInt("audiooutput.mode", AUDIO_DIGITAL);
+
+    EnableSettings(AUDIO_SETTINGS_OUTPUT_TO_ALL_SPEAKERS, g_guiSettings.GetInt("audiooutput.mode") == AUDIO_DIGITAL);
+    g_application.Restart();
+  }
   else if (setting.id == SUBTITLE_SETTINGS_ENABLE)
   {
     g_application.m_pPlayer->SetSubtitleVisible(g_stSettings.m_currentVideoSettings.m_SubtitleOn);

Modified: trunk/XBMC/xbmc/GUIDialogAudioSubtitleSettings.h
===================================================================
--- trunk/XBMC/xbmc/GUIDialogAudioSubtitleSettings.h	2007-02-01 11:15:23 UTC (rev 7763)
+++ trunk/XBMC/xbmc/GUIDialogAudioSubtitleSettings.h	2007-02-01 12:51:48 UTC (rev 7764)
@@ -20,4 +20,5 @@
   float m_volume;
   int m_audioStream;
   int m_subtitleStream;
+  int m_outputmode;
 };

Modified: trunk/XBMC/xbmc/GUIDialogSettings.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogSettings.cpp	2007-02-01 11:15:23 UTC (rev 7763)
+++ trunk/XBMC/xbmc/GUIDialogSettings.cpp	2007-02-01 12:51:48 UTC (rev 7764)
@@ -137,6 +137,31 @@
   }
 }
 
+void CGUIDialogSettings::EnableSettings(unsigned int id, bool enabled)
+{
+  unsigned int index = -1;
+  for (unsigned int i = 0; i < m_settings.size(); i++)
+  {
+    if (m_settings[i].id != id)
+      continue;
+    index = i;
+    break;
+  }
+  if(index>=0)
+  {
+    m_settings[index].enabled = enabled;
+    if (enabled)
+    {
+      CONTROL_ENABLE(index + CONTROL_START);
+    }
+    else
+    {
+      CONTROL_DISABLE(index + CONTROL_START);
+    }
+  }
+  else
+    CLog::Log(LOGWARNING, __FUNCTION__" - Invalid setting specified");
+}
 
 void CGUIDialogSettings::UpdateSetting(unsigned int id)
 {

Modified: trunk/XBMC/xbmc/GUIDialogSettings.h
===================================================================
--- trunk/XBMC/xbmc/GUIDialogSettings.h	2007-02-01 11:15:23 UTC (rev 7763)
+++ trunk/XBMC/xbmc/GUIDialogSettings.h	2007-02-01 12:51:48 UTC (rev 7764)
@@ -44,6 +44,7 @@
   virtual void SetupPage();
   virtual void CreateSettings() {};
   void UpdateSetting(unsigned int setting);
+  void EnableSettings(unsigned int setting, bool enabled);
   virtual void OnSettingChanged(unsigned int setting) {};
   void FreeControls();
   void OnClick(int iControlID);


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

Revision: 7767
          http://svn.sourceforge.net/xbmc/?rev=7767&view=rev
Author:   elupus
Date:     2007-02-01 08:13:57 -0800 (Thu, 01 Feb 2007)

Log Message:
-----------
fixed: CUtil::GetParentPath would fail on upnp://uuid/, CURL considers uuid the hostname
changed: removed some upnp specific hacks in FileManager.
fixed: copying from upnp share to smb would fail if target contained non fatx supported chars.

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowFileManager.cpp
    trunk/XBMC/xbmc/Util.cpp

Modified: trunk/XBMC/xbmc/GUIWindowFileManager.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowFileManager.cpp	2007-02-01 13:44:07 UTC (rev 7766)
+++ trunk/XBMC/xbmc/GUIWindowFileManager.cpp	2007-02-01 16:13:57 UTC (rev 7767)
@@ -807,35 +807,33 @@
     if (pItem->IsSelected())
     {
       CStdString strCorrectedPath = pItem->m_strPath;
-      // remove trailing slash only if it's not a upnp path (upnp folder)
-      if (!CUtil::IsUPnP(strCorrectedPath) && CUtil::HasSlashAtEnd(strCorrectedPath))
-      {
-        strCorrectedPath = strCorrectedPath.Left(strCorrectedPath.size() - 1);
-      }
-      CStdString strFileName = CUtil::GetFileName(strCorrectedPath);
-      CStdString strnewDestFile;
-      
+      CUtil::RemoveSlashAtEnd(strCorrectedPath);
+
+      CStdString strFileName;
+
       // special case for upnp
-      if (CUtil::IsUPnP(items.m_strPath))
+      if (CUtil::IsUPnP(items.m_strPath) || CUtil::IsUPnP(pItem->m_strPath))
       {
         // get filename from label instead of path
-        strFileName = CUtil::GetFileName(pItem->GetLabel());
-        // FIXME: for now we only work well if the url has the extension
-        // we should map the content type to the extension otherwise
-        CStdString strExtension = CUtil::GetExtension(pItem->m_strPath);
-        if (CUtil::GetExtension(strFileName).length() == 0 && strExtension.length() > 0) 
+        strFileName = pItem->GetLabel();
+
+        if(!pItem->m_bIsFolder && CUtil::GetExtension(strFileName).length() == 0)
         {
-          strFileName += strExtension;
+          // FIXME: for now we only work well if the url has the extension
+          // we should map the content type to the extension otherwise
+          strFileName += CUtil::GetExtension(pItem->m_strPath);
         }
-        CUtil::AddFileToFolder(strDestFile, strFileName.c_str(), strnewDestFile);
-        // make sure the path is qualified
-        CUtil::GetFatXQualifiedPath(strnewDestFile);
-      } 
-      else 
-      {
-        CUtil::AddFileToFolder(strDestFile, strFileName.c_str(), strnewDestFile);
+
+        CUtil::RemoveIllegalChars(strFileName);
+        CUtil::ShortenFileName(strFileName);
       }
+      else
+        strFileName = CUtil::GetFileName(strCorrectedPath);
 
+      CStdString strnewDestFile;
+      if(!strDestFile.IsEmpty()) // only do this if we have a destination
+        CUtil::AddFileToFolder(strDestFile, strFileName, strnewDestFile);
+
       if (pItem->m_bIsFolder)
       {
         // create folder on dest. drive
@@ -1090,20 +1088,15 @@
     else
     {
       // Other items in virual directory
-      CStdString strPath = pItem->m_strPath;
-      while (!CUtil::IsUPnP(strPath) && CUtil::HasSlashAtEnd(strPath))
-        strPath.Delete(strPath.size() - 1);
-
-      strHistoryString = pItem->GetLabel() + strPath;
+      strHistoryString = pItem->GetLabel() + pItem->m_strPath;
+      CUtil::RemoveSlashAtEnd(strHistoryString);
     }
   }
   else
   {
     // Normal directory items
     strHistoryString = pItem->m_strPath;
-
-    if (!CUtil::IsUPnP(strHistoryString) && CUtil::HasSlashAtEnd(strHistoryString))
-      strHistoryString.Delete(strHistoryString.size() - 1);
+    CUtil::RemoveSlashAtEnd(strHistoryString);
   }
 }
 

Modified: trunk/XBMC/xbmc/Util.cpp
===================================================================
--- trunk/XBMC/xbmc/Util.cpp	2007-02-01 13:44:07 UTC (rev 7766)
+++ trunk/XBMC/xbmc/Util.cpp	2007-02-01 16:13:57 UTC (rev 7767)
@@ -478,22 +478,14 @@
   }
   else if (strFile.size() == 0)
   {
-    if (url.GetProtocol() == "smb" && (url.GetHostName().size() > 0))
+    if (url.GetHostName().size() > 0)
     {
-      // we have an smb share with only server or workgroup name
-      // set hostname to "" and return true.
+      // we have an share with only server or workgroup name
+      // set hostname to "" and return true to get back to root
       url.SetHostName("");
       url.GetURL(strParent);
       return true;
     }
-    else if (url.GetProtocol() == "xbms" && (url.GetHostName().size() > 0))
-    {
-      // we have an xbms share with only server name
-      // set hostname to "" and return true.
-      url.SetHostName("");
-      url.GetURL(strParent);
-      return true;
-    }
     return false;
   }
 


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

Revision: 7791
          http://svn.sourceforge.net/xbmc/?rev=7791&view=rev
Author:   spiff_
Date:     2007-02-04 12:12:04 -0800 (Sun, 04 Feb 2007)

Log Message:
-----------
changed: if you set the content of a multi path, all paths are assigned in addition to the multipath url. should hopefully fix the problems with the refresh button.

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIDialogContentSettings.cpp
    trunk/XBMC/xbmc/GUIWindowVideoBase.cpp

Modified: trunk/XBMC/xbmc/GUIDialogContentSettings.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogContentSettings.cpp	2007-02-04 19:13:32 UTC (rev 7790)
+++ trunk/XBMC/xbmc/GUIDialogContentSettings.cpp	2007-02-04 20:12:04 UTC (rev 7791)
@@ -305,7 +305,19 @@
   database.GetScraperForPath(strDirectory,scraper.strPath,scraper.strContent);
   bool bResult = Show(scraper,bRunScan,bScanRecursive,bUseDirNames);
   if (bResult)
+  {
+    bool bName;
+    int iBookmark = CUtil::GetMatchingShare(strDirectory,g_settings.m_vecMyVideoShares,bName);
+    if (iBookmark > -1)
+    {
+      if (g_settings.m_vecMyVideoShares[iBookmark].vecPaths.size() > 1 && bName)
+      {
+        for (unsigned int i=0;i<g_settings.m_vecMyVideoShares[iBookmark].vecPaths.size();++i)
+          database.SetScraperForPath(g_settings.m_vecMyVideoShares[iBookmark].vecPaths[i],scraper.strPath,scraper.strContent);
+      }
+    }
     database.SetScraperForPath(strDirectory,scraper.strPath,scraper.strContent);
+  }
 
   return bResult;
 }

Modified: trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2007-02-04 19:13:32 UTC (rev 7790)
+++ trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2007-02-04 20:12:04 UTC (rev 7791)
@@ -324,7 +324,6 @@
     pDlgInfo->DoModal();
     item->SetThumbnailImage(pDlgInfo->GetThumbnail());
     if ( !pDlgInfo->NeedRefresh() ) return ;
-    m_database.DeleteMovieInfo(item->m_strPath);
   }
 
   // quietly return if Internet lookups are disabled
@@ -456,6 +455,7 @@
         // Add to the database if applicable
         if (item->m_strPath && (g_settings.m_vecProfiles[g_settings.m_iLastLoadedProfileIndex].canWriteDatabases() || g_passwordManager.bMasterUser))
         {
+          m_database.DeleteMovieInfo(item->m_strPath);
           m_database.SetMovieInfo(item->m_strPath, movieDetails);
           // remove directory caches
           CFileItemList items;


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

Revision: 7795
          http://svn.sourceforge.net/xbmc/?rev=7795&view=rev
Author:   elupus
Date:     2007-02-04 16:11:13 -0800 (Sun, 04 Feb 2007)

Log Message:
-----------
fixed: sending of multicast messages from xbox is now possible for the upnp server. not enabled by default (can be enabled from UPnP::broadcast variable)

Modified Paths:
--------------
    trunk/XBMC/xbmc/UPnP.cpp
    trunk/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Bsd/NptBsdSockets.cpp

Modified: trunk/XBMC/xbmc/UPnP.cpp
===================================================================
--- trunk/XBMC/xbmc/UPnP.cpp	2007-02-04 23:05:32 UTC (rev 7794)
+++ trunk/XBMC/xbmc/UPnP.cpp	2007-02-05 00:11:13 UTC (rev 7795)
@@ -96,7 +96,7 @@
 //        }
 
 
-        NPT_Flags     flags = NPT_NETWORK_INTERFACE_FLAG_BROADCAST;
+        NPT_Flags     flags = NPT_NETWORK_INTERFACE_FLAG_BROADCAST | NPT_NETWORK_INTERFACE_FLAG_MULTICAST;
 
         NPT_MacAddress mac;
         if (state & XNET_GET_XNADDR_ETHERNET) {

Modified: trunk/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Bsd/NptBsdSockets.cpp
===================================================================
--- trunk/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Bsd/NptBsdSockets.cpp	2007-02-04 23:05:32 UTC (rev 7794)
+++ trunk/XBMC/xbmc/lib/libUPnP/Platinum/ThirdParty/Neptune/Source/System/Bsd/NptBsdSockets.cpp	2007-02-05 00:11:13 UTC (rev 7795)
@@ -1193,6 +1193,12 @@
                SO_BROADCAST, 
                (SocketOption)&option, 
                sizeof(option));
+
+#ifdef _XBOX
+    // set flag on the socket the allows sending of multicast
+    *(DWORD*)((char*)m_SocketFdReference->GetSocketFd()+0xc) |= 0x02000000;
+#endif
+
 }
 
 /*----------------------------------------------------------------------
@@ -1405,7 +1411,7 @@
 NPT_BsdUdpMulticastSocket::JoinGroup(const NPT_IpAddress& group,
                                      const NPT_IpAddress& iface)
 {
-    return NPT_ERROR_NOT_IMPLEMENTED;
+    return NPT_SUCCESS;
 }
 #else
 /*----------------------------------------------------------------------
@@ -1443,7 +1449,7 @@
 NPT_BsdUdpMulticastSocket::LeaveGroup(const NPT_IpAddress& group,
                                       const NPT_IpAddress& iface)
 {
-    return NPT_ERROR_NOT_IMPLEMENTED;
+    return NPT_SUCCESS;
 }
 #else
 /*----------------------------------------------------------------------
@@ -1480,7 +1486,7 @@
 NPT_Result
 NPT_BsdUdpMulticastSocket::SetInterface(const NPT_IpAddress& iface)
 {
-    return NPT_ERROR_NOT_IMPLEMENTED;
+    return NPT_SUCCESS;
 }
 #else
 /*----------------------------------------------------------------------


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

Revision: 7797
          http://svn.sourceforge.net/xbmc/?rev=7797&view=rev
Author:   elupus
Date:     2007-02-04 17:32:01 -0800 (Sun, 04 Feb 2007)

Log Message:
-----------
fixed: mplayer had wrong channel order for flac audio.

Modified Paths:
--------------
    trunk/XBMC/xbmc/UPnP.cpp
    trunk/XBMC/xbmc/cores/mplayer/AsyncDirectSound.cpp
    trunk/XBMC/xbmc/cores/mplayer/mplayer.cpp

Modified: trunk/XBMC/xbmc/UPnP.cpp
===================================================================
--- trunk/XBMC/xbmc/UPnP.cpp	2007-02-05 01:27:09 UTC (rev 7796)
+++ trunk/XBMC/xbmc/UPnP.cpp	2007-02-05 01:32:01 UTC (rev 7797)
@@ -42,7 +42,7 @@
 // change to false for XBMC_PC if you want real UPnP functionality
 // otherwise keep to true for xbmc as it doesn't support multicast
 // don't change unless you know what you're doing!
-bool CUPnP::broadcast = true; 
+bool CUPnP::broadcast = false; 
 
 #ifdef HAS_XBOX_NETWORK
 #include <xtl.h>

Modified: trunk/XBMC/xbmc/cores/mplayer/AsyncDirectSound.cpp
===================================================================
--- trunk/XBMC/xbmc/cores/mplayer/AsyncDirectSound.cpp	2007-02-05 01:27:09 UTC (rev 7796)
+++ trunk/XBMC/xbmc/cores/mplayer/AsyncDirectSound.cpp	2007-02-05 01:32:01 UTC (rev 7797)
@@ -185,7 +185,7 @@
   {
     if (strstr(strAudioCodec, "AAC"))
       g_audioContext.GetMixBin(dsmbvp8, &iMixBinCount, &dwCMask, DSMIXBINTYPE_AAC, iChannels);
-    else if (strstr(strAudioCodec, "DMO"))
+    else if (strstr(strAudioCodec, "DMO") || strstr(strAudioCodec, "FLAC"))
       g_audioContext.GetMixBin(dsmbvp8, &iMixBinCount, &dwCMask, DSMIXBINTYPE_DMO, iChannels);
     else if (strstr(strAudioCodec, "OggVorbis"))
       g_audioContext.GetMixBin(dsmbvp8, &iMixBinCount, &dwCMask, DSMIXBINTYPE_OGG, iChannels);

Modified: trunk/XBMC/xbmc/cores/mplayer/mplayer.cpp
===================================================================
--- trunk/XBMC/xbmc/cores/mplayer/mplayer.cpp	2007-02-05 01:27:09 UTC (rev 7796)
+++ trunk/XBMC/xbmc/cores/mplayer/mplayer.cpp	2007-02-05 01:32:01 UTC (rev 7797)
@@ -1872,12 +1872,18 @@
       strName += (char)(slt.language & 255);
     }
 
-    strStreamName.Format("%s - %s(%s)", strName.c_str(), dvd_audio_stream_types[slt.type], dvd_audio_stream_channels[slt.channels]);
+    strStreamName.Format("%s", strName.c_str());
   }
-  else
+
+  if(slt.type>=0)
   {
-    strStreamName = "";
+    if(!strStreamName.IsEmpty())
+      strStreamName += " - ";
+    strStreamName += dvd_audio_stream_types[slt.type];
   }
+
+  if(slt.channels>0)
+    strStreamName += CStdString("(") +  dvd_audio_stream_channels[slt.channels-1] + CStdString(")");
 }
 
 void CMPlayer::SetAudioStream(int iStream)


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

Revision: 7817
          http://svn.sourceforge.net/xbmc/?rev=7817&view=rev
Author:   spiff_
Date:     2007-02-12 10:22:03 -0800 (Mon, 12 Feb 2007)

Log Message:
-----------
added: original title column to video database (still not accessible from ui).

Modified Paths:
--------------
    trunk/XBMC/xbmc/VideoDatabase.h
    trunk/XBMC/xbmc/utils/IMDB.cpp
    trunk/XBMC/xbmc/utils/IMDB.h

Modified: trunk/XBMC/xbmc/VideoDatabase.h
===================================================================
--- trunk/XBMC/xbmc/VideoDatabase.h	2007-02-12 18:06:31 UTC (rev 7816)
+++ trunk/XBMC/xbmc/VideoDatabase.h	2007-02-12 18:22:03 UTC (rev 7817)
@@ -32,6 +32,7 @@
   VIDEODB_ID_TOP250 = 13,
   VIDEODB_ID_GENRE = 14,
   VIDEODB_ID_DIRECTOR = 15,
+  VIDEODB_ID_ORIGINALTITLE = 16,
   VIDEODB_ID_MAX
 } VIDEODB_IDS;
 
@@ -67,7 +68,8 @@
   { VIDEODB_TYPE_STRING, offsetof(CIMDBMovie,m_strMPAARating) },
   { VIDEODB_TYPE_INT, offsetof(CIMDBMovie,m_iTop250) },
   { VIDEODB_TYPE_STRING, offsetof(CIMDBMovie,m_strGenre) },
-  { VIDEODB_TYPE_STRING, offsetof(CIMDBMovie,m_strDirector) }
+  { VIDEODB_TYPE_STRING, offsetof(CIMDBMovie,m_strDirector) },
+  { VIDEODB_TYPE_STRING, offsetof(CIMDBMovie,m_strOriginalTitle)}
 };
 
 class CBookmark

Modified: trunk/XBMC/xbmc/utils/IMDB.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/IMDB.cpp	2007-02-12 18:06:31 UTC (rev 7816)
+++ trunk/XBMC/xbmc/utils/IMDB.cpp	2007-02-12 18:22:03 UTC (rev 7817)
@@ -240,6 +240,8 @@
   if (!movie) return false;
 
   XMLUtils::SetString(movie, "title", m_strTitle);
+  if (!m_strOriginalTitle.IsEmpty())
+    XMLUtils::SetString(movie, "originaltitle", m_strOriginalTitle);
   XMLUtils::SetFloat(movie, "rating", m_fRating);
   XMLUtils::SetInt(movie, "year", m_iYear);
   XMLUtils::SetInt(movie, "top250", m_iTop250);
@@ -282,6 +284,7 @@
 {
   if (!movie) return false;
   XMLUtils::GetString(movie, "title", m_strTitle);
+  XMLUtils::GetString(movie, "originaltitle", m_strOriginalTitle);
   XMLUtils::GetFloat(movie, "rating", m_fRating);
   XMLUtils::GetInt(movie, "year", m_iYear);
   XMLUtils::GetInt(movie, "top250", m_iTop250);

Modified: trunk/XBMC/xbmc/utils/IMDB.h
===================================================================
--- trunk/XBMC/xbmc/utils/IMDB.h	2007-02-12 18:06:31 UTC (rev 7816)
+++ trunk/XBMC/xbmc/utils/IMDB.h	2007-02-12 18:22:03 UTC (rev 7817)
@@ -58,6 +58,7 @@
   CStdString m_strIMDBNumber;
   CStdString m_strMPAARating;
   CStdString m_strFileNameAndPath;
+  CStdString m_strOriginalTitle;
   bool m_bWatched;
   int m_iTop250;
   int m_iYear;


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

Revision: 7836
          http://svn.sourceforge.net/xbmc/?rev=7836&view=rev
Author:   spiff_
Date:     2007-02-14 09:10:21 -0800 (Wed, 14 Feb 2007)

Log Message:
-----------
changed: some code cleanup made possibly by changes in imdb scraper.

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
    trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp

Modified: trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2007-02-14 17:08:40 UTC (rev 7835)
+++ trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2007-02-14 17:10:21 UTC (rev 7836)
@@ -345,7 +345,6 @@
       if ( nfoReader.Create("Z:\\movie.nfo") == S_OK)
       {
 	    	url.m_strURL.push_back(nfoReader.m_strImDbUrl);
-        url.m_strURL.push_back(nfoReader.m_strImDbUrl+"plotsummary");
         url.m_strID = nfoReader.m_strImDbNr;
         SScraperInfo info2(info);
         info2.strPath = "imdb.xml"; // fallback to imdb scraper no matter what is configured

Modified: trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp	2007-02-14 17:08:40 UTC (rev 7835)
+++ trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp	2007-02-14 17:10:21 UTC (rev 7836)
@@ -493,7 +493,6 @@
               {
                 CIMDBUrl url;
                 url.m_strURL.push_back(nfoReader.m_strImDbUrl);
-                url.m_strURL.push_back(nfoReader.m_strImDbUrl+"plotsummary");
                 CLog::Log(LOGDEBUG,"-- imdb url: %s", url.m_strURL[0].c_str());
                 url.m_strID  = nfoReader.m_strImDbNr;
                 SScraperInfo info2(info);


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

Revision: 7857
          http://svn.sourceforge.net/xbmc/?rev=7857&view=rev
Author:   spiff_
Date:     2007-02-18 06:05:14 -0800 (Sun, 18 Feb 2007)

Log Message:
-----------
fixed: container.folderthumb didnt work.

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowMusicBase.cpp
    trunk/XBMC/xbmc/GUIWindowMusicBase.h
    trunk/XBMC/xbmc/GUIWindowPictures.cpp
    trunk/XBMC/xbmc/GUIWindowPrograms.cpp
    trunk/XBMC/xbmc/GUIWindowVideoBase.cpp

Modified: trunk/XBMC/xbmc/GUIWindowMusicBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicBase.cpp	2007-02-18 12:50:09 UTC (rev 7856)
+++ trunk/XBMC/xbmc/GUIWindowMusicBase.cpp	2007-02-18 14:05:14 UTC (rev 7857)
@@ -1764,4 +1764,14 @@
 
   // save
   pPlaylist->Save(strPlaylist);
+}
+
+bool CGUIWindowMusicBase::GetDirectory(const CStdString &strDirectory, CFileItemList &items)
+{
+  items.SetThumbnailImage("");
+  bool bResult = CGUIMediaWindow::GetDirectory(strDirectory,items);
+  if (bResult)
+    items.SetMusicThumb();
+
+  return bResult;
 }
\ No newline at end of file

Modified: trunk/XBMC/xbmc/GUIWindowMusicBase.h
===================================================================
--- trunk/XBMC/xbmc/GUIWindowMusicBase.h	2007-02-18 12:50:09 UTC (rev 7856)
+++ trunk/XBMC/xbmc/GUIWindowMusicBase.h	2007-02-18 14:05:14 UTC (rev 7857)
@@ -38,7 +38,8 @@
   \brief Overwrite to update your gui buttons (visible, enable,...)
   */
   virtual void UpdateButtons();
-
+  
+  virtual bool GetDirectory(const CStdString &strDirectory, CFileItemList &items);
   virtual void OnRetrieveMusicInfo(CFileItemList& items);
   void AddItemToPlayList(const CFileItem* pItem, CFileItemList &queuedItems);
   virtual void OnSearchItemFound(const CFileItem* pItem);

Modified: trunk/XBMC/xbmc/GUIWindowPictures.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowPictures.cpp	2007-02-18 12:50:09 UTC (rev 7856)
+++ trunk/XBMC/xbmc/GUIWindowPictures.cpp	2007-02-18 14:05:14 UTC (rev 7857)
@@ -265,7 +265,9 @@
   if (!CGUIMediaWindow::Update(strDirectory))
     return false;
 
+  m_vecItems.SetThumbnailImage("");
   m_thumbLoader.Load(m_vecItems);
+  m_vecItems.SetCachedPictureThumb();
 
   return true;
 }

Modified: trunk/XBMC/xbmc/GUIWindowPrograms.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowPrograms.cpp	2007-02-18 12:50:09 UTC (rev 7856)
+++ trunk/XBMC/xbmc/GUIWindowPrograms.cpp	2007-02-18 14:05:14 UTC (rev 7857)
@@ -799,7 +799,12 @@
   }
   m_database.CommitTransaction();
   // set the cached thumbs
+  items.SetThumbnailImage("");
   items.SetCachedProgramThumbs();
+  items.SetCachedProgramThumb();
+  if (!items.HasThumbnail())
+    items.SetUserProgramThumb();
+
   if (bProgressVisible)
     m_dlgProgress->Close();
 

Modified: trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2007-02-18 12:50:09 UTC (rev 7856)
+++ trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2007-02-18 14:05:14 UTC (rev 7857)
@@ -1446,7 +1446,9 @@
   if (!CGUIMediaWindow::Update(strDirectory))
     return false;
 
+  m_vecItems.SetThumbnailImage("");
   m_thumbLoader.Load(m_vecItems);
+  m_vecItems.SetVideoThumb();
   return true;
 }
 


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

Revision: 7861
          http://svn.sourceforge.net/xbmc/?rev=7861&view=rev
Author:   elupus
Date:     2007-02-18 18:12:43 -0800 (Sun, 18 Feb 2007)

Log Message:
-----------
fixed: potential deadlock on uninit of video renderer
changed: allow progress bar during mplayer init even if we already are in fullscreen ( stack borders, manual selection of subtitles... )

Modified Paths:
--------------
    trunk/XBMC/xbmc/Application.cpp
    trunk/XBMC/xbmc/GUIWindowFullScreen.cpp
    trunk/XBMC/xbmc/cores/VideoRenderers/RenderManager.cpp
    trunk/XBMC/xbmc/cores/VideoRenderers/RenderManager.h
    trunk/XBMC/xbmc/cores/dlgcache.cpp

Modified: trunk/XBMC/xbmc/Application.cpp
===================================================================
--- trunk/XBMC/xbmc/Application.cpp	2007-02-18 20:21:34 UTC (rev 7860)
+++ trunk/XBMC/xbmc/Application.cpp	2007-02-19 02:12:43 UTC (rev 7861)
@@ -2090,30 +2090,15 @@
   // that stuff should go into renderfullscreen instead as that is called from the renderin thread
 
   // dont show GUI when playing full screen video
-  if (m_gWindowManager.GetActiveWindow() == WINDOW_FULLSCREEN_VIDEO)
+#ifdef HAS_VIDEO_PLAYBACK
+  if (g_graphicsContext.IsFullScreenVideo() && IsPlaying() && !IsPaused())
   {
-    if ( g_graphicsContext.IsFullScreenVideo() )
-    {
-#ifdef HAS_VIDEO_PLAYBACK
-      if (m_pPlayer)
-      {
-        if (m_pPlayer->IsPaused())
-        {
-          CSingleLock lock(g_graphicsContext);
-          m_gWindowManager.UpdateModelessVisibility();
-          g_renderManager.RenderUpdate(true);
-          m_pd3dDevice->Present( NULL, NULL, NULL, NULL );
-          g_infoManager.ResetCache();
-          return ;
-        }
-      }
+    Sleep(50);
+    ResetScreenSaver();
+    g_infoManager.ResetCache();
+    return;
+  }
 #endif
-      Sleep(50);
-      ResetScreenSaver();
-      g_infoManager.ResetCache();
-      return ;
-    }
-  }
 
   // enable/disable video overlay window
   if (IsPlayingVideo() && m_gWindowManager.GetActiveWindow() != WINDOW_FULLSCREEN_VIDEO && !m_bScreenSave)
@@ -3730,6 +3715,10 @@
   if (m_gWindowManager.GetActiveWindow() == WINDOW_FULLSCREEN_VIDEO)
   {
     m_gWindowManager.UpdateModelessVisibility();
+
+    if (m_gWindowManager.HasDialogOnScreen()) return true;
+    if (g_Mouse.IsActive()) return true;
+
     CGUIWindowFullScreen *pFSWin = (CGUIWindowFullScreen *)m_gWindowManager.GetWindow(WINDOW_FULLSCREEN_VIDEO);
     if (!pFSWin)
       return false;
@@ -3751,6 +3740,19 @@
     if (!pFSWin)
       return ;
     pFSWin->RenderFullScreen();
+
+    // aslong as player is handling rendering, we update
+    // this stuff here, otherwise it will happen in main render
+    if( IsPlaying() && !IsPaused() )
+    {
+      if (m_gWindowManager.HasDialogOnScreen())
+        m_gWindowManager.RenderDialogs();
+      // Render the mouse pointer, if visible...
+      if (g_Mouse.IsActive())
+        g_application.m_guiPointer.Render();
+
+      g_infoManager.UpdateFPS();
+    }
   }
 }
 

Modified: trunk/XBMC/xbmc/GUIWindowFullScreen.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowFullScreen.cpp	2007-02-18 20:21:34 UTC (rev 7860)
+++ trunk/XBMC/xbmc/GUIWindowFullScreen.cpp	2007-02-19 02:12:43 UTC (rev 7861)
@@ -511,12 +511,12 @@
   return true;
 }
 
-// Dummy override of Render() - RenderFullScreen() is where the action takes place
-// this is called via mplayer when the video window is flipped (indicating a frame
-// change) so that we get smooth video playback
+// Override of Render() - RenderFullScreen() is where the action takes place
+// this is called from the rendermanager, normally we won't come this way
+// as player thread will handle rendering, and call this itself. 
 void CGUIWindowFullScreen::Render()
 {
-  return ;
+  g_renderManager.RenderUpdate(true);
 }
 
 bool CGUIWindowFullScreen::NeedRenderFullScreen()
@@ -526,6 +526,7 @@
   {
     if (g_application.m_pPlayer->IsPaused() ) return true;
     if (g_application.m_pPlayer->IsCaching() ) return true;
+    if (!g_application.m_pPlayer->IsPlaying() ) return true;
   }
   if (g_application.GetPlaySpeed() != 1) return true;
   if (m_timeCodeShow) return true;
@@ -536,8 +537,6 @@
   if (m_bShowCurrentTime) return true;
   if (g_infoManager.GetDisplayAfterSeek()) return true;
   if (g_infoManager.GetBool(PLAYER_SEEKBAR), GetID()) return true;
-  if (m_gWindowManager.HasDialogOnScreen()) return true;
-  if (g_Mouse.IsActive()) return true;
   if (CUtil::IsUsingTTFSubtitles() && g_application.m_pPlayer->GetSubtitleVisible() && m_subtitleFont)
     return true;
   if (m_bLastRender)
@@ -558,8 +557,6 @@
   m_bLastRender = true;
   if (!g_application.m_pPlayer) return ;
 
-  g_infoManager.UpdateFPS();
-
   if( g_application.m_pPlayer->IsCaching() )
   {
     g_infoManager.SetDisplayAfterSeek(0); //Make sure these stuff aren't visible now
@@ -695,12 +692,6 @@
     SET_CONTROL_HIDDEN(BLUE_BAR);
   }
   CGUIWindow::Render();
-
-  if (m_gWindowManager.HasDialogOnScreen())
-    m_gWindowManager.RenderDialogs();
-  // Render the mouse pointer, if visible...
-  if (g_Mouse.IsActive())
-    g_application.m_guiPointer.Render();
 }
 
 void CGUIWindowFullScreen::RenderTTFSubtitles()

Modified: trunk/XBMC/xbmc/cores/VideoRenderers/RenderManager.cpp
===================================================================
--- trunk/XBMC/xbmc/cores/VideoRenderers/RenderManager.cpp	2007-02-18 20:21:34 UTC (rev 7860)
+++ trunk/XBMC/xbmc/cores/VideoRenderers/RenderManager.cpp	2007-02-19 02:12:43 UTC (rev 7861)
@@ -105,6 +105,16 @@
   }
 }
 
+void CXBoxRenderManager::RenderUpdate(bool clear, DWORD flags, DWORD alpha)
+{
+  DWORD locks = ExitCriticalSection(g_graphicsContext);
+  CSharedLock lock(m_sharedSection); 
+  RestoreCriticalSection(g_graphicsContext, locks);
+
+  if (m_pRenderer)
+    m_pRenderer->RenderUpdate(clear, flags, alpha);
+}
+
 unsigned int CXBoxRenderManager::PreInit()
 {
   DWORD locks = ExitCriticalSection(g_graphicsContext);
@@ -150,16 +160,16 @@
 
 void CXBoxRenderManager::UnInit()
 {
+  DWORD locks = ExitCriticalSection(g_graphicsContext);
+
   m_bStop = true;
-  m_bIsStarted = false;
   m_eventFrame.Set();
-
   StopThread();
 
-  DWORD locks = ExitCriticalSection(g_graphicsContext);
   CExclusiveLock lock(m_sharedSection);
   RestoreCriticalSection(g_graphicsContext, locks);
 
+  m_bIsStarted = false;
   if (m_pRenderer)
   {
     m_pRenderer->UnInit();

Modified: trunk/XBMC/xbmc/cores/VideoRenderers/RenderManager.h
===================================================================
--- trunk/XBMC/xbmc/cores/VideoRenderers/RenderManager.h	2007-02-18 20:21:34 UTC (rev 7860)
+++ trunk/XBMC/xbmc/cores/VideoRenderers/RenderManager.h	2007-02-19 02:12:43 UTC (rev 7861)
@@ -17,7 +17,7 @@
   float GetAspectRatio() { CSharedLock lock(m_sharedSection); if (m_pRenderer) return m_pRenderer->GetAspectRatio(); else return 1.0f; };
   void AutoCrop(bool bCrop = true) { CSharedLock lock(m_sharedSection); if (m_pRenderer) m_pRenderer->AutoCrop(bCrop); };
   void Update(bool bPauseDrawing);
-  void RenderUpdate(bool clear) { CSharedLock lock(m_sharedSection); if (m_pRenderer) m_pRenderer->RenderUpdate(clear); };
+  void RenderUpdate(bool clear, DWORD flags = 0, DWORD alpha = 0);
   void SetupScreenshot();
   void CreateThumbnail(LPDIRECT3DSURFACE8 surface, unsigned int width, unsigned int height);
   void SetViewMode(int iViewMode) { CSharedLock lock(m_sharedSection); if (m_pRenderer) m_pRenderer->SetViewMode(iViewMode); };

Modified: trunk/XBMC/xbmc/cores/dlgcache.cpp
===================================================================
--- trunk/XBMC/xbmc/cores/dlgcache.cpp	2007-02-18 20:21:34 UTC (rev 7860)
+++ trunk/XBMC/xbmc/cores/dlgcache.cpp	2007-02-19 02:12:43 UTC (rev 7861)
@@ -43,13 +43,6 @@
 {
   m_pDlg = (CGUIDialogProgress*)m_gWindowManager.GetWindow(WINDOW_DIALOG_PROGRESS);
   if(m_pDlg == NULL) return;
-
-  /* if any other modal dialog is open, don't open this one */
-  if (m_gWindowManager.HasModalDialog() && !m_pDlg->IsRunning())
-  {
-    m_pDlg = NULL;
-    return;
-  }
   
   m_pDlg->SetHeading(438);
   m_pDlg->SetLine(0, m_strLinePrev);
@@ -63,9 +56,6 @@
 
 void CDlgCache::Update()
 {
-  if( g_graphicsContext.IsFullScreenVideo() )
-    return;
-
   if (m_pDlg)
   {
     m_pDlg->Progress();


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

Revision: 7877
          http://svn.sourceforge.net/xbmc/?rev=7877&view=rev
Author:   jmarshallnz
Date:     2007-02-19 15:33:22 -0800 (Mon, 19 Feb 2007)

Log Message:
-----------
changed: Faster sorting with "The " filtering.

Modified Paths:
--------------
    trunk/XBMC/xbmc/LangInfo.cpp
    trunk/XBMC/xbmc/Settings.cpp
    trunk/XBMC/xbmc/SortFileItem.cpp

Modified: trunk/XBMC/xbmc/LangInfo.cpp
===================================================================
--- trunk/XBMC/xbmc/LangInfo.cpp	2007-02-19 23:19:04 UTC (rev 7876)
+++ trunk/XBMC/xbmc/LangInfo.cpp	2007-02-19 23:33:22 UTC (rev 7877)
@@ -237,7 +237,7 @@
     while (pToken)
     {
       if (pToken->FirstChild() && pToken->FirstChild()->Value())
-        g_advancedSettings.m_vecTokens.push_back(pToken->FirstChild()->Value());
+        g_advancedSettings.m_vecTokens.push_back(CStdString(pToken->FirstChild()->Value()) + " ");
       pToken = pToken->NextSibling();
     }
   }

Modified: trunk/XBMC/xbmc/Settings.cpp
===================================================================
--- trunk/XBMC/xbmc/Settings.cpp	2007-02-19 23:19:04 UTC (rev 7876)
+++ trunk/XBMC/xbmc/Settings.cpp	2007-02-19 23:33:22 UTC (rev 7877)
@@ -1251,7 +1251,7 @@
     while (pToken)
     {
       if (pToken->FirstChild() && pToken->FirstChild()->Value())
-        g_advancedSettings.m_vecTokens.push_back(pToken->FirstChild()->Value());
+        g_advancedSettings.m_vecTokens.push_back(CStdString(pToken->FirstChild()->Value()) + " ");
       pToken = pToken->NextSibling();
     }
   }

Modified: trunk/XBMC/xbmc/SortFileItem.cpp
===================================================================
--- trunk/XBMC/xbmc/SortFileItem.cpp	2007-02-19 23:19:04 UTC (rev 7876)
+++ trunk/XBMC/xbmc/SortFileItem.cpp	2007-02-19 23:33:22 UTC (rev 7877)
@@ -22,18 +22,14 @@
 #include "stdafx.h"
 #include "SortFileItem.h"
 
-int StartsWithToken(const CStdString& strLabel)
+inline int StartsWithToken(const CStdString& strLabel)
 {
   for (unsigned int i=0;i<g_advancedSettings.m_vecTokens.size();++i)
   {
-    if (g_advancedSettings.m_vecTokens[i].size()+1 >= strLabel.size())
-      continue;
-
-    CStdString strCutLabel=strLabel.Left(g_advancedSettings.m_vecTokens[i].size()+1);
-    if ((strCutLabel).Equals(g_advancedSettings.m_vecTokens[i]+" "))
-      return strCutLabel.size();
+    if (g_advancedSettings.m_vecTokens[i].size() < strLabel.size() && 
+        strnicmp(g_advancedSettings.m_vecTokens[i].c_str(), strLabel.c_str(), g_advancedSettings.m_vecTokens[i].size()) == 0)
+      return g_advancedSettings.m_vecTokens[i].size();
   }
-
   return 0;
 }
 


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

Revision: 7878
          http://svn.sourceforge.net/xbmc/?rev=7878&view=rev
Author:   jmarshallnz
Date:     2007-02-19 15:46:12 -0800 (Mon, 19 Feb 2007)

Log Message:
-----------
changed: Sources.xml no longer required to boot, plus permanently added the "Add Source" button in the root list of file views.

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIDialogContextMenu.cpp
    trunk/XBMC/xbmc/GUIDialogFileBrowser.cpp
    trunk/XBMC/xbmc/GUIDialogMediaSource.cpp
    trunk/XBMC/xbmc/GUIMediaWindow.cpp
    trunk/XBMC/xbmc/GUIPassword.cpp
    trunk/XBMC/xbmc/GUIWindowSettingsCategory.cpp
    trunk/XBMC/xbmc/MediaManager.cpp
    trunk/XBMC/xbmc/MediaManager.h
    trunk/XBMC/xbmc/Settings.cpp
    trunk/XBMC/xbmc/Settings.h
    trunk/XBMC/xbmc/lib/libGoAhead/XBMCConfiguration.cpp

Modified: trunk/XBMC/xbmc/GUIDialogContextMenu.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogContextMenu.cpp	2007-02-19 23:33:22 UTC (rev 7877)
+++ trunk/XBMC/xbmc/GUIDialogContextMenu.cpp	2007-02-19 23:46:12 UTC (rev 7878)
@@ -402,6 +402,7 @@
         if (CGUIDialogFileBrowser::ShowAndGetImage(shares,g_localizeStrings.Get(20056),strThumb))
         {
           g_settings.UpdateBookmark(strType,share->strName,"thumbnail",strThumb);
+          g_settings.SaveSources();
 
           CGUIMessage msg(GUI_MSG_NOTIFY_ALL,0,0,GUI_MSG_UPDATE_BOOKMARKS);
           m_gWindowManager.SendThreadMessage(msg);
@@ -421,6 +422,7 @@
           return false;
 
         g_settings.UpdateBookmark(strType,share->strName,"thumbnail","");
+        g_settings.SaveSources();
         CGUIMessage msg(GUI_MSG_NOTIFY_ALL,0,0,GUI_MSG_UPDATE_BOOKMARKS);
         m_gWindowManager.SendThreadMessage(msg);
         return true;
@@ -519,12 +521,11 @@
           return false;
         // password entry and re-entry succeeded, write out the lock data
         share->m_iHasLock = 2;
-        g_settings.BeginBookmarkTransaction();
         g_settings.UpdateBookmark(strType, share->strName, "lockcode", strNewPassword);
         strNewPassword.Format("%i",share->m_iLockMode);
         g_settings.UpdateBookmark(strType, share->strName, "lockmode", strNewPassword);
         g_settings.UpdateBookmark(strType, share->strName, "badpwdcount", "0");
-        g_settings.CommitBookmarkTransaction();
+        g_settings.SaveSources();
 
         CGUIMessage msg(GUI_MSG_NOTIFY_ALL,0,0,GUI_MSG_UPDATE_BOOKMARKS);
         m_gWindowManager.SendThreadMessage(msg);
@@ -538,6 +539,7 @@
           return false;
 
         g_settings.UpdateBookmark(strType, share->strName, "badpwdcount", "0");
+        g_settings.SaveSources();
         CGUIMessage msg(GUI_MSG_NOTIFY_ALL,0,0,GUI_MSG_UPDATE_BOOKMARKS);
         m_gWindowManager.SendThreadMessage(msg);
         return true;
@@ -551,11 +553,10 @@
           return false;
 
         share->m_iHasLock = 0;
-        g_settings.BeginBookmarkTransaction();
         g_settings.UpdateBookmark(strType, share->strName, "lockmode", "0");
         g_settings.UpdateBookmark(strType, share->strName, "lockcode", "0");
         g_settings.UpdateBookmark(strType, share->strName, "badpwdcount", "0");
-        g_settings.CommitBookmarkTransaction();
+        g_settings.SaveSources();
         CGUIMessage msg(GUI_MSG_NOTIFY_ALL,0,0,GUI_MSG_UPDATE_BOOKMARKS);
         m_gWindowManager.SendThreadMessage(msg);
 
@@ -615,11 +616,10 @@
         if (!bResult)
           return false;
         // password ReSet and re-entry succeeded, write out the lock data
-        g_settings.BeginBookmarkTransaction();
         g_settings.UpdateBookmark(strType, share->strName, "lockcode", strNewPW);
         g_settings.UpdateBookmark(strType, share->strName, "lockmode", strNewLockMode);
         g_settings.UpdateBookmark(strType, share->strName, "badpwdcount", "0");
-        g_settings.CommitBookmarkTransaction();
+        g_settings.SaveSources();
         return true;
       }
       else if (btn == btn_Settings)
@@ -663,21 +663,17 @@
 
 void CGUIDialogContextMenu::SetDefault(const CStdString &strType, const CStdString &strDefault)
 {
-  if (g_settings.UpDateXbmcXML(strType, "default", strDefault))
-  {
-    if (strType == "myprograms")
-      strcpy(g_stSettings.m_szDefaultPrograms, strDefault.c_str());
-    else if (strType == "files")
-      strcpy(g_stSettings.m_szDefaultFiles, strDefault.c_str());
-    else if (strType == "music")
-      strcpy(g_stSettings.m_szDefaultMusic, strDefault.c_str());
-    else if (strType == "video")
-      strcpy(g_stSettings.m_szDefaultVideos, strDefault.c_str());
-    else if (strType == "pictures")
-      strcpy(g_stSettings.m_szDefaultPictures, strDefault.c_str());
-  }
-  else
-    CLog::Log(LOGERROR, "Could not change default bookmark for %s", strType.c_str());
+  if (strType == "myprograms")
+    strcpy(g_stSettings.m_szDefaultPrograms, strDefault.c_str());
+  else if (strType == "files")
+    strcpy(g_stSettings.m_szDefaultFiles, strDefault.c_str());
+  else if (strType == "music")
+    strcpy(g_stSettings.m_szDefaultMusic, strDefault.c_str());
+  else if (strType == "video")
+    strcpy(g_stSettings.m_szDefaultVideos, strDefault.c_str());
+  else if (strType == "pictures")
+    strcpy(g_stSettings.m_szDefaultPictures, strDefault.c_str());
+  g_settings.SaveSources();
 }
 
 void CGUIDialogContextMenu::ClearDefault(const CStdString &strType)

Modified: trunk/XBMC/xbmc/GUIDialogFileBrowser.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogFileBrowser.cpp	2007-02-19 23:33:22 UTC (rev 7877)
+++ trunk/XBMC/xbmc/GUIDialogFileBrowser.cpp	2007-02-19 23:46:12 UTC (rev 7878)
@@ -688,7 +688,9 @@
 void CGUIDialogFileBrowser::SetShares(VECSHARES &shares)
 {
   m_shares = shares;
-  m_rootDir.SetShares(shares);
+  if (!m_shares.size())
+    g_mediaManager.GetLocalDrives(m_shares);
+  m_rootDir.SetShares(m_shares);
 }
 
 void CGUIDialogFileBrowser::OnAddNetworkLocation()

Modified: trunk/XBMC/xbmc/GUIDialogMediaSource.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogMediaSource.cpp	2007-02-19 23:33:22 UTC (rev 7877)
+++ trunk/XBMC/xbmc/GUIDialogMediaSource.cpp	2007-02-19 23:46:12 UTC (rev 7878)
@@ -191,7 +191,6 @@
   bool confirmed(dialog->IsConfirmed());
   if (confirmed)
   { // yay, add this share
-    g_settings.BeginBookmarkTransaction();
     unsigned int i,j=2;
     bool bConfirmed=false;
     VECSHARES* pShares = g_settings.GetSharesFromType(type);
@@ -212,7 +211,6 @@
     CShare newShare;
     newShare.FromNameAndPaths(type, strName, dialog->GetPaths());
     g_settings.UpdateShare(type, strOldName, newShare);
-    g_settings.CommitBookmarkTransaction();
   }
   dialog->m_paths.Clear();
   return confirmed;

Modified: trunk/XBMC/xbmc/GUIMediaWindow.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIMediaWindow.cpp	2007-02-19 23:33:22 UTC (rev 7877)
+++ trunk/XBMC/xbmc/GUIMediaWindow.cpp	2007-02-19 23:46:12 UTC (rev 7878)
@@ -423,7 +423,7 @@
 
   int iWindow = GetID();
   bool bOkay = (iWindow == WINDOW_MUSIC_FILES || iWindow == WINDOW_VIDEO_FILES || iWindow == WINDOW_FILES || iWindow == WINDOW_PICTURES || iWindow == WINDOW_PROGRAMS);
-  if (strDirectory.IsEmpty() && m_vecItems.IsEmpty() && bOkay) // add 'add source button'
+  if (strDirectory.IsEmpty() && bOkay) // add 'add source button'
   {
     CStdString strLabel = g_localizeStrings.Get(1026);
     CFileItem *pItem = new CFileItem(strLabel);

Modified: trunk/XBMC/xbmc/GUIPassword.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIPassword.cpp	2007-02-19 23:33:22 UTC (rev 7877)
+++ trunk/XBMC/xbmc/GUIPassword.cpp	2007-02-19 23:46:12 UTC (rev 7878)
@@ -112,6 +112,7 @@
         pItem->m_iHasLock = 1;
         g_passwordManager.LockBookmark(strType,strLabel,false);
         g_settings.UpdateBookmark(strType, strLabel, "badpwdcount", itoa(pItem->m_iBadPwdCount, buffer, 10));
+        g_settings.SaveSources();
         break;
       }
     case 1:
@@ -120,6 +121,7 @@
         if (0 != g_guiSettings.GetInt("masterlock.maxretries"))
           pItem->m_iBadPwdCount++;
         g_settings.UpdateBookmark(strType, strLabel, "badpwdcount", itoa(pItem->m_iBadPwdCount, buffer, 10));
+        g_settings.SaveSources();
         break;
       }
     default:
@@ -575,7 +577,6 @@
   pShares[2] = g_settings.GetSharesFromType("video");
   pShares[3] = g_settings.GetSharesFromType("pictures");
   pShares[4] = g_settings.GetSharesFromType("files");
-  g_settings.BeginBookmarkTransaction();
   for (int i=0;i<5;++i)
   {
     for (IVECSHARES it=pShares[i]->begin();it != pShares[i]->end();++it)
@@ -586,7 +587,7 @@
         g_settings.UpdateBookmark(strType[i],it->strName,"lockmode","0"); // removes locks from xml
       }
   }
-  g_settings.CommitBookmarkTransaction();
+  g_settings.SaveSources();
   CGUIMessage msg(GUI_MSG_NOTIFY_ALL,0,0, GUI_MSG_UPDATE_BOOKMARKS);
   m_gWindowManager.SendThreadMessage(msg);
 }

Modified: trunk/XBMC/xbmc/GUIWindowSettingsCategory.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2007-02-19 23:33:22 UTC (rev 7877)
+++ trunk/XBMC/xbmc/GUIWindowSettingsCategory.cpp	2007-02-19 23:46:12 UTC (rev 7878)
@@ -1111,7 +1111,9 @@
   else if (strSetting.Equals("myvideos.exportvideolibrary"))
   {
     CStdString path(g_settings.GetDatabaseFolder());
-    if (CGUIDialogFileBrowser::ShowAndGetDirectory(g_settings.m_vecMyFilesShares, g_localizeStrings.Get(651), path, true))
+    VECSHARES shares;
+    g_mediaManager.GetLocalDrives(shares);
+    if (CGUIDialogFileBrowser::ShowAndGetDirectory(shares, g_localizeStrings.Get(651), path, true))
     {
       CUtil::AddFileToFolder(path, "videodb.xml", path);
       CVideoDatabase videodatabase;
@@ -1123,7 +1125,9 @@
   else if (strSetting.Equals("myvideos.importvideolibrary"))
   {
     CStdString path(g_settings.GetDatabaseFolder());
-    if (CGUIDialogFileBrowser::ShowAndGetFile(g_settings.m_vecMyFilesShares, "videodb.xml", g_localizeStrings.Get(651) , path))
+    VECSHARES shares;
+    g_mediaManager.GetLocalDrives(shares);
+    if (CGUIDialogFileBrowser::ShowAndGetFile(shares, "videodb.xml", g_localizeStrings.Get(651) , path))
     {
       CVideoDatabase videodatabase;
       videodatabase.Open();

Modified: trunk/XBMC/xbmc/MediaManager.cpp
===================================================================
--- trunk/XBMC/xbmc/MediaManager.cpp	2007-02-19 23:33:22 UTC (rev 7877)
+++ trunk/XBMC/xbmc/MediaManager.cpp	2007-02-19 23:46:12 UTC (rev 7878)
@@ -90,7 +90,7 @@
   return xmlDoc.SaveFile(MEDIA_SOURCES_XML);
 }
 
-void CMediaManager::GetLocalDrives(VECSHARES &localDrives)
+void CMediaManager::GetLocalDrives(VECSHARES &localDrives, bool includeQ)
 {
   // Local shares
   CShare share;
@@ -117,6 +117,13 @@
     share.strName = "G Drive";
     localDrives.push_back(share);
   }
+  if (includeQ)
+  {
+    CShare share;
+    share.strPath = "Q:\\";
+    share.strName = "Q Drive";
+    localDrives.push_back(share);
+  }
 }
 
 void CMediaManager::GetNetworkLocations(VECSHARES &locations)

Modified: trunk/XBMC/xbmc/MediaManager.h
===================================================================
--- trunk/XBMC/xbmc/MediaManager.h	2007-02-19 23:33:22 UTC (rev 7877)
+++ trunk/XBMC/xbmc/MediaManager.h	2007-02-19 23:46:12 UTC (rev 7878)
@@ -18,7 +18,7 @@
   bool LoadSources();
   bool SaveSources();
 
-  void GetLocalDrives(VECSHARES &localDrives);
+  void GetLocalDrives(VECSHARES &localDrives, bool includeQ = false);
   void GetNetworkLocations(VECSHARES &locations);
 
   bool AddNetworkLocation(const CStdString &path);

Modified: trunk/XBMC/xbmc/Settings.cpp
===================================================================
--- trunk/XBMC/xbmc/Settings.cpp	2007-02-19 23:33:22 UTC (rev 7877)
+++ trunk/XBMC/xbmc/Settings.cpp	2007-02-19 23:46:12 UTC (rev 7878)
@@ -37,6 +37,7 @@
 #include "filesystem/MultiPathDirectory.h"
 #include "GUIBaseContainer.h" // for VIEW_TYPE enum
 #include "utils/fancontroller.h"
+#include "MediaManager.h"
 #ifdef HAS_XBOX_HARDWARE
 #include "utils/MemoryUnitManager.h"
 #endif
@@ -95,7 +96,6 @@
   }
 
   strName = name;
-  m_iBufferSize = 0;
   m_iLockMode = LOCK_MODE_EVERYONE;
   m_strLockCode = "0";
   m_iBadPwdCount = 0;
@@ -265,9 +265,6 @@
   g_advancedSettings.m_iTuxBoxDefaultSubMenu = 4;
   g_advancedSettings.m_iTuxBoxDefaultRootMenu = 0; //default TV Mode
   g_advancedSettings.m_iTuxBoxZapWaitTime = 0; // Time in sec. Default 0:OFF
-
-  xbmcXmlLoaded = false;
-  bTransaction = false;
 }
 
 CSettings::~CSettings(void)
@@ -329,46 +326,23 @@
   CStdString strXMLFile = GetSourcesFile();
   CLog::Log(LOGNOTICE, "%s",strXMLFile.c_str());
   TiXmlDocument xmlDoc;
-  if ( !xmlDoc.LoadFile( strXMLFile.c_str() ) )
+  TiXmlElement *pRootElement = NULL;
+  if ( xmlDoc.LoadFile( strXMLFile.c_str() ) )
   {
-    g_LoadErrorStr.Format("%s, Line %d\n%s", strXMLFile.c_str(), xmlDoc.ErrorRow(), xmlDoc.ErrorDesc());
-    return false;
+    pRootElement = xmlDoc.RootElement();
+    CStdString strValue;
+    if (pRootElement)
+      strValue = pRootElement->Value();
+    if ( strValue != "sources")
+      CLog::Log(LOGERROR, __FUNCTION__" sources.xml file does not contain <sources>");
   }
+  else
+    CLog::Log(LOGERROR, __FUNCTION__" Error loading %s: Line %d, %s", strXMLFile.c_str(), xmlDoc.ErrorRow(), xmlDoc.ErrorDesc());
 
-  TiXmlElement* pRootElement = xmlDoc.RootElement();
-  CStdString strValue;
-  if (pRootElement)
-    strValue = pRootElement->Value();
-  if ( strValue != "sources")
-  {
-    g_LoadErrorStr.Format("%s Doesn't contain <sources>", strXMLFile.c_str());
-    return false;
-  }
-  /*
-  TiXmlElement* pFileTypeIcons = pRootElement->FirstChildElement("filetypeicons");
-  TiXmlNode* pFileType = pFileTypeIcons->FirstChild();
-  while (pFileType)
-  {
-    CFileTypeIcon icon;
-    icon.m_strName = ".";
-    icon.m_strName += pFileType->Value();
-    icon.m_strIcon = pFileType->FirstChild()->Value();
-    m_vecIcons.push_back(icon);
-    pFileType = pFileType->NextSibling();
-  }*/
-
-  LoadUserFolderLayout(pRootElement);
-
-  LoadRSSFeeds();
-
-#ifdef HAS_XBOX_HARDWARE
-  helper.Unmount("S:");
-#endif
-
   // look for external sources file
   CStdString strCached = "Z:\\remotesources.xml";
   bool bRemoteSourceFile = false;
-  TiXmlNode *pInclude = pRootElement->FirstChild("remote");
+  TiXmlNode *pInclude = pRootElement ? pRootElement->FirstChild("remote") : NULL;
   if (pInclude)
   {
     CStdString strRemoteFile = pInclude->FirstChild()->Value();
@@ -401,40 +375,50 @@
   if (bRemoteSourceFile)
   {
     strXMLFile = strCached;
-    if ( !xmlDoc.LoadFile( strXMLFile.c_str() ) )
+    if ( xmlDoc.LoadFile( strXMLFile.c_str() ) )
     {
-      g_LoadErrorStr.Format("%s, Line %d\n%s", strXMLFile.c_str(), xmlDoc.ErrorRow(), xmlDoc.ErrorDesc());
-      return false;
+      pRootElement = xmlDoc.RootElement();
+      CStdString strValue;
+      if (pRootElement)
+        strValue = pRootElement->Value();
+      if ( strValue != "sources")
+        CLog::Log(LOGERROR, __FUNCTION__" remote_sources.xml file does not contain <sources>");
     }
-
-    pRootElement = xmlDoc.RootElement();
-    if (pRootElement)
-      strValue = pRootElement->Value();
-    if ( strValue != "sources")
-    {
-      g_LoadErrorStr.Format("%s Doesn't contain <sources>", strXMLFile.c_str());
-      return false;
-    }
+    else
+      CLog::Log(LOGERROR, __FUNCTION__" unable to load file: %s, Line %d, %s", strXMLFile.c_str(), xmlDoc.ErrorRow(), xmlDoc.ErrorDesc());
   }
 
-  // parse my programs bookmarks...
-  CStdString strDefault;
-  GetShares(pRootElement, "myprograms", m_vecMyProgramsShares, strDefault);
-  strcpy( g_stSettings.m_szDefaultPrograms, strDefault.c_str());
+  if (pRootElement)
+  {
+    // parse my programs bookmarks...
+    CStdString strDefault;
+    GetShares(pRootElement, "myprograms", m_vecMyProgramsShares, strDefault);
+    strcpy( g_stSettings.m_szDefaultPrograms, strDefault.c_str());
 
-  GetShares(pRootElement, "pictures", m_vecMyPictureShares, strDefault);
-  strcpy( g_stSettings.m_szDefaultPictures, strDefault.c_str());
+    GetShares(pRootElement, "pictures", m_vecMyPictureShares, strDefault);
+    strcpy( g_stSettings.m_szDefaultPictures, strDefault.c_str());
 
-  GetShares(pRootElement, "files", m_vecMyFilesShares, strDefault);
-  strcpy( g_stSettings.m_szDefaultFiles, strDefault.c_str());
+    // TODO: Get rid of filemanager sources eventually?
+    GetShares(pRootElement, "files", m_vecMyFilesShares, strDefault);
+    strcpy( g_stSettings.m_szDefaultFiles, strDefault.c_str());
 
-  GetShares(pRootElement, "music", m_vecMyMusicShares, strDefault);
-  strcpy( g_stSettings.m_szDefaultMusic, strDefault.c_str());
+    GetShares(pRootElement, "music", m_vecMyMusicShares, strDefault);
+    strcpy( g_stSettings.m_szDefaultMusic, strDefault.c_str());
 
-  GetShares(pRootElement, "video", m_vecMyVideoShares, strDefault);
-  strcpy( g_stSettings.m_szDefaultVideos, strDefault.c_str());
+    GetShares(pRootElement, "video", m_vecMyVideoShares, strDefault);
+    strcpy( g_stSettings.m_szDefaultVideos, strDefault.c_str());
+  }
+  if (!m_vecMyFilesShares.size())
+    g_mediaManager.GetLocalDrives(m_vecMyFilesShares, true);  // true to include Q
 
   bXboxMediacenter = true;
+
+  LoadRSSFeeds();
+  LoadUserFolderLayout();
+
+#ifdef HAS_XBOX_HARDWARE
+  helper.Unmount("S:");
+#endif
   return true;
 }
 
@@ -609,8 +593,6 @@
     pPathName = pPathName->NextSibling("path");
   }
 
-  const TiXmlNode *pCacheNode = bookmark->FirstChild("cache");
-  const TiXmlNode *pDepthNode = bookmark->FirstChild("depth");
   const TiXmlNode *pLockMode = bookmark->FirstChild("lockmode");
   const TiXmlNode *pLockCode = bookmark->FirstChild("lockcode");
   const TiXmlNode *pBadPwdCount = bookmark->FirstChild("badpwdcount");
@@ -680,11 +662,6 @@
       CLog::Log(LOGDEBUG,"        Path: %s", share.strPath.c_str());
 
     share.m_iBadPwdCount = 0;
-    if (pCacheNode)
-    {
-      share.m_iBufferSize = atoi( pCacheNode->FirstChild()->Value() );
-    }
-
     if (pLockMode)
     {
       share.m_iLockMode = atoi( pLockMode->FirstChild()->Value() );
@@ -1994,20 +1971,6 @@
   return xmlDoc.SaveFile(strSettingsFile);
 }
 
-bool CSettings::LoadXml()
-{
-  // load xml file - we use the xbe path in case we were loaded as dash
-  if (!xbmcXmlLoaded)
-  {
-    if ( !xbmcXml.LoadFile( g_settings.GetSourcesFile() ) )
-    {
-      return false;
-    }
-    xbmcXmlLoaded = true;
-  }
-  return true;
-}
-
 bool CSettings::LoadUPnPXml(const CStdString& strSettingsFile)
 {
   TiXmlDocument UPnPDoc;
@@ -2113,32 +2076,8 @@
   return xmlDoc.SaveFile(strSettingsFile);
 }
 
-void CSettings::CloseXml()
-{
-  xbmcXmlLoaded = false;
-  xbmcXml.Clear();
-}
-
-void CSettings::BeginBookmarkTransaction()
-{
-  bTransaction = true;
-  bChangedDuringTransaction = false;
-}
-
-bool CSettings::CommitBookmarkTransaction()
-{
-  bool bResult=true;
-  if (bChangedDuringTransaction)
-    bResult = xbmcXml.SaveFile();
-  if (bResult)
-    bTransaction = false;
-
-  return bResult;
-}
-
 bool CSettings::UpdateShare(const CStdString &type, const CStdString oldName, const CShare &share)
 {
-  if (!LoadXml()) return false;
   VECSHARES *pShares = GetSharesFromType(type);
 
   if (!pShares) return false;
@@ -2161,75 +2100,12 @@
     return false;
 
   // Update our XML file as well
-  TiXmlElement *pRootElement = xbmcXml.RootElement();
-  TiXmlNode *pNode = NULL;
-  TiXmlNode *pIt = NULL;
-
-  pNode = pRootElement->FirstChild(type);
-  if (pNode)
-  {
-    bool foundXML(false);
-    pIt = pNode->FirstChild("bookmark");
-    while (pIt)
-    {
-      CShare oldShare;
-      if (GetShare(type, pIt, oldShare))
-      {
-        if (oldShare.strName == oldName) // TODO: Should we be checking path here?
-        {
-          foundXML = true;
-          // remove all the old paths and add the new ones
-          TiXmlNode *pChild = pIt->FirstChild("path");
-          while (pChild)
-          {
-            pIt->RemoveChild(pChild);
-            pChild = pIt->FirstChild("path");
-          }
-          // and add the new ones
-          for (unsigned int i = 0; i < share.vecPaths.size(); i++)
-          {
-            TiXmlText xmlText(share.vecPaths[i]);
-            TiXmlElement eElement("path");
-            eElement.InsertEndChild(xmlText);
-            pIt->InsertEndChild(eElement);
-          }
-          // and modify the <name> element
-          pChild = pIt->FirstChild("name");
-          if (pChild)
-          { // update it
-            pIt->FirstChild("name")->FirstChild()->SetValue(share.strName);
-          }
-          else
-          { // we don't, so make a new one
-            TiXmlText xmlText(share.strName);
-            TiXmlElement eElement("name");
-            eElement.InsertEndChild(xmlText);
-            pIt->ToElement()->InsertEndChild(eElement);
-          }
-          break;
-        }
-      }
-      pIt = pIt->NextSibling("bookmark");
-    }
-    if (!foundXML)
-      CLog::Log(LOGERROR, "Unable to find bookmark with name %s to update", oldName.c_str());
-
-    if (bTransaction)
-    {
-      bChangedDuringTransaction = true;
-      return true;
-    }
-
-    return xbmcXml.SaveFile();
-  }
-  return false;
+  return SaveSources();
 }
 
+// NOTE: This function does NOT save the sources.xml file - you need to call SaveSources() separately.
 bool CSettings::UpdateBookmark(const CStdString &strType, const CStdString strOldName, const CStdString &strUpdateElement, const CStdString &strUpdateText)
 {
-  bool breturn(false);
-  if (!LoadXml()) return false;
-
   VECSHARES *pShares = GetSharesFromType(strType);
 
   if (!pShares) return false;
@@ -2238,12 +2114,10 @@
   if (strUpdateElement.Equals("path") && CUtil::IsVirtualPath(strUpdateText))
     return false;
 
-  CShare* pShare;
   for (IVECSHARES it = pShares->begin(); it != pShares->end(); it++)
   {
     if ((*it).strName == strOldName)
     {
-      breturn = true;
       if ("name" == strUpdateElement)
         (*it).strName = strUpdateText;
       else if ("lockmode" == strUpdateElement)
@@ -2262,146 +2136,14 @@
       }
       else
         return false;
-      pShare = &(*it);
-      break;
-    }
-  }
-
-  // Update our XML file as well
-  TiXmlElement *pRootElement = xbmcXml.RootElement();
-
-  TiXmlNode *pNode = NULL;
-  TiXmlNode *pIt = NULL;
-
-  pNode = pRootElement->FirstChild(strType);
-  bool foundXML(false);
-  if (pNode && breturn)
-  {
-    pIt = pNode->FirstChild("bookmark");
-    while (pIt)
-    {
-      CShare share;
-      if (GetShare(strType, pIt, share))
-      {
-        if (share.strName == strOldName) // TODO: Should we be checking path here?
-        {
-          foundXML = true;
-          // check we have strUpdateElement ("name" etc.)
-          const TiXmlNode *pChild = pIt->FirstChild(strUpdateElement);
-          if (pChild)
-          { // we do, so update it
-            pIt->FirstChild(strUpdateElement)->FirstChild()->SetValue(strUpdateText);
-          }
-          else
-          { // we don't, so make a new one
-            TiXmlText xmlText(strUpdateText);
-            TiXmlElement eElement(strUpdateElement);
-            eElement.InsertEndChild(xmlText);
-            pIt->ToElement()->InsertEndChild(eElement);
-          }
-          if (pShare->m_iHasLock == 0) // remove lock entries
-          {
-            TiXmlNode* pChild2 = pIt->FirstChild("lockmode");
-            if (pChild2)
-              pIt->RemoveChild(pChild2);
-            pChild2 = pIt->FirstChild("lockcode");
-            if (pChild2)
-              pIt->RemoveChild(pChild2);
-            pChild2 = pIt->FirstChild("badpwdcount");
-            if (pChild2)
-              pIt->RemoveChild(pChild2);
-          }
-          if (pShare->m_strThumbnailImage == "")
-          {
-            TiXmlNode* pChild2 = pIt->FirstChild("thumbnail");
-            if (pChild2)
-              pIt->RemoveChild(pChild2);
-          }
-          break;
-        }
-      }
-      pIt = pIt->NextSibling("bookmark");
-    }
-    if (!foundXML)
-      CLog::Log(LOGERROR, "Unable to find bookmark with name %s to update the %s", strOldName.c_str(), strUpdateElement.c_str());
-
-    if (bTransaction)
-    {
-      bChangedDuringTransaction = true;
       return true;
     }
-
-    return xbmcXml.SaveFile();
   }
   return false;
 }
 
-bool CSettings::UpDateXbmcXML(const CStdString &strFirstChild, const CStdString &strChild, const CStdString &strChildValue)
-{
-  bool breturn; breturn = false;
-  if (!LoadXml()) return false;
-  //<strFirstChild>
-  //    <strChild>strChildValue</strChild>
-
-  TiXmlElement *pRootElement = xbmcXml.RootElement();
-  if (!pRootElement) return false;
-  TiXmlNode *pNode = pRootElement->FirstChild(strFirstChild);
-  if (!pNode) return false;
-  TiXmlNode *pIt = pNode->FirstChild(strChild);;
-  if (pIt)
-  {
-    if (pIt->FirstChild())
-      pIt->FirstChild()->SetValue(strChildValue);
-    else
-    {
-      TiXmlText xmlText(strChildValue);
-      pIt->InsertEndChild(xmlText);
-    }
-    breturn = true;
-  }
-  else
-  {
-    TiXmlText xmlText(strChildValue);
-    TiXmlElement eElement(strChild);
-    eElement.InsertEndChild(xmlText);
-    pNode->ToElement()->InsertEndChild(eElement);
-    breturn = true;
-  }
-  if(breturn)
-    return xbmcXml.SaveFile();
-  else return false;
-}
-
-bool CSettings::UpDateXbmcXML(const CStdString &strFirstChild, const CStdString &strFirstChildValue)
-{
-  if (!LoadXml()) return false;
-
-  //
-  //<strFirstChild>strFirstChildValue<strFirstChild>
-
-  TiXmlElement *pRootElement = xbmcXml.RootElement();
-  TiXmlNode *pNode = pRootElement->FirstChild(strFirstChild);;
-  if (pNode)
-  {
-    if (pNode->FirstChild())
-      pNode->FirstChild()->SetValue(strFirstChildValue);
-    else
-    {
-      TiXmlText xmlText(strFirstChildValue);
-      pNode->InsertEndChild(xmlText);
-    }
-    return xbmcXml.SaveFile();
-  }
-  else return false;
-}
-
 bool CSettings::DeleteBookmark(const CStdString &strType, const CStdString strName, const CStdString strPath)
 {
-  if (strType.Find("upnp") < 0)
-  {
-    if (!LoadXml()) return false; 
-  }
-
   VECSHARES *pShares = GetSharesFromType(strType);
   if (!pShares) return false;
 
@@ -2421,83 +2163,11 @@
   if (strType.Find("upnp") > -1)
     return found;
 
-  // Return bookmark of
-  if (found)
-  {
-    bool foundXML(false);  // for debugging
-    TiXmlElement *pRootElement = xbmcXml.RootElement();
-    TiXmlNode *pNode = NULL;
-    TiXmlNode *pIt = NULL;
-
-    pNode = pRootElement->FirstChild(strType);
-
-    // if valid bookmark, find child at pos (id)
-    if (pNode)
-    {
-      pIt = pNode->FirstChild("bookmark");
-      while (pIt)
-      {
-        CShare share;
-        if (GetShare(strType, pIt, share))
-        {
-          if (share.strName == strName && share.strPath == strPath)
-          {
-            foundXML = true;
-            pNode->RemoveChild(pIt);
-            break;
-          }
-        }
-        pIt = pIt->NextSibling("bookmark");
-      }
-    }
-    if (!foundXML)
-      CLog::Log(LOGERROR, "Unable to find the bookmark %s with path %s for deletion from sources.xml", strName.c_str(), strPath.c_str());
-    return xbmcXml.SaveFile();
-  }
-  else
-    CLog::Log(LOGERROR, "Unable to find the bookmark %s with path %s for deletion from our shares list", strName.c_str(), strPath.c_str());
-  return false;
+  return SaveSources();
 }
 
 bool CSettings::AddShare(const CStdString &type, const CShare &share)
 {
-  bool success;
-  if (type.Find("upnp") < 0)
-  {
-    if (!LoadXml()) 
-      return false;
-    // Add to the xml file
-    TiXmlElement *pRootElement = xbmcXml.RootElement();
-    TiXmlNode *pNode = NULL;
-
-    pNode = pRootElement->FirstChild(type);
-
-    // create a new Element
-    TiXmlText xmlName(share.strName);
-    TiXmlElement eName("name");
-    eName.InsertEndChild(xmlName);
-
-    TiXmlElement bookmark("bookmark");
-    bookmark.InsertEndChild(eName);
-
-    for (unsigned int i = 0; i < share.vecPaths.size(); i++)
-    {
-      TiXmlText xmlPath(share.vecPaths[i]);
-      TiXmlElement ePath("path");
-      ePath.InsertEndChild(xmlPath);
-      bookmark.InsertEndChild(ePath);
-    }
-
-    if (pNode)
-      pNode->ToElement()->InsertEndChild(bookmark);
-
-    success = xbmcXml.SaveFile();
-  }
-  else
-  {
-    success = true;
-  }
-
   VECSHARES *pShares = GetSharesFromType(type);
   if (!pShares) return false;
 
@@ -2519,9 +2189,63 @@
   }
   pShares->push_back(shareToAdd);
 
-  return success;
+  if (type.Find("upnp") < 0)
+  {
+    return SaveSources();
+  }
+  return true;
 }
 
+bool CSettings::SaveSources()
+{
+  // TODO: Should we be specifying utf8 here??
+  TiXmlDocument doc;
+  TiXmlElement xmlRootElement("sources");
+  TiXmlNode *pRoot = doc.InsertEndChild(xmlRootElement);
+  if (!pRoot) return false;
+
+  // ok, now run through and save each sources section
+  SetShares(pRoot, "myprograms", g_settings.m_vecMyProgramsShares, g_stSettings.m_szDefaultPrograms);
+  SetShares(pRoot, "video", g_settings.m_vecMyVideoShares, g_stSettings.m_szDefaultVideos);
+  SetShares(pRoot, "music", g_settings.m_vecMyMusicShares, g_stSettings.m_szDefaultMusic);
+  SetShares(pRoot, "pictures", g_settings.m_vecMyPictureShares, g_stSettings.m_szDefaultPictures);
+  SetShares(pRoot, "files", g_settings.m_vecMyFilesShares, g_stSettings.m_szDefaultFiles);
+
+  return doc.SaveFile(g_settings.GetSourcesFile());
+}
+
+bool CSettings::SetShares(TiXmlNode *root, const char *section, const VECSHARES &shares, const char *defaultPath)
+{
+  TiXmlElement sectionElement(section);
+  TiXmlNode *sectionNode = root->InsertEndChild(sectionElement);
+  if (sectionNode)
+  {
+    SetString(sectionNode, "default", defaultPath);
+    for (unsigned int i = 0; i < shares.size(); i++)
+    {
+      const CShare &share = shares[i];
+      TiXmlElement bookmark("bookmark");
+
+      SetString(&bookmark, "name", share.strName);
+
+      for (unsigned int i = 0; i < share.vecPaths.size(); i++)
+        SetString(&bookmark, "path", share.vecPaths[i]);
+
+      if (share.m_iHasLock)
+      {
+        SetInteger(&bookmark, "lockmode", share.m_iLockMode);
+        SetString(&bookmark, "lockcode", share.m_strLockCode);
+        SetInteger(&bookmark, "badpwdcount", share.m_iBadPwdCount);
+      }
+      if (!share.m_strThumbnailImage.IsEmpty())
+        SetString(&bookmark, "thumbnail", share.m_strThumbnailImage);
+
+      sectionNode->InsertEndChild(bookmark);
+    } 
+  }
+  return true;
+}
+
 void CSettings::LoadSkinSettings(const TiXmlElement* pRootElement)
 {
   int number = 0;
@@ -2594,7 +2318,6 @@
   m_szMyVideoCleanTokensArray.clear();
   g_advancedSettings.m_videoStackRegExps.clear();
   m_mapRssUrls.clear();
-  xbmcXml.Clear();
   m_skinBools.clear();
   m_skinStrings.clear();
 }
@@ -2728,7 +2451,7 @@
   g_infoManager.ResetCache();
 }
 
-void CSettings::LoadUserFolderLayout(const TiXmlElement *pRootElement)
+void CSettings::LoadUserFolderLayout()
 {
   // check them all
   if (g_guiSettings.GetString("system.playlistspath") == "set default")

Modified: trunk/XBMC/xbmc/Settings.h
===================================================================
--- trunk/XBMC/xbmc/Settings.h	2007-02-19 23:33:22 UTC (rev 7877)
+++ trunk/XBMC/xbmc/Settings.h	2007-02-19 23:46:12 UTC (rev 7878)
@@ -87,7 +87,7 @@
 class CShare
 {
 public:
-  CShare() { m_iBufferSize=0; m_iDriveType=SHARE_TYPE_UNKNOWN; m_iLockMode=LOCK_MODE_EVERYONE; m_iBadPwdCount=0; };
+  CShare() { m_iDriveType=SHARE_TYPE_UNKNOWN; m_iLockMode=LOCK_MODE_EVERYONE; m_iBadPwdCount=0; m_iHasLock=0; };
   virtual ~CShare() {};
 
   void FromNameAndPaths(const CStdString &category, const CStdString &name, const vector<CStdString> &paths);
@@ -96,7 +96,6 @@
   CStdString strStatus; ///< Status of the share (eg has disk etc.)
   CStdString strPath; ///< Path of the share, eg. iso9660:// or F:
   CStdString strEntryPoint; ///< entry point of shares, used with archives
-  int m_iBufferSize;   ///< Cachesize of the share
 
   /*!
   \brief The type of the share.
@@ -201,16 +200,11 @@
   VECSHARES *GetSharesFromType(const CStdString &type);
   CStdString GetDefaultShareFromType(const CStdString &type);
 
-  void BeginBookmarkTransaction();
   bool UpdateBookmark(const CStdString &strType, const CStdString strOldName, const CStdString &strUpdateChild, const CStdString &strUpdateValue);
-  bool CommitBookmarkTransaction();
   bool DeleteBookmark(const CStdString &strType, const CStdString strName, const CStdString strPath);
   bool UpdateShare(const CStdString &type, const CStdString oldName, const CShare &share);
   bool AddShare(const CStdString &type, const CShare &share);
 
-  bool UpDateXbmcXML(const CStdString &strFirstChild, const CStdString &strChild, const CStdString &strChildValue);
-  bool UpDateXbmcXML(const CStdString &strFirstChild, const CStdString &strFirstChildValue);
-
   int TranslateSkinString(const CStdString &setting);
   const CStdString &GetSkinString(int setting) const;
   void SetSkinString(int setting, const CStdString &label);
@@ -428,8 +422,9 @@
   bool SaveProfiles(const CStdString& strSettingsFile) const;
 
   bool SaveSettings(const CStdString& strSettingsFile) const;
-  TiXmlDocument xbmcXml;  // for editing the xml file from within XBMC
 
+  bool SaveSources();
+
 protected:
   void GetInteger(const TiXmlElement* pRootElement, const char *strTagName, int& iValue, const int iDefault, const int iMin, const int iMax);
   void GetFloat(const TiXmlElement* pRootElement, const char *strTagName, float& fValue, const float fDefault, const float fMin, const float fMax);
@@ -437,6 +432,7 @@
   void GetString(const TiXmlElement* pRootElement, const char *strTagName, char *szValue, const CStdString& strDefaultValue);
   bool GetShare(const CStdString &category, const TiXmlNode *bookmark, CShare &share);
   void GetShares(const TiXmlElement* pRootElement, const CStdString& strTagName, VECSHARES& items, CStdString& strDefault);
+  bool SetShares(TiXmlNode *root, const char *section, const VECSHARES &shares, const char *defaultPath);
   void GetViewState(const TiXmlElement* pRootElement, const CStdString& strTagName, CViewState &viewState);
 
   void ConvertHomeVar(CStdString& strText);
@@ -454,10 +450,6 @@
   bool LoadSettings(const CStdString& strSettingsFile);
 //  bool SaveSettings(const CStdString& strSettingsFile) const;
 
-  bool LoadXml();
-  void CloseXml();
-
-
   // skin activated settings
   void LoadSkinSettings(const TiXmlElement* pElement);
   void SaveSkinSettings(TiXmlNode *pElement) const;
@@ -465,7 +457,7 @@
   // Advanced settings
   void LoadAdvancedSettings();
 
-  void LoadUserFolderLayout(const TiXmlElement *pRootElement);
+  void LoadUserFolderLayout();
 
   void LoadRSSFeeds();
 
@@ -475,10 +467,6 @@
   bool SaveAvpackSettings(TiXmlNode *io_pRoot) const;
   bool LoadAvpackXML();
 
-  //TiXmlDocument xbmcXml;  // for editing the xml file from within XBMC
-  bool xbmcXmlLoaded;
-  bool bTransaction;
-  bool bChangedDuringTransaction;
 };
 
 extern class CSettings g_settings;

Modified: trunk/XBMC/xbmc/lib/libGoAhead/XBMCConfiguration.cpp
===================================================================
--- trunk/XBMC/xbmc/lib/libGoAhead/XBMCConfiguration.cpp	2007-02-19 23:33:22 UTC (rev 7877)
+++ trunk/XBMC/xbmc/lib/libGoAhead/XBMCConfiguration.cpp	2007-02-19 23:46:12 UTC (rev 7878)
@@ -365,10 +365,9 @@
   if (nr > 0 && nr <= (int)pShares->size()) // update share
   {
     const CShare& share = (*pShares)[nr-1];
-    g_settings.BeginBookmarkTransaction();
     g_settings.UpdateBookmark(type, share.strName, "path", path);
     g_settings.UpdateBookmark(type, share.strName, "name", name);
-    g_settings.CommitBookmarkTransaction();
+    g_settings.SaveSources();
     return 0;
   }
   


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

Revision: 7884
          http://svn.sourceforge.net/xbmc/?rev=7884&view=rev
Author:   jmarshallnz
Date:     2007-02-20 14:31:07 -0800 (Tue, 20 Feb 2007)

Log Message:
-----------
changed: Nfo reading now reads direct from network shares, instead of caching locally.

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
    trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp
    trunk/XBMC/xbmc/NfoFile.cpp

Modified: trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2007-02-20 22:29:13 UTC (rev 7883)
+++ trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2007-02-20 22:31:07 UTC (rev 7884)
@@ -339,24 +339,19 @@
   if ( !nfoFile.IsEmpty() )
   {
     CLog::Log(LOGDEBUG,"Found matching nfo file: %s", nfoFile.c_str());
-    if ( CFile::Cache(nfoFile, "Z:\\movie.nfo", NULL, NULL))
+    CNfoFile nfoReader(info.strContent);
+    if ( nfoReader.Create(nfoFile) == S_OK)
     {
-      CNfoFile nfoReader(info.strContent.c_str());
-      if ( nfoReader.Create("Z:\\movie.nfo") == S_OK)
-      {
-	    	url.m_strURL.push_back(nfoReader.m_strImDbUrl);
-        url.m_strID = nfoReader.m_strImDbNr;
-        SScraperInfo info2(info);
-        info2.strPath = nfoReader.m_strScraper; // fallback to imdb scraper no matter what is configured
-        IMDB.SetScraperInfo(info2);
-        CLog::Log(LOGDEBUG,"-- nfo scraper: %s", nfoReader.m_strScraper.c_str());
-        CLog::Log(LOGDEBUG,"-- nfo url: %s", url.m_strURL[0].c_str());
-      }
-      else
-        CLog::Log(LOGERROR,"Unable to find an imdb url in nfo file: %s", nfoFile.c_str());
+	    url.m_strURL.push_back(nfoReader.m_strImDbUrl);
+      url.m_strID = nfoReader.m_strImDbNr;
+      SScraperInfo info2(info);
+      info2.strPath = nfoReader.m_strScraper;
+      IMDB.SetScraperInfo(info2);
+      CLog::Log(LOGDEBUG,"-- nfo scraper: %s", nfoReader.m_strScraper.c_str());
+      CLog::Log(LOGDEBUG,"-- nfo url: %s", url.m_strURL[0].c_str());
     }
     else
-      CLog::Log(LOGERROR,"Unable to cache nfo file: %s", nfoFile.c_str());
+      CLog::Log(LOGERROR,"Unable to find an imdb url in nfo file: %s", nfoFile.c_str());
   }
 
   CStdString movieName = item->GetLabel();

Modified: trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp	2007-02-20 22:29:13 UTC (rev 7883)
+++ trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp	2007-02-20 22:31:07 UTC (rev 7884)
@@ -486,26 +486,21 @@
           if ( !strNfoFile.IsEmpty() )
           {
             CLog::Log(LOGDEBUG,"Found matching nfo file: %s", strNfoFile.c_str());
-            if ( CFile::Cache(strNfoFile, "Z:\\movie.nfo", NULL, NULL))
+            CNfoFile nfoReader(info.strContent);
+            if ( nfoReader.Create(strNfoFile) == S_OK)
             {
-              CNfoFile nfoReader(info.strContent.c_str());
-              if ( nfoReader.Create("Z:\\movie.nfo") == S_OK)
-              {
-                CIMDBUrl url;
-                url.m_strURL.push_back(nfoReader.m_strImDbUrl);
-                CLog::Log(LOGDEBUG,"-- nfo-scraper: %s", nfoReader.m_strScraper.c_str());
-                CLog::Log(LOGDEBUG,"-- nfo url: %s", url.m_strURL[0].c_str());
-                url.m_strID  = nfoReader.m_strImDbNr;
-                SScraperInfo info2(info);
-                info2.strPath = nfoReader.m_strScraper;
-                GetIMDBDetails(pItem, url, info2);
-                continue;
-              }
-              else
-                CLog::Log(LOGERROR,"Unable to find an imdb url in nfo file: %s", strNfoFile.c_str());
+              CIMDBUrl url;
+              url.m_strURL.push_back(nfoReader.m_strImDbUrl);
+              CLog::Log(LOGDEBUG,"-- nfo-scraper: %s", nfoReader.m_strScraper.c_str());
+              CLog::Log(LOGDEBUG,"-- nfo url: %s", url.m_strURL[0].c_str());
+              url.m_strID  = nfoReader.m_strImDbNr;
+              SScraperInfo info2(info);
+              info2.strPath = nfoReader.m_strScraper;
+              GetIMDBDetails(pItem, url, info2);
+              continue;
             }
             else
-              CLog::Log(LOGERROR,"Unable to cache nfo file: %s", strNfoFile.c_str());
+              CLog::Log(LOGERROR,"Unable to find an imdb url in nfo file: %s", strNfoFile.c_str());
           }
 
           // do IMDB lookup...

Modified: trunk/XBMC/xbmc/NfoFile.cpp
===================================================================
--- trunk/XBMC/xbmc/NfoFile.cpp	2007-02-20 22:29:13 UTC (rev 7883)
+++ trunk/XBMC/xbmc/NfoFile.cpp	2007-02-20 22:31:07 UTC (rev 7884)
@@ -5,6 +5,7 @@
 #include "stdafx.h"
 #include "NfoFile.h"
 #include "utils/ScraperParser.h"
+#include "FileSystem/File.h"
 #include "FileSystem/Directory.h"
 #include "util.h"
 
@@ -17,6 +18,7 @@
 CNfoFile::CNfoFile(const CStdString& strContent)
 {
   CNfoFile::strContent = strContent;
+  m_doc = NULL;
 }
 
 CNfoFile::~CNfoFile()
@@ -25,7 +27,7 @@
 
 HRESULT CNfoFile::Create(const CStdString& strPath)
 {
-  if (FAILED(Load(strPath.c_str())))
+  if (FAILED(Load(strPath)))
     return E_FAIL;
 
   CDirectory dir;
@@ -36,26 +38,27 @@
     if (!items[i]->m_bIsFolder)
     {
       
-      if(!FAILED(Scrape(CUtil::GetFileName(items[i]->m_strPath).c_str()))) break;
+      if(!FAILED(Scrape(items[i]->m_strPath))) break;
     }
   }
   Close();
 
   return (m_strImDbUrl.size() > 0) ? S_OK : E_FAIL;
 }
+
 HRESULT CNfoFile::Scrape(const CStdString& strScraperPath)
 {
   CScraperParser m_parser;
-  if (!m_parser.Load("Q:\\system\\scrapers\\video\\"+strScraperPath))
+  if (!m_parser.Load(strScraperPath))
     return E_FAIL;
 
-  if(m_parser.GetContent() !=  strContent.c_str() )
+  if(m_parser.GetContent() !=  strContent )
     return E_FAIL;
   m_parser.m_param[0] = m_doc;
   m_strImDbUrl = m_parser.Parse("NfoUrl");
   if(m_strImDbUrl.size() > 0)
   {
-    m_strScraper = strScraperPath;
+    m_strScraper = CUtil::GetFileName(strScraperPath);
     return S_OK;
   }
   else
@@ -65,42 +68,23 @@
 }
 HRESULT CNfoFile::Load(const CStdString& strFile)
 {
-  FILE* hFile;
-
-  hFile = fopen(strFile.c_str(), "rb");
-  if (hFile == NULL)
+  Close();
+  XFILE::CFile file;
+  if (file.Open(strFile, true))
   {
-    OutputDebugString("No such file: ");
-    OutputDebugString(strFile.c_str());
-    OutputDebugString("\n");
-    return E_FAIL;
+    m_size = (int)file.GetLength();
+    m_doc = (char*) malloc(m_size + 1);
+    if (!m_doc)
+    {
+      file.Close();
+      return E_FAIL;
+    }
+    file.Read(m_doc, m_size);
+    m_doc[m_size] = 0;
+    file.Close();
+    return S_OK;
   }
-
-  fseek(hFile, 0, SEEK_END);
-  m_size = ftell(hFile);
-
-  fseek(hFile, 0, SEEK_SET);
-
-  m_doc = (char*) malloc(m_size + 1);
-  if (!m_doc)
-  {
-    m_size = 0;
-    fclose(hFile);
-    return E_FAIL;
-  }
-
-  if (fread(m_doc, m_size, 1, hFile) <= 0)
-  {
-    delete m_doc;
-    m_doc = 0;
-    m_size = 0;
-    fclose(hFile);
-    return E_FAIL;
-  }
-
-  m_doc[m_size] = 0;
-  fclose(hFile);
-  return S_OK;
+  return E_FAIL;
 }
 
 void CNfoFile::Close()


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

Revision: 7890
          http://svn.sourceforge.net/xbmc/?rev=7890&view=rev
Author:   DonJ_
Date:     2007-02-21 12:11:33 -0800 (Wed, 21 Feb 2007)

Log Message:
-----------
added: Ability for scrapers to spoof a referrer header and send post variables

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
    trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp
    trunk/XBMC/xbmc/NfoFile.cpp
    trunk/XBMC/xbmc/NfoFile.h
    trunk/XBMC/xbmc/utils/HTTP.cpp
    trunk/XBMC/xbmc/utils/HTTP.h
    trunk/XBMC/xbmc/utils/IMDB.cpp
    trunk/XBMC/xbmc/utils/IMDB.h
    trunk/XBMC/xbmc/utils/ScraperParser.cpp
    trunk/XBMC/xbmc/utils/ScraperParser.h

Modified: trunk/XBMC/xbmc/GUIWindowVideoBase.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2007-02-21 15:05:40 UTC (rev 7889)
+++ trunk/XBMC/xbmc/GUIWindowVideoBase.cpp	2007-02-21 20:11:33 UTC (rev 7890)
@@ -342,13 +342,14 @@
     CNfoFile nfoReader(info.strContent);
     if ( nfoReader.Create(nfoFile) == S_OK)
     {
-	    url.m_strURL.push_back(nfoReader.m_strImDbUrl);
+      CScraperUrl scrUrl(nfoReader.m_strImDbUrl); 
+	    url.m_scrURL.push_back(scrUrl);
       url.m_strID = nfoReader.m_strImDbNr;
       SScraperInfo info2(info);
       info2.strPath = nfoReader.m_strScraper;
       IMDB.SetScraperInfo(info2);
       CLog::Log(LOGDEBUG,"-- nfo scraper: %s", nfoReader.m_strScraper.c_str());
-      CLog::Log(LOGDEBUG,"-- nfo url: %s", url.m_strURL[0].c_str());
+      CLog::Log(LOGDEBUG,"-- nfo url: %s", url.m_scrURL[0].m_url.c_str());
     }
     else
       CLog::Log(LOGERROR,"Unable to find an imdb url in nfo file: %s", nfoFile.c_str());
@@ -361,7 +362,7 @@
   {
     // 4. if we don't have a url, or need to refresh the search
     //    then do the web search
-    if (url.m_strURL.size() == 0 || needsRefresh)
+    if (url.m_scrURL.size() == 0 || needsRefresh)
     {
       // 4a. show dialog that we're busy querying http://www.imdb.com
       CStdString strHeading;
@@ -409,7 +410,7 @@
     }
     // 4c. Check if url is still empty - occurs if user has selected to do a manual
     //     lookup, or if the IMDb lookup failed or was cancelled.
-    if (url.m_strURL.size() == 0)
+    if (url.m_scrURL.size() == 0)
     {
       // Check for cancel of the progress dialog
       pDlgProgress->Close();

Modified: trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp	2007-02-21 15:05:40 UTC (rev 7889)
+++ trunk/XBMC/xbmc/GUIWindowVideoFiles.cpp	2007-02-21 20:11:33 UTC (rev 7890)
@@ -490,9 +490,10 @@
             if ( nfoReader.Create(strNfoFile) == S_OK)
             {
               CIMDBUrl url;
-              url.m_strURL.push_back(nfoReader.m_strImDbUrl);
+              CScraperUrl scrUrl(nfoReader.m_strImDbUrl); 
+	            url.m_scrURL.push_back(scrUrl);
               CLog::Log(LOGDEBUG,"-- nfo-scraper: %s", nfoReader.m_strScraper.c_str());
-              CLog::Log(LOGDEBUG,"-- nfo url: %s", url.m_strURL[0].c_str());
+              CLog::Log(LOGDEBUG,"-- nfo url: %s", url.m_scrURL[0].m_url.c_str());
               url.m_strID  = nfoReader.m_strImDbNr;
               SScraperInfo info2(info);
               info2.strPath = nfoReader.m_strScraper;

Modified: trunk/XBMC/xbmc/NfoFile.cpp
===================================================================
--- trunk/XBMC/xbmc/NfoFile.cpp	2007-02-21 15:05:40 UTC (rev 7889)
+++ trunk/XBMC/xbmc/NfoFile.cpp	2007-02-21 20:11:33 UTC (rev 7890)
@@ -17,7 +17,7 @@
 
 CNfoFile::CNfoFile(const CStdString& strContent)
 {
-  CNfoFile::strContent = strContent;
+  m_strContent = strContent;
   m_doc = NULL;
 }
 
@@ -52,7 +52,7 @@
   if (!m_parser.Load(strScraperPath))
     return E_FAIL;
 
-  if(m_parser.GetContent() !=  strContent )
+  if(m_parser.GetContent() !=  m_strContent )
     return E_FAIL;
   m_parser.m_param[0] = m_doc;
   m_strImDbUrl = m_parser.Parse("NfoUrl");

Modified: trunk/XBMC/xbmc/NfoFile.h
===================================================================
--- trunk/XBMC/xbmc/NfoFile.h	2007-02-21 15:05:40 UTC (rev 7889)
+++ trunk/XBMC/xbmc/NfoFile.h	2007-02-21 20:11:33 UTC (rev 7890)
@@ -26,7 +26,7 @@
 private:
   char* m_doc;
   int m_size;
-  CStdString strContent;
+  CStdString m_strContent;
 };
 
 #endif // !defined(AFX_NfoFile_H__641CCF68_6D2A_426E_9204_C0E4BEF12D00__INCLUDED_)

Modified: trunk/XBMC/xbmc/utils/HTTP.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/HTTP.cpp	2007-02-21 15:05:40 UTC (rev 7889)
+++ trunk/XBMC/xbmc/utils/HTTP.cpp	2007-02-21 20:11:33 UTC (rev 7890)
@@ -691,6 +691,11 @@
   m_strCookie = strCookie;
 }
 
+void CHTTP::SetReferer(const string &strReferer)
+{
+  m_strReferer = strReferer;
+}
+
 void CHTTP::SetUserAgent(string strUserAgent)
 {
   m_strUserAgent = strUserAgent;
@@ -733,6 +738,12 @@
   strcat(szHTTPHEADER, "User-Agent: ");
   strcat(szHTTPHEADER, m_strUserAgent.c_str());
   strcat(szHTTPHEADER, "\r\n");
+  if (m_strReferer.size())
+  {
+    strcat(szHTTPHEADER, "Referer: ");
+    strcat(szHTTPHEADER, m_strReferer.c_str());
+    strcat(szHTTPHEADER, "\r\n");
+  }
   if (m_strCookie.size())
   {
     // is this even valid in http?

Modified: trunk/XBMC/xbmc/utils/HTTP.h
===================================================================
--- trunk/XBMC/xbmc/utils/HTTP.h	2007-02-21 15:05:40 UTC (rev 7889)
+++ trunk/XBMC/xbmc/utils/HTTP.h	2007-02-21 20:11:33 UTC (rev 7890)
@@ -21,6 +21,7 @@
 
   bool Post(const string& strURL, const string& strPostData, string& strHTML);
   void SetCookie(const string& strCookie);
+  void SetReferer(const string& strCookie);
   bool Get(string& strURL, string& strHTML);
   bool Head(string& strURL);
   bool Download(const string &strURL, const string &strFileName, LPDWORD pdwSize = NULL);
@@ -50,6 +51,7 @@
   string m_strProxyServer;
   string m_strHostName;
   string m_strCookie;
+  string m_strReferer;
   string m_strHeaders;
   string m_strUsername;
   string m_strPassword;

Modified: trunk/XBMC/xbmc/utils/IMDB.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/IMDB.cpp	2007-02-21 15:05:40 UTC (rev 7889)
+++ trunk/XBMC/xbmc/utils/IMDB.cpp	2007-02-21 20:11:33 UTC (rev 7890)
@@ -29,7 +29,28 @@
 CIMDB::~CIMDB()
 {
 }
+bool CIMDB::Get(CScraperUrl& scrURL, string& strHTML)
+{
+  CURL url(scrURL.m_url);
+  m_http.SetReferer(scrURL.m_url);
 
+  if(scrURL.m_post)
+  {
+    CStdString strOptions = url.GetOptions();
+    url.SetOptions("");
+    CStdString strUrl;
+    url.GetURL(strUrl);
+    //CUtil::URLEncode(strOptions);
+
+    if (!m_http.Post(strUrl, strOptions, strHTML))
+      return false;
+  }
+
+  if (!m_http.Get(scrURL.m_url, strHTML))
+    return false;
+  
+  return true;
+}
 bool CIMDB::InternalFindMovie(const CStdString &strMovie, IMDB_MOVIELIST& movielist)
 {
   // load our scraper xml
@@ -39,18 +60,19 @@
   CIMDBUrl url;
   movielist.clear();
 
-	CStdString strURL, strHTML, strYear;
+	CStdString strHTML, strYear;
+  CScraperUrl scrURL;
   
-	GetURL(strMovie, strURL, strYear);
+	GetURL(strMovie, scrURL, strYear);
 
-  if (!m_http.Get(strURL, strHTML) || strHTML.size() == 0)
+  if (!Get(scrURL, strHTML) || strHTML.size() == 0)
   {
     CLog::Log(LOGERROR, "IMDB: Unable to retrieve web site");
     return false;
   }
   
   m_parser.m_param[0] = strHTML;
-  m_parser.m_param[1] = strURL;
+  m_parser.m_param[1] = scrURL.m_url;
   CStdString strXML = m_parser.Parse("GetSearchResults");
   if (strXML.IsEmpty())
   {
@@ -76,18 +98,22 @@
 
   for ( movie; movie; movie = movie->NextSiblingElement() )
   {
-    url.m_strURL.clear();
+    url.m_scrURL.clear();
     TiXmlNode *title = movie->FirstChild("title");
-    TiXmlNode *link = movie->FirstChild("url");
+    TiXmlElement *link = movie->FirstChildElement("url");
     TiXmlNode *year = movie->FirstChild("year");
     TiXmlNode* id = movie->FirstChild("id");
     if (title && title->FirstChild() && link && link->FirstChild())
     {
       url.m_strTitle = title->FirstChild()->Value();
-      url.m_strURL.push_back(link->FirstChild()->Value());
-      while ((link = link->NextSibling("url")))
+      CScraperUrl scrURL(link);
+      url.m_scrURL.push_back(scrURL);
+      //url.m_strURL.push_back(link->FirstChild()->Value());
+      while ((link = link->NextSiblingElement("url")))
       {
-        url.m_strURL.push_back(link->FirstChild()->Value());
+        CScraperUrl scrURL(link);
+        //url.m_strURL.push_back(link->FirstChild()->Value());
+        url.m_scrURL.push_back(scrURL);
       }
       if (id && id->FirstChild())
         url.m_strID = id->FirstChild()->Value();
@@ -125,11 +151,11 @@
 
   std::vector<CStdString> strHTML;
 
-  for (unsigned int i=0;i<url.m_strURL.size();++i)
+  for (unsigned int i=0;i<url.m_scrURL.size();++i)
   {
     CStdString strCurrHTML;
-    CStdString strU = url.m_strURL[i];
-    if (!m_http.Get(strU,strCurrHTML) || strCurrHTML.size() == 0)
+    CScraperUrl strU = url.m_scrURL[i];
+    if (!Get( strU,strCurrHTML) || strCurrHTML.size() == 0)
       return false;
     strHTML.push_back(strCurrHTML);
   }
@@ -171,7 +197,9 @@
     if (szFunction)
     {
       CIMDBUrl url2;
-      url2.m_strURL.push_back(url->FirstChild()->Value());
+      
+      CScraperUrl scrURL(url);
+      url2.m_scrURL.push_back(scrURL);
       InternalGetDetails(url2,movieDetails,szFunction);
     }
     url = url->NextSiblingElement("url");
@@ -393,7 +421,7 @@
 }
 
 // TODO: Make this user-configurable?
-void CIMDB::GetURL(const CStdString &strMovie, CStdString& strURL, CStdString& strYear)
+void CIMDB::GetURL(const CStdString &strMovie, CScraperUrl& scrURL, CStdString& strYear)
 {
   char szMovie[1024];
   char szYear[5];
@@ -440,8 +468,7 @@
   else
     m_parser.m_param[0] = szMovie;
 
-  strURL = m_parser.Parse("CreateSearchUrl");
-
+  scrURL.ParseString(m_parser.Parse("CreateSearchUrl"));
   strYear = szYear;
 }
 
@@ -459,7 +486,7 @@
   else if (m_state == GET_DETAILS)
   {
     if (!GetDetails(m_url, m_movieDetails))
-      CLog::Log(LOGERROR, "IMDb::Error getting movie details from %s", m_url.m_strURL[0].c_str());
+      CLog::Log(LOGERROR, "IMDb::Error getting movie details from %s", m_url.m_scrURL[0].m_url.c_str());
   }
   m_found = true;
 }

Modified: trunk/XBMC/xbmc/utils/IMDB.h
===================================================================
--- trunk/XBMC/xbmc/utils/IMDB.h	2007-02-21 15:05:40 UTC (rev 7889)
+++ trunk/XBMC/xbmc/utils/IMDB.h	2007-02-21 20:11:33 UTC (rev 7890)
@@ -28,7 +28,7 @@
 class CIMDBUrl
 {
 public:
-  std::vector<CStdString> m_strURL;
+  std::vector<CScraperUrl> m_scrURL;
   CStdString m_strID;  CStdString m_strTitle;
 };
 typedef vector<CIMDBUrl> IMDB_MOVIELIST;
@@ -79,7 +79,7 @@
   bool ParseDetails(TiXmlDocument &doc, CIMDBMovie &movieDetails);
   bool LoadXML(const CStdString& strXMLFile, CIMDBMovie &movieDetails, bool bDownload = true);
   bool Download(const CStdString &strURL, const CStdString &strFileName);
-  void GetURL(const CStdString& strMovie, CStdString& strURL, CStdString& strYear);
+  void GetURL(const CStdString& strMovie, CScraperUrl& strURL, CStdString& strYear);
 
   // threaded lookup functions
   bool FindMovie(const CStdString& strMovie, IMDB_MOVIELIST& movielist, CGUIDialogProgress *pProgress = NULL);
@@ -87,6 +87,7 @@
 
   void SetScraperInfo(const SScraperInfo& info) { m_info = info; }
 protected:
+  bool Get(CScraperUrl& , string& );
   void RemoveAllAfter(char* szMovie, const char* szSearch);
   CHTTP m_http;
 

Modified: trunk/XBMC/xbmc/utils/ScraperParser.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/ScraperParser.cpp	2007-02-21 15:05:40 UTC (rev 7889)
+++ trunk/XBMC/xbmc/utils/ScraperParser.cpp	2007-02-21 20:11:33 UTC (rev 7890)
@@ -2,9 +2,58 @@
 
 #include "RegExp.h"
 #include "htmlutil.h"
-
+#include "../stdafx.h"
 #include <cstring>
 
+CScraperUrl::CScraperUrl(const CStdString& strUrl)
+{
+  m_post = false;
+  ParseString(strUrl);
+
+}
+CScraperUrl::CScraperUrl(const TiXmlElement* element)
+{
+  m_post = false;
+  ParseElement(element);
+
+}
+CScraperUrl::CScraperUrl()
+{
+   m_post = false;
+}
+CScraperUrl::~CScraperUrl()
+{
+
+}
+void CScraperUrl::ParseElement(const TiXmlElement* element)
+{
+  m_url = element->FirstChild()->Value();
+  m_spoof = element->Attribute("spoof");
+  if(element->Attribute("post")) 
+    m_post = true;
+}
+void CScraperUrl::ParseString(CStdString strUrl)
+{
+  if (strUrl.IsEmpty())
+    return ;
+  
+  // ok, now parse the xml file
+  if (strUrl.Find("encoding=\"utf-8\"") < 0)
+    g_charsetConverter.stringCharsetToUtf8(strUrl);
+  
+  TiXmlDocument doc;
+  doc.Parse(strUrl.c_str(),0,TIXML_ENCODING_UTF8);
+
+  if (doc.RootElement())
+  {
+    m_url = doc.RootElement()->FirstChild()->Value();
+    m_spoof = doc.RootElement()->Attribute("spoof");
+    if(doc.RootElement()->Attribute("post")) 
+      m_post = true;
+  } 
+  else
+    m_url = strUrl;
+}
 CScraperParser::CScraperParser()
 {
   m_pRootElement = NULL;

Modified: trunk/XBMC/xbmc/utils/ScraperParser.h
===================================================================
--- trunk/XBMC/xbmc/utils/ScraperParser.h	2007-02-21 15:05:40 UTC (rev 7889)
+++ trunk/XBMC/xbmc/utils/ScraperParser.h	2007-02-21 20:11:33 UTC (rev 7890)
@@ -4,6 +4,19 @@
 #include "tinyxml/tinyxml.h"
 #include "stdstring.h"
 
+class CScraperUrl
+{
+public:
+  CScraperUrl(const CStdString&);
+  CScraperUrl(const TiXmlElement*);
+  CScraperUrl();
+	~CScraperUrl();
+  void ParseString(CStdString);
+  void ParseElement(const TiXmlElement*);
+  CStdString m_spoof;
+  CStdString m_url;
+  bool m_post;
+};
 class CScraperParser
 {
 public:


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

Revision: 7903
          http://svn.sourceforge.net/xbmc/?rev=7903&view=rev
Author:   xbmcapi
Date:     2007-02-23 10:22:59 -0800 (Fri, 23 Feb 2007)

Log Message:
-----------
added: httpapi command QueryVideoDatabase

Modified Paths:
--------------
    trunk/XBMC/xbmc/VideoDatabase.cpp
    trunk/XBMC/xbmc/VideoDatabase.h
    trunk/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp
    trunk/XBMC/xbmc/lib/libGoAhead/XBMChttp.h

Modified: trunk/XBMC/xbmc/VideoDatabase.cpp
===================================================================
--- trunk/XBMC/xbmc/VideoDatabase.cpp	2007-02-23 17:31:57 UTC (rev 7902)
+++ trunk/XBMC/xbmc/VideoDatabase.cpp	2007-02-23 18:22:59 UTC (rev 7903)
@@ -2526,4 +2526,51 @@
   {
     CLog::Log(LOGERROR, __FUNCTION__" failed");
   }
+}
+
+bool CVideoDatabase::GetArbitraryQuery(const CStdString& strQuery, const CStdString& strOpenRecordSet, const CStdString& strCloseRecordSet,
+	const CStdString& strOpenRecord, const CStdString& strCloseRecord, const CStdString& strOpenField, const CStdString& strCloseField, CStdString& strResult)
+{
+  try
+  {
+    strResult = "";
+	if (NULL == m_pDB.get()) return false;
+	if (NULL == m_pDS.get()) return false;
+	CStdString strSQL=FormatSQL(strQuery);
+	if (!m_pDS->query(strSQL.c_str()))
+	{
+	  strResult = m_pDB->getErrorMsg();
+	  return false;
+	}
+	int iRowsFound = m_pDS->num_rows();
+	strResult=strOpenRecordSet;
+	while (!m_pDS->eof())
+	{
+	  strResult += strOpenRecord;
+	  for (int i=0; i<m_pDS->fieldCount(); i++)
+	  {
+	    strResult += strOpenField + m_pDS->fv(i).get_asString() + strCloseField;
+	  }
+	  strResult += strCloseRecord;
+	  m_pDS->next();
+	}
+	strResult += strCloseRecordSet;
+	m_pDS->close();
+	return true;
+  }
+  catch (...)
+  {
+    CLog::Log(LOGERROR, "CVideoDatabase:GetArbitraryQuery() failed");
+  }
+  try
+  {
+	if (NULL == m_pDB.get()) return false;
+	strResult = m_pDB->getErrorMsg();
+  }
+  catch (...)
+  {
+
+  }
+
+  return false;
 }
\ No newline at end of file

Modified: trunk/XBMC/xbmc/VideoDatabase.h
===================================================================
--- trunk/XBMC/xbmc/VideoDatabase.h	2007-02-23 17:31:57 UTC (rev 7902)
+++ trunk/XBMC/xbmc/VideoDatabase.h	2007-02-23 18:22:59 UTC (rev 7903)
@@ -143,6 +143,9 @@
   void SetStackTimes(const CStdString &filePath, vector<long> &times);
   void SetScraperForPath(const CStdString& filePath, const CStdString& strScraper, const CStdString& strContent);
 
+  bool GetArbitraryQuery(const CStdString& strQuery, const CStdString& strOpenRecordSet, const CStdString& strCloseRecordSet, 
+	const CStdString& strOpenRecord, const CStdString& strCloseRecord, const CStdString& strOpenField, const CStdString& strCloseField, CStdString& strResult);
+
   bool GetGenresNav(const CStdString& strBaseDir, CFileItemList& items);
   bool GetActorsNav(const CStdString& strBaseDir, CFileItemList& items);
   bool GetDirectorsNav(const CStdString& strBaseDir, CFileItemList& items);

Modified: trunk/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp
===================================================================
--- trunk/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp	2007-02-23 17:31:57 UTC (rev 7902)
+++ trunk/XBMC/xbmc/lib/libGoAhead/XBMChttp.cpp	2007-02-23 18:22:59 UTC (rev 7903)
@@ -954,6 +954,28 @@
   return true;
 }
 
+int CXbmcHttp::xbmcQueryVideoDataBase(int numParas, CStdString paras[])
+{
+  if (numParas==0)
+    return SetResponse(openTag+"Error:Missing Parameter");
+  else
+  {
+	CVideoDatabase videodatabase;
+	if (videodatabase.Open())
+	{
+	  CStdString result;
+      if (videodatabase.GetArbitraryQuery(paras[0], openRecordSet, closeRecordSet, openRecord, closeRecord, openField, closeField, result))
+		return SetResponse(result);
+	  else
+		  return SetResponse(openTag+"Error:"+result);
+	  videodatabase.Close();
+	}
+	else
+	  return SetResponse(openTag+"Error:Could not open database");
+  }
+  return true;
+}
+
 int CXbmcHttp::xbmcAddToPlayList(int numParas, CStdString paras[])
 {
   //parameters=playList;mask
@@ -2674,6 +2696,7 @@
       else if (command == "setautogetpicturethumbs")  retVal = xbmcAutoGetPictureThumbs(numParas, paras);
       else if (command == "setresponseformat")        retVal = xbmcSetResponseFormat(numParas, paras);
 	  else if (command == "querymusicdatabase")       retVal = xbmcQueryMusicDataBase(numParas, paras);
+	  else if (command == "queryvideodatabase")       retVal = xbmcQueryVideoDataBase(numParas, paras);
 	  else if (command == "spindownharddisk")         retVal = xbmcSpinDownHardDisk();
 	  else if (command == "broadcast")                retVal = xbmcBroadcast(numParas, paras);
 	  else if (command == "setbroadcast")             retVal = xbmcSetBroadcast(numParas, paras);

Modified: trunk/XBMC/xbmc/lib/libGoAhead/XBMChttp.h
===================================================================
--- trunk/XBMC/xbmc/lib/libGoAhead/XBMChttp.h	2007-02-23 17:31:57 UTC (rev 7902)
+++ trunk/XBMC/xbmc/lib/libGoAhead/XBMChttp.h	2007-02-23 18:22:59 UTC (rev 7903)
@@ -75,6 +75,7 @@
   int xbmcLookupAlbum(int numParas, CStdString paras[]);
   int xbmcChooseAlbum(int numParas, CStdString paras[]);
   int xbmcQueryMusicDataBase(int numParas, CStdString paras[]);
+  int xbmcQueryVideoDataBase(int numParas, CStdString paras[]);
   int xbmcDownloadInternetFile(int numParas, CStdString paras[]);
   int xbmcSetKey(int numParas, CStdString paras[]);
   int xbmcGetMovieDetails(int numParas, CStdString paras[]);


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

Revision: 7908
          http://svn.sourceforge.net/xbmc/?rev=7908&view=rev
Author:   darkdonno
Date:     2007-02-23 21:20:43 -0800 (Fri, 23 Feb 2007)

Log Message:
-----------
added: [ 1667605 ] Python arguments in sys.argv by Asteron

Modified Paths:
--------------
    trunk/XBMC/xbmc/Util.cpp
    trunk/XBMC/xbmc/lib/libPython/XBPyThread.cpp
    trunk/XBMC/xbmc/lib/libPython/XBPyThread.h
    trunk/XBMC/xbmc/lib/libPython/XBPython.cpp
    trunk/XBMC/xbmc/lib/libPython/XBPython.h

Modified: trunk/XBMC/xbmc/Util.cpp
===================================================================
--- trunk/XBMC/xbmc/Util.cpp	2007-02-24 02:20:44 UTC (rev 7907)
+++ trunk/XBMC/xbmc/Util.cpp	2007-02-24 05:20:43 UTC (rev 7908)
@@ -3228,7 +3228,26 @@
   }
   else if (execute.Equals("runscript"))
   {
-    g_pythonParser.evalFile(parameter.c_str());
+    std::vector<CStdString> params;
+    StringUtils::SplitString(strParameterCaseIntact,",",params);
+    if (params.size() > 0)  // we need to construct arguments to pass to python
+    {
+      unsigned int argc = params.size();
+      char ** argv = new char*[argc];
+
+      std::vector<CStdString> path;
+      //split the path up to find the filename
+      StringUtils::SplitString(params[0],"\\",path); 
+      argv[0] = path.size() > 0 ? (char*)path[path.size() - 1].c_str() : (char*)params[0].c_str();
+
+      for(unsigned int i = 1; i < argc; i++)
+        argv[i] = (char*)params[i].c_str();
+
+      g_pythonParser.evalFile(params[0].c_str(), argc, (const char**)argv);
+      delete argv;
+    }
+    else
+      g_pythonParser.evalFile(parameter.c_str());
   }
   else if (execute.Equals("resolution"))
   {

Modified: trunk/XBMC/xbmc/lib/libPython/XBPyThread.cpp
===================================================================
--- trunk/XBMC/xbmc/lib/libPython/XBPyThread.cpp	2007-02-24 02:20:44 UTC (rev 7907)
+++ trunk/XBMC/xbmc/lib/libPython/XBPyThread.cpp	2007-02-24 05:20:43 UTC (rev 7908)
@@ -41,11 +41,19 @@
 
 	done = false;
 	stopping = false;
+	argv = NULL;
 }
 
 XBPyThread::~XBPyThread()
 {
 	if (source) delete []source;
+	if (argv)
+	{
+		for (unsigned int i = 0; i < argc; i++)
+			delete argv[i];
+		delete argv;
+	}
+
 }
 
 int XBPyThread::evalFile(const char *src)
@@ -66,6 +74,20 @@
 	return 0;
 }
 
+int XBPyThread::setArgv(unsigned int src_argc, const char **src)
+{
+	if (src == NULL)
+		return 1;
+	argc = src_argc;
+	argv = new char*[argc];
+	for(unsigned int i = 0; i < argc; i++)
+	{
+		argv[i] = new char[strlen(src[i])+1];
+		strcpy(argv[i], src[i]);
+	}
+	return 0;
+}
+
 void XBPyThread::OnStartup(){}
 
 void XBPyThread::Process()
@@ -89,6 +111,11 @@
 	PySys_SetPath(path);
 	xbp_chdir(sourcedir); // XXX, there is a ';' at the end
 
+	if (argv != NULL)
+	{
+		PySys_SetArgv(argc, argv);
+	}
+
 	if (type == 'F')
 	{
 		// run script from file

Modified: trunk/XBMC/xbmc/lib/libPython/XBPyThread.h
===================================================================
--- trunk/XBMC/xbmc/lib/libPython/XBPyThread.h	2007-02-24 02:20:44 UTC (rev 7907)
+++ trunk/XBMC/xbmc/lib/libPython/XBPyThread.h	2007-02-24 05:20:43 UTC (rev 7908)
@@ -11,6 +11,7 @@
 	virtual ~XBPyThread();
 	int evalFile(const char*);
 	int evalString(const char*);
+	int setArgv(const unsigned int, const char **);
 	bool isDone();
 	bool isStopping();
 	void stop();
@@ -21,6 +22,8 @@
 
 	char type;
 	char *source;
+	char **argv;
+	unsigned int  argc;
 	bool done;
 	bool stopping;
 	int id;

Modified: trunk/XBMC/xbmc/lib/libPython/XBPython.cpp
===================================================================
--- trunk/XBMC/xbmc/lib/libPython/XBPython.cpp	2007-02-24 02:20:44 UTC (rev 7907)
+++ trunk/XBMC/xbmc/lib/libPython/XBPython.cpp	2007-02-24 05:20:43 UTC (rev 7908)
@@ -306,8 +306,9 @@
 
 }
 
+int XBPython::evalFile(const char *src) { return evalFile(src, 0, NULL); }
 // execute script, returns -1 if script doesn't exist
-int XBPython::evalFile(const char *src)
+int XBPython::evalFile(const char *src, const unsigned int argc, const char ** argv)
 {
   // return if file doesn't exist
   if(access(src, 0) == -1) return -1;
@@ -323,6 +324,8 @@
 
   nextid++;
   XBPyThread *pyThread = new XBPyThread(this, mainThreadState, nextid);
+  if (argv != NULL)
+    pyThread->setArgv(argc, argv);
   pyThread->evalFile(src);
   PyElem inf;
   inf.id = nextid;

Modified: trunk/XBMC/xbmc/lib/libPython/XBPython.h
===================================================================
--- trunk/XBMC/xbmc/lib/libPython/XBPython.h	2007-02-24 02:20:44 UTC (rev 7907)
+++ trunk/XBMC/xbmc/lib/libPython/XBPython.h	2007-02-24 05:20:43 UTC (rev 7908)
@@ -39,6 +39,7 @@
 	int		ScriptsSize();
 	int		GetPythonScriptId(int scriptPosition); 
 	int   evalFile(const char *);
+	int   evalFile(const char *, const unsigned int, const char **);
 
 	bool	isRunning(int scriptId);
 	bool  isStopping(int scriptId);


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

Revision: 7916
          http://svn.sourceforge.net/xbmc/?rev=7916&view=rev
Author:   geminiserver
Date:     2007-02-25 00:47:09 -0800 (Sun, 25 Feb 2007)

Log Message:
-----------
changed: SystemInfo, removed not used or double code and code cleanup
fixed: SystemInfo, hangs on detecting Hardware/ModChip if debug logging is enabled

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowSystemInfo.cpp
    trunk/XBMC/xbmc/utils/LED.cpp
    trunk/XBMC/xbmc/utils/SystemInfo.cpp
    trunk/XBMC/xbmc/utils/SystemInfo.h

Modified: trunk/XBMC/xbmc/GUIWindowSystemInfo.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowSystemInfo.cpp	2007-02-24 23:12:43 UTC (rev 7915)
+++ trunk/XBMC/xbmc/GUIWindowSystemInfo.cpp	2007-02-25 08:47:09 UTC (rev 7916)
@@ -531,7 +531,7 @@
   if (!strIsSmartXX.Equals("None"))
   {
     strModChip.Format("%s %s", lblModChip.c_str(),strIsSmartXX);
-    CLog::Log(LOGDEBUG, "- Detected ModChip: %s",strIsSmartXX);
+    CLog::Log(LOGDEBUG, "- Detected ModChip: %s",strIsSmartXX.c_str());
     return true;
   }
   else

Modified: trunk/XBMC/xbmc/utils/LED.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/LED.cpp	2007-02-24 23:12:43 UTC (rev 7915)
+++ trunk/XBMC/xbmc/utils/LED.cpp	2007-02-25 08:47:09 UTC (rev 7916)
@@ -17,34 +17,29 @@
   if (ixLED == LED_COLOUR_OFF)
   {
     XKUtils::SetXBOXLEDStatus(0);
-	  //CSysInfo::SmartXXLEDControll(SMARTXX_LED_OFF);
   }
   else if (ixLED == LED_COLOUR_GREEN)
   {
     XKUtils::SetXBOXLEDStatus(XKUtils::LED_REGISTER_CYCLE0_GREEN | XKUtils::LED_REGISTER_CYCLE2_GREEN | XKUtils::LED_REGISTER_CYCLE1_GREEN | XKUtils::LED_REGISTER_CYCLE3_GREEN);
-	  //CSysInfo::SmartXXLEDControll(SMARTXX_LED_BLUE);
   }
   else if (ixLED == LED_COLOUR_RED)
   {
     XKUtils::SetXBOXLEDStatus(XKUtils::LED_REGISTER_CYCLE0_RED | XKUtils::LED_REGISTER_CYCLE2_RED | XKUtils::LED_REGISTER_CYCLE1_RED | XKUtils::LED_REGISTER_CYCLE3_RED);
-	  //CSysInfo::SmartXXLEDControll(SMARTXX_LED_RED);
   }
   else if (ixLED == LED_COLOUR_ORANGE)
   {
     XKUtils::SetXBOXLEDStatus(XKUtils::LED_REGISTER_CYCLE0_ORANGE | XKUtils::LED_REGISTER_CYCLE2_ORANGE | XKUtils::LED_REGISTER_CYCLE1_ORANGE | XKUtils::LED_REGISTER_CYCLE3_ORANGE);
-	  //CSysInfo::SmartXXLEDControll(SMARTXX_LED_BLUE_RED);
   }
   else if (ixLED == LED_COLOUR_CYCLE)
   {
     XKUtils::SetXBOXLEDStatus(XKUtils::LED_REGISTER_CYCLE0_GREEN | XKUtils::LED_REGISTER_CYCLE2_GREEN | XKUtils::LED_REGISTER_CYCLE1_ORANGE | XKUtils::LED_REGISTER_CYCLE3_RED);
-	  //CSysInfo::SmartXXLEDControll(SMARTXX_LED_CYCLE);
   }
   else if (ixLED == LED_COLOUR_NO_CHANGE) //Default Bios Settings
   {
     //No need to Change! Leave the LED with the Default Bios Settings
     //Since we can't get the BIOS LED Color Setting: we will set it to Standart Green!
     //XKUtils::SetXBOXLEDStatus(XKUtils::LED_REGISTER_CYCLE0_GREEN | XKUtils::LED_REGISTER_CYCLE2_GREEN | XKUtils::LED_REGISTER_CYCLE1_GREEN | XKUtils::LED_REGISTER_CYCLE3_GREEN);
-    //Todo: read the LED settings from BIOS!
+    //may be there is a way to read the LED settings from BIOS!
   }
 }
 

Modified: trunk/XBMC/xbmc/utils/SystemInfo.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/SystemInfo.cpp	2007-02-24 23:12:43 UTC (rev 7915)
+++ trunk/XBMC/xbmc/utils/SystemInfo.cpp	2007-02-25 08:47:09 UTC (rev 7916)
@@ -93,7 +93,6 @@
 }
 CStdString CSysInfo::GetVideoEncoder()
 {
-  // XBOX Video Encoder Detection GeminiServer
   int iTemp;
   if (HalReadSMBusValue(XKUtils::SMBDEV_VIDEO_ENCODER_CONNEXANT,XKUtils::VIDEO_ENCODER_CMD_DETECT,0,(LPBYTE)&iTemp)==0)
   { CLog::Log(LOGDEBUG, "Video Encoder: CONNEXANT");  return "CONNEXANT"; }
@@ -292,7 +291,6 @@
   {
     CLog::Log(LOGDEBUG, "- Detected TSOP/MOdCHIP: Detection does not match! (%s != %s)",strTemp1.c_str(),strTemp2.c_str());
     CLog::Log(LOGDEBUG, "- Detected TSOP/ModChip: Using -> %s",strTemp1.c_str());
-    //strTemp.Format("%s %s",strTemp1.c_str(),strTemp2.c_str());
     strTemp.Format("%s",strTemp1.c_str());
   }
   else strTemp = strTemp2;
@@ -304,33 +302,19 @@
 
 CStdString CSysInfo::SmartXXModCHIP()
 {
-  // SmartXX ModChip Detection Routine! 13.04.2005 GeminiServer
+  // SmartXX ModChip Detection
   unsigned char uSmartXX_ID = ((_inp(0xf701)) & 0xf);
+
   if ( uSmartXX_ID == 1 )      // SmartXX V1+V2
-  {
-    //CLog::Log(LOGDEBUG, "- Detected ModChip: SmartXX V1/V2");
     return "SmartXX V1/V2";
-  }
   else if ( uSmartXX_ID == 2 ) // SmartXX V1+V2
-  {
-    //CLog::Log(LOGDEBUG, "- Detected ModChip: SmartXX V1/V2");
     return "SmartXX V1/V2";
-  }
   else if ( uSmartXX_ID == 5 ) // SmartXX OPX
-  {
-    //CLog::Log(LOGDEBUG, "- Detected ModChip: SmartXX OPX");
     return "SmartXX OPX";
-  }
   else if ( uSmartXX_ID == 8 ) // SmartXX V3
-  {
-    //CLog::Log(LOGDEBUG, "- Detected ModChip: SmartXX V3");
     return "SmartXX V3";
-  }
-  else
-  {
-    //CLog::Log(LOGDEBUG, "Detected ModCHIP: No SmartXX Detected!");
+  else 
     return "None";
-  }
 }
 
 bool CSysInfo::BackupBios()
@@ -517,7 +501,6 @@
     if (HalReadSMBusValue(0xD4,0x00,0,(LPBYTE)&iTemp)==0){  strXboxVer = "v1.4";  return true; }
     else {  strXboxVer = "v1.2/v1.3";   return true;}
   }
-  else if ( strcmp(Ver,("???")) == NULL){ strXboxVer = "v1.5";  return true;} //Todo: Need XBOX v1.5 to Detect the ver.!!
   else if ( strcmp(Ver,("P2L")) == NULL){ strXboxVer = "v1.6";  return true;}
   else  { strXboxVer.Format("UNKNOWN: Please report this --> %s",Ver); return true;
   }
@@ -654,125 +637,6 @@
   }
   else return false;
 }
-bool CSysInfo::SmartXXLEDControll(int iSmartXXLED)
-{
-  //SmartXX LED0/LED1 Controll Routine! 21.04.2005 GeminiServer
-  //LED_R, LED_B, LED_RB, LED_RBCYCLE
-  //We need to check b4 we use the SmartXX LED controll!!
-  if (SmartXXModCHIP() == "SmartXX V3" || SmartXXModCHIP() == "SmartXX V1/V2")
-  {
-    if (iSmartXXLED == SMARTXX_LED_OFF)
-    {
-      if (SmartXXModCHIP() == "SmartXX V3")
-      {
-        _outp(0xf70c,0); // Red
-        _outp(0xf70d,0);  // Green
-        _outp(0xf70e,0); // Blue
-        _outp(0xf702, 0x0); // Status LED OFF
-      }
-      else
-      {
-        _outp(0xf702, 0xb);  //R:off  B:off
-        CLog::Log(LOGDEBUG, "Setting SmartXX LED: BOTH OFF");
-      }
-      return true;
-    }
-    else if (iSmartXXLED == SMARTXX_LED_RED)
-    {
-      if (SmartXXModCHIP() == "SmartXX V3")
-      {
-        _outp(0xf70c,80);// Red
-        _outp(0xf70d,0);  // Green
-        _outp(0xf70e,0); // Blue
-        _outp(0xf702, 0x0);  // Status LED OFF
-      }
-      else
-      {
-        //Only Red:
-        _outp(0xf702, 0xb);  //R:off  B:off
-        _outp(0xf702, 0x1);  //R:on B:off
-        CLog::Log(LOGDEBUG, "Setting SmartXX LED: RED");
-      }
-      return true;
-    }
-    else if (iSmartXXLED == SMARTXX_LED_BLUE)
-    { //Only Blue
-      if (SmartXXModCHIP() == "SmartXX V3")
-      {
-        _outp(0xf70c,0);// Red
-        _outp(0xf70d,0);  // Green
-        _outp(0xf70e,80); // Blue
-        _outp(0xf702, 0x0);  // Status LED OFF
-      }
-      else
-      {
-        _outp(0xf702, 0xb);  //R:off  B:off
-        _outp(0xf702, 0xa);  //R:off B:on
-        CLog::Log(LOGDEBUG, "Setting SmartXX LED: BLUE");
-      }
-      return true;
-    }
-    else if (iSmartXXLED == SMARTXX_LED_BLUE_RED)
-    { // RED and Blue
-      if (SmartXXModCHIP() == "SmartXX V3")
-      {
-        _outp(0xf70c,80);// Red
-        _outp(0xf70d,0);  // Green
-        _outp(0xf70e,80); // Blue
-        _outp(0xf702, 0xb);  // Status LED Blue ON
-      }
-      else
-      {
-        _outp(0xf702, 0xb);  //R:off  B:off
-        _outp(0xf702, 0x0);  //R:on B:on
-        CLog::Log(LOGDEBUG, "Setting SmartXX LED: RED and BLUE");
-      }
-      return true;
-    }
-    else if (iSmartXXLED == SMARTXX_LED_CYCLE)
-    {
-      if (SmartXXModCHIP() == "SmartXX V3")
-      {
-        _outp(0xf70c,80);  // Red
-        _outp(0xf70d,80);  // Green
-        _outp(0xf70e,80);  // Blue
-        _outp(0xf702, 0xb);  // Status LED Blue ON
-      }
-      else
-      {
-        // Blue and Red
-        _outp(0xf702, 0x0);  //R:on B:on
-        Sleep(100);
-        _outp(0xf702, 0x1);  //R:on B:off
-        Sleep(100);
-        _outp(0xf702, 0xa);  //R:off B:on
-        Sleep(100);
-        _outp(0xf702, 0xb);  //R:off  B:off
-        Sleep(100);
-       }
-      CLog::Log(LOGDEBUG, "Setting SmartXX LED: 1x CYCLE NO --> ALL ON!");
-      return true;
-    }
-    else
-    {
-      if (SmartXXModCHIP() == "SmartXX V3")
-      {
-        _outp(0xf70c,0);// Red
-        _outp(0xf70d,0);  // Green
-        _outp(0xf70e,80); // Blue
-        _outp(0xf702, 0xb);  // Status LED Blue ON
-      }
-      else
-      {
-        _outp(0xf702, 0xa);  //R:off B:on
-        CLog::Log(LOGDEBUG, "Setting SmartXX LED: DEFAULT STATE --> RED");
-      }
-      return true;
-    }
-  }
-  else return false;
-}
-
 double CSysInfo::GetCPUFrequency()
 {
   unsigned __int64 Fwin;
@@ -869,9 +733,6 @@
   while( strcmp(Listone[cntBioses].Name,"\0") != 0);
   return ("Unknown");
 }
-//GeminiServer: System Up Time in Minutes
-// Will return the time since the system was started!
-// Input Value int: Minutes  Return Values int: Minutes, Hours, Days
 bool CSysInfo::SystemUpTime(int iInputMinutes, int &iMinutes, int &iHours, int &iDays)
 {
   iMinutes=0;iHours=0;iDays=0;
@@ -886,23 +747,5 @@
     iDays = iHours / 24;
     iHours = iHours - (iDays * 24);
   }
-  /*
-  if (iDays >= 7) // Weeks
-  {
-    iWeeks = iDays / 7;
-    iDays = iDays - (iDays * 7);
-  }
-  if (iWeeks >= 4) // Months
-  {
-    iMonth = iWeeks / 4;
-    iMonth = iMonth - (iMonth * 4);
-  }
-  if (iMonth >= 12) // Years
-  {
-    iMonth = iWeeks / 4;
-    iMonth = iMonth - (iMonth * 4);
-  }
-  */
-
   return true;
 }

Modified: trunk/XBMC/xbmc/utils/SystemInfo.h
===================================================================
--- trunk/XBMC/xbmc/utils/SystemInfo.h	2007-02-24 23:12:43 UTC (rev 7915)
+++ trunk/XBMC/xbmc/utils/SystemInfo.h	2007-02-25 08:47:09 UTC (rev 7916)
@@ -36,7 +36,6 @@
     static bool CheckBios(CStdString& strDetBiosNa);
     static bool GetXBOXVersionDetected(CStdString& strXboxVer);
     static bool GetDVDInfo(CStdString& strDVDModel, CStdString& strDVDFirmware);
-    static bool SmartXXLEDControll(int iSmartXXLED);
     static bool GetHDDInfo(CStdString& strHDDModel, CStdString& strHDDSerial,CStdString& strHDDFirmware,CStdString& strHDDpw,CStdString& strHDDLockState);
     static struct Bios * LoadBiosSigns();
 


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

Revision: 7925
          http://svn.sourceforge.net/xbmc/?rev=7925&view=rev
Author:   kreet
Date:     2007-02-25 19:06:39 -0800 (Sun, 25 Feb 2007)

Log Message:
-----------
fixed: MD5 routines fixed, resulting in SMB being fixed. (thanks elupus!)

Modified Paths:
--------------
    trunk/XBMC/xbmc/FileSystem/FileLastFM.cpp
    trunk/XBMC/xbmc/GUIDialogGamepad.cpp
    trunk/XBMC/xbmc/GUIDialogKeyboard.cpp
    trunk/XBMC/xbmc/GUIDialogNumeric.cpp
    trunk/XBMC/xbmc/lib/libscrobbler/scrobbler.cpp
    trunk/XBMC/xbmc/utils/SystemInfo.cpp
    trunk/XBMC/xbmc/utils/SystemInfo.h
    trunk/XBMC/xbmc/utils/md5.c
    trunk/XBMC/xbmc/utils/md5.h

Modified: trunk/XBMC/xbmc/FileSystem/FileLastFM.cpp
===================================================================
--- trunk/XBMC/xbmc/FileSystem/FileLastFM.cpp	2007-02-26 02:22:22 UTC (rev 7924)
+++ trunk/XBMC/xbmc/FileSystem/FileLastFM.cpp	2007-02-26 03:06:39 UTC (rev 7925)
@@ -96,15 +96,16 @@
     return false;
   }
   MD5_CTX md5state;
+  unsigned char md5pword[16];
   MD5Init(&md5state);
   MD5Update(&md5state, (unsigned char *)strPassword.c_str(), (int)strPassword.size());
-  MD5Final(&md5state);
+  MD5Final(md5pword, &md5state);
   char tmp[33];
   strncpy(tmp, "\0", sizeof(tmp));
   for (int j = 0;j < 16;j++) 
   {
     char a[3];
-    sprintf(a, "%02x", md5state.digest[j]);
+    sprintf(a, "%02x", md5pword[j]);
     tmp[2*j] = a[0];
     tmp[2*j+1] = a[1];
   }

Modified: trunk/XBMC/xbmc/GUIDialogGamepad.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogGamepad.cpp	2007-02-26 02:22:22 UTC (rev 7924)
+++ trunk/XBMC/xbmc/GUIDialogGamepad.cpp	2007-02-26 03:06:39 UTC (rev 7925)
@@ -64,11 +64,12 @@
     m_bCanceled = false;
 
     MD5_CTX md5state;
+    unsigned char md5pword[16];
     char md5pword2[64];
     MD5Init(&md5state);
     MD5Update(&md5state, (unsigned char *)m_strUserInput.c_str(), (int)m_strUserInput.size());
-    MD5Final(&md5state);
-    XKGeneral::BytesToHexStr(md5state.digest,16,md5pword2);
+    MD5Final(md5pword, &md5state);
+    XKGeneral::BytesToHexStr(md5pword,16,md5pword2);
 
     if (m_strPassword != md5pword2)
     {
@@ -259,11 +260,12 @@
   if (bGetUserInput && !pDialog->IsCanceled())
   {
     MD5_CTX md5state;
+    unsigned char md5pword[16];
     char md5pword2[64];
     MD5Init(&md5state);
     MD5Update(&md5state, (unsigned char *)pDialog->m_strUserInput.c_str(), (int)pDialog->m_strUserInput.size());
-    MD5Final(&md5state);
-    XKGeneral::BytesToHexStr(md5state.digest,16,md5pword2);
+    MD5Final(md5pword, &md5state);
+    XKGeneral::BytesToHexStr(md5pword,16,md5pword2);
     strToVerify = md5pword2;
     pDialog->m_strUserInput = "";
   }

Modified: trunk/XBMC/xbmc/GUIDialogKeyboard.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogKeyboard.cpp	2007-02-26 02:22:22 UTC (rev 7924)
+++ trunk/XBMC/xbmc/GUIDialogKeyboard.cpp	2007-02-26 03:06:39 UTC (rev 7925)
@@ -537,11 +537,12 @@
   if (checkInput == userInput)
   {
     MD5_CTX md5state;
+    unsigned char md5pword[16];
     char md5pword2[64];
     MD5Init(&md5state);
     MD5Update(&md5state, (unsigned char *)userInput.c_str(), (int)userInput.size());
-    MD5Final(&md5state);
-    XKGeneral::BytesToHexStr(md5state.digest,16,md5pword2);
+    MD5Final(md5pword, &md5state);
+    XKGeneral::BytesToHexStr(md5pword,16,md5pword2);
     newPassword = md5pword2;
     return true;
   }
@@ -581,11 +582,12 @@
       return 0;
 
     MD5_CTX md5state;
+    unsigned char md5pword[16];
     char md5pword2[64];
     MD5Init(&md5state);
     MD5Update(&md5state, (unsigned char *)strUserInput.c_str(), (int)strUserInput.size());
-    MD5Final(&md5state);
-    XKGeneral::BytesToHexStr(md5state.digest,16,md5pword2);
+    MD5Final(md5pword, &md5state);
+    XKGeneral::BytesToHexStr(md5pword, 16, md5pword2);
     if (strPassword == md5pword2)
       return 0;		// user entered correct password
     else return 1;	// user must have entered an incorrect password
@@ -595,11 +597,12 @@
     if (!strUserInput.IsEmpty())
     {
       MD5_CTX md5state;
+      unsigned char md5pword[16];
       char md5pword2[64];
       MD5Init(&md5state);
       MD5Update(&md5state, (unsigned char *)strUserInput.c_str(), (int)strUserInput.size());
-      MD5Final(&md5state);
-      XKGeneral::BytesToHexStr(md5state.digest,16,md5pword2);
+      MD5Final(md5pword, &md5state);
+      XKGeneral::BytesToHexStr(md5pword, 16, md5pword2);
 
       strPassword = md5pword2;
       return 0; // user entered correct password

Modified: trunk/XBMC/xbmc/GUIDialogNumeric.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIDialogNumeric.cpp	2007-02-26 02:22:22 UTC (rev 7924)
+++ trunk/XBMC/xbmc/GUIDialogNumeric.cpp	2007-02-26 03:06:39 UTC (rev 7925)
@@ -621,11 +621,12 @@
   }
 
   MD5_CTX md5state;
+  unsigned char md5pword[16];
   char md5pword2[64];
   MD5Init(&md5state);
   MD5Update(&md5state, (unsigned char *)strInput.c_str(), (int)strInput.size());
-  MD5Final(&md5state);
-  XKGeneral::BytesToHexStr(md5state.digest,16,md5pword2);
+  MD5Final(md5pword, &md5state);
+  XKGeneral::BytesToHexStr(md5pword, 16, md5pword2);
 
   if (!bVerifyInput)
   {

Modified: trunk/XBMC/xbmc/lib/libscrobbler/scrobbler.cpp
===================================================================
--- trunk/XBMC/xbmc/lib/libscrobbler/scrobbler.cpp	2007-02-26 02:22:22 UTC (rev 7924)
+++ trunk/XBMC/xbmc/lib/libscrobbler/scrobbler.cpp	2007-02-26 03:06:39 UTC (rev 7925)
@@ -131,15 +131,16 @@
   if (strPass.IsEmpty())
     return;
   MD5_CTX md5state;
+  unsigned char md5pword[16];
   MD5Init(&md5state);
   MD5Update(&md5state, (unsigned char *)strPass.c_str(), (int)strPass.size());
-  MD5Final(&md5state);
+  MD5Final(md5pword, &md5state);
   char tmp[33];
   strncpy(tmp, "\0", sizeof(tmp));
   for (int j = 0;j < 16;j++) 
   {
     char a[3];
-    sprintf(a, "%02x", md5state.digest[j]);
+    sprintf(a, "%02x", md5pword[j]);
     tmp[2*j] = a[0];
     tmp[2*j+1] = a[1];
   }
@@ -411,15 +412,16 @@
 {
   CStdString clear = m_strPassword + m_strChallenge;
   MD5_CTX md5state;
+  unsigned char md5pword[16];
   MD5Init(&md5state);
   MD5Update(&md5state, (unsigned char *)clear.c_str(), (int)clear.length());
-  MD5Final(&md5state);
+  MD5Final(md5pword, &md5state);
   char key[33];
   strncpy(key, "\0", sizeof(key));
   for (int j = 0;j < 16;j++) 
   {
     char a[3];
-    sprintf(a, "%02x", md5state.digest[j]);
+    sprintf(a, "%02x", md5pword[j]);
     key[2*j] = a[0];
     key[2*j+1] = a[1];
   }

Modified: trunk/XBMC/xbmc/utils/SystemInfo.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/SystemInfo.cpp	2007-02-26 02:22:22 UTC (rev 7924)
+++ trunk/XBMC/xbmc/utils/SystemInfo.cpp	2007-02-26 03:06:39 UTC (rev 7925)
@@ -35,39 +35,22 @@
 
 const char * CSysInfo::cTempBIOSFile = "Q:\\System\\SystemInfo\\BiosBackup.bin";
 const char * CSysInfo::cBIOSmd5IDs   = "Q:\\System\\SystemInfo\\BiosIDs.ini";
-char CSysInfo::MD5_Sign[16];
+char CSysInfo::MD5_Sign[32 + 1];
 extern "C" XPP_DEVICE_TYPE XDEVICE_TYPE_IR_REMOTE_TABLE;
 #define XDEVICE_TYPE_IR_REMOTE  (&XDEVICE_TYPE_IR_REMOTE_TABLE)
 #define DEBUG_KEYBOARD
 #define DEBUG_MOUSE
 
-char* CSysInfo::MDPrint (MD5_CTX *mdContext)
-{
-  ZeroMemory(MD5_Sign, 16);
-  int i;
-  char carat[10],tmpcarat;
-  for (i = 0; i < 16; i++)
-  {
-    ultoa(mdContext->digest[i],carat,16);
-    if (strlen(carat)==1 )
-    {
-      tmpcarat = carat[0];
-      carat[0] = '0';
-      carat[1] = tmpcarat;
-      carat[2] = '\0';
-    }
-    strcat(MD5_Sign,carat);
-  }
-  return (strupr(MD5_Sign));
-}
-
 char* CSysInfo::MD5Buffer(char *buffer, long PosizioneInizio,int KBytes)
 {
   MD5_CTX mdContext;
+  unsigned char md5sum[16];
+  char md5sumstring[33] = "";
   MD5Init (&mdContext);
   MD5Update(&mdContext, (unsigned char *)(buffer + PosizioneInizio), KBytes * 1024);
-  MD5Final (&mdContext);
-  strcpy(MD5_Sign, MDPrint(&mdContext));
+  MD5Final (md5sum, &mdContext);
+  XKGeneral::BytesToHexStr(md5sum, 16, md5sumstring);
+  strcpy(MD5_Sign, md5sumstring);
   return MD5_Sign;
 }
 
@@ -75,10 +58,13 @@
 {
   CStdString strReturn;
   MD5_CTX mdContext;
+  unsigned char md5sum[16];
+  char md5sumstring[33] = "";
   MD5Init (&mdContext);
   MD5Update(&mdContext, (unsigned char *)(buffer + PosizioneInizio), KBytes * 1024);
-  MD5Final (&mdContext);
-  strReturn.Format("%s", MDPrint(&mdContext));
+  MD5Final (md5sum, &mdContext);
+  XKGeneral::BytesToHexStr(md5sum, 16, md5sumstring);
+  strReturn.Format("%s", md5sumstring);
   return strReturn;
 }
 CStdString CSysInfo::GetAVPackInfo()

Modified: trunk/XBMC/xbmc/utils/SystemInfo.h
===================================================================
--- trunk/XBMC/xbmc/utils/SystemInfo.h	2007-02-26 02:22:22 UTC (rev 7924)
+++ trunk/XBMC/xbmc/utils/SystemInfo.h	2007-02-26 03:06:39 UTC (rev 7925)
@@ -54,11 +54,10 @@
     static char* ReturnBiosName(char *buffer, char *str);
     static char* ReturnBiosSign(char *buffer, char *str);
     static char* CheckMD5 (struct Bios *Listone, char *Sign);
-    static char* MDPrint (MD5_CTX *mdContext);
     static char* MD5Buffer(char *filename,long PosizioneInizio,int KBytes);
     static CStdString MD5BufferNew(char *filename,long PosizioneInizio,int KBytes);
 
-    static char MD5_Sign[16];
+    static char MD5_Sign[32 + 1];
 
     // Folder where the Bios Detections Files Are!
     static const char *cTempBIOSFile;

Modified: trunk/XBMC/xbmc/utils/md5.c
===================================================================
--- trunk/XBMC/xbmc/utils/md5.c	2007-02-26 02:22:22 UTC (rev 7924)
+++ trunk/XBMC/xbmc/utils/md5.c	2007-02-26 03:06:39 UTC (rev 7925)
@@ -123,7 +123,7 @@
   }
 }
 
-void MD5Final (MD5_CTX *mdContext)
+void MD5Final (unsigned char digest[16], MD5_CTX *mdContext)
 {
   UINT4 in[16];
   int mdi;
@@ -151,12 +151,12 @@
 
   /* store buffer in digest */
   for (i = 0, ii = 0; i < 4; i++, ii += 4) {
-    mdContext->digest[ii] = (unsigned char)(mdContext->buf[i] & 0xFF);
-    mdContext->digest[ii+1] =
+    digest[ii] = (unsigned char)(mdContext->buf[i] & 0xFF);
+    digest[ii+1] =
       (unsigned char)((mdContext->buf[i] >> 8) & 0xFF);
-    mdContext->digest[ii+2] =
+    digest[ii+2] =
       (unsigned char)((mdContext->buf[i] >> 16) & 0xFF);
-    mdContext->digest[ii+3] =
+    digest[ii+3] =
       (unsigned char)((mdContext->buf[i] >> 24) & 0xFF);
   }
 }

Modified: trunk/XBMC/xbmc/utils/md5.h
===================================================================
--- trunk/XBMC/xbmc/utils/md5.h	2007-02-26 02:22:22 UTC (rev 7924)
+++ trunk/XBMC/xbmc/utils/md5.h	2007-02-26 03:06:39 UTC (rev 7925)
@@ -52,12 +52,11 @@
   UINT4 i[2];                   /* number of _bits_ handled mod 2^64 */
   UINT4 buf[4];                                    /* scratch buffer */
   unsigned char in[64];                              /* input buffer */
-  unsigned char digest[16];     /* actual digest after MD5Final call */
 } MD5_CTX;
 
 void MD5Init (MD5_CTX *mdContext);
 void MD5Update (MD5_CTX *mdContext, unsigned char *inBuf, unsigned int inLen);
-void MD5Final (MD5_CTX *mdContext);
+void MD5Final (unsigned char digest[16], MD5_CTX *mdContext);
 
 #ifdef __cplusplus
 }


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

Revision: 7930
          http://svn.sourceforge.net/xbmc/?rev=7930&view=rev
Author:   geminiserver
Date:     2007-02-26 01:20:48 -0800 (Mon, 26 Feb 2007)

Log Message:
-----------
changed: system info, more move to Info manager

Modified Paths:
--------------
    trunk/XBMC/xbmc/GUIWindowSystemInfo.cpp
    trunk/XBMC/xbmc/GUIWindowSystemInfo.h
    trunk/XBMC/xbmc/lib/smartXX/smartxxlcd.cpp
    trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
    trunk/XBMC/xbmc/utils/GUIInfoManager.h
    trunk/XBMC/xbmc/utils/LED.cpp
    trunk/XBMC/xbmc/utils/SystemInfo.cpp
    trunk/XBMC/xbmc/utils/SystemInfo.h

Modified: trunk/XBMC/xbmc/GUIWindowSystemInfo.cpp
===================================================================
--- trunk/XBMC/xbmc/GUIWindowSystemInfo.cpp	2007-02-26 09:17:36 UTC (rev 7929)
+++ trunk/XBMC/xbmc/GUIWindowSystemInfo.cpp	2007-02-26 09:20:48 UTC (rev 7930)
@@ -33,19 +33,10 @@
 CGUIWindowSystemInfo::CGUIWindowSystemInfo(void)
 :CGUIWindow(WINDOW_SYSTEM_INFORMATION, "SettingsSystemInfo.xml")
 {
-  mplayerVersion="";
-#ifdef HAS_SYSINFO
-  m_pXKEEPROM = new XKEEPROM;
-  m_pXKEEPROM->ReadFromXBOX();
-  m_XBOX_Version = m_pXKEEPROM->GetXBOXVersion();
-#endif
 }
 
 CGUIWindowSystemInfo::~CGUIWindowSystemInfo(void)
 {
-#ifdef HAS_SYSINFO
-  delete m_pXKEEPROM;
-#endif
 }
 
 bool CGUIWindowSystemInfo::OnAction(const CAction &action)
@@ -64,12 +55,7 @@
   {
   case GUI_MSG_WINDOW_INIT:
     {
-#ifdef HAS_SYSINFO
-      //Get SystemInformations on Init
       CGUIWindow::OnMessage(message);
-      //CreateEEPROMBackup("System\\SystemInfo");
-      //CSysInfo::BackupBios();
-#endif
       SetLabelDummy();
       b_IsHome = TRUE;
       return true;
@@ -85,7 +71,7 @@
         b_IsHome = FALSE;
         SetLabelDummy();
         SET_CONTROL_LABEL(40,g_localizeStrings.Get(20156));
-#ifdef HAS_SYSINFO
+        #ifdef HAS_SYSINFO
         //Label 2-6; HDD Values
         SET_CONTROL_LABEL(2, g_infoManager.GetLabel(SYSTEM_HDD_MODEL));
         SET_CONTROL_LABEL(3, g_infoManager.GetLabel(SYSTEM_HDD_SERIAL));
@@ -94,17 +80,17 @@
         SET_CONTROL_LABEL(6, g_infoManager.GetLabel(SYSTEM_HDD_LOCKSTATE));
         
         //Label 7: HDD Lock/UnLock key
-        CStdString strhddlockey;
-        GetHDDKey(strhddlockey);
-        SET_CONTROL_LABEL(7, strhddlockey);
+        SET_CONTROL_LABEL(7, g_sysinfo.GetHDDKey());
 
         //Label 8 + 9: Refurb Info
-        GetRefurbInfo(8, 9);
+        CStdString rfi_FirstBootTime, rfi_PowerCycleCount;
+        g_sysinfo.GetRefurbInfo(rfi_FirstBootTime, rfi_PowerCycleCount);
+        SET_CONTROL_LABEL(8, rfi_FirstBootTime);
+        SET_CONTROL_LABEL(9, rfi_PowerCycleCount);
 
         //Label 10: HDD Temperature
         SET_CONTROL_LABEL(10, g_infoManager.GetLabel(SYSTEM_HDD_TEMPERATURE));
-
-#endif
+        #endif
       }
       else if(iControl == CONTROL_BT_DVD)
       {
@@ -143,9 +129,7 @@
         GetNetwork(2,5,3,6,7,8,9);  // Label 2-7
 
         // Label 8: Mac Address
-        CStdString strMacAddress;
-        GetMACAddress(strMacAddress);
-        SET_CONTROL_LABEL(4, strMacAddress);
+        SET_CONTROL_LABEL(4, g_sysinfo.GetMACAddress());
 
         // Label 9: Online State
         CStdString strInetCon;
@@ -167,14 +151,10 @@
         SET_CONTROL_LABEL(4,g_infoManager.GetLabel(SYSTEM_AV_CABLE_PACK_INFO));
 
         // Label 5: XBE Video Region
-        CStdString strVideoXBERegion;
-        GetVideoXBERegion(strVideoXBERegion);
-        SET_CONTROL_LABEL(5,strVideoXBERegion);
+        SET_CONTROL_LABEL(5,g_sysinfo.GetVideoXBERegion());
 
         // Label 6: DVD Zone
-        CStdString strdvdzone;
-        GetDVDZone(strdvdzone);
-        SET_CONTROL_LABEL(6, strdvdzone);
+        SET_CONTROL_LABEL(6, g_sysinfo.GetDVDZone());
 #endif
       }
       else if(iControl == CONTROL_BT_HARDWARE)
@@ -198,10 +178,8 @@
         SET_CONTROL_LABEL(2,g_infoManager.GetLabel(SYSTEM_XBOX_VERSION));
 
         // Label 3: XBOX Serial
-        CStdString strXBSerial, strXBOXSerial;
-        CStdString strlblXBSerial = g_localizeStrings.Get(13289);
-        GetXBOXSerial(strXBSerial);
-        strXBOXSerial.Format("%s %s",strlblXBSerial,strXBSerial);
+        CStdString strXBOXSerial;
+        strXBOXSerial.Format("%s %s",g_localizeStrings.Get(13289) ,g_sysinfo.GetXBOXSerial());
         SET_CONTROL_LABEL(3,strXBOXSerial);
 
         // Label 4: CPU Speed!
@@ -225,22 +203,19 @@
         if (GetBIOSInfo(strBiosName))
           SET_CONTROL_LABEL(6,strBiosName);
 
-        // Label 7: XBOX Live Key
-        //CStdString strXBLiveKey;
-        //GetXBLiveKey(strXBLiveKey);
-        //SET_CONTROL_LABEL(7, strXBLiveKey);
-
         // Label 8: XBOX ProducutionDate Info
-        CStdString strXBProDate;
-        GetXBProduceInfo(strXBProDate);
-        SET_CONTROL_LABEL(7, strXBProDate);
+        SET_CONTROL_LABEL(7, g_sysinfo.GetXBProduceInfo());
 
         // Label 8,9,10,11: Attached Units!
-        SET_CONTROL_LABEL(8, CSysInfo::GetUnits(1));
-        SET_CONTROL_LABEL(9, CSysInfo::GetUnits(2));
-        SET_CONTROL_LABEL(10, CSysInfo::GetUnits(3));
-        SET_CONTROL_LABEL(11, CSysInfo::GetUnits(4));
-        //GetUnits(9, 10, 11);
+        SET_CONTROL_LABEL(8, g_sysinfo.GetUnits(1));
+        SET_CONTROL_LABEL(9, g_sysinfo.GetUnits(2));
+        SET_CONTROL_LABEL(10, g_sysinfo.GetUnits(3));
+        SET_CONTROL_LABEL(11, g_sysinfo.GetUnits(4));
+        // Creating BackUP
+        g_sysinfo.CreateEEPROMBackup();
+        g_sysinfo.CreateBiosBackup();
+        g_sysinfo.WriteTXTInfoFile("Q:\\System\\SystemInfo\\SYSTEM_INFO.TXT");
+        //
         pDlgProgress.SetPercentage(100);
         pDlgProgress.Progress();
         pDlgProgress.Close();
@@ -307,33 +282,18 @@
   CStdString version, buildDate;
   version.Format("%s %s", g_localizeStrings.Get(144), g_infoManager.GetVersion());
   buildDate.Format("XBMC %s (Compiled :%s)", version, g_infoManager.GetBuild());
-#ifdef HAS_SYSINFO
-  if (mplayerVersion.IsEmpty())
-    mplayerVersion = g_infoManager.GetLabel(SYSTEM_MPLAYER_VERSION);
-#endif
   SET_CONTROL_LABEL(label1, version);
   SET_CONTROL_LABEL(label2, buildDate);
-  SET_CONTROL_LABEL(label3, mplayerVersion);
+  SET_CONTROL_LABEL(label3, g_infoManager.GetLabel(SYSTEM_MPLAYER_VERSION));
   return true;
 }
 
 #ifdef HAS_SYSINFO
-void CGUIWindowSystemInfo::GetMACAddress(CStdString& strMacAddress)
-{
-  char macaddress[20] = "";
-
-  m_pXKEEPROM->GetMACAddressString((LPSTR)&macaddress, ':');
-
-  CStdString lbl1 = g_localizeStrings.Get(149);
-
-  strMacAddress.Format("%s: %s", lbl1, macaddress);
-}
-
 bool CGUIWindowSystemInfo::GetBIOSInfo(CStdString& strBiosName)
 {
   CStdString cBIOSName;
   CStdString strlblBios = g_localizeStrings.Get(13285);
-  if(CSysInfo::CheckBios(cBIOSName))
+  if(g_sysinfo.CheckBios(cBIOSName))
   {
     strBiosName.Format("%s %s", strlblBios,cBIOSName);
     return true;
@@ -344,54 +304,13 @@
     return true;
   }
 }
-
-void CGUIWindowSystemInfo::GetXBOXSerial(CStdString& strXBOXSerial)
-{
-  CHAR serial[SERIALNUMBER_SIZE + 1] = "";
-
-  m_pXKEEPROM->GetSerialNumberString(serial);
-
-  strXBOXSerial.Format("%s", serial);
-}
-
-void CGUIWindowSystemInfo::GetXBProduceInfo(CStdString& strXBProDate)
-{
-  // Print XBOX Production Place and Date
-  CStdString lbl = g_localizeStrings.Get(13290);
-  CStdString lblYear = g_localizeStrings.Get(201);
-  CStdString serialnumber;
-  GetXBOXSerial(serialnumber);
-  char *info = (char *) serialnumber.c_str();
-  char *country;
-  switch (atoi(&info[11]))
-  {
-  case 2:
-    country = "Mexico";
-    break;
-  case 3:
-    country = "Hungary";
-    break;
-  case 5:
-    country = "China";
-    break;
-  case 6:
-    country = "Taiwan";
-    break;
-  default:
-    country = "Unknown";
-    break;
-  }
-  CLog::Log(LOGDEBUG, "- XBOX production info: Country: %s, LineNumber: %c, Week %c%c, Year 200%c", country, info[0x00], info[0x08], info[0x09],info[0x07]);
-  strXBProDate.Format("%s %s, %s 200%c, "+g_localizeStrings.Get(20169)+": %c%c "+g_localizeStrings.Get(20170)+": %c",lbl, country, lblYear,info[0x07], info[0x08],info[0x09], info[0x00]);
-}
-
 bool CGUIWindowSystemInfo::GetModChipInfo(CStdString& strModChip)
 {
   // XBOX Modchip Type Detection
-  CStdString ModChip    = CSysInfo::GetModCHIPDetected();
+  CStdString ModChip    = g_sysinfo.GetModCHIPDetected();
   CStdString lblModChip = g_localizeStrings.Get(13291);
    // Check if it is a SmartXX
-  CStdString strIsSmartXX = CSysInfo::SmartXXModCHIP();
+  CStdString strIsSmartXX = g_sysinfo.SmartXXModCHIP();
   if (!strIsSmartXX.Equals("None"))
   {
     strModChip.Format("%s %s", lblModChip.c_str(),strIsSmartXX);
@@ -412,59 +331,6 @@
   }
   return false;
 }
-
-void CGUIWindowSystemInfo::GetVideoXBERegion(CStdString& strVideoXBERegion)
-{
-  //Print Video Standard & XBE Region...
-  CStdString lblVXBE = g_localizeStrings.Get(13293);
-  CStdString XBEString, VideoStdString;
-
-  switch (m_pXKEEPROM->GetVideoStandardVal())
-  {
-  case XKEEPROM::NTSC_J:
-    VideoStdString = "NTSC J";
-    break;
-  case XKEEPROM::NTSC_M:
-    VideoStdString = "NTSC M";
-    break;
-  case XKEEPROM::PAL_I:
-    VideoStdString = "PAL I";
-    break;
-  case XKEEPROM::PAL_M:
-    VideoStdString = "PAL M";
-    break;
-  default:
-    VideoStdString = g_localizeStrings.Get(13205); // "Unknown"
-  }
-
-  switch(m_pXKEEPROM->GetXBERegionVal())
-  {
-  case XKEEPROM::NORTH_AMERICA:
-    XBEString = "North America";
-    break;
-  case XKEEPROM::JAPAN:
-    XBEString = "Japan";
-    break;
-  case XKEEPROM::EURO_AUSTRALIA:
-    XBEString = "Europe / Australia";
-    break;
-  default:
-    XBEString = g_localizeStrings.Get(13205); // "Unknown"
-  }
-
-  strVideoXBERegion.Format("%s %s, %s", lblVXBE, VideoStdString, XBEString);
-}
-
-void CGUIWindowSystemInfo::GetDVDZone(CStdString& strdvdzone)
-{
-  //Print DVD [Region] Zone ..
-  CStdString lblDVDZone =  g_localizeStrings.Get(13294);
-  DVD_ZONE dvdVal;
-
-  dvdVal = m_pXKEEPROM->GetDVDRegionVal();
-  strdvdzone.Format("%s %d",lblDVDZone, dvdVal);
-}
-
 bool CGUIWindowSystemInfo::GetINetState(CStdString& strInetCon)
 {
   CHTTP http;
@@ -487,55 +353,7 @@
   return true;
 }
 
-void CGUIWindowSystemInfo::GetXBLiveKey(CStdString& strXBLiveKey)
-{
-  //Print XBLIVE Online Key..
-  CStdString lbl3 = g_localizeStrings.Get(13298);
-  char livekey[ONLINEKEY_SIZE * 2 + 1] = "";
 
-  m_pXKEEPROM->GetOnlineKeyString(livekey);
-
-  strXBLiveKey.Format("%s %s",lbl3, livekey);
-}
-
-void CGUIWindowSystemInfo::GetHDDKey(CStdString& strhddlockey)
-{
-  //Print HDD Key...
-  CStdString lbl5 = g_localizeStrings.Get(13150);
-  char hdkey[HDDKEY_SIZE * 2 + 1];
-
-  m_pXKEEPROM->GetHDDKeyString((LPSTR)&hdkey);
-
-  strhddlockey.Format("%s %s",lbl5, hdkey);
-}
-
-bool CGUIWindowSystemInfo::GetRefurbInfo(int label1, int label2)
-{
-  XBOX_REFURB_INFO xri;
-  CStdString refurb_info;
-  SYSTEMTIME sys_time;
-
-  if (ExReadWriteRefurbInfo(&xri, sizeof(XBOX_REFURB_INFO), FALSE) < 0)
-    return false;
-
-  FileTimeToSystemTime((FILETIME*)&xri.FirstBootTime, &sys_time);
-
-  refurb_info.Format("%s %d-%d-%d %d:%02d", g_localizeStrings.Get(13173), 
-    sys_time.wMonth, 
-    sys_time.wDay, 
-    sys_time.wYear,
-    sys_time.wHour,
-    sys_time.wMinute);
-
-  SET_CONTROL_LABEL(label1, refurb_info);
-
-  refurb_info.Format("%s %d", g_localizeStrings.Get(13174), xri.PowerCycleCount);
-
-  SET_CONTROL_LABEL(label2, refurb_info);
-
-  return true;
-}
-
 bool CGUIWindowSystemInfo::GetNetwork(int i_lblp1, int i_lblp2, int i_lblp3, int i_lblp4, int i_lblp5, int i_lblp6, int i_lblp7)
 {
   // Set Network Informations
@@ -773,140 +591,4 @@
   }
   return ret == TRUE;
 }
-void CGUIWindowSystemInfo::CreateEEPROMBackup(LPCSTR BackupFilePrefix)
-{
-  char backup_path[MAX_PATH];
-
-  wsprintf(backup_path, "Q:\\%s\\EEPROMBackup.bin", BackupFilePrefix);
-  m_pXKEEPROM->WriteToBINFile(backup_path);
-
-  wsprintf(backup_path, "Q:\\%s\\EEPROMBackup.cfg", BackupFilePrefix);
-  m_pXKEEPROM->WriteToCFGFile(backup_path);
-}
-
-void CGUIWindowSystemInfo::WriteTXTInfoFile(LPCSTR strFilename)
-{
-  BOOL retVal = FALSE;
-  DWORD dwBytesWrote = 0;
-  CHAR tmpData[SYSINFO_TMP_SIZE];
-  CStdString tmpstring;
-  LPSTR tmpFileStr = new CHAR[2048];
-  ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
-  ZeroMemory(tmpFileStr, 2048);
-
-  HANDLE hf = CreateFile(strFilename, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
-  if (hf !=  INVALID_HANDLE_VALUE)
-  {
-    //Write File Header..
-    strcat(tmpFileStr, "*******  XBOXMEDIACENTER [XBMC] INFORMATION FILE  *******\r\n");
-    if (m_XBOX_Version== m_pXKEEPROM->V1_0)
-      strcat(tmpFileStr, "\r\nXBOX Version = \t\tV1.0");
-    else if (m_XBOX_Version == m_pXKEEPROM->V1_1)
-      strcat(tmpFileStr, "\r\nXBOX Version = \t\tV1.1");
-    else if (m_XBOX_Version == m_pXKEEPROM->V1_6)
-      strcat(tmpFileStr,  "\r\nXBOX Version = \t\tV1.6");
-    //Get Kernel Version
-    ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
-    sprintf(tmpData, "\r\nKernel Version: \t%d.%d.%d.%d", XboxKrnlVersion->VersionMajor,XboxKrnlVersion->VersionMinor,XboxKrnlVersion->Build,XboxKrnlVersion->Qfe);
-    strcat(tmpFileStr, tmpData);
-
-    //Get Memory Status
-    strcat(tmpFileStr, "\r\nXBOX RAM = \t\t");
-    ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
-    MEMORYSTATUS stat;
-    GlobalMemoryStatus( &stat );
-    ltoa(stat.dwTotalPhys/1024/1024, tmpData, 10);
-    strcat(tmpFileStr, tmpData);
-    strcat(tmpFileStr, " MBytes");
-
-    //Write Serial Number..
-    strcat(tmpFileStr, "\r\n\r\nXBOX Serial Number = \t");
-    GetXBOXSerial(tmpstring);
-    strcat(tmpFileStr, tmpstring.c_str());
-
-    //Write MAC Address..
-    strcat(tmpFileStr, "\r\nXBOX MAC Address = \t");
-    GetMACAddress(tmpstring);
-    strcat(tmpFileStr, tmpstring.c_str());
-
-    //Write Online Key ..
-    strcat(tmpFileStr, "\r\nXBOX Online Key = \t");
-    GetXBLiveKey(tmpstring);
-    strcat(tmpFileStr, tmpstring.c_str());
-
-    //Write VideoMode ..
-    strcat(tmpFileStr, "\r\nXBOX Video Mode = \t");
-    VIDEO_STANDARD vdo = m_pXKEEPROM->GetVideoStandardVal();
-    if (vdo == XKEEPROM::VIDEO_STANDARD::PAL_I)
-      strcat(tmpFileStr, "PAL");
-    else
-      strcat(tmpFileStr, "NTSC");
-
-    //Write XBE Region..
-    strcat(tmpFileStr, "\r\nXBOX XBE Region = \t");
-    ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
-    m_pXKEEPROM->GetXBERegionString(tmpData);
-    strcat(tmpFileStr, tmpData);
-
-    //Write HDDKey..
-    strcat(tmpFileStr, "\r\nXBOX HDD Key = \t\t");
-    ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
-    m_pXKEEPROM->GetHDDKeyString(tmpData);
-    strcat(tmpFileStr, tmpData);
-
-    //Write Confounder..
-    strcat(tmpFileStr, "\r\nXBOX Confounder = \t");
-    ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
-    m_pXKEEPROM->GetConfounderString(tmpData);
-    strcat(tmpFileStr, tmpData);
-
-    //GET HDD Info...
-    //Query ATA IDENTIFY
-    XKHDD::ATA_COMMAND_OBJ cmdObj;
-    ZeroMemory(&cmdObj, sizeof(XKHDD::ATA_COMMAND_OBJ));
-    cmdObj.IPReg.bCommandReg = IDE_ATA_IDENTIFY;
-    cmdObj.IPReg.bDriveHeadReg = IDE_DEVICE_MASTER;
-    XKHDD::SendATACommand(IDE_PRIMARY_PORT, &cmdObj, IDE_COMMAND_READ);
-
-    //Write HDD Model
-    strcat(tmpFileStr, "\r\n\r\nXBOX HDD Model = \t");
-    ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
-    XKHDD::GetIDEModel(cmdObj.DATA_BUFFER, (LPSTR)tmpData);
-    strcat(tmpFileStr, tmpData);
-
-    //Write HDD Serial..
-    strcat(tmpFileStr, "\r\nXBOX HDD Serial = \t");
-    ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
-    XKHDD::GetIDESerial(cmdObj.DATA_BUFFER, (LPSTR)tmpData);
-    strcat(tmpFileStr, tmpData);
-
-    //Write HDD Password..
-    ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
-    strcat(tmpFileStr, "\r\n\r\nXBOX HDD Password = \t");
-
-    ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
-    BYTE HDDpwd[20];
-    ZeroMemory(HDDpwd, 20);
-    XKHDD::GenerateHDDPwd((UCHAR *)XboxHDKey, cmdObj.DATA_BUFFER, (UCHAR*)&HDDpwd);
-    XKGeneral::BytesToHexStr(HDDpwd, 20, tmpData);
-    strcat(tmpFileStr, tmpData);
-
-    //Query ATAPI IDENTIFY
-    ZeroMemory(&cmdObj, sizeof(XKHDD::ATA_COMMAND_OBJ));
-    cmdObj.IPReg.bCommandReg = IDE_ATAPI_IDENTIFY;
-    cmdObj.IPReg.bDriveHeadReg = IDE_DEVICE_SLAVE;
-    XKHDD::SendATACommand(IDE_PRIMARY_PORT, &cmdObj, IDE_COMMAND_READ);
-
-    //Write DVD Model
-    strcat(tmpFileStr, "\r\n\r\nXBOX DVD Model = \t");
-    ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
-    XKHDD::GetIDEModel(cmdObj.DATA_BUFFER, (LPSTR)tmpData);
-    strcat(tmpFileStr, tmpData);
-    strupr(tmpFileStr);
-
-    WriteFile(hf, tmpFileStr, (DWORD)strlen(tmpFileStr), &dwBytesWrote, NULL);
-  }
-  delete[] tmpFileStr;
-  CloseHandle(hf);
-}
 #endif
\ No newline at end of file

Modified: trunk/XBMC/xbmc/GUIWindowSystemInfo.h
===================================================================
--- trunk/XBMC/xbmc/GUIWindowSystemInfo.h	2007-02-26 09:17:36 UTC (rev 7929)
+++ trunk/XBMC/xbmc/GUIWindowSystemInfo.h	2007-02-26 09:20:48 UTC (rev 7930)
@@ -1,6 +1,5 @@
 #pragma once
 #include "guiwindow.h"
-#include "xbox/xkeeprom.h"
 
 #define CONTROL_BT_HDD			92
 #define CONTROL_BT_DVD			93
@@ -9,61 +8,35 @@
 #define CONTROL_BT_NETWORK		96
 #define CONTROL_BT_VIDEO		97
 #define CONTROL_BT_HARDWARE		98
+
 #define AddStr(a,b) (pstrOut += wsprintf( pstrOut, a, b ))
 
-#define SYSINFO_TMP_SIZE 256
-
 class CGUIWindowSystemInfo :
       public CGUIWindow
 {
 public:
 	CGUIWindowSystemInfo(void);
 	virtual ~CGUIWindowSystemInfo(void);
-	virtual bool    OnMessage(CGUIMessage& message);
-	virtual bool	OnAction(const CAction &action);
-	virtual void	Render();
+	virtual bool OnMessage(CGUIMessage& message);
+	virtual bool OnAction(const CAction &action);
+	virtual void Render();
 
 	void	SetLabelDummy();
 	bool	GetBuildTime(int i_lblp1, int i_lblp2, int i_lblp3);
-	static bool GetResolution(CStdString& strResol);
-	static void GetFreeMemory(CStdString& strFreeMem);
 #ifdef HAS_SYSINFO
-	void	UpdateButtons();
-	void	CreateEEPROMBackup(LPCSTR BackupFilePrefix);
-	void	WriteTXTInfoFile(LPCSTR strFilename);
-	
-	bool	GetUnits(int i_lblp1, int i_lblp2, int i_lblp3);
-	bool	GetRefurbInfo(int label1, int label2);
 	bool	GetNetwork(int i_lblp1, int i_lblp2, int i_lblp3, int i_lblp4, int i_lblp5, int i_lblp6, int i_lblp7);
 	bool	GetStorage(int i_lblp1, int i_lblp2, int i_lblp3, int i_lblp4, int i_lblp5, int i_lblp6, int i_lblp7, int i_lblp8, int i_lblp9, int i_lblp10);
 	
-	void GetMACAddress(CStdString& strMacAddress);
-	static bool	GetBIOSInfo(CStdString& strBiosName);
-	static bool GetXBVerInfo(CStdString& strXBoxVer);
-	void GetXBOXSerial(CStdString& strXBOXSerial);
-	void GetXBProduceInfo(CStdString& strXBProDate);
+  static bool	GetBIOSInfo(CStdString& strBiosName);
 	static bool GetModChipInfo(CStdString& strModChip);
-	void GetVideoXBERegion(CStdString& strVideoXBERegion);
-	void GetDVDZone(CStdString& strdvdzone);
 	static bool GetINetState(CStdString& strInetCon);
-	void GetXBLiveKey(CStdString& strXBLiveKey);
-	void GetHDDKey(CStdString& strhddlockey);
+	
 
 #endif
 private:
 	bool b_IsHome;
-	DWORD	m_dwFPSTime;
-	DWORD	m_dwFrames;
-	float	cputemp;
-	float	mbtemp;
-  CStdString mplayerVersion;
-
 #ifdef HAS_SYSINFO
 	bool GetDiskSpace(const CStdString &drive, ULARGE_INTEGER &total, ULARGE_INTEGER& totalFree, CStdString &string);
-#ifdef HAS_XBOX_HARDWARE
-	XKEEPROM* m_pXKEEPROM;
-	XBOX_VERSION  m_XBOX_Version;
 #endif
-#endif
 };
 

Modified: trunk/XBMC/xbmc/lib/smartXX/smartxxlcd.cpp
===================================================================
--- trunk/XBMC/xbmc/lib/smartXX/smartxxlcd.cpp	2007-02-26 09:17:36 UTC (rev 7929)
+++ trunk/XBMC/xbmc/lib/smartXX/smartxxlcd.cpp	2007-02-26 09:20:48 UTC (rev 7930)
@@ -381,7 +381,7 @@
   }
   else //if (g_guiSettings.GetInt("lcd.type")==LCD_TYPE_LCD_HD44780)
   {
-    if (CSysInfo::SmartXXModCHIP().Equals("SmartXX V3"))
+    if (g_sysinfo.SmartXXModCHIP().Equals("SmartXX V3"))
     {
       float fBackLight=((float)level)/100.0f;
       fBackLight*=127.0f;
@@ -389,7 +389,7 @@
       if (iNewLevel==63) iNewLevel=64;
       _outp(DISP_O_LIGHT, iNewLevel&127);
     }
-    else if (CSysInfo::SmartXXModCHIP().Equals("SmartXX OPX"))
+    else if (g_sysinfo.SmartXXModCHIP().Equals("SmartXX OPX"))
     {
       float fBackLight=((float)level)/100.0f;
       fBackLight*=127.0f;
@@ -418,7 +418,7 @@
 
   float fBackLight=((float)level)/100.0f;
   
-  if (CSysInfo::SmartXXModCHIP().Equals("SmartXX V3")) // Smartxx V3 
+  if (g_sysinfo.SmartXXModCHIP().Equals("SmartXX V3")) // Smartxx V3 
   {   
     if (level<0 || level>99) level=99;
     level = (99-level);
@@ -429,7 +429,7 @@
 
     _outp(0xF701, iNewLevel&127|128);
  	}
-  else if ( CSysInfo::SmartXXModCHIP().Equals("SmartXX OPX"))
+  else if ( g_sysinfo.SmartXXModCHIP().Equals("SmartXX OPX"))
   {
     if (level<0 || level>99) level=99;
     level = (99-level);

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-02-26 09:17:36 UTC (rev 7929)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-02-26 09:20:48 UTC (rev 7930)
@@ -576,56 +576,54 @@
     break;
 
   case SYSTEM_HDD_TEMPERATURE:
-    return GetATAInfo("hddtemperature");
+    return GetATAInfo(SYSTEM_HDD_TEMPERATURE);
     break;
   case SYSTEM_HDD_MODEL:
-    return GetATAInfo("hddinfomodel");
+    return GetATAInfo(SYSTEM_HDD_MODEL);
     break;
   case SYSTEM_HDD_SERIAL:
-    return GetATAInfo("hddinfoserial");
+    return GetATAInfo(SYSTEM_HDD_SERIAL);
     break;
   case SYSTEM_HDD_FIRMWARE:
-    return GetATAInfo("hddinfofirmware");
+    return GetATAInfo(SYSTEM_HDD_FIRMWARE);
     break;
   case SYSTEM_HDD_PASSWORD:
-    return GetATAInfo("hddinfopw");
+    return GetATAInfo(SYSTEM_HDD_PASSWORD);
     break;
   case SYSTEM_HDD_LOCKSTATE:
-    return GetATAInfo("hddinfolockstate");
+    return GetATAInfo(SYSTEM_HDD_LOCKSTATE);
     break;
 
   case SYSTEM_DVD_MODEL:
-    return GetATAInfo("dvdinfomodel");
+    return GetATAInfo(SYSTEM_DVD_MODEL);
     break;
   case SYSTEM_DVD_FIRMWARE:
-    return GetATAInfo("dvdinfofirmware");
+    return GetATAInfo(SYSTEM_DVD_FIRMWARE);
     break;
 
   case SYSTEM_MPLAYER_VERSION:
-    return CSysInfo::GetMPlayerVersion();
+    return SystemInfoValues(SYSTEM_MPLAYER_VERSION);
     break;
   case SYSTEM_KERNEL_VERSION:
-    return CSysInfo::GetKernelVersion();
+    return SystemInfoValues(SYSTEM_KERNEL_VERSION);
     break;
-  
   case SYSTEM_UPTIME:
-    return CSysInfo::GetSystemUpTime();
+    return SystemInfoValues(SYSTEM_UPTIME);
     break;  
   case SYSTEM_TOTALUPTIME:
-    return CSysInfo::GetSystemTotalUpTime();
+    return SystemInfoValues(SYSTEM_TOTALUPTIME);
     break;
 
   case SYSTEM_CPUFREQUENCY:
-    return CSysInfo::GetCPUFreqInfo();
+    return SystemInfoValues(SYSTEM_CPUFREQUENCY);
     break;
 
   case SYSTEM_XBOX_VERSION:
-    return CSysInfo::GetXBVerInfo();
+    return SystemInfoValues(SYSTEM_XBOX_VERSION);
     break;
 
   case SYSTEM_AV_CABLE_PACK_INFO:
-    strLabel.Format("%s %s",g_localizeStrings.Get(13292), CSysInfo::GetAVPackInfo());
-    return strLabel;
+    return SystemInfoValues(SYSTEM_AV_CABLE_PACK_INFO);
     break;
 
   case SYSTEM_SCREEN_RESOLUTION:
@@ -637,9 +635,9 @@
     break;
 
   case SYSTEM_VIDEO_ENCODER_INFO:
-    strLabel.Format("%s %s", g_localizeStrings.Get(13286),CSysInfo::GetVideoEncoder());
-    return strLabel;
+    return SystemInfoValues(SYSTEM_VIDEO_ENCODER_INFO);
     break;
+
   
   case CONTAINER_FOLDERPATH:
     {
@@ -1842,63 +1840,149 @@
   return space;
 }
 
-string CGUIInfoManager::GetATAInfo(const CStdString &strInfo)
+CStdString CGUIInfoManager::GetATAInfo(int info)
 {
 #ifdef HAS_XBOX_HARDWARE
   if (timeGetTime() - m_lastHddInfoTime >= 5000)
-  { // update our variables
+  { 
+    // update our variables
+    if (!b_ata_request)
+    {
+      // We should only request 1 time the HDD Informations
+      // If we request frequence is more then 1 time, we will have a <1sec. Freeze 
+      // of HDD releated functions like FTP, movie play ect.
+      b_ata_request = true;
+      m_hddRequest = g_sysinfo.GetHDDInfo(strHDDModel, strHDDSerial,strHDDFirmware,strHDDpw,strHDDLockState);
+      m_dvdRequest = g_sysinfo.GetDVDInfo(strDVDModel, strDVDFirmware);
+    }
+    b_HddTemp = XKHDD::GetHddSmartTemp();
     m_lastHddInfoTime = timeGetTime();
-    b_HddTemp = XKHDD::GetHddSmartTemp();
-    m_hddRequest = CSysInfo::GetHDDInfo(strHDDModel, strHDDSerial,strHDDFirmware,strHDDpw,strHDDLockState);
-    m_dvdRequest = CSysInfo::GetDVDInfo(strDVDModel, strDVDFirmware);
   }
 #endif
 
   CStdString text;
-  if (strInfo.Equals("hddtemperature"))
+  switch(info)
   {
-    CTemperature temp = CTemperature::CreateFromCelsius((double)b_HddTemp);
-    if (b_HddTemp == 0 )
-    {
-      temp.SetState(CTemperature::invalid);
-      text.Format("%s %s", g_localizeStrings.Get(13151).c_str(), temp.ToString() );
-    }
-    else
-    {
-      text.Format("%s %s", g_localizeStrings.Get(13151).c_str(), temp.ToString() );
-    }
-  }
-  else if (strInfo.Left(7).Equals("hddinfo"))
-  {
-    if (m_hddRequest)
-    {
-      if(strInfo.Equals("hddinfomodel"))
-        text.Format("%s %s", g_localizeStrings.Get(13154).c_str(), strHDDModel.c_str() );
-      else if(strInfo.Equals("hddinfoserial"))
-        text.Format("%s %s", g_localizeStrings.Get(13155).c_str(), strHDDSerial.c_str() );
-      else if(strInfo.Equals("hddinfofirmware"))
-        text.Format("%s %s", g_localizeStrings.Get(13156).c_str(), strHDDFirmware.c_str() );
-      else if(strInfo.Equals("hddinfopw"))
-        text.Format("%s %s", g_localizeStrings.Get(13157).c_str(), strHDDpw.c_str() );
-      else if(strInfo.Equals("hddinfolockstate"))
-        text.Format("%s %s", g_localizeStrings.Get(13158).c_str(), strHDDLockState.c_str() );
-    }
-    else 
+    case SYSTEM_HDD_TEMPERATURE:
+      {
+        CTemperature temp = CTemperature::CreateFromCelsius((double)b_HddTemp);
+        if (b_HddTemp == 0 )
+        {
+          temp.SetState(CTemperature::invalid);
+          text.Format("%s %s", g_localizeStrings.Get(13151).c_str(), temp.ToString() );
+        }
+        else
+        {
+          text.Format("%s %s", g_localizeStrings.Get(13151).c_str(), temp.ToString() );
+        }
+        return text;
+        break;
+      }
+    case SYSTEM_HDD_MODEL:
+      {
+        if(m_hddRequest)
+          text.Format("%s %s", g_localizeStrings.Get(13154).c_str(), strHDDModel.c_str() );
+        return text;
+        break;
+      }
+    case SYSTEM_HDD_SERIAL:
+      {
+        if(m_hddRequest)
+          text.Format("%s %s", g_localizeStrings.Get(13155).c_str(), strHDDSerial.c_str() );
+        return text;
+        break;
+      }
+    case SYSTEM_HDD_FIRMWARE:
+      {
+        if(m_hddRequest)
+          text.Format("%s %s", g_localizeStrings.Get(13156).c_str(), strHDDFirmware.c_str() );
+        return text;
+        break;
+      }
+    case SYSTEM_HDD_PASSWORD:
+      {
+        if(m_hddRequest)
+          text.Format("%s %s", g_localizeStrings.Get(13157).c_str(), strHDDpw.c_str() );
+        return text;
+        break;
+      }
+    case SYSTEM_HDD_LOCKSTATE:
+      {
+        if(m_hddRequest)
+          text.Format("%s %s", g_localizeStrings.Get(13158).c_str(), strHDDLockState.c_str() );
+        return text;
+        break;
+      }
+    case SYSTEM_DVD_MODEL:
+      {
+        if (m_dvdRequest)
+          text.Format("%s %s", g_localizeStrings.Get(13152).c_str(), strDVDModel.c_str() );
+        return text;
+        break;
+      }
+    case SYSTEM_DVD_FIRMWARE:
+      {
+        if (m_dvdRequest)
+          text.Format("%s %s", g_localizeStrings.Get(13153).c_str(), strDVDFirmware.c_str() );
+        return text;
+        break;
+      }
+    default:
       text.Format("%s",g_localizeStrings.Get(13205) ); // "Unknown"
+      break;
   }
-  else if (strInfo.Left(7).Equals("dvdinfo"))
+  return text;
+}
+
+CStdString CGUIInfoManager::SystemInfoValues(int info)
+{
+  if (timeGetTime() - m_lastSysInfoTime >= 5000)
+  { // update our variables, update interval 1 minute
+    m_lastSysInfoTime = timeGetTime();
+    m_systemuptime = g_sysinfo.GetSystemUpTime();
+    m_systemtotaluptime = g_sysinfo.GetSystemTotalUpTime();
+#ifdef HAS_XBOX_HARDWARE
+      // values are only need one time request
+      b_sys_request = true;
+      m_mplayerversion = g_sysinfo.GetMPlayerVersion();
+      m_kernelversion = g_sysinfo.GetKernelVersion();
+      m_cpufrequency = g_sysinfo.GetCPUFreqInfo();
+      m_xboxversion = g_sysinfo.GetXBVerInfo();
+      m_avcablepackinfo = g_sysinfo.GetAVPackInfo();
+      m_videoencoder = g_sysinfo.GetVideoEncoder();
+#endif
+  }
+  switch (info)
   {
-    if (m_dvdRequest)
-    {
-      if(strInfo.Equals("dvdinfomodel"))
-        text.Format("%s %s", g_localizeStrings.Get(13152).c_str(), strDVDModel.c_str() );
-      else if(strInfo.Equals("dvdinfofirmware"))
-        text.Format("%s %s", g_localizeStrings.Get(13153).c_str(), strDVDFirmware.c_str() );
-    }
-    else 
-      text.Format("%s",g_localizeStrings.Get(13205) ); // "Unknown"
+  case SYSTEM_MPLAYER_VERSION:
+    return m_mplayerversion;
+    break;
+  case SYSTEM_KERNEL_VERSION:
+    return m_kernelversion;
+    break;
+  case SYSTEM_UPTIME:
+    return m_systemuptime;
+    break;
+  case SYSTEM_TOTALUPTIME:
+    return m_systemtotaluptime;
+    break;
+  case SYSTEM_CPUFREQUENCY:
+    return m_cpufrequency;
+    break;
+  case SYSTEM_XBOX_VERSION:
+    return m_xboxversion;
+    break;
+  case SYSTEM_AV_CABLE_PACK_INFO:
+    return m_avcablepackinfo;
+    break;
+  case SYSTEM_VIDEO_ENCODER_INFO:
+    return m_videoencoder;
+    break;
+
+  default:
+    return "";
+    break;
   }
-  return text;
 }
 
 CStdString CGUIInfoManager::GetVersion()

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.h
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.h	2007-02-26 09:17:36 UTC (rev 7929)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.h	2007-02-26 09:20:48 UTC (rev 7930)
@@ -352,7 +352,9 @@
   bool m_performingSeek;
 
   string GetSystemHeatInfo(const CStdString &strInfo);
-  string GetATAInfo(const CStdString &strInfo);
+  CStdString GetATAInfo(int info);
+  CStdString SystemInfoValues(int info);
+
   void UpdateFPS();
   inline float GetFPS() const { return m_fps; };
 
@@ -414,9 +416,23 @@
   bool m_hddRequest;
   CStdString strDVDModel, strDVDFirmware;
   bool m_dvdRequest;
+  bool b_ata_request;
 
+  DWORD m_lastSysInfoTime;
+  CStdString m_mplayerversion;
+  CStdString m_kernelversion;
+  CStdString m_systemuptime;
+  CStdString m_systemtotaluptime;
+  CStdString m_cpufrequency;
+  CStdString m_xboxversion;
+  CStdString m_avcablepackinfo;
+  CStdString m_videoencoder;
+  bool b_sys_request;
 
 
+
+
+
   //Fullscreen OSD Stuff
   DWORD m_AfterSeekTimeout;
   bool m_playerSeeking;

Modified: trunk/XBMC/xbmc/utils/LED.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/LED.cpp	2007-02-26 09:17:36 UTC (rev 7929)
+++ trunk/XBMC/xbmc/utils/LED.cpp	2007-02-26 09:20:48 UTC (rev 7930)
@@ -63,7 +63,7 @@
 }
 void ILEDSmartxxRGB::OnStartup()
 {
-  if (CSysInfo::SmartXXModCHIP().Equals("SmartXX V3") || CSysInfo::SmartXXModCHIP().Equals("SmartXX OPX"))
+  if (g_sysinfo.SmartXXModCHIP().Equals("SmartXX V3") || g_sysinfo.SmartXXModCHIP().Equals("SmartXX OPX"))
   {
 	  SetThreadPriority(GetCurrentThread(),THREAD_PRIORITY_LOWEST);
 	  CLog::Log(LOGDEBUG,"Starting SmartXX RGB LED thread");
@@ -273,7 +273,7 @@
 
 bool ILEDSmartxxRGB::Start()
 {
-  if (CSysInfo::SmartXXModCHIP().Equals("SmartXX V3") || CSysInfo::SmartXXModCHIP().Equals("SmartXX OPX"))
+  if (g_sysinfo.SmartXXModCHIP().Equals("SmartXX V3") || g_sysinfo.SmartXXModCHIP().Equals("SmartXX OPX"))
   {
     Create();
     return true;

Modified: trunk/XBMC/xbmc/utils/SystemInfo.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/SystemInfo.cpp	2007-02-26 09:17:36 UTC (rev 7929)
+++ trunk/XBMC/xbmc/utils/SystemInfo.cpp	2007-02-26 09:20:48 UTC (rev 7930)
@@ -20,7 +20,7 @@
  */
 #include "../stdafx.h"
 #include "SystemInfo.h"
-
+#include <conio.h>
 #include "../xbox/XKUtils.h"
 #include "../xbox/xkhdd.h"
 #include "../xbox/XKflash.h"
@@ -28,19 +28,56 @@
 #include "../settings.h"
 #include "../utils/log.h"
 #include "../xbox/Undocumented.h"
-#include "../xbox/xkeeprom.h"
 #include "../cores/dllloader/dllloader.h"
 
-#include <conio.h>
-
-const char * CSysInfo::cTempBIOSFile = "Q:\\System\\SystemInfo\\BiosBackup.bin";
-const char * CSysInfo::cBIOSmd5IDs   = "Q:\\System\\SystemInfo\\BiosIDs.ini";
-char CSysInfo::MD5_Sign[32 + 1];
 extern "C" XPP_DEVICE_TYPE XDEVICE_TYPE_IR_REMOTE_TABLE;
-#define XDEVICE_TYPE_IR_REMOTE  (&XDEVICE_TYPE_IR_REMOTE_TABLE)
-#define DEBUG_KEYBOARD
-#define DEBUG_MOUSE
 
+CSysInfo g_sysinfo;
+
+CSysInfo::CSysInfo()
+{
+  m_XKEEPROM = new XKEEPROM;
+  m_XKEEPROM->ReadFromXBOX();
+  m_XBOXVersion = m_XKEEPROM->GetXBOXVersion();
+}
+CSysInfo::~CSysInfo()
+{
+   delete m_XKEEPROM;
+}
+struct Bios * CSysInfo::LoadBiosSigns()
+{
+  FILE *infile;
+
+  if ((infile = fopen(XBOX_BIOS_ID_INI_FILE,"r")) == NULL)
+  {
+    CLog::Log(LOGDEBUG, "ERROR LOADING BIOSES.INI!!");
+    return NULL;
+  }
+  else
+  {
+    struct Bios * Listone = (struct Bios *)calloc(1000, sizeof(struct Bios));
+    int cntBioses=0;
+    char buffer[255];
+    char stringone[255];
+    do
+    {
+      fgets(stringone,255,infile);
+      if  (stringone[0] != '#')
+      {
+        if (strstr(stringone,"=")!= NULL)
+        {
+          strcpy(Listone[cntBioses].Name,ReturnBiosName(buffer, stringone));
+          strcpy(Listone[cntBioses].Signature,ReturnBiosSign(buffer, stringone));
+          cntBioses++;
+        }
+      }
+    } while( !feof( infile ) && cntBioses < 999 );
+    fclose(infile);
+    strcpy(Listone[cntBioses++].Name,"\0");
+    strcpy(Listone[cntBioses++].Signature,"\0");
+    return Listone;
+  }
+}
 char* CSysInfo::MD5Buffer(char *buffer, long PosizioneInizio,int KBytes)
 {
   MD5_CTX mdContext;
@@ -54,261 +91,186 @@
   return MD5_Sign;
 }
 
-CStdString CSysInfo::MD5BufferNew(char *buffer,long PosizioneInizio,int KBytes)
+char* CSysInfo::ReturnBiosName(char *buffer, char *str)
 {
-  CStdString strReturn;
-  MD5_CTX mdContext;
-  unsigned char md5sum[16];
-  char md5sumstring[33] = "";
-  MD5Init (&mdContext);
-  MD5Update(&mdContext, (unsigned char *)(buffer + PosizioneInizio), KBytes * 1024);
-  MD5Final (md5sum, &mdContext);
-  XKGeneral::BytesToHexStr(md5sum, 16, md5sumstring);
-  strReturn.Format("%s", md5sumstring);
-  return strReturn;
-}
-CStdString CSysInfo::GetAVPackInfo()
-{  //AV-Pack Detection PICReg(0x04)
-  int cAVPack;
-  HalReadSMBusValue(0x20,XKUtils::PIC16L_CMD_AV_PACK,0,(LPBYTE)&cAVPack);
+  int cnt1,cnt2,i;
+  cnt1=cnt2=0;
 
-     if (cAVPack == XKUtils::AV_PACK_SCART)   return "SCART";
-  else if (cAVPack == XKUtils::AV_PACK_HDTV)    return "HDTV";
-  else if (cAVPack == XKUtils::AV_PACK_VGA)   return "VGA";
-  else if (cAVPack == XKUtils::AV_PACK_RFU)   return "RFU";
-  else if (cAVPack == XKUtils::AV_PACK_SVideo)  return "S-Video";
-  else if (cAVPack == XKUtils::AV_PACK_Undefined) return "Undefined";
-  else if (cAVPack == XKUtils::AV_PACK_Standard)  return "Standard RGB";
-  else if (cAVPack == XKUtils::AV_PACK_Missing) return "Missing or Unknown";
-  else return "Unknown";
+  for (i=0;i<255;i++) buffer[i]='\0';
+  if ( (strstr(str,"(1MB)")==0) || (strstr(str,"(512)")==0) || (strstr(str,"(256)")==0) )
+    cnt2=5;
+
+  while (str[cnt2] != '=')
+  {
+    buffer[cnt1]=str[cnt2];
+    cnt1++;
+    cnt2++;
+  }
+  buffer[cnt1++]='\0';
+  return buffer;
 }
-CStdString CSysInfo::GetVideoEncoder()
+char* CSysInfo::ReturnBiosSign(char *buffer, char *str)
 {
-  int iTemp;
-  if (HalReadSMBusValue(XKUtils::SMBDEV_VIDEO_ENCODER_CONNEXANT,XKUtils::VIDEO_ENCODER_CMD_DETECT,0,(LPBYTE)&iTemp)==0)
-  { CLog::Log(LOGDEBUG, "Video Encoder: CONNEXANT");  return "CONNEXANT"; }
-  if (HalReadSMBusValue(XKUtils::SMBDEV_VIDEO_ENCODER_FOCUS,XKUtils::VIDEO_ENCODER_CMD_DETECT,0,(LPBYTE)&iTemp)==0)
-  { CLog::Log(LOGDEBUG, "Video Encoder: FOCUS");    return "FOCUS";   }
-  if (HalReadSMBusValue(XKUtils::SMBDEV_VIDEO_ENCODER_XCALIBUR,XKUtils::VIDEO_ENCODER_CMD_DETECT,0,(LPBYTE)&iTemp)==0)
-  { CLog::Log(LOGDEBUG, "Video Encoder: XCALIBUR");   return "XCALIBUR";  }
-  else {  CLog::Log(LOGDEBUG, "Video Encoder: UNKNOWN");  return "UNKNOWN"; }
+  int cnt1,cnt2,i;
+  cnt1=cnt2=0;
+  for (i=0;i<255;i++) buffer[i]='\0';
+  while (str[cnt2] != '=') cnt2++;
+  cnt2++;
+  while (str[cnt2] != NULL)
+  {
+    if ( str[cnt2] != ' ' )
+    {
+      buffer[cnt1]=toupper(str[cnt2]);
+      cnt1++;
+      cnt2++;
+    }
+    else cnt2++;
+  }
+  buffer[cnt1++]='\0';
+  return buffer;
 }
+char* CSysInfo::CheckMD5 (struct Bios *Listone, char *Sign)
+{
+  int cntBioses;
+  cntBioses=0;
+  do
+  {
+    if  (strstr(Listone[cntBioses].Signature, Sign) != NULL)
+    { return (Listone[cntBioses].Name);   }
+    cntBioses++;
+  }
+  while( strcmp(Listone[cntBioses].Name,"\0") != 0);
+  return ("Unknown");
+}
 
-CStdString CSysInfo::GetModCHIPDetected()
+void CSysInfo::WriteTXTInfoFile(LPCSTR strFilename)
 {
-  CXBoxFlash *mbFlash=new CXBoxFlash(); //Max description Leng= 40
+  BOOL retVal = FALSE;
+  DWORD dwBytesWrote = 0;
+  CHAR tmpData[SYSINFO_TMP_SIZE];
+  CStdString tmpstring;
+  LPSTR tmpFileStr = new CHAR[2048];
+  ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
+  ZeroMemory(tmpFileStr, 2048);
+
+  HANDLE hf = CreateFile(strFilename, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+  if (hf !=  INVALID_HANDLE_VALUE)
   {
-    // Unknown or TSOP
-    mbFlash->AddFCI(0x09,0x00,"Unknown/Onboard TSOP (protected)",0x00000);
+    //Write File Header..
+    strcat(tmpFileStr, "*******  XBOXMEDIACENTER [XBMC] INFORMATION FILE  *******\r\n");
+    if (m_XBOXVersion== m_XKEEPROM->V1_0)
+      strcat(tmpFileStr, "\r\nXBOX Version = \t\tV1.0");
+    else if (m_XBOXVersion == m_XKEEPROM->V1_1)
+      strcat(tmpFileStr, "\r\nXBOX Version = \t\tV1.1");
+    else if (m_XBOXVersion == m_XKEEPROM->V1_6)
+      strcat(tmpFileStr,  "\r\nXBOX Version = \t\tV1.6");
+    //Get Kernel Version
+    ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
+    sprintf(tmpData, "\r\nKernel Version: \t%d.%d.%d.%d", XboxKrnlVersion->VersionMajor,XboxKrnlVersion->VersionMinor,XboxKrnlVersion->Build,XboxKrnlVersion->Qfe);
+    strcat(tmpFileStr, tmpData);
 
-    // Known XBOX ModCHIP IDs&Names
-    mbFlash->AddFCI(0x01,0xAD,"XECUTER 3",0x100000); // if Write Protection is ON!: this chip can not detected! X3 Bug or Feature! it will return Unknown/Onboard TSOP (protected)!
-    mbFlash->AddFCI(0x01,0xD5,"XECUTER 2",0x100000);
-    mbFlash->AddFCI(0x01,0xC4,"XENIUM",0x100000);
-    mbFlash->AddFCI(0x01,0xC4,"XENIUM",0x000000);
-    mbFlash->AddFCI(0x04,0xBA,"ALX2+ R3 FLASH",0x40000);
-    // XBOX Possible Flash CHIPs
-    mbFlash->AddFCI(0x01,0xb0,"AMD Am29F002BT/NBT",0x40000);
-    mbFlash->AddFCI(0x01,0x34,"AMD Am29F002BB/NBB",0x40000);
-    mbFlash->AddFCI(0x01,0x51,"AMD Am29F200BT",0x40000);
-    mbFlash->AddFCI(0x01,0x57,"AMD Am29F200BB",0x40000);
-    mbFlash->AddFCI(0x01,0x40,"AMD Am29LV002BT",0x40000);
-    mbFlash->AddFCI(0x01,0xc2,"AMD Am29LV002BB",0x40000);
-    mbFlash->AddFCI(0x01,0x3b,"AMD Am29LV200BT",0x40000);
-    mbFlash->AddFCI(0x01,0xbf,"AMD Am29LV200BB",0x40000);
-    mbFlash->AddFCI(0x01,0x0c,"AMD Am29DL400BT",0x80000);
-    mbFlash->AddFCI(0x01,0x0f,"AMD Am29DL400BB",0x80000);
-    mbFlash->AddFCI(0x01,0x77,"AMD Am29F004BT",0x80000);
-    mbFlash->AddFCI(0x01,0x7b,"AMD Am29F004BB",0x80000);
-    mbFlash->AddFCI(0x01,0xa4,"AMD Am29F040B",0x80000);
-    mbFlash->AddFCI(0x01,0x23,"AMD Am29F400BT",0x80000);
-    mbFlash->AddFCI(0x01,0xab,"AMD Am29F400BB",0x80000);
-    mbFlash->AddFCI(0x01,0xb5,"AMD Am29LV004BT",0x80000);
-    mbFlash->AddFCI(0x01,0xb6,"AMD Am29LV004BB",0x80000);
-    mbFlash->AddFCI(0x01,0x4f,"AMD Am29LV040B",0x80000);
-    mbFlash->AddFCI(0x01,0xb9,"AMD Am29LV400BT",0x80000);
-    mbFlash->AddFCI(0x01,0xba,"AMD Am29LV400BB",0x80000);
-    mbFlash->AddFCI(0x01,0x4a,"AMD Am29DL800BT",0x100000);
-    mbFlash->AddFCI(0x01,0xcb,"AMD Am29DL800BB",0x100000);
-    mbFlash->AddFCI(0x01,0xd5,"AMD Am29F080B",0x100000);
-    mbFlash->AddFCI(0x01,0xd6,"AMD Am29F800BT",0x100000);
-    mbFlash->AddFCI(0x01,0x58,"AMD Am29F800BB",0x100000);
-    mbFlash->AddFCI(0x01,0x3e,"AMD Am29LV008BT",0x100000);
-    mbFlash->AddFCI(0x01,0x37,"AMD Am29LV008BB",0x100000);
-    mbFlash->AddFCI(0x01,0x38,"AMD Am29LV080B",0x100000);
-    mbFlash->AddFCI(0x01,0xda,"AMD Am29LV800BT/DT",0x100000);
-    mbFlash->AddFCI(0x01,0x5b,"AMD Am29LV800BB/DB",0x100000);
+    //Get Memory Status
+    strcat(tmpFileStr, "\r\nXBOX RAM = \t\t");
+    ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
+    MEMORYSTATUS stat;
+    GlobalMemoryStatus( &stat );
+    ltoa(stat.dwTotalPhys/1024/1024, tmpData, 10);
+    strcat(tmpFileStr, tmpData);
+    strcat(tmpFileStr, " MBytes");
 
-    mbFlash->AddFCI(0x37,0x8c,"AMIC A29002T/290021T",0x40000);
-    mbFlash->AddFCI(0x37,0x0d,"AMIC A29002U/290021U",0x40000);
-    mbFlash->AddFCI(0x37,0x86,"AMIC A29040A",0x80000);
-    mbFlash->AddFCI(0x37,0xb0,"AMIC A29400T/294001T",0x80000);
-    mbFlash->AddFCI(0x37,0x31,"AMIC A29400U/294001U",0x80000);
-    mbFlash->AddFCI(0x37,0x34,"AMIC A29L004T/A29L400T",0x80000);
-    mbFlash->AddFCI(0x37,0xb5,"AMIC A29L004U/A29L400U",0x80000);
-    mbFlash->AddFCI(0x37,0x92,"AMIC A29L040",0x80000);
-    mbFlash->AddFCI(0x37,0x0e,"AMIC A29800T",0x100000);
-    mbFlash->AddFCI(0x37,0x8f,"AMIC A29800U",0x100000);
-    mbFlash->AddFCI(0x37,0x1a,"AMIC A29L008T/A29L800T",0x100000);
-    mbFlash->AddFCI(0x37,0x9b,"AMIC A29L008U/A29L800U",0x100000);
+    //Write Serial Number..
+    strcat(tmpFileStr, "\r\n\r\nXBOX Serial Number = \t");
+    CHAR serial[SERIALNUMBER_SIZE + 1] = "";
+    m_XKEEPROM->GetSerialNumberString(serial);
+    strcat(tmpFileStr, serial);
 
-    mbFlash->AddFCI(0x04,0xb0,"Fujitsu MBM29F002TC",0x40000);
-    mbFlash->AddFCI(0x04,0x34,"Fujitsu MBM29F002BC",0x40000);
-    mbFlash->AddFCI(0x04,0x51,"Fujitsu MBM29F200TC",0x40000);
-    mbFlash->AddFCI(0x04,0x57,"Fujitsu MBM29F200BC",0x40000);
-    mbFlash->AddFCI(0x04,0x40,"Fujitsu MBM29LV002TC",0x40000);
-    mbFlash->AddFCI(0x04,0xc2,"Fujitsu MBM29LV002BC",0x40000);
-    mbFlash->AddFCI(0x04,0x3b,"Fujitsu MBM29LV200TC",0x40000);
-    mbFlash->AddFCI(0x04,0xbf,"Fujitsu MBM29LV200BC",0x40000);
-    mbFlash->AddFCI(0x04,0x0c,"Fujitsu MBM29DL400TC",0x80000);
-    mbFlash->AddFCI(0x04,0x0f,"Fujitsu MBM29DL400BC",0x80000);
-    mbFlash->AddFCI(0x04,0x77,"Fujitsu MBM29F004TC",0x80000);
-    mbFlash->AddFCI(0x04,0x7b,"Fujitsu MBM29F004BC",0x80000);
-    mbFlash->AddFCI(0x04,0xa4,"Fujitsu MBM29F040C",0x80000);
-    mbFlash->AddFCI(0x04,0x23,"Fujitsu MBM29F400TC",0x80000);
-    mbFlash->AddFCI(0x04,0xab,"Fujitsu MBM29F400BC",0x80000);
-    mbFlash->AddFCI(0x04,0xb5,"Fujitsu MBM29LV004TC",0x80000);
-    mbFlash->AddFCI(0x04,0xb6,"Fujitsu MBM29LV004BC",0x80000);
-    mbFlash->AddFCI(0x04,0xb9,"Fujitsu MBM29LV400TC",0x80000);
-    mbFlash->AddFCI(0x04,0xba,"Fujitsu MBM29LV400BC",0x80000);
-    mbFlash->AddFCI(0x04,0x4a,"Fujitsu MBM29DL800TA",0x100000);
-    mbFlash->AddFCI(0x04,0xcb,"Fujitsu MBM29DL800BA",0x100000);
-    mbFlash->AddFCI(0x04,0xd5,"Fujitsu MBM29F080A",0x100000);
-    mbFlash->AddFCI(0x04,0xd6,"Fujitsu MBM29F800TA",0x100000);
-    mbFlash->AddFCI(0x04,0x58,"Fujitsu MBM29F800BA",0x100000);
-    mbFlash->AddFCI(0x04,0x3e,"Fujitsu MBM29LV008TA",0x100000);
-    mbFlash->AddFCI(0x04,0x37,"Fujitsu MBM29LV008BA",0x100000);
-    mbFlash->AddFCI(0x04,0x38,"Fujitsu MBM29LV080A",0x100000);
-    mbFlash->AddFCI(0x04,0xda,"Fujitsu MBM29LV800TA/TE",0x100000);
-    mbFlash->AddFCI(0x04,0x5b,"Fujitsu MBM29LV800BA/BE",0x100000);
+    //Write MAC Address..
+    strcat(tmpFileStr, "\r\nXBOX MAC Address = \t");
+    m_XKEEPROM->GetMACAddressString((LPSTR)&tmpstring, ':');
+    strcat(tmpFileStr, tmpstring.c_str());
 
-    mbFlash->AddFCI(0xad,0xb0,"Hynix HY29F002",0x40000);
-    mbFlash->AddFCI(0xad,0xa4,"Hynix HY29F040A",0x80000);
-    mbFlash->AddFCI(0xad,0x23,"Hynix HY29F400T/AT",0x80000);
-    mbFlash->AddFCI(0xad,0xab,"Hynix HY29F400B/AB",0x80000);
-    mbFlash->AddFCI(0xad,0xb9,"Hynix HY29LV400T",0x80000);
-    mbFlash->AddFCI(0xad,0xba,"Hynix HY29LV400B",0x80000);
-    mbFlash->AddFCI(0xad,0xd5,"Hynix HY29F080",0x100000);
-    mbFlash->AddFCI(0xad,0xd6,"Hynix HY29F800T/AT",0x100000);
-    mbFlash->AddFCI(0xad,0x58,"Hynix HY29F800B/AB",0x100000);
-    mbFlash->AddFCI(0xad,0xda,"Hynix HY29LV800T",0x100000);
-    mbFlash->AddFCI(0xad,0x5b,"Hynix HY29LV800B",0x100000);
+    //Write Online Key ..
+    strcat(tmpFileStr, "\r\nXBOX Online Key = \t");
+    char livekey[ONLINEKEY_SIZE * 2 + 1] = "";
+    m_XKEEPROM->GetOnlineKeyString(livekey);
+    strcat(tmpFileStr, livekey);
 
-    mbFlash->AddFCI(0xc2,0xb0,"Macronix MX29F002T/NT",0x40000);
-    mbFlash->AddFCI(0xc2,0x34,"Macronix MX29F002B/NB",0x40000);
-    mbFlash->AddFCI(0xc2,0x36,"Macronix MX29F022T/NT",0x40000);
-    mbFlash->AddFCI(0xc2,0x37,"Macronix MX29F022B/NB",0x40000);
-    mbFlash->AddFCI(0xc2,0x51,"Macronix MX29F200T",0x40000);
-    mbFlash->AddFCI(0xc2,0x57,"Macronix MX29F200B",0x40000);
-    mbFlash->AddFCI(0xc2,0x45,"Macronix MX29F004T",0x80000);
-    mbFlash->AddFCI(0xc2,0x46,"Macronix MX29F004B",0x80000);
-    mbFlash->AddFCI(0xc2,0xa4,"Macronix MX29F040",0x80000);
-    mbFlash->AddFCI(0xc2,0x23,"Macronix MX29F400T",0x80000);
-    mbFlash->AddFCI(0xc2,0xab,"Macronix MX29F400B",0x80000);
-    mbFlash->AddFCI(0xc2,0xb5,"Macronix MX29LV004T",0x80000);
-    mbFlash->AddFCI(0xc2,0xb6,"Macronix MX29LV004B",0x80000);
-    mbFlash->AddFCI(0xc2,0x4f,"Macronix MX29LV040",0x80000);
-    mbFlash->AddFCI(0xc2,0xb9,"Macronix MX29LV400T",0x80000);
-    mbFlash->AddFCI(0xc2,0xba,"Macronix MX29LV400B",0x80000);
-    mbFlash->AddFCI(0xc2,0xd5,"Macronix MX29F080",0x100000);
-    mbFlash->AddFCI(0xc2,0xd6,"Macronix MX29F800T",0x100000);
-    mbFlash->AddFCI(0xc2,0x58,"Macronix MX29F800B",0x100000);
-    mbFlash->AddFCI(0xc2,0x3e,"Macronix MX29LV008T",0x100000);
-    mbFlash->AddFCI(0xc2,0x37,"Macronix MX29LV008B",0x100000);
-    mbFlash->AddFCI(0xc2,0x38,"Macronix MX29LV081",0x100000);
-    mbFlash->AddFCI(0xc2,0xda,"Macronix MX29LV800T",0x100000);
-    mbFlash->AddFCI(0xc2,0x5b,"Macronix MX29LV800B",0x100000);
+    //Write VideoMode ..
+    strcat(tmpFileStr, "\r\nXBOX Video Mode = \t");
+    VIDEO_STANDARD vdo = m_XKEEPROM->GetVideoStandardVal();
+    if (vdo == XKEEPROM::VIDEO_STANDARD::PAL_I)
+      strcat(tmpFileStr, "PAL");
+    else
+      strcat(tmpFileStr, "NTSC");
 
-    mbFlash->AddFCI(0xb0,0xc9,"Sharp LHF00L02/L06/L07",0x100000);
-    mbFlash->AddFCI(0xb0,0xcf,"Sharp LHF00L03/L04/L05",0x100000);
-    mbFlash->AddFCI(0x89,0xa2,"Sharp LH28F008SA series",0x100000);
-    mbFlash->AddFCI(0x89,0xa6,"Sharp LH28F008SC series",0x100000);
-    mbFlash->AddFCI(0xb0,0xec,"Sharp LH28F008BJxx-PT series",0x100000);
-    mbFlash->AddFCI(0xb0,0xed,"Sharp LH28F008BJxx-PB series",0x100000);
-    mbFlash->AddFCI(0xb0,0x4b,"Sharp LH28F800BVxx-BTL series",0x100000);
-    mbFlash->AddFCI(0xb0,0x4c,"Sharp LH28F800BVxx-TV series",0x100000);
-    mbFlash->AddFCI(0xb0,0x4d,"Sharp LH28F800BVxx-BV series",0x100000);
+    //Write XBE Region..
+    strcat(tmpFileStr, "\r\nXBOX XBE Region = \t");
+    ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
+    m_XKEEPROM->GetXBERegionString(tmpData);
+    strcat(tmpFileStr, tmpData);
 
-    mbFlash->AddFCI(0xbf,0x10,"SST 29EE020",0x40000);
-    mbFlash->AddFCI(0xbf,0x12,"SST 29LE020/29VE020",0x40000);
-    mbFlash->AddFCI(0xbf,0xd6,"SST 39LF020/39VF020",0x40000);
-    mbFlash->AddFCI(0xbf,0xb6,"SST 39SF020A",0x40000);
-    mbFlash->AddFCI(0xbf,0x57,"SST 49LF002A",0x40000);
-    mbFlash->AddFCI(0xbf,0x57,"SST 49LF002A",0x100000);
-    mbFlash->AddFCI(0xbf,0x52,"SST 49LF020A",0x40000);
-    mbFlash->AddFCI(0xbf,0x1b,"SST 49LF003A",0x60000);
-    mbFlash->AddFCI(0xbf,0x1c,"SST 49LF030A",0x60000);
-    mbFlash->AddFCI(0xbf,0x61,"SST 49LF020",0x40000);
-    mbFlash->AddFCI(0xbf,0x13,"SST 29SF040",0x80000);
-    mbFlash->AddFCI(0xbf,0x14,"SST 29VF040",0x80000);
-    mbFlash->AddFCI(0xbf,0xd7,"SST 39LF040/39VF040",0x80000);
-    mbFlash->AddFCI(0xbf,0xb7,"SST 39SF040",0x80000);
-    mbFlash->AddFCI(0xbf,0x60,"SST 49LF004A/B",0x80000);
-    mbFlash->AddFCI(0xbf,0x51,"SST 49LF040",0x80000);
-    mbFlash->AddFCI(0xbf,0xd8,"SST 39LF080/39VF080/39VF088",0x100000);
-    mbFlash->AddFCI(0xbf,0x5a,"SST 49LF008A",0x100000);
-    mbFlash->AddFCI(0xbf,0x5b,"SST 49LF080A",0x100000);
-    mbFlash->AddFCI(0x20,0xb0,"ST M29F002T/NT/BT/BNT",0x40000);
-    mbFlash->AddFCI(0x20,0x34,"ST M29F002B/BB",0x40000);
-    mbFlash->AddFCI(0x20,0xd3,"ST M29F200BT",0x40000);
-    mbFlash->AddFCI(0x20,0xd4,"ST M29F200BB",0x40000);
-    mbFlash->AddFCI(0x20,0xe2,"ST M29F040 series",0x80000);
-    mbFlash->AddFCI(0x20,0xd5,"ST M29F400T/BT",0x80000);
-    mbFlash->AddFCI(0x20,0xd6,"ST M29F400B/BB",0x80000);
-    mbFlash->AddFCI(0x20,0xf1,"ST M29F080 series",0x100000);
-    mbFlash->AddFCI(0x20,0xec,"ST M29F800DT",0x100000);
-    mbFlash->AddFCI(0x20,0x58,"ST M29F800DB",0x100000);
-    mbFlash->AddFCI(0xda,0x45,"Winbond W29C020",0x40000);
-    mbFlash->AddFCI(0x09,0x00,"Winbond W49F020T",0x40000);
-    mbFlash->AddFCI(0xda,0xb5,"Winbond W39L020",0x40000);
-    mbFlash->AddFCI(0xda,0x0b,"Winbond W49F002U",0x40000);
-    mbFlash->AddFCI(0xda,0x8c,"Winbond W49F020",0x40000);
-    mbFlash->AddFCI(0xda,0xb0,"Winbond W49V002A",0x40000);
-    mbFlash->AddFCI(0xda,0x46,"Winbond W29C040",0x40000);
-    mbFlash->AddFCI(0xda,0xb6,"Winbond W39L040",0x80000);
-    mbFlash->AddFCI(0xda,0x3d,"Winbond W39V040A",0x80000);
-  }
-  CStdString strTemp = "", strTemp1 = "", strTemp2 = "";
-  if (mbFlash->CheckID()!=0 || mbFlash->CheckID2()!=0)
-  {
-    CLog::Log(LOGDEBUG, "- Detected TSOP/ModChip: %s",mbFlash->CheckID()->text);
-    CLog::Log(LOGDEBUG, "- Detected TSOP/ModChip: %s",mbFlash->CheckID2()->text);
-    strTemp1 = mbFlash->CheckID()->text;
-    strTemp2 = mbFlash->CheckID2()->text;
-  }
-  else {  CLog::Log(LOGDEBUG, "- Detected TSOP/MOdCHIP: Unknown");  strTemp2 = "Unknown"; }
+    //Write HDDKey..
+    strcat(tmpFileStr, "\r\nXBOX HDD Key = \t\t");
+    ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
+    m_XKEEPROM->GetHDDKeyString(tmpData);
+    strcat(tmpFileStr, tmpData);
 
-  if (strTemp1 != strTemp2)
-  {
-    CLog::Log(LOGDEBUG, "- Detected TSOP/MOdCHIP: Detection does not match! (%s != %s)",strTemp1.c_str(),strTemp2.c_str());
-    CLog::Log(LOGDEBUG, "- Detected TSOP/ModChip: Using -> %s",strTemp1.c_str());
-    strTemp.Format("%s",strTemp1.c_str());
-  }
-  else strTemp = strTemp2;
+    //Write Confounder..
+    strcat(tmpFileStr, "\r\nXBOX Confounder = \t");
+    ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
+    m_XKEEPROM->GetConfounderString(tmpData);
+    strcat(tmpFileStr, tmpData);
 
-  delete mbFlash;
+    //GET HDD Info...
+    //Query ATA IDENTIFY
+    XKHDD::ATA_COMMAND_OBJ cmdObj;
+    ZeroMemory(&cmdObj, sizeof(XKHDD::ATA_COMMAND_OBJ));
+    cmdObj.IPReg.bCommandReg = IDE_ATA_IDENTIFY;
+    cmdObj.IPReg.bDriveHeadReg = IDE_DEVICE_MASTER;
+    XKHDD::SendATACommand(IDE_PRIMARY_PORT, &cmdObj, IDE_COMMAND_READ);
 
-  return strTemp;
-}
+    //Write HDD Model
+    strcat(tmpFileStr, "\r\n\r\nXBOX HDD Model = \t");
+    ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
+    XKHDD::GetIDEModel(cmdObj.DATA_BUFFER, (LPSTR)tmpData);
+    strcat(tmpFileStr, tmpData);
 
-CStdString CSysInfo::SmartXXModCHIP()
-{
-  // SmartXX ModChip Detection
-  unsigned char uSmartXX_ID = ((_inp(0xf701)) & 0xf);
+    //Write HDD Serial..
+    strcat(tmpFileStr, "\r\nXBOX HDD Serial = \t");
+    ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
+    XKHDD::GetIDESerial(cmdObj.DATA_BUFFER, (LPSTR)tmpData);
+    strcat(tmpFileStr, tmpData);
 
-  if ( uSmartXX_ID == 1 )      // SmartXX V1+V2
-    return "SmartXX V1/V2";
-  else if ( uSmartXX_ID == 2 ) // SmartXX V1+V2
-    return "SmartXX V1/V2";
-  else if ( uSmartXX_ID == 5 ) // SmartXX OPX
-    return "SmartXX OPX";
-  else if ( uSmartXX_ID == 8 ) // SmartXX V3
-    return "SmartXX V3";
-  else 
-    return "None";
+    //Write HDD Password..
+    ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
+    strcat(tmpFileStr, "\r\n\r\nXBOX HDD Password = \t");
+
+    ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
+    BYTE HDDpwd[20];
+    ZeroMemory(HDDpwd, 20);
+    XKHDD::GenerateHDDPwd((UCHAR *)XboxHDKey, cmdObj.DATA_BUFFER, (UCHAR*)&HDDpwd);
+    XKGeneral::BytesToHexStr(HDDpwd, 20, tmpData);
+    strcat(tmpFileStr, tmpData);
+
+    //Query ATAPI IDENTIFY
+    ZeroMemory(&cmdObj, sizeof(XKHDD::ATA_COMMAND_OBJ));
+    cmdObj.IPReg.bCommandReg = IDE_ATAPI_IDENTIFY;
+    cmdObj.IPReg.bDriveHeadReg = IDE_DEVICE_SLAVE;
+    XKHDD::SendATACommand(IDE_PRIMARY_PORT, &cmdObj, IDE_COMMAND_READ);
+
+    //Write DVD Model
+    strcat(tmpFileStr, "\r\n\r\nXBOX DVD Model = \t");
+    ZeroMemory(tmpData, SYSINFO_TMP_SIZE);
+    XKHDD::GetIDEModel(cmdObj.DATA_BUFFER, (LPSTR)tmpData);
+    strcat(tmpFileStr, tmpData);
+    strupr(tmpFileStr);
+
+    WriteFile(hf, tmpFileStr, (DWORD)strlen(tmpFileStr), &dwBytesWrote, NULL);
+  }
+  delete[] tmpFileStr;
+  CloseHandle(hf);
 }
-
-bool CSysInfo::BackupBios()
+bool CSysInfo::CreateBiosBackup()
 {
   FILE *fp;
   DWORD addr        = FLASH_BASE_ADDRESS;
@@ -318,7 +280,7 @@
 
   flash_copy = (char *) malloc(0x100000);
 
-  if((fp = fopen(cTempBIOSFile, "wb")) != NULL)
+  if((fp = fopen(XBOX_BIOS_BACKUP_FILE, "wb")) != NULL)
   {
     for(int loop=0;loop<0x100000;loop++)
     {
@@ -496,40 +458,7 @@
   else  { strXboxVer.Format("UNKNOWN: Please report this --> %s",Ver); return true;
   }
 }
-struct Bios * CSysInfo::LoadBiosSigns()
-{
-  FILE *infile;
 
-  if ((infile = fopen(cBIOSmd5IDs,"r")) == NULL)
-  {
-    CLog::Log(LOGDEBUG, "ERROR LOADING BIOSES.INI!!");
-    return NULL;
-  }
-  else
-  {
-    struct Bios * Listone = (struct Bios *)calloc(1000, sizeof(struct Bios));
-    int cntBioses=0;
-    char buffer[255];
-    char stringone[255];
-    do
-    {
-      fgets(stringone,255,infile);
-      if  (stringone[0] != '#')
-      {
-        if (strstr(stringone,"=")!= NULL)
-        {
-          strcpy(Listone[cntBioses].Name,ReturnBiosName(buffer, stringone));
-          strcpy(Listone[cntBioses].Signature,ReturnBiosSign(buffer, stringone));
-          cntBioses++;
-        }
-      }
-    } while( !feof( infile ) && cntBioses < 999 );
-    fclose(infile);
-    strcpy(Listone[cntBioses++].Name,"\0");
-    strcpy(Listone[cntBioses++].Signature,"\0");
-    return Listone;
-  }
-}
 bool CSysInfo::GetDVDInfo(CStdString& strDVDModel, CStdString& strDVDFirmware)
 {
   XKHDD::ATA_COMMAND_OBJ hddcommand;
@@ -628,6 +557,48 @@
   }
   else return false;
 }
+bool CSysInfo::SystemUpTime(int iInputMinutes, int &iMinutes, int &iHours, int &iDays)
+{
+  iMinutes=0;iHours=0;iDays=0;
+  iMinutes = iInputMinutes;
+  if (iMinutes >= 60) // Hour's
+  {
+    iHours = iMinutes / 60;
+    iMinutes = iMinutes - (iHours *60);
+  }
+  if (iHours >= 24) // Days
+  {
+    iDays = iHours / 24;
+    iHours = iHours - (iDays * 24);
+  }
+  return true;
+}
+
+bool CSysInfo::CreateEEPROMBackup()
+{
+  m_XKEEPROM->WriteToBINFile(XBOX_EEPROM_BIN_BACKUP_FILE);
+  m_XKEEPROM->WriteToCFGFile(XBOX_EEPROM_CFG_BACKUP_FILE);
+  return true;
+}
+bool CSysInfo::GetRefurbInfo(CStdString& rfi_FirstBootTime, CStdString& rfi_PowerCycleCount)
+{
+  XBOX_REFURB_INFO xri;
+  SYSTEMTIME sys_time;
+  if (ExReadWriteRefurbInfo(&xri, sizeof(XBOX_REFURB_INFO), FALSE) < 0)
+    return false;
+
+  FileTimeToSystemTime((FILETIME*)&xri.FirstBootTime, &sys_time);
+  rfi_FirstBootTime.Format("%s %d-%d-%d %d:%02d", g_localizeStrings.Get(13173), 
+    sys_time.wMonth, 
+    sys_time.wDay, 
+    sys_time.wYear,
+    sys_time.wHour,
+    sys_time.wMinute);
+
+  rfi_PowerCycleCount.Format("%s %d", g_localizeStrings.Get(13174), xri.PowerCycleCount);
+  return true;
+}
+
 double CSysInfo::GetCPUFrequency()
 {
   unsigned __int64 Fwin;
@@ -672,75 +643,273 @@
   x+=a;
   return x;
 }
-
-char* CSysInfo::ReturnBiosName(char *buffer, char *str)
+CStdString CSysInfo::MD5BufferNew(char *buffer,long PosizioneInizio,int KBytes)
 {
-  int cnt1,cnt2,i;
-  cnt1=cnt2=0;
+  CStdString strReturn;
+  MD5_CTX mdContext;
+  unsigned char md5sum[16];
+  char md5sumstring[33] = "";
+  MD5Init (&mdContext);
+  MD5Update(&mdContext, (unsigned char *)(buffer + PosizioneInizio), KBytes * 1024);
+  MD5Final (md5sum, &mdContext);
+  XKGeneral::BytesToHexStr(md5sum, 16, md5sumstring);
+  strReturn.Format("%s", md5sumstring);
+  return strReturn;
+}
+CStdString CSysInfo::GetAVPackInfo()
+{  //AV-Pack Detection PICReg(0x04)
+  int cAVPack;
+  HalReadSMBusValue(0x20,XKUtils::PIC16L_CMD_AV_PACK,0,(LPBYTE)&cAVPack);
 
-  for (i=0;i<255;i++) buffer[i]='\0';
-  if ( (strstr(str,"(1MB)")==0) || (strstr(str,"(512)")==0) || (strstr(str,"(256)")==0) )
-    cnt2=5;
-
-  while (str[cnt2] != '=')
-  {
-    buffer[cnt1]=str[cnt2];
-    cnt1++;
-    cnt2++;
-  }
-  buffer[cnt1++]='\0';
-  return buffer;
+     if (cAVPack == XKUtils::AV_PACK_SCART) return g_localizeStrings.Get(13292)+" "+"SCART";
+  else if (cAVPack == XKUtils::AV_PACK_HDTV) return g_localizeStrings.Get(13292)+" "+"HDTV";
+  else if (cAVPack == XKUtils::AV_PACK_VGA) return g_localizeStrings.Get(13292)+" "+"VGA";
+  else if (cAVPack == XKUtils::AV_PACK_RFU) return g_localizeStrings.Get(13292)+" "+"RFU";
+  else if (cAVPack == XKUtils::AV_PACK_SVideo) return g_localizeStrings.Get(13292)+" "+"S-Video";
+  else if (cAVPack == XKUtils::AV_PACK_Undefined) return g_localizeStrings.Get(13292)+" "+"Undefined";
+  else if (cAVPack == XKUtils::AV_PACK_Standard) return g_localizeStrings.Get(13292)+" "+"Standard RGB";
+  else if (cAVPack == XKUtils::AV_PACK_Missing) return g_localizeStrings.Get(13292)+" "+"Missing or Unknown";
+  else return g_localizeStrings.Get(13292)+" "+"Unknown";
 }
-char* CSysInfo::ReturnBiosSign(char *buffer, char *str)
+CStdString CSysInfo::GetVideoEncoder()
 {
-  int cnt1,cnt2,i;
-  cnt1=cnt2=0;
-  for (i=0;i<255;i++) buffer[i]='\0';
-  while (str[cnt2] != '=') cnt2++;
-  cnt2++;
-  while (str[cnt2] != NULL)
-  {
-    if ( str[cnt2] != ' ' )
-    {
-      buffer[cnt1]=toupper(str[cnt2]);
-      cnt1++;
-      cnt2++;
-    }
-    else cnt2++;
+  int iTemp;
+  if (HalReadSMBusValue(XKUtils::SMBDEV_VIDEO_ENCODER_CONNEXANT,XKUtils::VIDEO_ENCODER_CMD_DETECT,0,(LPBYTE)&iTemp)==0)
+  { 
+    CLog::Log(LOGDEBUG, "Video Encoder: CONNEXANT");  
+    return g_localizeStrings.Get(13286)+" "+"CONNEXANT"; 
   }
-  buffer[cnt1++]='\0';
-  return buffer;
+  if (HalReadSMBusValue(XKUtils::SMBDEV_VIDEO_ENCODER_FOCUS,XKUtils::VIDEO_ENCODER_CMD_DETECT,0,(LPBYTE)&iTemp)==0)
+  { 
+    CLog::Log(LOGDEBUG, "Video Encoder: FOCUS");
+    return g_localizeStrings.Get(13286)+" "+"FOCUS";   
+  }
+  if (HalReadSMBusValue(XKUtils::SMBDEV_VIDEO_ENCODER_XCALIBUR,XKUtils::VIDEO_ENCODER_CMD_DETECT,0,(LPBYTE)&iTemp)==0)
+  { 
+    CLog::Log(LOGDEBUG, "Video Encoder: XCALIBUR");   
+    return g_localizeStrings.Get(13286)+" "+ "XCALIBUR";
+  }
+  else 
+  {  
+    CLog::Log(LOGDEBUG, "Video Encoder: UNKNOWN");  
+    return g_localizeStrings.Get(13286)+" "+"UNKNOWN"; 
+  }
 }
-char* CSysInfo::CheckMD5 (struct Bios *Listone, char *Sign)
+
+CStdString CSysInfo::GetModCHIPDetected()
 {
-  int cntBioses;
-  cntBioses=0;
-  do
+  CXBoxFlash *mbFlash=new CXBoxFlash(); //Max description Leng= 40
   {
-    if  (strstr(Listone[cntBioses].Signature, Sign) != NULL)
-    { return (Listone[cntBioses].Name);   }
-    cntBioses++;
+    // Unknown or TSOP
+    mbFlash->AddFCI(0x09,0x00,"Unknown/Onboard TSOP (protected)",0x00000);
+
+    // Known XBOX ModCHIP IDs&Names
+    mbFlash->AddFCI(0x01,0xAD,"XECUTER 3",0x100000); // if Write Protection is ON!: this chip can not detected! X3 Bug or Feature! it will return Unknown/Onboard TSOP (protected)!
+    mbFlash->AddFCI(0x01,0xD5,"XECUTER 2",0x100000);
+    mbFlash->AddFCI(0x01,0xC4,"XENIUM",0x100000);
+    mbFlash->AddFCI(0x01,0xC4,"XENIUM",0x000000);
+    mbFlash->AddFCI(0x04,0xBA,"ALX2+ R3 FLASH",0x40000);
+    // XBOX Possible Flash CHIPs
+    mbFlash->AddFCI(0x01,0xb0,"AMD Am29F002BT/NBT",0x40000);
+    mbFlash->AddFCI(0x01,0x34,"AMD Am29F002BB/NBB",0x40000);
+    mbFlash->AddFCI(0x01,0x51,"AMD Am29F200BT",0x40000);
+    mbFlash->AddFCI(0x01,0x57,"AMD Am29F200BB",0x40000);
+    mbFlash->AddFCI(0x01,0x40,"AMD Am29LV002BT",0x40000);
+    mbFlash->AddFCI(0x01,0xc2,"AMD Am29LV002BB",0x40000);
+    mbFlash->AddFCI(0x01,0x3b,"AMD Am29LV200BT",0x40000);
+    mbFlash->AddFCI(0x01,0xbf,"AMD Am29LV200BB",0x40000);
+    mbFlash->AddFCI(0x01,0x0c,"AMD Am29DL400BT",0x80000);
+    mbFlash->AddFCI(0x01,0x0f,"AMD Am29DL400BB",0x80000);
+    mbFlash->AddFCI(0x01,0x77,"AMD Am29F004BT",0x80000);
+    mbFlash->AddFCI(0x01,0x7b,"AMD Am29F004BB",0x80000);
+    mbFlash->AddFCI(0x01,0xa4,"AMD Am29F040B",0x80000);
+    mbFlash->AddFCI(0x01,0x23,"AMD Am29F400BT",0x80000);
+    mbFlash->AddFCI(0x01,0xab,"AMD Am29F400BB",0x80000);
+    mbFlash->AddFCI(0x01,0xb5,"AMD Am29LV004BT",0x80000);
+    mbFlash->AddFCI(0x01,0xb6,"AMD Am29LV004BB",0x80000);
+    mbFlash->AddFCI(0x01,0x4f,"AMD Am29LV040B",0x80000);
+    mbFlash->AddFCI(0x01,0xb9,"AMD Am29LV400BT",0x80000);
+    mbFlash->AddFCI(0x01,0xba,"AMD Am29LV400BB",0x80000);
+    mbFlash->AddFCI(0x01,0x4a,"AMD Am29DL800BT",0x100000);
+    mbFlash->AddFCI(0x01,0xcb,"AMD Am29DL800BB",0x100000);
+    mbFlash->AddFCI(0x01,0xd5,"AMD Am29F080B",0x100000);
+    mbFlash->AddFCI(0x01,0xd6,"AMD Am29F800BT",0x100000);
+    mbFlash->AddFCI(0x01,0x58,"AMD Am29F800BB",0x100000);
+    mbFlash->AddFCI(0x01,0x3e,"AMD Am29LV008BT",0x100000);
+    mbFlash->AddFCI(0x01,0x37,"AMD Am29LV008BB",0x100000);
+    mbFlash->AddFCI(0x01,0x38,"AMD Am29LV080B",0x100000);
+    mbFlash->AddFCI(0x01,0xda,"AMD Am29LV800BT/DT",0x100000);
+    mbFlash->AddFCI(0x01,0x5b,"AMD Am29LV800BB/DB",0x100000);
+
+    mbFlash->AddFCI(0x37,0x8c,"AMIC A29002T/290021T",0x40000);
+    mbFlash->AddFCI(0x37,0x0d,"AMIC A29002U/290021U",0x40000);
+    mbFlash->AddFCI(0x37,0x86,"AMIC A29040A",0x80000);
+    mbFlash->AddFCI(0x37,0xb0,"AMIC A29400T/294001T",0x80000);
+    mbFlash->AddFCI(0x37,0x31,"AMIC A29400U/294001U",0x80000);
+    mbFlash->AddFCI(0x37,0x34,"AMIC A29L004T/A29L400T",0x80000);
+    mbFlash->AddFCI(0x37,0xb5,"AMIC A29L004U/A29L400U",0x80000);
+    mbFlash->AddFCI(0x37,0x92,"AMIC A29L040",0x80000);
+    mbFlash->AddFCI(0x37,0x0e,"AMIC A29800T",0x100000);
+    mbFlash->AddFCI(0x37,0x8f,"AMIC A29800U",0x100000);
+    mbFlash->AddFCI(0x37,0x1a,"AMIC A29L008T/A29L800T",0x100000);
+    mbFlash->AddFCI(0x37,0x9b,"AMIC A29L008U/A29L800U",0x100000);
+
+    mbFlash->AddFCI(0x04,0xb0,"Fujitsu MBM29F002TC",0x40000);
+    mbFlash->AddFCI(0x04,0x34,"Fujitsu MBM29F002BC",0x40000);
+    mbFlash->AddFCI(0x04,0x51,"Fujitsu MBM29F200TC",0x40000);
+    mbFlash->AddFCI(0x04,0x57,"Fujitsu MBM29F200BC",0x40000);
+    mbFlash->AddFCI(0x04,0x40,"Fujitsu MBM29LV002TC",0x40000);
+    mbFlash->AddFCI(0x04,0xc2,"Fujitsu MBM29LV002BC",0x40000);
+    mbFlash->AddFCI(0x04,0x3b,"Fujitsu MBM29LV200TC",0x40000);
+    mbFlash->AddFCI(0x04,0xbf,"Fujitsu MBM29LV200BC",0x40000);
+    mbFlash->AddFCI(0x04,0x0c,"Fujitsu MBM29DL400TC",0x80000);
+    mbFlash->AddFCI(0x04,0x0f,"Fujitsu MBM29DL400BC",0x80000);
+    mbFlash->AddFCI(0x04,0x77,"Fujitsu MBM29F004TC",0x80000);
+    mbFlash->AddFCI(0x04,0x7b,"Fujitsu MBM29F004BC",0x80000);
+    mbFlash->AddFCI(0x04,0xa4,"Fujitsu MBM29F040C",0x80000);
+    mbFlash->AddFCI(0x04,0x23,"Fujitsu MBM29F400TC",0x80000);
+    mbFlash->AddFCI(0x04,0xab,"Fujitsu MBM29F400BC",0x80000);
+    mbFlash->AddFCI(0x04,0xb5,"Fujitsu MBM29LV004TC",0x80000);
+    mbFlash->AddFCI(0x04,0xb6,"Fujitsu MBM29LV004BC",0x80000);
+    mbFlash->AddFCI(0x04,0xb9,"Fujitsu MBM29LV400TC",0x80000);
+    mbFlash->AddFCI(0x04,0xba,"Fujitsu MBM29LV400BC",0x80000);
+    mbFlash->AddFCI(0x04,0x4a,"Fujitsu MBM29DL800TA",0x100000);
+    mbFlash->AddFCI(0x04,0xcb,"Fujitsu MBM29DL800BA",0x100000);
+    mbFlash->AddFCI(0x04,0xd5,"Fujitsu MBM29F080A",0x100000);
+    mbFlash->AddFCI(0x04,0xd6,"Fujitsu MBM29F800TA",0x100000);
+    mbFlash->AddFCI(0x04,0x58,"Fujitsu MBM29F800BA",0x100000);
+    mbFlash->AddFCI(0x04,0x3e,"Fujitsu MBM29LV008TA",0x100000);
+    mbFlash->AddFCI(0x04,0x37,"Fujitsu MBM29LV008BA",0x100000);
+    mbFlash->AddFCI(0x04,0x38,"Fujitsu MBM29LV080A",0x100000);
+    mbFlash->AddFCI(0x04,0xda,"Fujitsu MBM29LV800TA/TE",0x100000);
+    mbFlash->AddFCI(0x04,0x5b,"Fujitsu MBM29LV800BA/BE",0x100000);
+
+    mbFlash->AddFCI(0xad,0xb0,"Hynix HY29F002",0x40000);
+    mbFlash->AddFCI(0xad,0xa4,"Hynix HY29F040A",0x80000);
+    mbFlash->AddFCI(0xad,0x23,"Hynix HY29F400T/AT",0x80000);
+    mbFlash->AddFCI(0xad,0xab,"Hynix HY29F400B/AB",0x80000);
+    mbFlash->AddFCI(0xad,0xb9,"Hynix HY29LV400T",0x80000);
+    mbFlash->AddFCI(0xad,0xba,"Hynix HY29LV400B",0x80000);
+    mbFlash->AddFCI(0xad,0xd5,"Hynix HY29F080",0x100000);
+    mbFlash->AddFCI(0xad,0xd6,"Hynix HY29F800T/AT",0x100000);
+    mbFlash->AddFCI(0xad,0x58,"Hynix HY29F800B/AB",0x100000);
+    mbFlash->AddFCI(0xad,0xda,"Hynix HY29LV800T",0x100000);
+    mbFlash->AddFCI(0xad,0x5b,"Hynix HY29LV800B",0x100000);
+
+    mbFlash->AddFCI(0xc2,0xb0,"Macronix MX29F002T/NT",0x40000);
+    mbFlash->AddFCI(0xc2,0x34,"Macronix MX29F002B/NB",0x40000);
+    mbFlash->AddFCI(0xc2,0x36,"Macronix MX29F022T/NT",0x40000);
+    mbFlash->AddFCI(0xc2,0x37,"Macronix MX29F022B/NB",0x40000);
+    mbFlash->AddFCI(0xc2,0x51,"Macronix MX29F200T",0x40000);
+    mbFlash->AddFCI(0xc2,0x57,"Macronix MX29F200B",0x40000);
+    mbFlash->AddFCI(0xc2,0x45,"Macronix MX29F004T",0x80000);
+    mbFlash->AddFCI(0xc2,0x46,"Macronix MX29F004B",0x80000);
+    mbFlash->AddFCI(0xc2,0xa4,"Macronix MX29F040",0x80000);
+    mbFlash->AddFCI(0xc2,0x23,"Macronix MX29F400T",0x80000);
+    mbFlash->AddFCI(0xc2,0xab,"Macronix MX29F400B",0x80000);
+    mbFlash->AddFCI(0xc2,0xb5,"Macronix MX29LV004T",0x80000);
+    mbFlash->AddFCI(0xc2,0xb6,"Macronix MX29LV004B",0x80000);
+    mbFlash->AddFCI(0xc2,0x4f,"Macronix MX29LV040",0x80000);
+    mbFlash->AddFCI(0xc2,0xb9,"Macronix MX29LV400T",0x80000);
+    mbFlash->AddFCI(0xc2,0xba,"Macronix MX29LV400B",0x80000);
+    mbFlash->AddFCI(0xc2,0xd5,"Macronix MX29F080",0x100000);
+    mbFlash->AddFCI(0xc2,0xd6,"Macronix MX29F800T",0x100000);
+    mbFlash->AddFCI(0xc2,0x58,"Macronix MX29F800B",0x100000);
+    mbFlash->AddFCI(0xc2,0x3e,"Macronix MX29LV008T",0x100000);
+    mbFlash->AddFCI(0xc2,0x37,"Macronix MX29LV008B",0x100000);
+    mbFlash->AddFCI(0xc2,0x38,"Macronix MX29LV081",0x100000);
+    mbFlash->AddFCI(0xc2,0xda,"Macronix MX29LV800T",0x100000);
+    mbFlash->AddFCI(0xc2,0x5b,"Macronix MX29LV800B",0x100000);
+
+    mbFlash->AddFCI(0xb0,0xc9,"Sharp LHF00L02/L06/L07",0x100000);
+    mbFlash->AddFCI(0xb0,0xcf,"Sharp LHF00L03/L04/L05",0x100000);
+    mbFlash->AddFCI(0x89,0xa2,"Sharp LH28F008SA series",0x100000);
+    mbFlash->AddFCI(0x89,0xa6,"Sharp LH28F008SC series",0x100000);
+    mbFlash->AddFCI(0xb0,0xec,"Sharp LH28F008BJxx-PT series",0x100000);
+    mbFlash->AddFCI(0xb0,0xed,"Sharp LH28F008BJxx-PB series",0x100000);
+    mbFlash->AddFCI(0xb0,0x4b,"Sharp LH28F800BVxx-BTL series",0x100000);
+    mbFlash->AddFCI(0xb0,0x4c,"Sharp LH28F800BVxx-TV series",0x100000);
+    mbFlash->AddFCI(0xb0,0x4d,"Sharp LH28F800BVxx-BV series",0x100000);
+
+    mbFlash->AddFCI(0xbf,0x10,"SST 29EE020",0x40000);
+    mbFlash->AddFCI(0xbf,0x12,"SST 29LE020/29VE020",0x40000);
+    mbFlash->AddFCI(0xbf,0xd6,"SST 39LF020/39VF020",0x40000);
+    mbFlash->AddFCI(0xbf,0xb6,"SST 39SF020A",0x40000);
+    mbFlash->AddFCI(0xbf,0x57,"SST 49LF002A",0x40000);
+    mbFlash->AddFCI(0xbf,0x57,"SST 49LF002A",0x100000);
+    mbFlash->AddFCI(0xbf,0x52,"SST 49LF020A",0x40000);
+    mbFlash->AddFCI(0xbf,0x1b,"SST 49LF003A",0x60000);
+    mbFlash->AddFCI(0xbf,0x1c,"SST 49LF030A",0x60000);
+    mbFlash->AddFCI(0xbf,0x61,"SST 49LF020",0x40000);
+    mbFlash->AddFCI(0xbf,0x13,"SST 29SF040",0x80000);
+    mbFlash->AddFCI(0xbf,0x14,"SST 29VF040",0x80000);
+    mbFlash->AddFCI(0xbf,0xd7,"SST 39LF040/39VF040",0x80000);
+    mbFlash->AddFCI(0xbf,0xb7,"SST 39SF040",0x80000);
+    mbFlash->AddFCI(0xbf,0x60,"SST 49LF004A/B",0x80000);
+    mbFlash->AddFCI(0xbf,0x51,"SST 49LF040",0x80000);
+    mbFlash->AddFCI(0xbf,0xd8,"SST 39LF080/39VF080/39VF088",0x100000);
+    mbFlash->AddFCI(0xbf,0x5a,"SST 49LF008A",0x100000);
+    mbFlash->AddFCI(0xbf,0x5b,"SST 49LF080A",0x100000);
+    mbFlash->AddFCI(0x20,0xb0,"ST M29F002T/NT/BT/BNT",0x40000);
+    mbFlash->AddFCI(0x20,0x34,"ST M29F002B/BB",0x40000);
+    mbFlash->AddFCI(0x20,0xd3,"ST M29F200BT",0x40000);
+    mbFlash->AddFCI(0x20,0xd4,"ST M29F200BB",0x40000);
+    mbFlash->AddFCI(0x20,0xe2,"ST M29F040 series",0x80000);
+    mbFlash->AddFCI(0x20,0xd5,"ST M29F400T/BT",0x80000);
+    mbFlash->AddFCI(0x20,0xd6,"ST M29F400B/BB",0x80000);
+    mbFlash->AddFCI(0x20,0xf1,"ST M29F080 series",0x100000);
+    mbFlash->AddFCI(0x20,0xec,"ST M29F800DT",0x100000);
+    mbFlash->AddFCI(0x20,0x58,"ST M29F800DB",0x100000);
+    mbFlash->AddFCI(0xda,0x45,"Winbond W29C020",0x40000);
+    mbFlash->AddFCI(0x09,0x00,"Winbond W49F020T",0x40000);
+    mbFlash->AddFCI(0xda,0xb5,"Winbond W39L020",0x40000);
+    mbFlash->AddFCI(0xda,0x0b,"Winbond W49F002U",0x40000);
+    mbFlash->AddFCI(0xda,0x8c,"Winbond W49F020",0x40000);
+    mbFlash->AddFCI(0xda,0xb0,"Winbond W49V002A",0x40000);
+    mbFlash->AddFCI(0xda,0x46,"Winbond W29C040",0x40000);
+    mbFlash->AddFCI(0xda,0xb6,"Winbond W39L040",0x80000);
+    mbFlash->AddFCI(0xda,0x3d,"Winbond W39V040A",0x80000);
   }
-  while( strcmp(Listone[cntBioses].Name,"\0") != 0);
-  return ("Unknown");
-}
-bool CSysInfo::SystemUpTime(int iInputMinutes, int &iMinutes, int &iHours, int &iDays)
-{
-  iMinutes=0;iHours=0;iDays=0;
-  iMinutes = iInputMinutes;
-  if (iMinutes >= 60) // Hour's
+  CStdString strTemp = "", strTemp1 = "", strTemp2 = "";
+  if (mbFlash->CheckID()!=0 || mbFlash->CheckID2()!=0)
   {
-    iHours = iMinutes / 60;
-    iMinutes = iMinutes - (iHours *60);
+    CLog::Log(LOGDEBUG, "- Detected TSOP/ModChip: %s",mbFlash->CheckID()->text);
+    CLog::Log(LOGDEBUG, "- Detected TSOP/ModChip: %s",mbFlash->CheckID2()->text);
+    strTemp1 = mbFlash->CheckID()->text;
+    strTemp2 = mbFlash->CheckID2()->text;
   }
-  if (iHours >= 24) // Days
+  else {  CLog::Log(LOGDEBUG, "- Detected TSOP/MOdCHIP: Unknown");  strTemp2 = "Unknown"; }
+
+  if (strTemp1 != strTemp2)
   {
-    iDays = iHours / 24;
-    iHours = iHours - (iDays * 24);
+    CLog::Log(LOGDEBUG, "- Detected TSOP/MOdCHIP: Detection does not match! (%s != %s)",strTemp1.c_str(),strTemp2.c_str());
+    CLog::Log(LOGDEBUG, "- Detected TSOP/ModChip: Using -> %s",strTemp1.c_str());
+    strTemp.Format("%s",strTemp1.c_str());
   }
-  return true;
+  else strTemp = strTemp2;
+
+  delete mbFlash;
+
+  return strTemp;
 }
 
+CStdString CSysInfo::SmartXXModCHIP()
+{
+  // SmartXX ModChip Detection
+  unsigned char uSmartXX_ID = ((_inp(0xf701)) & 0xf);
+
+  if ( uSmartXX_ID == 1 )      // SmartXX V1+V2
+    return "SmartXX V1/V2";
+  else if ( uSmartXX_ID == 2 ) // SmartXX V1+V2
+    return "SmartXX V1/V2";
+  else if ( uSmartXX_ID == 5 ) // SmartXX OPX
+    return "SmartXX OPX";
+  else if ( uSmartXX_ID == 8 ) // SmartXX V3
+    return "SmartXX V3";
+  else 
+    return "None";
+}
+
 CStdString CSysInfo::GetMPlayerVersion()
 {
   CStdString strVersion="";
@@ -1036,3 +1205,133 @@
   
   return strReturn;
 }
+
+
+CStdString CSysInfo::GetMACAddress()
+{
+  char macaddress[20] = "";
+
+  m_XKEEPROM->GetMACAddressString((LPSTR)&macaddress, ':');
+
+  CStdString