Merge remote-tracking branch 'remotes/upstream/medley' into medley

Output/Languages/Deutsch.xml

@@ -125,7 +125,7 @@
 		<TR_SCREENSONG_BUTTON_RANDOM>Zufälligen Song wählen</TR_SCREENSONG_BUTTON_RANDOM>
 		<TR_SCREENSONG_BUTTON_RANDOMCAT>Zufällige Kategorie wählen</TR_SCREENSONG_BUTTON_RANDOMCAT>
 		<TR_SCREENSONG_BUTTON_SINGALL>Alle Songs singen</TR_SCREENSONG_BUTTON_SINGALL>
-		<TR_SCREENSONG_BUTTON_SINGALLVISIBLE>Alle sichtbaren Song singen</TR_SCREENSONG_BUTTON_SINGALLVISIBLE>	
+		<TR_SCREENSONG_BUTTON_SINGALLVISIBLE>Alle sichtbaren Songs singen</TR_SCREENSONG_BUTTON_SINGALLVISIBLE>	
 		<TR_SCREENSONG_BUTTON_OPENPLAYLIST>Playlist öffnen</TR_SCREENSONG_BUTTON_OPENPLAYLIST>	
 		<TR_SCREENSONG_NEWPLAYLIST>Neue Playlist</TR_SCREENSONG_NEWPLAYLIST>
 		<TR_SCREENSONG_SONGOPTIONS>Lied-Optionen</TR_SCREENSONG_SONGOPTIONS>

Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml

@@ -497,13 +497,13 @@
       <H>50</H>
       <!--<ArrowLeftX>, <ArrowLeftY>, <ArrowLeftZ>, <ArrowLeftW>, <ArrowLeftH>: Left arrow position, width and height-->
       <ArrowLeftX>505</ArrowLeftX>
-      <ArrowLeftY>225</ArrowLeftY>
+      <ArrowLeftY>285</ArrowLeftY>
       <ArrowLeftZ>0,00</ArrowLeftZ>
       <ArrowLeftW>40</ArrowLeftW>
       <ArrowLeftH>40</ArrowLeftH>
       <!--<ArrowRightX>, <ArrowRightY>, <ArrowRightZ>, <ArrowRightW>, <ArrowRightH>: Right arrow position, width and height-->
       <ArrowRightX>1170</ArrowRightX>
-      <ArrowRightY>225</ArrowRightY>
+      <ArrowRightY>285</ArrowRightY>
       <ArrowRightZ>0,00</ArrowRightZ>
       <ArrowRightW>40</ArrowRightW>
       <ArrowRightH>40</ArrowRightH>
@@ -540,4 +540,4 @@
       <NumVisible>3</NumVisible>
     </SelectSlideVideosToBackground>
   </ScreenOptionsVideo>
-</root>
+</root>

Vocaluxe/Doc/Roadmap.txt

@@ -71,31 +71,33 @@
 	- PortAudio Record and Playback
 
 -------------------------------------------------------------
-+ v0.1.0:
++ v0.1.0 (reached: 07.04.2012):
 	- Menu Background Music
+	- Jukebox light (bg music controls)
 	- Theme System Update
 	- A nicer Theme!
 
 + v0.2.0:
 	- Medley
-	- WiiMote Support
+	- Show Avatars and Player Name in Sing Screen
-	- Jukebox light (bg music controls)
-	- Show Avatars and Player Name in Sing Screen (and perhaps some other screens)
 	- New Lyric Effects
+	- More Player at once (up to 6)
+	- Duet (full support, choose/toggle names)
+	- Playlist-Support
+	- Spectrum Analyzer (Record Screen)
  
 
 -----------------
 just some ideas:
+	- WiiMote Support
 	- Installer
 	- More Song List Views
 	- Tile Board: Show title and artist under each tile
 	- OnScreen Keyboard?
 	- Kinect Support?
 	- Help System
-	- Party Mode: Casting Show
+	- Party Mode: Casting Show	
-	- More Player at once
+	- Mark newly added songs	
-	- Mark newly added songs
-	- Playlist-Support
 	- Theme Editor
 	- Jukebox
 	- Tournament Mode
@@ -103,5 +105,4 @@ just some ideas:
 	- Party Mode: Tic, Tac, Toe
 	- Party Mode: 4 in a row
 	- Challenge Mode (with more than 2 player at once)
-	- Song Editor
+	- Song Editor
-	- Duet (full support, choose/toggle names)

Vocaluxe/Lib/Song/CSong.cs

@@ -79,6 +79,11 @@ namespace Vocaluxe.Lib.Song
         {
             get { return _CoverLoaded; }
         }
+        public bool NotesLoaded
+        {
+            get { return _NotesLoaded; }
+        }
+
         public bool CoverBigLoaded = false;
 
         public STexture CoverTextureSmall
@@ -204,6 +209,7 @@ namespace Vocaluxe.Lib.Song
             this.VideoAspect = song.VideoAspect;
             this._CoverLoaded = song._CoverLoaded;
             this.CoverBigLoaded = song.CoverBigLoaded;
+            this._NotesLoaded = song._NotesLoaded;
 
             this.Artist = song.Artist;
             this.Title = song.Title;

Vocaluxe/Screens/CScreenScore.cs

@@ -263,10 +263,11 @@ namespace Vocaluxe.Screens
 
         private void UpdateRatings()
         {
+            CSong song = null;
             SPlayer[] player = new SPlayer[CGame.NumPlayer];
             if (_Round != 0)
             {
-                CSong song = CGame.GetSong(_Round);
+                song = CGame.GetSong(_Round);
                 if (song == null)
                     return;
 
@@ -299,9 +300,24 @@ namespace Vocaluxe.Screens
                     player[p].Points = (int)(player[p].Points / CGame.NumRounds);
                 }
             }
+
             for (int p = 0; p < player.Length; p++)
             {
-                Texts[htTexts(TextNames[p, CGame.NumPlayer - 1])].Text = player[p].Name;
+                if (song != null)
+                {
+                    if (!song.IsDuet)
+                        Texts[htTexts(TextNames[p, CGame.NumPlayer - 1])].Text = player[p].Name;
+                    else
+                        if (player[p].LineNr == 0 && song.DuetPart1 != "Part 1")
+                            Texts[htTexts(TextNames[p, CGame.NumPlayer - 1])].Text = player[p].Name + " (" + song.DuetPart1 + ")";
+                        else if (player[p].LineNr == 1 && song.DuetPart2 != "Part 2")
+                            Texts[htTexts(TextNames[p, CGame.NumPlayer - 1])].Text = player[p].Name + " (" + song.DuetPart2 + ")";
+                        else
+                            Texts[htTexts(TextNames[p, CGame.NumPlayer - 1])].Text = player[p].Name;
+                }
+                else
+                    Texts[htTexts(TextNames[p, CGame.NumPlayer - 1])].Text = player[p].Name;
+                
                 Texts[htTexts(TextScores[p, CGame.NumPlayer - 1])].Text = ((int)Math.Round(player[p].Points)).ToString("0000") + " " + CLanguage.Translate("TR_SCREENSCORE_POINTS");
                 if (CGame.NumPlayer <= 3)
                 {

Vocaluxe/Screens/CScreenSing.cs

@@ -960,9 +960,11 @@ namespace Vocaluxe.Screens
             float dt = 4f;
             float rt = dt * 0.8f;
 
-            CSong Song = CGame.GetSong();  
+            CSong Song = CGame.GetSong();
             if (Song == null)
                 return null;
+            else if (!Song.NotesLoaded)
+                return null;
 
             float[] Alpha = new float[Song.Notes.Lines.Length * 2];
             CLines[] lines = new CLines[Song.Notes.Lines.Length];

Vocaluxe/Screens/CScreenSong.cs

@@ -713,6 +713,7 @@ namespace Vocaluxe.Screens
                 Buttons[htButtons(ButtonOptionsClose)].Visible = true;
                 Texts[htTexts(TextOptionsTitle)].Visible = true;
                 Statics[htStatics(StaticOptionsBG)].Visible = true;
+                Buttons[htButtons(ButtonOpenOptions)].Visible = false;
             }
             else 
             {
@@ -727,6 +728,7 @@ namespace Vocaluxe.Screens
                 Buttons[htButtons(ButtonOptionsSingAll)].Visible = false;
                 Buttons[htButtons(ButtonOptionsSingAllVisible)].Visible = false;
                 Buttons[htButtons(ButtonOptionsOpenPlaylist)].Visible = false;
+                Buttons[htButtons(ButtonOpenOptions)].Visible = true;
                 Texts[htTexts(TextOptionsTitle)].Visible = false;
                 Statics[htStatics(StaticOptionsBG)].Visible = false;
             }