performous-commit Mailing List for Performous (Page 65)

The All-in-One music game

Brought to you by: aave000, tronic, yoda-jm

performous-commit — SCM commits

You can subscribe to this list here.

2009	_Jan	_Feb	_Mar	_Apr	_May	_Jun (25)	_Jul (288)	_Aug (119)	_Sep (31)	_Oct (59)	_Nov (458)	_Dec (359)
2010	_Jan (268)	_Feb (26)	_Mar (36)	_Apr (48)	_May (119)	_Jun (37)	_Jul (173)	_Aug (429)	_Sep (137)	_Oct (156)	_Nov (59)	_Dec (45)
2011	_Jan (398)	_Feb (257)	_Mar (49)	_Apr (5)	_May (34)	_Jun (11)	_Jul (38)	_Aug (12)	_Sep (1)	_Oct (49)	_Nov (5)	_Dec (10)
2012	_Jan (21)	_Feb (32)	_Mar (20)	_Apr (1)	_May (2)	_Jun	_Jul (173)	_Aug	_Sep (25)	_Oct (6)	_Nov (44)	_Dec

Flat | Threaded

<< < 1 .. 63 64 65 66 67 .. 163 > >> (Page 65 of 163)

[Performous-commit] Vincent Le Ligeour : Moved a controller error to the new logging feature

From: Yoda-JM <yo...@us...> - 2010-08-25 11:50:28

Module: performous
Branch: master
Commit: 8e7a9b20212d161a10ebaf634103a6fc0251c8cd

Author: Vincent Le Ligeour <yo...@us...>
Date:   Wed Aug 25 13:50:33 2010 +0200

Moved a controller error to the new logging feature

---

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

diff --git a/game/joystick.cc b/game/joystick.cc
index e4ee20f..a9f92a1 100644
--- a/game/joystick.cc
+++ b/game/joystick.cc
@@ -367,7 +367,7 @@ void input::SDL::init() {
 	ConfigItem::StringList const& instruments = config["game/instruments"].sl();
 	for (ConfigItem::StringList::const_iterator it = instruments.begin(); it != instruments.end(); ++it) {
 		if (!regex_search(it->c_str(), what, match_force)) {
-			std::cerr << "Error \"" << *it << "\" is not a valid instrument forced value" << std::endl;
+			std::clog << "controllers/error:  " << *it << "\" is not a valid instrument forced value" << std::endl;
 			continue;
 		} else {
 			unsigned int sdl_id = boost::lexical_cast<unsigned int>(what[1]);

[Performous-commit] Fredrik Klasson : [+] Thread secure the logger. This should ensure clog' ing in two threads will at least print whole lines.

From: Fredrik K. <sci...@us...> - 2010-08-25 11:49:07

Module: performous
Branch: master
Commit: df13523ce4d3cbf745adbbd6d6fb5b7c4a2cd9ed

Author: Fredrik Klasson <fr...@li...>
Date:   Wed Aug 25 13:48:40 2010 +0200

[+] Thread secure the logger. This should ensure clog'ing in two threads will at least print whole lines.

---

 game/log.cc |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/game/log.cc b/game/log.cc
index 9a28319..9029c52 100644
--- a/game/log.cc
+++ b/game/log.cc
@@ -5,6 +5,7 @@
 
 #include <boost/iostreams/stream_buffer.hpp>
 #include <boost/regex.hpp>
+#include <boost/thread/mutex.hpp>
 
 #ifndef NDEBUG
 #	include <boost/algorithm/string/trim.hpp>
@@ -29,6 +30,11 @@
  **/
 
 namespace logger {
+	/** \internal
+	 * Guard to ensure we're atomically printing to cout/cerr.
+	 * \attention This only guards from multiple clog interleaving, not other console I/O.
+	 */
+	boost::mutex log_lock;
 
 	/** \internal The implementation of the stream filter that handles the message filtering. **/
 	class VerboseMessageSink : public boost::iostreams::sink {
@@ -62,7 +68,10 @@ namespace logger {
 			//throw std::runtime_error(tmp);
 			// It seems throwing an exception here doesn't work,
 			// so for now, do the next best thing: make some noise
-			std::cerr << tmp << std::endl;
+			{
+				boost::mutex::scoped_lock l(log_lock);
+				std::cerr << tmp << std::endl;
+			}
 			return n;
 		}
 #		endif
@@ -74,7 +83,10 @@ namespace logger {
 
 		std::string prefix(line, 0, i);
 
-		if(boost::regex_match(prefix, *level_regex)) std::cout << line;
+		if(boost::regex_match(prefix, *level_regex)){
+			boost::mutex::scoped_lock l(log_lock);
+			std::cout << line;
+		}
 
 		return n;
 	}
@@ -93,10 +105,13 @@ namespace logger {
 
 		level_regex = new boost::regex(level_regexp_str);
 
-		sb.open(vsm);
-		__default_ClogBuf = std::clog.rdbuf();
-		std::clog.rdbuf(&sb);
+		{ // scope here lest we might dead lock (if showing .*/info).
+			boost::mutex::scoped_lock l(log_lock);
 
+			sb.open(vsm);
+			__default_ClogBuf = std::clog.rdbuf();
+			std::clog.rdbuf(&sb);
+		}
 		std::clog << "logger/info: Log level is: " << level_regexp_str << std::endl;
 	}
 
@@ -105,6 +120,7 @@ namespace logger {
 	void teardown(){
 		if(__default_ClogBuf == 0) throw std::runtime_error("Internal logger error #2");
 		if(level_regex == 0) throw std::runtime_error("Internal logger error #3");
+		boost::mutex::scoped_lock l(log_lock);
 
 		std::clog.rdbuf(__default_ClogBuf);
 		sb.close();

[Performous-commit] Fredrik Klasson : [ ] Updating log messages with (more) propper subsystem names.

From: Fredrik K. <sci...@us...> - 2010-08-25 11:26:47

Module: performous
Branch: master
Commit: 671ce8e2cec41d1427a67617ffa63090422cdfc6

Author: Fredrik Klasson <fr...@li...>
Date:   Wed Aug 25 13:26:23 2010 +0200

[ ] Updating log messages with (more) propper subsystem names.

---

 game/audio.cc          |    2 +-
 game/backgrounds.cc    |    8 ++++----
 game/color.cc          |    2 +-
 game/configuration.cc  |    6 +++---
 game/fs.cc             |    4 ++--
 game/joystick.cc       |   14 +++++++-------
 game/midifile.cc       |    2 +-
 game/profiler.hh       |    2 +-
 game/songparser-ini.cc |    4 ++--
 game/songparser-txt.cc |    4 ++--
 game/songs.cc          |   14 +++++++-------
 game/unicode.cc        |    2 +-
 game/video_driver.cc   |    6 +++---
 game/webcam.cc         |    2 +-
 14 files changed, 36 insertions(+), 36 deletions(-)

[Performous-commit] Fredrik Klasson : [ ] Document \n vs std::endl behaviour.

From: Fredrik K. <sci...@us...> - 2010-08-25 10:31:25

Module: performous
Branch: master
Commit: 7479a8b266f37643cc02e1f8bb402010edff7c7a

Author: Fredrik Klasson <fr...@li...>
Date:   Wed Aug 25 12:27:54 2010 +0200

[ ] Document \n vs std::endl behaviour.

---

 game/log.cc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/game/log.cc b/game/log.cc
index 648cb2a..9a28319 100644
--- a/game/log.cc
+++ b/game/log.cc
@@ -14,6 +14,7 @@
  * \brief The std::clog logger.
  *
  * The classification is \e discretionary, meaning that you can specify any message class you want but there are only 4 recommended classes: \p debug, \p info, \p warning and \p error.
+ * \attention Each new line (ended by <tt>std::endl</tt>) must be prefixed with the message classification. New lines by <tt>"\n"</tt> will belong to the previous line as far as the filter is concerned.
  *
  * The default log level is specified by logger::default_log_level.
  *

[Performous-commit] Fredrik Klasson : [ ] Updating code using clog. This prevents massive malformed message class warnings. (quick fix)

From: Fredrik K. <sci...@us...> - 2010-08-25 10:31:22

Module: performous
Branch: master
Commit: 07859fcc20c152d480ffdc4547df6ec29b128b91

Author: Fredrik Klasson <fr...@li...>
Date:   Wed Aug 25 12:19:24 2010 +0200

[ ] Updating code using clog. This prevents massive malformed message class warnings. (quick fix)

---

 game/audio.cc          |    4 ++--
 game/backgrounds.cc    |    8 ++++----
 game/configuration.cc  |    6 +++---
 game/filemagic.hh      |   10 +++++-----
 game/joystick.cc       |   14 +++++++-------
 game/midifile.cc       |    2 +-
 game/profiler.hh       |    2 +-
 game/songparser-ini.cc |    2 +-
 game/songparser-txt.cc |    2 +-
 game/songs.cc          |    2 +-
 game/unicode.cc        |    2 +-
 game/webcam.cc         |    2 +-
 12 files changed, 28 insertions(+), 28 deletions(-)

[Performous-commit] Fredrik Klasson : [+] Refactoring the logger code, now subsystem and message classification is supported.

From: Fredrik K. <sci...@us...> - 2010-08-25 10:31:20

Module: performous
Branch: master
Commit: 15d348c8ea07e4d872cc40431fee59aa618d6f96

Author: Fredrik Klasson <fr...@li...>
Date:   Wed Aug 25 12:18:12 2010 +0200

[+] Refactoring the logger code, now subsystem and message classification is supported.

---

 game/log.cc  |  200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 game/log.hh  |   17 +++++
 game/main.cc |   31 ++-------
 3 files changed, 224 insertions(+), 24 deletions(-)

[Performous-commit] Tapio Vierros : Update instrument menu fret hints to new navigation style.

From: Tapio V. <aa...@us...> - 2010-08-24 14:28:39

Module: performous
Branch: master
Commit: cb839869341d9b605c1b557db223e7933dc4fdf5

Author: Tapio Vierros <tap...@gm...>
Date:   Tue Aug 24 17:27:46 2010 +0300

Update instrument menu fret hints to new navigation style.

---

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

diff --git a/game/instrumentgraph.cc b/game/instrumentgraph.cc
index aba8e9b..4eace91 100644
--- a/game/instrumentgraph.cc
+++ b/game/instrumentgraph.cc
@@ -79,26 +79,43 @@ void InstrumentGraph::drawMenu() {
 	const float step = txth * 0.7f;
 	const float h = m_menu.getOptions().size() * step + step;
 	float y = -h * .5f + step;
-	float x = -w * .5f + step + offsetX + button_margin * 1.5f;
+	float x = offsetX - w*.5f + step + button_margin*1.0f;
+	float xx = offsetX + w*.5f - step - button_margin*1.0f;
 	// Background
 	th.bg.dimensions.middle(offsetX).center(0).stretch(w, h);
 	th.bg.draw();
 	// Loop through menu items
 	w = 0;
-	int i = 0;
+	unsigned i = 0;
+	m_button.dimensions.stretch(0.05, 0.05);
 	for (MenuOptions::const_iterator it = m_menu.begin(); it != m_menu.end(); ++it, ++i) {
 		SvgTxtTheme* txt = &th.option;
-		// Draw the key hints
-		if (getGraphType() != input::DANCEPAD && i < m_pads) {
-			int fret = (getGraphType() == input::DRUMS ? ((i + 1) % m_pads) : i);
-			glColor4fv(color(fret));
-			m_button.dimensions.middle(x - button_margin).center(y).stretch(0.05, 0.05);
-			m_button.draw();
-		}
 		// Selected item?
 		if (cur == it) {
+			// Draw the key hints
+			if (getGraphType() != input::DANCEPAD) {
+				glColor4fv(color(getGraphType() == input::GUITAR ? 0 : 1));
+				m_button.dimensions.middle(x - button_margin).center(y);
+				m_button.draw();
+				glColor4fv(color(getGraphType() == input::GUITAR ? 1 : 4));
+				m_button.dimensions.middle(xx + button_margin);
+				m_button.draw();
+			}
+			// Drum up hint
+			if (getGraphType() == input::DRUMS && i > 0) {
+				glColor4fv(color(2));
+				m_button.dimensions.middle(x - button_margin).center(y - step);
+				m_button.draw();
+			}
+			// Drum down hint
+			if (getGraphType() == input::DRUMS && i < m_menu.getOptions().size()-1) {
+				glColor4fv(color(3));
+				m_button.dimensions.middle(x - button_margin).center(y + step);
+				m_button.draw();
+			}
 			//th.back_h.dimensions.middle(0.05 + offsetX).center(y);
 			//th.back_h.draw();
+			// Switch to the "selected" font
 			txt = &th.option_selected;
 		}
 		txt->dimensions.middle(x).center(y);
@@ -113,6 +130,7 @@ void InstrumentGraph::drawMenu() {
 		th.comment.dimensions.middle(offsetX).screenBottom(-0.12);
 		th.comment.draw(cur->getComment());
 	}
+	// Reset button size
 	m_button.dimensions.stretch(1.0, 1.0);
 	// Save the calculated menu dimensions
 	m_menu.dimensions.stretch(w, h);

[Performous-commit] Tapio Vierros : Better scaling of joinmenu.

From: Tapio V. <aa...@us...> - 2010-08-24 14:28:36

Module: performous
Branch: master
Commit: 520ded594869d0d98b7f73ffc239ad890897422c

Author: Tapio Vierros <tap...@gm...>
Date:   Tue Aug 24 16:48:41 2010 +0300

Better scaling of joinmenu.

---

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

diff --git a/game/instrumentgraph.cc b/game/instrumentgraph.cc
index c4464b7..aba8e9b 100644
--- a/game/instrumentgraph.cc
+++ b/game/instrumentgraph.cc
@@ -68,13 +68,12 @@ void InstrumentGraph::drawMenu() {
 	ThemeInstrumentMenu& th = *m_menuTheme;
 	MenuOptions::const_iterator cur = static_cast<MenuOptions::const_iterator>(&m_menu.current());
 	glutil::PushMatrix pm; // Save scaling state
-	float s = m_width.get();
-	s = (s > 0.49f ? 1.0f : s + 0.3f); // Full scale with 1 or 2 instruments
+	double w = m_menu.dimensions.w();
+	const float s = std::min(m_width.get(), 0.5) / w;
 	glScalef(s, s, 1.0f);
 	// We need to multiply offset by inverse scale factor to keep it always constant
-	const double offsetX = 0.5f * (dimensions.x1() + dimensions.x2()) / s;
 	// All these vars are ultimately affected by the scaling matrix
-	double w = m_menu.dimensions.w();
+	const double offsetX = 0.5f * (dimensions.x1() + dimensions.x2()) / s;
 	const float txth = th.option.h();
 	const float button_margin = (getGraphType() == input::DANCEPAD ? 0.0f : 0.05f);
 	const float step = txth * 0.7f;

[Performous-commit] Tapio Vierros : Fix bug in joinmenu current difficulty determination during menu setup.

From: Tapio V. <aa...@us...> - 2010-08-23 21:18:30

Module: performous
Branch: master
Commit: 5d50d15d643589232e40603378747f483e1cd4ee

Author: Tapio Vierros <tap...@gm...>
Date:   Tue Aug 24 00:17:16 2010 +0300

Fix bug in joinmenu current difficulty determination during menu setup.

---

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

diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 8df4f45..9e81b4f 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -144,11 +144,11 @@ void GuitarGraph::setupJoinMenu() {
 	// Create track option only for guitars
 	if (!m_drums) {
 		ConfigItem::OptionList ol;
-		int i = 0, cur = 0;
+		int cur = 0;
 		// Add tracks to option list
-		for (InstrumentTracksConstPtr::const_iterator it = m_instrumentTracks.begin(); it != m_instrumentTracks.end(); ++it, ++i) {
+		for (InstrumentTracksConstPtr::const_iterator it = m_instrumentTracks.begin(); it != m_instrumentTracks.end(); ++it) {
 			ol.push_back(it->first);
-			if (m_track_index->first == it->first) cur = i; // Find the index of current track
+			if (m_track_index->first == it->first) cur = ol.size()-1; // Find the index of current track
 		}
 		m_selectedTrack = ConfigItem(ol); // Create a ConfigItem from the option list
 		m_selectedTrack.select(cur); // Set the selection to current track
@@ -157,13 +157,12 @@ void GuitarGraph::setupJoinMenu() {
 	}
 	{ // Create difficulty opt
 		ConfigItem::OptionList ol;
-		int i = 0, cur = 0;
+		int cur = 0;
 		// Add difficulties to the option list
 		for (int level = 0; level < DIFFICULTYCOUNT; ++level) {
 			if (difficulty(Difficulty(level), true)) {
 				ol.push_back(boost::lexical_cast<std::string>(level));
-				if (Difficulty(i) == m_level) cur = i;
-				++i;
+				if (Difficulty(level) == m_level) cur = ol.size()-1;
 			}
 		}
 		m_selectedDifficulty = ConfigItem(ol); // Create a ConfigItem from the option list

[Performous-commit] Tapio Vierros : Change joinmenu navigation.

From: Tapio V. <aa...@us...> - 2010-08-23 21:18:26

Module: performous
Branch: master
Commit: 48f88df7c2d81a10eba1de36e21e812ab93f0822

Author: Tapio Vierros <tap...@gm...>
Date:   Tue Aug 24 00:06:35 2010 +0300

Change joinmenu navigation.

* Guitar strum for up/down
* Guitar green/red for left/right
* Drum yellow/blue for up/down
* Drum red/green+kick left/right
* Start for "right"

TODO: Lefty-mode handling
TODO: Update visual hints

---

 game/guitargraph.cc |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index f4f1d17..8df4f45 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -301,15 +301,20 @@ void GuitarGraph::engine() {
 		if (menuOpen()) {
 			// Check first regular keys
 			if (ev.type == input::Event::PRESS && ev.button >= 0 && ev.button < m_pads) {
-				if (m_drums && ev.button == 0) m_menu.action(); // Kick substitutes for strum
-				else { // Hilight item
-					int sel = m_drums ? ((ev.button + m_pads - 1) % m_pads) : ev.button;
-					m_menu.select(sel);
+				if (m_drums) { // Drums
+					 if (ev.button == 0) m_menu.action(); // Kick for action
+					 else if (ev.button == 1) m_menu.action(-1); // Red for left
+					 else if (ev.button == 2) m_menu.move(-1); // Yellow for up
+					 else if (ev.button == 3) m_menu.move(1); // Blue for down
+					 else if (ev.button == 4) m_menu.action(1); // Green for right
+				} else { // Guitar
+					 if (ev.button == 0) m_menu.action(-1); // Green for left
+					 else if (ev.button == 1) m_menu.action(1); // Red for right
 				}
 			}
 			// Strum (strum of keyboard-as-guitar doesn't generate nav-events)
-			else if (ev.type == input::Event::PICK && ev.button == 0) m_menu.action(1);
-			else if (ev.type == input::Event::PICK && ev.button == 1) m_menu.action(-1);
+			else if (ev.type == input::Event::PICK && ev.button == 0) m_menu.move(1);
+			else if (ev.type == input::Event::PICK && ev.button == 1) m_menu.move(-1);
 			else if (ev.nav == input::START) m_menu.action();
 			// See if anything changed
 			if (!m_drums && m_selectedTrack.so() != m_track_index->first) setTrack(m_selectedTrack.so());

[Performous-commit] Tapio Vierros : Default to Medium difficulty on instruments.

From: Tapio V. <aa...@us...> - 2010-08-23 20:42:24

Module: performous
Branch: master
Commit: e189e84596bc7cdc9c1f4081d7624bb9c077022a

Author: Tapio Vierros <tap...@gm...>
Date:   Mon Aug 23 23:40:33 2010 +0300

Default to Medium difficulty on instruments.

Fallback chain: Easy, Hard, Expert, Kids

---

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

diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index e44638c..f4f1d17 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -125,7 +125,12 @@ GuitarGraph::GuitarGraph(Audio& audio, Song const& song, bool drums, int number,
 	m_track_index = m_instrumentTracks.begin();
 	while (number--)
 		if (++m_track_index == m_instrumentTracks.end()) m_track_index = m_instrumentTracks.begin();
-	difficultyAuto();
+	// Pick a nice default difficulty
+	if (difficulty(DIFFICULTY_EASY));
+	else if (difficulty(DIFFICULTY_SUPAEASY));
+	else if (difficulty(DIFFICULTY_MEDIUM));
+	else if (difficulty(DIFFICULTY_AMAZING));
+	else difficultyAuto();
 	updateNeck();
 	setupJoinMenu();
 }

[Performous-commit] Tapio Vierros : Tweak TODO.

From: Tapio V. <aa...@us...> - 2010-08-23 20:42:21

Module: performous
Branch: master
Commit: b3e023807b4520195efed7534ba12db048b00858

Author: Tapio Vierros <tap...@gm...>
Date:   Mon Aug 23 23:22:37 2010 +0300

Tweak TODO.

---

 docs/TODO.txt |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/TODO.txt b/docs/TODO.txt
index 7df60f1..3c51138 100644
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -4,7 +4,6 @@ fixable should not be recorded here, but should rather be fixed in the code.
 
 Structural:
 
-- PortAudio as the only audio backend (instead of libda plugin system) [WIP]
 - Rename ScreenManager to Game and put globally used resources into it
 - Switch to GStreamer? (both the ripper and the game)
 
@@ -16,10 +15,9 @@ Big features:
 - Recording performances
     * Internet highscore
 - Mic effects (reduce volume for bad singers, perfect pitch, reverb, etc)
+- Guitar whammy bar pitch shifting effect [WIP]
 - Ingame Singstar DVD support (integrated ripping + ffmpeg feeding + XML song format)
 - Automatically download songs and other stuff from performous.org
-- Store instrument/dancepad mappings in configurations files + Allow user to
-  create new mapping
 
 
 Features:
@@ -33,10 +31,12 @@ Features:
 - Kiosk/arcade mode (disable exiting game and limit other functions)
 - Allow left-handed/reversed controllers (guitars, drum kits)
 
+
 Dance features:
 
 - Colored arrows for timing
 - BGCHANGE support for SM format (background videos)
+- Roll and lift notes
 
 
 Text rendering bugs:
@@ -49,7 +49,7 @@ Text rendering bugs:
 New config menu:
 
 - Multiple items visible at once
-- Modifying strings and stringlist items.
+- Modifying strings and stringlist items
 - Predefined options from config schema and libda device enumeration

[Performous-commit] Arto Seppä : Disabled building tools in OS X bundle script since they won' t work anyway atm.

From: Arto SeppÃ¤ <za...@us...> - 2010-08-23 19:08:27

Module: performous
Branch: master
Commit: 3e012340c4c9837313bda3f665f7fd92ada17c17

Author: Arto SeppÃ¤ <za...@us...>
Date:   Mon Aug 23 22:06:44 2010 +0300

Disabled building tools in OS X bundle script since they won't work anyway atm.

---

 osx-utils/performous-app-build.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osx-utils/performous-app-build.sh b/osx-utils/performous-app-build.sh
index 6f66224..5680eb7 100755
--- a/osx-utils/performous-app-build.sh
+++ b/osx-utils/performous-app-build.sh
@@ -10,7 +10,7 @@ fi
 # first compile performous, build dir shouldn't exist at this stage
 mkdir build
 cd build
-cmake ../../ -DCMAKE_INSTALL_PREFIX=./out/Performous.app/Contents
+cmake ../../ -DCMAKE_INSTALL_PREFIX=./out/Performous.app/Contents -DENABLE_TOOLS=OFF
 make install
 
 # then create the rest of the app bundle
@@ -36,4 +36,4 @@ ln -sf /Applications out/Applications
 /usr/bin/hdiutil convert RWPerformous.dmg -format UDZO -imagekey zlib-level=9 -o Performous.dmg
 rm -f RWPerformous.dmg
 
-cd ..
\ No newline at end of file
+cd ..

[Performous-commit] Tapio Vierros : Add a batch script to make song folder config easier for Windows users.

From: Tapio V. <aa...@us...> - 2010-08-23 17:40:51

Module: performous
Branch: master
Commit: 494aaf3cc55ea4dfe1907f316850c628c25932ee

Author: Tapio Vierros <tap...@gm...>
Date:   Mon Aug 23 20:39:08 2010 +0300

Add a batch script to make song folder config easier for Windows users.

Until we have a proper GUI.

---

 CMakeLists.txt                   |    1 +
 win32/ConfigureSongDirectory.bat |    9 +++++++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c887394..26b1d48 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,4 +72,5 @@ endif (ENABLE_TOOLS)
 
 if(WIN32)
 	option(ENABLE_VERSIONING "Add number version information. This allows to add version information to exe. Be carefull, in beta (and a lot useless)" OFF)
+	install(FILES win32/ConfigureSongDirectory.bat DESTINATION bin)
 endif(WIN32)
diff --git a/win32/ConfigureSongDirectory.bat b/win32/ConfigureSongDirectory.bat
new file mode 100755
index 0000000..7008a2d
--- /dev/null
+++ b/win32/ConfigureSongDirectory.bat
@@ -0,0 +1,9 @@
+@echo off
+set /p songdir=Enter the path to your song dir: 
+
+echo Performous will now launch.
+echo Go to the song browser and verify you typed the path correctly.
+echo Then go to configuration menu and hit Ctrl+S to save the setting.
+pause
+
+performous.exe %songdir%

[Performous-commit] Fredrik Klasson : Merge branch 'master' of git.performous.org:/gitroot/ performous/performous

From: Fredrik K. <sci...@us...> - 2010-08-23 10:41:01

Module: performous
Branch: master
Commit: df246a1771b7c2ad4ebefa9ed8826476c48b3f89

Author: Fredrik Klasson <fr...@li...>
Date:   Mon Aug 23 12:37:19 2010 +0200

Merge branch 'master' of git.performous.org:/gitroot/performous/performous

---

[Performous-commit] Fredrik Klasson : [+] Doxygen generator configuration. Note: documentation will be generated in docs/doxygen/ in the _source_ directory .

From: Fredrik K. <sci...@us...> - 2010-08-23 10:40:57

Module: performous
Branch: master
Commit: 40a373163fb1c1498309ca3a9cbc2bd35dfd6527

Author: Fredrik Klasson <fr...@li...>
Date:   Mon Aug 23 12:36:39 2010 +0200

[+] Doxygen generator configuration. Note: documentation will be generated in docs/doxygen/ in the _source_ directory.

---

 docs/doxygen.config | 1522 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 1522 insertions(+), 0 deletions(-)

[Performous-commit] Miguel Sánchez de León Peque : Fedora 13 supported for packaging

From: Peque <ms...@us...> - 2010-08-23 06:02:40

Module: performous
Branch: master
Commit: 3f3e4fce05c2e473b197d3db72dfc2fc220bcea0

Author: Miguel SÃ¡nchez de LeÃ³n Peque <msd...@gm...>
Date:   Mon Aug 23 07:43:18 2010 +0200

Fedora 13 supported for packaging

---

 cmake/performous-packaging.cmake |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/cmake/performous-packaging.cmake b/cmake/performous-packaging.cmake
index 04fb4c2..c527902 100644
--- a/cmake/performous-packaging.cmake
+++ b/cmake/performous-packaging.cmake
@@ -64,6 +64,13 @@ if(UNIX)
 	# For Fedora-based distros we want to create RPM packages.
 	if("${LSB_DISTRIB}" MATCHES "Fedora")
 		set(CPACK_GENERATOR "RPM")
+		set(CPACK_RPM_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
+		set(CPACK_RPM_PACKAGE_VERSION "${PROJECT_VERSION}")
+		set(CPACK_RPM_PACKAGE_RELEASE "1")
+		set(CPACK_RPM_PACKAGE_GROUP "Amusements/Games")
+		set(CPACK_RPM_PACKAGE_LICENSE "GPLv3+")
+		set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A karaoke, band and dancing game")
+		set(CPACK_RPM_PACKAGE_DESCRIPTION "Performous is a 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.")
 		# We need to alter the architecture names as per distro rules
 		if("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "i[3-6]86")
 			set(CPACK_PACKAGE_ARCHITECTURE i386)
@@ -72,11 +79,11 @@ if(UNIX)
 			set(CPACK_PACKAGE_ARCHITECTURE amd64)
 		endif("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "x86_64")
 		# Set the dependencies based on the distro version
-		if("${LSB_DISTRIB}" MATCHES "Fedora12")
-			set(CPACK_RPM_PACKAGE_REQUIRES "gettext, gtk2, cairo, librsvg2, libsigc++20, glibmm24, libxml++, ImageMagick-c++, boost, SDL, glew, ffmpeg, pulseaudio-libs")
-		endif("${LSB_DISTRIB}" MATCHES "Fedora12")
+		if("${LSB_DISTRIB}" MATCHES "Fedora13")
+			set(CPACK_RPM_PACKAGE_REQUIRES "gettext, gtk2, cairo, librsvg2, libsigc++20, glibmm24, libxml++, ImageMagick-c++, boost, SDL, glew, ffmpeg, pulseaudio-libs, portaudio, opencv")
+		endif("${LSB_DISTRIB}" MATCHES "Fedora13")
 		if(NOT CPACK_RPM_PACKAGE_REQUIRES)
-			message("WARNING: ${LSB_DISTRIB} not supported yet.\nPlease set deps in cmake/performous-packaging.cmake before packaging.")
+			message("WARNING: ${LSB_DISTRIB} is not supported.\nPlease set deps in cmake/performous-packaging.cmake before packaging.")
 		endif(NOT CPACK_RPM_PACKAGE_REQUIRES)
 	endif("${LSB_DISTRIB}" MATCHES "Fedora")
 	set(CPACK_SYSTEM_NAME "${LSB_DISTRIB}-${CPACK_PACKAGE_ARCHITECTURE}")

[Performous-commit] Tapio Vierros : Increase audio config output verbosity.

From: Tapio V. <aa...@us...> - 2010-08-22 18:47:40

Module: performous
Branch: master
Commit: 6dc50b4e3ef9105546efaf257c0be23182a3453a

Author: Tapio Vierros <tap...@gm...>
Date:   Sun Aug 22 21:46:55 2010 +0300

Increase audio config output verbosity.

---

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

diff --git a/game/audio.cc b/game/audio.cc
index 374b366..83a00f4 100644
--- a/game/audio.cc
+++ b/game/audio.cc
@@ -456,6 +456,8 @@ struct Audio::Impl {
 					int tmp;
 					if (iss >> tmp && iss.get() == EOF && tmp >= 0 && tmp < count) dev = tmp;
 				}
+				std::clog << "Trying audio device \"" << params.dev << "\", id: " << dev
+					<< ", in: " << params.mics.size() << ", out: " << params.out << std::endl;
 				bool skip_partial = false;
 				bool found = false;
 				// Try exact match first, then partial
@@ -473,6 +475,7 @@ struct Audio::Impl {
 							if (match_partial && std::string(info->name).find(params.dev) == std::string::npos) continue;
 						}
 						// Match found if we got here
+						int assigned_mics = 0;
 						bool device_init_threw = true;
 						try {
 							devices.push_back(new Device(params.mics.size(), params.out, params.rate, i));
@@ -494,6 +497,7 @@ struct Audio::Impl {
 								Analyzer* a = new Analyzer(d.rate);
 								analyzers.push_back(a);
 								d.mics[j] = a;
+								++assigned_mics;
 							}
 							// Assign playback output for the first available stereo output
 							if (!playback && d.out == 2) { d.outptr = &output; playback = true; }
@@ -504,6 +508,10 @@ struct Audio::Impl {
 						}
 						skip_partial = true;
 						found = true;
+						std::clog << "Using audio device: " << i;
+						if (assigned_mics) std::clog << ", input channels: " << assigned_mics;
+						if (params.out) std::clog << ", output channels: " << params.out;
+						std::clog << std::endl;
 						break;
 					}
 				}

[Performous-commit] Tapio Vierros : Add --audiohelp cmdline parameter.

From: Tapio V. <aa...@us...> - 2010-08-22 17:48:15

Module: performous
Branch: master
Commit: f3befcd79b2a4fee063ca7e2102f7ed0d1f53b6b

Author: Tapio Vierros <tap...@gm...>
Date:   Sun Aug 22 20:46:37 2010 +0300

Add --audiohelp cmdline parameter.

---

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

diff --git a/game/main.cc b/game/main.cc
index f37f9bb..f35a04a 100644
--- a/game/main.cc
+++ b/game/main.cc
@@ -280,12 +280,13 @@ int main(int argc, char** argv) try {
 	std::string songlist;
 	opt1.add_options()
 	  ("help,h", "you are viewing it")
-	  ("verbose,V", "Be more verbose")
+	  ("verbose,V", "be more verbose")
 	  ("version,v", "display version number")
 	  ("songlist", po::value<std::string>(&songlist), "save a list of songs in the specified folder");
 	po::options_description opt2("Configuration options");
 	opt2.add_options()
 	  ("audio", po::value<std::vector<std::string> >(&devices)->composing(), "specify an audio device to use")
+	  ("audiohelp", "print audio related information")
 	  ("jstest", "utility to get joystick button mappings");
 	po::options_description opt3("Hidden options");
 	opt3.add_options()
@@ -332,6 +333,15 @@ int main(int argc, char** argv) try {
 		std::cerr << e.what() << std::endl;
 		return EXIT_FAILURE;
 	}
+	if (vm.count("audiohelp")) {
+		Audio audio;
+		std::cout << "Example --audio parameters" << std::endl;
+		std::cout << "  --audio \"out=2\"         # Pick first working two-channel playback device" << std::endl;
+		std::cout << "  --audio \"dev=1 out=2\"   # Pick device id 1 and assign stereo playback" << std::endl;
+		std::cout << "  --audio 'dev=\"HDA Intel\" mics=blue,red'   # HDA Intel with two mics" << std::endl;
+		std::cout << "  --audio 'dev=pulse out=2 mics=blue'       # PulseAudio with input and output" << std::endl;
+		return EXIT_SUCCESS;
+	}
 	// Override XML config for options that were specified from commandline or performous.conf
 	confOverride(songdirs, "system/path_songs");
 	confOverride(devices, "audio/devices");

[Performous-commit] Miguel Sánchez de León Peque : Updated Spanish translation

From: Peque <ms...@us...> - 2010-08-22 13:30:29

Module: performous
Branch: master
Commit: 37d08085682c8fd8d8f5e7dfb68bccf7293ba1e7

Author: Miguel SÃ¡nchez de LeÃ³n Peque <msd...@gm...>
Date:   Sun Aug 22 15:29:25 2010 +0200

Updated Spanish translation

---

 lang/es.po |  290 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 196 insertions(+), 94 deletions(-)

diff --git a/lang/es.po b/lang/es.po
index 8af7365..ae195be 100644
--- a/lang/es.po
+++ b/lang/es.po
@@ -2,10 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Performous\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-20 16:47+0100\n"
+"POT-Creation-Date: 2010-08-22 14:17+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Miguel SÃ¡nchez de LeÃ³n Peque <msd...@gm...>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -15,77 +16,104 @@ msgstr ""
 "X-Poedit-Country: SPAIN\n"
 "X-Poedit-SearchPath-0: ../game\n"
 
-#: ../game/guitargraph.cc:305
-msgid "Streak!"
-msgstr "Aciertos!"
+#: ../game/main.cc:132
+msgid "Miscellaneous..."
+msgstr "Varios..."
 
-#: ../game/guitargraph.cc:322
-msgid ""
-"God Mode\n"
-"Activated!"
+#: ../game/main.cc:160
+msgid "Main menu..."
+msgstr "MenÃº principal..."
+
+#: ../game/main.cc:171
+msgid "Screenshot taken!"
+msgstr "Â¡Captura de pantalla exitosa!"
+
+#: ../game/main.cc:174
+msgid "Screenshot failed!"
+msgstr "Â¡Captura de pantalla fallida!"
+
+#: ../game/database.cc:107
+msgid "No Items up to now."
+msgstr "No hay mejores puntuaciones guardadas."
+
+#: ../game/database.cc:108
+msgid "Be the first to be listed here!"
+msgstr "Â¡SÃ© el primero en aparecer aquÃ!"
+
+#: ../game/instrumentgraph.cc:40
+msgid "Resume"
+msgstr "Continuar"
+
+#: ../game/instrumentgraph.cc:40
+msgid "Back to performing!"
+msgstr "Â¡De vuelta al juego!"
+
+#: ../game/instrumentgraph.cc:41
+msgid "Rejoin"
 msgstr ""
-"Â¡Modo Dios\n"
-"Activado!"
 
-#: ../game/guitargraph.cc:323
-msgid "Mistakes ignored!"
-msgstr "Â¡Se ignoran los fallos!"
+#: ../game/instrumentgraph.cc:41
+msgid "Change selections"
+msgstr ""
 
-#: ../game/guitargraph.cc:953
-msgid "Drum Fill!"
-msgstr "Â¡EnajenaciÃ³n!"
+#: ../game/instrumentgraph.cc:42
+msgid "Restart"
+msgstr "Reiniciar"
 
-#: ../game/guitargraph.cc:954
-msgid "God Mode Ready!"
-msgstr "Â¡Modo Dios Disponible!"
+#: ../game/instrumentgraph.cc:42
+msgid ""
+"Start the song\n"
+"from the beginning"
+msgstr ""
+"Empezar de nuevo\n"
+"la canciÃ³n"
 
-#: ../game/guitargraph.cc:959
-msgid "Solo!"
-msgstr "Â¡Solo!"
+#: ../game/instrumentgraph.cc:43
+#: ../game/screen_intro.cc:20
+msgid "Quit"
+msgstr "Salir"
+
+#: ../game/instrumentgraph.cc:43
+msgid "Exit to song browser"
+msgstr ""
+"Salir al menÃº de\n"
+"selecciÃ³n de canciones"
 
-#: ../game/screen_intro.cc:15
+#: ../game/screen_intro.cc:17
 msgid "Perform"
 msgstr "Jugar"
 
-#: ../game/screen_intro.cc:15
+#: ../game/screen_intro.cc:17
 msgid "Start performing!"
 msgstr "Â¡Comienza una partida!"
 
-#: ../game/screen_intro.cc:16
+#: ../game/screen_intro.cc:18
 msgid "Practice"
 msgstr "Practicar"
 
-#: ../game/screen_intro.cc:16
+#: ../game/screen_intro.cc:18
 msgid "Check your skills or test the microphones"
 msgstr "Comprueba tus habilidades o revisa los micrÃ³fonos"
 
-#: ../game/screen_intro.cc:17
+#: ../game/screen_intro.cc:19
 msgid "Configure"
 msgstr "Opciones"
 
-#: ../game/screen_intro.cc:17
+#: ../game/screen_intro.cc:19
 msgid "Configure game options"
 msgstr "Cambia las opciones de configuraciÃ³n del juego"
 
-#: ../game/screen_intro.cc:18
-msgid "Quit"
-msgstr "Salir"
-
-#: ../game/screen_intro.cc:18
+#: ../game/screen_intro.cc:20
 msgid "Leave the game"
 msgstr "Sal del juego"
 
-#: ../game/screen_intro.cc:21
+#: ../game/screen_intro.cc:23
 msgid "No playback devices could be used.\n"
 msgstr ""
 "No se pudo configurar ningÃºn dispositivo\n"
 "de reproducciÃ³n de audio.\n"
 
-#: ../game/screen_intro.cc:22
-msgid "No microphones found.\n"
-msgstr "No se ha encontrado ningÃºn micrÃ³fono.\n"
-
-#: ../game/screen_intro.cc:23
+#: ../game/screen_intro.cc:24
 msgid ""
 "\n"
 "Please configure some before playing."
@@ -93,6 +121,91 @@ msgstr ""
 "\n"
 "Por favor, configura alguno antes de jugar."
 
+#: ../game/guitargraph.cc:14
+msgid "Kids"
+msgstr "NiÃ±os"
+
+#: ../game/guitargraph.cc:14
+#: ../game/dancegraph.cc:18
+msgid "Easy"
+msgstr "FÃ¡cil"
+
+#: ../game/guitargraph.cc:14
+#: ../game/dancegraph.cc:18
+msgid "Medium"
+msgstr "Media"
+
+#: ../game/guitargraph.cc:14
+#: ../game/dancegraph.cc:18
+msgid "Hard"
+msgstr "DifÃcil"
+
+#: ../game/guitargraph.cc:14
+msgid "Expert"
+msgstr "Experto"
+
+#: ../game/guitargraph.cc:138
+#: ../game/dancegraph.cc:111
+msgid "Ready!"
+msgstr "Â¡Listo!"
+
+#: ../game/guitargraph.cc:150
+#: ../game/dancegraph.cc:122
+msgid "Select track"
+msgstr "Selecciona la pista"
+
+#: ../game/guitargraph.cc:166
+#: ../game/dancegraph.cc:138
+msgid "Select difficulty"
+msgstr "Selecciona la dificultad"
+
+#: ../game/guitargraph.cc:169
+msgid "Lefty-mode"
+msgstr "Modo zurdo"
+
+#: ../game/guitargraph.cc:178
+msgid "ON"
+msgstr "ACTIVADO"
+
+#: ../game/guitargraph.cc:178
+msgid "OFF"
+msgstr "DESACTIVADO"
+
+#: ../game/guitargraph.cc:179
+msgid "Toggle lefty-mode"
+msgstr ""
+"Activar/desactivar\n"
+"el modo zurdo"
+
+#: ../game/guitargraph.cc:444
+#: ../game/dancegraph.cc:335
+msgid "Streak!"
+msgstr "Aciertos!"
+
+#: ../game/guitargraph.cc:461
+msgid ""
+"God Mode\n"
+"Activated!"
+msgstr ""
+"Â¡Modo Dios\n"
+"Activado!"
+
+#: ../game/guitargraph.cc:462
+msgid "Mistakes ignored!"
+msgstr "Â¡Se ignoran los fallos!"
+
+#: ../game/guitargraph.cc:1095
+msgid "Drum Fill!"
+msgstr "Â¡EnajenaciÃ³n!"
+
+#: ../game/guitargraph.cc:1096
+msgid "God Mode Ready!"
+msgstr "Â¡Modo Dios Disponible!"
+
+#: ../game/guitargraph.cc:1101
+msgid "Solo!"
+msgstr "Â¡Solo!"
+
 #: ../game/screen_players.cc:110
 msgid "No players found!"
 msgstr "Â¡No se han encontrado jugadores!"
@@ -125,126 +238,114 @@ msgstr "Introduce texto para filtrar o crear un nuevo jugador."
 msgid "Search Text:"
 msgstr "Buscar texto:"
 
-#: ../game/songs.cc:195
+#: ../game/songs.cc:199
 msgid "random order"
 msgstr "ordenadas aleatoriamente"
 
-#: ../game/songs.cc:196
+#: ../game/songs.cc:200
 msgid "sorted by song"
 msgstr "ordenadas por canciÃ³n"
 
-#: ../game/songs.cc:197
+#: ../game/songs.cc:201
 msgid "sorted by artist"
 msgstr "ordenadas por artista"
 
-#: ../game/songs.cc:198
+#: ../game/songs.cc:202
 msgid "sorted by edition"
 msgstr "ordenadas por ediciÃ³n"
 
-#: ../game/songs.cc:199
+#: ../game/songs.cc:203
 msgid "sorted by genre"
 msgstr "ordenadas por gÃ©nero"
 
-#: ../game/songs.cc:200
+#: ../game/songs.cc:204
 msgid "sorted by path"
 msgstr "ordenadas por directorio"
 
-#: ../game/songs.cc:201
+#: ../game/songs.cc:205
 msgid "sorted by language"
 msgstr "ordenadas por idioma"
 
-#: ../game/screen_sing.cc:34
+#: ../game/screen_sing.cc:36
 msgid "Loading song..."
 msgstr "Cargando canciÃ³n..."
 
-#: ../game/screen_sing.cc:42
+#: ../game/screen_sing.cc:45
 msgid "Song is broken!"
 msgstr "Â¡CanciÃ³n defectuosa!"
 
-#: ../game/screen_sing.cc:47
+#: ../game/screen_sing.cc:50
 msgid "Song contains broken tracks!"
 msgstr "Â¡La canciÃ³n contiene pistas defectuosas!"
 
-#: ../game/screen_sing.cc:386
+#: ../game/screen_sing.cc:450
 msgid "   ENTER to skip instrumental break"
 msgstr "   ENTER para pasar la parte instrumental"
 
-#: ../game/screen_sing.cc:387
+#: ../game/screen_sing.cc:451
 msgid "   Remember to wait for grading!"
 msgstr "   Recuerda esperar para ser evaluado!"
 
-#: ../game/screen_sing.cc:475
+#: ../game/screen_sing.cc:587
 msgid "No player!"
 msgstr "Â¡No se han encontrado jugadores!"
 
-#: ../game/screen_sing.cc:484
+#: ../game/screen_sing.cc:596
 msgid "Hit singer"
 msgstr "Superestrella"
 
-#: ../game/screen_sing.cc:485
+#: ../game/screen_sing.cc:597
 msgid "Lead singer"
 msgstr "Vocalista"
 
-#: ../game/screen_sing.cc:486
-#: ../game/screen_sing.cc:492
-#: ../game/screen_sing.cc:498
+#: ../game/screen_sing.cc:598
+#: ../game/screen_sing.cc:604
+#: ../game/screen_sing.cc:610
 msgid "Rising star"
 msgstr "Aficionado"
 
-#: ../game/screen_sing.cc:487
-#: ../game/screen_sing.cc:493
-#: ../game/screen_sing.cc:499
+#: ../game/screen_sing.cc:599
+#: ../game/screen_sing.cc:605
+#: ../game/screen_sing.cc:611
 msgid "Amateur"
 msgstr "Novato"
 
-#: ../game/screen_sing.cc:488
-#: ../game/screen_sing.cc:500
+#: ../game/screen_sing.cc:600
+#: ../game/screen_sing.cc:612
 msgid "Tone deaf"
 msgstr "Sin oÃdo"
 
-#: ../game/screen_sing.cc:490
+#: ../game/screen_sing.cc:602
 msgid "Maniac"
 msgstr "ManÃaco"
 
-#: ../game/screen_sing.cc:491
+#: ../game/screen_sing.cc:603
 msgid "Hoofer"
 msgstr "Artista"
 
-#: ../game/screen_sing.cc:494
+#: ../game/screen_sing.cc:606
 msgid "Loser"
 msgstr "Perdedor"
 
-#: ../game/screen_sing.cc:496
+#: ../game/screen_sing.cc:608
 msgid "Virtuoso"
 msgstr "Virtuoso"
 
-#: ../game/screen_sing.cc:497
+#: ../game/screen_sing.cc:609
 msgid "Rocker"
 msgstr "Rockero"
 
-#: ../game/main.cc:159
-msgid "Audio capture..."
-msgstr "Captura de audio..."
-
-#: ../game/main.cc:161
-msgid "Audio playback..."
-msgstr "ReproducciÃ³n de audio..."
-
-#: ../game/main.cc:164
-msgid "Miscellaneous..."
-msgstr "Varios..."
-
-#: ../game/main.cc:178
-msgid "Main menu..."
-msgstr "MenÃº principal..."
+#: ../game/dancegraph.cc:18
+msgid "Beginner"
+msgstr "Principiante"
 
-#: ../game/main.cc:189
-msgid "Screenshot taken!"
-msgstr "Â¡Captura de pantalla exitosa!"
+#: ../game/dancegraph.cc:18
+msgid "Challenge"
+msgstr "DesafÃo"
 
-#: ../game/main.cc:192
-msgid "Screenshot failed!"
-msgstr "Â¡Captura de pantalla fallida!"
+#: ../game/dancegraph.cc:260
+msgid "STOP!"
+msgstr ""
 
 #: ../game/screen_songs.cc:195
 msgid "No songs found!"
@@ -274,13 +375,14 @@ msgstr "<escribe para buscar>"
 msgid "Hiscore for "
 msgstr "Mejores puntuaciones para "
 
-#: ../game/database.cc:107
-msgid "No Items up to now."
-msgstr "No hay mejores puntuaciones guardadas."
+#~ msgid "No microphones found.\n"
+#~ msgstr "No se ha encontrado ningÃºn micrÃ³fono.\n"
 
-#: ../game/database.cc:108
-msgid "Be the first to be listed here!"
-msgstr "Â¡SÃ© el primero en aparecer aquÃ!"
+#~ msgid "Audio capture..."
+#~ msgstr "Captura de audio..."
+
+#~ msgid "Audio playback..."
+#~ msgstr "ReproducciÃ³n de audio..."
 
 #~ msgid "filter: "
 #~ msgstr "filtro: "

[Performous-commit] Tapio Vierros : Alpha-blend options that are not available.

From: Tapio V. <aa...@us...> - 2010-08-22 13:01:50

Module: performous
Branch: master
Commit: a84373059aec782ee5f7eae0ef1a1d653fa0283a

Author: Tapio Vierros <tap...@gm...>
Date:   Sun Aug 22 16:00:17 2010 +0300

Alpha-blend options that are not available.

---

 game/instrumentgraph.cc |    2 +-
 game/menu.cc            |   10 ++++++++++
 game/menu.hh            |    2 ++
 3 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/game/instrumentgraph.cc b/game/instrumentgraph.cc
index 10d11ca..c4464b7 100644
--- a/game/instrumentgraph.cc
+++ b/game/instrumentgraph.cc
@@ -103,7 +103,7 @@ void InstrumentGraph::drawMenu() {
 			txt = &th.option_selected;
 		}
 		txt->dimensions.middle(x).center(y);
-		txt->draw(it->getName());
+		txt->draw(it->getName(), it->isActive() ? 1.0f : 0.5f);
 		w = std::max(w, txt->w() + 2 * step + button_margin * 2); // Calculate the widest entry
 		y += step;
 	}
diff --git a/game/menu.cc b/game/menu.cc
index 30ca24d..b2a4377 100644
--- a/game/menu.cc
+++ b/game/menu.cc
@@ -58,6 +58,16 @@ MenuOption::MenuOption(const std::string& nm, const std::string& comm, const std
 	if (!img.empty()) image.reset(new Surface(getThemePath(img)));
 }
 
+bool MenuOption::isActive() const {
+	if (type == OPEN_SUBMENU && options.empty()) return false;
+	else if (type == CHANGE_VALUE) {
+		if (!value) return false;
+		if (value->get_type() == "option_list" && value->ol().size() <= 1)
+			return false;
+	}
+	return true;
+}
+
 
 
 Menu::Menu():
diff --git a/game/menu.hh b/game/menu.hh
index 9845969..37b7ae3 100644
--- a/game/menu.hh
+++ b/game/menu.hh
@@ -36,6 +36,8 @@ class MenuOption {
 	const std::string& getName() const { if (namePtr) return *namePtr; else return name; }
 	/// Return comment
 	const std::string& getComment() const { if (commentPtr) return *commentPtr; else return comment; }
+	/// Check if this option can be selected
+	bool isActive() const;
 	/// Value
 	ConfigItem* value;
 	/// Value-to-be-set

[Performous-commit] Vincent Le Ligeour : Added eof svn ebuild

From: Yoda-JM <yo...@us...> - 2010-08-22 11:16:31

Module: performous
Branch: master
Commit: 48f4329750ad830b35aa5d32a82d694c8fc65dec

Author: Vincent Le Ligeour <yo...@us...>
Date:   Sun Aug 22 13:16:13 2010 +0200

Added eof svn ebuild

---

 portage-overlay/games-util/eof/eof-9999.ebuild |   44 ++++++++++++++++++++++++
 1 files changed, 44 insertions(+), 0 deletions(-)

diff --git a/portage-overlay/games-util/eof/eof-9999.ebuild b/portage-overlay/games-util/eof/eof-9999.ebuild
new file mode 100644
index 0000000..2f62604
--- /dev/null
+++ b/portage-overlay/games-util/eof/eof-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit games subversion
+
+DESCRIPTION="Song editor for the game Frets On Fire"
+HOMEPAGE="http://code.google.com/p/editor-on-fire/"
+ESVN_REPO_URI="http://editor-on-fire.googlecode.com/svn/trunk/"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	media-libs/allegro
+	media-sound/vorbis-tools
+	media-sound/lame"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	cd ${S}/src/
+	emake -f makefile.linux || die "emake failed"
+}
+
+src_install() {
+	cd ${S}
+	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] Vincent Le Ligeour : Added FoFLC ebuild, fixed performous ebuild

From: Yoda-JM <yo...@us...> - 2010-08-22 10:59:11

Module: performous
Branch: master
Commit: 358040d71f0b6e0a3701198760e374f77cf22ed2

Author: Vincent Le Ligeour <yo...@us...>
Date:   Sun Aug 22 12:58:52 2010 +0200

Added FoFLC ebuild, fixed performous ebuild

---

 .../games-arcade/performous/performous-9999.ebuild |    6 +++-
 portage-overlay/games-util/foflc/foflc-9999.ebuild |   33 ++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/portage-overlay/games-arcade/performous/performous-9999.ebuild b/portage-overlay/games-arcade/performous/performous-9999.ebuild
index ac3a68c..0c4c6b5 100644
--- a/portage-overlay/games-arcade/performous/performous-9999.ebuild
+++ b/portage-overlay/games-arcade/performous/performous-9999.ebuild
@@ -71,6 +71,10 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-gentoopaths.patch
+}
+
 src_configure() {
 	local mycmakeargs="
 		$(cmake-utils_use_enable tools TOOLS)
@@ -95,7 +99,7 @@ src_install() {
 	DOCS="docs/*.txt" cmake-utils_src_install
 	mv -f "${D}/${GAMES_PREFIX}/share/man" "${D}/usr/share/"
 	mkdir -p "${D}/${GAMES_DATADIR}/${PN}"
-	mv -f "${D}/${GAMES_PREFIX}/share" "${D}/${GAMES_DATADIR}/${PN}"
+	mv -f "${D}/${GAMES_PREFIX}/share/games/performous" "${D}/${GAMES_DATADIR}/"
 
 	if use songs; then
 		insinto "${GAMES_DATADIR}/${PN}"
diff --git a/portage-overlay/games-util/foflc/foflc-9999.ebuild b/portage-overlay/games-util/foflc/foflc-9999.ebuild
new file mode 100644
index 0000000..5e95a85
--- /dev/null
+++ b/portage-overlay/games-util/foflc/foflc-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit cmake-utils games subversion
+
+DESCRIPTION="Frets On Fire Lyrics Converter"
+HOMEPAGE="http://www.fretsonfire.net/forums/viewtopic.php?t=31765&f=11"
+ESVN_REPO_URI="http://editor-on-fire.googlecode.com/svn/trunk/src/foflc"
+
+LICENSE="ASIS"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs="-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	DOCS="*.txt" cmake-utils_src_install
+	prepgamesdirs
+}

[Performous-commit] Vincent Le Ligeour : Updated French translation

From: Yoda-JM <yo...@us...> - 2010-08-22 10:00:33

Module: performous
Branch: master
Commit: a09a0323410e8040b0f864723539da0558c18456

Author: Vincent Le Ligeour <yo...@us...>
Date:   Sun Aug 22 12:00:16 2010 +0200

Updated French translation

---

 lang/fr.po |  222 ++++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 157 insertions(+), 65 deletions(-)

diff --git a/lang/fr.po b/lang/fr.po
index 0c44ce3..641fb47 100644
--- a/lang/fr.po
+++ b/lang/fr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Performous\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-29 12:51+0100\n"
+"POT-Creation-Date: 2010-08-22 11:47+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Vincent Le Ligeour <yo...@us...>\n"
 "Language-Team: \n"
@@ -14,7 +14,55 @@ msgstr ""
 "X-Poedit-Basepath: .\n"
 "X-Poedit-SearchPath-0: ../game\n"
 
-#: ../game/dancegraph.cc:240
+#: ../game/dancegraph.cc:18
+msgid "Beginner"
+msgstr "DÃ©butant"
+
+#: ../game/dancegraph.cc:18
+msgid "Easy"
+msgstr "Facile"
+
+#: ../game/dancegraph.cc:18
+msgid "Medium"
+msgstr "Moyen"
+
+#: ../game/dancegraph.cc:18
+msgid "Hard"
+msgstr "Difficile"
+
+#: ../game/dancegraph.cc:18
+msgid "Challenge"
+msgstr "DÃ©fi"
+
+#: ../game/dancegraph.cc:111
+msgid "Ready!"
+msgstr "PrÃªt!"
+
+#: ../game/dancegraph.cc:111
+msgid "Start performing!"
+msgstr "Commencer une partie!"
+
+#: ../game/dancegraph.cc:122
+msgid "Select track"
+msgstr "SÃ©lectionner la piste"
+
+#: ../game/dancegraph.cc:138
+msgid "Select difficulty"
+msgstr "SÃ©lectionner la difficultÃ©"
+
+#: ../game/dancegraph.cc:141
+msgid "Quit"
+msgstr "Quitter"
+
+#: ../game/dancegraph.cc:141
+msgid "Exit to song browser"
+msgstr "Quitter vers la liste des morceaux"
+
+#: ../game/dancegraph.cc:260
+msgid "STOP!"
+msgstr "STOP!"
+
+#: ../game/dancegraph.cc:335
 msgid "Streak!"
 msgstr "D'affilÃ©"
 
@@ -26,116 +74,128 @@ msgstr "Aucun Ã©lÃ©ment jusqu'Ã  prÃ©sent"
 msgid "Be the first to be listed here!"
 msgstr "Soyez le premier Ã  Ãªtre listÃ© ici!"
 
-#: ../game/screen_sing.cc:34
+#: ../game/screen_sing.cc:36
 msgid "Loading song..."
 msgstr "Chargement de la chanson..."
 
-#: ../game/screen_sing.cc:42
+#: ../game/screen_sing.cc:45
 msgid "Song is broken!"
 msgstr "Chanson cassÃ©e"
 
-#: ../game/screen_sing.cc:47
+#: ../game/screen_sing.cc:50
 msgid "Song contains broken tracks!"
 msgstr "Chanson contenant des morceaux cassÃ©s"
 
-#: ../game/screen_sing.cc:372
+#: ../game/screen_sing.cc:114
+#: ../game/instrumentgraph.cc:40
+msgid "Resume"
+msgstr "Reprendre"
+
+#: ../game/screen_sing.cc:114
+#: ../game/instrumentgraph.cc:40
+msgid "Back to performing!"
+msgstr "Retourner Ã  la partie!"
+
+#: ../game/screen_sing.cc:115
+#: ../game/instrumentgraph.cc:42
+msgid "Restart"
+msgstr "RedÃ©marrer"
+
+#: ../game/screen_sing.cc:115
+#: ../game/instrumentgraph.cc:42
+msgid ""
+"Start the song\n"
+"from the beginning"
+msgstr ""
+"DÃ©marrer le morceau\n"
+"depuis le dÃ©but"
+
+#: ../game/screen_sing.cc:450
 msgid "   ENTER to skip instrumental break"
 msgstr "   \"EntrÃ©e\" pour passer l'instrumental"
 
-#: ../game/screen_sing.cc:373
+#: ../game/screen_sing.cc:451
 msgid "   Remember to wait for grading!"
 msgstr "   N'oubliez pas d'attendre pour votre classement!"
 
-#: ../game/screen_sing.cc:461
+#: ../game/screen_sing.cc:587
 msgid "No player!"
 msgstr "Aucun joueur n'a Ã©tÃ© trouvÃ©!"
 
-#: ../game/screen_sing.cc:470
+#: ../game/screen_sing.cc:596
 msgid "Hit singer"
 msgstr "Superstar"
 
-#: ../game/screen_sing.cc:471
+#: ../game/screen_sing.cc:597
 msgid "Lead singer"
 msgstr "Soliste"
 
-#: ../game/screen_sing.cc:472
-#: ../game/screen_sing.cc:478
-#: ../game/screen_sing.cc:484
+#: ../game/screen_sing.cc:598
+#: ../game/screen_sing.cc:604
+#: ../game/screen_sing.cc:610
 msgid "Rising star"
 msgstr "Etoile montante"
 
-#: ../game/screen_sing.cc:473
-#: ../game/screen_sing.cc:479
-#: ../game/screen_sing.cc:485
+#: ../game/screen_sing.cc:599
+#: ../game/screen_sing.cc:605
+#: ../game/screen_sing.cc:611
 msgid "Amateur"
 msgstr "Amateur"
 
-#: ../game/screen_sing.cc:474
-#: ../game/screen_sing.cc:486
+#: ../game/screen_sing.cc:600
+#: ../game/screen_sing.cc:612
 msgid "Tone deaf"
 msgstr "Casserole"
 
-#: ../game/screen_sing.cc:476
+#: ../game/screen_sing.cc:602
 msgid "Maniac"
 msgstr "Maniac"
 
-#: ../game/screen_sing.cc:477
+#: ../game/screen_sing.cc:603
 msgid "Hoofer"
 msgstr "Claquettiste"
 
-#: ../game/screen_sing.cc:480
+#: ../game/screen_sing.cc:606
 msgid "Loser"
 msgstr "Perdant"
 
-#: ../game/screen_sing.cc:482
+#: ../game/screen_sing.cc:608
 msgid "Virtuoso"
 msgstr "Virtuose"
 
-#: ../game/screen_sing.cc:483
+#: ../game/screen_sing.cc:609
 msgid "Rocker"
 msgstr "Rockeur"
 
-#: ../game/screen_intro.cc:15
+#: ../game/screen_intro.cc:17
 msgid "Perform"
 msgstr "Jouer"
 
-#: ../game/screen_intro.cc:15
-msgid "Start performing!"
-msgstr "Commencer une partie!"
-
-#: ../game/screen_intro.cc:16
+#: ../game/screen_intro.cc:18
 msgid "Practice"
 msgstr "S'exercer"
 
-#: ../game/screen_intro.cc:16
+#: ../game/screen_intro.cc:18
 msgid "Check your skills or test the microphones"
 msgstr "Chauffer votre voix et tester les micros"
 
-#: ../game/screen_intro.cc:17
+#: ../game/screen_intro.cc:19
 msgid "Configure"
 msgstr "Options"
 
-#: ../game/screen_intro.cc:17
+#: ../game/screen_intro.cc:19
 msgid "Configure game options"
 msgstr "Configurer les options de jeu"
 
-#: ../game/screen_intro.cc:18
-msgid "Quit"
-msgstr "Quitter"
-
-#: ../game/screen_intro.cc:18
+#: ../game/screen_intro.cc:20
 msgid "Leave the game"
 msgstr "Sortir du jeu"
 
-#: ../game/screen_intro.cc:21
+#: ../game/screen_intro.cc:23
 msgid "No playback devices could be used.\n"
 msgstr "Aucun pÃ©rifÃ©rique audio de sortie n'est utilisable.\n"
 
-#: ../game/screen_intro.cc:22
-msgid "No microphones found.\n"
-msgstr "Aucun micro n'a Ã©tÃ© trouvÃ©.\n"
-
-#: ../game/screen_intro.cc:23
+#: ../game/screen_intro.cc:24
 msgid ""
 "\n"
 "Please configure some before playing."
@@ -171,27 +231,27 @@ msgstr "<Entrez votre recherche>"
 msgid "Hiscore for "
 msgstr "Records pour "
 
-#: ../game/main.cc:159
-msgid "Audio capture..."
-msgstr "EntrÃ©e sonore..."
+#: ../game/instrumentgraph.cc:41
+msgid "Rejoin"
+msgstr "Rejoindre"
 
-#: ../game/main.cc:161
-msgid "Audio playback..."
-msgstr "Sortie sonore..."
+#: ../game/instrumentgraph.cc:41
+msgid "Change selections"
+msgstr "Changer les paramÃ¨tres"
 
-#: ../game/main.cc:164
+#: ../game/main.cc:132
 msgid "Miscellaneous..."
 msgstr "Divers"
 
-#: ../game/main.cc:178
+#: ../game/main.cc:160
 msgid "Main menu..."
 msgstr "Menu principal..."
 
-#: ../game/main.cc:189
+#: ../game/main.cc:171
 msgid "Screenshot taken!"
 msgstr "Capture d'Ã©cran effectuÃ©e"
 
-#: ../game/main.cc:192
+#: ../game/main.cc:174
 msgid "Screenshot failed!"
 msgstr "Echec de la capture d'Ã©cran"
 
@@ -227,35 +287,59 @@ msgstr "Entrez un nom pour crÃ©er un nouveau joueur."
 msgid "Search Text:"
 msgstr "Recherche:"
 
-#: ../game/songs.cc:195
+#: ../game/songs.cc:199
 msgid "random order"
 msgstr "ordre alÃ©atoire"
 
-#: ../game/songs.cc:196
+#: ../game/songs.cc:200
 msgid "sorted by song"
 msgstr "classement par chanson"
 
-#: ../game/songs.cc:197
+#: ../game/songs.cc:201
 msgid "sorted by artist"
 msgstr "classement par artiste"
 
-#: ../game/songs.cc:198
+#: ../game/songs.cc:202
 msgid "sorted by edition"
 msgstr "classement par Ã©dition"
 
-#: ../game/songs.cc:199
+#: ../game/songs.cc:203
 msgid "sorted by genre"
 msgstr "classement par genre"
 
-#: ../game/songs.cc:200
+#: ../game/songs.cc:204
 msgid "sorted by path"
 msgstr "classement par chemin"
 
-#: ../game/songs.cc:201
+#: ../game/songs.cc:205
 msgid "sorted by language"
 msgstr "classement par langue"
 
-#: ../game/guitargraph.cc:331
+#: ../game/guitargraph.cc:14
+msgid "Kids"
+msgstr "Enfantin"
+
+#: ../game/guitargraph.cc:14
+msgid "Expert"
+msgstr "Expert"
+
+#: ../game/guitargraph.cc:169
+msgid "Lefty-mode"
+msgstr "Mode gaucher"
+
+#: ../game/guitargraph.cc:178
+msgid "ON"
+msgstr "ActivÃ©"
+
+#: ../game/guitargraph.cc:178
+msgid "OFF"
+msgstr "DesactivÃ©"
+
+#: ../game/guitargraph.cc:179
+msgid "Toggle lefty-mode"
+msgstr "Basculer en mode gaucher"
+
+#: ../game/guitargraph.cc:461
 msgid ""
 "God Mode\n"
 "Activated!"
@@ -263,19 +347,27 @@ msgstr ""
 "God Mode\n"
 "ActivÃ©"
 
-#: ../game/guitargraph.cc:332
+#: ../game/guitargraph.cc:462
 msgid "Mistakes ignored!"
 msgstr "Erreurs ignorÃ©es!"
 
-#: ../game/guitargraph.cc:978
+#: ../game/guitargraph.cc:1095
 msgid "Drum Fill!"
 msgstr "Solo Batterie"
 
-#: ../game/guitargraph.cc:979
+#: ../game/guitargraph.cc:1096
 msgid "God Mode Ready!"
 msgstr "God Mode PrÃªt!"
 
-#: ../game/guitargraph.cc:984
+#: ../game/guitargraph.cc:1101
 msgid "Solo!"
 msgstr "Solo!"
 
+#~ msgid "No microphones found.\n"
+#~ msgstr "Aucun micro n'a Ã©tÃ© trouvÃ©.\n"
+
+#~ msgid "Audio capture..."
+#~ msgstr "EntrÃ©e sonore..."
+
+#~ msgid "Audio playback..."
+#~ msgstr "Sortie sonore..."

[Performous-commit] Tapio Vierros : OptionList loops around since drums don't have " select backwards" option in join menu.

From: Tapio V. <aa...@us...> - 2010-08-22 09:14:11

Module: performous
Branch: master
Commit: 8ba42c6941de410615f3b567d7a4524701818429

Author: Tapio Vierros <tap...@gm...>
Date:   Sun Aug 22 12:11:55 2010 +0300

OptionList loops around since drums don't have "select backwards" option in join menu.

---

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

diff --git a/game/configuration.cc b/game/configuration.cc
index 24a70e5..5e37c29 100644
--- a/game/configuration.cc
+++ b/game/configuration.cc
@@ -42,7 +42,8 @@ ConfigItem& ConfigItem::incdec(int dir) {
 		bool& val = boost::get<bool>(m_value);
 		val = !val;
 	} else if (m_type == "option_list") {
-		m_sel = clamp<int>(m_sel + dir, 0, boost::get<OptionList>(m_value).size()-1);
+		size_t s = boost::get<OptionList>(m_value).size();
+		m_sel = (m_sel + dir + s) % s;
 	}
 	return *this;
 }

Flat | Threaded

<< < 1 .. 63 64 65 66 67 .. 163 > >> (Page 65 of 163)

2009	Jan	Feb	Mar	Apr	May	Jun (25)	Jul (288)	Aug (119)	Sep (31)	Oct (59)	Nov (458)	Dec (359)
2010	Jan (268)	Feb (26)	Mar (36)	Apr (48)	May (119)	Jun (37)	Jul (173)	Aug (429)	Sep (137)	Oct (156)	Nov (59)	Dec (45)
2011	Jan (398)	Feb (257)	Mar (49)	Apr (5)	May (34)	Jun (11)	Jul (38)	Aug (12)	Sep (1)	Oct (49)	Nov (5)	Dec (10)
2012	Jan (21)	Feb (32)	Mar (20)	Apr (1)	May (2)	Jun	Jul (173)	Aug	Sep (25)	Oct (6)	Nov (44)	Dec