XBMC Media Center

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.