Merge remote branch 'origin/trunk' into trac-8658-try2
authorceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Fri, 17 Sep 2010 03:29:38 +0000 (03:29 +0000)
committerceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Fri, 17 Sep 2010 03:29:38 +0000 (03:29 +0000)
commit9de4d3a56e25ce4223e44b13b1c31b50792b9bae
treebf2f8ad6de0cfb34f0b89968726fcedb212a60ee
parentf8263546fb6c6b1d99a65892abe4c28dded86441
Merge remote branch 'origin/trunk' into trac-8658-try2

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/trac-8658-try2@33914 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
330 files changed:
Makefile.in
XBMC.xcodeproj/project.pbxproj
addons/metadata.albums.allmusic.com/addon.xml
addons/metadata.albums.allmusic.com/resources/language/Bulgarian/strings.xml [new file with mode: 0644]
addons/metadata.albums.allmusic.com/resources/language/Dutch/strings.xml [new file with mode: 0644]
addons/metadata.albums.allmusic.com/resources/language/Russian/strings.xml [new file with mode: 0644]
addons/metadata.albums.allmusic.com/resources/language/Swedish/strings.xml [new file with mode: 0644]
addons/metadata.artists.allmusic.com/addon.xml
addons/metadata.artists.allmusic.com/resources/language/Bulgarian/strings.xml [new file with mode: 0644]
addons/metadata.artists.allmusic.com/resources/language/Dutch/strings.xml [new file with mode: 0644]
addons/metadata.artists.allmusic.com/resources/language/Russian/strings.xml [new file with mode: 0644]
addons/metadata.artists.allmusic.com/resources/language/Swedish/strings.xml [new file with mode: 0644]
addons/metadata.common.allmusic.com/addon.xml
addons/metadata.common.hdtrailers.net/addon.xml
addons/metadata.common.htbackdrops.com/addon.xml
addons/metadata.common.last.fm/addon.xml
addons/metadata.common.last.fm/lastfm.xml
addons/metadata.common.themoviedb.org/addon.xml
addons/metadata.common.themoviedb.org/tmdb.xml
addons/metadata.mtv.com/addon.xml
addons/metadata.themoviedb.org/addon.xml
addons/metadata.themoviedb.org/changelog.txt
addons/metadata.themoviedb.org/resources/language/Bulgarian/strings.xml [new file with mode: 0644]
addons/metadata.themoviedb.org/resources/language/Dutch/strings.xml [new file with mode: 0644]
addons/metadata.themoviedb.org/resources/language/Russian/strings.xml [new file with mode: 0644]
addons/metadata.themoviedb.org/resources/language/Swedish/strings.xml [new file with mode: 0644]
addons/metadata.themoviedb.org/tmdb.xml
addons/metadata.tvdb.com/addon.xml
addons/metadata.tvdb.com/resources/language/Dutch/strings.xml [new file with mode: 0644]
addons/metadata.tvdb.com/resources/language/Russian/strings.xml [new file with mode: 0644]
addons/metadata.tvdb.com/resources/language/Swedish/strings.xml [new file with mode: 0644]
addons/repository.xbmc.org/addon.xml
addons/screensaver.rsxs.euphoria/addon.xml
addons/screensaver.rsxs.plasma/addon.xml
addons/screensaver.rsxs.solarwinds/addon.xml
addons/screensaver.xbmc.builtin.black/addon.xml
addons/screensaver.xbmc.builtin.dim/addon.xml
addons/screensaver.xbmc.builtin.dim/resources/language/Bulgarian/strings.xml [new file with mode: 0644]
addons/screensaver.xbmc.builtin.dim/resources/language/Dutch/strings.xml [new file with mode: 0644]
addons/screensaver.xbmc.builtin.dim/resources/language/Russian/strings.xml [new file with mode: 0644]
addons/screensaver.xbmc.builtin.dim/resources/language/Swedish/strings.xml [new file with mode: 0644]
addons/screensaver.xbmc.builtin.slideshow/addon.xml
addons/screensaver.xbmc.builtin.slideshow/resources/language/Dutch/strings.xml [new file with mode: 0644]
addons/screensaver.xbmc.builtin.slideshow/resources/language/Russian/strings.xml [new file with mode: 0644]
addons/screensaver.xbmc.builtin.slideshow/resources/language/Swedish/strings.xml [new file with mode: 0644]
addons/script.recentlyadded/addon.xml
addons/script.recentlyadded/default.py
addons/skin.confluence/language/Bulgarian/strings.xml
addons/skin.confluence/language/Dutch/strings.xml
addons/skin.confluence/language/Greek/strings.xml
addons/skin.confluence/language/Portuguese (Brazil)/strings.xml
addons/skin.confluence/language/Russian/strings.xml
addons/skin.confluence/language/Swedish/strings.xml
addons/skin.confluence/media/Makefile
addons/skin.confluence/media/flagging/video/sd.png [deleted file]
addons/visualization.dxspectrum/addon.xml
addons/visualization.dxspectrum/resources/language/Bulgarian/strings.xml [new file with mode: 0644]
addons/visualization.dxspectrum/resources/language/Dutch/strings.xml
addons/visualization.dxspectrum/resources/language/Swedish/strings.xml [new file with mode: 0644]
addons/visualization.glspectrum/addon.xml
addons/visualization.glspectrum/resources/language/Bulgarian/strings.xml [new file with mode: 0644]
addons/visualization.glspectrum/resources/language/Dutch/strings.xml
addons/visualization.glspectrum/resources/language/Russian/strings.xml [new file with mode: 0644]
addons/visualization.glspectrum/resources/language/Swedish/strings.xml [new file with mode: 0644]
addons/visualization.itunes/addon.xml
addons/visualization.milkdrop/addon.xml
addons/visualization.milkdrop/resources/language/Bulgarian/strings.xml [new file with mode: 0644]
addons/visualization.milkdrop/resources/language/Dutch/strings.xml
addons/visualization.milkdrop/resources/language/Russian/strings.xml [new file with mode: 0644]
addons/visualization.milkdrop/resources/language/Swedish/strings.xml [new file with mode: 0644]
addons/visualization.projectm/addon.xml
addons/visualization.projectm/resources/language/Bulgarian/strings.xml [new file with mode: 0644]
addons/visualization.projectm/resources/language/Dutch/strings.xml
addons/visualization.projectm/resources/language/Russian/strings.xml [new file with mode: 0644]
addons/visualization.projectm/resources/language/Swedish/strings.xml [new file with mode: 0644]
addons/visualization.waveform/addon.xml
addons/weather.xbmc.builtin/addon.xml
addons/webinterface.default/addon.xml [new file with mode: 0644]
addons/webinterface.default/css/core.css [new file with mode: 0644]
addons/webinterface.default/css/ipad.css [new file with mode: 0644]
addons/webinterface.default/favicon.ico [new file with mode: 0644]
addons/webinterface.default/images/DefaultAlbumCover.png [new file with mode: 0644]
addons/webinterface.default/images/DefaultVideo.png [new file with mode: 0644]
addons/webinterface.default/images/ajax-loader.gif [new file with mode: 0644]
addons/webinterface.default/images/close-button.png [new file with mode: 0644]
addons/webinterface.default/index.html [new file with mode: 0644]
addons/webinterface.default/js/Core.js [new file with mode: 0644]
addons/webinterface.default/js/Launcher.js [new file with mode: 0644]
addons/webinterface.default/js/MediaLibrary.js [new file with mode: 0644]
addons/webinterface.default/js/NowPlayingManager.js [new file with mode: 0644]
addons/webinterface.default/js/iscroll-min.js [new file with mode: 0644]
addons/webinterface.default/js/jquery-1.4.2.js [new file with mode: 0644]
addons/webinterface.default/js/jquery-1.4.2.min.js [new file with mode: 0644]
addons/webinterface.default/js/jquery.lazyload.js [new file with mode: 0644]
addons/xbmc.gui/addon.xml
guilib/DDSImage.cpp
guilib/GUIScrollBarControl.cpp
guilib/GUIShader.cpp
guilib/GUIShader.h
guilib/GUITextureGLES.cpp
guilib/GraphicContext.cpp
guilib/Key.h
guilib/Texture.cpp
language/Bulgarian/strings.xml
language/Chinese (Simple)/strings.xml
language/Chinese (Traditional)/langinfo.xml
language/Dutch/strings.xml
language/English/strings.xml
language/French/strings.xml
language/Greek/strings.xml
language/Hungarian/strings.xml
language/Korean/strings.xml
language/Norwegian/strings.xml
language/Polish/strings.xml
language/Portuguese (Brazil)/strings.xml
language/Portuguese/strings.xml
language/Russian/strings.xml
language/Swedish/strings.xml
lib/libmicrohttpd_win32/bin/libgpg-error-0.dll
project/BuildDependencies/scripts/libsdl_d.bat
project/BuildDependencies/scripts/libsdl_d.txt
project/VS2008Express/XBMC.vcproj
project/VS2010Express/XBMC.vcxproj
project/VS2010Express/XBMC.vcxproj.filters
project/Win32BuildSetup/BuildSetup.bat
project/Win32BuildSetup/XBMC for Windows.nsi
system/colors.xml
system/keymaps/gamepad.xml
system/keymaps/joystick.AppleRemote.xml
system/keymaps/joystick.Harmony.xml
system/keymaps/joystick.Logitech.RumblePad.2.xml
system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
system/keymaps/joystick.Microsoft.Xbox.Controller.S.xml
system/keymaps/joystick.PS3.Remote.Keyboard.xml
system/keymaps/joystick.WiiRemote.xml
system/keymaps/keyboard.xml
system/keymaps/remote.xml
system/players/dvdplayer/avcodec-52.dll
system/players/dvdplayer/avformat-52.dll
system/players/dvdplayer/avutil-50.dll
system/players/dvdplayer/postproc-51.dll
system/players/dvdplayer/swscale-0.6.1.dll
system/shaders/guishader_frag.glsl [deleted file]
system/shaders/guishader_frag0.glsl [deleted file]
system/shaders/guishader_frag1.glsl [deleted file]
system/shaders/guishader_frag2.glsl [deleted file]
system/shaders/guishader_frag3.glsl [deleted file]
system/shaders/guishader_frag4.glsl [deleted file]
system/shaders/guishader_frag_default.glsl [new file with mode: 0644]
system/shaders/guishader_frag_fonts.glsl [new file with mode: 0644]
system/shaders/guishader_frag_multi.glsl [new file with mode: 0644]
system/shaders/guishader_frag_texture.glsl [new file with mode: 0644]
system/shaders/guishader_frag_texture_noblend.glsl [new file with mode: 0644]
tools/Linux/packaging/debian/rules.hardy
tools/TexturePacker/Makefile.in
tools/TexturePacker/TexturePacker.exe
tools/TexturePacker/Win32/MakeDDS.vcproj
tools/TexturePacker/Win32/TexturePacker.vcproj
tools/TexturePacker/XBMCTex.cpp
tools/TexturePacker/XBTFWriter.cpp
tools/TexturePacker/XBTFWriter.h
tools/TexturePacker/md5.c [new file with mode: 0644]
tools/TexturePacker/md5.h [new file with mode: 0644]
tools/XBMCLive/Live-post.d/1-setVolumes.sh [new file with mode: 0644]
tools/XBMCLive/Live-post.d/2-mountDisks.sh [new file with mode: 0644]
tools/XBMCLive/Live-post.d/3-setupWakeFromUSB.sh [new file with mode: 0644]
tools/XBMCLive/Live-pre.d/1-configureXorg.sh [new file with mode: 0644]
tools/XBMCLive/Live-pre.d/2-profileRedir.sh [new file with mode: 0644]
tools/XBMCLive/Live-pre.d/3-configNVIDIAHDMI.sh [new file with mode: 0644]
tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/hwSetup_AMD.sh
tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/hwSetup_NVIDIA.sh
tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/hwSetup_NVIDIA_HDMI.sh [new file with mode: 0644]
tools/XBMCLive/SDK/buildLive/Files/binary_local-includes/Hooks/setupSources.sh
tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/16-alsaUpgrade
tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/17-wirelessUpgrade
tools/XBMCLive/SDK/buildLive/Files/chroot_local-includes/etc/ntp.conf [new file with mode: 0644]
tools/XBMCLive/setAlsaVolumes.c
tools/XBMCLive/xbmc-live.upstart-new [new file with mode: 0644]
web/poc_jsonrpc/albums.html [deleted file]
web/poc_jsonrpc/artists.html [deleted file]
web/poc_jsonrpc/basic.css [deleted file]
web/poc_jsonrpc/development.html [deleted file]
web/poc_jsonrpc/help.js [deleted file]
web/poc_jsonrpc/images/DefaultAlbumCover.png [deleted file]
web/poc_jsonrpc/images/DefaultFolder.png [deleted file]
web/poc_jsonrpc/images/DefaultVideo.png [deleted file]
web/poc_jsonrpc/images/OSDNextTrackFO.png [deleted file]
web/poc_jsonrpc/images/OSDPlayFO.png [deleted file]
web/poc_jsonrpc/images/OSDPrevTrackFO.png [deleted file]
web/poc_jsonrpc/images/OSDStopFO.png [deleted file]
web/poc_jsonrpc/images/play.png [deleted file]
web/poc_jsonrpc/index.html [deleted file]
web/poc_jsonrpc/json.js [deleted file]
web/poc_jsonrpc/movies.html [deleted file]
web/poc_jsonrpc/musicfiles.html [deleted file]
web/poc_jsonrpc/nowplaying.html [deleted file]
web/poc_jsonrpc/tvshowepisodes.html [deleted file]
web/poc_jsonrpc/tvshows.html [deleted file]
web/poc_jsonrpc/tvshowseasons.html [deleted file]
web/poc_jsonrpc/videofiles.html [deleted file]
xbmc/APEv2Tag.cpp
xbmc/AddonDatabase.cpp
xbmc/AddonDatabase.h
xbmc/AdvancedSettings.cpp
xbmc/AdvancedSettings.h
xbmc/Application.cpp
xbmc/ApplicationMessenger.cpp
xbmc/ApplicationMessenger.h
xbmc/ButtonTranslator.cpp
xbmc/ButtonTranslator.h
xbmc/DateTime.cpp
xbmc/DateTime.h
xbmc/FileSystem/AddonsDirectory.cpp
xbmc/FileSystem/AddonsDirectory.h
xbmc/FileSystem/Directory.cpp
xbmc/FileSystem/File.cpp
xbmc/FileSystem/FileSpecialProtocol.cpp
xbmc/FileSystem/IDirectory.cpp
xbmc/FileSystem/IDirectory.h
xbmc/FileSystem/LastFMDirectory.cpp
xbmc/FileSystem/MusicDatabaseDirectory/DirectoryNodeAlbum.cpp
xbmc/FileSystem/PluginDirectory.cpp
xbmc/FileSystem/RSSDirectory.cpp
xbmc/FileSystem/SMBDirectory.cpp
xbmc/FileSystem/SpecialProtocol.cpp
xbmc/FileSystem/SpecialProtocol.h
xbmc/FileSystem/UPnPDirectory.cpp
xbmc/GUIDialogAudioSubtitleSettings.cpp
xbmc/GUIDialogBoxBase.cpp
xbmc/GUIDialogBoxBase.h
xbmc/GUIDialogFileBrowser.cpp
xbmc/GUIDialogKeyboard.cpp
xbmc/GUIDialogKeyboard.h
xbmc/GUIDialogOK.cpp
xbmc/GUIDialogOK.h
xbmc/GUIDialogSmartPlaylistRule.cpp
xbmc/GUIMediaWindow.cpp
xbmc/GUIPassword.cpp
xbmc/GUISettings.cpp
xbmc/GUISettings.h
xbmc/GUIWindowAddonBrowser.cpp
xbmc/GUIWindowAddonBrowser.h
xbmc/GUIWindowMusicBase.cpp
xbmc/GUIWindowSettingsCategory.cpp
xbmc/GUIWindowVideoBase.cpp
xbmc/GUIWindowVideoFiles.cpp
xbmc/MusicDatabase.cpp
xbmc/MusicDatabase.h
xbmc/MusicInfoScanner.cpp
xbmc/NfoFile.cpp
xbmc/PlayListM3U.cpp
xbmc/PlayListPlayer.cpp
xbmc/PlayListPlayer.h
xbmc/RenderSystem.cpp
xbmc/RenderSystem.h
xbmc/RenderSystemDX.cpp
xbmc/RenderSystemGLES.cpp
xbmc/RenderSystemGLES.h
xbmc/Settings.h
xbmc/TextureCache.cpp
xbmc/UPnP.cpp
xbmc/URL.cpp
xbmc/Util.cpp
xbmc/Util.h
xbmc/VideoInfoScanner.cpp
xbmc/VideoInfoTag.cpp
xbmc/WinEventsWin32.cpp
xbmc/WinSystemEGL.cpp
xbmc/WinSystemWin32.cpp
xbmc/addons/Addon.cpp
xbmc/addons/AddonManager.cpp
xbmc/addons/AddonManager.h
xbmc/addons/IAddon.h
xbmc/addons/Repository.cpp
xbmc/addons/Repository.h
xbmc/addons/Scraper.cpp
xbmc/cores/AudioRenderers/Win32DirectSound.cpp
xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
xbmc/cores/IPlayer.h
xbmc/cores/VideoRenderers/BaseRenderer.cpp
xbmc/cores/VideoRenderers/BaseRenderer.h
xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
xbmc/cores/VideoRenderers/OverlayRendererDX.cpp
xbmc/cores/VideoRenderers/OverlayRendererGL.cpp
xbmc/cores/VideoRenderers/RenderManager.cpp
xbmc/cores/dvdplayer/Codecs/ffmpeg/build_xbmc_win32.sh
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavcodec/vp3.c
xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp
xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
xbmc/cores/dvdplayer/DVDFileInfo.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp
xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
xbmc/cores/dvdplayer/Edl.cpp
xbmc/cores/paplayer/MP3codec.cpp
xbmc/lib/libPython/linux/Makefile.in
xbmc/lib/libPython/xbmcmodule/controlslider.cpp
xbmc/lib/libhttpapi/HttpApi.cpp
xbmc/lib/libhttpapi/XBMChttp.cpp
xbmc/lib/libjsonrpc/AVPlaylistOperations.cpp
xbmc/lib/libjsonrpc/AudioLibrary.cpp
xbmc/lib/libjsonrpc/FileItemHandler.cpp
xbmc/lib/libjsonrpc/JSONRPC.cpp
xbmc/lib/libjsonrpc/TCPServer.cpp
xbmc/lib/libjsonrpc/TCPServer.h
xbmc/linux/ConsoleUPowerSyscall.cpp
xbmc/screensavers/rsxs-0.9/xbmc/Makefile.in
xbmc/utils/Builtins.cpp
xbmc/utils/CharsetConverter.cpp
xbmc/utils/CriticalSection.cpp
xbmc/utils/CriticalSection.h
xbmc/utils/GUIInfoManager.cpp
xbmc/utils/HTMLUtil.cpp
xbmc/utils/MusicInfoScraper.cpp
xbmc/utils/MusicInfoScraper.h
xbmc/utils/PasswordManager.cpp
xbmc/utils/TuxBoxUtil.cpp
xbmc/utils/Variant.cpp
xbmc/utils/Variant.h
xbmc/utils/WebServer.cpp
xbmc/utils/WebServer.h
xbmc/win32/WINSMBDirectory.cpp