[Performous-commit] Lasse Karkkainen : Improvements to latency key bindings and documentation.

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: 9f22281e05f5c2261ff467df929b546cfe4b13dc

Author: Lasse Karkkainen <tro...@tr...>
Date:   Thu Jan  7 13:10:32 2010 +0200

Improvements to latency key bindings and documentation.

---

 data/schema.xml     |   14 +++++++-------
 game/screen_sing.cc |    8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/data/schema.xml b/data/schema.xml
index bc1cef6..a3168d7 100644
--- a/data/schema.xml
+++ b/data/schema.xml
@@ -159,23 +159,23 @@ to save the current settings to XML.
 		<limits min="-0.5" max="0.5" step="0.01" />
 		<locale name="C">
 			<short>Audio/video latency</short>
-			<long>Use negative value if your display input lag is greater than the sound card output latency, positive values in the opposite case and zero if they are equal. F5/F6 to adjust this in singing screen.</long>
+			<long>Affects all modes. Use negative value if your display input lag is greater than the sound card output latency, positive values in the opposite case and zero if they are equal. This should be set so that the notes pass the cursor at the same time the audio is heard. Use Ctrl+F1/F2 to adjust this while performing.</long>
 		</locale>
 	</entry>
-	<entry name="audio/controller_delay" type="float" value="0.08">
+	<entry name="audio/round-trip" type="float" value="0.09">
 		<ui unit=" ms" multiplier="1000" />
 		<limits min="0.0" max="0.5" step="0.01" />
 		<locale name="C">
-			<short>Audio/controller latency</short>
-			<long>The total of USB (guitar or dance pad) latency combined with audio output latency.</long>
+			<short>Audio round-trip latency</short>
+			<long>Affects singing only. The time it takes for Performous playback to reach your speakers, fly to the microphone and all the way back until Performous captures and analyzes it. While performing, press Ctrl+S for synth mode and adjust with Ctrl+F3/F4.</long>
 		</locale>
 	</entry>
-	<entry name="audio/round-trip" type="float" value="0.09">
+	<entry name="audio/controller_delay" type="float" value="0.08">
 		<ui unit=" ms" multiplier="1000" />
 		<limits min="0.0" max="0.5" step="0.01" />
 		<locale name="C">
-			<short>Audio round-trip latency</short>
-			<long>The time it takes for Performous playback to reach your speakers, fly to the microphone and all the way back until Performous captures and analyzes it. Use F4 debug mode in singing screen and adjust with F7/F8.</long>
+			<short>Audio/controller latency</short>
+			<long>Affects instruments and dancing only. The total of USB (guitar or dance pad) latency combined with audio output latency. Adjust so that you can hit the notes best when playing by ear (not looking on screen). Use Ctrl+F5/F6 to adjust while performing.</long>
 		</locale>
 	</entry>
 	<entry name="audio/capture" type="string_list">
diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 2110581..b8fa9aa 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -247,10 +247,10 @@ void ScreenSing::manageEvent(SDL_Event event) {
 		// Control combinations
 		if (event.key.keysym.mod & KMOD_CTRL) {
 			// Latency settings
-			if (key == SDLK_F1) --config["audio/round-trip"];
-			if (key == SDLK_F2) ++config["audio/round-trip"];
-			if (key == SDLK_F3) --config["audio/video_delay"];
-			if (key == SDLK_F4) ++config["audio/video_delay"];
+			if (key == SDLK_F1) --config["audio/video_delay"];
+			if (key == SDLK_F2) ++config["audio/video_delay"];
+			if (key == SDLK_F3) --config["audio/round-trip"];
+			if (key == SDLK_F4) ++config["audio/round-trip"];
 			if (key == SDLK_F5) --config["audio/controller_delay"];
 			if (key == SDLK_F6) ++config["audio/controller_delay"];
 			if (m_song->track_map.empty()) { // Seeking is currently only permitted for karaoke songs