Merge pull request #21 from Vocaluxe/release-0.1

Merge release-0.1 branch into develop branch

Output/Readme.txt

@@ -115,6 +115,7 @@ Songscreen
 =================================
 = 5. Help & Suppport            =
 =================================
+GitHub Wiki:			https://github.com/Vocaluxe/Vocaluxe/wiki
 Support Forum (German):	http://www.ultra-star.de
 Song-DataBase (USDB):	http://usdb.animux.de/
 

README

@@ -0,0 +1,50 @@
+ __     __              _
+ \ \   / /__   ___ __ _| |_   ___  _____
+  \ \ / / _ \ / __/ _` | | | | \ \/ / _ \
+   \ V / (_) | (_| (_| | | |_| |>  <  __/
+    \_/ \___/ \___\__,_|_|\__,_/_/\_\___|
+	
+	
+=================================
+= 1. About                      =
+= 2. Download                   =
+= 3. Development Guidelines     =
+= 4. Help & Support             =
+=================================
+
+
+=================================
+= 1. About                      =
+=================================
+Vocaluxe is a free and open source singing game. It allows up to three players (currently) to sing along with music using microphones in order to score points, depending on the pitch of the voice and the rhythm of singing.
+
+Vocaluxe is an entirely new development in C#, inspired by the original UltraStar (developed by corvus5) and the great Ultrastar Deluxe project.
+
+Supported Operating Systems / Requirements:
+- WinXP, Vista, Windows 7 with .NET 2.0
+- 1 GHz CPU, 512 MB RAM, Graphics card with OpenGL 2.1 or DirectX 9.0 support
+
+
+=================================
+= 2. Download                   =
+=================================
+You can donwloadn precompiles Windows binaries at SourceForge:
+
+Download:	http://sourceforge.net/projects/vocaluxe/
+
+
+=================================
+= 3. Development Guidelines     =
+=================================
+The development of Vocaluxe uses this git branching model:
+
+		http://nvie.com/posts/a-successful-git-branching-model/
+
+
+=================================
+= 4. Help & Suppport            =
+=================================
+GitHub Wiki:		https://github.com/Vocaluxe/Vocaluxe/wiki
+GitGub Issues Tracker:	https://github.com/Vocaluxe/Vocaluxe/issues
+Support Forum (German):	http://www.ultra-star.de
+Song-DataBase (USDB):	http://usdb.animux.de/	

Vocaluxe/Doc/Roadmap.txt

@@ -81,41 +81,27 @@
 	- WiiMote Support
 	- Jukebox light (bg music controls)
 	- Show Avatars and Player Name in Sing Screen (and perhaps some other screens)
-
-+ v0.3.0:
-	- Song Editor
-	- Help System
-	- Duet (full support)
-	- Mark newly added songs
-	- Playlist-Support
-	- Theme System Update (Theme Editor)
-
-+ v0.4.0:
-	- Challenge Mode (with more than 2 player at once)
-	- More Player at once
-
-+ v0.5.0:
-	- Party Mode: Team-Battle
-	- Party Mode: Tic, Tac, Toe
-	- Party Mode: 4 in a row
-
-+ v0.6.0:
-	- Jukebox
-
-+ v0.7.0:
-	- Tournament Mode
-
-+ v0.8.0:
-	- Party Mode: Casting Show
-	
-+ v0.9.0:
-	- ?
-
-+ v1.0.0:
-	- ?
-	 
+	- New Lyric Effects
+ 
 
 -----------------
 just some ideas:
+	- Installer
+	- More Song List Views
+	- Tile Board: Show title and artist under each tile
 	- OnScreen Keyboard?
-	- Kinect Support?
+	- Kinect Support?
+	- Help System
+	- Party Mode: Casting Show
+	- More Player at once
+	- Mark newly added songs
+	- Playlist-Support
+	- Theme Editor
+	- Jukebox
+	- Tournament Mode
+	- Party Mode: Team-Battle
+	- Party Mode: Tic, Tac, Toe
+	- Party Mode: 4 in a row
+	- Challenge Mode (with more than 2 player at once)
+	- Song Editor
+	- Duet (full support, choose/toggle names)

Vocaluxe/Lib/Sound/CPortAudioPlay.cs

@@ -489,7 +489,7 @@ namespace Vocaluxe.Lib.Sound
                     if (Finished)
                         _SyncTimer.Pause();
 
-                    return _CurrentTime; // _SyncTimer.Time;
+                    return _SyncTimer.Time;
                 }  
             }
         }
@@ -843,7 +843,7 @@ namespace Vocaluxe.Lib.Sound
                 float latency = buf.Length / _BytesPerSecond + CConfig.AudioLatency/1000f;
                 float time = _TimeCode - _data.BytesNotRead / _BytesPerSecond - latency;
 
-                _CurrentTime = time; // _SyncTimer.Update(time);
+                _CurrentTime = _SyncTimer.Update(time);
             }
   
             try