diff options
43 files changed, 168 insertions, 110 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-ATV2.xcodeproj/project.pbxproj b/XBMC-ATV2.xcodeproj/project.pbxproj index b9e7caa400..598df5d5d2 100644 --- a/XBMC-ATV2.xcodeproj/project.pbxproj +++ b/XBMC-ATV2.xcodeproj/project.pbxproj @@ -131,6 +131,9 @@ DF527783151BAFD600B5B63B /* WebSocketV8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF52777D151BAFD600B5B63B /* WebSocketV8.cpp */; }; DF527788151BAFEE00B5B63B /* Base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF527784151BAFEE00B5B63B /* Base64.cpp */; }; DF527789151BAFEE00B5B63B /* HttpResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF527786151BAFEE00B5B63B /* HttpResponse.cpp */; }; + DF64FE6C16C07B2C00D028FB /* GUIViewControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF64FE6416C07B2C00D028FB /* GUIViewControl.cpp */; }; + DF64FE6D16C07B2C00D028FB /* GUIViewState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF64FE6616C07B2C00D028FB /* GUIViewState.cpp */; }; + DF64FE6F16C07B2C00D028FB /* ViewDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF64FE6916C07B2C00D028FB /* ViewDatabase.cpp */; }; DF830D4815BB2CFC00602BE6 /* GUIKeyboardFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF830D4515BB2CFC00602BE6 /* GUIKeyboardFactory.cpp */; }; DF830D4B15BB2D2300602BE6 /* GUIDialogKeyboardGeneric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF830D4915BB2D2300602BE6 /* GUIDialogKeyboardGeneric.cpp */; }; DF91D899161B759B004E6637 /* AddonsOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF91D897161B759B004E6637 /* AddonsOperations.cpp */; }; @@ -876,8 +879,6 @@ F56C7B76131EC155000AD0F6 /* GUIInfoManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77E2131EC154000AD0F6 /* GUIInfoManager.cpp */; }; F56C7B77131EC155000AD0F6 /* GUILargeTextureManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77E4131EC154000AD0F6 /* GUILargeTextureManager.cpp */; }; F56C7B78131EC155000AD0F6 /* GUIPassword.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77E6131EC154000AD0F6 /* GUIPassword.cpp */; }; - F56C7B79131EC155000AD0F6 /* GUIViewControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77E9131EC154000AD0F6 /* GUIViewControl.cpp */; }; - F56C7B7A131EC155000AD0F6 /* GUIViewState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77EB131EC154000AD0F6 /* GUIViewState.cpp */; }; F56C7B7B131EC155000AD0F6 /* LangInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77EE131EC154000AD0F6 /* LangInfo.cpp */; }; F56C7B7C131EC155000AD0F6 /* MediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77F0131EC154000AD0F6 /* MediaSource.cpp */; }; F56C7B7D131EC155000AD0F6 /* NfoFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C77F2131EC154000AD0F6 /* NfoFile.cpp */; }; @@ -892,7 +893,6 @@ F56C7B87131EC155000AD0F6 /* ThumbnailCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7806131EC154000AD0F6 /* ThumbnailCache.cpp */; }; F56C7B88131EC155000AD0F6 /* URL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7808131EC154000AD0F6 /* URL.cpp */; }; F56C7B89131EC155000AD0F6 /* Util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C780A131EC154000AD0F6 /* Util.cpp */; }; - F56C7B8A131EC155000AD0F6 /* ViewDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C780C131EC154000AD0F6 /* ViewDatabase.cpp */; }; F56C7B8B131EC155000AD0F6 /* XBApplicationEx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C780E131EC154000AD0F6 /* XBApplicationEx.cpp */; }; F56C7B9B131EC1B4000AD0F6 /* AutoPool.mm in Sources */ = {isa = PBXBuildFile; fileRef = F56C7B9A131EC1B4000AD0F6 /* AutoPool.mm */; }; F56C7BC9131EC2DB000AD0F6 /* XBMCAppliance.m in Sources */ = {isa = PBXBuildFile; fileRef = F56C7BC2131EC2DB000AD0F6 /* XBMCAppliance.m */; }; @@ -1336,6 +1336,13 @@ DF527785151BAFEE00B5B63B /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; }; DF527786151BAFEE00B5B63B /* HttpResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HttpResponse.cpp; sourceTree = "<group>"; }; DF527787151BAFEE00B5B63B /* HttpResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpResponse.h; sourceTree = "<group>"; }; + DF64FE6416C07B2C00D028FB /* GUIViewControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIViewControl.cpp; sourceTree = "<group>"; }; + DF64FE6516C07B2C00D028FB /* GUIViewControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIViewControl.h; sourceTree = "<group>"; }; + DF64FE6616C07B2C00D028FB /* GUIViewState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIViewState.cpp; sourceTree = "<group>"; }; + DF64FE6716C07B2C00D028FB /* GUIViewState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIViewState.h; sourceTree = "<group>"; }; + DF64FE6916C07B2C00D028FB /* ViewDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewDatabase.cpp; sourceTree = "<group>"; }; + DF64FE6A16C07B2C00D028FB /* ViewDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewDatabase.h; sourceTree = "<group>"; }; + DF64FE6B16C07B2C00D028FB /* ViewState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewState.h; sourceTree = "<group>"; }; DF830D4415BB2CFC00602BE6 /* GUIKeyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIKeyboard.h; sourceTree = "<group>"; }; DF830D4515BB2CFC00602BE6 /* GUIKeyboardFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIKeyboardFactory.cpp; sourceTree = "<group>"; }; DF830D4615BB2CFC00602BE6 /* GUIKeyboardFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIKeyboardFactory.h; sourceTree = "<group>"; }; @@ -2902,7 +2909,6 @@ F56C77CA131EC154000AD0F6 /* GUIWindowWeather.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowWeather.h; sourceTree = "<group>"; }; F56C77CB131EC154000AD0F6 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; }; F56C77CC131EC154000AD0F6 /* SystemGlobals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SystemGlobals.cpp; sourceTree = "<group>"; }; - F56C77CD131EC154000AD0F6 /* ViewState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewState.h; sourceTree = "<group>"; }; F56C77CE131EC154000AD0F6 /* Application.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Application.cpp; sourceTree = "<group>"; }; F56C77CF131EC154000AD0F6 /* Application.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Application.h; sourceTree = "<group>"; }; F56C77D0131EC154000AD0F6 /* ApplicationMessenger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ApplicationMessenger.cpp; sourceTree = "<group>"; }; @@ -2930,10 +2936,6 @@ F56C77E6131EC154000AD0F6 /* GUIPassword.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIPassword.cpp; sourceTree = "<group>"; }; F56C77E7131EC154000AD0F6 /* GUIPassword.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIPassword.h; sourceTree = "<group>"; }; F56C77E8131EC154000AD0F6 /* GUIUserMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIUserMessages.h; sourceTree = "<group>"; }; - F56C77E9131EC154000AD0F6 /* GUIViewControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIViewControl.cpp; sourceTree = "<group>"; }; - F56C77EA131EC154000AD0F6 /* GUIViewControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIViewControl.h; sourceTree = "<group>"; }; - F56C77EB131EC154000AD0F6 /* GUIViewState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIViewState.cpp; sourceTree = "<group>"; }; - F56C77EC131EC154000AD0F6 /* GUIViewState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIViewState.h; sourceTree = "<group>"; }; F56C77ED131EC154000AD0F6 /* IProgressCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IProgressCallback.h; sourceTree = "<group>"; }; F56C77EE131EC154000AD0F6 /* LangInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LangInfo.cpp; sourceTree = "<group>"; }; F56C77EF131EC154000AD0F6 /* LangInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LangInfo.h; sourceTree = "<group>"; }; @@ -2964,8 +2966,6 @@ F56C7809131EC154000AD0F6 /* URL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = URL.h; sourceTree = "<group>"; }; F56C780A131EC154000AD0F6 /* Util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Util.cpp; sourceTree = "<group>"; }; F56C780B131EC154000AD0F6 /* Util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Util.h; sourceTree = "<group>"; }; - F56C780C131EC154000AD0F6 /* ViewDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewDatabase.cpp; sourceTree = "<group>"; }; - F56C780D131EC154000AD0F6 /* ViewDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewDatabase.h; sourceTree = "<group>"; }; F56C780E131EC154000AD0F6 /* XBApplicationEx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBApplicationEx.cpp; sourceTree = "<group>"; }; F56C780F131EC154000AD0F6 /* XBApplicationEx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBApplicationEx.h; sourceTree = "<group>"; }; F56C7B99131EC1B4000AD0F6 /* AutoPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoPool.h; sourceTree = "<group>"; }; @@ -3595,6 +3595,20 @@ path = websocket; sourceTree = "<group>"; }; + DF64FE6316C07B2C00D028FB /* view */ = { + isa = PBXGroup; + children = ( + DF64FE6416C07B2C00D028FB /* GUIViewControl.cpp */, + DF64FE6516C07B2C00D028FB /* GUIViewControl.h */, + DF64FE6616C07B2C00D028FB /* GUIViewState.cpp */, + DF64FE6716C07B2C00D028FB /* GUIViewState.h */, + DF64FE6916C07B2C00D028FB /* ViewDatabase.cpp */, + DF64FE6A16C07B2C00D028FB /* ViewDatabase.h */, + DF64FE6B16C07B2C00D028FB /* ViewState.h */, + ); + path = view; + sourceTree = "<group>"; + }; DFB6628A15376810006B8FF1 /* AudioEngine */ = { isa = PBXGroup; children = ( @@ -4009,6 +4023,7 @@ F56C76F4131EC153000AD0F6 /* threads */, F56C770B131EC153000AD0F6 /* utils */, F56C7779131EC154000AD0F6 /* video */, + DF64FE6316C07B2C00D028FB /* view */, F56C77AB131EC154000AD0F6 /* windowing */, F56C77B8131EC154000AD0F6 /* windows */, F56C77CE131EC154000AD0F6 /* Application.cpp */, @@ -4041,10 +4056,6 @@ F56C77E6131EC154000AD0F6 /* GUIPassword.cpp */, F56C77E7131EC154000AD0F6 /* GUIPassword.h */, F56C77E8131EC154000AD0F6 /* GUIUserMessages.h */, - F56C77E9131EC154000AD0F6 /* GUIViewControl.cpp */, - F56C77EA131EC154000AD0F6 /* GUIViewControl.h */, - F56C77EB131EC154000AD0F6 /* GUIViewState.cpp */, - F56C77EC131EC154000AD0F6 /* GUIViewState.h */, F56C77ED131EC154000AD0F6 /* IProgressCallback.h */, F56C77EE131EC154000AD0F6 /* LangInfo.cpp */, F56C77EF131EC154000AD0F6 /* LangInfo.h */, @@ -4078,9 +4089,6 @@ F56C7809131EC154000AD0F6 /* URL.h */, F56C780A131EC154000AD0F6 /* Util.cpp */, F56C780B131EC154000AD0F6 /* Util.h */, - F56C780C131EC154000AD0F6 /* ViewDatabase.cpp */, - F56C780D131EC154000AD0F6 /* ViewDatabase.h */, - F56C77CD131EC154000AD0F6 /* ViewState.h */, F56C780E131EC154000AD0F6 /* XBApplicationEx.cpp */, F56C780F131EC154000AD0F6 /* XBApplicationEx.h */, F56C77DA131EC154000AD0F6 /* XBDateTime.cpp */, @@ -7295,8 +7303,6 @@ F56C7B76131EC155000AD0F6 /* GUIInfoManager.cpp in Sources */, F56C7B77131EC155000AD0F6 /* GUILargeTextureManager.cpp in Sources */, F56C7B78131EC155000AD0F6 /* GUIPassword.cpp in Sources */, - F56C7B79131EC155000AD0F6 /* GUIViewControl.cpp in Sources */, - F56C7B7A131EC155000AD0F6 /* GUIViewState.cpp in Sources */, F56C7B7B131EC155000AD0F6 /* LangInfo.cpp in Sources */, F56C7B7C131EC155000AD0F6 /* MediaSource.cpp in Sources */, F56C7B7D131EC155000AD0F6 /* NfoFile.cpp in Sources */, @@ -7311,7 +7317,6 @@ F56C7B87131EC155000AD0F6 /* ThumbnailCache.cpp in Sources */, F56C7B88131EC155000AD0F6 /* URL.cpp in Sources */, F56C7B89131EC155000AD0F6 /* Util.cpp in Sources */, - F56C7B8A131EC155000AD0F6 /* ViewDatabase.cpp in Sources */, F56C7B8B131EC155000AD0F6 /* XBApplicationEx.cpp in Sources */, F56C7B9B131EC1B4000AD0F6 /* AutoPool.mm in Sources */, F56C7BC9131EC2DB000AD0F6 /* XBMCAppliance.m in Sources */, @@ -7673,6 +7678,9 @@ DF07255216873553008DCAAD /* karaokevideobackground.cpp in Sources */, DF07255516873565008DCAAD /* FFmpegVideoDecoder.cpp in Sources */, 5500731516A75A2700097786 /* UPnPPlayer.cpp in Sources */, + DF64FE6C16C07B2C00D028FB /* GUIViewControl.cpp in Sources */, + DF64FE6D16C07B2C00D028FB /* GUIViewState.cpp in Sources */, + DF64FE6F16C07B2C00D028FB /* ViewDatabase.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/XBMC-IOS.xcodeproj/project.pbxproj b/XBMC-IOS.xcodeproj/project.pbxproj index e571209529..79d1904b36 100644 --- a/XBMC-IOS.xcodeproj/project.pbxproj +++ b/XBMC-IOS.xcodeproj/project.pbxproj @@ -132,6 +132,9 @@ DF52775A151BAF8200B5B63B /* WebSocketV8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF527754151BAF8200B5B63B /* WebSocketV8.cpp */; }; DF527760151BAFA000B5B63B /* Base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF52775C151BAFA000B5B63B /* Base64.cpp */; }; DF527761151BAFA000B5B63B /* HttpResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF52775E151BAFA000B5B63B /* HttpResponse.cpp */; }; + DF64FE5616C07AF700D028FB /* GUIViewControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF64FE4E16C07AF700D028FB /* GUIViewControl.cpp */; }; + DF64FE5716C07AF700D028FB /* GUIViewState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF64FE5016C07AF700D028FB /* GUIViewState.cpp */; }; + DF64FE5916C07AF700D028FB /* ViewDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF64FE5316C07AF700D028FB /* ViewDatabase.cpp */; }; DF830C9515BB20FC00602BE6 /* GUIDialogKeyboardGeneric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF830C9315BB20FC00602BE6 /* GUIDialogKeyboardGeneric.cpp */; }; DF830C9E15BB215500602BE6 /* GUIKeyboardFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF830C9C15BB215500602BE6 /* GUIKeyboardFactory.cpp */; }; DF91D88A161B7581004E6637 /* AddonsOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF91D888161B7581004E6637 /* AddonsOperations.cpp */; }; @@ -966,8 +969,6 @@ F56C8B64131F42ED000AD0F6 /* GUIInfoManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87CF131F42ED000AD0F6 /* GUIInfoManager.cpp */; }; F56C8B65131F42ED000AD0F6 /* GUILargeTextureManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87D1131F42ED000AD0F6 /* GUILargeTextureManager.cpp */; }; F56C8B66131F42ED000AD0F6 /* GUIPassword.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87D3131F42ED000AD0F6 /* GUIPassword.cpp */; }; - F56C8B67131F42ED000AD0F6 /* GUIViewControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87D6131F42ED000AD0F6 /* GUIViewControl.cpp */; }; - F56C8B68131F42ED000AD0F6 /* GUIViewState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87D8131F42ED000AD0F6 /* GUIViewState.cpp */; }; F56C8B69131F42ED000AD0F6 /* LangInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87DB131F42ED000AD0F6 /* LangInfo.cpp */; }; F56C8B6A131F42ED000AD0F6 /* MediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87DD131F42ED000AD0F6 /* MediaSource.cpp */; }; F56C8B6B131F42ED000AD0F6 /* NfoFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87DF131F42ED000AD0F6 /* NfoFile.cpp */; }; @@ -982,7 +983,6 @@ F56C8B75131F42ED000AD0F6 /* ThumbnailCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87F3131F42ED000AD0F6 /* ThumbnailCache.cpp */; }; F56C8B76131F42ED000AD0F6 /* URL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87F5131F42ED000AD0F6 /* URL.cpp */; }; F56C8B77131F42ED000AD0F6 /* Util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87F7131F42ED000AD0F6 /* Util.cpp */; }; - F56C8B78131F42ED000AD0F6 /* ViewDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87F9131F42ED000AD0F6 /* ViewDatabase.cpp */; }; F56C8B79131F42ED000AD0F6 /* XBApplicationEx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C87FB131F42ED000AD0F6 /* XBApplicationEx.cpp */; }; F56C8BA8131F4466000AD0F6 /* XBMC.png in Resources */ = {isa = PBXBuildFile; fileRef = F56C8B9E131F4466000AD0F6 /* XBMC.png */; }; F56C8BA9131F4466000AD0F6 /* XBMCApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = F56C8BA0131F4466000AD0F6 /* XBMCApplication.m */; }; @@ -1340,6 +1340,13 @@ DF52775D151BAFA000B5B63B /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base64.h; sourceTree = "<group>"; }; DF52775E151BAFA000B5B63B /* HttpResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HttpResponse.cpp; sourceTree = "<group>"; }; DF52775F151BAFA000B5B63B /* HttpResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpResponse.h; sourceTree = "<group>"; }; + DF64FE4E16C07AF700D028FB /* GUIViewControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIViewControl.cpp; sourceTree = "<group>"; }; + DF64FE4F16C07AF700D028FB /* GUIViewControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIViewControl.h; sourceTree = "<group>"; }; + DF64FE5016C07AF700D028FB /* GUIViewState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIViewState.cpp; sourceTree = "<group>"; }; + DF64FE5116C07AF700D028FB /* GUIViewState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIViewState.h; sourceTree = "<group>"; }; + DF64FE5316C07AF700D028FB /* ViewDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewDatabase.cpp; sourceTree = "<group>"; }; + DF64FE5416C07AF700D028FB /* ViewDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewDatabase.h; sourceTree = "<group>"; }; + DF64FE5516C07AF700D028FB /* ViewState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewState.h; sourceTree = "<group>"; }; DF830C9315BB20FC00602BE6 /* GUIDialogKeyboardGeneric.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogKeyboardGeneric.cpp; sourceTree = "<group>"; }; DF830C9415BB20FC00602BE6 /* GUIDialogKeyboardGeneric.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogKeyboardGeneric.h; sourceTree = "<group>"; }; DF830C9C15BB215500602BE6 /* GUIKeyboardFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIKeyboardFactory.cpp; sourceTree = "<group>"; }; @@ -3097,7 +3104,6 @@ F56C87B7131F42EC000AD0F6 /* GUIWindowWeather.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowWeather.h; sourceTree = "<group>"; }; F56C87B8131F42ED000AD0F6 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; }; F56C87B9131F42ED000AD0F6 /* SystemGlobals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SystemGlobals.cpp; sourceTree = "<group>"; }; - F56C87BA131F42ED000AD0F6 /* ViewState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewState.h; sourceTree = "<group>"; }; F56C87BB131F42ED000AD0F6 /* Application.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Application.cpp; sourceTree = "<group>"; }; F56C87BC131F42ED000AD0F6 /* Application.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Application.h; sourceTree = "<group>"; }; F56C87BD131F42ED000AD0F6 /* ApplicationMessenger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ApplicationMessenger.cpp; sourceTree = "<group>"; }; @@ -3125,10 +3131,6 @@ F56C87D3131F42ED000AD0F6 /* GUIPassword.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIPassword.cpp; sourceTree = "<group>"; }; F56C87D4131F42ED000AD0F6 /* GUIPassword.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIPassword.h; sourceTree = "<group>"; }; F56C87D5131F42ED000AD0F6 /* GUIUserMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIUserMessages.h; sourceTree = "<group>"; }; - F56C87D6131F42ED000AD0F6 /* GUIViewControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIViewControl.cpp; sourceTree = "<group>"; }; - F56C87D7131F42ED000AD0F6 /* GUIViewControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIViewControl.h; sourceTree = "<group>"; }; - F56C87D8131F42ED000AD0F6 /* GUIViewState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIViewState.cpp; sourceTree = "<group>"; }; - F56C87D9131F42ED000AD0F6 /* GUIViewState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIViewState.h; sourceTree = "<group>"; }; F56C87DA131F42ED000AD0F6 /* IProgressCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IProgressCallback.h; sourceTree = "<group>"; }; F56C87DB131F42ED000AD0F6 /* LangInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LangInfo.cpp; sourceTree = "<group>"; }; F56C87DC131F42ED000AD0F6 /* LangInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LangInfo.h; sourceTree = "<group>"; }; @@ -3159,8 +3161,6 @@ F56C87F6131F42ED000AD0F6 /* URL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = URL.h; sourceTree = "<group>"; }; F56C87F7131F42ED000AD0F6 /* Util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Util.cpp; sourceTree = "<group>"; }; F56C87F8131F42ED000AD0F6 /* Util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Util.h; sourceTree = "<group>"; }; - F56C87F9131F42ED000AD0F6 /* ViewDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewDatabase.cpp; sourceTree = "<group>"; }; - F56C87FA131F42ED000AD0F6 /* ViewDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewDatabase.h; sourceTree = "<group>"; }; F56C87FB131F42ED000AD0F6 /* XBApplicationEx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBApplicationEx.cpp; sourceTree = "<group>"; }; F56C87FC131F42ED000AD0F6 /* XBApplicationEx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBApplicationEx.h; sourceTree = "<group>"; }; F56C8B9E131F4466000AD0F6 /* XBMC.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = XBMC.png; sourceTree = "<group>"; }; @@ -3599,6 +3599,20 @@ path = websocket; sourceTree = "<group>"; }; + DF64FE4D16C07AF700D028FB /* view */ = { + isa = PBXGroup; + children = ( + DF64FE4E16C07AF700D028FB /* GUIViewControl.cpp */, + DF64FE4F16C07AF700D028FB /* GUIViewControl.h */, + DF64FE5016C07AF700D028FB /* GUIViewState.cpp */, + DF64FE5116C07AF700D028FB /* GUIViewState.h */, + DF64FE5316C07AF700D028FB /* ViewDatabase.cpp */, + DF64FE5416C07AF700D028FB /* ViewDatabase.h */, + DF64FE5516C07AF700D028FB /* ViewState.h */, + ); + path = view; + sourceTree = "<group>"; + }; DFB6620415376791006B8FF1 /* AudioEngine */ = { isa = PBXGroup; children = ( @@ -4365,6 +4379,7 @@ F56C86DF131F42EB000AD0F6 /* threads */, F56C86FA131F42EB000AD0F6 /* utils */, F56C8768131F42EC000AD0F6 /* video */, + DF64FE4D16C07AF700D028FB /* view */, F56C879A131F42EC000AD0F6 /* windowing */, F56C87A5131F42EC000AD0F6 /* windows */, F56C87BB131F42ED000AD0F6 /* Application.cpp */, @@ -4397,10 +4412,6 @@ F56C87D3131F42ED000AD0F6 /* GUIPassword.cpp */, F56C87D4131F42ED000AD0F6 /* GUIPassword.h */, F56C87D5131F42ED000AD0F6 /* GUIUserMessages.h */, - F56C87D6131F42ED000AD0F6 /* GUIViewControl.cpp */, - F56C87D7131F42ED000AD0F6 /* GUIViewControl.h */, - F56C87D8131F42ED000AD0F6 /* GUIViewState.cpp */, - F56C87D9131F42ED000AD0F6 /* GUIViewState.h */, F56C87DA131F42ED000AD0F6 /* IProgressCallback.h */, F56C87DB131F42ED000AD0F6 /* LangInfo.cpp */, F56C87DC131F42ED000AD0F6 /* LangInfo.h */, @@ -4434,9 +4445,6 @@ F56C87F6131F42ED000AD0F6 /* URL.h */, F56C87F7131F42ED000AD0F6 /* Util.cpp */, F56C87F8131F42ED000AD0F6 /* Util.h */, - F56C87F9131F42ED000AD0F6 /* ViewDatabase.cpp */, - F56C87FA131F42ED000AD0F6 /* ViewDatabase.h */, - F56C87BA131F42ED000AD0F6 /* ViewState.h */, F56C87FB131F42ED000AD0F6 /* XBApplicationEx.cpp */, F56C87FC131F42ED000AD0F6 /* XBApplicationEx.h */, F56C87C7131F42ED000AD0F6 /* XBDateTime.cpp */, @@ -7404,8 +7412,6 @@ F56C8B64131F42ED000AD0F6 /* GUIInfoManager.cpp in Sources */, F56C8B65131F42ED000AD0F6 /* GUILargeTextureManager.cpp in Sources */, F56C8B66131F42ED000AD0F6 /* GUIPassword.cpp in Sources */, - F56C8B67131F42ED000AD0F6 /* GUIViewControl.cpp in Sources */, - F56C8B68131F42ED000AD0F6 /* GUIViewState.cpp in Sources */, F56C8B69131F42ED000AD0F6 /* LangInfo.cpp in Sources */, F56C8B6A131F42ED000AD0F6 /* MediaSource.cpp in Sources */, F56C8B6B131F42ED000AD0F6 /* NfoFile.cpp in Sources */, @@ -7420,7 +7426,6 @@ F56C8B75131F42ED000AD0F6 /* ThumbnailCache.cpp in Sources */, F56C8B76131F42ED000AD0F6 /* URL.cpp in Sources */, F56C8B77131F42ED000AD0F6 /* Util.cpp in Sources */, - F56C8B78131F42ED000AD0F6 /* ViewDatabase.cpp in Sources */, F56C8B79131F42ED000AD0F6 /* XBApplicationEx.cpp in Sources */, F56C8BA9131F4466000AD0F6 /* XBMCApplication.m in Sources */, F56C8BAA131F4466000AD0F6 /* XBMCController.mm in Sources */, @@ -7698,6 +7703,9 @@ DF07254116873517008DCAAD /* karaokevideobackground.cpp in Sources */, DF0725441687352C008DCAAD /* FFmpegVideoDecoder.cpp in Sources */, 5500730E16A759D800097786 /* UPnPPlayer.cpp in Sources */, + DF64FE5616C07AF700D028FB /* GUIViewControl.cpp in Sources */, + DF64FE5716C07AF700D028FB /* GUIViewState.cpp in Sources */, + DF64FE5916C07AF700D028FB /* ViewDatabase.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj index 0fced6e8b1..9e47bddac3 100644 --- a/XBMC.xcodeproj/project.pbxproj +++ b/XBMC.xcodeproj/project.pbxproj @@ -405,6 +405,9 @@ DF527735151BAF4C00B5B63B /* WebSocketManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF52772D151BAF4C00B5B63B /* WebSocketManager.cpp */; }; DF527736151BAF4C00B5B63B /* WebSocketV13.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF52772F151BAF4C00B5B63B /* WebSocketV13.cpp */; }; DF527737151BAF4C00B5B63B /* WebSocketV8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF527731151BAF4C00B5B63B /* WebSocketV8.cpp */; }; + DF64FE3D16C07AAA00D028FB /* GUIViewControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF64FE3516C07AAA00D028FB /* GUIViewControl.cpp */; }; + DF64FE3E16C07AAA00D028FB /* GUIViewState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF64FE3716C07AAA00D028FB /* GUIViewState.cpp */; }; + DF64FE4016C07AAA00D028FB /* ViewDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF64FE3A16C07AAA00D028FB /* ViewDatabase.cpp */; }; DF673AA51443819600A5A509 /* AddonManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B49FF41152BFA5001AF8A6 /* AddonManager.cpp */; }; DF830D0C15BB260C00602BE6 /* GUIDialogKeyboardGeneric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF830D0A15BB260C00602BE6 /* GUIDialogKeyboardGeneric.cpp */; }; DF830D1215BB262700602BE6 /* GUIKeyboardFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF830D0F15BB262700602BE6 /* GUIKeyboardFactory.cpp */; }; @@ -712,8 +715,6 @@ E38E20A40D25F9FD00618676 /* GUILargeTextureManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17EE0D25F9FA00618676 /* GUILargeTextureManager.cpp */; }; E38E20A50D25F9FD00618676 /* GUIMediaWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17F00D25F9FA00618676 /* GUIMediaWindow.cpp */; }; E38E20A60D25F9FD00618676 /* GUIPassword.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17F20D25F9FA00618676 /* GUIPassword.cpp */; }; - E38E20A80D25F9FD00618676 /* GUIViewControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17F70D25F9FA00618676 /* GUIViewControl.cpp */; }; - E38E20A90D25F9FD00618676 /* GUIViewState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17F90D25F9FA00618676 /* GUIViewState.cpp */; }; E38E20AA0D25F9FD00618676 /* GUIViewStateMusic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17FB0D25F9FA00618676 /* GUIViewStateMusic.cpp */; }; E38E20AC0D25F9FD00618676 /* GUIViewStateVideo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17FF0D25F9FA00618676 /* GUIViewStateVideo.cpp */; }; E38E20AE0D25F9FD00618676 /* GUIWindowFileManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E18030D25F9FA00618676 /* GUIWindowFileManager.cpp */; }; @@ -882,7 +883,6 @@ E38E22FB0D25F9FE00618676 /* VideoDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1E930D25F9FD00618676 /* VideoDatabase.cpp */; }; E38E22FC0D25F9FE00618676 /* VideoInfoScanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1E950D25F9FD00618676 /* VideoInfoScanner.cpp */; }; E38E22FD0D25F9FE00618676 /* VideoInfoTag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1E970D25F9FD00618676 /* VideoInfoTag.cpp */; }; - E38E22FE0D25F9FE00618676 /* ViewDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1E990D25F9FD00618676 /* ViewDatabase.cpp */; }; E38E23040D25F9FE00618676 /* XBApplicationEx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1EA70D25F9FD00618676 /* XBApplicationEx.cpp */; }; E38E23150D25F9FE00618676 /* xbmc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1ED10D25F9FD00618676 /* xbmc.cpp */; }; E38E23920D2626E600618676 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E38E238B0D2626E600618676 /* AudioToolbox.framework */; }; @@ -1603,7 +1603,6 @@ 7C779E20104A57E500F444C4 /* RenderSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSystem.h; sourceTree = "<group>"; }; 7C779E21104A57E500F444C4 /* RenderSystemGL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSystemGL.cpp; sourceTree = "<group>"; }; 7C779E22104A57E500F444C4 /* RenderSystemGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSystemGL.h; sourceTree = "<group>"; }; - 7C779E24104A57E500F444C4 /* ViewState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewState.h; sourceTree = "<group>"; }; 7C779E25104A57E500F444C4 /* WindowingFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowingFactory.h; sourceTree = "<group>"; }; 7C779E26104A57E500F444C4 /* WinEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WinEvents.h; sourceTree = "<group>"; }; 7C779E27104A57E500F444C4 /* WinEventsSDL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WinEventsSDL.cpp; sourceTree = "<group>"; }; @@ -1935,6 +1934,13 @@ DF527730151BAF4C00B5B63B /* WebSocketV13.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketV13.h; sourceTree = "<group>"; }; DF527731151BAF4C00B5B63B /* WebSocketV8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSocketV8.cpp; sourceTree = "<group>"; }; DF527732151BAF4C00B5B63B /* WebSocketV8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketV8.h; sourceTree = "<group>"; }; + DF64FE3516C07AAA00D028FB /* GUIViewControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIViewControl.cpp; sourceTree = "<group>"; }; + DF64FE3616C07AAA00D028FB /* GUIViewControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIViewControl.h; sourceTree = "<group>"; }; + DF64FE3716C07AAA00D028FB /* GUIViewState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIViewState.cpp; sourceTree = "<group>"; }; + DF64FE3816C07AAA00D028FB /* GUIViewState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIViewState.h; sourceTree = "<group>"; }; + DF64FE3A16C07AAA00D028FB /* ViewDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewDatabase.cpp; sourceTree = "<group>"; }; + DF64FE3B16C07AAA00D028FB /* ViewDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewDatabase.h; sourceTree = "<group>"; }; + DF64FE3C16C07AAA00D028FB /* ViewState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewState.h; sourceTree = "<group>"; }; DF830D0A15BB260C00602BE6 /* GUIDialogKeyboardGeneric.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogKeyboardGeneric.cpp; sourceTree = "<group>"; }; DF830D0B15BB260C00602BE6 /* GUIDialogKeyboardGeneric.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogKeyboardGeneric.h; sourceTree = "<group>"; }; DF830D0E15BB262700602BE6 /* GUIKeyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIKeyboard.h; sourceTree = "<group>"; }; @@ -2547,10 +2553,6 @@ E38E17F20D25F9FA00618676 /* GUIPassword.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIPassword.cpp; sourceTree = "<group>"; }; E38E17F30D25F9FA00618676 /* GUIPassword.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIPassword.h; sourceTree = "<group>"; }; E38E17F60D25F9FA00618676 /* GUIUserMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIUserMessages.h; sourceTree = "<group>"; }; - E38E17F70D25F9FA00618676 /* GUIViewControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIViewControl.cpp; sourceTree = "<group>"; }; - E38E17F80D25F9FA00618676 /* GUIViewControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIViewControl.h; sourceTree = "<group>"; }; - E38E17F90D25F9FA00618676 /* GUIViewState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIViewState.cpp; sourceTree = "<group>"; }; - E38E17FA0D25F9FA00618676 /* GUIViewState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIViewState.h; sourceTree = "<group>"; }; E38E17FB0D25F9FA00618676 /* GUIViewStateMusic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIViewStateMusic.cpp; sourceTree = "<group>"; }; E38E17FC0D25F9FA00618676 /* GUIViewStateMusic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIViewStateMusic.h; sourceTree = "<group>"; }; E38E17FF0D25F9FA00618676 /* GUIViewStateVideo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIViewStateVideo.cpp; sourceTree = "<group>"; }; @@ -2954,8 +2956,6 @@ E38E1E960D25F9FD00618676 /* VideoInfoScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoInfoScanner.h; sourceTree = "<group>"; }; E38E1E970D25F9FD00618676 /* VideoInfoTag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VideoInfoTag.cpp; sourceTree = "<group>"; }; E38E1E980D25F9FD00618676 /* VideoInfoTag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoInfoTag.h; sourceTree = "<group>"; }; - E38E1E990D25F9FD00618676 /* ViewDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewDatabase.cpp; sourceTree = "<group>"; }; - E38E1E9A0D25F9FD00618676 /* ViewDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewDatabase.h; sourceTree = "<group>"; }; E38E1EA70D25F9FD00618676 /* XBApplicationEx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBApplicationEx.cpp; sourceTree = "<group>"; }; E38E1EA80D25F9FD00618676 /* XBApplicationEx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBApplicationEx.h; sourceTree = "<group>"; }; E38E1EAD0D25F9FD00618676 /* XBIRRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBIRRemote.h; sourceTree = "<group>"; }; @@ -4598,6 +4598,20 @@ path = websocket; sourceTree = "<group>"; }; + DF64FE3416C07AAA00D028FB /* view */ = { + isa = PBXGroup; + children = ( + DF64FE3516C07AAA00D028FB /* GUIViewControl.cpp */, + DF64FE3616C07AAA00D028FB /* GUIViewControl.h */, + DF64FE3716C07AAA00D028FB /* GUIViewState.cpp */, + DF64FE3816C07AAA00D028FB /* GUIViewState.h */, + DF64FE3A16C07AAA00D028FB /* ViewDatabase.cpp */, + DF64FE3B16C07AAA00D028FB /* ViewDatabase.h */, + DF64FE3C16C07AAA00D028FB /* ViewState.h */, + ); + path = view; + sourceTree = "<group>"; + }; DFB15B1F15F8FB8100CDF0DE /* osx */ = { isa = PBXGroup; children = ( @@ -4752,6 +4766,7 @@ 43D8300612D64DEF00B38489 /* threads */, E38E1E220D25F9FD00618676 /* utils */, 43FAC85D12D62F4300F67914 /* video */, + DF64FE3416C07AAA00D028FB /* view */, 43FAC8C812D63C4400F67914 /* windowing */, 43D82FF512D64C8600B38489 /* windows */, E38E14640D25F9F900618676 /* Application.cpp */, @@ -4784,10 +4799,6 @@ E38E17F20D25F9FA00618676 /* GUIPassword.cpp */, E38E17F30D25F9FA00618676 /* GUIPassword.h */, E38E17F60D25F9FA00618676 /* GUIUserMessages.h */, - E38E17F70D25F9FA00618676 /* GUIViewControl.cpp */, - E38E17F80D25F9FA00618676 /* GUIViewControl.h */, - E38E17F90D25F9FA00618676 /* GUIViewState.cpp */, - E38E17FA0D25F9FA00618676 /* GUIViewState.h */, E38E184F0D25F9FA00618676 /* IProgressCallback.h */, E38E18580D25F9FA00618676 /* LangInfo.cpp */, E38E18590D25F9FA00618676 /* LangInfo.h */, @@ -4821,9 +4832,6 @@ E38E1E1F0D25F9FD00618676 /* URL.h */, E38E1E200D25F9FD00618676 /* Util.cpp */, E38E1E210D25F9FD00618676 /* Util.h */, - E38E1E990D25F9FD00618676 /* ViewDatabase.cpp */, - E38E1E9A0D25F9FD00618676 /* ViewDatabase.h */, - 7C779E24104A57E500F444C4 /* ViewState.h */, E38E1EA70D25F9FD00618676 /* XBApplicationEx.cpp */, E38E1EA80D25F9FD00618676 /* XBApplicationEx.h */, 384718D61325BA04000486D6 /* XBDateTime.cpp */, @@ -6928,8 +6936,6 @@ E38E20A40D25F9FD00618676 /* GUILargeTextureManager.cpp in Sources */, E38E20A50D25F9FD00618676 /* GUIMediaWindow.cpp in Sources */, E38E20A60D25F9FD00618676 /* GUIPassword.cpp in Sources */, - E38E20A80D25F9FD00618676 /* GUIViewControl.cpp in Sources */, - E38E20A90D25F9FD00618676 /* GUIViewState.cpp in Sources */, E38E20AA0D25F9FD00618676 /* GUIViewStateMusic.cpp in Sources */, E38E20AC0D25F9FD00618676 /* GUIViewStateVideo.cpp in Sources */, E38E20AE0D25F9FD00618676 /* GUIWindowFileManager.cpp in Sources */, @@ -7098,7 +7104,6 @@ E38E22FB0D25F9FE00618676 /* VideoDatabase.cpp in Sources */, E38E22FC0D25F9FE00618676 /* VideoInfoScanner.cpp in Sources */, E38E22FD0D25F9FE00618676 /* VideoInfoTag.cpp in Sources */, - E38E22FE0D25F9FE00618676 /* ViewDatabase.cpp in Sources */, E38E23040D25F9FE00618676 /* XBApplicationEx.cpp in Sources */, E38E23150D25F9FE00618676 /* xbmc.cpp in Sources */, E38E25780D263BF600618676 /* unpack.cpp in Sources */, @@ -7730,6 +7735,9 @@ DFB02DEA16629DBA00F37752 /* PyContext.cpp in Sources */, DF07252E168734D7008DCAAD /* karaokevideobackground.cpp in Sources */, DF072534168734ED008DCAAD /* FFmpegVideoDecoder.cpp in Sources */, + DF64FE3D16C07AAA00D028FB /* GUIViewControl.cpp in Sources */, + DF64FE3E16C07AAA00D028FB /* GUIViewState.cpp in Sources */, + DF64FE4016C07AAA00D028FB /* ViewDatabase.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index c3050a2b0f..cd2bcea34e 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -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" /> diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index 0e4b8b6b48..cd0b51e772 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -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"> 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/dialogs/GUIDialogSmartPlaylistRule.cpp b/xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp index 84ff9f124f..21bb244bf6 100644 --- a/xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp +++ b/xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp @@ -298,10 +298,15 @@ void CGUIDialogSmartPlaylistRule::OnBrowse() } else if (m_rule.m_field == FieldTag) { - if (m_type == "movies") - videodatabase.GetTagsNav(basePath + "9/", items, VIDEODB_CONTENT_MOVIES); - else + VIDEODB_CONTENT_TYPE type = VIDEODB_CONTENT_MOVIES; + if (m_type == "tvshows") + type = VIDEODB_CONTENT_TVSHOWS; + else if (m_type == "musicvideos") + type = VIDEODB_CONTENT_MUSICVIDEOS; + else if (m_type != "movies") return; + + videodatabase.GetTagsNav(basePath + "9/", items, type); iLabel = 20459; } else 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/playlists/SmartPlayList.cpp b/xbmc/playlists/SmartPlayList.cpp index 691c70c441..f7191ac9e3 100644 --- a/xbmc/playlists/SmartPlayList.cpp +++ b/xbmc/playlists/SmartPlayList.cpp @@ -418,6 +418,7 @@ vector<Field> CSmartPlaylistRule::GetFields(const CStdString &type) fields.push_back(FieldDateAdded); fields.push_back(FieldLastPlayed); fields.push_back(FieldInProgress); + fields.push_back(FieldTag); } else if (type == "episodes") { @@ -489,6 +490,7 @@ vector<Field> CSmartPlaylistRule::GetFields(const CStdString &type) fields.push_back(FieldDirector); fields.push_back(FieldStudio); fields.push_back(FieldPlot); + fields.push_back(FieldTag); fields.push_back(FieldDateAdded); isVideo = true; } @@ -899,6 +901,8 @@ CStdString CSmartPlaylistRule::GetWhereClause(const CDatabase &db, const CStdStr query = GetField(FieldId, strType) + negate + " IN (SELECT idMVideo FROM directorlinkmusicvideo JOIN actors ON actors.idActor=directorlinkmusicvideo.idDirector WHERE actors.strActor" + parameter + ")"; else if ((m_field == FieldLastPlayed || m_field == FieldDateAdded) && (m_operator == OPERATOR_LESS_THAN || m_operator == OPERATOR_BEFORE || m_operator == OPERATOR_NOT_IN_THE_LAST)) query = GetField(m_field, strType) + " IS NULL OR " + GetField(m_field, strType) + parameter; + else if (m_field == FieldTag) + query = GetField(FieldId, strType) + negate + " IN (SELECT idMedia FROM taglinks JOIN tag ON tag.idTag = taglinks.idTag WHERE tag.strTag" + parameter + " AND taglinks.media_type = 'musicvideo')"; } else if (strType == "tvshows") { @@ -918,6 +922,8 @@ CStdString CSmartPlaylistRule::GetWhereClause(const CDatabase &db, const CStdStr query = GetField(m_field, strType) + " IS NULL OR " + GetField(m_field, strType) + parameter; else if (m_field == FieldPlaycount) query = "CASE WHEN COALESCE(" + GetField(FieldNumberOfEpisodes, strType) + " - " + GetField(FieldNumberOfWatchedEpisodes, strType) + ", 0) > 0 THEN 0 ELSE 1 END " + parameter; + else if (m_field == FieldTag) + query = GetField(FieldId, strType) + negate + " IN (SELECT idMedia FROM taglinks JOIN tag ON tag.idTag = taglinks.idTag WHERE tag.strTag" + parameter + " AND taglinks.media_type = 'tvshow')"; } else if (strType == "episodes") { 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; |