Conflicts: project/VS2010Express/XBMC.vcxproj.filters xbmc/dialogs/GUIDialogPlayEject.cpp xbmc/filesystem/LastFMDirectory.h xbmc/filesystem/LibraryDirectory.h xbmc/guilib/GUIColorManager.cpp xbmc/guilib/LocalizeStrings.cpp xbmc/utils/LangCodeExpander.cpp xbmc/utils/XMLUtils.h
…ng it from DIRECTORY_ARCHIVES
…ir that should be made
…SE_LIBCEC=1 and USE_EXTERNAL_LIBCEC=0 in Makefile.in. fixes compiler error on linux without --enable-libcec caused by 4f2c2b6
…t and use for default skin if permitted by code ifdef. fixed also check when xcode does copy root files for packaging into xbmc.app. fixed errors in copy root files, skin.touched has background not backgrounds dir
… --enable-external-libcec option to configure. to keep a permanent copy, remove "make download" from bootstrap to change the location of the tarball to another mirror, change lib/libcec/Makefile.in
…ripheralBusUSB into PeripheralBusUSBLibUdev and PeripheralBusUSBLibUSB. fixed automake files
This is a PR for a new "peripherals manager", /xbmc/peripherals, that detects devices and automatically configures them for use with XBMC. The device mappings and configurations can be defined in system/peripherals.xml. Users can modify settings via system->system->input->peripherals. It works as follows: - CPeripherals contains one or more CPeripheralBus instances. - CPeripheralBus contains the device scanning implementations for the different platforms we support. - The implementations for the devices can be found in peripheral/devices and all devices inherit from CPeripheral. - The devices that are detected are looked up in peripherals.xml, starting at the top of the file and going down. If no mapping was found for the device, an instance of one of the default classes will be created: CPeripheralHID, CPeripheralDisk or CPeripheralNIC. - in peripherals.xml, devices can be matched by vendor id (vendor="xxxx"), product id (product="xxxx"), bus type (bus="xxxx"), device class (class="xxxx") or a combination of these values. The class that will be instantiated for that device is defined in mapTo="xxxx" - the configuration for the device can be defined in peripherals.xml as well. Have a look at system/peripherals.xml, where you can find the possible settings in the demo entry at the bottom. When a device is inserted and there are any settings with configurable="true" present for that device, these settings will be added to the settings dialog, under system->system->input->peripherals. - an example of how these settings can be used can be found in CPeripheralHID, which checks for a "keymap" setting and will automatically switch the keymap XBMC uses to the one that is defined in the setting. TODO: - keep separate configs when the same device is found more than once - general review of this code.
…le building XBMCProjectM via configure option
* theuni/configure-cleanup: build: allow build without dbus build: don't check for enca. we haven't needed it for ages. build: configure option for enable/disable x11. build: make rsxs configurable
- sync of xcode projects
Also, there were a few X libs (xt and xmu) that appear to only be used by rsxs. We still check for them and link to them so that our packaging scripts (Ubuntu) are able to resolve deps correctly, otherwise the linking in the XBMC binary is unnecessary. We might consider removing these links and hinting to packagers instead.
…ing EGL. This is in prep for the addition of other windowing implementations that share common EGL bits
…ws." This reverts commit d8f3f66.
Small wrapper class is used to override LoadFile() and SaveFile() with code to use XBMC's VFS.
…bdir make archive list and use that
* topfs2/remove_jsoncpp: (21 commits) Fix. Added explicit typecast to platform int to quench warnings for variant use in jsonrpc [win32] replace jsoncpp with yajl Removed jsoncpp Added pragma and license to IClient.h Removed the dependency of jsoncpp in CVariant Switched to use CVariant instead of jsoncpp values in JSON-RPC Added yajl writer for Variant Added yajl parser for Variant Added c_str and have size of variant work with strings Added check for libyajl to configure Added CVariant::type which returns the type of the current variant (easier than multiple isFoo queries) Switched Variant to use double internally, still accepts floats Added swap method to CVariant Moved to use explicit type in CVariant instead of isFoo Added operator== to CVariant Added array and map iterators to CVariant Added CVariant constructor which takes a string pointer and length Added append to CVariant Added isMember to CVariant Removed debug in CVariant ... Conflicts: Makefile.in configure.in project/VS2010Express/XBMC.vcxproj xbmc/interfaces/json-rpc/AudioLibrary.cpp xbmc/interfaces/json-rpc/FileItemHandler.cpp xbmc/interfaces/json-rpc/FileItemHandler.h xbmc/interfaces/json-rpc/VideoLibrary.cpp