XBMC Media Center

Revision: 7232
          http://svn.sourceforge.net/xbmc/?rev=7232&view=rev
Author:   jmarshallnz
Date:     2006-11-26 02:28:40 -0800 (Sun, 26 Nov 2006)

Log Message:
-----------
fixed: Weird labels showing on All Albums, Artists items.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2006-11-26 08:19:55 UTC (rev 7231)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2006-11-26 10:28:40 UTC (rev 7232)
@@ -1939,6 +1939,17 @@
   return label;
 }
 
+// This is required as in order for the "* All Albums" etc. items to sort
+// correctly, they must have fake artist/album etc. information generated.
+// This looks nasty if we attempt to render it to the GUI, thus this (further)
+// workaround
+const CStdString &CorrectAllItemsSortHack(const CStdString &item)
+{
+  if (item.size() == 1 && item[0] == 0x01 || item[1] == 0xff)
+    return StringUtils::EmptyString;
+  return item;
+}
+
 CStdString CGUIInfoManager::GetItemLabel(const CFileItem *item, int info)
 {
   if (!item) return "";
@@ -1949,7 +1960,7 @@
   case LISTITEM_LABEL2:
     return item->GetLabel2();
   case LISTITEM_TITLE:
-    return item->m_musicInfoTag.GetTitle();
+    return CorrectAllItemsSortHack(item->m_musicInfoTag.GetTitle());
   case LISTITEM_TRACKNUMBER:
     {
       CStdString track;
@@ -1958,13 +1969,13 @@
     }
   case LISTITEM_ARTIST:
   case LISTITEM_DIRECTOR:// HACK - director info is injected as the artist tag
-    return item->m_musicInfoTag.GetArtist();
+    return CorrectAllItemsSortHack(item->m_musicInfoTag.GetArtist());
   case LISTITEM_ALBUM:
-    return item->m_musicInfoTag.GetAlbum();
+    return CorrectAllItemsSortHack(item->m_musicInfoTag.GetAlbum());
   case LISTITEM_YEAR:
     return item->m_musicInfoTag.GetYear();
   case LISTITEM_GENRE:
-    return item->m_musicInfoTag.GetGenre();
+    return CorrectAllItemsSortHack(item->m_musicInfoTag.GetGenre());
   case LISTITEM_FILENAME:
     return CUtil::GetFileName(item->m_strPath);
   case LISTITEM_DATE:


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

Revision: 7248
          http://svn.sourceforge.net/xbmc/?rev=7248&view=rev
Author:   jmarshallnz
Date:     2006-11-26 13:19:21 -0800 (Sun, 26 Nov 2006)

Log Message:
-----------
fixed: SVN didn't compile due to last commits.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2006-11-26 16:16:53 UTC (rev 7247)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2006-11-26 21:19:21 UTC (rev 7248)
@@ -1261,13 +1261,13 @@
     break;
   case MUSICPLAYER_PLAYLISTLEN:
     {
-      if (g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_MUSIC || g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_MUSIC_TEMP)
+      if (g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_MUSIC)
         return GetPlaylistLabel(PLAYLIST_LENGTH);
   	}
 	  break;
   case MUSICPLAYER_PLAYLISTPOS:
     {
-      if (g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_MUSIC || g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_MUSIC_TEMP)
+      if (g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_MUSIC)
         return GetPlaylistLabel(PLAYLIST_POSITION);
   	}
   	break;
@@ -1384,13 +1384,13 @@
     break;
   case VIDEOPLAYER_PLAYLISTLEN:
     {
-      if (g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_VIDEO || g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_VIDEO_TEMP)
+      if (g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_VIDEO)
         return GetPlaylistLabel(PLAYLIST_LENGTH);
   	}
 	  break;
   case VIDEOPLAYER_PLAYLISTPOS:
     {
-      if (g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_VIDEO || g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_VIDEO_TEMP)
+      if (g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_VIDEO)
         return GetPlaylistLabel(PLAYLIST_POSITION);
   	}
   	break;


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

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

Log Message:
-----------
fixed: hasdrivef and hasdriveg vis conditions

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2006-11-29 00:41:52 UTC (rev 7273)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2006-11-29 00:58:15 UTC (rev 7274)
@@ -183,8 +183,8 @@
     else if (strTest.Equals("system.ismaster")) ret = SYSTEM_ISMASTER;
     else if (strTest.Equals("system.internetstate")) ret = SYSTEM_INTERNET_STATE;
     else if (strTest.Equals("system.loggedon")) ret = SYSTEM_LOGGEDON;
-    else if (strTest.Equals("system.hasdrive(f)")) ret = SYSTEM_HAS_DRIVE_F;
-    else if (strTest.Equals("system.hasdrive(g)")) ret = SYSTEM_HAS_DRIVE_G;
+    else if (strTest.Equals("system.hasdrivef")) ret = SYSTEM_HAS_DRIVE_F;
+    else if (strTest.Equals("system.hasdriveg")) ret = SYSTEM_HAS_DRIVE_G;
     else if (strTest.Left(16).Equals("system.idletime("))
     {
       int time = atoi((strTest.Mid(16, strTest.GetLength() - 17).c_str()));
@@ -796,9 +796,21 @@
       bReturn = false;
   }
   else if (condition == SYSTEM_HAS_DRIVE_F)
-    bReturn = g_advancedSettings.m_useFDrive;
+  {
+    if (g_advancedSettings.m_useFDrive)
+      return true;
+
+    CIoSupport helper;
+    bReturn = helper.IsDrivePresent("F:");
+  }
   else if (condition == SYSTEM_HAS_DRIVE_G)
-    bReturn = g_advancedSettings.m_useGDrive;
+  {
+    if (g_advancedSettings.m_useGDrive)
+      return true;
+
+    CIoSupport helper;   
+    bReturn = helper.IsDrivePresent("G:");
+  }
   else if (condition == SYSTEM_DVDREADY)
 	  bReturn = CDetectDVDMedia::DriveReady() != DRIVE_NOT_READY;
   else if (condition == SYSTEM_TRAYOPEN)


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

Revision: 7275
          http://svn.sourceforge.net/xbmc/?rev=7275&view=rev
Author:   spiff_
Date:     2006-11-28 17:11:24 -0800 (Tue, 28 Nov 2006)

Log Message:
-----------
fixed: hasdrivef and hasdriveg, second attempt

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2006-11-29 00:58:15 UTC (rev 7274)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2006-11-29 01:11:24 UTC (rev 7275)
@@ -796,21 +796,9 @@
       bReturn = false;
   }
   else if (condition == SYSTEM_HAS_DRIVE_F)
-  {
-    if (g_advancedSettings.m_useFDrive)
-      return true;
-
-    CIoSupport helper;
-    bReturn = helper.IsDrivePresent("F:");
-  }
+    return g_advancedSettings.m_useFDrive;
   else if (condition == SYSTEM_HAS_DRIVE_G)
-  {
-    if (g_advancedSettings.m_useGDrive)
-      return true;
-
-    CIoSupport helper;   
-    bReturn = helper.IsDrivePresent("G:");
-  }
+    return g_advancedSettings.m_useGDrive;
   else if (condition == SYSTEM_DVDREADY)
 	  bReturn = CDetectDVDMedia::DriveReady() != DRIVE_NOT_READY;
   else if (condition == SYSTEM_TRAYOPEN)


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

Revision: 7624
          http://svn.sourceforge.net/xbmc/?rev=7624&view=rev
Author:   jmarshallnz
Date:     2007-01-14 16:37:58 -0800 (Sun, 14 Jan 2007)

Log Message:
-----------
fixed: !System.HasDriveF and !System.HasDriveG ignored the !

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-01-14 23:42:37 UTC (rev 7623)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-01-15 00:37:58 UTC (rev 7624)
@@ -797,9 +797,9 @@
       bReturn = false;
   }
   else if (condition == SYSTEM_HAS_DRIVE_F)
-    return g_advancedSettings.m_useFDrive;
+    bReturn = g_advancedSettings.m_useFDrive;
   else if (condition == SYSTEM_HAS_DRIVE_G)
-    return g_advancedSettings.m_useGDrive;
+    bReturn = g_advancedSettings.m_useGDrive;
   else if (condition == SYSTEM_DVDREADY)
 	  bReturn = CDetectDVDMedia::DriveReady() != DRIVE_NOT_READY;
   else if (condition == SYSTEM_TRAYOPEN)


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

Revision: 7845
          http://svn.sourceforge.net/xbmc/?rev=7845&view=rev
Author:   jmarshallnz
Date:     2007-02-16 18:58:37 -0800 (Fri, 16 Feb 2007)

Log Message:
-----------
fixed: videoplayer.duration didn't work.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-02-16 15:07:55 UTC (rev 7844)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-02-17 02:58:37 UTC (rev 7845)
@@ -1392,7 +1392,9 @@
   switch (item)
   {
   case VIDEOPLAYER_DURATION:
-      return m_currentMovieDuration;
+    if (m_currentMovieDuration.IsEmpty())
+      return GetVideoLabel(PLAYER_DURATION);
+    return m_currentMovieDuration;
   case VIDEOPLAYER_TITLE:
     return m_currentMovie.m_strTitle;
     break;


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

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

Log Message:
-----------
fixed: container.folderpath showed user credentials.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-02-18 14:05:14 UTC (rev 7857)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-02-18 14:14:43 UTC (rev 7858)
@@ -553,7 +553,10 @@
     {
       CGUIWindow *window = m_gWindowManager.GetWindow(m_gWindowManager.GetActiveWindow());
       if (window && window->IsMediaWindow())
-        strLabel = ((CGUIMediaWindow*)window)->CurrentDirectory().m_strPath;
+      {
+        CURL url(((CGUIMediaWindow*)window)->CurrentDirectory().m_strPath);
+        url.GetURLWithoutUserDetails(strLabel);
+      }
       break;
     }
   case SYSTEM_BUILD_VERSION:


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

Revision: 8005
          http://svn.sourceforge.net/xbmc/?rev=8005&view=rev
Author:   GeminiServer
Date:     2007-03-03 12:40:51 -0800 (Sat, 03 Mar 2007)

Log Message:
-----------
fixed: conditional return of InternetState wasn't updated

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-03-03 16:03:09 UTC (rev 8004)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-03-03 20:40:51 UTC (rev 8005)
@@ -995,7 +995,10 @@
   else if (condition == WEATHER_IS_FETCHED)
     bReturn = g_weatherManager.IsFetched();
   else if (condition == SYSTEM_INTERNET_STATE)
+  {
+    g_sysinfo.GetInfo(condition);
     bReturn = g_sysinfo.m_bInternetState;
+  }
   else if (condition == SKIN_HAS_VIDEO_OVERLAY)
   {
     bReturn = !g_application.IsInScreenSaver() && m_gWindowManager.IsOverlayAllowed() &&


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

Revision: 8184
          http://svn.sourceforge.net/xbmc/?rev=8184&view=rev
Author:   jmarshallnz
Date:     2007-03-14 22:37:42 -0700 (Wed, 14 Mar 2007)

Log Message:
-----------
fixed: Video info wasn't shown in fullscreen mode.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-03-15 04:34:01 UTC (rev 8183)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-03-15 05:37:42 UTC (rev 8184)
@@ -1637,7 +1637,7 @@
 
 CStdString CGUIInfoManager::GetVideoLabel(int item)
 {
-  if (!g_application.IsPlayingVideo() || !m_currentFile.HasVideoInfoTag()) 
+  if (!g_application.IsPlayingVideo()) 
     return "";
   
   switch (item)
@@ -1907,6 +1907,32 @@
   CLog::Log(LOGDEBUG,"CGUIInfoManager::SetCurrentMovie(%s)",item.m_strPath.c_str());
   m_currentFile = item;
   
+  if (!m_currentFile.HasVideoInfoTag())
+  { // attempt to get some information
+    CVideoDatabase dbs;
+    dbs.Open();
+    if (dbs.HasMovieInfo(item.m_strPath))
+    {
+      dbs.GetMovieInfo(item.m_strPath, *m_currentFile.GetVideoInfoTag());
+      CLog::Log(LOGDEBUG,__FUNCTION__", got movie info!");
+      CLog::Log(LOGDEBUG,"  Title = %s", m_currentFile.GetVideoInfoTag()->m_strTitle.c_str());
+    }
+    else if (dbs.HasEpisodeInfo(item.m_strPath))
+    {
+      dbs.GetEpisodeInfo(item.m_strPath, *m_currentFile.GetVideoInfoTag());
+      CLog::Log(LOGDEBUG,__FUNCTION__", got episode info!");
+      CLog::Log(LOGDEBUG,"  Title = %s", m_currentFile.GetVideoInfoTag()->m_strTitle.c_str());
+    }
+    dbs.Close();
+
+    if (m_currentFile.GetVideoInfoTag()->m_strTitle.IsEmpty())
+    { // at least fill in the filename
+      if (!item.GetLabel().IsEmpty())
+        m_currentFile.GetVideoInfoTag()->m_strTitle = item.GetLabel();
+      else
+        m_currentFile.GetVideoInfoTag()->m_strTitle = CUtil::GetTitleFromPath(item.m_strPath);
+    }
+  }
   // Find a thumb for this file.
   item.SetVideoThumb();
 


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

Revision: 8185
          http://svn.sourceforge.net/xbmc/?rev=8185&view=rev
Author:   jmarshallnz
Date:     2007-03-14 23:04:05 -0700 (Wed, 14 Mar 2007)

Log Message:
-----------
fixed: Various ListItem.* labels didn't function correctly.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-03-15 05:37:42 UTC (rev 8184)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-03-15 06:04:05 UTC (rev 8185)
@@ -946,6 +946,11 @@
   case LISTITEM_RATING:
   case LISTITEM_PROGRAM_COUNT:
   case LISTITEM_DURATION:
+  case LISTITEM_PLOT:
+  case LISTITEM_PLOT_OUTLINE:
+  case LISTITEM_EPISODE:
+  case LISTITEM_SEASON:
+  case LISTITEM_TVSHOW:
     {
       CGUIWindow *pWindow = m_gWindowManager.GetWindow(m_gWindowManager.GetActiveWindow());
       if (pWindow && pWindow->IsMediaWindow())


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

Revision: 8218
          http://svn.sourceforge.net/xbmc/?rev=8218&view=rev
Author:   kreet
Date:     2007-03-16 14:21:47 -0700 (Fri, 16 Mar 2007)

Log Message:
-----------
fixed: InfoManager was missing Production Info

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-03-16 21:11:31 UTC (rev 8217)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-03-16 21:21:47 UTC (rev 8218)
@@ -239,6 +239,7 @@
     else if (strTest.Equals("system.avcablepackinfo")) ret = SYSTEM_AV_CABLE_PACK_INFO;
     else if (strTest.Equals("system.screenresolution")) ret = SYSTEM_SCREEN_RESOLUTION;
     else if (strTest.Equals("system.videoencoderinfo")) ret = SYSTEM_VIDEO_ENCODER_INFO;
+	else if (strTest.Equals("system.xboxproduceinfo")) ret = SYSTEM_XBOX_PRODUCE_INFO;
     else if (strTest.Equals("system.xboxserial")) ret = SYSTEM_XBOX_SERIAL;
     else if (strTest.Equals("system.xberegion")) ret = SYSTEM_XBE_REGION;
     else if (strTest.Equals("system.dvdzone")) ret = SYSTEM_DVD_ZONE;


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

Revision: 8342
          http://svn.sourceforge.net/xbmc/?rev=8342&view=rev
Author:   kreet
Date:     2007-03-26 22:02:48 -0700 (Mon, 26 Mar 2007)

Log Message:
-----------
fixed: system.cpuusage did not output anything

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-03-27 00:07:12 UTC (rev 8341)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-03-27 05:02:48 UTC (rev 8342)
@@ -695,6 +695,7 @@
   case LCD_CPU_TEMPERATURE:
   case LCD_GPU_TEMPERATURE:
   case LCD_FAN_SPEED:
+  case SYSTEM_CPU_USAGE:
     return GetSystemHeatInfo(info);
     break;
 
@@ -2131,9 +2132,8 @@
       text.Format("%i%%", m_fanSpeed * 2);
       break;
     case SYSTEM_CPU_USAGE:
-      {
-        text.Format("%s %2.0f%%", g_localizeStrings.Get(13271).c_str(), (1.0f - g_application.m_idleThread.GetRelativeUsage())*100);
-      }
+      text.Format("%s %2.0f%%", g_localizeStrings.Get(13271).c_str(), (1.0f - g_application.m_idleThread.GetRelativeUsage())*100);
+      break;
   }
   return text;
 }


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

Revision: 8346
          http://svn.sourceforge.net/xbmc/?rev=8346&view=rev
Author:   kreet
Date:     2007-03-27 01:40:15 -0700 (Tue, 27 Mar 2007)

Log Message:
-----------
fixed: free space / used space bars did not work.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-03-27 07:35:55 UTC (rev 8345)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-03-27 08:40:15 UTC (rev 8346)
@@ -1099,14 +1099,10 @@
     case BAR_USED_SPACE_E:
     case BAR_USED_SPACE_F:
     case BAR_USED_SPACE_G:
-      {
-       iret = atoi(g_sysinfo.GetHddSpaceInfo(info));
-      }
+      iret = atoi(g_sysinfo.GetHddSpaceInfo(info).c_str());
       break;
     case BAR_CPU_USAGE:
-      {
-       iret = 100 - ((int)(100.0f *g_application.m_idleThread.GetRelativeUsage()));
-      }
+      iret = 100 - ((int)(100.0f *g_application.m_idleThread.GetRelativeUsage()));
       break;
   }
   return iret;
@@ -1120,7 +1116,7 @@
   if (IsCached(condition1, dwContextWindow, result))
     return result;
 
-  if(  condition1 >= COMBINED_VALUES_START && (condition1 - COMBINED_VALUES_START) < (int)(m_CombinedValues.size()) )
+  if(condition1 >= COMBINED_VALUES_START && (condition1 - COMBINED_VALUES_START) < (int)(m_CombinedValues.size()) )
   {
     const CCombinedValue &comb = m_CombinedValues[condition1 - COMBINED_VALUES_START];
     bool result;


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

Revision: 8686
          http://svn.sourceforge.net/xbmc/?rev=8686&view=rev
Author:   jmarshallnz
Date:     2007-04-28 20:37:56 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
fixed: If an item didn't have tag details loaded, ListItem.Rating returned the thumb.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-04-28 22:28:52 UTC (rev 8685)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-04-29 03:37:56 UTC (rev 8686)
@@ -2768,6 +2768,7 @@
       rating.Format("songrating%c.png", item->GetMusicInfoTag()->GetRating());
       return rating;
     }
+    return "";
   }
   return item->GetThumbnailImage();
 }


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

Revision: 9168
          http://svn.sourceforge.net/xbmc/?rev=9168&view=rev
Author:   spiff_
Date:     2007-05-31 15:01:28 -0700 (Thu, 31 May 2007)

Log Message:
-----------
added: videoplayer.content visibility condition (less stupidity this time)

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-05-31 21:52:21 UTC (rev 9167)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-05-31 22:01:28 UTC (rev 9168)
@@ -404,7 +404,7 @@
     else if (strTest.Equals("videoplayer.rating")) ret = VIDEOPLAYER_RATING;
     else if (strTest.Equals("videoplayer.tvshowtitle")) ret = VIDEOPLAYER_TVSHOW;
     else if (strTest.Equals("videoplayer.premiered")) ret = VIDEOPLAYER_PREMIERED;
-    else if (strTest.Left(21).Equals("videoplayer.content")) return AddMultiInfo(GUIInfo(bNegate ? -CONTAINER_CONTENT : CONTAINER_CONTENT, ConditionalStringParameter(strTest.Mid(22,strTest.size()-23)), 0));
+    else if (strTest.Left(19).Equals("videoplayer.content")) return AddMultiInfo(GUIInfo(bNegate ? -VIDEOPLAYER_CONTENT : VIDEOPLAYER_CONTENT, ConditionalStringParameter(strTest.Mid(20,strTest.size()-21)), 0));
   }
   else if (strCategory.Equals("playlist"))
   {


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

Revision: 9524
          http://svn.sourceforge.net/xbmc/?rev=9524&view=rev
Author:   jmarshallnz
Date:     2007-07-09 03:06:59 -0700 (Mon, 09 Jul 2007)

Log Message:
-----------
fixed: container.content() condition.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-07-09 01:51:45 UTC (rev 9523)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-07-09 10:06:59 UTC (rev 9524)
@@ -451,7 +451,7 @@
     else if (info.Equals("onnext")) ret = CONTAINER_ON_NEXT;
     else if (info.Equals("onprevious")) ret = CONTAINER_ON_PREVIOUS;
     else if (info.Left(8).Equals("content("))
-      return AddMultiInfo(GUIInfo(bNegate ? -CONTAINER_CONTENT : CONTAINER_CONTENT, ConditionalStringParameter(info.Mid(8,strTest.size()-9)), 0));
+      return AddMultiInfo(GUIInfo(bNegate ? -CONTAINER_CONTENT : CONTAINER_CONTENT, ConditionalStringParameter(info.Mid(8,info.GetLength()-9)), 0));
     else if (info.Equals("hasthumb")) ret = CONTAINER_HAS_THUMB;
     else if (info.Left(5).Equals("sort("))
     {


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

Revision: 9669
          http://svn.sourceforge.net/xbmc/?rev=9669&view=rev
Author:   jmarshallnz
Date:     2007-07-23 01:30:23 -0700 (Mon, 23 Jul 2007)

Log Message:
-----------
fixed: Skin.String(setting,compare) wasn't working.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-07-23 08:29:38 UTC (rev 9668)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-07-23 08:30:23 UTC (rev 9669)
@@ -489,7 +489,7 @@
       int pos = strTest.Find(",");
       if (pos >= 0)
       {
-        int skinOffset = g_settings.TranslateSkinString(strTest.Mid(12, pos - 13));
+        int skinOffset = g_settings.TranslateSkinString(strTest.Mid(12, pos - 12));
         int compareString = ConditionalStringParameter(strTest.Mid(pos + 1, strTest.GetLength() - (pos + 2)));
         return AddMultiInfo(GUIInfo(bNegate ? -SKIN_STRING : SKIN_STRING, skinOffset, compareString));
       }


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

Revision: 9682
          http://svn.sourceforge.net/xbmc/?rev=9682&view=rev
Author:   jmarshallnz
Date:     2007-07-23 22:02:23 -0700 (Mon, 23 Jul 2007)

Log Message:
-----------
fixed: System.Time(hh) wouldn't obey the regional format differences (24 hour vs 12 hour clocks)

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-07-24 04:28:48 UTC (rev 9681)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-07-24 05:02:23 UTC (rev 9682)
@@ -1788,6 +1788,8 @@
 
 CStdString CGUIInfoManager::LocalizeTime(const CDateTime &time, TIME_FORMAT format) const
 {
+  const CStdString timeFormat = g_langInfo.GetTimeFormat();
+  bool use12hourclock = timeFormat.Find('h') != -1;
   switch (format)
   {
   case TIME_FORMAT_GUESS:
@@ -1798,10 +1800,10 @@
     return time.GetAsLocalizedTime("mm", true);
   case TIME_FORMAT_MM_SS:
     return time.GetAsLocalizedTime("mm:ss", true);
-  case TIME_FORMAT_HH:
-    return time.GetAsLocalizedTime("hh", false);
+  case TIME_FORMAT_HH:  // this forces it to a 12 hour clock
+    return time.GetAsLocalizedTime(use12hourclock ? "h" : "H", false);
   case TIME_FORMAT_HH_MM:
-    return time.GetAsLocalizedTime("hh:mm", false);
+    return time.GetAsLocalizedTime(use12hourclock ? "h:mm" : "H:mm", false);
   case TIME_FORMAT_HH_MM_SS:
     return time.GetAsLocalizedTime("", true);
   }


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

Revision: 9728
          http://xbmc.svn.sourceforge.net/xbmc/?rev=9728&view=rev
Author:   nuka1195
Date:     2007-07-29 15:29:51 -0700 (Sun, 29 Jul 2007)

Log Message:
-----------
changed: added the correct spelling for Network.*Address infolabels (network.macaddress, network.subnetaddress, network.gatewayaddress, network.dns1address, network.dns2address, network.dhcpaddress) The old spelling still works.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-07-29 21:31:24 UTC (rev 9727)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-07-29 22:29:51 UTC (rev 9728)
@@ -349,14 +349,14 @@
   else if (strCategory.Equals("network"))
   {
     if (strTest.Equals("network.ipaddress")) ret = NETWORK_IP_ADDRESS;
-    if (strTest.Equals("network.macadress")) ret = NETWORK_MAC_ADDRESS;
+    if (strTest.Equals("network.macadress") || strTest.Equals("network.macaddress")) ret = NETWORK_MAC_ADDRESS;
     if (strTest.Equals("network.isdhcp")) ret = NETWORK_IS_DHCP;
     if (strTest.Equals("network.linkstate")) ret = NETWORK_LINK_STATE;
-    if (strTest.Equals("network.subetadress")) ret = NETWORK_SUBNET_ADDRESS;
-    if (strTest.Equals("network.gatewayadress")) ret = NETWORK_GATEWAY_ADDRESS;
-    if (strTest.Equals("network.dns1adress")) ret = NETWORK_DNS1_ADDRESS;
-    if (strTest.Equals("network.dns2adress")) ret = NETWORK_DNS2_ADDRESS;
-    if (strTest.Equals("network.dhcpadress")) ret = NETWORK_DHCP_ADDRESS;
+    if (strTest.Equals("network.subetadress") || strTest.Equals("network.subnetaddress")) ret = NETWORK_SUBNET_ADDRESS;
+    if (strTest.Equals("network.gatewayadress") || strTest.Equals("network.gatewayaddress")) ret = NETWORK_GATEWAY_ADDRESS;
+    if (strTest.Equals("network.dns1adress") || strTest.Equals("network.dns1address")) ret = NETWORK_DNS1_ADDRESS;
+    if (strTest.Equals("network.dns2adress") || strTest.Equals("network.dns2address")) ret = NETWORK_DNS2_ADDRESS;
+    if (strTest.Equals("network.dhcpadress") || strTest.Equals("network.dhcpaddress")) ret = NETWORK_DHCP_ADDRESS;
   }
   else if (strCategory.Equals("musicplayer"))
   {


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

Revision: 9730
          http://xbmc.svn.sourceforge.net/xbmc/?rev=9730&view=rev
Author:   nuka1195
Date:     2007-07-29 17:26:53 -0700 (Sun, 29 Jul 2007)

Log Message:
-----------
changed: Wrapped Network.*Adress mis-spelled infolabels with an #ifdef for easy removal in the future.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-07-29 22:51:48 UTC (rev 9729)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-07-30 00:26:53 UTC (rev 9730)
@@ -349,14 +349,23 @@
   else if (strCategory.Equals("network"))
   {
     if (strTest.Equals("network.ipaddress")) ret = NETWORK_IP_ADDRESS;
-    if (strTest.Equals("network.macadress") || strTest.Equals("network.macaddress")) ret = NETWORK_MAC_ADDRESS;
     if (strTest.Equals("network.isdhcp")) ret = NETWORK_IS_DHCP;
     if (strTest.Equals("network.linkstate")) ret = NETWORK_LINK_STATE;
+#ifdef PRE_SKIN_VERSION_2_1_COMPATIBILITY
+    if (strTest.Equals("network.macadress") || strTest.Equals("network.macaddress")) ret = NETWORK_MAC_ADDRESS;
     if (strTest.Equals("network.subetadress") || strTest.Equals("network.subnetaddress")) ret = NETWORK_SUBNET_ADDRESS;
     if (strTest.Equals("network.gatewayadress") || strTest.Equals("network.gatewayaddress")) ret = NETWORK_GATEWAY_ADDRESS;
     if (strTest.Equals("network.dns1adress") || strTest.Equals("network.dns1address")) ret = NETWORK_DNS1_ADDRESS;
     if (strTest.Equals("network.dns2adress") || strTest.Equals("network.dns2address")) ret = NETWORK_DNS2_ADDRESS;
     if (strTest.Equals("network.dhcpadress") || strTest.Equals("network.dhcpaddress")) ret = NETWORK_DHCP_ADDRESS;
+#else
+    if (strTest.Equals("network.macaddress")) ret = NETWORK_MAC_ADDRESS;
+    if (strTest.Equals("network.subnetaddress")) ret = NETWORK_SUBNET_ADDRESS;
+    if (strTest.Equals("network.gatewayaddress")) ret = NETWORK_GATEWAY_ADDRESS;
+    if (strTest.Equals("network.dns1address")) ret = NETWORK_DNS1_ADDRESS;
+    if (strTest.Equals("network.dns2address")) ret = NETWORK_DNS2_ADDRESS;
+    if (strTest.Equals("network.dhcpaddress")) ret = NETWORK_DHCP_ADDRESS;
+#endif
   }
   else if (strCategory.Equals("musicplayer"))
   {


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

Revision: 9831
          http://xbmc.svn.sourceforge.net/xbmc/?rev=9831&view=rev
Author:   jmarshallnz
Date:     2007-08-05 02:27:59 -0700 (Sun, 05 Aug 2007)

Log Message:
-----------
fixed: Player.TimeRemaining/TimeSpeed was returning Player.Time.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-08-05 09:07:20 UTC (rev 9830)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-08-05 09:27:59 UTC (rev 9831)
@@ -158,8 +158,8 @@
     else if (strTest.Equals("player.showinfo")) ret = PLAYER_SHOWINFO;
     else if (strTest.Left(15).Equals("player.seektime")) return AddMultiInfo(GUIInfo(PLAYER_SEEKTIME, TranslateTimeFormat(strTest.Mid(15))));
     else if (strTest.Left(20).Equals("player.timeremaining")) return AddMultiInfo(GUIInfo(PLAYER_TIME_REMAINING, TranslateTimeFormat(strTest.Mid(20))));
+    else if (strTest.Left(16).Equals("player.timespeed")) return AddMultiInfo(GUIInfo(PLAYER_TIME_SPEED, TranslateTimeFormat(strTest.Mid(16))));
     else if (strTest.Left(11).Equals("player.time")) return AddMultiInfo(GUIInfo(PLAYER_TIME, TranslateTimeFormat(strTest.Mid(11))));
-    else if (strTest.Left(16).Equals("player.timespeed")) return AddMultiInfo(GUIInfo(PLAYER_TIME_SPEED, TranslateTimeFormat(strTest.Mid(16))));
     else if (strTest.Left(15).Equals("player.duration")) return AddMultiInfo(GUIInfo(PLAYER_DURATION, TranslateTimeFormat(strTest.Mid(15))));
     else if (strTest.Left(17).Equals("player.finishtime")) return AddMultiInfo(GUIInfo(PLAYER_FINISH_TIME, TranslateTimeFormat(strTest.Mid(17))));
     else if (strTest.Equals("player.volume")) ret = PLAYER_VOLUME;
@@ -375,9 +375,9 @@
     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.Left(16).Equals("musicplayer.time")) ret = AddMultiInfo(GUIInfo(PLAYER_TIME, TranslateTimeFormat(strTest.Mid(16))));
     else if (strTest.Left(25).Equals("musicplayer.timeremaining")) ret = AddMultiInfo(GUIInfo(PLAYER_TIME_REMAINING, TranslateTimeFormat(strTest.Mid(25))));
     else if (strTest.Left(21).Equals("musicplayer.timespeed")) ret = AddMultiInfo(GUIInfo(PLAYER_TIME_SPEED, TranslateTimeFormat(strTest.Mid(21))));
+    else if (strTest.Left(16).Equals("musicplayer.time")) ret = AddMultiInfo(GUIInfo(PLAYER_TIME, TranslateTimeFormat(strTest.Mid(16))));
     else if (strTest.Left(20).Equals("musicplayer.duration")) ret = AddMultiInfo(GUIInfo(PLAYER_DURATION, TranslateTimeFormat(strTest.Mid(20))));
     else if (strTest.Equals("musicplayer.tracknumber")) ret = MUSICPLAYER_TRACK_NUMBER;
     else if (strTest.Equals("musicplayer.cover")) ret = MUSICPLAYER_COVER;
@@ -399,9 +399,9 @@
     else if (strTest.Equals("videoplayer.originaltitle")) ret = VIDEOPLAYER_ORIGINALTITLE;
     else if (strTest.Equals("videoplayer.director")) ret = VIDEOPLAYER_DIRECTOR;
     else if (strTest.Equals("videoplayer.year")) ret = VIDEOPLAYER_YEAR;
-    else if (strTest.Left(16).Equals("videoplayer.time")) ret = AddMultiInfo(GUIInfo(PLAYER_TIME, TranslateTimeFormat(strTest.Mid(16))));
     else if (strTest.Left(25).Equals("videoplayer.timeremaining")) ret = AddMultiInfo(GUIInfo(PLAYER_TIME_REMAINING, TranslateTimeFormat(strTest.Mid(25))));
     else if (strTest.Left(21).Equals("videoplayer.timespeed")) ret = AddMultiInfo(GUIInfo(PLAYER_TIME_SPEED, TranslateTimeFormat(strTest.Mid(21))));
+    else if (strTest.Left(16).Equals("videoplayer.time")) ret = AddMultiInfo(GUIInfo(PLAYER_TIME, TranslateTimeFormat(strTest.Mid(16))));
     else if (strTest.Left(20).Equals("videoplayer.duration")) ret = AddMultiInfo(GUIInfo(PLAYER_DURATION, TranslateTimeFormat(strTest.Mid(20))));
     else if (strTest.Equals("videoplayer.cover")) ret = VIDEOPLAYER_COVER;
     else if (strTest.Equals("videoplayer.usingoverlays")) ret = VIDEOPLAYER_USING_OVERLAYS;


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

Revision: 9836
          http://xbmc.svn.sourceforge.net/xbmc/?rev=9836&view=rev
Author:   jmarshallnz
Date:     2007-08-05 21:37:31 -0700 (Sun, 05 Aug 2007)

Log Message:
-----------
fixed: container.folderthumb wasn't working.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-08-06 01:38:19 UTC (rev 9835)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-08-06 04:37:31 UTC (rev 9836)
@@ -1782,7 +1782,10 @@
       CFileItem* item;
 
       if (info == CONTAINER_FOLDERTHUMB)
+      {
         item = &const_cast<CFileItemList&>(((CGUIMediaWindow*)window)->CurrentDirectory());
+        info = LISTITEM_THUMB;
+      }
       else
         item = window->GetCurrentListItem();
       if (item)


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

Revision: 9871
          http://xbmc.svn.sourceforge.net/xbmc/?rev=9871&view=rev
Author:   spiff_
Date:     2007-08-09 14:24:03 -0700 (Thu, 09 Aug 2007)

Log Message:
-----------
fixed: hide plot for unwatched items applied to tvshow plots

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-08-09 17:43:05 UTC (rev 9870)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-08-09 21:24:03 UTC (rev 9871)
@@ -2795,7 +2795,7 @@
   case LISTITEM_PLOT:
     if (item->HasVideoInfoTag())
     {
-      if (!(!item->GetVideoInfoTag()->m_strShowTitle.IsEmpty() && item->GetVideoInfoTag()->m_iSeason == 0)) // dont apply to tvshows
+      if (!(!item->GetVideoInfoTag()->m_strShowTitle.IsEmpty() && item->GetVideoInfoTag()->m_iSeason == -1)) // dont apply to tvshows
         if (!item->GetVideoInfoTag()->m_bWatched && g_guiSettings.GetBool("myvideos.hideplots"))
           return g_localizeStrings.Get(20370);
 
@@ -3119,4 +3119,4 @@
 void CGUIInfoManager::ResetCurrentSlide()
 {
   m_currentSlide.Reset();
-}
\ No newline at end of file
+}


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

Revision: 10259
          http://xbmc.svn.sourceforge.net/xbmc/?rev=10259&view=rev
Author:   spiff_
Date:     2007-09-17 10:07:35 -0700 (Mon, 17 Sep 2007)

Log Message:
-----------
fixed: uninitialized variable usage

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-09-17 16:34:45 UTC (rev 10258)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-09-17 17:07:35 UTC (rev 10259)
@@ -1643,7 +1643,7 @@
         CGUIWindow *window = m_gWindowManager.GetWindow(m_gWindowManager.GetActiveWindow());
         if (window)
         {
-          CFileItem *item;
+          CFileItem *item=NULL;
           if (!info.m_data1)
           { // assumes a media window
             if (window->IsMediaWindow())


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

Revision: 10290
          http://xbmc.svn.sourceforge.net/xbmc/?rev=10290&view=rev
Author:   jmarshallnz
Date:     2007-09-19 01:46:04 -0700 (Wed, 19 Sep 2007)

Log Message:
-----------
changed: Default to HH:MM:SS if total time is more than an hour for current and remaining time, if no format is specified.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-09-19 07:45:30 UTC (rev 10289)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-09-19 08:46:04 UTC (rev 10290)
@@ -2197,6 +2197,8 @@
 CStdString CGUIInfoManager::GetCurrentPlayTime(TIME_FORMAT format) const
 {
   CStdString strTime;
+  if (format == TIME_FORMAT_GUESS && GetTotalPlayTime() >= 3600)
+    format = TIME_FORMAT_HH_MM_SS;
   if (g_application.IsPlayingAudio())
     StringUtils::SecondsToTimeString((int)(GetPlayTime()/1000), strTime, format);
   else if (g_application.IsPlayingVideo())
@@ -2218,6 +2220,8 @@
 
 CStdString CGUIInfoManager::GetCurrentPlayTimeRemaining(TIME_FORMAT format) const
 {
+  if (format == TIME_FORMAT_GUESS && GetTotalPlayTime() >= 3600)
+    format = TIME_FORMAT_HH_MM_SS;
   CStdString strTime;
   int timeRemaining = GetPlayTimeRemaining();
   if (timeRemaining)


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

Revision: 10334
          http://xbmc.svn.sourceforge.net/xbmc/?rev=10334&view=rev
Author:   spiff_
Date:     2007-09-23 22:04:46 -0700 (Sun, 23 Sep 2007)

Log Message:
-----------
fixed: info was not set for music videos launched from file view (2)

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-09-24 05:02:54 UTC (rev 10333)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-09-24 05:04:46 UTC (rev 10334)
@@ -2397,7 +2397,7 @@
     }
     else if (dbs.HasMusicVideoInfo(item.m_strPath))
     {
-      dbs.GetEpisodeInfo(item.m_strPath, *m_currentFile.GetVideoInfoTag());
+      dbs.GetMusicVideoInfo(item.m_strPath, *m_currentFile.GetVideoInfoTag());
       CLog::Log(LOGDEBUG,__FUNCTION__", got music video info!");
       CLog::Log(LOGDEBUG,"  Title = %s", m_currentFile.GetVideoInfoTag()->m_strTitle.c_str());
     }


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

Revision: 10476
          http://xbmc.svn.sourceforge.net/xbmc/?rev=10476&view=rev
Author:   jmarshallnz
Date:     2007-10-09 00:00:22 -0700 (Tue, 09 Oct 2007)

Log Message:
-----------
fixed: Player.SeekTime didn't auto-select HH:MM:SS correctly.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-10-09 03:02:41 UTC (rev 10475)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-10-09 07:00:22 UTC (rev 10476)
@@ -1780,9 +1780,12 @@
   }
   else if (info.m_info == PLAYER_SEEKTIME)
   {
+    TIME_FORMAT format = (TIME_FORMAT)info.m_data1;
+    if (format == TIME_FORMAT_GUESS && GetTotalPlayTime() >= 3600)
+      format = TIME_FORMAT_HH_MM_SS;
     CGUIDialogSeekBar *seekBar = (CGUIDialogSeekBar*)m_gWindowManager.GetWindow(WINDOW_DIALOG_SEEK_BAR);
     if (seekBar)
-      return seekBar->GetSeekTimeLabel((TIME_FORMAT)info.m_data1);
+      return seekBar->GetSeekTimeLabel(format);
   }
   else if (info.m_info == SYSTEM_TIME)
   {


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

Revision: 10585
          http://xbmc.svn.sourceforge.net/xbmc/?rev=10585&view=rev
Author:   jmarshallnz
Date:     2007-10-22 01:54:49 -0700 (Mon, 22 Oct 2007)

Log Message:
-----------
Fixed: Info images that relied on the window context didn't show when dialogs were on screen.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-10-21 20:53:43 UTC (rev 10584)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-10-22 08:54:49 UTC (rev 10585)
@@ -1805,7 +1805,7 @@
 {
   if (info >= MULTI_INFO_START && info <= MULTI_INFO_END)
   {
-    return GetMultiInfoLabel(m_multiInfo[info - MULTI_INFO_START]);
+    return GetMultiInfoLabel(m_multiInfo[info - MULTI_INFO_START], contextWindow);
   }
   else if (info == WEATHER_CONDITIONS)
     return g_weatherManager.GetInfo(WEATHER_IMAGE_CURRENT_ICON);


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

Revision: 10615
          http://xbmc.svn.sourceforge.net/xbmc/?rev=10615&view=rev
Author:   jmarshallnz
Date:     2007-10-24 22:15:00 -0700 (Wed, 24 Oct 2007)

Log Message:
-----------
fixed: The previous infolabel fix wasn't quite right.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-10-25 04:33:28 UTC (rev 10614)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-10-25 05:15:00 UTC (rev 10615)
@@ -3206,9 +3206,10 @@
 bool CGUIInfoManager::CheckWindowCondition(CGUIWindow *window, int condition) const
 {
   // check if it satisfies our condition
-  if (window && (condition & WINDOW_CONDITION_HAS_LIST_ITEMS) && !window->HasListItems())
+  if (!window) return false;
+  if ((condition & WINDOW_CONDITION_HAS_LIST_ITEMS) && !window->HasListItems())
     return false;
-  if (window && (condition & WINDOW_CONDITION_IS_MEDIA_WINDOW) && !window->IsMediaWindow())
+  if ((condition & WINDOW_CONDITION_IS_MEDIA_WINDOW) && !window->IsMediaWindow())
     return false;
   return true;
 }


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

Revision: 10770
          http://xbmc.svn.sourceforge.net/xbmc/?rev=10770&view=rev
Author:   jmarshallnz
Date:     2007-11-16 18:34:55 -0800 (Fri, 16 Nov 2007)

Log Message:
-----------
changed: Removed VideoPlayer.IsInLibrary and replaced with VideoPlayer.HasInfo to be a bit more universal (attempt 2)

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-11-17 01:50:32 UTC (rev 10769)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2007-11-17 02:34:55 UTC (rev 10770)
@@ -2155,111 +2155,118 @@
   if (!g_application.IsPlayingVideo()) 
     return "";
   
-  switch (item)
+  if (item == VIDEOPLAYER_TITLE)
   {
-  case VIDEOPLAYER_TITLE:
-    return m_currentFile.GetVideoInfoTag()->m_strTitle;
-    break;
-  case VIDEOPLAYER_ORIGINALTITLE:
-    return m_currentFile.GetVideoInfoTag()->m_strOriginalTitle;
-    break;
-  case VIDEOPLAYER_GENRE:
-    return m_currentFile.GetVideoInfoTag()->m_strGenre;
-    break;
-  case VIDEOPLAYER_DIRECTOR:
-    return m_currentFile.GetVideoInfoTag()->m_strDirector;
-    break;
-  case VIDEOPLAYER_RATING:
+    if (m_currentFile.HasVideoInfoTag() && !m_currentFile.GetVideoInfoTag()->m_strTitle.IsEmpty())
+      return m_currentFile.GetVideoInfoTag()->m_strTitle;
+    // don't have the title, so use label, or drop down to title from path
+    if (!m_currentFile.GetLabel().IsEmpty())
+      return m_currentFile.GetLabel();
+    return CUtil::GetTitleFromPath(m_currentFile.m_strPath);
+  }
+  else if (item == VIDEOPLAYER_PLAYLISTLEN)
+  {
+    if (g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_VIDEO)
+      return GetPlaylistLabel(PLAYLIST_LENGTH);
+  }
+  else if (item == VIDEOPLAYER_PLAYLISTPOS)
+  {
+    if (g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_VIDEO)
+      return GetPlaylistLabel(PLAYLIST_POSITION);
+  }
+  else if (m_currentFile.HasVideoInfoTag())
+  {
+    switch (item)
     {
-      CStdString strYear;
-      strYear.Format("%2.2f", m_currentFile.GetVideoInfoTag()->m_fRating);
-      return strYear;
-    }
-  case VIDEOPLAYER_YEAR:
-    {
-      CStdString strYear;
-      if (m_currentFile.GetVideoInfoTag()->m_iYear > 0)
-        strYear.Format("%i", m_currentFile.GetVideoInfoTag()->m_iYear);
-      return strYear;
-    }
-    break;
-  case VIDEOPLAYER_PREMIERED:
-    {
-      CStdString strYear;
-      if (!m_currentFile.GetVideoInfoTag()->m_strPremiered.IsEmpty())
-        strYear = m_currentFile.GetVideoInfoTag()->m_strPremiered;
-      else if (!m_currentFile.GetVideoInfoTag()->m_strFirstAired.IsEmpty())
-        strYear = m_currentFile.GetVideoInfoTag()->m_strFirstAired;
-      return strYear;
-    }
-    break;
-  case VIDEOPLAYER_PLOT:
-    return m_currentFile.GetVideoInfoTag()->m_strPlot;
-  case VIDEOPLAYER_PLOT_OUTLINE:
-    return m_currentFile.GetVideoInfoTag()->m_strPlotOutline;
-  case VIDEOPLAYER_EPISODE:
-    if (m_currentFile.GetVideoInfoTag()->m_iEpisode > 0)
-    {
-      CStdString strYear;
-      if (m_currentFile.GetVideoInfoTag()->m_iSpecialSortEpisode > 0)
-        strYear.Format("S%i", m_currentFile.GetVideoInfoTag()->m_iEpisode);
-      else
-        strYear.Format("%i", m_currentFile.GetVideoInfoTag()->m_iEpisode);
-      return strYear;
-    }
-    break;
-  case VIDEOPLAYER_SEASON:
-    if (m_currentFile.GetVideoInfoTag()->m_iSeason > -1)
-    {
-      CStdString strYear;
-      if (m_currentFile.GetVideoInfoTag()->m_iSpecialSortSeason > 0)
-        strYear.Format("%i", m_currentFile.GetVideoInfoTag()->m_iSpecialSortSeason);
-      else
-        strYear.Format("%i", m_currentFile.GetVideoInfoTag()->m_iSeason);
-      return strYear;
-    }
-    break;
-  case VIDEOPLAYER_TVSHOW:
-    return m_currentFile.GetVideoInfoTag()->m_strShowTitle;
+    case VIDEOPLAYER_ORIGINALTITLE:
+      return m_currentFile.GetVideoInfoTag()->m_strOriginalTitle;
+      break;
+    case VIDEOPLAYER_GENRE:
+      return m_currentFile.GetVideoInfoTag()->m_strGenre;
+      break;
+    case VIDEOPLAYER_DIRECTOR:
+      return m_currentFile.GetVideoInfoTag()->m_strDirector;
+      break;
+    case VIDEOPLAYER_RATING:
+      {
+        CStdString strYear;
+        strYear.Format("%2.2f", m_currentFile.GetVideoInfoTag()->m_fRating);
+        return strYear;
+      }
+    case VIDEOPLAYER_YEAR:
+      {
+        CStdString strYear;
+        if (m_currentFile.GetVideoInfoTag()->m_iYear > 0)
+          strYear.Format("%i", m_currentFile.GetVideoInfoTag()->m_iYear);
+        return strYear;
+      }
+      break;
+    case VIDEOPLAYER_PREMIERED:
+      {
+        CStdString strYear;
+        if (!m_currentFile.GetVideoInfoTag()->m_strPremiered.IsEmpty())
+          strYear = m_currentFile.GetVideoInfoTag()->m_strPremiered;
+        else if (!m_currentFile.GetVideoInfoTag()->m_strFirstAired.IsEmpty())
+          strYear = m_currentFile.GetVideoInfoTag()->m_strFirstAired;
+        return strYear;
+      }
+      break;
+    case VIDEOPLAYER_PLOT:
+      return m_currentFile.GetVideoInfoTag()->m_strPlot;
+    case VIDEOPLAYER_PLOT_OUTLINE:
+      return m_currentFile.GetVideoInfoTag()->m_strPlotOutline;
+    case VIDEOPLAYER_EPISODE:
+      if (m_currentFile.GetVideoInfoTag()->m_iEpisode > 0)
+      {
+        CStdString strYear;
+        if (m_currentFile.GetVideoInfoTag()->m_iSpecialSortEpisode > 0)
+          strYear.Format("S%i", m_currentFile.GetVideoInfoTag()->m_iEpisode);
+        else
+          strYear.Format("%i", m_currentFile.GetVideoInfoTag()->m_iEpisode);
+        return strYear;
+      }
+      break;
+    case VIDEOPLAYER_SEASON:
+      if (m_currentFile.GetVideoInfoTag()->m_iSeason > -1)
+      {
+        CStdString strYear;
+        if (m_currentFile.GetVideoInfoTag()->m_iSpecialSortSeason > 0)
+          strYear.Format("%i", m_currentFile.GetVideoInfoTag()->m_iSpecialSortSeason);
+        else
+          strYear.Format("%i", m_currentFile.GetVideoInfoTag()->m_iSeason);
+        return strYear;
+      }
+      break;
+    case VIDEOPLAYER_TVSHOW:
+      return m_currentFile.GetVideoInfoTag()->m_strShowTitle;
 
-  case VIDEOPLAYER_PLAYLISTLEN:
-    {
-      if (g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_VIDEO)
-        return GetPlaylistLabel(PLAYLIST_LENGTH);
+    case VIDEOPLAYER_STUDIO:
+      return m_currentFile.GetVideoInfoTag()->m_strStudio;
+    case VIDEOPLAYER_MPAA:
+      return m_currentFile.GetVideoInfoTag()->m_strMPAARating;
+    case VIDEOPLAYER_TOP250:
+      {
+        CStdString strTop250;
+        if (m_currentFile.GetVideoInfoTag()->m_iTop250 > 0)
+          strTop250.Format("%i", m_currentFile.GetVideoInfoTag()->m_iTop250);
+        return strTop250;
+      }
+      break;
+    case VIDEOPLAYER_CAST:
+      return m_currentFile.GetVideoInfoTag()->GetCast();
+    case VIDEOPLAYER_CAST_AND_ROLE:
+      return m_currentFile.GetVideoInfoTag()->GetCast(true);
+    case VIDEOPLAYER_ARTIST:
+      if (m_currentFile.GetVideoInfoTag()->m_artist.size() > 0)
+        return m_currentFile.GetVideoInfoTag()->GetArtist();
+      break;
+    case VIDEOPLAYER_ALBUM:
+      return m_currentFile.GetVideoInfoTag()->m_strAlbum;
+    case VIDEOPLAYER_WRITER:
+      return m_currentFile.GetVideoInfoTag()->m_strWritingCredits;
+    case VIDEOPLAYER_TAGLINE:
+      return m_currentFile.GetVideoInfoTag()->m_strTagLine;
     }
-    break;
-  case VIDEOPLAYER_PLAYLISTPOS:
-    {
-      if (g_playlistPlayer.GetCurrentPlaylist() == PLAYLIST_VIDEO)
-        return GetPlaylistLabel(PLAYLIST_POSITION);
-    }
-    break;
-  case VIDEOPLAYER_STUDIO:
-    return m_currentFile.GetVideoInfoTag()->m_strStudio;
-  case VIDEOPLAYER_MPAA:
-    return m_currentFile.GetVideoInfoTag()->m_strMPAARating;
-  case VIDEOPLAYER_TOP250:
-    {
-      CStdString strTop250;
-      if (m_currentFile.GetVideoInfoTag()->m_iTop250 > 0)
-        strTop250.Format("%i", m_currentFile.GetVideoInfoTag()->m_iTop250);
-      return strTop250;
-    }
-    break;
-  case VIDEOPLAYER_CAST:
-    return m_currentFile.GetVideoInfoTag()->GetCast();
-  case VIDEOPLAYER_CAST_AND_ROLE:
-    return m_currentFile.GetVideoInfoTag()->GetCast(true);
-  case VIDEOPLAYER_ARTIST:
-    if (m_currentFile.GetVideoInfoTag()->m_artist.size() > 0)
-      return m_currentFile.GetVideoInfoTag()->GetArtist();
-    break;
-  case VIDEOPLAYER_ALBUM:
-    return m_currentFile.GetVideoInfoTag()->m_strAlbum;
-  case VIDEOPLAYER_WRITER:
-    return m_currentFile.GetVideoInfoTag()->m_strWritingCredits;
-  case VIDEOPLAYER_TAGLINE:
-    return m_currentFile.GetVideoInfoTag()->m_strTagLine;
   }
   return "";
 }
@@ -2814,12 +2821,8 @@
   case LISTITEM_TITLE:
     if (item->HasMusicInfoTag())
       return CorrectAllItemsSortHack(item->GetMusicInfoTag()->GetTitle());
-    if (item->HasVideoInfoTag() && !item->GetVideoInfoTag()->m_strTitle.IsEmpty())
+    if (item->HasVideoInfoTag())
       return CorrectAllItemsSortHack(item->GetVideoInfoTag()->m_strTitle);
-    // don't have the title, so use label, or drop down to title from path
-    if (!item->GetLabel().IsEmpty())
-      return item->GetLabel();
-    return CUtil::GetTitleFromPath(item->m_strPath);
     break;
   case LISTITEM_TRACKNUMBER:
     {


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

Revision: 11286
          http://xbmc.svn.sourceforge.net/xbmc/?rev=11286&view=rev
Author:   jmarshallnz
Date:     2008-01-08 01:42:28 -0800 (Tue, 08 Jan 2008)

Log Message:
-----------
fixed: <visible>IsEmpty()</visible> didn't work with image attributes.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-01-08 09:04:37 UTC (rev 11285)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-01-08 09:42:28 UTC (rev 11286)
@@ -1605,10 +1605,11 @@
       }
       break;
     case STRING_IS_EMPTY:
+      // note: Get*Image() falls back to Get*Label(), so this should cover all of them
       if (item && item->IsFileItem() && info.m_data1 >= LISTITEM_START && info.m_data1 < LISTITEM_END)
-        bReturn = GetItemLabel((CFileItem *)item, info.m_data1).IsEmpty();
+        bReturn = GetItemImage((CFileItem *)item, info.m_data1).IsEmpty();
       else
-        bReturn = GetLabel(info.m_data1, dwContextWindow).IsEmpty();
+        bReturn = GetImage(info.m_data1, dwContextWindow).IsEmpty();
       break;
     case CONTROL_GROUP_HAS_FOCUS:
       {


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

Revision: 12208
          http://xbmc.svn.sourceforge.net/xbmc/?rev=12208&view=rev
Author:   jmarshallnz
Date:     2008-03-19 15:34:46 -0700 (Wed, 19 Mar 2008)

Log Message:
-----------
changed: Removed "enabled" and "disabled" as boolean conditions.  Use "true" and "false" instead.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-03-19 22:05:16 UTC (rev 12207)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-03-19 22:34:46 UTC (rev 12208)
@@ -132,8 +132,8 @@
   CStdString strCategory = strTest.Left(strTest.Find("."));
 
   // translate conditions...
-  if (strTest.Equals("false") || strTest.Equals("no") || strTest.Equals("off") || strTest.Equals("disabled")) ret = SYSTEM_ALWAYS_FALSE;
-  else if (strTest.Equals("true") || strTest.Equals("yes") || strTest.Equals("on") || strTest.Equals("enabled")) ret = SYSTEM_ALWAYS_TRUE;
+  if (strTest.Equals("false") || strTest.Equals("no") || strTest.Equals("off")) ret = SYSTEM_ALWAYS_FALSE;
+  else if (strTest.Equals("true") || strTest.Equals("yes") || strTest.Equals("on")) ret = SYSTEM_ALWAYS_TRUE;
   if (strCategory.Equals("player"))
   {
     if (strTest.Equals("player.hasmedia")) ret = PLAYER_HAS_MEDIA;


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

Revision: 12367
          http://xbmc.svn.sourceforge.net/xbmc/?rev=12367&view=rev
Author:   jmarshallnz
Date:     2008-03-28 17:11:19 -0700 (Fri, 28 Mar 2008)

Log Message:
-----------
fixed: ListItem.Season and ListItem.Episode return empty if the item has no season and episode detail (thanks Agathorn).

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-03-28 23:04:04 UTC (rev 12366)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-03-29 00:11:19 UTC (rev 12367)
@@ -3213,7 +3213,7 @@
       CStdString strResult;
       if (item->GetVideoInfoTag()->m_iSpecialSortEpisode > 0)
         strResult.Format("S%d",item->GetVideoInfoTag()->m_iEpisode);
-      else
+      else if (item->GetVideoInfoTag()->m_iEpisode >= 0) // if m_iEpisode = -1 there's no episode detail
         strResult.Format("%d",item->GetVideoInfoTag()->m_iEpisode);
       return strResult;
     }
@@ -3224,7 +3224,7 @@
       CStdString strResult;
       if (item->GetVideoInfoTag()->m_iSpecialSortSeason > 0)
         strResult.Format("%d",item->GetVideoInfoTag()->m_iSpecialSortSeason);
-      else
+      else if (item->GetVideoInfoTag()->m_iSeason >= 0) // if m_iSeason = -1 there's no season detail
         strResult.Format("%d",item->GetVideoInfoTag()->m_iSeason);
       return strResult;
     }


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

Revision: 12583
          http://xbmc.svn.sourceforge.net/xbmc/?rev=12583&view=rev
Author:   jwvanderbeck
Date:     2008-04-08 14:07:10 -0700 (Tue, 08 Apr 2008)

Log Message:
-----------
added: System.Time(startTime, endTime) InfoBoolean
endTime is optional.  Returns true if current system time is equal to or greater than startTime and less than endTime (if supplied).

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-04-08 19:58:42 UTC (rev 12582)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-04-08 21:07:10 UTC (rev 12583)
@@ -213,7 +213,26 @@
   else if (strCategory.Equals("system"))
   {
     if (strTest.Equals("system.date")) ret = SYSTEM_DATE;
-    else if (strTest.Left(11).Equals("system.time")) return AddMultiInfo(GUIInfo(SYSTEM_TIME, TranslateTimeFormat(strTest.Mid(11))));
+    else if (strTest.Left(11).Equals("system.time")) 
+    {
+      // determine if this is a System.Time(TIME_FORMAT) infolabel or a System.Time(13:00,14:00) boolean based on the contents of the param
+      // essentially if it isn't a valid TIME_FORMAT then its considered to be the latter.
+      CStdString param = strTest.Mid(12, strTest.length() - 13);
+      TIME_FORMAT timeFormat = TranslateTimeFormat(param);
+      if ((timeFormat == TIME_FORMAT_GUESS) && (!param.IsEmpty()))
+      {
+        CStdStringArray params;
+        int time1 = 0;
+        int time2 = 0;
+        StringUtils::SplitString(param, ",", params);
+        if (params.size() == 2)
+          return AddMultiInfo(GUIInfo(bNegate ? -SYSTEM_TIME : SYSTEM_TIME, StringUtils::TimeStringToSeconds(params[0]), StringUtils::TimeStringToSeconds(params[1])));
+        else if (params.size() == 1)
+          return AddMultiInfo(GUIInfo(bNegate ? -SYSTEM_TIME : SYSTEM_TIME, StringUtils::TimeStringToSeconds(params[0])));
+      }
+      else
+        return AddMultiInfo(GUIInfo(SYSTEM_TIME, timeFormat));
+    }
     else if (strTest.Equals("system.cputemperature")) ret = SYSTEM_CPU_TEMPERATURE;
     else if (strTest.Equals("system.cpuusage")) ret = SYSTEM_CPU_USAGE;
     else if (strTest.Equals("system.gputemperature")) ret = SYSTEM_GPU_TEMPERATURE;
@@ -1910,6 +1929,21 @@
       }
       break;
     }
+    case SYSTEM_TIME:
+      {
+        CDateTime time=CDateTime::GetCurrentDateTime();
+        int currentTime = time.GetHour() * 60 + time.GetMinute();
+        int startTime = info.m_data1;
+        int stopTime = info.m_data2;
+
+        if (stopTime < startTime)
+          stopTime += 1440;
+        if (stopTime > 0)
+          bReturn = (currentTime >= startTime) && (currentTime < stopTime);
+        else
+          bReturn = currentTime >= startTime;
+      }
+      break;
   }
   return (info.m_info < 0) ? !bReturn : bReturn;
 }


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

Revision: 12671
          http://xbmc.svn.sourceforge.net/xbmc/?rev=12671&view=rev
Author:   jmarshallnz
Date:     2008-04-15 18:43:39 -0700 (Tue, 15 Apr 2008)

Log Message:
-----------
fixed: Container.CurrentPage,NumPages,NumItems didn't work with a specified id

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-04-15 09:36:33 UTC (rev 12670)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-04-16 01:43:39 UTC (rev 12671)
@@ -591,7 +591,8 @@
       return AddMultiInfo(GUIInfo(bNegate ? -CONTAINER_HAS_FOCUS : CONTAINER_HAS_FOCUS, id, itemID));
     }
     else if (info.Equals("showplot")) ret = CONTAINER_SHOWPLOT;
-    if (id && (ret == CONTAINER_ON_NEXT || ret == CONTAINER_ON_PREVIOUS))
+    if (id && (ret == CONTAINER_ON_NEXT || ret == CONTAINER_ON_PREVIOUS || ret == CONTAINER_NUM_PAGES ||
+               ret == CONTAINER_NUM_ITEMS || ret == CONTAINER_CURRENT_PAGE))
       return AddMultiInfo(GUIInfo(bNegate ? -ret : ret, id));
   }
   else if (strCategory.Left(8).Equals("listitem"))


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

Revision: 12672
          http://xbmc.svn.sourceforge.net/xbmc/?rev=12672&view=rev
Author:   jmarshallnz
Date:     2008-04-15 18:59:19 -0700 (Tue, 15 Apr 2008)

Log Message:
-----------
fixed: Negated container conditionals weren't returning correctly.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-04-16 01:43:39 UTC (rev 12671)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-04-16 01:59:19 UTC (rev 12672)
@@ -1895,7 +1895,7 @@
             control = window->GetControl(window->GetViewContainerID());
         }
         if (control)
-          bReturn = control->GetCondition(info.m_info, info.m_data2);
+          bReturn = control->GetCondition(condition, info.m_data2);
       }
       break;
     case CONTAINER_HAS_FOCUS:
@@ -1934,7 +1934,7 @@
           }
         }
         if (item)
-          bReturn = GetBool(info.m_info, dwContextWindow, item);
+          bReturn = GetBool(condition, dwContextWindow, item);
       }
       break;
     case VIDEOPLAYER_CONTENT:


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

Revision: 12820
          http://xbmc.svn.sourceforge.net/xbmc/?rev=12820&view=rev
Author:   jwvanderbeck
Date:     2008-04-24 06:59:18 -0700 (Thu, 24 Apr 2008)

Log Message:
-----------
fixed: specified TimeFormat string wasn't being recognized in System.Time
changed: tighten up some of the ListItem code

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-04-24 09:10:33 UTC (rev 12819)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-04-24 13:59:18 UTC (rev 12820)
@@ -240,10 +240,11 @@
     {
       // determine if this is a System.Time(TIME_FORMAT) infolabel or a System.Time(13:00,14:00) boolean based on the contents of the param
       // essentially if it isn't a valid TIME_FORMAT then its considered to be the latter.
-      CStdString param = strTest.Mid(12, strTest.length() - 13);
+      CStdString param = strTest.Mid(11);
       TIME_FORMAT timeFormat = TranslateTimeFormat(param);
       if ((timeFormat == TIME_FORMAT_GUESS) && (!param.IsEmpty()))
       {
+        param = strTest.Mid(12, strTest.length() - 13);
         CStdStringArray params;
         StringUtils::SplitString(param, ",", params);
         if (params.size() == 2)
@@ -2038,18 +2039,14 @@
 
     if (window)
     {
-      if (noWrap) // Get list item specified, without wrapping
+      const CGUIControl *control = window->GetControl(data1);
+      if (control && control->IsContainer())
       {
-        const CGUIControl *control = window->GetControl(data1);
-        if (control && control->IsContainer())
-          item = (CFileItem *)((CGUIBaseContainer *)control)->GetListItem(info.m_data2, false);
+        if (noWrap) // Get list item specified, without wrapping
+            item = (CFileItem *)((CGUIBaseContainer *)control)->GetListItem(info.m_data2, false);
+        else // Get list item specified with wrapping
+            item = (CFileItem *)((CGUIBaseContainer *)control)->GetListItem(info.m_data2, true);
       }
-      else // Get list item specified with wrapping
-      {
-        const CGUIControl *control = window->GetControl(data1);
-        if (control && control->IsContainer())
-          item = (CFileItem *)((CGUIBaseContainer *)control)->GetListItem(info.m_data2, true);
-      }
     }
 
     if (item) // If we got a valid item, do the lookup


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

Revision: 12884
          http://xbmc.svn.sourceforge.net/xbmc/?rev=12884&view=rev
Author:   nuka1195
Date:     2008-05-04 15:40:34 -0700 (Sun, 04 May 2008)

Log Message:
-----------
fixed: Infolabels ListItem.Filename/Path/FilenameAndPath did not work for plugins (I would thank JMarshall (since he gave me the fix) if he checked my work before I committed so I would have looked like I knew what I was doing :P )

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-05-04 21:30:50 UTC (rev 12883)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-05-04 22:40:34 UTC (rev 12884)
@@ -3257,9 +3257,9 @@
       return CorrectAllItemsSortHack(item->GetVideoInfoTag()->m_strGenre);
     break;
   case LISTITEM_FILENAME:
-    if (item->HasMusicInfoTag())
+    if (item->IsMusicDb())
       return CUtil::GetFileName(CorrectAllItemsSortHack(item->GetMusicInfoTag()->GetURL()));
-    if (item->HasVideoInfoTag())
+    if (item->IsVideoDb())
       return CUtil::GetFileName(CorrectAllItemsSortHack(item->GetVideoInfoTag()->m_strFileNameAndPath));
     return CUtil::GetFileName(item->m_strPath);
   case LISTITEM_DATE:
@@ -3377,9 +3377,9 @@
     return item->GetThumbnailImage();
   case LISTITEM_PATH:
   case LISTITEM_FILENAME_AND_PATH:
-    if (item->HasMusicInfoTag())
+    if (item->IsMusicDb())
       return CorrectAllItemsSortHack(item->GetMusicInfoTag()->GetURL());
-    if (item->HasVideoInfoTag())
+    if (item->IsVideoDb())
       return CorrectAllItemsSortHack(item->GetVideoInfoTag()->m_strFileNameAndPath);
     return item->m_strPath;
   case LISTITEM_PICTURE_PATH:


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

Revision: 12888
          http://xbmc.svn.sourceforge.net/xbmc/?rev=12888&view=rev
Author:   nuka1195
Date:     2008-05-05 07:24:34 -0700 (Mon, 05 May 2008)

Log Message:
-----------
fixed: Infolabels ListItem.Filename/Path/FilenameAndPath
changed: ListItem.Path to only return the path portion

Thanks JMarshall

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-05-05 08:14:24 UTC (rev 12887)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-05-05 14:24:34 UTC (rev 12888)
@@ -3257,9 +3257,9 @@
       return CorrectAllItemsSortHack(item->GetVideoInfoTag()->m_strGenre);
     break;
   case LISTITEM_FILENAME:
-    if (item->IsMusicDb())
+    if (item->IsMusicDb() && item->HasMusicInfoTag())
       return CUtil::GetFileName(CorrectAllItemsSortHack(item->GetMusicInfoTag()->GetURL()));
-    if (item->IsVideoDb())
+    if (item->IsVideoDb() && item->HasVideoInfoTag())
       return CUtil::GetFileName(CorrectAllItemsSortHack(item->GetVideoInfoTag()->m_strFileNameAndPath));
     return CUtil::GetFileName(item->m_strPath);
   case LISTITEM_DATE:
@@ -3376,10 +3376,20 @@
   case LISTITEM_THUMB:
     return item->GetThumbnailImage();
   case LISTITEM_PATH:
+    {
+      CStdString path;
+      if (item->IsMusicDb() && item->HasMusicInfoTag())
+        CUtil::GetDirectory(CorrectAllItemsSortHack(item->GetMusicInfoTag()->GetURL()), path);
+      else if (item->IsVideoDb() && item->HasVideoInfoTag())
+        CUtil::GetDirectory(CorrectAllItemsSortHack(item->GetVideoInfoTag()->m_strFileNameAndPath), path);
+      else
+        CUtil::GetDirectory(item->m_strPath, path);
+      return path;
+    }
   case LISTITEM_FILENAME_AND_PATH:
-    if (item->IsMusicDb())
+    if (item->IsMusicDb() && item->HasMusicInfoTag())
       return CorrectAllItemsSortHack(item->GetMusicInfoTag()->GetURL());
-    if (item->IsVideoDb())
+    if (item->IsVideoDb() && item->HasVideoInfoTag())
       return CorrectAllItemsSortHack(item->GetVideoInfoTag()->m_strFileNameAndPath);
     return item->m_strPath;
   case LISTITEM_PICTURE_PATH:


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

Revision: 12914
          http://xbmc.svn.sourceforge.net/xbmc/?rev=12914&view=rev
Author:   spiff_
Date:     2008-05-07 15:21:44 -0700 (Wed, 07 May 2008)

Log Message:
-----------
fixed: don't go around casting windows to CGUIMediaWindow without making sure it is polite to do. fixes hang with xbmc_lyrics if show visualizer was enabled

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-05-07 21:44:37 UTC (rev 12913)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-05-07 22:21:44 UTC (rev 12914)
@@ -1978,7 +1978,7 @@
     case CONTAINER_SORT_METHOD:
     {
       CGUIWindow *window = GetWindowWithCondition(dwContextWindow, WINDOW_CONDITION_IS_MEDIA_WINDOW);
-      if (window)
+      if (window && window->IsMediaWindow())
       {
         const CFileItemList &item = ((CGUIMediaWindow*)window)->CurrentDirectory();
         SORT_METHOD method = item.GetSortMethod();


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

Revision: 12985
          http://xbmc.svn.sourceforge.net/xbmc/?rev=12985&view=rev
Author:   spiff_
Date:     2008-05-13 15:25:59 -0700 (Tue, 13 May 2008)

Log Message:
-----------
fixed: container.content would be wrong in the video info dialog if opened from file view

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-05-13 22:15:06 UTC (rev 12984)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-05-13 22:25:59 UTC (rev 12985)
@@ -1906,19 +1906,19 @@
     case CONTAINER_CONTENT:
       {
         CStdString content;
-        CGUIWindow *window = GetWindowWithCondition(dwContextWindow, WINDOW_CONDITION_IS_MEDIA_WINDOW);
+        CGUIWindow *window = GetWindowWithCondition(dwContextWindow, 0);
         if (window)
-          content = ((CGUIMediaWindow *)window)->CurrentDirectory().GetContent();
-        else
         {
-          window = GetWindowWithCondition(dwContextWindow, 0);
+          if (window->GetID() == WINDOW_MUSIC_INFO)
+            content = ((CGUIWindowMusicInfo *)window)->CurrentDirectory().GetContent();
+          else if (window->GetID() == WINDOW_VIDEO_INFO)
+            content = ((CGUIWindowVideoInfo *)window)->CurrentDirectory().GetContent();
+        }
+        if (content.IsEmpty())
+        {
+          window = GetWindowWithCondition(dwContextWindow, WINDOW_CONDITION_IS_MEDIA_WINDOW);
           if (window)
-          {
-            if (window->GetID() == WINDOW_MUSIC_INFO)
-              content = ((CGUIWindowMusicInfo *)window)->CurrentDirectory().GetContent();
-            else if (window->GetID() == WINDOW_VIDEO_INFO)
-              content = ((CGUIWindowVideoInfo *)window)->CurrentDirectory().GetContent();
-          }
+            content = ((CGUIMediaWindow *)window)->CurrentDirectory().GetContent();
         }
         bReturn = m_stringParameters[info.GetData1()].Equals(content);
       }


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

Revision: 13356
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13356&view=rev
Author:   charlydoes
Date:     2008-06-01 05:57:51 -0700 (Sun, 01 Jun 2008)

Log Message:
-----------
fixed: crash in mediaviews due to checking first character of an empty string.... (linuxbranch rev 13355)

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

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-06-01 12:46:29 UTC (rev 13355)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-06-01 12:57:51 UTC (rev 13356)
@@ -3331,7 +3331,7 @@
 // workaround
 const CStdString &CorrectAllItemsSortHack(const CStdString &item)
 {
-  if (item.size() == 1 && item[0] == 0x01 || ((unsigned char) item[1]) == 0xff)
+  if (item.size() == 1 && item[0] == 0x01 || item.size() > 1 && ((unsigned char) item[1]) == 0xff)
     return StringUtils::EmptyString;
   return item;
 }


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

Revision: 13392
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13392&view=rev
Author:   jmarshallnz
Date:     2008-06-03 17:35:59 -0700 (Tue, 03 Jun 2008)

Log Message:
-----------
fixed: Don't show authentication details via listitem.path/listitem.filenameandpath (thanks cptspiff)

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-06-04 00:04:36 UTC (rev 13391)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-06-04 00:35:59 UTC (rev 13392)
@@ -3537,14 +3537,23 @@
         CUtil::GetDirectory(CorrectAllItemsSortHack(item->GetVideoInfoTag()->m_strFileNameAndPath), path);
       else
         CUtil::GetDirectory(item->m_strPath, path);
+      CURL url(path);
+      url.GetURLWithoutUserDetails(path);
       return path;
+     }
+   case LISTITEM_FILENAME_AND_PATH:
+    {
+      CStdString path;
+      if (item->IsMusicDb() && item->HasMusicInfoTag())
+        path = CorrectAllItemsSortHack(item->GetMusicInfoTag()->GetURL());
+      else if (item->IsVideoDb() && item->HasVideoInfoTag())
+        path = CorrectAllItemsSortHack(item->GetVideoInfoTag()->m_strFileNameAndPath);
+      else
+        path = item->m_strPath;
+      CURL url(path);
+      url.GetURLWithoutUserDetails(path);
+      return path;
     }
-  case LISTITEM_FILENAME_AND_PATH:
-    if (item->IsMusicDb() && item->HasMusicInfoTag())
-      return CorrectAllItemsSortHack(item->GetMusicInfoTag()->GetURL());
-    if (item->IsVideoDb() && item->HasVideoInfoTag())
-      return CorrectAllItemsSortHack(item->GetVideoInfoTag()->m_strFileNameAndPath);
-    return item->m_strPath;
   case LISTITEM_PICTURE_PATH:
     if (item->IsPicture() && (!item->IsZIP() || item->IsRAR() || item->IsCBZ() || item->IsCBR()))
       return item->m_strPath;


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

Revision: 13498
          http://xbmc.svn.sourceforge.net/xbmc/?rev=13498&view=rev
Author:   jmarshallnz
Date:     2008-06-10 00:00:03 -0700 (Tue, 10 Jun 2008)

Log Message:
-----------
fixed: Don't attempt to return empty icons from the infomanager.

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

Modified: trunk/XBMC/xbmc/utils/GUIInfoManager.cpp
===================================================================
--- trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-06-10 06:31:06 UTC (rev 13497)
+++ trunk/XBMC/xbmc/utils/GUIInfoManager.cpp	2008-06-10 07:00:03 UTC (rev 13498)
@@ -3577,7 +3577,7 @@
       if(!strThumb.IsEmpty() && !CURL::IsFileOnly(strThumb) && !CUtil::IsHD(strThumb))
         strThumb = "";
 
-      if(strThumb.IsEmpty())
+      if(strThumb.IsEmpty() && !item->GetIconImage().IsEmpty())
       {
         strThumb = item->GetIconImage();
         strThumb.Insert(strThumb.Find("."), "Big");


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