Permalink
Browse files

Merge pull request #383 from Pulse-Eight/peripherals-pr

new peripherals manager
  • Loading branch information...
2 parents 714ad40 + 1ac45d8 commit f4bb961a86f7a5ebe23bfa8d7da1b6893fc26662 @bobo1on1 bobo1on1 committed Sep 30, 2011
Showing with 5,803 additions and 450 deletions.
  1. +18 −0 .gitignore
  2. +18 −2 Makefile.in
  3. +1 −1 README.linux
  4. +1 −1 README.ubuntu
  5. +146 −8 XBMC.xcodeproj/project.pbxproj
  6. +381 −0 addons/skin.confluence/720p/DialogPeripheralManager.xml
  7. +183 −0 addons/skin.confluence/720p/DialogPeripheralSettings.xml
  8. +93 −1 configure.in
  9. +33 −0 language/English/strings.xml
  10. +14 −0 project/BuildDependencies/scripts/libcec_d.bat
  11. +2 −0 project/BuildDependencies/scripts/libcec_d.txt
  12. +28 −5 project/VS2010Express/XBMC.vcxproj
  13. +94 −13 project/VS2010Express/XBMC.vcxproj.filters
  14. +0 −3 system/deviceidmappings.xml
  15. +41 −0 system/peripherals.xml
  16. +33 −5 xbmc/Application.cpp
  17. +1 −0 xbmc/Application.h
  18. +3 −0 xbmc/GUIUserMessages.h
  19. +2 −0 xbmc/guilib/Key.h
  20. +32 −2 xbmc/input/KeyboardStat.cpp
  21. +2 −0 xbmc/input/KeyboardStat.h
  22. +0 −96 xbmc/input/KeymapLoader.cpp
  23. +0 −1 xbmc/input/Makefile
  24. +6 −0 xbmc/interfaces/Builtins.cpp
  25. +6 −0 xbmc/peripherals/Makefile
  26. +170 −0 xbmc/peripherals/PeripheralTypes.h
  27. +466 −0 xbmc/peripherals/Peripherals.cpp
  28. +161 −0 xbmc/peripherals/Peripherals.h
  29. +18 −0 xbmc/peripherals/bus/Makefile.in
  30. +341 −0 xbmc/peripherals/bus/PeripheralBus.cpp
  31. +193 −0 xbmc/peripherals/bus/PeripheralBus.h
  32. +35 −0 xbmc/peripherals/bus/PeripheralBusUSB.h
  33. +84 −0 xbmc/peripherals/bus/linux/PeripheralBusUSBLibUSB.cpp
  34. +46 −0 xbmc/peripherals/bus/linux/PeripheralBusUSBLibUSB.h
  35. +181 −0 xbmc/peripherals/bus/linux/PeripheralBusUSBLibUdev.cpp
  36. +54 −0 xbmc/peripherals/bus/linux/PeripheralBusUSBLibUdev.h
  37. +278 −0 xbmc/peripherals/bus/osx/PeripheralBusUSB.cpp
  38. +58 −0 xbmc/peripherals/bus/osx/PeripheralBusUSB.h
  39. +138 −0 xbmc/peripherals/bus/win32/PeripheralBusUSB.cpp
  40. +45 −0 xbmc/peripherals/bus/win32/PeripheralBusUSB.h
  41. +16 −0 xbmc/peripherals/devices/Makefile.in
  42. +480 −0 xbmc/peripherals/devices/Peripheral.cpp
  43. +172 −0 xbmc/peripherals/devices/Peripheral.h
  44. +31 −0 xbmc/peripherals/devices/PeripheralBluetooth.cpp
  45. +8 −11 xbmc/{input/KeymapLoader.h → peripherals/devices/PeripheralBluetooth.h}
  46. +554 −0 xbmc/peripherals/devices/PeripheralCecAdapter.cpp
  47. +75 −0 xbmc/peripherals/devices/PeripheralCecAdapter.h
  48. +31 −0 xbmc/peripherals/devices/PeripheralDisk.cpp
  49. +33 −0 xbmc/peripherals/devices/PeripheralDisk.h
  50. +90 −0 xbmc/peripherals/devices/PeripheralHID.cpp
  51. +41 −0 xbmc/peripherals/devices/PeripheralHID.h
  52. +33 −0 xbmc/peripherals/devices/PeripheralNIC.cpp
  53. +33 −0 xbmc/peripherals/devices/PeripheralNIC.h
  54. +70 −0 xbmc/peripherals/devices/PeripheralNyxboard.cpp
  55. +34 −0 xbmc/peripherals/devices/PeripheralNyxboard.h
  56. +31 −0 xbmc/peripherals/devices/PeripheralTuner.cpp
  57. +33 −0 xbmc/peripherals/devices/PeripheralTuner.h
  58. +206 −0 xbmc/peripherals/dialogs/GUIDialogPeripheralManager.cpp
  59. +59 −0 xbmc/peripherals/dialogs/GUIDialogPeripheralManager.h
  60. +222 −0 xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp
  61. +50 −0 xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.h
  62. +7 −0 xbmc/peripherals/dialogs/Makefile
  63. +39 −0 xbmc/settings/GUIDialogSettings.cpp
  64. +2 −1 xbmc/settings/GUIDialogSettings.h
  65. +7 −6 xbmc/settings/GUISettings.cpp
  66. +22 −21 xbmc/settings/GUISettings.h
  67. +10 −0 xbmc/settings/GUIWindowSettingsCategory.cpp
  68. +4 −1 xbmc/video/windows/GUIWindowVideoBase.cpp
  69. +0 −74 xbmc/win32/WIN32USBScan.cpp
  70. +0 −5 xbmc/win32/WIN32USBScan.h
  71. +0 −3 xbmc/windowing/osx/WinEventsOSX.h
  72. +0 −180 xbmc/windowing/osx/WinEventsOSX.mm
  73. +4 −10 xbmc/windowing/windows/WinEventsWin32.cpp
View
@@ -125,6 +125,10 @@ config.log
/xbmc/guilib/Profile
/xbmc/guilib/Profile_FastCap
+# /xbmc/peripherals/
+/xbmc/peripherals/bus/Makefile
+/xbmc/peripherals/devices/Makefile
+
# /lib/
/lib/Makefile
@@ -226,6 +230,20 @@ lib/cmyth/Makefile
/lib/libass/m4/ltversion.m4
/lib/libass/m4/lt~obsolete.m4
+# /lib/libcec
+/lib/libcec/Makefile
+/lib/libcec/Makefile.in
+/lib/libcec/aclocal.m4
+/lib/libcec/config.guess
+/lib/libcec/config.sub
+/lib/libcec/configure
+/lib/libcec/depcomp
+/lib/libcec/install-sh
+/lib/libcec/ltmain.sh
+/lib/libcec/missing
+/lib/libcec/src/lib/Makefile.in
+/lib/libcec/src/testclient/Makefile.in
+
# /lib/libiconv
/lib/libiconv/libiconv_win32/Debug
/lib/libiconv/libiconv_win32/Release
View
@@ -73,7 +73,11 @@ BIN_DIRS= \
xbmc/input/linux \
xbmc/osx \
xbmc/threads \
- xbmc/windowing
+ xbmc/windowing \
+ xbmc/peripherals \
+ xbmc/peripherals/bus \
+ xbmc/peripherals/devices \
+ xbmc/peripherals/dialogs \
ifeq (@USE_OPENGL@,1)
BIN_DIRS += xbmc/rendering/gl
@@ -348,6 +352,14 @@ xbmc/utils/utils.a: force
$(MAKE) -C xbmc/utils
xbmc/osx/osx.a: force
$(MAKE) -C xbmc/osx
+xbmc/peripherals/peripherals.a: force
+ $(MAKE) -C xbmc/peripherals
+xbmc/peripherals/bus/peripheral-bus.a: force
+ $(MAKE) -C xbmc/peripherals/bus
+xbmc/peripherals/devices/peripheral-devices.a: force
+ $(MAKE) -C xbmc/peripherals/devices
+xbmc/peripherals/dialogs/peripheral-dialogs.a: force
+ $(MAKE) -C xbmc/peripherals/dialogs
lib/libapetag/.libs/libapetag.a: force
$(MAKE) -C lib/libapetag
lib/cpluff/libcpluff/.libs/libcpluff.a: force
@@ -482,7 +494,11 @@ OBJSXBMC= \
lib/libhts/libhts.a \
lib/xbmc-dll-symbols/dll-symbols.a \
xbmc/rendering/rendering.a \
- xbmc/windowing/windowing.a
+ xbmc/windowing/windowing.a \
+ xbmc/peripherals/peripherals.a \
+ xbmc/peripherals/bus/peripheral-bus.a \
+ xbmc/peripherals/devices/peripheral-devices.a \
+ xbmc/peripherals/dialogs/peripheral-dialogs.a
ifeq (@USE_OPENGL@,1)
OBJSXBMC += xbmc/rendering/gl/rendering_gl.a
View
@@ -55,7 +55,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
libbluetooth-dev, zlib1g-dev, libsmbclient-dev, libboost-thread-dev
libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev,
libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl, python-dev, libyajl-dev,
- libplist-dev
+ libplist-dev, libusb-dev, libudev-dev
*** For developers and anyone else who compiles frequently it is recommended to
use ccache
View
@@ -44,7 +44,7 @@ Two methods exist to install the required Ubuntu packages:
For Ubuntu (all versions >= 7.04):
- # sudo apt-get install git-core make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-dev libyajl-dev libboost-thread-dev libplist-dev
+ # sudo apt-get install git-core make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-dev libyajl-dev libboost-thread-dev libplist-dev libusb-dev libudev-dev
For Ubuntu Maverick (10.10):
# sudo apt-get install autopoint
Oops, something went wrong.
Oops, something went wrong.

0 comments on commit f4bb961

Please sign in to comment.