move view related files into new view folder and lib

36 files changed, 39 insertions, 33 deletions

diff --git a/Makefile.in b/Makefile.in
index d4fb12fb8b..b3dd4dff76 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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 \
diff --git a/xbmc/DatabaseManager.cpp b/xbmc/DatabaseManager.cpp
index 02dd464feb..6f7c5798b3 100644
--- a/xbmc/DatabaseManager.cpp
+++ b/xbmc/DatabaseManager.cpp
@@ -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"
diff --git a/xbmc/Makefile.in b/xbmc/Makefile.in
index ebae796c29..741354beac 100644
--- a/xbmc/Makefile.in
+++ b/xbmc/Makefile.in
@@ -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 \
diff --git a/xbmc/addons/GUIViewStateAddonBrowser.cpp b/xbmc/addons/GUIViewStateAddonBrowser.cpp
index 7132eb5552..6a938b5827 100644
--- a/xbmc/addons/GUIViewStateAddonBrowser.cpp
+++ b/xbmc/addons/GUIViewStateAddonBrowser.cpp
@@ -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"
diff --git a/xbmc/addons/GUIViewStateAddonBrowser.h b/xbmc/addons/GUIViewStateAddonBrowser.h
index d73d563bc0..1b14d959c3 100644
--- a/xbmc/addons/GUIViewStateAddonBrowser.h
+++ b/xbmc/addons/GUIViewStateAddonBrowser.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include "GUIViewState.h"
+#include "view/GUIViewState.h"
 
 class CGUIViewStateAddonBrowser : public CGUIViewState
 {
diff --git a/xbmc/dialogs/GUIDialogFileBrowser.h b/xbmc/dialogs/GUIDialogFileBrowser.h
index 22d16ffba1..0ea03aabfa 100644
--- a/xbmc/dialogs/GUIDialogFileBrowser.h
+++ b/xbmc/dialogs/GUIDialogFileBrowser.h
@@ -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;
diff --git a/xbmc/dialogs/GUIDialogSelect.h b/xbmc/dialogs/GUIDialogSelect.h
index 120a8009ae..2122c88731 100644
--- a/xbmc/dialogs/GUIDialogSelect.h
+++ b/xbmc/dialogs/GUIDialogSelect.h
@@ -22,7 +22,7 @@
 
 #include "GUIDialogBoxBase.h"
 #include "guilib/GUIListItem.h"
-#include "GUIViewControl.h"
+#include "view/GUIViewControl.h"
 
 class CFileItem;
 class CFileItemList;
diff --git a/xbmc/music/GUIViewStateMusic.h b/xbmc/music/GUIViewStateMusic.h
index 4b5618c80c..68c83b2d58 100644
--- a/xbmc/music/GUIViewStateMusic.h
+++ b/xbmc/music/GUIViewStateMusic.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include "GUIViewState.h"
+#include "view/GUIViewState.h"
 
 class CGUIViewStateWindowMusic : public CGUIViewState
 {
diff --git a/xbmc/network/upnp/UPnPServer.cpp b/xbmc/network/upnp/UPnPServer.cpp
index c47c8eb8b3..a21cd237be 100644
--- a/xbmc/network/upnp/UPnPServer.cpp
+++ b/xbmc/network/upnp/UPnPServer.cpp
@@ -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"
diff --git a/xbmc/peripherals/dialogs/GUIDialogPeripheralManager.h b/xbmc/peripherals/dialogs/GUIDialogPeripheralManager.h
index 9ed3c3e1bb..8ac43a719c 100644
--- a/xbmc/peripherals/dialogs/GUIDialogPeripheralManager.h
+++ b/xbmc/peripherals/dialogs/GUIDialogPeripheralManager.h
@@ -20,7 +20,7 @@
  */
 
 #include "guilib/GUIDialog.h"
-#include "GUIViewControl.h"
+#include "view/GUIViewControl.h"
 
 namespace PERIPHERALS
 {
diff --git a/xbmc/pictures/GUIViewStatePictures.cpp b/xbmc/pictures/GUIViewStatePictures.cpp
index e309f04145..d26bf61880 100644
--- a/xbmc/pictures/GUIViewStatePictures.cpp
+++ b/xbmc/pictures/GUIViewStatePictures.cpp
@@ -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"
diff --git a/xbmc/pictures/GUIViewStatePictures.h b/xbmc/pictures/GUIViewStatePictures.h
index a514116e78..5369d23721 100644
--- a/xbmc/pictures/GUIViewStatePictures.h
+++ b/xbmc/pictures/GUIViewStatePictures.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include "GUIViewState.h"
+#include "view/GUIViewState.h"
 
 class CGUIViewStateWindowPictures : public CGUIViewState
 {
diff --git a/xbmc/programs/GUIViewStatePrograms.cpp b/xbmc/programs/GUIViewStatePrograms.cpp
index 12df81d8bc..d779ee8836 100644
--- a/xbmc/programs/GUIViewStatePrograms.cpp
+++ b/xbmc/programs/GUIViewStatePrograms.cpp
@@ -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"
diff --git a/xbmc/programs/GUIViewStatePrograms.h b/xbmc/programs/GUIViewStatePrograms.h
index 1b5f576cf0..564cf9d670 100644
--- a/xbmc/programs/GUIViewStatePrograms.h
+++ b/xbmc/programs/GUIViewStatePrograms.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include "GUIViewState.h"
+#include "view/GUIViewState.h"
 
 class CGUIViewStateWindowPrograms : public CGUIViewState
 {
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h
index 60e9626835..9d66c8708a 100644
--- a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h
+++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h
@@ -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
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
index 576ffd59a6..b448cd4ae6 100644
--- a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
+++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
@@ -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"
 
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.h b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.h
index ecf574eaef..f6475b0152 100644
--- a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.h
+++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.h
@@ -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>
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.h b/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.h
index b266e0c065..e2399819b3 100644
--- a/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.h
+++ b/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.h
@@ -20,7 +20,7 @@
  */
 
 #include "guilib/GUIDialog.h"
-#include "GUIViewControl.h"
+#include "view/GUIViewControl.h"
 #include "../channels/PVRChannelGroup.h"
 
 class CFileItemList;
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp
index b9cba6151e..d4d95f8976 100644
--- a/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp
+++ b/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp
@@ -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"
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.h b/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.h
index 8e75c20db4..535e3a20f7 100644
--- a/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.h
+++ b/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.h
@@ -20,7 +20,7 @@
  */
 
 #include "guilib/GUIDialog.h"
-#include "GUIViewControl.h"
+#include "view/GUIViewControl.h"
 
 class CFileItemList;
 
diff --git a/xbmc/pvr/windows/GUIViewStatePVR.h b/xbmc/pvr/windows/GUIViewStatePVR.h
index 3d37882d1b..cb84613fed 100644
--- a/xbmc/pvr/windows/GUIViewStatePVR.h
+++ b/xbmc/pvr/windows/GUIViewStatePVR.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include "GUIViewState.h"
+#include "view/GUIViewState.h"
 #include "GUIWindowPVRCommon.h"
 
 namespace PVR
diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp
index 80118b6dbd..cd446ed1ab 100644
--- a/xbmc/settings/GUIWindowSettingsCategory.cpp
+++ b/xbmc/settings/GUIWindowSettingsCategory.cpp
@@ -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
diff --git a/xbmc/settings/Settings.h b/xbmc/settings/Settings.h
index e86ca2c75a..3d225e3adf 100644
--- a/xbmc/settings/Settings.h
+++ b/xbmc/settings/Settings.h
@@ -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"
 
diff --git a/xbmc/video/GUIViewStateVideo.h b/xbmc/video/GUIViewStateVideo.h
index 4dd12f8c35..ed03442b42 100644
--- a/xbmc/video/GUIViewStateVideo.h
+++ b/xbmc/video/GUIViewStateVideo.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include "GUIViewState.h"
+#include "view/GUIViewState.h"
 
 class CGUIViewStateWindowVideo : public CGUIViewState
 {
diff --git a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
index e173ad0591..349e1d754b 100644
--- a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
+++ b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp
@@ -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"
diff --git a/xbmc/video/dialogs/GUIDialogVideoBookmarks.h b/xbmc/video/dialogs/GUIDialogVideoBookmarks.h
index a62fae3f86..b1971cc584 100644
--- a/xbmc/video/dialogs/GUIDialogVideoBookmarks.h
+++ b/xbmc/video/dialogs/GUIDialogVideoBookmarks.h
@@ -21,7 +21,7 @@
  */
 
 #include "guilib/GUIDialog.h"
-#include "GUIViewControl.h"
+#include "view/GUIViewControl.h"
 #include "video/VideoDatabase.h"
 
 class CFileItemList;
diff --git a/xbmc/GUIViewControl.cpp b/xbmc/view/GUIViewControl.cpp
index de08fc038e..de08fc038e 100644
--- a/xbmc/GUIViewControl.cpp
+++ b/xbmc/view/GUIViewControl.cpp
diff --git a/xbmc/GUIViewControl.h b/xbmc/view/GUIViewControl.h
index ff0d836e99..a69edb0fc3 100644
--- a/xbmc/GUIViewControl.h
+++ b/xbmc/view/GUIViewControl.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include "GUIViewState.h"
+#include "view/GUIViewState.h"
 
 #include "guilib/GUIBaseContainer.h"
 
diff --git a/xbmc/GUIViewState.cpp b/xbmc/view/GUIViewState.cpp
index 4d54585050..5fb899f523 100644
--- a/xbmc/GUIViewState.cpp
+++ b/xbmc/view/GUIViewState.cpp
@@ -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"
diff --git a/xbmc/GUIViewState.h b/xbmc/view/GUIViewState.h
index 15be10082d..15be10082d 100644
--- a/xbmc/GUIViewState.h
+++ b/xbmc/view/GUIViewState.h
diff --git a/xbmc/view/Makefile b/xbmc/view/Makefile
new file mode 100644
index 0000000000..2afefa4689
--- /dev/null
+++ b/xbmc/view/Makefile
@@ -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)))
\ No newline at end of file
diff --git a/xbmc/ViewDatabase.cpp b/xbmc/view/ViewDatabase.cpp
index 494d24ef69..661a5a5a94 100644
--- a/xbmc/ViewDatabase.cpp
+++ b/xbmc/view/ViewDatabase.cpp
@@ -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()
diff --git a/xbmc/ViewDatabase.h b/xbmc/view/ViewDatabase.h
index a34323dc01..a34323dc01 100644
--- a/xbmc/ViewDatabase.h
+++ b/xbmc/view/ViewDatabase.h
diff --git a/xbmc/ViewState.h b/xbmc/view/ViewState.h
index bd24c8c17c..bd24c8c17c 100644
--- a/xbmc/ViewState.h
+++ b/xbmc/view/ViewState.h
diff --git a/xbmc/windows/GUIMediaWindow.h b/xbmc/windows/GUIMediaWindow.h
index aa1ae3dbde..39db0dfc8d 100644
--- a/xbmc/windows/GUIMediaWindow.h
+++ b/xbmc/windows/GUIMediaWindow.h
@@ -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"
 
diff --git a/xbmc/windows/GUIWindowLoginScreen.h b/xbmc/windows/GUIWindowLoginScreen.h
index ffe79bcda2..f81141ab5e 100644
--- a/xbmc/windows/GUIWindowLoginScreen.h
+++ b/xbmc/windows/GUIWindowLoginScreen.h
@@ -21,7 +21,7 @@
  */
 
 #include "guilib/GUIDialog.h"
-#include "GUIViewControl.h"
+#include "view/GUIViewControl.h"
 #include "utils/Stopwatch.h"
 
 class CFileItemList;