From 5ddc0562d53d60cd9c47481eb7c85be23f37bc98 Mon Sep 17 00:00:00 2001 From: Colby Klein Date: Tue, 17 Sep 2013 14:53:13 -0700 Subject: [PATCH] Remove ScreenPackagesSSC --- src/Makefile.am | 2 +- src/ScreenPackagesSSC.cpp | 80 --------------------------------------- src/ScreenPackagesSSC.h | 59 ----------------------------- 3 files changed, 1 insertion(+), 140 deletions(-) delete mode 100644 src/ScreenPackagesSSC.cpp delete mode 100644 src/ScreenPackagesSSC.h diff --git a/src/Makefile.am b/src/Makefile.am index 8a8e08b25c..1f92952f28 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -92,7 +92,7 @@ ScreenOptionsManageProfiles.cpp ScreenOptionsManageProfiles.h \ ScreenOptionsMaster.cpp ScreenOptionsMaster.h \ ScreenOptionsMasterPrefs.cpp ScreenOptionsMasterPrefs.h \ ScreenOptionsToggleSongs.cpp ScreenOptionsToggleSongs.h \ -ScreenPackages.cpp ScreenPackages.h ScreenPackagesSSC.cpp ScreenPackagesSSC.h \ +ScreenPackages.cpp ScreenPackages.h \ ScreenNetworkOptions.h ScreenNetworkOptions.cpp \ ScreenPlayerOptions.cpp ScreenPlayerOptions.h \ ScreenProfileLoad.cpp ScreenProfileLoad.h \ diff --git a/src/ScreenPackagesSSC.cpp b/src/ScreenPackagesSSC.cpp deleted file mode 100644 index 902650f39d..0000000000 --- a/src/ScreenPackagesSSC.cpp +++ /dev/null @@ -1,80 +0,0 @@ -#include "global.h" - -#if !defined(WITHOUT_NETWORKING) -#include "ScreenPackagesSSC.h" -#include "ThemeManager.h" -#include "RageDisplay.h" -#include "RageLog.h" -#include "ScreenManager.h" - -REGISTER_SCREEN_CLASS( ScreenPackagesSSC ); - -void ScreenPackagesSSC::Init() -{ - ScreenWithMenuElements::Init(); -} - -void ScreenPackagesSSC::HandleScreenMessage( const ScreenMessage SM ) -{ - if( SM == SM_GoToPrevScreen ) - SCREENMAN->SetNewScreen( THEME->GetMetric (m_sName, "PrevScreen") ); - else if( SM ==SM_GoToNextScreen ) - SCREENMAN->SetNewScreen( THEME->GetMetric (m_sName, "NextScreen") ); - - ScreenWithMenuElements::HandleScreenMessage( SM ); -} - -bool ScreenPackagesSSC::Input( const InputEventPlus &input ) -{ - return ScreenWithMenuElements::Input( input ); -} - -bool ScreenPackagesSSC::MenuBack( const InputEventPlus &input ) -{ - TweenOffScreen(); - Cancel( SM_GoToPrevScreen ); - ScreenWithMenuElements::MenuBack( input ); - return true; -} - -void ScreenPackagesSSC::Update( float fDeltaTime ) -{ - ScreenWithMenuElements::Update(fDeltaTime); -} - -void ScreenPackagesSSC::DrawPrimitives() -{ - ScreenWithMenuElements::DrawPrimitives(); -} - -RString ScreenPackagesSSC::JSONParse( const RString &string_in ) -{ - /* json++ stuff here */ - return ""; -} - -#endif -/* - * (c) 2009 Colby Klein - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, and/or sell copies of the Software, and to permit persons to - * whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF - * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS - * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT - * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ diff --git a/src/ScreenPackagesSSC.h b/src/ScreenPackagesSSC.h deleted file mode 100644 index affa136e84..0000000000 --- a/src/ScreenPackagesSSC.h +++ /dev/null @@ -1,59 +0,0 @@ -#ifndef SCREEN_PACKAGES_SSC_H -#define SCREEN_PACKAGES_SSC_H - -#include "ScreenWithMenuElements.h" -#include "BitmapText.h" -#include "ezsockets.h" -#include "RageFileManager.h" -#include "RageFile.h" -#include "Sprite.h" - -#if !defined(WITHOUT_NETWORKING) -/** @brief Parses JSON for downloadable content. */ -class ScreenPackagesSSC : public ScreenWithMenuElements -{ -public: - virtual void Init(); - - /* Input stuff */ - virtual bool Input( const InputEventPlus &input ); - virtual bool MenuBack( const InputEventPlus &input ); - - virtual void HandleScreenMessage( const ScreenMessage SM ); - virtual void Update(float f); - virtual void DrawPrimitives(); - -private: - RString JSONParse( const RString &string_in ); -}; -#endif // WITHOUT_NETWORKING? - -#endif - -/** - * @file - * @author Chris Danford (c) 2004 - * @section LICENSE - * All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, and/or sell copies of the Software, and to permit persons to - * whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF - * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS - * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT - * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR - * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ -