- added webcam support

- faster program start
- faster sorting (mergesort)
- sync lyrics to music
- some new backgrounds and credits graphics (thx to MezzoX)
- own thread for video decoding
- finished 6-Player-on-one-screen-mode
- changqed player-colors
- fixed some bugs...

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2637 b956fd51-792f-4845-bead-9b4dfca2ff2c

5 files changed, 72 insertions, 32 deletions

diff --git a/Game/Output/Languages/Dutch.ini b/Game/Output/Languages/Dutch.ini
index 6f8abeab..2bd31e42 100644
--- a/Game/Output/Languages/Dutch.ini
+++ b/Game/Output/Languages/Dutch.ini
@@ -77,18 +77,18 @@ PARTY_WIN_DESC = winnaar van het party spel
 PARTY_WIN_LEGEND_CONTINUE = Terug naar het hoofdmenu

 PARTY_WIN_WHEREAMI = Party Winnaar

 PLAYLIST_CATTEXT = Speellijst: %s

-PLUGIN_ATLEAST3500_DESC = Erreiche mindestens 3500 Punkte um zu gewinnen.

-PLUGIN_ATLEAST3500_NAME = Mindestens 3500

-PLUGIN_ATLEAST5000_DESC = Erreiche mindestens 5000 Punkte um zu gewinnen.

-PLUGIN_ATLEAST5000_NAME = Mindestens 5K

-PLUGIN_ATLEAST7500_DESC = Erreiche mindestens 7500 Punkte um zu gewinnen.

-PLUGIN_ATLEAST7500_NAME = Mindestens 7500

+PLUGIN_ATLEAST3500_DESC = Reach at least 3500 points to win

+PLUGIN_ATLEAST3500_NAME = Min 3500

+PLUGIN_ATLEAST5000_DESC = Reach at least 5000 points to win

+PLUGIN_ATLEAST5000_NAME = Min 5000

+PLUGIN_ATLEAST7500_DESC = Reach at least 7500 points to win

+PLUGIN_ATLEAST7500_NAME = Min 7500

 PLUGIN_BLIND_DESC = Duel zonder de dat je de noten ziet.

 PLUGIN_BLIND_NAME = Blinde Modus

 PLUGIN_BLIND_NOSCORE_DESC = Erreiche Blind und ohne Punkteanzeige die höchste Punktzahl.

 PLUGIN_BLIND_NOSCORE_NAME = Blind&No Score

 PLUGIN_BLIND_NOSCORE2_DESC = Erreiche Blind, ohne Punkteanzeige und Linebonus die höchste Punktzahl.

-PLUGIN_BLIND_NOSCORE2_NAME = Blind&No Score2

+PLUGIN_BLIND_NOSCORE2_NAME = Blind&No Score 2

 PLUGIN_DUELL_DESC = Zing een duel tot 10000 punten.

 PLUGIN_DUELL_NAME = Duel

 PLUGIN_ERREICH7000_DESC = Jeder der 7000 Punkte erreicht, bekommt Punkte.

@@ -134,6 +134,7 @@ PLUGIN_MORETHAN1000_DESC = Wer mehr als 1000 Punkte zurückliegt, fliegt raus.
 PLUGIN_MORETHAN1000_NAME = Rückstand 1K

 PLUGIN_NOSCORE_DESC = Duel zonder dat de scores zichtbaar zijn.

 PLUGIN_NOSCORE_NAME = Geen Score

+PLUGIN_PKZIEL3000_DESC = Bleibe blind unter 3000 Punkte, um zu gewinnen.

 PLUGIN_PKZIEL3000_NAME = <=3000 Blind

 PLUGIN_PREMIOCASTIGO_DESC = Die erreichbaren Punkte sind vom Linebonus abhängig

 PLUGIN_PREMIOCASTIGO_NAME = Line-Bonus Pkt

@@ -185,6 +186,7 @@ SING_MULTI_DESC = Zing in de klassieke party-modus
 SING_MULTI_M2 = Uitdaging

 SING_MULTI_M2_DESC = Zing in de uitdaging-modus

 SING_NOTES = Noten

+SING_ERROR_DUET_NUM_PLAYERS = It is a Duet Song! Only playable with 2 or 4 Players!

 SING_OPTIONS = Opties

 SING_OPTIONS_ADVANCED = Geavanceerd

 SING_OPTIONS_ADVANCED_ASKBEFOREDEL = Veiligheidsvragen

@@ -230,9 +232,12 @@ SING_OPTIONS_RECORD = Opnamen
 SING_OPTIONS_RECORD_CARD = Geluidskaart

 SING_OPTIONS_RECORD_CHANNELL = Linkerkanaal

 SING_OPTIONS_RECORD_CHANNELR = Rechterkanaal

-SING_OPTIONS_RECORD_DESC = Microfoon instellingen

+SING_OPTIONS_RECORD_DESC = Microfoon/webcam instellingen

 SING_OPTIONS_RECORD_INPUT = Aansluiting

 SING_OPTIONS_RECORD_WHEREAMI = Opties Opnamen

+SING_OPTIONS_RECORD_WEBCAMONOFF = Enable Webcam

+SING_OPTIONS_RECORD_WEBCAMDEVICE = Webcam

+SING_OPTIONS_RECORD_WEBCAMMEDIA = Webcam Codec

 SING_OPTIONS_SOUND = Geluid

 SING_OPTIONS_SOUND_BEAT_CLICK = Metronoom

 SING_OPTIONS_SOUND_CLICK_ASSIST = Klik assistent

@@ -354,4 +359,4 @@ STAT_PREV = Vorige pagina
 STAT_REVERSE = Anders om

 VIDEO_ASPECT_CROP = Inkrimpen

 VIDEO_ASPECT_LETTER_BOX = Letter Box

-VIDEO_ASPECT_STRETCH = Uitrekken

+VIDEO_ASPECT_STRETCH = Uitrekken
\ No newline at end of file
diff --git a/Game/Output/Languages/English.ini b/Game/Output/Languages/English.ini
index 26327e12..7a777354 100644
--- a/Game/Output/Languages/English.ini
+++ b/Game/Output/Languages/English.ini
@@ -77,18 +77,18 @@ PARTY_WIN_DESC = and the winner is...
 PARTY_WIN_LEGEND_CONTINUE = back to main menu

 PARTY_WIN_WHEREAMI = Party Winner

 PLAYLIST_CATTEXT = Playlist: %s

-PLUGIN_ATLEAST3500_DESC = Erreiche mindestens 3500 Punkte um zu gewinnen.

-PLUGIN_ATLEAST3500_NAME = Mindestens 3500

-PLUGIN_ATLEAST5000_DESC = Erreiche mindestens 5000 Punkte um zu gewinnen.

-PLUGIN_ATLEAST5000_NAME = Mindestens 5K

-PLUGIN_ATLEAST7500_DESC = Erreiche mindestens 7500 Punkte um zu gewinnen.

-PLUGIN_ATLEAST7500_NAME = Mindestens 7500

+PLUGIN_ATLEAST3500_DESC = Reach at least 3500 points to win

+PLUGIN_ATLEAST3500_NAME = Min 3500

+PLUGIN_ATLEAST5000_DESC = Reach at least 5000 points to win

+PLUGIN_ATLEAST5000_NAME = Min 5000

+PLUGIN_ATLEAST7500_DESC = Reach at least 7500 points to win

+PLUGIN_ATLEAST7500_NAME = Min 7500

 PLUGIN_BLIND_DESC = Random song without notes, highest score wins

 PLUGIN_BLIND_NAME = Blind Battle

 PLUGIN_BLIND_NOSCORE_DESC = Erreiche Blind und ohne Punkteanzeige die höchste Punktzahl.

 PLUGIN_BLIND_NOSCORE_NAME = Blind&No Score

 PLUGIN_BLIND_NOSCORE2_DESC = Erreiche Blind, ohne Punkteanzeige und Linebonus die höchste Punktzahl.

-PLUGIN_BLIND_NOSCORE2_NAME = Blind&No Score2

+PLUGIN_BLIND_NOSCORE2_NAME = Blind&No Score 2

 PLUGIN_DUELL_DESC = Random song, highest score wins

 PLUGIN_DUELL_NAME = Battle

 PLUGIN_ERREICH7000_DESC = Jeder der 7000 Punkte erreicht, bekommt Punkte.

@@ -134,6 +134,7 @@ PLUGIN_MORETHAN1000_DESC = Wer mehr als 1000 Punkte zurückliegt, fliegt raus.
 PLUGIN_MORETHAN1000_NAME = Rückstand 1K

 PLUGIN_NOSCORE_DESC = Random song without running scoreboard, highest score wins

 PLUGIN_NOSCORE_NAME = Unscored Battle

+PLUGIN_PKZIEL3000_DESC = Bleibe blind unter 3000 Punkte, um zu gewinnen.

 PLUGIN_PKZIEL3000_NAME = <=3000 Blind

 PLUGIN_PREMIOCASTIGO_DESC = Die erreichbaren Punkte sind vom Linebonus abhängig

 PLUGIN_PREMIOCASTIGO_NAME = Line-Bonus Pkt

@@ -185,6 +186,7 @@ SING_MULTI_DESC = sing in classic party mode
 SING_MULTI_M2 = challenge

 SING_MULTI_M2_DESC = sing in challenge party mode

 SING_NOTES = notes

+SING_ERROR_DUET_NUM_PLAYERS = It is a Duet Song! Only playable with 2 or 4 Players!

 SING_OPTIONS = options

 SING_OPTIONS_ADVANCED = advanced

 SING_OPTIONS_ADVANCED_ASKBEFOREDEL = Quit Prompts

@@ -230,9 +232,12 @@ SING_OPTIONS_RECORD = mics
 SING_OPTIONS_RECORD_CARD = Soundcard

 SING_OPTIONS_RECORD_CHANNELL = Left Channel

 SING_OPTIONS_RECORD_CHANNELR = Right Channel

-SING_OPTIONS_RECORD_DESC = change microphone settings

+SING_OPTIONS_RECORD_DESC = change microphone and webcam  settings

 SING_OPTIONS_RECORD_INPUT = Input

-SING_OPTIONS_RECORD_WHEREAMI = Microphone Options

+SING_OPTIONS_RECORD_WHEREAMI = Microphone/Webcam Options

+SING_OPTIONS_RECORD_WEBCAMONOFF = Enable Webcam

+SING_OPTIONS_RECORD_WEBCAMDEVICE = Webcam

+SING_OPTIONS_RECORD_WEBCAMMEDIA = Webcam Codec

 SING_OPTIONS_SOUND = sound

 SING_OPTIONS_SOUND_BEAT_CLICK = Beat Clicks

 SING_OPTIONS_SOUND_CLICK_ASSIST = Note Clicks

@@ -338,7 +343,7 @@ STAT_DESC_SONGS_REVERSED = unpopular songs
 STAT_DETAIL = Statistics

 STAT_DETAIL_WHEREAMI = Detailed Statistics

 STAT_FORMAT_BANDS = %0:s \n     %1:d times

-STAT_FORMAT_DATE = %0:.2d/%1:.2d/%2:d

+STAT_FORMAT_DATE = %0:.2d.%1:.2d.%2:d

 STAT_FORMAT_SCORES = %1:d on %5:s by %0:s \n     %3:s - %4:s (%2:s)

 STAT_FORMAT_SINGERS = %0:s \n     Average Score: %1:d after singing %2:d times

 STAT_FORMAT_SONGS = %0:s - %1:s \n    %2:d times

@@ -862,7 +867,7 @@ RIGHT = Rotate right through menu options
 #-------------------------------------------------------#

 [ID_011]

 Title = Microphone Options

-Description = These determine the players' microphone settings

+Description = These determine the players' microphone settings. You can adjust the webcam setting here also.

 #-------------------------------------------------------#

 SUB_010 = Soundcard

 ENT_011 =     Select one of the available sound cards to view the corresponding input settings

@@ -876,6 +881,15 @@ ENT_031 =     The left channel of the selected soundcard input is assigned to pl
 SUB_040 = Right Channel

 ENT_041 =     The right channel of the selected soundcard input is assigned to player number...

 #-------------------------------------------------------#

+SUB_050 = Enable Webcam

+ENT_051 =   Switch the webcam on or off. You must switch it on for using in the singscreen. 

+#-------------------------------------------------------#

+SUB_060 = Webcam

+ENT_061 =   Select one of the available webcams.

+#-------------------------------------------------------#

+SUB_070 = Webcam Codec

+ENT_071 =   Determine the codec and resolution for the selected webcam.

+#-------------------------------------------------------#

 SEC_001 = General

 RETURN = Confirm current selection

 TAB = Toggle help

@@ -1194,6 +1208,7 @@ Q = Quit UltraStar Deluxe
 SEC_002 = Playback

 P = Pause song

 K = Toggle karaoke playback (removes vocals)

+W = Toggle webcam on/off

 PAGEUP = Increase song volume

 PAGEDOWN = Decrease song volume

 #-------------------------------------------------------#

diff --git a/Game/Output/Languages/German.ini b/Game/Output/Languages/German.ini
index ca49e024..8e5cc569 100644
--- a/Game/Output/Languages/German.ini
+++ b/Game/Output/Languages/German.ini
@@ -134,6 +134,7 @@ PLUGIN_MORETHAN1000_DESC = Wer mehr als 1000 Punkte zurückliegt, fliegt raus.
 PLUGIN_MORETHAN1000_NAME = Rückstand 1K

 PLUGIN_NOSCORE_DESC = Ein Duell ohne Punkteanzeige.

 PLUGIN_NOSCORE_NAME = No Score

+PLUGIN_PKZIEL3000_DESC = Bleibe blind unter 3000 Punkte, um zu gewinnen.

 PLUGIN_PKZIEL3000_NAME = <=3000 Blind

 PLUGIN_PREMIOCASTIGO_DESC = Die erreichbaren Punkte sind vom Linebonus abhängig

 PLUGIN_PREMIOCASTIGO_NAME = Line-Bonus Pkt

@@ -185,6 +186,7 @@ SING_MULTI_DESC = Party Classic-Modus singen
 SING_MULTI_M2 = Challenge

 SING_MULTI_M2_DESC = Party Challenge-Modus singen

 SING_NOTES = Noten

+SING_ERROR_DUET_NUM_PLAYERS = Dies ist ein Duett! Man kann es nur mit 2 oder 4 Spielern singen!

 SING_OPTIONS = Optionen

 SING_OPTIONS_ADVANCED = Erweitert

 SING_OPTIONS_ADVANCED_ASKBEFOREDEL = Sicherheitsabfr.

@@ -230,9 +232,12 @@ SING_OPTIONS_RECORD = Aufnahme
 SING_OPTIONS_RECORD_CARD = Soundkarte

 SING_OPTIONS_RECORD_CHANNELL = Linker Kanal

 SING_OPTIONS_RECORD_CHANNELR = Rechter Kanal

-SING_OPTIONS_RECORD_DESC = Einstellungen für die Mikrofone

+SING_OPTIONS_RECORD_DESC = Einstellungen für die Mikrofone/Webcam

 SING_OPTIONS_RECORD_INPUT = Eingang

 SING_OPTIONS_RECORD_WHEREAMI = Optionen Aufnahme

+SING_OPTIONS_RECORD_WEBCAMONOFF = Webcam aktiv:

+SING_OPTIONS_RECORD_WEBCAMDEVICE = Webcam

+SING_OPTIONS_RECORD_WEBCAMMEDIA = Webcam Codec

 SING_OPTIONS_SOUND = Sound

 SING_OPTIONS_SOUND_BEAT_CLICK = Beat-Click

 SING_OPTIONS_SOUND_CLICK_ASSIST = Click-Assistent

@@ -862,7 +867,7 @@ RIGHT = Auswahlmöglichkeiten der gewählten Einstellung nach rechts durchgehen
 #-------------------------------------------------------#

 [ID_011]

 Title = Aufnahme Optionen

-Description = Hier findet man die Aufnahme- und Mikrofon-Optionen von UltraStar Deluxe.

+Description = Hier findet man die Aufnahme- und Mikrofon-Optionen von UltraStar Deluxe. Die Webcam kann hier ebenfalls konfiguriert werden.

 #-------------------------------------------------------#

 SUB_010 = Soundkarte

 ENT_011 = Legt die einzustellende Soundkarte fest.

@@ -873,9 +878,18 @@ ENT_021 = Legt den verwendeten Eingang der Soundkarte fest.
 SUB_030 = Linker Kanal

 ENT_031 = Legt fest, welcher Spielernummer der linke Aufnahmekanal zugeordnet ist.

 #-------------------------------------------------------#

-SUB_040 = Rechter Kanals

+SUB_040 = Rechter Kanal

 ENT_041 = Legt fest, welcher Spielernummer der rechte Aufnahmekanal zugeordnet ist.

 #-------------------------------------------------------#

+SUB_050 = Webcam aktiv

+ENT_051 = Schaltet die Webcam  ein oder aus. Die Option muss auf "On" stehen, damit die Webcam im Singscreen benutzt werden kann.

+#-------------------------------------------------------#

+SUB_060 = Webcam

+ENT_061 = Hiermit wird die aktive Webcam ausgewählt (falls mehrere vorhanden sind).

+#-------------------------------------------------------#

+SUB_070 = Webcam Codec

+ENT_071 = Legt den Codec und die Auflösung der Webcam fest.

+#-------------------------------------------------------#

 SEC_001 = Allgemein

 RETURN = Wenn aktuelle Auswahl auf "zurück": Zum Optionsmenü zurückkehren

 TAB = Hilfe öffnen/schließen

@@ -1194,6 +1208,7 @@ Q = UltraStar Deluxe beenden
 SEC_002 = Wiedergabe

 P = Pause / Weiter

 K = Experimentelle Karaoke-Funktion ein/ausschalten

+W = Webcam ein/ausschalten

 PAGEUP = MP3-Lautstärke erhöhen

 PAGEDOWN = MP3-Lautstärke reduzieren

 #-------------------------------------------------------#

diff --git a/Game/Output/Languages/Italian.ini b/Game/Output/Languages/Italian.ini
index 0f770cbb..4a8b97f1 100644
--- a/Game/Output/Languages/Italian.ini
+++ b/Game/Output/Languages/Italian.ini
@@ -77,18 +77,18 @@ PARTY_WIN_DESC = Vincitore Party
 PARTY_WIN_LEGEND_CONTINUE = Torna al menu principale

 PARTY_WIN_WHEREAMI = Vincitore Party

 PLAYLIST_CATTEXT = Playlist: %s

-PLUGIN_ATLEAST3500_DESC = Erreiche mindestens 3500 Punkte um zu gewinnen.

-PLUGIN_ATLEAST3500_NAME = Mindestens 3500

-PLUGIN_ATLEAST5000_DESC = Erreiche mindestens 5000 Punkte um zu gewinnen.

-PLUGIN_ATLEAST5000_NAME = Mindestens 5K

-PLUGIN_ATLEAST7500_DESC = Erreiche mindestens 7500 Punkte um zu gewinnen.

-PLUGIN_ATLEAST7500_NAME = Mindestens 7500

+PLUGIN_ATLEAST3500_DESC = Reach at least 3500 points to win

+PLUGIN_ATLEAST3500_NAME = Min 3500

+PLUGIN_ATLEAST5000_DESC = Reach at least 5000 points to win

+PLUGIN_ATLEAST5000_NAME = Min 5000

+PLUGIN_ATLEAST7500_DESC = Reach at least 7500 points to win

+PLUGIN_ATLEAST7500_NAME = Min 7500

 PLUGIN_BLIND_DESC = Duello senza le note visualizzate.

 PLUGIN_BLIND_NAME = Alla cieca

 PLUGIN_BLIND_NOSCORE_DESC = Erreiche Blind und ohne Punkteanzeige die höchste Punktzahl.

 PLUGIN_BLIND_NOSCORE_NAME = Blind&No Score

 PLUGIN_BLIND_NOSCORE2_DESC = Erreiche Blind, ohne Punkteanzeige und Linebonus die höchste Punktzahl.

-PLUGIN_BLIND_NOSCORE2_NAME = Blind&No Score2

+PLUGIN_BLIND_NOSCORE2_NAME = Blind&No Score 2

 PLUGIN_DUELL_DESC = Duello classico fino a 10000 punti.

 PLUGIN_DUELL_NAME = Duello

 PLUGIN_ERREICH7000_DESC = Jeder der 7000 Punkte erreicht, bekommt Punkte.

@@ -134,6 +134,7 @@ PLUGIN_MORETHAN1000_DESC = Wer mehr als 1000 Punkte zurückliegt, fliegt raus.
 PLUGIN_MORETHAN1000_NAME = Rückstand 1K

 PLUGIN_NOSCORE_DESC = Duello senza vedere il punteggio

 PLUGIN_NOSCORE_NAME = Niente punteggio

+PLUGIN_PKZIEL3000_DESC = Bleibe blind unter 3000 Punkte, um zu gewinnen.

 PLUGIN_PKZIEL3000_NAME = <=3000 Blind

 PLUGIN_PREMIOCASTIGO_DESC = Die erreichbaren Punkte sind vom Linebonus abhängig

 PLUGIN_PREMIOCASTIGO_NAME = Line-Bonus Pkt

@@ -185,6 +186,7 @@ SING_MULTI_DESC = Party classico
 SING_MULTI_M2 = Sfida

 SING_MULTI_M2_DESC = Modalità sfida

 SING_NOTES = Note

+SING_ERROR_DUET_NUM_PLAYERS = It is a Duet Song! Only playable with 2 or 4 Players!

 SING_OPTIONS = Opzioni

 SING_OPTIONS_ADVANCED = Avanzate

 SING_OPTIONS_ADVANCED_ASKBEFOREDEL = Avviso uscita

@@ -230,9 +232,12 @@ SING_OPTIONS_RECORD = Input sonoro
 SING_OPTIONS_RECORD_CARD = Scheda audio

 SING_OPTIONS_RECORD_CHANNELL = Canale sinistro

 SING_OPTIONS_RECORD_CHANNELR = Canale destro

-SING_OPTIONS_RECORD_DESC = Opzioni microfono

+SING_OPTIONS_RECORD_DESC = Opzioni microfono/webcam

 SING_OPTIONS_RECORD_INPUT = Input

-SING_OPTIONS_RECORD_WHEREAMI = Opzioni input sonoro

+SING_OPTIONS_RECORD_WHEREAMI = Opzioni input sonoro/webcam

+SING_OPTIONS_RECORD_WEBCAMONOFF = Enable Webcam

+SING_OPTIONS_RECORD_WEBCAMDEVICE = Webcam

+SING_OPTIONS_RECORD_WEBCAMMEDIA = Webcam Codec

 SING_OPTIONS_SOUND = Suono

 SING_OPTIONS_SOUND_BEAT_CLICK = Suono metronomo

 SING_OPTIONS_SOUND_CLICK_ASSIST = Aiuto click

diff --git a/Game/Output/Languages/Languages.xls b/Game/Output/Languages/Languages.xls
index f5ba6bf6..7736491d 100644
--- a/Game/Output/Languages/Languages.xls
+++ b/Game/Output/Languages/Languages.xls