Author: shadowmaster
Date: Sat Jun 14 00:38:45 2008
New Revision: 27158
URL: http://svn.gna.org/viewcvs/wesnoth?rev=27158&view=rev
Log:
* Made progress counter output on stderr be done via the display
* logdomain (level = info/error)
Modified:
trunk/src/loadscreen.cpp
trunk/src/loadscreen.hpp
Modified: trunk/src/loadscreen.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/loadscreen.cpp?rev=27158&r1=27157&r2=27158&view=diff
==============================================================================
--- trunk/src/loadscreen.cpp (original)
+++ trunk/src/loadscreen.cpp Sat Jun 14 00:38:45 2008
@@ -17,6 +17,7 @@
#include "loadscreen.hpp"
+#include "log.hpp"
#include "font.hpp"
#include "marked-up_text.hpp"
#include "gettext.hpp"
@@ -26,6 +27,9 @@
#include <cassert>
#include <SDL_image.h>
+
+#define INFO_DISP LOG_STREAM(info, display)
+#define ERR_DISP LOG_STREAM(err, display)
#define MIN_PERCENTAGE 0
#define MAX_PERCENTAGE 100
@@ -72,7 +76,7 @@
std::string path = get_binary_file_location("images","misc/logo.png");
logo_surface_ = IMG_Load(path.c_str());
if (!logo_surface_) {
- std::cerr << "loadscreen: Failed to load the logo: " <<
path << std::endl;
+ ERR_DISP << "loadscreen: Failed to load the logo: " <<
path << std::endl;
}
textarea_.x = textarea_.y = textarea_.w = textarea_.h = 0;
}
@@ -106,7 +110,7 @@
pby_offset_ = (pbh + area.h)/2;
SDL_BlitSurface (logo_surface_, 0, gdis, &area);
} else {
- std::cerr << "loadscreen: Logo image is too big." <<
std::endl;
+ ERR_DISP << "loadscreen: Logo image is too big." <<
std::endl;
}
logo_drawn_ = true;
SDL_UpdateRect(gdis, area.x, area.y, area.w, area.h);
@@ -190,6 +194,14 @@
loadscreen *loadscreen::global_loadscreen = 0;
+void loadscreen::dump_counters() const
+{
+ INFO_DISP << "loadscreen: filesystem counter = " << filesystem_counter
<< '\n';
+ INFO_DISP << "loadscreen: binarywml counter = " << binarywml_counter
<< '\n';
+ INFO_DISP << "loadscreen: setconfig counter = " << setconfig_counter
<< '\n';
+ INFO_DISP << "loadscreen: parser counter = " << parser_counter
<< '\n';
+}
+
// Amount of work to expect during the startup-stages,
// for scaling the progressbars:
#define CALLS_TO_FILESYSTEM 112
Modified: trunk/src/loadscreen.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/loadscreen.hpp?rev=27158&r1=27157&r2=27158&view=diff
==============================================================================
--- trunk/src/loadscreen.hpp (original)
+++ trunk/src/loadscreen.hpp Sat Jun 14 00:38:45 2008
@@ -38,10 +38,7 @@
// Destructor, dumps the counter values to stderr
~loadscreen()
{
- std::cerr << "loadscreen: filesystem counter = " <<
filesystem_counter << std::endl;
- std::cerr << "loadscreen: binarywml counter = " <<
binarywml_counter << std::endl;
- std::cerr << "loadscreen: setconfig counter = " <<
setconfig_counter << std::endl;
- std::cerr << "loadscreen: parser counter = " <<
parser_counter << std::endl;
+ dump_counters();
if (logo_surface_) {
SDL_FreeSurface (logo_surface_);
}
@@ -85,6 +82,8 @@
bool logo_drawn_;
int pby_offset_;
int prcnt_;
+
+ void dump_counters() const;
};
// Global accessible functions that centralize the loadscreen related work.
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
