[Performous-commit] Vincent Le Ligeour : Added song database inside screen songs

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

Module: performous
Branch: master
Commit: c6f96faf64de7303b43f4e8e42a9ef62ccc4d6b9

Author: Vincent Le Ligeour <yo...@us...>
Date:   Wed Jan 13 01:06:18 2010 +0100

Added song database inside screen songs

---

 game/main.cc           |    2 +-
 game/screen_hiscore.cc |    2 +-
 game/screen_songs.cc   |    4 ++--
 game/screen_songs.hh   |    4 +++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/game/main.cc b/game/main.cc
index 605c8f6..ba91912 100644
--- a/game/main.cc
+++ b/game/main.cc
@@ -145,7 +145,7 @@ void mainLoop(std::string const& songlist) {
 		ScreenManager sm;
 		Window window(config["graphic/window_width"].i(), config["graphic/window_height"].i(), config["graphic/fullscreen"].b());
 		sm.addScreen(new ScreenIntro("Intro", audio, capture));
-		sm.addScreen(new ScreenSongs("Songs", audio, songs));
+		sm.addScreen(new ScreenSongs("Songs", audio, songs, database));
 		sm.addScreen(new ScreenSing("Sing", audio, capture, database, backgrounds));
 		sm.addScreen(new ScreenPractice("Practice", audio, capture));
 		sm.addScreen(new ScreenConfiguration("Configuration", audio));
diff --git a/game/screen_hiscore.cc b/game/screen_hiscore.cc
index eec3f3d..424aed5 100644
--- a/game/screen_hiscore.cc
+++ b/game/screen_hiscore.cc
@@ -13,7 +13,7 @@
 #include <boost/format.hpp>
 
 ScreenHiscore::ScreenHiscore(std::string const& name, Audio& audio, Songs& songs, Database& database):
-  ScreenSongs(name, audio, songs), m_database(database), m_players(database.m_players)
+  ScreenSongs(name, audio, songs, database), m_database(database), m_players(database.m_players)
 {
 	m_players.setAnimMargins(5.0, 5.0);
 }
diff --git a/game/screen_songs.cc b/game/screen_songs.cc
index 380bb8f..a5f151b 100644
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -12,8 +12,8 @@
 
 static const double IDLE_TIMEOUT = 45.0; // seconds
 
-ScreenSongs::ScreenSongs(std::string const& name, Audio& audio, Songs& songs):
-  Screen(name), m_audio(audio), m_songs(songs), m_covers(20), m_jukebox()
+ScreenSongs::ScreenSongs(std::string const& name, Audio& audio, Songs& songs, Database& database):
+  Screen(name), m_audio(audio), m_songs(songs), m_database(database), m_covers(20), m_jukebox()
 {
 	m_songs.setAnimMargins(5.0, 5.0);
 	m_playTimer.setTarget(getInf()); // Using this as a simple timer counting seconds
diff --git a/game/screen_songs.hh b/game/screen_songs.hh
index 7a59146..964985d 100644
--- a/game/screen_songs.hh
+++ b/game/screen_songs.hh
@@ -3,6 +3,7 @@
 #include <boost/scoped_ptr.hpp>
 #include "animvalue.hh"
 #include "cachemap.hh"
+#include "database.hh"
 #include "screen.hh"
 #include "surface.hh"
 #include "textinput.hh"
@@ -26,7 +27,7 @@ struct ScreenSharedInfo
 class ScreenSongs : public Screen {
   public:
 	/// constructor
-	ScreenSongs(std::string const& name, Audio& audio, Songs& songs);
+	ScreenSongs(std::string const& name, Audio& audio, Songs& songs, Database& database);
 	void enter();
 	void exit();
 	void manageSharedKey(input::NavButton nav); ///< same behaviour for jukebox and normal mode
@@ -41,6 +42,7 @@ class ScreenSongs : public Screen {
 
 	Audio& m_audio;
 	Songs& m_songs;
+	Database& m_database;
 	boost::scoped_ptr<Surface> m_songbg;
 	boost::scoped_ptr<Surface> m_songbg_default;
 	boost::scoped_ptr<Video> m_video;