Permalink
Browse files

Merge pull request #2565 from ulion/add_slideshow_isvideo_info

Add isvideo info for slideshow window.
  • Loading branch information...
2 parents 5c8d43e + d18d7c1 commit e2efdc210140f99708fcb28d9b186e8c7542d3e3 @jmarshallnz jmarshallnz committed Apr 8, 2013
Showing with 7 additions and 0 deletions.
  1. +6 −0 xbmc/GUIInfoManager.cpp
  2. +1 −0 xbmc/GUIInfoManager.h
View
@@ -649,6 +649,7 @@ const infomap pvr[] = {{ "isrecording", PVR_IS_RECORDING
const infomap slideshow[] = {{ "ispaused", SLIDESHOW_ISPAUSED },
{ "isactive", SLIDESHOW_ISACTIVE },
+ { "isvideo", SLIDESHOW_ISVIDEO },
{ "israndom", SLIDESHOW_ISRANDOM }};
const int picture_slide_map[] = {/* LISTITEM_PICTURE_RESOLUTION => */ SLIDE_RESOLUTION,
@@ -2304,6 +2305,11 @@ bool CGUIInfoManager::GetBool(int condition1, int contextWindow, const CGUIListI
CGUIWindowSlideShow *slideShow = (CGUIWindowSlideShow *)g_windowManager.GetWindow(WINDOW_SLIDESHOW);
bReturn = (slideShow && slideShow->InSlideShow());
}
+ else if (condition == SLIDESHOW_ISVIDEO)
+ {
+ CGUIWindowSlideShow *slideShow = (CGUIWindowSlideShow *)g_windowManager.GetWindow(WINDOW_SLIDESHOW);
+ bReturn = (slideShow && slideShow->GetCurrentSlide() && slideShow->GetCurrentSlide()->IsVideo());
+ }
else if (g_application.IsPlaying())
{
switch (condition)
View
@@ -408,6 +408,7 @@ namespace INFO
#define SLIDESHOW_ISPAUSED 800
#define SLIDESHOW_ISRANDOM 801
#define SLIDESHOW_ISACTIVE 802
+#define SLIDESHOW_ISVIDEO 803
#define SLIDE_INFO_START 900
#define SLIDE_INFO_END 980

0 comments on commit e2efdc2

Please sign in to comment.