cleanup: removed unneeded code (#7408)

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@23875 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

diff --git a/Makefile.in b/Makefile.in
index 4edaeb2..8bed959 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,7 +47,6 @@ BIN_DIRS=     \
        xbmc/utils \
        xbmc/settings \
        xbmc/linux \
-       xbmc/xbox \
        xbmc/osx
 
 EC_DIRS= \
@@ -241,8 +240,6 @@ xbmc/utils/utils.a: force
        $(MAKE) -C xbmc/utils
 xbmc/visualizations/visualization.a: force
        $(MAKE) -C xbmc/visualizations
-xbmc/xbox/xbox.a: force
-       $(MAKE) -C xbmc/xbox
 xbmc/osx/osx.a: force
        $(MAKE) -C xbmc/osx
 
@@ -370,8 +367,7 @@ OBJSXBMC=   \
        xbmc/lib/libsquish/libsquish-@ARCH@.a \
        xbmc/screensavers/screensaver.a \
        xbmc/settings/settings.a \
-       xbmc/visualizations/visualization.a \
-       xbmc/xbox/xbox.a
+       xbmc/visualizations/visualization.a
 
 DYNOBJSXBMC= \
        xbmc/lib/libcmyth/libcmyth.a \

diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 6df0e7a..fd62116 100644 (file)
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -107,7 +107,7 @@
 #include "AudioContext.h"
 #include "GUIFontTTF.h"
 #include "utils/Network.h"
-#include "xbox/IoSupport.h"
+#include "utils/IoSupport.h"
 #include "Zeroconf.h"
 #include "ZeroconfBrowser.h"
 #ifndef _LINUX

diff --git a/xbmc/DetectDVDType.h b/xbmc/DetectDVDType.h
index af45591..35744be 100644 (file)
--- a/xbmc/DetectDVDType.h
+++ b/xbmc/DetectDVDType.h
@@ -33,7 +33,7 @@
 
 #ifdef HAS_DVD_DRIVE
 
-#include "xbox/IoSupport.h"
+#include "utils/IoSupport.h"
 #include "FileSystem/cdioSupport.h"
 #include "utils/CriticalSection.h"
 

diff --git a/xbmc/FileSystem/FileISO.h b/xbmc/FileSystem/FileISO.h
index ed83d45..8a0b52c 100644 (file)
--- a/xbmc/FileSystem/FileISO.h
+++ b/xbmc/FileSystem/FileISO.h
@@ -31,7 +31,7 @@
 
 #include "IFile.h"
 #include "iso9660.h"
-#include "xbox/IoSupport.h"
+#include "utils/IoSupport.h"
 #include "RingBuffer.h"
 
 namespace XFILE

diff --git a/xbmc/FileSystem/HDDirectory.cpp b/xbmc/FileSystem/HDDirectory.cpp
index 59d7aa2..11b1f21 100644 (file)
--- a/xbmc/FileSystem/HDDirectory.cpp
+++ b/xbmc/FileSystem/HDDirectory.cpp
@@ -21,7 +21,7 @@
 
 #include "HDDirectory.h"
 #include "Util.h"
-#include "xbox/IoSupport.h"
+#include "utils/IoSupport.h"
 #include "iso9660.h"
 #include "URL.h"
 #include "GUISettings.h"

diff --git a/xbmc/FileSystem/ISO9660Directory.cpp b/xbmc/FileSystem/ISO9660Directory.cpp
index d3a2d4c..50bfa2a 100644 (file)
--- a/xbmc/FileSystem/ISO9660Directory.cpp
+++ b/xbmc/FileSystem/ISO9660Directory.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "ISO9660Directory.h"
-#include "xbox/IoSupport.h"
+#include "utils/IoSupport.h"
 #include "iso9660.h"
 #include "Util.h"
 #include "URL.h"

diff --git a/xbmc/FileSystem/cdioSupport.h b/xbmc/FileSystem/cdioSupport.h
index 819efd9..1c40043 100644 (file)
--- a/xbmc/FileSystem/cdioSupport.h
+++ b/xbmc/FileSystem/cdioSupport.h
@@ -35,7 +35,7 @@
 
 #ifdef HAS_DVD_DRIVE
 
-#include "xbox/IoSupport.h"
+#include "../utils/IoSupport.h"
 
 #ifndef _LINUX
 #include "lib/libcdio/cdio.h"

diff --git a/xbmc/FileSystem/iso9660.h b/xbmc/FileSystem/iso9660.h
index 760d894..1d6d034 100644 (file)
--- a/xbmc/FileSystem/iso9660.h
+++ b/xbmc/FileSystem/iso9660.h
@@ -23,7 +23,7 @@
 #pragma once
 #include <vector>
 #include <string>
-#include "xbox/IoSupport.h"
+#include "utils/IoSupport.h"
 #include "system.h" // for win32 types
 
 #ifdef _WIN32

diff --git a/xbmc/GUIDialogGamepad.cpp b/xbmc/GUIDialogGamepad.cpp
index 8aabd23..24f3cd0 100644 (file)
--- a/xbmc/GUIDialogGamepad.cpp
+++ b/xbmc/GUIDialogGamepad.cpp
@@ -21,7 +21,6 @@
 
 #include "GUIDialogGamepad.h"
 #include "utils/md5.h"
-#include "xbox/XKGeneral.h"
 #include "GUIAudioManager.h"
 #include "GUIWindowManager.h"
 #include "GUIDialogOK.h"

diff --git a/xbmc/GUIDialogKeyboard.cpp b/xbmc/GUIDialogKeyboard.cpp
index 03d3e7f..2494d49 100644 (file)
--- a/xbmc/GUIDialogKeyboard.cpp
+++ b/xbmc/GUIDialogKeyboard.cpp
@@ -31,7 +31,6 @@
 #include "GUIPassword.h"
 #include "utils/md5.h"
 #include "utils/TimeUtils.h"
-#include "xbox/XKGeneral.h"
 #include "Application.h"
 #include "AdvancedSettings.h"
 #include "LocalizeStrings.h"

diff --git a/xbmc/GUIDialogNumeric.cpp b/xbmc/GUIDialogNumeric.cpp
index 66dfd34..532bcfe 100644 (file)
--- a/xbmc/GUIDialogNumeric.cpp
+++ b/xbmc/GUIDialogNumeric.cpp
@@ -22,7 +22,6 @@
 #include "GUIDialogNumeric.h"
 #include "GUILabelControl.h"
 #include "utils/md5.h"
-#include "xbox/XKGeneral.h"
 #include "GUIWindowManager.h"
 #include "GUIDialogOK.h"
 #include "StringUtils.h"

diff --git a/xbmc/MediaManager.cpp b/xbmc/MediaManager.cpp
index ca9d2d5..3b3049e 100644 (file)
--- a/xbmc/MediaManager.cpp
+++ b/xbmc/MediaManager.cpp
@@ -22,7 +22,7 @@
 #include "system.h"
 #include "LocalizeStrings.h"
 #include "MediaManager.h"
-#include "xbox/IoSupport.h"
+#include "utils/IoSupport.h"
 #include "URL.h"
 #include "Util.h"
 #ifdef _WIN32

diff --git a/xbmc/MusicInfoScanner.cpp b/xbmc/MusicInfoScanner.cpp
index 477db48..ec88602 100644 (file)
--- a/xbmc/MusicInfoScanner.cpp
+++ b/xbmc/MusicInfoScanner.cpp
@@ -30,7 +30,6 @@
 #include "Util.h"
 #include "utils/md5.h"
 #include "utils/GUIInfoManager.h"
-#include "xbox/XKGeneral.h"
 #include "NfoFile.h"
 #include "MusicInfoTag.h"
 #include "GUIWindowManager.h"

diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp
index 98149bf..d47c3b6 100644 (file)
--- a/xbmc/Util.cpp
+++ b/xbmc/Util.cpp
@@ -35,7 +35,7 @@
 #include "Application.h"
 #include "AutoPtrHandle.h"
 #include "Util.h"
-#include "xbox/IoSupport.h"
+#include "utils/IoSupport.h"
 #include "FileSystem/StackDirectory.h"
 #include "FileSystem/VirtualPathDirectory.h"
 #include "FileSystem/MultiPathDirectory.h"

diff --git a/xbmc/VideoInfoScanner.cpp b/xbmc/VideoInfoScanner.cpp
index f1ad565..efc06de 100644 (file)
--- a/xbmc/VideoInfoScanner.cpp
+++ b/xbmc/VideoInfoScanner.cpp
@@ -28,7 +28,6 @@
 #include "utils/md5.h"
 #include "Picture.h"
 #include "FileSystem/StackDirectory.h"
-#include "xbox/XKGeneral.h"
 #include "utils/IMDB.h"
 #include "utils/GUIInfoManager.h"
 #include "FileSystem/File.h"

diff --git a/xbmc/cores/DllLoader/exports/emu_kernel32.cpp b/xbmc/cores/DllLoader/exports/emu_kernel32.cpp
index 751c1ef..e196339 100644 (file)
--- a/xbmc/cores/DllLoader/exports/emu_kernel32.cpp
+++ b/xbmc/cores/DllLoader/exports/emu_kernel32.cpp
@@ -23,7 +23,7 @@
 #include "emu_dummy.h"
 #include "utils/log.h"
 
-#include "xbox/IoSupport.h"
+#include "utils/IoSupport.h"
 
 #ifndef _LINUX
 #include <process.h>

diff --git a/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp b/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
index 4944b0c..47eab69 100644 (file)
--- a/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
+++ b/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
@@ -39,7 +39,7 @@
 #include "player.h"
 #include "pyplaylist.h"
 #include "keyboard.h"
-#include "xbox/IoSupport.h"
+#include "utils/IoSupport.h"
 #ifndef _LINUX
 #include <ConIo.h>
 #endif

diff --git a/xbmc/utils/Makefile b/xbmc/utils/Makefile
index 21f0480..af3a8a3 100644 (file)
--- a/xbmc/utils/Makefile
+++ b/xbmc/utils/Makefile
@@ -13,6 +13,7 @@ SRCS=AlarmClock.cpp \
      HttpHeader.cpp \
      IMDB.cpp \
      InfoLoader.cpp \
+     IoSupport.cpp \
      log.cpp \
      MusicAlbumInfo.cpp \
      MusicInfoScraper.cpp \