merge with trunk
authorbobo1on1 <bobo1on1@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Tue, 27 Apr 2010 14:36:10 +0000 (14:36 +0000)
committerbobo1on1 <bobo1on1@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Tue, 27 Apr 2010 14:36:10 +0000 (14:36 +0000)
commit7187d43a5b6c465abd67e8f64fa1297f8195a10b
treee8825500fac8a010785256bc8312aaadca480285
parent5ff1c4748c867ce25063bbde9bb1517dc2a374b6
merge with trunk

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/boblight@29547 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
223 files changed:
.gitignore
Makefile.in
README.osx
XBMC.xcodeproj/project.pbxproj
configure.in
guilib/GUIBaseContainer.cpp
guilib/GUIButtonScroller.cpp
guilib/GUIColorManager.cpp
guilib/GUIControl.cpp
guilib/GUIControlFactory.cpp
guilib/GUIFontManager.cpp
guilib/GUIIncludes.cpp
guilib/GUIListItemLayout.cpp
guilib/GUIWindow.cpp
guilib/GUIWindowManager.cpp
guilib/Key.h
guilib/Makefile.in
guilib/SkinInfo.cpp [deleted file]
guilib/SkinInfo.h [deleted file]
guilib/TextureBundleXBT.cpp
guilib/TextureBundleXPR.cpp
guilib/VisibleEffect.cpp
language/English/strings.xml
lib/enca/libenca_win32/libenca_win32.vcxproj
lib/fribidi/libfridibidi/libfridibidi.vcxproj
lib/fribidi/libfridibidi/libfridibidi.vcxproj.filters
lib/libcdio/libcdio.vcxproj
lib/libiconv/libiconv_win32/libiconv_win32.vcxproj
lib/libiconv/libiconv_win32/libiconv_win32.vcxproj.filters
lib/libmodplug/libmodplug_2010.vcxproj
lib/pcre/libpcre/libpcre.vcxproj
project/VS2008Express/XBMC for Windows.sln
project/VS2008Express/XBMC.vcproj
project/VS2008Express/guilib.vcproj
project/VS2010Express/XBMC for Windows.sln
project/VS2010Express/XBMC.vcxproj
project/VS2010Express/guilib.vcxproj
project/VS2010Express/libPlatinum.vcxproj
skin/Confluence/720p/DialogAddonInfo.xml [new file with mode: 0644]
skin/Confluence/720p/DialogFullScreenInfo.xml
skin/Confluence/720p/IncludesCodecFlagging.xml
skin/Confluence/720p/MyVideoNav.xml
skin/Confluence/720p/includes.xml
system/freetype6.dll [deleted file]
system/libid3tag.dll [deleted file]
system/players/dvdplayer/libmad.dll [deleted file]
system/players/paplayer/MACDll.dll [deleted file]
system/players/paplayer/NoseFart.dll [deleted file]
system/players/paplayer/adpcm.dll [deleted file]
system/players/paplayer/libsidplay2.dll [deleted file]
system/players/paplayer/vgmstream.dll [deleted file]
system/players/paplayer/vorbisfile.dll [deleted file]
system/scrapers/video/cine-passion.png [deleted file]
system/scrapers/video/cine-passion.xml [deleted file]
system/scrapers/video/daum-tv.xml [deleted file]
system/scrapers/video/daum.png [deleted file]
system/scrapers/video/daum.xml [deleted file]
system/scrapers/video/moviemeter.jpg [deleted file]
system/scrapers/video/moviemeter.xml [deleted file]
system/scrapers/video/naver.png [deleted file]
system/scrapers/video/naver.xml [deleted file]
tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/finish-install.d/91modifyGrubMenu [deleted file]
tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/finish-install.d/91modifyGrubMenu.karmic-variant [new file with mode: 0755]
tools/XBMCLive/SDK/buildDEBs/xbmclive-installhelpers/finish-install.d/91modifyGrubMenu.lucid-variant [new file with mode: 0644]
tools/XBMCLive/SDK/buildHook-grub2.sh.karmic-variant
tools/XBMCLive/SDK/buildLive/Files/binary_debian-installer/preseed.cfg [deleted file]
tools/XBMCLive/SDK/buildLive/Files/binary_debian-installer/preseed.cfg.karmic-variant [new file with mode: 0644]
tools/XBMCLive/SDK/buildLive/Files/binary_debian-installer/preseed.cfg.lucid-variant [new file with mode: 0644]
tools/XBMCLive/SDK/buildLive/Files/binary_grub/grub.cfg.lucid-variant
tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/02-setGLDrivers.lucid-variant
tools/XBMCLive/SDK/buildLive/Files/chroot_local-includes/etc/live-persistence.binds [new file with mode: 0644]
tools/XBMCLive/xbmc-live.conf
xbmc/AddonDatabase.cpp
xbmc/AddonDatabase.h
xbmc/Application.cpp
xbmc/Application.h
xbmc/ButtonTranslator.cpp
xbmc/FileItem.cpp
xbmc/FileItem.h
xbmc/FileSystem/AddonsDirectory.cpp
xbmc/FileSystem/DAVDirectory.cpp
xbmc/FileSystem/Directory.cpp
xbmc/GUIDialogAddonInfo.cpp [new file with mode: 0644]
xbmc/GUIDialogAddonInfo.h [new file with mode: 0644]
xbmc/GUIDialogAudioSubtitleSettings.cpp
xbmc/GUIDialogContextMenu.cpp
xbmc/GUIDialogContextMenu.h
xbmc/GUIDialogFileBrowser.cpp
xbmc/GUIDialogFileBrowser.h
xbmc/GUIDialogMediaSource.cpp
xbmc/GUIDialogProfileSettings.cpp
xbmc/GUIDialogSongInfo.cpp
xbmc/GUIDialogVideoSettings.cpp
xbmc/GUIDialogYesNo.cpp
xbmc/GUIDialogYesNo.h
xbmc/GUISettings.cpp
xbmc/GUISettings.h
xbmc/GUIViewStateAddonBrowser.cpp
xbmc/GUIWindowAddonBrowser.cpp
xbmc/GUIWindowAddonBrowser.h
xbmc/GUIWindowLoginScreen.cpp
xbmc/GUIWindowMusicInfo.cpp
xbmc/GUIWindowMusicNav.cpp
xbmc/GUIWindowMusicNav.h
xbmc/GUIWindowPrograms.cpp
xbmc/GUIWindowSettingsCategory.cpp
xbmc/GUIWindowSettingsCategory.h
xbmc/GUIWindowVideoBase.cpp
xbmc/GUIWindowVideoInfo.cpp
xbmc/GUIWindowVideoNav.cpp
xbmc/Makefile.in
xbmc/MusicDatabase.cpp
xbmc/PictureThumbLoader.cpp
xbmc/PictureThumbLoader.h
xbmc/RenderSystemDX.cpp
xbmc/Settings.cpp
xbmc/Settings.h
xbmc/SettingsControls.cpp
xbmc/TextureCache.cpp
xbmc/TextureCache.h
xbmc/ThumbLoader.cpp
xbmc/ThumbLoader.h
xbmc/VideoDatabase.cpp
xbmc/WinSystemWin32.cpp
xbmc/WinSystemWin32.h
xbmc/addons/Addon.cpp
xbmc/addons/Addon.h
xbmc/addons/AddonManager.cpp
xbmc/addons/AddonManager.h
xbmc/addons/IAddon.h
xbmc/addons/Makefile [new file with mode: 0644]
xbmc/addons/Makefile.in [deleted file]
xbmc/addons/Repository.cpp
xbmc/addons/Repository.h
xbmc/addons/Skin.cpp [new file with mode: 0644]
xbmc/addons/Skin.h [new file with mode: 0644]
xbmc/addons/Visualisation.cpp
xbmc/cores/AudioRenderers/ALSADirectSound.cpp
xbmc/cores/AudioRenderers/Win32DirectSound.cpp
xbmc/cores/AudioRenderers/Win32WASAPI.cpp
xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
xbmc/cores/dvdplayer/Codecs/ffmpeg/include/dxva2/dxva2api.h
xbmc/cores/dvdplayer/Codecs/libdts/vc++/libdts.vcproj
xbmc/cores/dvdplayer/Codecs/libdts/vc++/libdts.vcxproj [new file with mode: 0644]
xbmc/cores/dvdplayer/Codecs/libdts/vc++/libdts.vcxproj.filters [new file with mode: 0644]
xbmc/cores/dvdplayer/Codecs/libfaad2/libfaad/libfaad2_dll.vcxproj
xbmc/cores/dvdplayer/Codecs/libmad/msvc++/libmad.vcproj
xbmc/cores/dvdplayer/Codecs/libmad/msvc++/libmad.vcxproj [new file with mode: 0644]
xbmc/cores/dvdplayer/Codecs/libmad/msvc++/libmad.vcxproj.filters [new file with mode: 0644]
xbmc/cores/dvdplayer/Codecs/libmad/xbox/compile.sh [deleted file]
xbmc/cores/dvdplayer/Codecs/libmad/xbox/configure.sh [deleted file]
xbmc/cores/dvdplayer/Codecs/libmad/xbox/libmad.def [deleted file]
xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp
xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
xbmc/cores/dvdplayer/DVDPlayer.cpp
xbmc/cores/paplayer/AC3Codec/vc++/AC3Codec.vcproj
xbmc/cores/paplayer/AC3Codec/vc++/AC3Codec.vcxproj [new file with mode: 0644]
xbmc/cores/paplayer/AC3Codec/vc++/AC3Codec.vcxproj.filters [new file with mode: 0644]
xbmc/cores/paplayer/ADPCMCodec/adpcm.vcproj
xbmc/cores/paplayer/ADPCMCodec/adpcm.vcxproj [new file with mode: 0644]
xbmc/cores/paplayer/ADPCMCodec/adpcm.vcxproj.filters [new file with mode: 0644]
xbmc/cores/paplayer/NSFCodec/NoseFartXBMC.vcproj
xbmc/cores/paplayer/NSFCodec/NoseFartXBMC.vcxproj [new file with mode: 0644]
xbmc/cores/paplayer/NSFCodec/NoseFartXBMC.vcxproj.filters [new file with mode: 0644]
xbmc/cores/paplayer/NSFCodec/src/log.h
xbmc/cores/paplayer/NSFCodec/src/memguard.c
xbmc/cores/paplayer/SIDCodec/libsidplay/win/VC/libsidplay.sln
xbmc/cores/paplayer/SIDCodec/libsidplay/win/VC/libsidplay.vcproj
xbmc/cores/paplayer/SIDCodec/libsidplay/win/VC/libsidplay.vcxproj [new file with mode: 0644]
xbmc/cores/paplayer/SIDCodec/libsidplay/win/VC/libsidplay.vcxproj.filters [new file with mode: 0644]
xbmc/cores/paplayer/WavPackCodec/wavpackdll.vcxproj
xbmc/cores/paplayer/YMCodec/StSoundLibrary/StSoundLibrary.vcproj
xbmc/cores/paplayer/YMCodec/StSoundLibrary/StSoundLibrary.vcxproj
xbmc/cores/paplayer/vgmstream/src/streamfile.c
xbmc/cores/paplayer/vgmstream/win32/win32.sln
xbmc/cores/paplayer/vgmstream/win32/win32.vcproj
xbmc/cores/paplayer/vgmstream/win32/win32.vcxproj [new file with mode: 0644]
xbmc/cores/paplayer/vgmstream/win32/win32.vcxproj.filters [new file with mode: 0644]
xbmc/cores/paplayer/vorbisfile/libvorbis/win32/VS2008/libvorbis/libvorbis.vcproj [new file with mode: 0644]
xbmc/cores/paplayer/vorbisfile/libvorbis/win32/VS2008/libvorbisfile/libvorbisfile.def [new file with mode: 0644]
xbmc/cores/paplayer/vorbisfile/libvorbis/win32/VS2008/libvorbisfile/libvorbisfile.vcproj [new file with mode: 0644]
xbmc/cores/paplayer/vorbisfile/libvorbis/win32/VS2010/libvorbis/libvorbis.vcxproj [new file with mode: 0644]
xbmc/cores/paplayer/vorbisfile/libvorbis/win32/VS2010/libvorbis/libvorbis.vcxproj.filters [new file with mode: 0644]
xbmc/cores/paplayer/vorbisfile/libvorbis/win32/VS2010/libvorbisfile/libvorbisfile.def [new file with mode: 0644]
xbmc/cores/paplayer/vorbisfile/libvorbis/win32/VS2010/libvorbisfile/libvorbisfile.vcxproj [new file with mode: 0644]
xbmc/cores/paplayer/vorbisfile/libvorbis/win32/VS2010/libvorbisfile/libvorbisfile.vcxproj.filters [new file with mode: 0644]
xbmc/cores/paplayer/vorbisfile/ogg/win32/ogg_static.vcproj
xbmc/cores/paplayer/vorbisfile/ogg/win32/ogg_static.vcxproj [new file with mode: 0644]
xbmc/cores/paplayer/vorbisfile/ogg/win32/ogg_static.vcxproj.filters [new file with mode: 0644]
xbmc/cores/paplayer/vorbisfile/vorbisfile_win32/vorbisfile_win32.sln
xbmc/karaoke/karaokelyricstext.cpp
xbmc/lib/cmyth/Win32/libcmyth.vcxproj
xbmc/lib/cximage-6.0/ImageLib.vcxproj
xbmc/lib/libPython/xbmcmodule/pyutil.cpp
xbmc/lib/libPython/xbmcmodule/winxml.cpp
xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp
xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
xbmc/lib/libRTV/libRTV.vcxproj
xbmc/lib/libUPnP/Neptune/Source/System/Win32/NptWin32Threads.cpp
xbmc/lib/libXBMS/libXBMS/libXBMS.vcxproj
xbmc/lib/libXDAAP/libXDAAP_win32/libXDAAP_win32.vcxproj
xbmc/lib/libass/libass_win32/libass_win32_vs2010.vcxproj
xbmc/lib/libexif/libexif.vcxproj
xbmc/lib/libid3tag/libid3tag/frametype-9754.c [new file with mode: 0644]
xbmc/lib/libid3tag/libid3tag/msvc++/libid3tag.vcproj
xbmc/lib/libid3tag/libid3tag/msvc++/libid3tag.vcxproj [new file with mode: 0644]
xbmc/lib/libid3tag/libid3tag/msvc++/libid3tag.vcxproj.filters [new file with mode: 0644]
xbmc/lib/libmms/libmms_win32/msvc++/libmms.vcxproj
xbmc/lib/libsamplerate/libsamplerate_win32/libsamplerate_win32.vcxproj
xbmc/lib/libshout/libshout/libshout.vcxproj
xbmc/lib/libsquish/vs7/squish/squish_2010.vcxproj
xbmc/lib/sqLite/sqlite/libsqlite_win32/libsqlite_win32.vcxproj
xbmc/utils/Builtins.cpp
xbmc/utils/GUIInfoManager.cpp
xbmc/utils/Thread.cpp
xbmc/visualizations/DirectXSpectrum/directx_spectrum.vcxproj
xbmc/visualizations/Milkdrop/Plugin.vcxproj
xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/Compiler.c
xbmc/visualizations/WaveForm/Waveform.vcxproj