changed: get rid of unnecessary headers/classes

5 files changed, 6 insertions, 63 deletions

diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp
index d678082061..983a478350 100644
--- a/xbmc/addons/AddonManager.cpp
+++ b/xbmc/addons/AddonManager.cpp
@@ -35,11 +35,9 @@
 #include "log.h"
 
 #ifdef HAS_VISUALISATION
-#include "DllVisualisation.h"
 #include "Visualisation.h"
 #endif
 #ifdef HAS_SCREENSAVER
-#include "DllScreenSaver.h"
 #include "ScreenSaver.h"
 #endif
 //#ifdef HAS_SCRAPERS
diff --git a/xbmc/addons/DllScreenSaver.h b/xbmc/addons/DllScreenSaver.h
deleted file mode 100644
index cbedda85ce..0000000000
--- a/xbmc/addons/DllScreenSaver.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include "DllAddon.h"
-#include "include/xbmc_scr_types.h"
-
-class DllScreenSaver : public DllAddon<ScreenSaver, SCR_PROPS>
-{
-  // this is populated via Macro calls in DllAddon.h
-};
-
diff --git a/xbmc/addons/DllVisualisation.h b/xbmc/addons/DllVisualisation.h
deleted file mode 100644
index 1f22c4e2d1..0000000000
--- a/xbmc/addons/DllVisualisation.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-/*
- *      Copyright (C) 2005-2008 Team XBMC
- *      http://www.xbmc.org
- *
- *  This Program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This Program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with XBMC; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *  http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#include "DllAddon.h"
-#include "include/xbmc_vis_types.h"
-
-class DllVisualisation : public DllAddon<Visualisation, VIS_PROPS>
-{
-  // this is populated via Macro calls in DllAddon.h
-};
diff --git a/xbmc/addons/ScreenSaver.h b/xbmc/addons/ScreenSaver.h
index 7d0b17ec1c..e54dfe87b7 100644
--- a/xbmc/addons/ScreenSaver.h
+++ b/xbmc/addons/ScreenSaver.h
@@ -21,7 +21,9 @@
 #pragma once
 
 #include "AddonDll.h"
-#include "DllScreenSaver.h"
+#include "include/xbmc_scr_types.h"
+
+typedef DllAddon<ScreenSaver, SCR_PROPS> DllScreenSaver;
 
 namespace ADDON
 {
diff --git a/xbmc/addons/Visualisation.h b/xbmc/addons/Visualisation.h
index 036a86207a..e7b34a3225 100644
--- a/xbmc/addons/Visualisation.h
+++ b/xbmc/addons/Visualisation.h
@@ -21,9 +21,9 @@
 #pragma once
 
 #include "Key.h"
-#include "DllVisualisation.h"
 #include "AddonDll.h"
 #include "cores/IAudioCallback.h"
+#include "include/xbmc_vis_types.h"
 
 #include <map>
 #include <list>
@@ -34,6 +34,8 @@
 
 class CCriticalSection;
 
+typedef DllAddon<Visualisation, VIS_PROPS> DllVisualisation;
+
 class CAudioBuffer
 {
 public: