Skip to content

Commit

Permalink
Merge pull request #7516 from xhaggi/gui-drop-overlay-dialogs
Browse files Browse the repository at this point in the history 
[gui] drop video/music overlay dialogs
  • Loading branch information
@xhaggi
xhaggi committed Aug 19, 2015
2 parents 4879380 + 2f61389 commit 605bd96
Show file tree
Hide file tree
Showing 14 changed files with 1 addition and 163 deletions.
20 changes: 0 additions & 20 deletions Kodi.xcodeproj/project.pbxproj
View file
Expand Up @@ -1567,7 +1567,6 @@
DFF0F2F117528350002DA3A4 /* XTimeUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1D870D25F9FD00618676 /* XTimeUtils.cpp */; };
DFF0F2F217528350002DA3A4 /* GUIDialogMusicInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E180F0D25F9FA00618676 /* GUIDialogMusicInfo.cpp */; };
DFF0F2F317528350002DA3A4 /* GUIDialogMusicOSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17BA0D25F9FA00618676 /* GUIDialogMusicOSD.cpp */; };
DFF0F2F417528350002DA3A4 /* GUIDialogMusicOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18130D25F9FA00618676 /* GUIDialogMusicOverlay.cpp */; };
DFF0F2F517528350002DA3A4 /* GUIDialogSongInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17DA0D25F9FA00618676 /* GUIDialogSongInfo.cpp */; };
DFF0F2F617528350002DA3A4 /* GUIDialogVisualisationPresetList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17E60D25F9FA00618676 /* GUIDialogVisualisationPresetList.cpp */; };
DFF0F2F717528350002DA3A4 /* MusicAlbumInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1E650D25F9FD00618676 /* MusicAlbumInfo.cpp */; };
Expand Down Expand Up @@ -1816,7 +1815,6 @@
DFF0F40317528350002DA3A4 /* GUIDialogVideoBookmarks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17E00D25F9FA00618676 /* GUIDialogVideoBookmarks.cpp */; };
DFF0F40417528350002DA3A4 /* GUIDialogVideoInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E183F0D25F9FA00618676 /* GUIDialogVideoInfo.cpp */; };
DFF0F40517528350002DA3A4 /* GUIDialogVideoOSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E181D0D25F9FA00618676 /* GUIDialogVideoOSD.cpp */; };
DFF0F40617528350002DA3A4 /* GUIDialogVideoOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18430D25F9FA00618676 /* GUIDialogVideoOverlay.cpp */; };
DFF0F40717528350002DA3A4 /* GUIDialogVideoSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C90B129427A6009E7A26 /* GUIDialogVideoSettings.cpp */; };
DFF0F40817528350002DA3A4 /* GUIWindowFullScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18050D25F9FA00618676 /* GUIWindowFullScreen.cpp */; };
DFF0F40917528350002DA3A4 /* GUIWindowVideoBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E183B0D25F9FA00618676 /* GUIWindowVideoBase.cpp */; };
Expand Down Expand Up @@ -2128,7 +2126,6 @@
E38E20B30D25F9FD00618676 /* GUIWindowMusicBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E180D0D25F9FA00618676 /* GUIWindowMusicBase.cpp */; };
E38E20B40D25F9FD00618676 /* GUIDialogMusicInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E180F0D25F9FA00618676 /* GUIDialogMusicInfo.cpp */; };
E38E20B50D25F9FD00618676 /* GUIWindowMusicNav.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18110D25F9FA00618676 /* GUIWindowMusicNav.cpp */; };
E38E20B60D25F9FD00618676 /* GUIDialogMusicOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18130D25F9FA00618676 /* GUIDialogMusicOverlay.cpp */; };
E38E20B70D25F9FD00618676 /* GUIWindowMusicPlaylist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18150D25F9FA00618676 /* GUIWindowMusicPlaylist.cpp */; };
E38E20B80D25F9FD00618676 /* GUIWindowMusicPlaylistEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18170D25F9FA00618676 /* GUIWindowMusicPlaylistEditor.cpp */; };
E38E20B90D25F9FD00618676 /* GUIWindowMusicSongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18190D25F9FA00618676 /* GUIWindowMusicSongs.cpp */; };
Expand All @@ -2143,7 +2140,6 @@
E38E20CA0D25F9FD00618676 /* GUIWindowVideoBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E183B0D25F9FA00618676 /* GUIWindowVideoBase.cpp */; };
E38E20CC0D25F9FD00618676 /* GUIDialogVideoInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E183F0D25F9FA00618676 /* GUIDialogVideoInfo.cpp */; };
E38E20CD0D25F9FD00618676 /* GUIWindowVideoNav.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18410D25F9FA00618676 /* GUIWindowVideoNav.cpp */; };
E38E20CE0D25F9FD00618676 /* GUIDialogVideoOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18430D25F9FA00618676 /* GUIDialogVideoOverlay.cpp */; };
E38E20CF0D25F9FD00618676 /* GUIWindowVideoPlaylist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18450D25F9FA00618676 /* GUIWindowVideoPlaylist.cpp */; };
E38E20D00D25F9FD00618676 /* GUIWindowVisualisation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18470D25F9FA00618676 /* GUIWindowVisualisation.cpp */; };
E38E20D10D25F9FD00618676 /* GUIWindowWeather.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18490D25F9FA00618676 /* GUIWindowWeather.cpp */; };
Expand Down Expand Up @@ -2741,7 +2737,6 @@
E4991372174E5EF700741B6D /* XTimeUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1D870D25F9FD00618676 /* XTimeUtils.cpp */; };
E4991373174E5F0E00741B6D /* GUIDialogMusicInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E180F0D25F9FA00618676 /* GUIDialogMusicInfo.cpp */; };
E4991374174E5F0E00741B6D /* GUIDialogMusicOSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17BA0D25F9FA00618676 /* GUIDialogMusicOSD.cpp */; };
E4991375174E5F0E00741B6D /* GUIDialogMusicOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18130D25F9FA00618676 /* GUIDialogMusicOverlay.cpp */; };
E4991376174E5F0E00741B6D /* GUIDialogSongInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17DA0D25F9FA00618676 /* GUIDialogSongInfo.cpp */; };
E4991377174E5F0E00741B6D /* GUIDialogVisualisationPresetList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17E60D25F9FA00618676 /* GUIDialogVisualisationPresetList.cpp */; };
E4991378174E5F0E00741B6D /* MusicAlbumInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1E650D25F9FD00618676 /* MusicAlbumInfo.cpp */; };
Expand Down Expand Up @@ -2990,7 +2985,6 @@
E4991487174E606500741B6D /* GUIDialogVideoBookmarks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17E00D25F9FA00618676 /* GUIDialogVideoBookmarks.cpp */; };
E4991488174E606500741B6D /* GUIDialogVideoInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E183F0D25F9FA00618676 /* GUIDialogVideoInfo.cpp */; };
E4991489174E606500741B6D /* GUIDialogVideoOSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E181D0D25F9FA00618676 /* GUIDialogVideoOSD.cpp */; };
E499148A174E606500741B6D /* GUIDialogVideoOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18430D25F9FA00618676 /* GUIDialogVideoOverlay.cpp */; };
E499148B174E606500741B6D /* GUIDialogVideoSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C90B129427A6009E7A26 /* GUIDialogVideoSettings.cpp */; };
E499148C174E606500741B6D /* GUIWindowFullScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18050D25F9FA00618676 /* GUIWindowFullScreen.cpp */; };
E499148D174E606500741B6D /* GUIWindowVideoBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E183B0D25F9FA00618676 /* GUIWindowVideoBase.cpp */; };
Expand Down Expand Up @@ -5233,8 +5227,6 @@
E38E18100D25F9FA00618676 /* GUIDialogMusicInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogMusicInfo.h; sourceTree = "<group>"; };
E38E18110D25F9FA00618676 /* GUIWindowMusicNav.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowMusicNav.cpp; sourceTree = "<group>"; };
E38E18120D25F9FA00618676 /* GUIWindowMusicNav.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowMusicNav.h; sourceTree = "<group>"; };
E38E18130D25F9FA00618676 /* GUIDialogMusicOverlay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogMusicOverlay.cpp; sourceTree = "<group>"; };
E38E18140D25F9FA00618676 /* GUIDialogMusicOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogMusicOverlay.h; sourceTree = "<group>"; };
E38E18150D25F9FA00618676 /* GUIWindowMusicPlaylist.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowMusicPlaylist.cpp; sourceTree = "<group>"; };
E38E18160D25F9FA00618676 /* GUIWindowMusicPlaylist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowMusicPlaylist.h; sourceTree = "<group>"; };
E38E18170D25F9FA00618676 /* GUIWindowMusicPlaylistEditor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowMusicPlaylistEditor.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -5263,8 +5255,6 @@
E38E18400D25F9FA00618676 /* GUIDialogVideoInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogVideoInfo.h; sourceTree = "<group>"; };
E38E18410D25F9FA00618676 /* GUIWindowVideoNav.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowVideoNav.cpp; sourceTree = "<group>"; };
E38E18420D25F9FA00618676 /* GUIWindowVideoNav.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowVideoNav.h; sourceTree = "<group>"; };
E38E18430D25F9FA00618676 /* GUIDialogVideoOverlay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogVideoOverlay.cpp; sourceTree = "<group>"; };
E38E18440D25F9FA00618676 /* GUIDialogVideoOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogVideoOverlay.h; sourceTree = "<group>"; };
E38E18450D25F9FA00618676 /* GUIWindowVideoPlaylist.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowVideoPlaylist.cpp; sourceTree = "<group>"; };
E38E18460D25F9FA00618676 /* GUIWindowVideoPlaylist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowVideoPlaylist.h; sourceTree = "<group>"; };
E38E18470D25F9FA00618676 /* GUIWindowVisualisation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowVisualisation.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -6538,8 +6528,6 @@
E38E18100D25F9FA00618676 /* GUIDialogMusicInfo.h */,
E38E17BA0D25F9FA00618676 /* GUIDialogMusicOSD.cpp */,
E38E17BB0D25F9FA00618676 /* GUIDialogMusicOSD.h */,
E38E18130D25F9FA00618676 /* GUIDialogMusicOverlay.cpp */,
E38E18140D25F9FA00618676 /* GUIDialogMusicOverlay.h */,
E38E17DA0D25F9FA00618676 /* GUIDialogSongInfo.cpp */,
E38E17DB0D25F9FA00618676 /* GUIDialogSongInfo.h */,
E38E17E60D25F9FA00618676 /* GUIDialogVisualisationPresetList.cpp */,
Expand Down Expand Up @@ -6926,8 +6914,6 @@
E38E18400D25F9FA00618676 /* GUIDialogVideoInfo.h */,
E38E181D0D25F9FA00618676 /* GUIDialogVideoOSD.cpp */,
E38E181E0D25F9FA00618676 /* GUIDialogVideoOSD.h */,
E38E18430D25F9FA00618676 /* GUIDialogVideoOverlay.cpp */,
E38E18440D25F9FA00618676 /* GUIDialogVideoOverlay.h */,
18B7C90B129427A6009E7A26 /* GUIDialogVideoSettings.cpp */,
18B7C90C129427A6009E7A26 /* GUIDialogVideoSettings.h */,
);
Expand Down Expand Up @@ -10493,7 +10479,6 @@
E38E20B30D25F9FD00618676 /* GUIWindowMusicBase.cpp in Sources */,
E38E20B40D25F9FD00618676 /* GUIDialogMusicInfo.cpp in Sources */,
E38E20B50D25F9FD00618676 /* GUIWindowMusicNav.cpp in Sources */,
E38E20B60D25F9FD00618676 /* GUIDialogMusicOverlay.cpp in Sources */,
E38E20B70D25F9FD00618676 /* GUIWindowMusicPlaylist.cpp in Sources */,
395C29F61A98B44B00EBC7AD /* AddonModuleXbmcwsgi.cpp in Sources */,
E38E20B80D25F9FD00618676 /* GUIWindowMusicPlaylistEditor.cpp in Sources */,
Expand All @@ -10510,7 +10495,6 @@
E38E20CA0D25F9FD00618676 /* GUIWindowVideoBase.cpp in Sources */,
E38E20CC0D25F9FD00618676 /* GUIDialogVideoInfo.cpp in Sources */,
E38E20CD0D25F9FD00618676 /* GUIWindowVideoNav.cpp in Sources */,
E38E20CE0D25F9FD00618676 /* GUIDialogVideoOverlay.cpp in Sources */,
E38E20CF0D25F9FD00618676 /* GUIWindowVideoPlaylist.cpp in Sources */,
E38E20D00D25F9FD00618676 /* GUIWindowVisualisation.cpp in Sources */,
E38E20D10D25F9FD00618676 /* GUIWindowWeather.cpp in Sources */,
Expand Down Expand Up @@ -11865,7 +11849,6 @@
DFF0F2F117528350002DA3A4 /* XTimeUtils.cpp in Sources */,
DFF0F2F217528350002DA3A4 /* GUIDialogMusicInfo.cpp in Sources */,
DFF0F2F317528350002DA3A4 /* GUIDialogMusicOSD.cpp in Sources */,
DFF0F2F417528350002DA3A4 /* GUIDialogMusicOverlay.cpp in Sources */,
DFF0F2F517528350002DA3A4 /* GUIDialogSongInfo.cpp in Sources */,
7CEE587F1B5A3FFB007C2B5A /* AudioDSPSettings.cpp in Sources */,
DFF0F2F617528350002DA3A4 /* GUIDialogVisualisationPresetList.cpp in Sources */,
Expand Down Expand Up @@ -12135,7 +12118,6 @@
DFF0F40317528350002DA3A4 /* GUIDialogVideoBookmarks.cpp in Sources */,
DFF0F40417528350002DA3A4 /* GUIDialogVideoInfo.cpp in Sources */,
DFF0F40517528350002DA3A4 /* GUIDialogVideoOSD.cpp in Sources */,
DFF0F40617528350002DA3A4 /* GUIDialogVideoOverlay.cpp in Sources */,
DFF0F40717528350002DA3A4 /* GUIDialogVideoSettings.cpp in Sources */,
DFF0F40817528350002DA3A4 /* GUIWindowFullScreen.cpp in Sources */,
DFF0F40917528350002DA3A4 /* GUIWindowVideoBase.cpp in Sources */,
Expand Down Expand Up @@ -12938,7 +12920,6 @@
E4991372174E5EF700741B6D /* XTimeUtils.cpp in Sources */,
E4991373174E5F0E00741B6D /* GUIDialogMusicInfo.cpp in Sources */,
E4991374174E5F0E00741B6D /* GUIDialogMusicOSD.cpp in Sources */,
E4991375174E5F0E00741B6D /* GUIDialogMusicOverlay.cpp in Sources */,
E4991376174E5F0E00741B6D /* GUIDialogSongInfo.cpp in Sources */,
E4991377174E5F0E00741B6D /* GUIDialogVisualisationPresetList.cpp in Sources */,
E4991378174E5F0E00741B6D /* MusicAlbumInfo.cpp in Sources */,
Expand Down Expand Up @@ -13202,7 +13183,6 @@
E4991487174E606500741B6D /* GUIDialogVideoBookmarks.cpp in Sources */,
E4991488174E606500741B6D /* GUIDialogVideoInfo.cpp in Sources */,
E4991489174E606500741B6D /* GUIDialogVideoOSD.cpp in Sources */,
E499148A174E606500741B6D /* GUIDialogVideoOverlay.cpp in Sources */,
E499148B174E606500741B6D /* GUIDialogVideoSettings.cpp in Sources */,
E499148C174E606500741B6D /* GUIWindowFullScreen.cpp in Sources */,
E499148D174E606500741B6D /* GUIWindowVideoBase.cpp in Sources */,
Expand Down
5 changes: 0 additions & 5 deletions addons/skin.confluence/720p/MusicOverlay.xml
View file

This file was deleted.

5 changes: 0 additions & 5 deletions addons/skin.confluence/720p/VideoOverlay.xml
View file

This file was deleted.

4 changes: 0 additions & 4 deletions project/VS2010Express/XBMC.vcxproj
View file
Expand Up @@ -630,7 +630,6 @@
<ClCompile Include="..\..\xbmc\music\CueInfoLoader.cpp" />
<ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicInfo.cpp" />
<ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicOSD.cpp" />
<ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicOverlay.cpp" />
<ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogSongInfo.cpp" />
<ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogVisualisationPresetList.cpp" />
<ClCompile Include="..\..\xbmc\music\GUIViewStateMusic.cpp" />
Expand Down Expand Up @@ -1536,7 +1535,6 @@
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoBookmarks.cpp" />
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoInfo.cpp" />
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoOSD.cpp" />
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoOverlay.cpp" />
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoSettings.cpp" />
<ClCompile Include="..\..\xbmc\video\FFmpegVideoDecoder.cpp" />
<ClCompile Include="..\..\xbmc\video\GUIViewStateVideo.cpp" />
Expand Down Expand Up @@ -1951,7 +1949,6 @@
<ClInclude Include="..\..\xbmc\music\Artist.h" />
<ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogMusicInfo.h" />
<ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogMusicOSD.h" />
<ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogMusicOverlay.h" />
<ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogSongInfo.h" />
<ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogVisualisationPresetList.h" />
<ClInclude Include="..\..\xbmc\music\GUIViewStateMusic.h" />
Expand Down Expand Up @@ -2199,7 +2196,6 @@
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoBookmarks.h" />
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoInfo.h" />
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoOSD.h" />
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoOverlay.h" />
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoSettings.h" />
<ClInclude Include="..\..\xbmc\video\GUIViewStateVideo.h" />
<ClInclude Include="..\..\xbmc\video\Teletext.h" />
Expand Down
12 changes: 0 additions & 12 deletions project/VS2010Express/XBMC.vcxproj.filters
View file
Expand Up @@ -1186,9 +1186,6 @@
<ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicOSD.cpp">
<Filter>music\dialogs</Filter>
</ClCompile>
<ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogMusicOverlay.cpp">
<Filter>music\dialogs</Filter>
</ClCompile>
<ClCompile Include="..\..\xbmc\music\dialogs\GUIDialogSongInfo.cpp">
<Filter>music\dialogs</Filter>
</ClCompile>
Expand Down Expand Up @@ -1546,9 +1543,6 @@
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoOSD.cpp">
<Filter>video\dialogs</Filter>
</ClCompile>
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoOverlay.cpp">
<Filter>video\dialogs</Filter>
</ClCompile>
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogVideoSettings.cpp">
<Filter>video\dialogs</Filter>
</ClCompile>
Expand Down Expand Up @@ -4165,9 +4159,6 @@
<ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogMusicOSD.h">
<Filter>music\dialogs</Filter>
</ClInclude>
<ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogMusicOverlay.h">
<Filter>music\dialogs</Filter>
</ClInclude>
<ClInclude Include="..\..\xbmc\music\dialogs\GUIDialogSongInfo.h">
<Filter>music\dialogs</Filter>
</ClInclude>
Expand Down Expand Up @@ -4555,9 +4546,6 @@
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoOSD.h">
<Filter>video\dialogs</Filter>
</ClInclude>
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoOverlay.h">
<Filter>video\dialogs</Filter>
</ClInclude>
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogVideoSettings.h">
<Filter>video\dialogs</Filter>
</ClInclude>
Expand Down
20 changes: 1 addition & 19 deletions xbmc/Application.cpp
View file
Expand Up @@ -1712,13 +1712,6 @@ bool CApplication::LoadSkin(const SkinPtr& skin)
if (g_SkinInfo->HasSkinFile("DialogFullScreenInfo.xml"))
g_windowManager.Add(new CGUIDialogFullScreenInfo);

{ // we can't register visible condition in dialog's ctor because infomanager is cleared when unloading skin
CGUIDialog *overlay = (CGUIDialog *)g_windowManager.GetWindow(WINDOW_DIALOG_VIDEO_OVERLAY);
if (overlay) overlay->SetVisibleCondition("skin.hasvideooverlay");
overlay = (CGUIDialog *)g_windowManager.GetWindow(WINDOW_DIALOG_MUSIC_OVERLAY);
if (overlay) overlay->SetVisibleCondition("skin.hasmusicoverlay");
}

CLog::Log(LOGINFO, " skin loaded...");

// leave the graphics lock
Expand Down Expand Up @@ -1878,18 +1871,7 @@ bool CApplication::RenderNoPresent()
// g_graphicsContext.AcquireCurrentContext();

g_graphicsContext.Lock();

// dont show GUI when playing full screen video
if (g_graphicsContext.IsFullScreenVideo())
{
// close window overlays
CGUIDialog *overlay = (CGUIDialog *)g_windowManager.GetWindow(WINDOW_DIALOG_VIDEO_OVERLAY);
if (overlay) overlay->Close(true);
overlay = (CGUIDialog *)g_windowManager.GetWindow(WINDOW_DIALOG_MUSIC_OVERLAY);
if (overlay) overlay->Close(true);

}


bool hasRendered = g_windowManager.Render();

g_graphicsContext.Unlock();
Expand Down

0 comments on commit 605bd96

Please sign in to comment.