performous-commit — SCM commits

[Performous-commit] Vincent Le Ligeour : Exploded instrument definition for simpliest code/ maintainability

[Yoda-JM <yo...@us...>]

Module: performous
Branch: controllers
Commit: b992f235f5266604469278a60535d47fdae492ed

Author: Vincent Le Ligeour <yo...@us...>
Date:   Wed Aug  4 13:16:37 2010 +0200

Exploded instrument definition for simpliest code/maintainability

---

 data/controllers.xml |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/data/controllers.xml b/data/controllers.xml
index 7129607..5e83c9e 100644
--- a/data/controllers.xml
+++ b/data/controllers.xml
@@ -16,11 +16,22 @@
 			<button id="9" value="start" />
 		</mapping>
 	</guitar>
-        <guitar name="GUITAR_RB_XBOX360">
+        <guitar name="GUITAR_GH_XPLORER">
 		<match>
 			<description>Guitar Hero X-plorer guitar</description>
 	                <regexp match="Guitar Hero X-plorer" />
 		</match>
+                <mapping> 
+                        <button id="0" value="green" />
+                        <button id="1" value="red" />
+                        <button id="2" value="blue" />
+                        <button id="3" value="yellow" />
+                        <button id="4" value="orange" />
+                        <button id="6" value="select" />
+                        <button id="7" value="start" />
+                </mapping>
+        </guitar>
+        <guitar name="GUITAR_RB_XBOX360">
 		<match>
 			<description>Rock Band guitar Xbox 360</description>
 			<regexp match="Harmonix Guitar .* Xbox" />
@@ -83,11 +94,22 @@
 			<button id="9" value="start" />
 		</mapping>
 	</drumkit>
-	<drumkit name="DRUMS_RB_PS3">
+	<drumkit name="DRUMS_RB_WII">
 		<match>
 			<description>RockBand Wii drum kit</description>
 			<regexp match="Harmonix Drum Controller for Nintendo Wii" />
 		</match>
+		<mapping>
+			<button id="0" value="blue" />
+			<button id="1" value="green" />
+			<button id="2" value="red" />
+			<button id="3" value="yellow" />
+			<button id="4" value="kick" />
+			<button id="8" value="select" />
+			<button id="9" value="start" />
+		</mapping>
+	</drumkit>
+	<drumkit name="DRUMS_RB_PS3">
 		<match>
 			<description>RockBand PS3 drum kit</description>
 			<regexp match="Harmonix Drum [Kk]it for Playstation" />

[Performous-commit] Vincent Le Ligeour : Removed all detailled instrument type

[Yoda-JM <yo...@us...>]

Module: performous
Branch: controllers
Commit: 6c98be0018b0015fb12bdc9de08912aef9925fb5

Author: Vincent Le Ligeour <yo...@us...>
Date:   Wed Aug  4 13:05:05 2010 +0200

Removed all detailled instrument type

---

 game/joystick.cc        |  111 +++++++++++++++++++----------------------------
 game/joystick.hh        |   35 ++++++++-------
 game/screen_practice.cc |    2 +-
 3 files changed, 65 insertions(+), 83 deletions(-)

[Performous-commit] Vincent Le Ligeour : Moved instrument definition inside InputDevPrivate

[Yoda-JM <yo...@us...>]

Module: performous
Branch: controllers
Commit: 762fd35cd5161be68dc51c536af8c8fee6e373e1

Author: Vincent Le Ligeour <yo...@us...>
Date:   Wed Aug  4 11:42:30 2010 +0200

Moved instrument definition inside InputDevPrivate

---

 game/joystick.cc |   58 +++++++++++++++++++++--------------------------------
 game/joystick.hh |   38 ++++++++++++++--------------------
 2 files changed, 39 insertions(+), 57 deletions(-)

[Performous-commit] Tapio Vierros : Simple time code correction for smoother gameplay.

[Tapio V. <aa...@us...>]

Module: performous
Branch: portaudio
Commit: a6fd1f98cedfdd849955bb63efc8ffc791d7f1ce

Author: Tapio Vierros <tap...@gm...>
Date:   Tue Aug  3 21:25:08 2010 +0300

Simple time code correction for smoother gameplay.

---

 game/audio.cc |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/game/audio.cc b/game/audio.cc
index 27c499a..bfba389 100644
--- a/game/audio.cc
+++ b/game/audio.cc
@@ -60,12 +60,20 @@ class Music {
 	Tracks tracks; ///< Audio decoders
 	double srate; ///< Sample rate
 	int64_t m_pos; ///< Current sample position
+	boost::posix_time::ptime m_syncTime; ///< Time of the previous audio timeSync
 	bool m_preview;
+
+	static boost::posix_time::ptime getTime() { return boost::posix_time::microsec_clock::universal_time(); }
+	double pos_internal() const { return double(m_pos) / srate / 2.0; }
+	double seconds(boost::posix_time::time_duration const& d) const { return 1e-6 * d.total_microseconds(); }
+	/// Do stuff for correcting time codes
+	void timeSync() { m_syncTime = getTime(); }
+
 public:
 	double fadeLevel;
 	double fadeRate;
 	typedef std::map<std::string,std::string> Files;
-	Music(Files const& filenames, unsigned int sr, bool preview): srate(sr), m_pos(), m_preview(preview), fadeLevel(), fadeRate() {
+	Music(Files const& filenames, unsigned int sr, bool preview): srate(sr), m_pos(), m_syncTime(getTime()), m_preview(preview), fadeLevel(), fadeRate() {
 		for (Files::const_iterator it = filenames.begin(), end = filenames.end(); it != end; ++it) {
 			tracks.insert(it->first, std::auto_ptr<Track>(new Track(it->second, sr)));
 		}
@@ -79,6 +87,7 @@ public:
 			if (t.mpeg.audioQueue(&*mixbuf.begin(), &*mixbuf.end(), m_pos, t.fadeLevel)) eof = false;
 		}
 		m_pos += end - begin;
+		timeSync(); // Keep audio synced
 		for (size_t i = 0, iend = mixbuf.size(); i != iend; ++i) {
 			if (i % 2 == 0) {
 				fadeLevel += fadeRate;
@@ -91,7 +100,11 @@ public:
 	}
 	void seek(double time) { m_pos = time * srate * 2.0; }
 	/// Get current position in seconds
-	double pos() const { return double(m_pos) / srate / 2.0; }
+	double pos() {
+		double delay = seconds(getTime() - m_syncTime); // Delay since last sync
+		if (delay > 0.150) delay = 0; // If delay gets long, something is fishy (or pause is on)
+		return pos_internal() + delay; // Adjust internal time
+	}
 	double duration() const {
 		double dur = 0.0;
 		for (Tracks::const_iterator it = tracks.begin(), itend = tracks.end(); it != itend; ++it) {

[Performous-commit] Vincent Le Ligeour : Removed unneeded default constructor in joystick.hh

[Yoda-JM <yo...@us...>]

Module: performous
Branch: controllers
Commit: fb76cabfaadaab0639c11761003e04e11d916d6a

Author: Vincent Le Ligeour <yo...@us...>
Date:   Tue Aug  3 20:23:05 2010 +0200

Removed unneeded default constructor in joystick.hh

---

 game/joystick.cc        |   66 +++++++++++++++++++++++-----------------------
 game/joystick.hh        |    7 +----
 game/screen_practice.cc |    4 +-
 3 files changed, 36 insertions(+), 41 deletions(-)

[Performous-commit] Tapio Vierros : Fix dance menu margins, since it doesn't (yet?) have icons.

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: 42ea1b7aea14a9b0ebf6a40b95e4548c7e308a35

Author: Tapio Vierros <tap...@gm...>
Date:   Tue Aug  3 17:04:44 2010 +0300

Fix dance menu margins, since it doesn't (yet?) have icons.

---

 game/instrumentgraph.cc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/game/instrumentgraph.cc b/game/instrumentgraph.cc
index b5afc91..399f579 100644
--- a/game/instrumentgraph.cc
+++ b/game/instrumentgraph.cc
@@ -66,7 +66,7 @@ void InstrumentGraph::drawMenu() {
 	double w = m_menu.dimensions.w();
 	const double offsetX = 0.5f * (dimensions.x1() + dimensions.x2());
 	const float txth = th.option.h();
-	const float button_margin = 0.05f;
+	const float button_margin = (getGraphType() == input::DANCEPAD ? 0.0f : 0.05f);
 	const float step = txth * 0.7f;
 	const float h = m_menu.getOptions().size() * step + step;
 	float y = -h * .5f + step;

[Performous-commit] Tapio Vierros : Merge branch 'master' into joinmenu

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: 96e9c43548d43dbfa8b40361e30643892c33f304

Author: Tapio Vierros <tap...@gm...>
Date:   Tue Aug  3 14:33:58 2010 +0300

Merge branch 'master' into joinmenu

Conflicts:
	game/instrumentgraph.hh

---

[Performous-commit] Fredrik Klasson : Load the SVG if loading the cache file fails instead of aborting with a fatal error .

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: 931c5874d4ca8fcc230a6f5e476cb1548a6e6723

Author: Fredrik Klasson <fr...@li...>
Date:   Fri Jul 30 21:40:00 2010 +0200

Load the SVG if loading the cache file fails instead of aborting with a fatal error.

---

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

diff --git a/game/surface.cc b/game/surface.cc
index 319e0e7..d93ad08 100644
--- a/game/surface.cc
+++ b/game/surface.cc
@@ -52,7 +52,11 @@ template <typename T> void loader(T& target, fs::path name) {
 					// SVG file is newer we should update cache
 					loadSVG(target, filename, cache_filename.string());
 				} else {
-					loadPNG(target, cache_filename.string());
+					try {
+						loadPNG(target, cache_filename.string());
+					}catch (std::runtime_error){
+						loadSVG(target, filename, cache_filename.string());
+					}
 				}
 			} else {
 				loadSVG(target, filename, cache_filename.string());

[Performous-commit] Vincent Le Ligeour : Added EditorOfFire ebuild

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: 1f900d6846e241ba04623747f25adc66fda5b7bb

Author: Vincent Le Ligeour <yo...@us...>
Date:   Tue Jul 27 23:59:29 2010 +0200

Added EditorOfFire ebuild

---

 portage-overlay/games-arcade/eof/eof-1.65.ebuild |   45 ++++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 deletions(-)

diff --git a/portage-overlay/games-arcade/eof/eof-1.65.ebuild b/portage-overlay/games-arcade/eof/eof-1.65.ebuild
new file mode 100644
index 0000000..387898b
--- /dev/null
+++ b/portage-overlay/games-arcade/eof/eof-1.65.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit games
+
+DESCRIPTION="Song editor for the game Frets On Fire"
+HOMEPAGE="http://www.t3-i.com/eof.htm"
+SRC_URI="http://www.t3-i.com/apps/${PN}/downloads/${PN}-${PV}-linux.tar.gz"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	media-libs/allegro
+	media-sound/vorbis-tools
+	media-sound/lame
+"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	cd "${WORKDIR}/src/"
+	emake -f makefile.linux || die "emake failed"
+}
+
+src_install() {
+	cd "${WORKDIR}"
+	cat >> bin/eof.script <<-EOF
+		#!/bin/bash
+		TMP_DIR=\`mktemp -d || echo "/tmp/falback"\`
+		echo ">> Using \\"\${TMP_DIR}\\" as temporary location"
+		cp /usr/share/eof/* "\${TMP_DIR}"
+		cd "\${TMP_DIR}"
+		eof.bin
+		rm -rf "\${TMP_DIR}"
+	EOF
+	newbin bin/eof eof.bin
+	newbin bin/eof.script eof
+	insinto "/usr/share/${PN}"
+	doins bin/eof.dat bin/check.wav
+}

[Performous-commit] Tapio Vierros : Attempt to work around porttime problems.

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: d25e84aab8d0ef95cba85d0931e7f00d7a736fad

Author: Tapio Vierros <tap...@gm...>
Date:   Tue Jul 27 23:08:38 2010 +0300

Attempt to work around porttime problems.

---

 cmake/Modules/FindPortMidi.cmake |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/cmake/Modules/FindPortMidi.cmake b/cmake/Modules/FindPortMidi.cmake
index f5126d8..e3774ad 100644
--- a/cmake/Modules/FindPortMidi.cmake
+++ b/cmake/Modules/FindPortMidi.cmake
@@ -16,6 +16,12 @@ find_library(PortMidi_LIBRARY NAMES portmidi)
 find_library(PortTime_LIBRARY NAMES porttime)
 
 set(PortMidi_PROCESS_INCLUDES PortMidi_INCLUDE_DIR)
-set(PortMidi_PROCESS_LIBS PortMidi_LIBRARY PortTime_LIBRARY)
+set(PortMidi_PROCESS_LIBS PortMidi_LIBRARY)
+# Porttime library is merged to Portmidi in new versions, so
+# we work around problems by adding it only if it's present
+if (${PortTime_LIBRARY})
+	set(PortMidi_PROCESS_LIBS PortMidi_PROCESS_LIBS PortTime_LIBRARY)
+endif (${PortTime_LIBRARY})
+
 libfind_process(PortMidi)
 

[Performous-commit] Tapio Vierros : Add a README to the repo root to make my github mirror prettier.

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: 06d781635e345cf2bd6a9a92cce71ace0a670ac6

Author: Tapio Vierros <tap...@gm...>
Date:   Tue Jul 27 22:36:58 2010 +0300

Add a README to the repo root to make my github mirror prettier.

---

 README.txt |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000..df8fa33
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,8 @@
+Performous
+==========
+An open-source karaoke, band and dancing game where one or more players perform a song and the game scores their performances. Supports songs in UltraStar, Frets on Fire and StepMania formats. Microphones and instruments from SingStar, Guitar Hero and Rock Band as well as some dance pads are autodetected.
+
+Website at http://performous.org
+Wiki at http://wiki.performous.org
+
+For compiling instructions, see docs/Compiling.txt or visit the wiki page: http://wiki.performous.org/index.php/Building_and_installing_from_source

[Performous-commit] Tapio Vierros : Make sure paths are unique.

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: 330f88915c5362c8a05ecda3a5d35bec06bdaf4b

Author: Tapio Vierros <tap...@gm...>
Date:   Tue Jul 27 22:24:20 2010 +0300

Make sure paths are unique.

---

 game/fs.cc |   54 +++++++++++++++++++++++++++++-------------------------
 1 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/game/fs.cc b/game/fs.cc
index 79895c2..e56f471 100644
--- a/game/fs.cc
+++ b/game/fs.cc
@@ -6,6 +6,7 @@
 #include <cstdlib>
 #include <iostream>
 #include <sstream>
+#include <algorithm>
 
 #ifdef _WIN32
 #include <windows.h>
@@ -40,31 +41,31 @@ fs::path getConfigDir() {
 	static bool initialized = false;
 	if (!initialized) {
 		initialized = true;
-        #ifndef _WIN32
-        {
-            char const* conf = getenv("XDG_CONFIG_HOME");
-            if (conf) dir = fs::path(conf) / "performous";
-            else dir = getHomeDir() / ".config" / "performous";
-        }
-        #else
-        {
-            //open AppData directory
-            std::string str;
-            ITEMIDLIST* pidl;
-            char AppDir[MAX_PATH];
-            HRESULT hRes = SHGetSpecialFolderLocation( NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE , &pidl );
-            if (hRes==NOERROR)
-            {
-              SHGetPathFromIDList( pidl, AppDir );
-              int i;
-              for(i = 0; AppDir[i] != '\0'; i++){
-                  if(AppDir[i] == '\\') str += '/';
-                  else                  str += AppDir[i];
-              }
-              dir = fs::path(str) / "performous";
-            }
-        }
-        #endif
+		#ifndef _WIN32
+		{
+			char const* conf = getenv("XDG_CONFIG_HOME");
+			if (conf) dir = fs::path(conf) / "performous";
+			else dir = getHomeDir() / ".config" / "performous";
+		}
+		#else
+		{
+			//open AppData directory
+			std::string str;
+			ITEMIDLIST* pidl;
+			char AppDir[MAX_PATH];
+			HRESULT hRes = SHGetSpecialFolderLocation( NULL, CSIDL_APPDATA|CSIDL_FLAG_CREATE , &pidl );
+			if (hRes==NOERROR)
+			{
+			  SHGetPathFromIDList( pidl, AppDir );
+			  int i;
+			  for(i = 0; AppDir[i] != '\0'; i++){
+				  if(AppDir[i] == '\\') str += '/';
+				  else                  str += AppDir[i];
+			  }
+			  dir = fs::path(str) / "performous";
+			}
+		}
+		#endif
 	}
 	return dir;
 }
@@ -174,6 +175,9 @@ Paths const& getPaths(bool refresh) {
 		// Check if they actually exist and print debug
 		paths.clear();
 		std::remove_copy_if(dirs.begin(), dirs.end(), std::inserter(paths, paths.end()), pathNotExist);
+		// Assure that each path appears only once
+		Paths::iterator it = std::unique(paths.begin(), paths.end());
+		paths.resize(it - paths.begin());
 	}
 	return paths;
 }

[Performous-commit] Tapio Vierros : Add a .gitignore for the cross compilation files.

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: 221264956017d8f93a4231dc44dd937758f68370

Author: Tapio Vierros <tap...@gm...>
Date:   Sat Jul 24 23:40:41 2010 +0300

Add a .gitignore for the cross compilation files.

---

 win32/cross-from-debian/.gitignore |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/win32/cross-from-debian/.gitignore b/win32/cross-from-debian/.gitignore
new file mode 100644
index 0000000..b36ad51
--- /dev/null
+++ b/win32/cross-from-debian/.gitignore
@@ -0,0 +1,9 @@
+*.tar.gz
+*.tar.bz2
+*.tgz
+*.zip
+deps/*
+dist/*
+stage/*
+wine/*
+

[Performous-commit] Felix Bertram : remove command line parameters from performous-launcher

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: 6f717b2930e5e0677aba7a2a84e61780b331337b

Author: Felix Bertram <fl...@be...>
Date:   Sun Jul 25 14:41:00 2010 -0700

remove command line parameters from performous-launcher
with these, Performous doesn't launch on MacBook Pro w/ 10.5.8

---

 osx-utils/resources/performous-launcher |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/osx-utils/resources/performous-launcher b/osx-utils/resources/performous-launcher
index a6ff039..102dad7 100755
--- a/osx-utils/resources/performous-launcher
+++ b/osx-utils/resources/performous-launcher
@@ -3,4 +3,7 @@
 dir=$(dirname "$0")
 export PATH=$PATH:"$dir"
 export FONTCONFIG_PATH="$dir/../Resources/etc/fonts"
-performous 2>&1 --pdev pa19 --mics pa19
+# somehow this doesn't work on a MacBookPro under 10.5.8:
+#performous 2>&1 --pdev pa19 --mics pa19
+# TODO: might be a good idea to turn-off all console output
+performous

[Performous-commit] Felix Bertram : fix detection of Wii instruments (guitar, drums)

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: 999d4941623f91d57b53df3fc1b1e99506ff8fe3

Author: Felix Bertram <fl...@be...>
Date:   Sun Jul 25 14:40:21 2010 -0700

fix detection of Wii instruments (guitar, drums)

---

 game/joystick.cc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/game/joystick.cc b/game/joystick.cc
index 35f192f..bccd247 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -386,8 +386,8 @@ void input::SDL::init() {
 				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::GUITAR_RB_XB360);
 			} else if (name.find("Nintendo") != std::string::npos) {
 				// "Licensed by Nintendo of America  Harmonix Guitar Controller for Nintendo Wii"
-				std::cout << "  Detected as: RockBand Drums PS3 (Wii Guitar)" << std::endl;
-				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::DRUMS_RB_PS3);
+				std::cout << "  Detected as: RockBand Guitar PS3 (Wii Guitar)" << std::endl;
+				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::GUITAR_RB_PS3);
 			} else {
 				std::cout << "  Detected as: RockBand Guitar PS3" << std::endl;
 				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::GUITAR_RB_PS3);
@@ -399,8 +399,8 @@ void input::SDL::init() {
 				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::DRUMS_RB_XB360);
 			} else if (name.find("Nintendo") != std::string::npos) {
 				// Licensed by Nintendo of America  Harmonix Drum Controller for Nintendo Wii
-				std::cout << "  Detected as: RockBand Guitar PS3 (Wii Drums)" << std::endl;
-				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::GUITAR_RB_PS3);
+				std::cout << "  Detected as: RockBand Drums PS3 (Wii Drums)" << std::endl;
+				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::DRUMS_RB_PS3);
 			} else {
 				std::cout << "  Detected as: RockBand Drums PS3" << std::endl;
 				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::DRUMS_RB_PS3);

[Performous-commit] Tapio Vierros : Add auto-detection for Wii instruments.

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: fe970e73dcaf6479c8931107a297f05c22e31236

Author: Tapio Vierros <tap...@gm...>
Date:   Sat Jul 24 11:08:47 2010 +0300

Add auto-detection for Wii instruments.

---

 game/joystick.cc |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/game/joystick.cc b/game/joystick.cc
index 98640c1..35f192f 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -381,16 +381,26 @@ void input::SDL::init() {
 			input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::GUITAR_GH);
 		} else if( name.find("Harmonix Guitar") != std::string::npos ) {
 			if (name.find("Xbox") != std::string::npos) {
+				// "Harmonix Guitar for Xbox360 (Controller)"
 				std::cout << "  Detected as: RockBand Guitar Xbox360" << std::endl;
 				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::GUITAR_RB_XB360);
+			} else if (name.find("Nintendo") != std::string::npos) {
+				// "Licensed by Nintendo of America  Harmonix Guitar Controller for Nintendo Wii"
+				std::cout << "  Detected as: RockBand Drums PS3 (Wii Guitar)" << std::endl;
+				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::DRUMS_RB_PS3);
 			} else {
 				std::cout << "  Detected as: RockBand Guitar PS3" << std::endl;
 				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::GUITAR_RB_PS3);
 			}
-		} else if( name.find("Harmonix Drum Kit") != std::string::npos || name.find("Harmonix Drum kit") != std::string::npos) {
+		} else if( name.find("Harmonix Drum") != std::string::npos) {
+			// Kit / kit / Controller
 			if (name.find("Xbox") != std::string::npos) {
 				std::cout << "  Detected as: RockBand Drums Xbox360" << std::endl;
 				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::DRUMS_RB_XB360);
+			} else if (name.find("Nintendo") != std::string::npos) {
+				// Licensed by Nintendo of America  Harmonix Drum Controller for Nintendo Wii
+				std::cout << "  Detected as: RockBand Guitar PS3 (Wii Drums)" << std::endl;
+				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::GUITAR_RB_PS3);
 			} else {
 				std::cout << "  Detected as: RockBand Drums PS3" << std::endl;
 				input::detail::devices[i] = input::detail::InputDevPrivate(input::detail::DRUMS_RB_PS3);

[Performous-commit] John Stumpo : Merge remote branch 'origin/master'

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: 454127977b4216f1f4874ab5c481f3f75e1154cb

Author: John Stumpo <st...@js...>
Date:   Wed Jul 21 16:14:40 2010 -0400

Merge remote branch 'origin/master'

---

[Performous-commit] Vincent Le Ligeour : Added explicit webcam/midi disabling

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: 5ad067bd0953dbba3b3964bbd2e412c5e07aa1ce

Author: Vincent Le Ligeour <yo...@us...>
Date:   Wed Jul 21 12:45:28 2010 +0200

Added explicit webcam/midi disabling

---

 game/CMakeLists.txt                                |   36 ++++++++++++--------
 .../games-arcade/performous/performous-9999.ebuild |    4 ++
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index 17a11e7..5a4fa1f 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -96,24 +96,32 @@ else()
 	message(STATUS "Internationalization: Disabled (libintl not found)")
 endif()
 
-find_package(PortMidi)
-if(PortMidi_FOUND)
-	include_directories(${PortMidi_INCLUDE_DIRS})
-	list(APPEND LIBS ${PortMidi_LIBRARIES})
-	add_definitions("-DUSE_PORTMIDI")
-	message(STATUS "MIDI I/O: Enabled")
+if(NOT NO_PORTMIDI)
+	find_package(PortMidi)
+	if(PortMidi_FOUND)
+		include_directories(${PortMidi_INCLUDE_DIRS})
+		list(APPEND LIBS ${PortMidi_LIBRARIES})
+		add_definitions("-DUSE_PORTMIDI")
+		message(STATUS "MIDI I/O: Enabled")
+	else()
+		message(STATUS "MIDI I/O: Disabled (libportmidi not found)")
+	endif()
 else()
-	message(STATUS "MIDI I/O: Disabled (libportmidi not found)")
+	message(STATUS "MIDI I/O: Disabled (explicitly disabled)")
 endif()
 
-find_package(OpenCV)
-if(OpenCV_FOUND)
-	include_directories(${OpenCV_INCLUDE_DIRS})
-	list(APPEND LIBS ${OpenCV_LIBRARIES})
-	add_definitions("-DUSE_OPENCV")
-	message(STATUS "Webcam support: Enabled")
+if(NOT NO_WEBCAM)
+	find_package(OpenCV)
+	if(OpenCV_FOUND)
+		include_directories(${OpenCV_INCLUDE_DIRS})
+		list(APPEND LIBS ${OpenCV_LIBRARIES})
+		add_definitions("-DUSE_OPENCV")
+		message(STATUS "Webcam support: Enabled")
+	else()
+		message(STATUS "Webcam support: Disabled (libcv/libhighgui not found)")
+	endif()
 else()
-	message(STATUS "Webcam support: Disabled (libcv/libhighgui not found)")
+	message(STATUS "Webcam support: Disabled (explicitly disabled)")
 endif()
 
 
diff --git a/portage-overlay/games-arcade/performous/performous-9999.ebuild b/portage-overlay/games-arcade/performous/performous-9999.ebuild
index ba82507..d2a1ad5 100644
--- a/portage-overlay/games-arcade/performous/performous-9999.ebuild
+++ b/portage-overlay/games-arcade/performous/performous-9999.ebuild
@@ -91,12 +91,16 @@ src_configure() {
 		$(cmake-utils_use pulseaudio LibDA_PLUGIN_PULSEAUDIO)
 		$(cmake-utils_use_enable tools TOOLS)
 		$(cmake-utils_use_enable editor EDITOR)
+		$(cmake-utils_use_no webcam WEBCAM)
 		-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}
 		-DSHARE_INSTALL=share/performous
 		-DLOCALE_DIR=/usr/share
 		-DLIBDA_AUTODETECT_PLUGINS=false
 		-DLIBDA_PLUGIN_TESTING=false
 		-DCMAKE_BUILD_TYPE=Release"
+#	local mycmakeargs="
+#		$(cmake-utils_use_no midi MIDI)
+#		${mycmakeargs}"
 
 	cmake-utils_src_configure
 }

[Performous-commit] Vincent Le Ligeour : Added master default to ebuild

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: 7bf290f86dbae6e0244d2c1d758f56368095b8b8

Author: Vincent Le Ligeour <yo...@us...>
Date:   Wed Jul 21 02:22:56 2010 +0200

Added master default to ebuild

---

 .../games-arcade/performous/performous-9999.ebuild |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/portage-overlay/games-arcade/performous/performous-9999.ebuild b/portage-overlay/games-arcade/performous/performous-9999.ebuild
index d979e5f..ba82507 100644
--- a/portage-overlay/games-arcade/performous/performous-9999.ebuild
+++ b/portage-overlay/games-arcade/performous/performous-9999.ebuild
@@ -25,6 +25,7 @@ if [ "$PV" != "9999" ]; then
 		$SRC_URI"
 else
 	EGIT_REPO_URI="git://performous.git.sourceforge.net/gitroot/performous/performous"
+	EGIT_BRANCH="master"
 fi
 
 LICENSE="GPL-2

[Performous-commit] Tapio Vierros : Revert "Midi I/O does not compile under Fedora 13"

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: e3ba3fa22419dacc1ed3ca4a8ac2931e07c870be

Author: Tapio Vierros <tap...@gm...>
Date:   Sat Jul 17 11:19:55 2010 +0300

Revert "Midi I/O does not compile under Fedora 13"

This reverts commit 107a4c07d8a03dffa603a6d38eed6476c83bd70c.

Reason: Apparantly this causes Launchpad builds to fail,
so it is reverted pending better solution.

---

 cmake/Modules/FindPortMidi.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cmake/Modules/FindPortMidi.cmake b/cmake/Modules/FindPortMidi.cmake
index 38224a0..f5126d8 100644
--- a/cmake/Modules/FindPortMidi.cmake
+++ b/cmake/Modules/FindPortMidi.cmake
@@ -13,7 +13,7 @@ include(LibFindMacros)
 
 find_path(PortMidi_INCLUDE_DIR NAMES portmidi.h)
 find_library(PortMidi_LIBRARY NAMES portmidi)
-find_library(PortTime_LIBRARY NAMES portmidi)
+find_library(PortTime_LIBRARY NAMES porttime)
 
 set(PortMidi_PROCESS_INCLUDES PortMidi_INCLUDE_DIR)
 set(PortMidi_PROCESS_LIBS PortMidi_LIBRARY PortTime_LIBRARY)

[Performous-commit] Tapio Vierros : Remove excess includes and move to .cc when possible.

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: b1b1d8d9c4720c5941a2bacc7cb2aaa0c699051f

Author: Tapio Vierros <tap...@gm...>
Date:   Sat Jul 17 00:57:29 2010 +0300

Remove excess includes and move to .cc when possible.

---

 game/3dobject.cc             |    6 ------
 game/3dobject.hh             |    4 ----
 game/backgrounds.cc          |    1 -
 game/backgrounds.hh          |    1 -
 game/dancegraph.cc           |    7 +++----
 game/dancegraph.hh           |    8 --------
 game/guitargraph.cc          |    5 ++---
 game/guitargraph.hh          |    8 --------
 game/instrumentgraph.hh      |    3 ---
 game/joystick.cc             |    1 -
 game/screen_configuration.cc |    3 +++
 game/screen_configuration.hh |    7 ++++---
 game/screen_intro.cc         |    2 ++
 game/screen_intro.hh         |    8 ++++----
 game/screen_practice.cc      |    4 +++-
 game/screen_practice.hh      |   10 +++++-----
 game/songparser-ini.cc       |    1 -
 game/songparser-sm.cc        |    1 -
 game/songparser.cc           |    3 +--
 game/songparser.hh           |    2 --
 20 files changed, 27 insertions(+), 58 deletions(-)

diff --git a/game/3dobject.cc b/game/3dobject.cc
index edafe3d..053896c 100644
--- a/game/3dobject.cc
+++ b/game/3dobject.cc
@@ -1,14 +1,8 @@
 #include "3dobject.hh"
-#include "surface.hh"
-#include "glutil.hh"
 
-#include <vector>
-#include <map>
-#include <iostream>
 #include <sstream>
 #include <fstream>
 #include <stdexcept>
-#include <string>
 #include <cmath>
 
 
diff --git a/game/3dobject.hh b/game/3dobject.hh
index 8bf6ceb..9858de8 100644
--- a/game/3dobject.hh
+++ b/game/3dobject.hh
@@ -1,11 +1,7 @@
 #pragma once
 
 #include <vector>
-#include <map>
-#include <iostream>
-#include <stdexcept>
 #include <string>
-
 #include <boost/scoped_ptr.hpp>
 #include <boost/noncopyable.hpp>
 #include "surface.hh"
diff --git a/game/backgrounds.cc b/game/backgrounds.cc
index fcc7fe2..5fe42bd 100644
--- a/game/backgrounds.cc
+++ b/game/backgrounds.cc
@@ -1,7 +1,6 @@
 #include "backgrounds.hh"
 
 #include "configuration.hh"
-#include "fs.hh"
 
 #include <boost/bind.hpp>
 #include <boost/format.hpp>
diff --git a/game/backgrounds.hh b/game/backgrounds.hh
index aa99bab..d56eab7 100644
--- a/game/backgrounds.hh
+++ b/game/backgrounds.hh
@@ -7,7 +7,6 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
-#include <set>
 #include <vector>
 
 /// songs class for songs screen
diff --git a/game/dancegraph.cc b/game/dancegraph.cc
index 468106c..8d2d7a9 100644
--- a/game/dancegraph.cc
+++ b/game/dancegraph.cc
@@ -1,8 +1,7 @@
 #include "dancegraph.hh"
-#include "instrumentgraph.hh"
-#include "fs.hh"
-#include "notes.hh"
-#include "surface.hh"
+#include "song.hh"
+#include "i18n.hh"
+
 #include <boost/lexical_cast.hpp>
 #include <stdexcept>
 #include <algorithm>
diff --git a/game/dancegraph.hh b/game/dancegraph.hh
index 0eff7b7..67c58fd 100644
--- a/game/dancegraph.hh
+++ b/game/dancegraph.hh
@@ -1,16 +1,8 @@
 #pragma once
 
-#include <vector>
 #include <boost/ptr_container/ptr_map.hpp>
 
 #include "instrumentgraph.hh"
-#include "animvalue.hh"
-#include "song.hh"
-#include "notes.hh"
-#include "audio.hh"
-#include "joystick.hh"
-#include "surface.hh"
-#include "opengl_text.hh"
 
 class Song;
 
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 01d9ffb..c0152b1 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -1,12 +1,11 @@
 #include "guitargraph.hh"
-#include "instrumentgraph.hh"
 #include "fs.hh"
 #include "song.hh"
-#include "3dobject.hh"
+#include "i18n.hh"
+
 #include <cmath>
 #include <cstdlib>
 #include <stdexcept>
-
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
 
diff --git a/game/guitargraph.hh b/game/guitargraph.hh
index ed8b931..e8e5e1f 100644
--- a/game/guitargraph.hh
+++ b/game/guitargraph.hh
@@ -1,17 +1,9 @@
 #pragma once
 
-#include <vector>
 #include <boost/ptr_container/ptr_map.hpp>
 
 #include "instrumentgraph.hh"
-#include "animvalue.hh"
-#include "notes.hh"
-#include "audio.hh"
-#include "joystick.hh"
-#include "surface.hh"
-#include "opengl_text.hh"
 #include "3dobject.hh"
-#include "glutil.hh"
 
 class Song;
 
diff --git a/game/instrumentgraph.hh b/game/instrumentgraph.hh
index 8ca5cac..7bc6ab8 100644
--- a/game/instrumentgraph.hh
+++ b/game/instrumentgraph.hh
@@ -8,11 +8,8 @@
 #include "joystick.hh"
 #include "surface.hh"
 #include "opengl_text.hh"
-#include "3dobject.hh"
 #include "glutil.hh"
 #include "fs.hh"
-#include "i18n.hh"
-
 
 /// Represents popup messages
 class Popup {
diff --git a/game/joystick.cc b/game/joystick.cc
index 02d016d..98640c1 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -1,5 +1,4 @@
 #include "joystick.hh"
-#include <iostream>
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/game/screen_configuration.cc b/game/screen_configuration.cc
index 87b7a4a..e61ecf3 100644
--- a/game/screen_configuration.cc
+++ b/game/screen_configuration.cc
@@ -2,6 +2,9 @@
 
 #include "configuration.hh"
 #include "joystick.hh"
+#include "theme.hh"
+#include "audio.hh"
+
 
 ScreenConfiguration::ScreenConfiguration(std::string const& name, Audio& audio): Screen(name), m_audio(audio), selected() {
 	for (ConfigMenu::const_iterator it = configMenu.begin(); it != configMenu.end(); ++it) {
diff --git a/game/screen_configuration.hh b/game/screen_configuration.hh
index 72d54b8..3524d3c 100644
--- a/game/screen_configuration.hh
+++ b/game/screen_configuration.hh
@@ -1,9 +1,10 @@
 #pragma once
 
-#include "screen.hh"
-#include "audio.hh"
-#include "theme.hh"
 #include <boost/scoped_ptr.hpp>
+#include "screen.hh"
+
+class Audio;
+class ThemeConfiguration;
 
 /// options dialogue
 class ScreenConfiguration: public Screen {
diff --git a/game/screen_intro.cc b/game/screen_intro.cc
index 2b488a5..818bfeb 100644
--- a/game/screen_intro.cc
+++ b/game/screen_intro.cc
@@ -5,6 +5,8 @@
 #include "record.hh"
 #include "i18n.hh"
 #include "joystick.hh"
+#include "theme.hh"
+#include "menu.hh"
 
 ScreenIntro::ScreenIntro(std::string const& name, Audio& audio, Capture& capture): Screen(name), m_audio(audio), m_capture(capture), selected(), m_first(true) {
 }
diff --git a/game/screen_intro.hh b/game/screen_intro.hh
index 76d7909..a7912d8 100644
--- a/game/screen_intro.hh
+++ b/game/screen_intro.hh
@@ -1,13 +1,13 @@
 #pragma once
 
+#include <boost/scoped_ptr.hpp>
 #include "dialog.hh"
 #include "screen.hh"
-#include "theme.hh"
-#include "menu.hh"
-#include <boost/scoped_ptr.hpp>
 
 class Audio;
 class Capture;
+class ThemeIntro;
+class MenuOption;
 
 /// intro screen
 class ScreenIntro : public Screen {
@@ -18,7 +18,7 @@ class ScreenIntro : public Screen {
 	void exit();
 	void manageEvent(SDL_Event event);
 	void draw();
-	
+
 	/// draw menu
 	void draw_menu_options();
 
diff --git a/game/screen_practice.cc b/game/screen_practice.cc
index 1ca3135..4b37583 100644
--- a/game/screen_practice.cc
+++ b/game/screen_practice.cc
@@ -3,7 +3,9 @@
 #include "util.hh"
 #include "fs.hh"
 #include "record.hh"
-#include "joystick.hh"
+#include "audio.hh"
+#include "theme.hh"
+#include "progressbar.hh"
 
 ScreenPractice::ScreenPractice(std::string const& name, Audio& audio, Capture& capture):
   Screen(name), m_audio(audio), m_capture(capture)
diff --git a/game/screen_practice.hh b/game/screen_practice.hh
index a2c372c..fd77a75 100644
--- a/game/screen_practice.hh
+++ b/game/screen_practice.hh
@@ -1,14 +1,14 @@
 #pragma once
 
 #include <boost/scoped_ptr.hpp>
-#include "audio.hh"
 #include "screen.hh"
-#include "theme.hh"
-//#include "opengl_text.hh"
-#include "progressbar.hh"
 #include "joystick.hh"
 
+class Audio;
 class Capture;
+class Sample;
+class ProgressBar;
+class ThemePractice;
 
 /// screen for practice mode
 class ScreenPractice : public Screen {
@@ -19,7 +19,7 @@ class ScreenPractice : public Screen {
 	void exit();
 	void manageEvent( SDL_Event event );
 	void draw();
-	
+
 	/// draw analyzers
 	void draw_analyzers();
 
diff --git a/game/songparser-ini.cc b/game/songparser-ini.cc
index 1b5a686..67e2ce0 100644
--- a/game/songparser-ini.cc
+++ b/game/songparser-ini.cc
@@ -2,7 +2,6 @@
 
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
-#include <boost/filesystem.hpp>
 #include <boost/regex.hpp>
 #include <stdexcept>
 #include "midifile.hh"
diff --git a/game/songparser-sm.cc b/game/songparser-sm.cc
index df5fe91..cb84732 100644
--- a/game/songparser-sm.cc
+++ b/game/songparser-sm.cc
@@ -1,6 +1,5 @@
 #include "songparser.hh"
 
-#include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 #include <algorithm>
diff --git a/game/songparser.cc b/game/songparser.cc
index 47c6ca8..af47a6d 100644
--- a/game/songparser.cc
+++ b/game/songparser.cc
@@ -1,9 +1,8 @@
 #include "songparser.hh"
+
 #include <fstream>
-#include <sstream>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
-#include <boost/filesystem.hpp>
 #include <boost/regex.hpp>
 
 
diff --git a/game/songparser.hh b/game/songparser.hh
index 20a6901..a0bb6e5 100644
--- a/game/songparser.hh
+++ b/game/songparser.hh
@@ -2,10 +2,8 @@
 
 #include "song.hh"
 #include "unicode.hh"
-#include <fstream>
 #include <sstream>
 #include <boost/filesystem.hpp>
-#include <boost/regex.hpp>
 
 namespace SongParserUtil {
 	/// Parse an int from string and assign it to a variable

[Performous-commit] Vincent Le Ligeour : Fixed (workaround) midi golden and freestyle vocal notes

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: 57e1b19e6bc1f9d06f3856996371520e706f3530

Author: Vincent Le Ligeour <yo...@us...>
Date:   Fri Jul 16 17:10:17 2010 +0200

Fixed (workaround) midi golden and freestyle vocal notes

---

 game/songparser-ini.cc |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/game/songparser-ini.cc b/game/songparser-ini.cc
index 9437e77..1b5a686 100644
--- a/game/songparser-ini.cc
+++ b/game/songparser-ini.cc
@@ -176,13 +176,9 @@ void SongParser::iniParse() {
 			n.end = midi.get_seconds(it2->end)+s.start;
 			n.notePrev = n.note = it2->note;
 			n.type = n.note > 100 ? Note::SLEEP : Note::NORMAL;
-			if(n.note == 116 || n.note == 103)
-				// n.type = Note::GOLDEN;
-				continue; // not yet managed by midi parser
-			else if(n.note == 124)
-				// n.type = Note::GOLDEN;
-				continue; // not yet managed by midi parser
-			else if(n.note > 100)
+			if(n.note == 116 || n.note == 103 || n.note == 124)
+				continue; // managed in the next loop (GOLDEN/FREESTYLE notes)
+			else if(n.note > 100) // is it always 105 ?
 				n.type = Note::SLEEP;
 			else
 				n.type = Note::NORMAL;
@@ -245,6 +241,20 @@ void SongParser::iniParse() {
 				vocal.notes.push_back(n);
 			}
 		}
+		for (MidiFileParser::Lyrics::const_iterator it2 = it->lyrics.begin(); it2 != it->lyrics.end(); ++it2) {
+			if(it2->note == 116 || it2->note == 103 || it2->note == 124) {
+				for(Notes::iterator it3 = vocal.notes.begin() ; it3 != vocal.notes.end(); ++it3) {
+					if(it3->begin == midi.get_seconds(it2->begin)+s.start && it3->type == Note::NORMAL) {
+						if(it2->note == 124) {
+							it3->type = Note::FREESTYLE;
+						} else {
+							it3->type = Note::GOLDEN;
+						}
+						break;
+					}
+				}
+			}
+		}
 		if (!vocal.notes.empty()) break;
 	}
 	// Figure out if we have BRE in the song

[Performous-commit] John Stumpo : Add Add/Remove Programs information to the installer.

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: 879d759f08cbede4fa3eb532cb52560af5b21230

Author: John Stumpo <st...@js...>
Date:   Sat Jun 26 03:51:59 2010 -0400

Add Add/Remove Programs information to the installer.

---

 win32/cross-from-debian/makepackage.py |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/win32/cross-from-debian/makepackage.py b/win32/cross-from-debian/makepackage.py
index f422145..4ff134a 100755
--- a/win32/cross-from-debian/makepackage.py
+++ b/win32/cross-from-debian/makepackage.py
@@ -89,6 +89,10 @@ makensis.stdin.write(r'''  WriteRegStr HKLM "Software\Performous" "" "$INSTDIR"
   CreateDirectory "$SMPROGRAMS\Performous"
   CreateShortcut "$SMPROGRAMS\Performous\Performous.lnk" "$INSTDIR\bin\performous.exe"
   CreateShortcut "$SMPROGRAMS\Performous\Uninstall.lnk" "$INSTDIR\uninst.exe"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Performous" "DisplayName" "Performous"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Performous" "UninstallString" "$\"$INSTDIR\uninst.exe$\""
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Performous" "DisplayIcon" "$INSTDIR\bin\performous.exe"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Performous" "DisplayVersion" "${VERSION}"
 SectionEnd
 
 Section Uninstall
@@ -107,6 +111,7 @@ makensis.stdin.write(r'''  Delete "$INSTDIR\uninst.exe"
   Delete "$SMPROGRAMS\Performous\Performous.lnk"
   Delete "$SMPROGRAMS\Performous\Uninstall.lnk"
   RmDir "$SMPROGRAMS\Performous"
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Performous"
   DeleteRegKey /ifempty HKLM "Software\Performous"
 SectionEnd
 ''')

[Performous-commit] John Stumpo : Add Start menu entries to the installer.

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: cf6864f80dec1afb6897ef779bb609aed9c160d6

Author: John Stumpo <st...@js...>
Date:   Sat Jun 26 03:31:05 2010 -0400

Add Start menu entries to the installer.

---

 win32/cross-from-debian/makepackage.py |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/win32/cross-from-debian/makepackage.py b/win32/cross-from-debian/makepackage.py
index 2ad6342..f422145 100755
--- a/win32/cross-from-debian/makepackage.py
+++ b/win32/cross-from-debian/makepackage.py
@@ -85,6 +85,10 @@ for root, dirs, files in os.walk('.'):
 
 makensis.stdin.write(r'''  WriteRegStr HKLM "Software\Performous" "" "$INSTDIR"
   WriteUninstaller "$INSTDIR\uninst.exe"
+  SetShellVarContext all
+  CreateDirectory "$SMPROGRAMS\Performous"
+  CreateShortcut "$SMPROGRAMS\Performous\Performous.lnk" "$INSTDIR\bin\performous.exe"
+  CreateShortcut "$SMPROGRAMS\Performous\Uninstall.lnk" "$INSTDIR\uninst.exe"
 SectionEnd
 
 Section Uninstall
@@ -99,6 +103,10 @@ for root, dirs, files in os.walk('.', topdown=False):
 
 makensis.stdin.write(r'''  Delete "$INSTDIR\uninst.exe"
   RmDir "$INSTDIR"
+  SetShellVarContext all
+  Delete "$SMPROGRAMS\Performous\Performous.lnk"
+  Delete "$SMPROGRAMS\Performous\Uninstall.lnk"
+  RmDir "$SMPROGRAMS\Performous"
   DeleteRegKey /ifempty HKLM "Software\Performous"
 SectionEnd
 ''')

[Performous-commit] John Stumpo : Add some notes about the cross-compilation setup.

[Tapio V. <aa...@us...>]

Module: performous
Branch: joinmenu
Commit: 6e3607a9d3914f47fe15a5fbdb7ebf7c8595ca2b

Author: John Stumpo <st...@js...>
Date:   Sat Jun 26 03:12:23 2010 -0400

Add some notes about the cross-compilation setup.

---

 win32/cross-from-debian/README |   59 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 59 insertions(+), 0 deletions(-)

diff --git a/win32/cross-from-debian/README b/win32/cross-from-debian/README
new file mode 100644
index 0000000..cebc77c
--- /dev/null
+++ b/win32/cross-from-debian/README
@@ -0,0 +1,59 @@
+These scripts were developed under Debian's mingw32 environment with the
+wine package (and associated binfmt_misc rule, which is part of the package)
+installed, so some programs do not detect that they are being cross-compiled
+and attempt to run just-compiled programs because this works when the scripts
+use the ".exe" suffix when they try to do so (as autoconf scripts do).  So
+we occasionally generate a shell script wrapper under the non-.exe name that
+execs wine to satisfy scripts that fail to use ".exe" (some scripts do this
+because it's perfectly OK to do this under Windows).
+
+For pkg-config handling, we simply wrap the *host* pkg-config in a shell
+script that execs it with options causing it to look absolutely nowhere other
+than deps/lib/pkgconfig for .pc files and we place that script earlier on the
+PATH.  This very neatly avoids the glib/pkg-config chicken-and-egg problem
+that exists under Windows, though we don't bother building a Windows
+pkg-config at all since we don't need it.
+
+The makedeps.sh script builds the dependencies under ./deps and places stamp
+files in deps/build-stamps so it doesn't have to keep rebuilding the same
+things if it is interrupted or experiences an error halfway through.  You can
+force a single package to be rebuilt by deleting the appropriate stamp file
+and re-running makedeps.sh.  (You might do this, for example, to get newer
+ffmpeg code, as makedeps.sh builds the latest SVN of ffmpeg at the time the
+script is run.)
+
+Once the dependencies are built, run makebuilddir.sh to invoke cmake with the
+appropriate arguments for cross-compilation.  (Arguments to makebuilddir.sh
+are passed intact to cmake after the arguments the script itself passes but
+before the final argument [the source directory], which the script provides
+for you.)  It is up to you to run "make" and "make install" in the ./build
+directory (installation will occur to ./stage) after running makebuilddir.sh
+to set up ./build appropriately.
+
+(Regarding installation, it is a good idea to delete or rename ./stage if it
+exists before running "make install" so obsolete files aren't accidentally
+included in the package you are building.)
+
+The copydlls.py script takes two directories as arguments and copies any DLLs
+it can find in the first directory that are needed by PE executables in the
+second directory into the second directory.
+
+The makepackage.py script creates an executable installer from the contents of
+./stage using NSIS (NSIS can be built under non-Windows systems for use as a
+cross-compiler, and many Linux distros package it in this form) and places it
+into ./dist for your testing and distributing pleasure.
+
+In summary:
+  $ ./makedeps.sh
+  $ ./makebuilddir.sh
+  $ cd build
+  $ make
+  $ make install
+  $ cd ..
+  $ ./copydlls.py ./deps/bin ./stage/bin
+    [strip the binaries in ./stage/bin if you want]
+  $ ./makepackage.py
+    [test the file generated in ./dist]
+    [distribute said file if everything looks good]
+
+Happy cross-building!