merge/sync with trunk. rev. 12385.
authorvulkanr <vulkanr@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 30 Mar 2008 13:31:47 +0000 (13:31 +0000)
committervulkanr <vulkanr@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sun, 30 Mar 2008 13:31:47 +0000 (13:31 +0000)
commitbc3cf3777e6829e8fad54c28ab68670f89ed888c
treefa34d72df84b81cd904892fc15d46a23b95c768e
parent0e615913e62eab1f736b75e00309c4aa5b5615a3
merge/sync with trunk. rev. 12385.
big merge. hope it didnt break anything.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/linuxport/XBMC@12386 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
173 files changed:
guilib/GUIBaseContainer.cpp
guilib/GUIButtonControl.cpp
guilib/GUIButtonControl.h
guilib/GUICheckMarkControl.cpp
guilib/GUICheckMarkControl.h
guilib/GUIConsoleControl.cpp
guilib/GUIConsoleControl.h
guilib/GUIControl.cpp
guilib/GUIControl.h
guilib/GUIFadeLabelControl.cpp
guilib/GUIInfoColor.cpp [new file with mode: 0644]
guilib/GUIInfoColor.h [new file with mode: 0644]
guilib/GUILabelControl.cpp
guilib/GUILargeImage.cpp
guilib/GUILargeImage.h
guilib/GUIListItem.cpp
guilib/GUIListItem.h
guilib/GUIListItemLayout.cpp
guilib/GUIListItemLayout.h
guilib/GUIMessage.h
guilib/GUIMoverControl.cpp
guilib/GUIMoverControl.h
guilib/GUIMultiImage.cpp
guilib/GUIMultiImage.h
guilib/GUIPanelContainer.cpp
guilib/GUIPanelContainer.h
guilib/GUIProgressControl.cpp
guilib/GUIProgressControl.h
guilib/GUIRSSControl.cpp
guilib/GUIRSSControl.h
guilib/GUIRadioButtonControl.cpp
guilib/GUIRadioButtonControl.h
guilib/GUIResizeControl.cpp
guilib/GUIResizeControl.h
guilib/GUIScrollBarControl.cpp
guilib/GUIScrollBarControl.h
guilib/GUISelectButtonControl.cpp
guilib/GUISelectButtonControl.h
guilib/GUISettingsSliderControl.cpp
guilib/GUISettingsSliderControl.h
guilib/GUISliderControl.cpp
guilib/GUISliderControl.h
guilib/GUISpinControl.cpp
guilib/GUISpinControl.h
guilib/GUISpinControlEx.cpp
guilib/GUISpinControlEx.h
guilib/GUITextBox.cpp
guilib/GUITextBox.h
guilib/GUIToggleButtonControl.cpp
guilib/GUIToggleButtonControl.h
guilib/GUIWindowManager.cpp
guilib/GuiControlFactory.cpp
guilib/GuiControlFactory.h
guilib/Makefile
guilib/common/Mouse.h
guilib/guiImage.cpp
guilib/guiImage.h
guilib/guilib.vcproj
guilib/guilib_win32.vcproj
guilib/system.h
language/Chinese (Traditional)/strings.xml
language/Danish/strings.xml
language/Dutch/strings.xml
language/English/strings.xml
language/Finnish/strings.xml
language/Portuguese (Brazil)/strings.xml
language/Swedish/strings.xml
skin/Project Mayhem III/PAL/DialogVideoScan.xml
skin/Project Mayhem III/PAL/FileManager.xml
skin/Project Mayhem III/PAL/MusicOverlay.xml
skin/Project Mayhem III/PAL/MusicVisualisation.xml
skin/Project Mayhem III/PAL/MyMusicSongs.xml
skin/Project Mayhem III/PAL/MyVideo.xml
skin/Project Mayhem III/PAL/SlideShow.xml
skin/Project Mayhem III/PAL/VideoOSD.xml
skin/Project Mayhem III/PAL/VideoOverlay.xml
skin/Project Mayhem III/PAL16x9/MusicVisualisation.xml
skin/Project Mayhem III/PAL16x9/SlideShow.xml
skin/Project Mayhem III/PAL16x9/VideoOSD.xml
skin/Project Mayhem III/fonts/FrancophilSans.ttf
system/libcmyth.dll
system/players/mplayer/mplayer.dll
system/scrapers/video/filmaffinity.xml
system/scrapers/video/filmweb.xml
system/scrapers/video/imdb tv.xml
system/scrapers/video/imdb.xml
system/scrapers/video/jadedVideo.xml
system/scrapers/video/ofdb.xml
system/scrapers/video/tvdb.xml
tools/Win32/XBMC_PC.vcproj
visualisations/Boxalizer.vis
visualisations/MilkDrop.vis
visualisations/Saville.vis
visualisations/Spectrum.vis
visualisations/g-force.vis
xbmc.vcproj
xbmc/Application.cpp
xbmc/ButtonTranslator.h
xbmc/Credits.cpp
xbmc/DNSNameCache.cpp
xbmc/DNSNameCache.h
xbmc/Database.cpp
xbmc/Database.h
xbmc/DateTime.cpp
xbmc/FileItem.cpp
xbmc/FileItem.h
xbmc/FileSystem/CMythFile.h
xbmc/FileSystem/CMythSession.cpp
xbmc/FileSystem/DllLibCurl.cpp
xbmc/FileSystem/DllLibCurl.h
xbmc/FileSystem/FileCurl.cpp
xbmc/FileSystem/FileCurl.h
xbmc/FileSystem/MemoryUnits/Fat32FileSystem.cpp
xbmc/FileSystem/MemoryUnits/FatXDevice.cpp
xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp
xbmc/GUIDialogPluginSettings.cpp
xbmc/GUIDialogPluginSettings.h
xbmc/GUIDialogVideoScan.cpp
xbmc/GUIDialogVideoScan.h
xbmc/GUISettings.cpp
xbmc/GUIWindowMusicSongs.cpp
xbmc/GUIWindowSettingsCategory.cpp
xbmc/GUIWindowVideoBase.cpp
xbmc/GUIWindowVideoFiles.cpp
xbmc/GUIWindowVideoInfo.cpp
xbmc/GUIWindowVideoInfo.h
xbmc/GUIWindowVideoNav.cpp
xbmc/MusicDatabase.cpp
xbmc/MusicInfoTagLoaderWMA.cpp
xbmc/Settings.cpp
xbmc/Settings.h
xbmc/URL.cpp
xbmc/Util.cpp
xbmc/Util.h
xbmc/VideoDatabase.cpp
xbmc/VideoDatabase.h
xbmc/VideoInfoScanner.cpp
xbmc/VideoInfoScanner.h
xbmc/VideoInfoTag.cpp
xbmc/VideoInfoTag.h
xbmc/cores/DllLoader/DllLoader.cpp
xbmc/cores/PlayerCoreFactory.cpp
xbmc/cores/dvdplayer/DVDAudio.cpp
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.cpp
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.h
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp
xbmc/cores/dvdplayer/DVDPlayer.cpp
xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.cpp
xbmc/cores/mplayer/AsyncDirectSound.cpp
xbmc/cores/mplayer/mplayer.cpp
xbmc/cores/paplayer/RingHoldBuffer.h
xbmc/cores/paplayer/paplayer.cpp
xbmc/lib/libPython/xbmcmodule/controlimage.cpp
xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp
xbmc/lib/libPython/xbmcmodule/pyutil.cpp
xbmc/lib/libPython/xbmcmodule/window.cpp
xbmc/lib/libcmyth/Win32/libcmyth.def
xbmc/lib/libcmyth/Win32/libcmyth.vcproj
xbmc/lib/libcmyth/cmyth.h
xbmc/lib/libcmyth/cmyth_local.h
xbmc/lib/libcmyth/connection.c
xbmc/lib/libcmyth/livetv.c
xbmc/lib/libcmyth/mythtv_mysql.c
xbmc/lib/libcmyth/proginfo.c
xbmc/utils/Fanart.cpp [new file with mode: 0644]
xbmc/utils/Fanart.h [new file with mode: 0644]
xbmc/utils/GUIInfoManager.cpp
xbmc/utils/GUIInfoManager.h
xbmc/utils/Makefile
xbmc/utils/Socket.cpp
xbmc/utils/Splash.cpp