Merging with karaoke branch.
authorgyunaev <gyunaev@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sat, 24 Jan 2009 03:40:07 +0000 (03:40 +0000)
committergyunaev <gyunaev@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
Sat, 24 Jan 2009 03:40:07 +0000 (03:40 +0000)
commit180a5df1d87c3088d1a5b6702266ebab0843aa96
treea4bbfe7f26e65fa92494c489977e49c063f395d2
parent3cae4b153c49a89a490de59c552ea5f68ef04f5c
Merging with karaoke branch.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/linuxport/XBMC@17296 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
58 files changed:
Makefile.in
XBMC.xcodeproj/project.pbxproj
guilib/GUIVisualisationControl.cpp
guilib/common/LIRC.cpp
language/English/strings.xml
project/VS2008Express/XBMC.vcproj
skin/PM3.HD/720p/DialogKaraokeSongSelector.xml [new file with mode: 0644]
skin/PM3.HD/720p/DialogKaraokeSongSelectorLarge.xml [new file with mode: 0644]
xbmc/Application.cpp
xbmc/Application.h
xbmc/Cdg.cpp [deleted file]
xbmc/Cdg.h [deleted file]
xbmc/CdgParser.cpp [deleted file]
xbmc/CdgParser.h [deleted file]
xbmc/CdgVoiceManager.cpp [deleted file]
xbmc/CdgVoiceManager.h [deleted file]
xbmc/FileItem.cpp
xbmc/FileItem.h
xbmc/GUISettings.cpp
xbmc/GUISettings.h
xbmc/GUIWindowSettingsCategory.cpp
xbmc/GUIWindowVisualisation.cpp
xbmc/Makefile
xbmc/MusicDatabase.cpp
xbmc/MusicDatabase.h
xbmc/MusicInfoScanner.cpp
xbmc/MusicInfoTagLoaderFactory.cpp
xbmc/MusicInfoTagLoaderMidi.cpp [new file with mode: 0644]
xbmc/MusicInfoTagLoaderMidi.h [new file with mode: 0644]
xbmc/Settings.cpp
xbmc/Settings.h
xbmc/Song.cpp
xbmc/Song.h
xbmc/cores/paplayer/CodecFactory.cpp
xbmc/cores/paplayer/paplayer_linux.cpp
xbmc/cores/paplayer/paplayer_osx.cpp
xbmc/cores/paplayer/paplayer_win32.cpp
xbmc/karaoke/Cdg.cpp [new file with mode: 0644]
xbmc/karaoke/Cdg.h [new file with mode: 0644]
xbmc/karaoke/CdgParser.cpp [new file with mode: 0644]
xbmc/karaoke/CdgParser.h [new file with mode: 0644]
xbmc/karaoke/GUIDialogKaraokeSongSelector.cpp [new file with mode: 0644]
xbmc/karaoke/GUIDialogKaraokeSongSelector.h [new file with mode: 0644]
xbmc/karaoke/Makefile [new file with mode: 0644]
xbmc/karaoke/karaokelyrics.cpp [new file with mode: 0644]
xbmc/karaoke/karaokelyrics.h [new file with mode: 0644]
xbmc/karaoke/karaokelyricscdg.cpp [new file with mode: 0644]
xbmc/karaoke/karaokelyricscdg.h [new file with mode: 0644]
xbmc/karaoke/karaokelyricsfactory.cpp [new file with mode: 0644]
xbmc/karaoke/karaokelyricsfactory.h [new file with mode: 0644]
xbmc/karaoke/karaokelyricsmanager.cpp [new file with mode: 0644]
xbmc/karaoke/karaokelyricsmanager.h [new file with mode: 0644]
xbmc/karaoke/karaokelyricstext.cpp [new file with mode: 0644]
xbmc/karaoke/karaokelyricstext.h [new file with mode: 0644]
xbmc/karaoke/karaokelyricstextkar.cpp [new file with mode: 0644]
xbmc/karaoke/karaokelyricstextkar.h [new file with mode: 0644]
xbmc/karaoke/karaokelyricstextlrc.cpp [new file with mode: 0644]
xbmc/karaoke/karaokelyricstextlrc.h [new file with mode: 0644]