merged: changes from trunk. revs: r32301:32551
authoralwinus <alwinus@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Fri, 6 Aug 2010 22:06:18 +0000 (22:06 +0000)
committeralwinus <alwinus@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Fri, 6 Aug 2010 22:06:18 +0000 (22:06 +0000)
commitdbdea843c8abc5b2407e518494cfa7a6109dbbf4
tree019826837392b877befecde4efaba5d56eb696f7
parentfcd51b7008c154e56e12b5649f172233a10d2f39
merged: changes from trunk. revs: r32301:32551

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/pvr-testing2@32552 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
211 files changed:
.gitignore
Makefile.in
XBMC.xcodeproj/project.pbxproj
addons/metadata.albums.allmusic.com/addon.xml
addons/metadata.albums.allmusic.com/resources/language/French/strings.xml [new file with mode: 0644]
addons/metadata.artists.allmusic.com/addon.xml
addons/metadata.artists.allmusic.com/resources/language/French/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.themoviedb.org/addon.xml
addons/metadata.mtv.com/addon.xml
addons/metadata.themoviedb.org/addon.xml
addons/metadata.themoviedb.org/resources/language/French/strings.xml [new file with mode: 0644]
addons/metadata.tvdb.com/addon.xml
addons/metadata.tvdb.com/resources/language/French/strings.xml [new file with mode: 0644]
addons/metadata.tvdb.com/resources/language/Portuguese/strings.xml
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/Chinese (Simple)/strings.xml [new file with mode: 0644]
addons/screensaver.xbmc.builtin.dim/resources/language/French/strings.xml [new file with mode: 0644]
addons/screensaver.xbmc.builtin.dim/resources/language/Portuguese/strings.xml [new file with mode: 0644]
addons/screensaver.xbmc.builtin.slideshow/addon.xml
addons/screensaver.xbmc.builtin.slideshow/resources/language/Chinese (Simple)/strings.xml [new file with mode: 0644]
addons/screensaver.xbmc.builtin.slideshow/resources/language/French/strings.xml [new file with mode: 0644]
addons/script.recentlyadded/addon.xml
addons/skin.confluence/addon.xml
addons/visualization.dxspectrum/addon.xml
addons/visualization.dxspectrum/resources/language/French/strings.xml [new file with mode: 0644]
addons/visualization.dxspectrum/resources/language/Portuguese/strings.xml [new file with mode: 0644]
addons/visualization.glspectrum/addon.xml
addons/visualization.glspectrum/resources/language/French/strings.xml [new file with mode: 0644]
addons/visualization.itunes/addon.xml
addons/visualization.milkdrop/addon.xml
addons/visualization.milkdrop/resources/language/French/strings.xml [new file with mode: 0644]
addons/visualization.milkdrop/resources/language/Portuguese/strings.xml [new file with mode: 0644]
addons/visualization.projectm/addon.xml
addons/visualization.projectm/resources/language/French/strings.xml [new file with mode: 0644]
addons/visualization.projectm/resources/language/Portuguese/strings.xml [new file with mode: 0644]
addons/visualization.waveform/addon.xml
addons/weather.xbmc.builtin/addon.xml
bootstrap
configure.in
guilib/D3DResource.cpp
guilib/D3DResource.h
guilib/TextureManager.cpp
guilib/system.h
language/French/strings.xml
language/Greek/strings.xml
language/Hungarian/strings.xml
language/Portuguese (Brazil)/strings.xml
language/Portuguese/strings.xml
lib/addons/script.module.pysqlite/Makefile
lib/librtmp/darwin_package_librtmp.sh
lib/libvpx/Makefile [deleted file]
project/VS2008Express/XBMC.vcproj
project/VS2010Express/XBMC.vcxproj
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
tools/Linux/packaging/debian/changelog
tools/Linux/packaging/debian/control
tools/Linux/packaging/debian/control.in
tools/Linux/packaging/debian/copyright
tools/Linux/packaging/debian/rules
tools/Linux/packaging/debian/rules.hardy
tools/Linux/packaging/debian/var_info
tools/Linux/packaging/debian/xbmc-get-orig-source
tools/Linux/packaging/debian/xbmc-live.install
tools/Linux/packaging/debian/xbmc-live.upstart [new file with mode: 0644]
tools/Linux/packaging/debian/xbmc-scripts-example.install [deleted file]
tools/XBMCLive/SDK/Tools/cloneLiveHelper.sh
tools/XBMCLive/SDK/build.sh
tools/XBMCLive/SDK/buildBinaryDrivers/Files/chroot_local-hooks/10-buildBC.sh
tools/XBMCLive/SDK/buildBinaryDrivers/Files/chroot_local-hooks/20-buildAMD.sh
tools/XBMCLive/SDK/buildBinaryDrivers/Files/chroot_local-hooks/30-buildNVIDIA.sh
tools/XBMCLive/SDK/buildDEBs/build-live-initramfs.sh
tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/00-installCrystalHD.lucid-variant
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-packageslists/packages.list.lucid-variant
tools/XBMCLive/SDK/buildLive/build.sh
tools/XBMCLive/SDK/copyFiles-addons.sh.lucid-variant
tools/XBMCLive/SDK/copyFiles-crystalhd.sh.lucid-variant
xbmc/Application.cpp
xbmc/AutoPtrHandle.cpp [deleted file]
xbmc/AutoPtrHandle.h [deleted file]
xbmc/FileItem.cpp
xbmc/FileItem.h
xbmc/FileSystem/AddonsDirectory.cpp
xbmc/FileSystem/File.cpp
xbmc/FileSystem/File.h
xbmc/FileSystem/FileHD.cpp
xbmc/FileSystem/FileHD.h
xbmc/FileSystem/FileSFTP.cpp
xbmc/FileSystem/FileSFTP.h
xbmc/FileSystem/HTSPDirectory.cpp
xbmc/FileSystem/HTSPSession.cpp
xbmc/FileSystem/PluginDirectory.cpp
xbmc/FileSystem/VirtualDirectory.cpp
xbmc/GUILargeTextureManager.cpp
xbmc/GUIMediaWindow.cpp
xbmc/GUIPassword.cpp
xbmc/GUISettings.h
xbmc/GUIViewState.cpp
xbmc/GUIViewState.h
xbmc/GUIViewStateAddonBrowser.cpp
xbmc/GUIViewStateVideo.cpp
xbmc/GUIWindowAddonBrowser.cpp
xbmc/GUIWindowSettingsCategory.cpp
xbmc/GUIWindowVideoBase.cpp
xbmc/GUIWindowVideoBase.h
xbmc/GUIWindowVideoInfo.cpp
xbmc/GUIWindowVideoNav.cpp
xbmc/Makefile.in
xbmc/PlayList.cpp
xbmc/PlayList.h
xbmc/PlayListM3U.cpp
xbmc/PlayListPlayer.cpp
xbmc/RenderSystemDX.cpp
xbmc/RenderSystemDX.h
xbmc/Util.cpp
xbmc/Util.h
xbmc/VideoDatabase.cpp
xbmc/VideoInfoScanner.cpp
xbmc/addons/Repository.cpp
xbmc/cores/AudioRenderers/Win32WASAPI.cpp
xbmc/cores/DllLoader/Win32DllLoader.cpp
xbmc/cores/DllLoader/exports/emu_kernel32.cpp
xbmc/cores/DllLoader/exports/emu_kernel32.h
xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
xbmc/cores/VideoRenderers/OverlayRendererDX.cpp
xbmc/cores/VideoRenderers/VideoShaders/WinVideoFilter.cpp
xbmc/cores/VideoRenderers/VideoShaders/WinVideoFilter.h
xbmc/cores/VideoRenderers/WinRenderer.cpp
xbmc/cores/VideoRenderers/WinRenderer.h
xbmc/cores/dvdplayer/Codecs/ffmpeg/build_xbmc_win32.sh
xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/mpegts.c
xbmc/cores/dvdplayer/Codecs/ffmpeg/patches/0030-add-build-scripts.patch
xbmc/cores/dvdplayer/Codecs/libbdnav/Makefile.am [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/README.txt [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/configure.ac [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/m4/.gitignore [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/Makefile.am [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/bluray.c [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/bluray.h [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/file/configfile.c [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/file/configfile.h [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/file/dir.h [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/file/dir_posix.c [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/file/dir_xbmc.cpp [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/file/file.h [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/file/file_posix.c [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/file/file_xbmc.cpp [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/COPYING [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/Makefile.am [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/bdparse.h [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/clpi_parse.c [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/clpi_parse.h [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/mpls_parse.c [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/mpls_parse.h [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/navigation.c [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/libbdnav/navigation.h [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/util/bits.h [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/util/logging.c [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/util/logging.h [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/util/macro.h [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/util/strutl.c [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/src/util/strutl.h [deleted file]
xbmc/cores/dvdplayer/Codecs/libbdnav/tools/genconfigfile.c [deleted file]
xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.h
xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMPLS.cpp [deleted file]
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMPLS.h [deleted file]
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp
xbmc/cores/dvdplayer/DVDInputStreams/Makefile
xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagMicroDVD.cpp
xbmc/lib/libPython/XBPython.cpp
xbmc/lib/libPython/xbmcmodule/controlprogress.cpp
xbmc/lib/libPython/xbmcmodule/dialog.cpp
xbmc/lib/libPython/xbmcmodule/dialog.h
xbmc/osx/Makefile.in
xbmc/utils/AutoPtrHandle.cpp [new file with mode: 0644]
xbmc/utils/AutoPtrHandle.h [new file with mode: 0644]
xbmc/utils/Builtins.cpp
xbmc/utils/GUIInfoManager.cpp
xbmc/utils/GUIInfoManager.h
xbmc/utils/IMDB.cpp
xbmc/utils/IMDB.h
xbmc/utils/Makefile
xbmc/utils/Network.cpp
xbmc/utils/SaveFileStateJob.h
xbmc/visualizations/Milkdrop/MilkdropXBMC.cpp
xbmc/visualizations/Milkdrop/vis_milkdrop/dxcontext.cpp
xbmc/visualizations/Milkdrop/vis_milkdrop/dxcontext.h
xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/Compiler.c