[SCM] kodi/master: Imported Upstream version 15.2+dfsg1
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Tue Oct 20 08:58:16 UTC 2015
The following commit has been merged in the master branch:
commit 514e1d21c26ba1e3f2eacf389d5d519e2749e8c4
Author: Balint Reczey <balint at balintreczey.hu>
Date: Tue Oct 20 09:28:39 2015 +0200
Imported Upstream version 15.2+dfsg1
diff --git a/addons/skin.confluence/720p/DialogVideoInfo.xml b/addons/skin.confluence/720p/DialogVideoInfo.xml
index 8b9bb63..e222585 100644
--- a/addons/skin.confluence/720p/DialogVideoInfo.xml
+++ b/addons/skin.confluence/720p/DialogVideoInfo.xml
@@ -2,7 +2,6 @@
<window>
<defaultcontrol always="true">8</defaultcontrol>
<allowoverlay>no</allowoverlay>
- <onload condition="Skin.HasSetting(ActivateTvTunes) + System.HasAddon(script.tvtunes)">RunScript(script.tvtunes,backend=True)</onload>
<controls>
<control type="group">
<visible>!Window.IsVisible(FileBrowser)</visible>
@@ -984,13 +983,6 @@
<onclick>PlayMedia($INFO[ListItem.Trailer],1)</onclick>
<visible>!IsEmpty(ListItem.Trailer) + Skin.HasSetting(WindowedTrailer)</visible>
</control>
- <control type="button" id="100">
- <description>Fetch TvTunes stuff</description>
- <include>ButtonInfoDialogsCommonValues</include>
- <label>31127</label>
- <onclick>RunScript(script.tvtunes,mode=solo)</onclick>
- <visible>Skin.HasSetting(ActivateTvTunes) + System.HasAddon(script.tvtunes) + [Container.Content(TVShows) | Container.Content(movies) | Container.Content(musicvideos)] + IsEmpty(Window(movieinformation).Property("TvTunes_HideVideoInfoButton"))</visible>
- </control>
</control>
</control>
</control>
diff --git a/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml
index df4b303..304fd0d 100644
--- a/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml
+++ b/addons/skin.confluence/720p/IncludesBackgroundBuilding.xml
@@ -51,7 +51,6 @@
<width>1280</width>
<height>720</height>
<visible>Player.HasAudio + !Skin.HasSetting(ShowBackgroundVis)</visible>
- <visible>!SubString(Window(videolibrary).Property(TvTunesIsAlive),True)</visible>
</control>
<control type="videowindow">
<left>0</left>
@@ -66,7 +65,7 @@
<width>1280</width>
<height>120</height>
<texture flipy="true" border="1">HomeNowPlayingBack.png</texture>
- <visible>[Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] | [Player.HasAudio + ![Skin.HasSetting(ShowBackgroundVis) | SubString(Window(videolibrary).Property(TvTunesIsAlive),True)]] | [!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))]</visible>
+ <visible>[Player.HasVideo + !Skin.HasSetting(ShowBackgroundVideo)] | [Player.HasAudio + !Skin.HasSetting(ShowBackgroundVis)] | [!Skin.HasSetting(HideBackGroundFanart) + !IsEmpty(ListItem.Property(Fanart_Image))]</visible>
<include>VisibleFadeEffect</include>
</control>
</include>
diff --git a/addons/skin.confluence/720p/MyVideoNav.xml b/addons/skin.confluence/720p/MyVideoNav.xml
index 6428fac..dab5d8b 100644
--- a/addons/skin.confluence/720p/MyVideoNav.xml
+++ b/addons/skin.confluence/720p/MyVideoNav.xml
@@ -4,7 +4,6 @@
<allowoverlay>no</allowoverlay>
<views>50,51,500,550,551,560,501,508,504,503,515,505,511</views>
<onload condition="!Skin.HasSetting(FirstTimeRun)">ActivateWindow(1112)</onload>
- <onload condition="Skin.HasSetting(ActivateTvTunes) + System.HasAddon(script.tvtunes)">RunScript(script.tvtunes,backend=True)</onload>
<controls>
<include>CommonBackground</include>
<include>ContentPanelBackgrounds</include>
diff --git a/addons/skin.confluence/720p/SkinSettings.xml b/addons/skin.confluence/720p/SkinSettings.xml
index f4a15cb..0167a40 100644
--- a/addons/skin.confluence/720p/SkinSettings.xml
+++ b/addons/skin.confluence/720p/SkinSettings.xml
@@ -284,30 +284,6 @@
<onclick>Skin.ToggleSetting(HideFilenameFlagging)</onclick>
<selected>Skin.HasSetting(HideFilenameFlagging)</selected>
</control>
- <control type="label" id="104">
- <width>750</width>
- <height>45</height>
- <font>font13_title</font>
- <label>20343</label>
- <textcolor>blue</textcolor>
- <shadowcolor>black</shadowcolor>
- <align>left</align>
- <aligny>center</aligny>
- <visible>System.HasAddon(script.tvtunes)</visible>
- </control>
- <control type="radiobutton" id="115">
- <width>750</width>
- <height>40</height>
- <font>font13</font>
- <label>31126</label>
- <textcolor>grey2</textcolor>
- <focusedcolor>white</focusedcolor>
- <texturefocus>MenuItemFO.png</texturefocus>
- <texturenofocus>MenuItemNF.png</texturenofocus>
- <onclick>Skin.ToggleSetting(ActivateTvTunes)</onclick>
- <selected>Skin.HasSetting(ActivateTvTunes)</selected>
- <visible>System.HasAddon(script.tvtunes)</visible>
- </control>
<control type="label" id="106">
<width>750</width>
<height>45</height>
diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml
index ce5ad24..094fc23 100644
--- a/addons/skin.confluence/720p/includes.xml
+++ b/addons/skin.confluence/720p/includes.xml
@@ -312,7 +312,7 @@
</include>
<include name="CommonNowPlaying">
<control type="group">
- <visible>Player.HasMedia + !SubString(Window(videolibrary).Property(TvTunesIsAlive),TRUE)</visible>
+ <visible>Player.HasMedia</visible>
<include>VisibleFadeEffect</include>
<animation effect="fade" time="200" condition="Window.Previous(Home)">WindowOpen</animation>
<animation effect="fade" time="200" condition="Window.Next(Home)">WindowClose</animation>
diff --git a/addons/skin.confluence/language/resource.language.en_gb/strings.po b/addons/skin.confluence/language/resource.language.en_gb/strings.po
index 66020c5..e361971 100644
--- a/addons/skin.confluence/language/resource.language.en_gb/strings.po
+++ b/addons/skin.confluence/language/resource.language.en_gb/strings.po
@@ -267,13 +267,7 @@ msgctxt "#31125"
msgid "Show background \"Now playing\" visualisation"
msgstr ""
-msgctxt "#31126"
-msgid "Play TV theme songs in video library (TvTunes add-on)"
-msgstr ""
-
-msgctxt "#31127"
-msgid "TvTunes"
-msgstr ""
+#empty strings from id 31126 to 31127
msgctxt "#31128"
msgid "Lyrics"
diff --git a/configure.ac b/configure.ac
index d2cd5b2..686f4a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([kodi], [15.1.903], [http://trac.kodi.tv])
+AC_INIT([kodi], [15.2.000], [http://trac.kodi.tv])
AC_CONFIG_HEADERS([xbmc/config.h])
AH_TOP([#pragma once])
m4_include([m4/ax_prog_cc_for_build.m4])
diff --git a/media/Splash.png b/media/Splash.png
index 094b97c..579f530 100644
Binary files a/media/Splash.png and b/media/Splash.png differ
diff --git a/version.txt b/version.txt
index c427834..6bf96a6 100644
--- a/version.txt
+++ b/version.txt
@@ -3,9 +3,9 @@ COMPANY_NAME XBMC-Foundation
WEBSITE http://kodi.tv
VERSION_MAJOR 15
VERSION_MINOR 2
-VERSION_TAG RC3
-VERSION_CODE 151903
-ADDON_API 15.1.903
+VERSION_TAG
+VERSION_CODE 152000
+ADDON_API 15.2.000
# Notes:
# Change AC_INIT in configure.ac
diff --git a/xbmc/windows/GUIWindowScreensaverDim.cpp b/xbmc/windows/GUIWindowScreensaverDim.cpp
index 644fe34..ee2f494 100644
--- a/xbmc/windows/GUIWindowScreensaverDim.cpp
+++ b/xbmc/windows/GUIWindowScreensaverDim.cpp
@@ -40,12 +40,9 @@ CGUIWindowScreensaverDim::~CGUIWindowScreensaverDim(void)
void CGUIWindowScreensaverDim::UpdateVisibility()
{
- float level = g_application.GetDimScreenSaverLevel();
- if (level)
- {
- m_dimLevel = level;
+ m_dimLevel = g_application.GetDimScreenSaverLevel();
+ if (m_dimLevel)
Show();
- }
else
Close();
}
--
kodi packaging
More information about the pkg-multimedia-commits
mailing list