[Performous-commit] Tapio Vierros : Make setupPauseMenu() static member function used everywhere.

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

Module: performous
Branch: master
Commit: 6bce9101c6b3981354a38d91ffd82d7b759af3fe

Author: Tapio Vierros <tap...@gm...>
Date:   Fri Jul 16 20:49:44 2010 +0300

Make setupPauseMenu() static member function used everywhere.

---

 game/instrumentgraph.cc |   21 +++++++++++----------
 game/instrumentgraph.hh |    3 ++-
 game/screen_sing.cc     |    8 +++-----
 game/screen_sing.hh     |    2 --
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/game/instrumentgraph.cc b/game/instrumentgraph.cc
index 5d147a2..7a5f599 100644
--- a/game/instrumentgraph.cc
+++ b/game/instrumentgraph.cc
@@ -4,6 +4,16 @@
 
 //const unsigned InstrumentGraph::max_panels = 10; // Maximum number of arrow lines / guitar frets
 
+
+void InstrumentGraph::setupPauseMenu(Menu& menu) {
+	menu.clear();
+	menu.add(MenuOption(_("Resume"), _("Back to performing!")));
+	 //TODO: Implement restart
+	//menu.add(MenuOption(_("Restart"), _("Start the song\nfrom the beginning")));
+	menu.add(MenuOption(_("Quit"), _("Exit to song browser"), "Songs"));
+}
+
+
 InstrumentGraph::InstrumentGraph(Audio& audio, Song const& song, input::DevType inp):
   m_audio(audio), m_song(song), m_input(input::DevType(inp)),
   m_stream(),
@@ -30,19 +40,10 @@ InstrumentGraph::InstrumentGraph(Audio& audio, Song const& song, input::DevType
 }
 
 
-void InstrumentGraph::setupPauseMenu() {
-	m_menu.clear();
-	m_menu.add(MenuOption(_("Resume"), _("Back to performing!")));
-	// TODO: Implement restart
-	//m_menu.add(MenuOption(_("Restart"), _("Start the song\nfrom the beginning")));
-	m_menu.add(MenuOption(_("Quit"), _("Exit to song browser"), "Songs"));
-}
-
-
 void InstrumentGraph::doUpdates() {
 	if (!menuOpen() && !m_ready) {
 		m_ready = true;
-		setupPauseMenu();
+		setupPauseMenu(m_menu);
 	}
 }
 
diff --git a/game/instrumentgraph.hh b/game/instrumentgraph.hh
index a0f85ea..8454123 100644
--- a/game/instrumentgraph.hh
+++ b/game/instrumentgraph.hh
@@ -62,6 +62,8 @@ class Song;
 
 class InstrumentGraph {
   public:
+	static void setupPauseMenu(Menu& menu);
+
 	/// Constructor
 	InstrumentGraph(Audio& audio, Song const& song, input::DevType inp);
 
@@ -117,7 +119,6 @@ class InstrumentGraph {
 	Menu m_menu;
 
 	// Shared functions for derived classes
-	void setupPauseMenu();
 	void drawPopups(double offsetX);
 	void handleCountdown(double time, double beginTime);
 
diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index 3086eb8..4998506 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -9,6 +9,7 @@
 #include "database.hh"
 #include "video.hh"
 #include "guitargraph.hh"
+#include "dancegraph.hh"
 #include "glutil.hh"
 #include "i18n.hh"
 #include "menu.hh"
@@ -111,11 +112,7 @@ void ScreenSing::enter() {
 	// Populate the pause menu
 	// TODO: Refactor this menu population to static
 	//       function that instrumentgraph can also use
-	m_menu.clear();
-	m_menu.add(MenuOption(_("Resume"), _("Back to performing!")));
-	// TODO: Implement restart
-	//m_menu.add(MenuOption(_("Restart"), _("Start the song\nfrom the beginning")));
-	m_menu.add(MenuOption(_("Quit"), _("Exit to song browser"), "Songs"));
+	InstrumentGraph::setupPauseMenu(m_menu);
 	m_menu.close();
 	// Startup delay for instruments is longer than for singing only
 	double setup_delay = (m_instruments.empty() && m_dancers.empty() ? -1.0 : -3.0);
@@ -123,6 +120,7 @@ void ScreenSing::enter() {
 	m_engine.reset(new Engine(m_audio, m_song->vocals, analyzers.begin(), analyzers.end(), m_database));
 }
 
+
 /// Manages the instrument drawing
 /// Returns false if no instuments are alive
 bool ScreenSing::instrumentLayout(double time) {
diff --git a/game/screen_sing.hh b/game/screen_sing.hh
index a8064e2..93b3cc8 100644
--- a/game/screen_sing.hh
+++ b/game/screen_sing.hh
@@ -7,8 +7,6 @@
 #include "animvalue.hh"
 #include "engine.hh"
 #include "instrumentgraph.hh"
-#include "guitargraph.hh"
-#include "dancegraph.hh"
 #include "screen.hh"
 #include "backgrounds.hh"
 #include "theme.hh"