[Performous-commit] Lasse Karkkainen : Prefer video instead of webcam when both are enabled ( disable video in config to get the old functionality).

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

Author: Lasse Karkkainen <tro...@tr...>
Date:   Mon Oct 24 01:12:19 2011 +0300

Prefer video instead of webcam when both are enabled (disable video in config to get the old functionality).

---

 game/screen_sing.cc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 92b460c..ff0f90c 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -436,12 +436,12 @@ void ScreenSing::draw() {
 			if (ar > arMax || (m_video && ar > arMin)) fillBG();  // Fill white background to avoid black borders
 			m_background->draw();
 		} else fillBG(); // Blank
+		// Webcam
+		if (m_cam && config["graphic/webcam"].b()) m_cam->render();
 		// Video
-		if (m_video && (!m_cam || !m_cam->is_good())) {
+		if (m_video /* && (!m_cam || !m_cam->is_good()) */) {
 			m_video->render(time); double tmp = m_video->dimensions().ar(); if (tmp > 0.0) ar = tmp;
 		}
-		// Webcam
-		if (m_cam && config["graphic/webcam"].b()) m_cam->render();
 		// Top/bottom borders
 		ar = clamp(ar, arMin, arMax);
 		double offset = 0.5 / ar + 0.2;