Skip to content

Commit

Permalink
changed: drop CProgramDatabase
Browse files Browse the repository at this point in the history 
unused and unusable in its current state
  • Loading branch information
spiff committed Jul 12, 2012
1 parent c7fc25a commit 92f0eae
Show file tree
Hide file tree
Showing 11 changed files with 1 addition and 435 deletions.
6 changes: 0 additions & 6 deletions XBMC-ATV2.xcodeproj/project.pbxproj
View file
Expand Up @@ -694,7 +694,6 @@
F56C7AEC131EC155000AD0F6 /* PowerManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C76B2131EC153000AD0F6 /* PowerManager.cpp */; };
F56C7AED131EC155000AD0F6 /* GUIViewStatePrograms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C76B5131EC153000AD0F6 /* GUIViewStatePrograms.cpp */; };
F56C7AEE131EC155000AD0F6 /* GUIWindowPrograms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C76B7131EC153000AD0F6 /* GUIWindowPrograms.cpp */; };
F56C7AEF131EC155000AD0F6 /* ProgramDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C76B9131EC153000AD0F6 /* ProgramDatabase.cpp */; };
F56C7AF3131EC155000AD0F6 /* RenderSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C76C3131EC153000AD0F6 /* RenderSystem.cpp */; };
F56C7AF4131EC155000AD0F6 /* GUIDialogContentSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C76C7131EC153000AD0F6 /* GUIDialogContentSettings.cpp */; };
F56C7AF5131EC155000AD0F6 /* GUIDialogLockSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C76C9131EC153000AD0F6 /* GUIDialogLockSettings.cpp */; };
Expand Down Expand Up @@ -2478,8 +2477,6 @@
F56C76B6131EC153000AD0F6 /* GUIViewStatePrograms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIViewStatePrograms.h; sourceTree = "<group>"; };
F56C76B7131EC153000AD0F6 /* GUIWindowPrograms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowPrograms.cpp; sourceTree = "<group>"; };
F56C76B8131EC153000AD0F6 /* GUIWindowPrograms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowPrograms.h; sourceTree = "<group>"; };
F56C76B9131EC153000AD0F6 /* ProgramDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProgramDatabase.cpp; sourceTree = "<group>"; };
F56C76BA131EC153000AD0F6 /* ProgramDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProgramDatabase.h; sourceTree = "<group>"; };
F56C76C3131EC153000AD0F6 /* RenderSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSystem.cpp; sourceTree = "<group>"; };
F56C76C4131EC153000AD0F6 /* RenderSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSystem.h; sourceTree = "<group>"; };
F56C76C7131EC153000AD0F6 /* GUIDialogContentSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogContentSettings.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -5240,8 +5237,6 @@
F56C76B6131EC153000AD0F6 /* GUIViewStatePrograms.h */,
F56C76B7131EC153000AD0F6 /* GUIWindowPrograms.cpp */,
F56C76B8131EC153000AD0F6 /* GUIWindowPrograms.h */,
F56C76B9131EC153000AD0F6 /* ProgramDatabase.cpp */,
F56C76BA131EC153000AD0F6 /* ProgramDatabase.h */,
);
path = programs;
sourceTree = "<group>";
Expand Down Expand Up @@ -6851,7 +6846,6 @@
F56C7AEC131EC155000AD0F6 /* PowerManager.cpp in Sources */,
F56C7AED131EC155000AD0F6 /* GUIViewStatePrograms.cpp in Sources */,
F56C7AEE131EC155000AD0F6 /* GUIWindowPrograms.cpp in Sources */,
F56C7AEF131EC155000AD0F6 /* ProgramDatabase.cpp in Sources */,
F56C7AF3131EC155000AD0F6 /* RenderSystem.cpp in Sources */,
F56C7AF4131EC155000AD0F6 /* GUIDialogContentSettings.cpp in Sources */,
F56C7AF5131EC155000AD0F6 /* GUIDialogLockSettings.cpp in Sources */,
Expand Down
6 changes: 0 additions & 6 deletions XBMC-IOS.xcodeproj/project.pbxproj
View file
Expand Up @@ -785,7 +785,6 @@
F56C8ADA131F42ED000AD0F6 /* PowerManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C869F131F42EB000AD0F6 /* PowerManager.cpp */; };
F56C8ADB131F42ED000AD0F6 /* GUIViewStatePrograms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86A2131F42EB000AD0F6 /* GUIViewStatePrograms.cpp */; };
F56C8ADC131F42ED000AD0F6 /* GUIWindowPrograms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86A4131F42EB000AD0F6 /* GUIWindowPrograms.cpp */; };
F56C8ADD131F42ED000AD0F6 /* ProgramDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86A6131F42EB000AD0F6 /* ProgramDatabase.cpp */; };
F56C8ADE131F42ED000AD0F6 /* Shortcut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86A8131F42EB000AD0F6 /* Shortcut.cpp */; };
F56C8ADF131F42ED000AD0F6 /* RenderSystemGLES.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86AC131F42EB000AD0F6 /* RenderSystemGLES.cpp */; };
F56C8AE0131F42ED000AD0F6 /* RenderSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86AE131F42EB000AD0F6 /* RenderSystem.cpp */; };
Expand Down Expand Up @@ -2677,8 +2676,6 @@
F56C86A3131F42EB000AD0F6 /* GUIViewStatePrograms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIViewStatePrograms.h; sourceTree = "<group>"; };
F56C86A4131F42EB000AD0F6 /* GUIWindowPrograms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowPrograms.cpp; sourceTree = "<group>"; };
F56C86A5131F42EB000AD0F6 /* GUIWindowPrograms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowPrograms.h; sourceTree = "<group>"; };
F56C86A6131F42EB000AD0F6 /* ProgramDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProgramDatabase.cpp; sourceTree = "<group>"; };
F56C86A7131F42EB000AD0F6 /* ProgramDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProgramDatabase.h; sourceTree = "<group>"; };
F56C86AC131F42EB000AD0F6 /* RenderSystemGLES.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSystemGLES.cpp; sourceTree = "<group>"; };
F56C86AD131F42EB000AD0F6 /* RenderSystemGLES.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSystemGLES.h; sourceTree = "<group>"; };
F56C86AE131F42EB000AD0F6 /* RenderSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSystem.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -5597,8 +5594,6 @@
F56C86A3131F42EB000AD0F6 /* GUIViewStatePrograms.h */,
F56C86A4131F42EB000AD0F6 /* GUIWindowPrograms.cpp */,
F56C86A5131F42EB000AD0F6 /* GUIWindowPrograms.h */,
F56C86A6131F42EB000AD0F6 /* ProgramDatabase.cpp */,
F56C86A7131F42EB000AD0F6 /* ProgramDatabase.h */,
);
path = programs;
sourceTree = "<group>";
Expand Down Expand Up @@ -6955,7 +6950,6 @@
F56C8ADA131F42ED000AD0F6 /* PowerManager.cpp in Sources */,
F56C8ADB131F42ED000AD0F6 /* GUIViewStatePrograms.cpp in Sources */,
F56C8ADC131F42ED000AD0F6 /* GUIWindowPrograms.cpp in Sources */,
F56C8ADD131F42ED000AD0F6 /* ProgramDatabase.cpp in Sources */,
F56C8ADE131F42ED000AD0F6 /* Shortcut.cpp in Sources */,
F56C8ADF131F42ED000AD0F6 /* RenderSystemGLES.cpp in Sources */,
F56C8AE0131F42ED000AD0F6 /* RenderSystem.cpp in Sources */,
Expand Down
6 changes: 0 additions & 6 deletions XBMC.xcodeproj/project.pbxproj
View file
Expand Up @@ -752,7 +752,6 @@
E38E22A40D25F9FE00618676 /* PictureThumbLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1DDD0D25F9FD00618676 /* PictureThumbLoader.cpp */; };
E38E22AA0D25F9FE00618676 /* PlayListPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1DE90D25F9FD00618676 /* PlayListPlayer.cpp */; };
E38E22AE0D25F9FE00618676 /* Profile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1DF10D25F9FD00618676 /* Profile.cpp */; };
E38E22AF0D25F9FE00618676 /* ProgramDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1DF30D25F9FD00618676 /* ProgramDatabase.cpp */; };
E38E22B30D25F9FE00618676 /* SectionLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1DFE0D25F9FD00618676 /* SectionLoader.cpp */; };
E38E22B40D25F9FE00618676 /* VideoSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1E010D25F9FD00618676 /* VideoSettings.cpp */; };
E38E22B70D25F9FE00618676 /* Shortcut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E1E070D25F9FD00618676 /* Shortcut.cpp */; };
Expand Down Expand Up @@ -2666,8 +2665,6 @@
E38E1DEA0D25F9FD00618676 /* PlayListPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayListPlayer.h; sourceTree = "<group>"; };
E38E1DF10D25F9FD00618676 /* Profile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Profile.cpp; sourceTree = "<group>"; };
E38E1DF20D25F9FD00618676 /* Profile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Profile.h; sourceTree = "<group>"; };
E38E1DF30D25F9FD00618676 /* ProgramDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProgramDatabase.cpp; sourceTree = "<group>"; };
E38E1DF40D25F9FD00618676 /* ProgramDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProgramDatabase.h; sourceTree = "<group>"; };
E38E1DFE0D25F9FD00618676 /* SectionLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SectionLoader.cpp; sourceTree = "<group>"; };
E38E1DFF0D25F9FD00618676 /* SectionLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SectionLoader.h; sourceTree = "<group>"; };
E38E1E010D25F9FD00618676 /* VideoSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VideoSettings.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3667,8 +3664,6 @@
8863281A0E07B37200BB3DAB /* GUIViewStatePrograms.h */,
E38E18230D25F9FA00618676 /* GUIWindowPrograms.cpp */,
E38E18240D25F9FA00618676 /* GUIWindowPrograms.h */,
E38E1DF30D25F9FD00618676 /* ProgramDatabase.cpp */,
E38E1DF40D25F9FD00618676 /* ProgramDatabase.h */,
);
path = programs;
sourceTree = "<group>";
Expand Down Expand Up @@ -6711,7 +6706,6 @@
E38E22A40D25F9FE00618676 /* PictureThumbLoader.cpp in Sources */,
E38E22AA0D25F9FE00618676 /* PlayListPlayer.cpp in Sources */,
E38E22AE0D25F9FE00618676 /* Profile.cpp in Sources */,
E38E22AF0D25F9FE00618676 /* ProgramDatabase.cpp in Sources */,
E38E22B30D25F9FE00618676 /* SectionLoader.cpp in Sources */,
E38E22B40D25F9FE00618676 /* VideoSettings.cpp in Sources */,
E38E22B70D25F9FE00618676 /* Shortcut.cpp in Sources */,
Expand Down
4 changes: 1 addition & 3 deletions project/VS2010Express/XBMC.vcxproj
View file
Expand Up @@ -853,7 +853,6 @@
<ClCompile Include="..\..\xbmc\powermanagement\windows\Win32PowerSyscall.cpp" />
<ClCompile Include="..\..\xbmc\programs\GUIViewStatePrograms.cpp" />
<ClCompile Include="..\..\xbmc\programs\GUIWindowPrograms.cpp" />
<ClCompile Include="..\..\xbmc\programs\ProgramDatabase.cpp" />
<ClCompile Include="..\..\xbmc\rendering\dx\GUIWindowTestPatternDX.cpp" />
<ClCompile Include="..\..\xbmc\rendering\dx\RenderSystemDX.cpp" />
<ClCompile Include="..\..\xbmc\rendering\gl\GUIWindowTestPatternGL.cpp">
Expand Down Expand Up @@ -1806,7 +1805,6 @@
<ClInclude Include="..\..\xbmc\powermanagement\windows\Win32PowerSyscall.h" />
<ClInclude Include="..\..\xbmc\programs\GUIViewStatePrograms.h" />
<ClInclude Include="..\..\xbmc\programs\GUIWindowPrograms.h" />
<ClInclude Include="..\..\xbmc\programs\ProgramDatabase.h" />
<ClInclude Include="..\..\xbmc\rendering\dx\GUIWindowTestPatternDX.h" />
<ClInclude Include="..\..\xbmc\rendering\dx\RenderSystemDX.h" />
<ClInclude Include="..\..\xbmc\rendering\gl\GUIWindowTestPatternGL.h">
Expand Down Expand Up @@ -2286,4 +2284,4 @@
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\$(ProjectFileName).targets.user" Condition="Exists('$(SolutionDir)\$(ProjectFileName).targets.user')" />
</Project>
</Project>
6 changes: 0 additions & 6 deletions project/VS2010Express/XBMC.vcxproj.filters
View file
Expand Up @@ -2505,9 +2505,6 @@
<ClCompile Include="..\..\xbmc\music\MusicDatabase.cpp">
<Filter>music</Filter>
</ClCompile>
<ClCompile Include="..\..\xbmc\programs\ProgramDatabase.cpp">
<Filter>programs</Filter>
</ClCompile>
<ClCompile Include="..\..\xbmc\video\VideoDatabase.cpp">
<Filter>video</Filter>
</ClCompile>
Expand Down Expand Up @@ -5130,9 +5127,6 @@
<ClInclude Include="..\..\xbmc\music\MusicDatabase.h">
<Filter>music</Filter>
</ClInclude>
<ClInclude Include="..\..\xbmc\programs\ProgramDatabase.h">
<Filter>programs</Filter>
</ClInclude>
<ClInclude Include="..\..\xbmc\video\VideoDatabase.h">
<Filter>video</Filter>
</ClInclude>
Expand Down
2 changes: 0 additions & 2 deletions xbmc/DatabaseManager.cpp
View file
Expand Up @@ -24,7 +24,6 @@
#include "addons/AddonDatabase.h"
#include "ViewDatabase.h"
#include "TextureDatabase.h"
#include "programs/ProgramDatabase.h"
#include "music/MusicDatabase.h"
#include "video/VideoDatabase.h"
#include "settings/AdvancedSettings.h"
Expand Down Expand Up @@ -54,7 +53,6 @@ void CDatabaseManager::Initialize(bool addonsOnly)
CLog::Log(LOGDEBUG, "%s, updating databases...", __FUNCTION__);
{ CViewDatabase db; UpdateDatabase(db); }
{ CTextureDatabase db; UpdateDatabase(db); }
{ CProgramDatabase db; UpdateDatabase(db); }
{ CMusicDatabase db; UpdateDatabase(db, &g_advancedSettings.m_databaseMusic); }
{ CVideoDatabase db; UpdateDatabase(db, &g_advancedSettings.m_databaseVideo); }
CLog::Log(LOGDEBUG, "%s, updating databases... DONE", __FUNCTION__);
Expand Down
3 changes: 0 additions & 3 deletions xbmc/programs/GUIWindowPrograms.cpp
View file
Expand Up @@ -67,7 +67,6 @@ bool CGUIWindowPrograms::OnMessage(CGUIMessage& message)
{
if (m_thumbLoader.IsLoading())
m_thumbLoader.StopThread();
m_database.Close();
}
break;

Expand All @@ -80,8 +79,6 @@ bool CGUIWindowPrograms::OnMessage(CGUIMessage& message)
if (m_vecItems->GetPath() == "?" && message.GetStringParam().IsEmpty())
message.SetStringParam(g_settings.m_defaultProgramSource);

m_database.Open();

return CGUIMediaWindow::OnMessage(message);
}
break;
Expand Down
3 changes: 0 additions & 3 deletions xbmc/programs/GUIWindowPrograms.h
View file
Expand Up @@ -22,7 +22,6 @@
*/

#include "windows/GUIMediaWindow.h"
#include "ProgramDatabase.h"
#include "dialogs/GUIDialogProgress.h"
#include "ThumbLoader.h"

Expand All @@ -47,8 +46,6 @@ class CGUIWindowPrograms :

CGUIDialogProgress* m_dlgProgress;

CProgramDatabase m_database;

int m_iRegionSet; // for cd stuff

CProgramThumbLoader m_thumbLoader;
Expand Down
1 change: 0 additions & 1 deletion xbmc/programs/Makefile
View file
@@ -1,6 +1,5 @@
SRCS=GUIViewStatePrograms.cpp \
GUIWindowPrograms.cpp \
ProgramDatabase.cpp \

LIB=programs.a

Expand Down

0 comments on commit 92f0eae

Please sign in to comment.