Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #2183 from Montellese/view_lib

move all view related files into xbmc/view
  • Loading branch information...
commit 3f8b637840acec1e23f21c8a7f283aadefe4c46f 2 parents a2de8ff + 2fd3323
jmarshallnz jmarshallnz authored
Showing with 70 additions and 47 deletions.
  1. +1 −0  Makefile.in
  2. +7 −7 project/VS2010Express/XBMC.vcxproj
  3. +24 −7 project/VS2010Express/XBMC.vcxproj.filters
  4. +1 −1  xbmc/DatabaseManager.cpp
  5. +0 −3  xbmc/Makefile.in
  6. +1 −1  xbmc/addons/GUIViewStateAddonBrowser.cpp
  7. +1 −1  xbmc/addons/GUIViewStateAddonBrowser.h
  8. +1 −1  xbmc/dialogs/GUIDialogFileBrowser.h
  9. +1 −1  xbmc/dialogs/GUIDialogSelect.h
  10. +1 −1  xbmc/music/GUIViewStateMusic.h
  11. +1 −1  xbmc/network/upnp/UPnPServer.cpp
  12. +1 −1  xbmc/peripherals/dialogs/GUIDialogPeripheralManager.h
  13. +1 −1  xbmc/pictures/GUIViewStatePictures.cpp
  14. +1 −1  xbmc/pictures/GUIViewStatePictures.h
  15. +1 −1  xbmc/programs/GUIViewStatePrograms.cpp
  16. +1 −1  xbmc/programs/GUIViewStatePrograms.h
  17. +1 −1  xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h
  18. +1 −1  xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
  19. +1 −1  xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.h
  20. +1 −1  xbmc/pvr/dialogs/GUIDialogPVRGroupManager.h
  21. +1 −1  xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp
  22. +1 −1  xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.h
  23. +1 −1  xbmc/pvr/windows/GUIViewStatePVR.h
  24. +1 −1  xbmc/settings/GUIWindowSettingsCategory.cpp
  25. +1 −1  xbmc/settings/Settings.h
  26. +1 −1  xbmc/video/GUIViewStateVideo.h
  27. +1 −1  xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
  28. +1 −1  xbmc/video/dialogs/GUIDialogVideoBookmarks.h
  29. 0  xbmc/{ → view}/GUIViewControl.cpp
  30. +1 −1  xbmc/{ → view}/GUIViewControl.h
  31. +2 −2 xbmc/{ → view}/GUIViewState.cpp
  32. 0  xbmc/{ → view}/GUIViewState.h
  33. +8 −0 xbmc/view/Makefile
  34. +1 −1  xbmc/{ → view}/ViewDatabase.cpp
  35. 0  xbmc/{ → view}/ViewDatabase.h
  36. 0  xbmc/{ → view}/ViewState.h
  37. +1 −1  xbmc/windows/GUIMediaWindow.h
  38. +1 −1  xbmc/windows/GUIWindowLoginScreen.h
1  Makefile.in
View
@@ -83,6 +83,7 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
xbmc/video/dialogs/videodialogs.a \
xbmc/video/video.a \
xbmc/video/windows/videowindows.a \
+ xbmc/view/view.a \
xbmc/windowing/windowing.a \
xbmc/windows/windows.a \
xbmc/xbmc.a \
14 project/VS2010Express/XBMC.vcxproj
View
@@ -693,8 +693,6 @@
<ClCompile Include="..\..\xbmc\guilib\XBTF.cpp" />
<ClCompile Include="..\..\xbmc\guilib\XBTFReader.cpp" />
<ClCompile Include="..\..\xbmc\GUIPassword.cpp" />
- <ClCompile Include="..\..\xbmc\GUIViewControl.cpp" />
- <ClCompile Include="..\..\xbmc\GUIViewState.cpp" />
<ClCompile Include="..\..\xbmc\input\ButtonTranslator.cpp" />
<ClCompile Include="..\..\xbmc\input\InertialScrollingHandler.cpp" />
<ClCompile Include="..\..\xbmc\input\KeyboardLayoutConfiguration.cpp" />
@@ -1646,7 +1644,9 @@
<ClCompile Include="..\..\xbmc\video\windows\GUIWindowVideoBase.cpp" />
<ClCompile Include="..\..\xbmc\video\windows\GUIWindowVideoNav.cpp" />
<ClCompile Include="..\..\xbmc\video\windows\GUIWindowVideoPlaylist.cpp" />
- <ClCompile Include="..\..\xbmc\ViewDatabase.cpp" />
+ <ClCompile Include="..\..\xbmc\view\GUIViewControl.cpp" />
+ <ClCompile Include="..\..\xbmc\view\GUIViewState.cpp" />
+ <ClCompile Include="..\..\xbmc\view\ViewDatabase.cpp" />
<ClCompile Include="..\..\xbmc\win32\pch.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug (DirectX)|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Testsuite|Win32'">Create</PrecompiledHeader>
@@ -2143,8 +2143,6 @@
<ClInclude Include="..\..\xbmc\guilib\XBTFReader.h" />
<ClInclude Include="..\..\xbmc\GUIPassword.h" />
<ClInclude Include="..\..\xbmc\GUIUserMessages.h" />
- <ClInclude Include="..\..\xbmc\GUIViewControl.h" />
- <ClInclude Include="..\..\xbmc\GUIViewState.h" />
<ClInclude Include="..\..\xbmc\input\ButtonTranslator.h" />
<ClInclude Include="..\..\xbmc\input\InertialScrollingHandler.h" />
<ClInclude Include="..\..\xbmc\input\KeyboardLayoutConfiguration.h" />
@@ -2492,8 +2490,10 @@
<ClInclude Include="..\..\xbmc\video\windows\GUIWindowVideoBase.h" />
<ClInclude Include="..\..\xbmc\video\windows\GUIWindowVideoNav.h" />
<ClInclude Include="..\..\xbmc\video\windows\GUIWindowVideoPlaylist.h" />
- <ClInclude Include="..\..\xbmc\ViewDatabase.h" />
- <ClInclude Include="..\..\xbmc\ViewState.h" />
+ <ClInclude Include="..\..\xbmc\view\GUIViewControl.h" />
+ <ClInclude Include="..\..\xbmc\view\GUIViewState.h" />
+ <ClInclude Include="..\..\xbmc\view\ViewDatabase.h" />
+ <ClInclude Include="..\..\xbmc\view\ViewState.h" />
<ClInclude Include="..\..\xbmc\win32\pch.h" />
<ClInclude Include="..\..\xbmc\win32\PlatformDefs.h" />
<ClInclude Include="..\..\xbmc\XBDateTime.h" />
31 project/VS2010Express/XBMC.vcxproj.filters
View
@@ -280,6 +280,9 @@
<Filter Include="interfaces\python\test">
<UniqueIdentifier>{0a84b5ee-2ad4-4ae2-9a8d-fc585c6d8aae}</UniqueIdentifier>
</Filter>
+ <Filter Include="view">
+ <UniqueIdentifier>{90f512bb-8cda-4f04-b938-4f48d29bc82a}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\xbmc\win32\pch.cpp">
@@ -2496,7 +2499,6 @@
<ClCompile Include="..\..\xbmc\utils\Screenshot.cpp">
<Filter>utils</Filter>
</ClCompile>
- <ClCompile Include="..\..\xbmc\ViewDatabase.cpp" />
<ClCompile Include="..\..\xbmc\ApplicationMessenger.cpp" />
<ClCompile Include="..\..\xbmc\Autorun.cpp" />
<ClCompile Include="..\..\xbmc\AutoSwitch.cpp" />
@@ -2522,8 +2524,6 @@
<ClCompile Include="..\..\xbmc\XBApplicationEx.cpp" />
<ClCompile Include="..\..\xbmc\XBDateTime.cpp" />
<ClCompile Include="..\..\xbmc\GUILargeTextureManager.cpp" />
- <ClCompile Include="..\..\xbmc\GUIViewControl.cpp" />
- <ClCompile Include="..\..\xbmc\GUIViewState.cpp" />
<ClCompile Include="..\..\xbmc\ThumbLoader.cpp" />
<ClCompile Include="..\..\xbmc\BackgroundInfoLoader.cpp" />
<ClCompile Include="..\..\xbmc\pictures\PictureThumbLoader.cpp">
@@ -2963,6 +2963,15 @@
<ClCompile Include="..\..\xbmc\video\FFmpegVideoDecoder.cpp">
<Filter>video</Filter>
</ClCompile>
+ <ClCompile Include="..\..\xbmc\view\GUIViewControl.cpp">
+ <Filter>view</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\view\GUIViewState.cpp">
+ <Filter>view</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\xbmc\view\ViewDatabase.cpp">
+ <Filter>view</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\xbmc\win32\pch.h">
@@ -5480,7 +5489,6 @@
<ClInclude Include="..\..\xbmc\video\VideoDatabase.h">
<Filter>video</Filter>
</ClInclude>
- <ClInclude Include="..\..\xbmc\ViewDatabase.h" />
<ClInclude Include="..\..\xbmc\ApplicationMessenger.h" />
<ClInclude Include="..\..\xbmc\Autorun.h" />
<ClInclude Include="..\..\xbmc\AutoSwitch.h" />
@@ -5510,9 +5518,6 @@
<ClInclude Include="..\..\xbmc\XBApplicationEx.h" />
<ClInclude Include="..\..\xbmc\XBDateTime.h" />
<ClInclude Include="..\..\xbmc\GUILargeTextureManager.h" />
- <ClInclude Include="..\..\xbmc\GUIViewControl.h" />
- <ClInclude Include="..\..\xbmc\GUIViewState.h" />
- <ClInclude Include="..\..\xbmc\ViewState.h" />
<ClInclude Include="..\..\xbmc\ThumbLoader.h" />
<ClInclude Include="..\..\xbmc\pictures\PictureThumbLoader.h">
<Filter>pictures</Filter>
@@ -5788,6 +5793,18 @@
<ClInclude Include="..\..\xbmc\video\FFmpegVideoDecoder.h">
<Filter>video</Filter>
</ClInclude>
+ <ClInclude Include="..\..\xbmc\view\GUIViewControl.h">
+ <Filter>view</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\view\GUIViewState.h">
+ <Filter>view</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\view\ViewDatabase.h">
+ <Filter>view</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\xbmc\view\ViewState.h">
+ <Filter>view</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\xbmc\win32\XBMC_PC.rc">
2  xbmc/DatabaseManager.cpp
View
@@ -21,7 +21,7 @@
#include "DatabaseManager.h"
#include "utils/log.h"
#include "addons/AddonDatabase.h"
-#include "ViewDatabase.h"
+#include "view/ViewDatabase.h"
#include "TextureDatabase.h"
#include "music/MusicDatabase.h"
#include "video/VideoDatabase.h"
3  xbmc/Makefile.in
View
@@ -13,8 +13,6 @@ SRCS=Application.cpp \
GUIInfoManager.cpp \
GUILargeTextureManager.cpp \
GUIPassword.cpp \
- GUIViewControl.cpp \
- GUIViewState.cpp \
MediaSource.cpp \
NfoFile.cpp \
PasswordManager.cpp \
@@ -30,7 +28,6 @@ SRCS=Application.cpp \
ThumbnailCache.cpp \
URL.cpp \
Util.cpp \
- ViewDatabase.cpp \
XBApplicationEx.cpp \
XBDateTime.cpp \
xbmc.cpp \
2  xbmc/addons/GUIViewStateAddonBrowser.cpp
View
@@ -21,7 +21,7 @@
#include "GUIViewStateAddonBrowser.h"
#include "FileItem.h"
#include "guilib/Key.h"
-#include "ViewState.h"
+#include "view/ViewState.h"
#include "settings/Settings.h"
#include "addons/Addon.h"
#include "addons/AddonManager.h"
2  xbmc/addons/GUIViewStateAddonBrowser.h
View
@@ -20,7 +20,7 @@
*
*/
-#include "GUIViewState.h"
+#include "view/GUIViewState.h"
class CGUIViewStateAddonBrowser : public CGUIViewState
{
2  xbmc/dialogs/GUIDialogFileBrowser.h
View
@@ -23,7 +23,7 @@
#include "guilib/GUIDialog.h"
#include "filesystem/VirtualDirectory.h"
#include "filesystem/DirectoryHistory.h"
-#include "GUIViewControl.h"
+#include "view/GUIViewControl.h"
#include "pictures/PictureThumbLoader.h"
class CFileItem;
2  xbmc/dialogs/GUIDialogSelect.h
View
@@ -22,7 +22,7 @@
#include "GUIDialogBoxBase.h"
#include "guilib/GUIListItem.h"
-#include "GUIViewControl.h"
+#include "view/GUIViewControl.h"
class CFileItem;
class CFileItemList;
2  xbmc/music/GUIViewStateMusic.h
View
@@ -20,7 +20,7 @@
*
*/
-#include "GUIViewState.h"
+#include "view/GUIViewState.h"
class CGUIViewStateWindowMusic : public CGUIViewState
{
2  xbmc/network/upnp/UPnPServer.cpp
View
@@ -1,7 +1,7 @@
#include "UPnPServer.h"
#include "UPnPInternal.h"
#include "Application.h"
-#include "GUIViewState.h"
+#include "view/GUIViewState.h"
#include "Platinum.h"
#include "video/VideoThumbLoader.h"
#include "music/Artist.h"
2  xbmc/peripherals/dialogs/GUIDialogPeripheralManager.h
View
@@ -20,7 +20,7 @@
*/
#include "guilib/GUIDialog.h"
-#include "GUIViewControl.h"
+#include "view/GUIViewControl.h"
namespace PERIPHERALS
{
2  xbmc/pictures/GUIViewStatePictures.cpp
View
@@ -20,7 +20,7 @@
#include "GUIViewStatePictures.h"
#include "FileItem.h"
-#include "ViewState.h"
+#include "view/ViewState.h"
#include "settings/GUISettings.h"
#include "settings/AdvancedSettings.h"
#include "settings/Settings.h"
2  xbmc/pictures/GUIViewStatePictures.h
View
@@ -20,7 +20,7 @@
*
*/
-#include "GUIViewState.h"
+#include "view/GUIViewState.h"
class CGUIViewStateWindowPictures : public CGUIViewState
{
2  xbmc/programs/GUIViewStatePrograms.cpp
View
@@ -20,7 +20,7 @@
#include "GUIViewStatePrograms.h"
#include "FileItem.h"
-#include "ViewState.h"
+#include "view/ViewState.h"
#include "settings/GUISettings.h"
#include "settings/Settings.h"
#include "filesystem/Directory.h"
2  xbmc/programs/GUIViewStatePrograms.h
View
@@ -20,7 +20,7 @@
*
*/
-#include "GUIViewState.h"
+#include "view/GUIViewState.h"
class CGUIViewStateWindowPrograms : public CGUIViewState
{
2  xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h
View
@@ -21,7 +21,7 @@
#include "guilib/GUIDialog.h"
#include "dialogs/GUIDialogContextMenu.h"
-#include "GUIViewControl.h"
+#include "view/GUIViewControl.h"
#include "../channels/PVRChannelGroup.h"
namespace PVR
2  xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
View
@@ -27,7 +27,7 @@
#include "dialogs/GUIDialogKaiToast.h"
#include "dialogs/GUIDialogOK.h"
#include "GUIDialogPVRGuideInfo.h"
-#include "ViewState.h"
+#include "view/ViewState.h"
#include "settings/GUISettings.h"
#include "GUIInfoManager.h"
2  xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.h
View
@@ -20,7 +20,7 @@
*/
#include "guilib/GUIDialog.h"
-#include "GUIViewControl.h"
+#include "view/GUIViewControl.h"
#include "utils/Observer.h"
#include "pvr/channels/PVRChannelGroupsContainer.h"
#include <map>
2  xbmc/pvr/dialogs/GUIDialogPVRGroupManager.h
View
@@ -20,7 +20,7 @@
*/
#include "guilib/GUIDialog.h"
-#include "GUIViewControl.h"
+#include "view/GUIViewControl.h"
#include "../channels/PVRChannelGroup.h"
class CFileItemList;
2  xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp
View
@@ -23,7 +23,7 @@
#include "FileItem.h"
#include "GUIDialogPVRGuideInfo.h"
#include "guilib/GUIWindowManager.h"
-#include "ViewState.h"
+#include "view/ViewState.h"
#include "epg/Epg.h"
#include "pvr/PVRManager.h"
2  xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.h
View
@@ -20,7 +20,7 @@
*/
#include "guilib/GUIDialog.h"
-#include "GUIViewControl.h"
+#include "view/GUIViewControl.h"
class CFileItemList;
2  xbmc/pvr/windows/GUIViewStatePVR.h
View
@@ -20,7 +20,7 @@
*
*/
-#include "GUIViewState.h"
+#include "view/GUIViewState.h"
#include "GUIWindowPVRCommon.h"
namespace PVR
2  xbmc/settings/GUIWindowSettingsCategory.cpp
View
@@ -34,7 +34,7 @@
#include "utils/Weather.h"
#include "music/MusicDatabase.h"
#include "video/VideoDatabase.h"
-#include "ViewDatabase.h"
+#include "view/ViewDatabase.h"
#ifdef HAS_LCD
#include "utils/LCDFactory.h"
#endif
2  xbmc/settings/Settings.h
View
@@ -45,7 +45,7 @@
#include "settings/VideoSettings.h"
#include "Profile.h"
-#include "ViewState.h"
+#include "view/ViewState.h"
#include "guilib/Resolution.h"
#include "guilib/GraphicContext.h"
2  xbmc/video/GUIViewStateVideo.h
View
@@ -20,7 +20,7 @@
*
*/
-#include "GUIViewState.h"
+#include "view/GUIViewState.h"
class CGUIViewStateWindowVideo : public CGUIViewState
{
2  xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
View
@@ -28,7 +28,7 @@
#endif
#include "pictures/Picture.h"
#include "dialogs/GUIDialogContextMenu.h"
-#include "ViewState.h"
+#include "view/ViewState.h"
#include "settings/Settings.h"
#include "settings/AdvancedSettings.h"
#include "FileItem.h"
2  xbmc/video/dialogs/GUIDialogVideoBookmarks.h
View
@@ -21,7 +21,7 @@
*/
#include "guilib/GUIDialog.h"
-#include "GUIViewControl.h"
+#include "view/GUIViewControl.h"
#include "video/VideoDatabase.h"
class CFileItemList;
0  xbmc/GUIViewControl.cpp → xbmc/view/GUIViewControl.cpp
View
File renamed without changes
2  xbmc/GUIViewControl.h → xbmc/view/GUIViewControl.h
View
@@ -20,7 +20,7 @@
*
*/
-#include "GUIViewState.h"
+#include "view/GUIViewState.h"
#include "guilib/GUIBaseContainer.h"
4 xbmc/GUIViewState.cpp → xbmc/view/GUIViewState.cpp
View
@@ -18,7 +18,7 @@
*
*/
-#include "GUIViewState.h"
+#include "view/GUIViewState.h"
#include "pvr/windows/GUIViewStatePVR.h"
#include "addons/GUIViewStateAddonBrowser.h"
#include "music/GUIViewStateMusic.h"
@@ -35,7 +35,7 @@
#include "addons/Addon.h"
#include "addons/AddonManager.h"
#include "addons/PluginSource.h"
-#include "ViewState.h"
+#include "view/ViewState.h"
#include "settings/GUISettings.h"
#include "settings/AdvancedSettings.h"
#include "settings/Settings.h"
0  xbmc/GUIViewState.h → xbmc/view/GUIViewState.h
View
File renamed without changes
8 xbmc/view/Makefile
View
@@ -0,0 +1,8 @@
+SRCS=GUIViewControl.cpp \
+ GUIViewState.cpp \
+ ViewDatabase.cpp \
+
+LIB=view.a
+
+include ../../Makefile.include
+-include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))
2  xbmc/ViewDatabase.cpp → xbmc/view/ViewDatabase.cpp
View
@@ -21,7 +21,7 @@
#include "ViewDatabase.h"
#include "utils/URIUtils.h"
#include "settings/Settings.h"
-#include "ViewState.h"
+#include "view/ViewState.h"
#include "utils/log.h"
#ifdef _LINUX
#include "linux/ConvUtils.h" // GetLastError()
0  xbmc/ViewDatabase.h → xbmc/view/ViewDatabase.h
View
File renamed without changes
0  xbmc/ViewState.h → xbmc/view/ViewState.h
View
File renamed without changes
2  xbmc/windows/GUIMediaWindow.h
View
@@ -23,7 +23,7 @@
#include "guilib/GUIWindow.h"
#include "filesystem/VirtualDirectory.h"
#include "filesystem/DirectoryHistory.h"
-#include "GUIViewControl.h"
+#include "view/GUIViewControl.h"
#include "dialogs/GUIDialogContextMenu.h"
#include "playlists/SmartPlayList.h"
2  xbmc/windows/GUIWindowLoginScreen.h
View
@@ -21,7 +21,7 @@
*/
#include "guilib/GUIDialog.h"
-#include "GUIViewControl.h"
+#include "view/GUIViewControl.h"
#include "utils/Stopwatch.h"
class CFileItemList;
Please sign in to comment.
Something went wrong with that request. Please try again.