Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Add isvideo info for slideshow window. #2565

Merged
merged 1 commit into from

2 participants

@ulion
Collaborator

then later in slideshow.xml we can show different ui for video/picture

@jmarshallnz jmarshallnz merged commit e2efdc2 into xbmc:master
@popcornmix popcornmix referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@popcornmix popcornmix referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@popcornmix popcornmix referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@popcornmix popcornmix referenced this pull request from a commit in popcornmix/xbmc
@popcornmix popcornmix [rbp/omxplayer] Fix for subtitle flood at start of file
The test for pts==0 results in every subtitle in the overlay container being rendered at start of file.
#2565 results in every subitle from an external file being loaded into the overlay container at start of file.

This results in hundreds of subtitles being rendered which is slow and ugly. See:
https://dl.dropboxusercontent.com/u/3669512/temp/screenshot001.png

Remove this test.

Also remove setting the media_pts to the predicted media_pts as that causes a subtitle flurry after seeking while GPU fifo fills
d80875c
@miappa miappa referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Apr 8, 2013
  1. @ulion
This page is out of date. Refresh to see the latest.
Showing with 7 additions and 0 deletions.
  1. +6 −0 xbmc/GUIInfoManager.cpp
  2. +1 −0  xbmc/GUIInfoManager.h
View
6 xbmc/GUIInfoManager.cpp
@@ -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
1  xbmc/GUIInfoManager.h
@@ -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
Something went wrong with that request. Please try again.