[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1351-g54fa1b9 |
|
Date: |
Thu, 29 Dec 2011 20:29:54 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 54fa1b981b9188f2514ef69783a8011fe5e89132 (commit)
from 6f84f8a942f353d1ab1d8d6a8533c2c5ac175217 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=54fa1b981b9188f2514ef69783a8011fe5e89132
commit 54fa1b981b9188f2514ef69783a8011fe5e89132
Author: Rob Savoye <address@hidden>
Date: Thu Dec 29 13:29:52 2011 -0700
add macro so new strings get found by xgettext, so they can be translated.
diff --git a/gui/dump/dump.am b/gui/dump/dump.am
index 13c16af..73b1a5e 100644
--- a/gui/dump/dump.am
+++ b/gui/dump/dump.am
@@ -31,4 +31,6 @@ dump_gnash_CPPFLAGS = -DGUI_DUMP -DGUI_CONFIG=\"DUMP\" \
$(AGG_CFLAGS)
dump_gnash_LDADD = \
$(GNASH_LIBS) \
- $(AGG_LIBS)
+ $(top_builddir)/libdevice/libgnashdevice.la \
+ $(AGG_LIBS) \
+ $(NULL)
diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index da2bc9b..c60e1df 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -199,7 +199,7 @@ FBGui::init(int argc, char *** argv)
// Set "window" size
_width = ovg->getWidth();
_height = ovg->getHeight();
- log_debug("Width:%d, Height:%d", _width, _height);
+ log_debug(_("Width:%d, Height:%d"), _width, _height);
_renderer.reset(renderer::openvg::create_handler(0));
renderer::openvg::Renderer_ovg *rend = reinterpret_cast
<renderer::openvg::Renderer_ovg *>(_renderer.get());
@@ -221,12 +221,12 @@ FBGui::init(int argc, char *** argv)
// Set "window" size
_width = agg->width();
_height = agg->height();
- log_debug("Width:%d, Height:%d", _width, _height);
+ log_debug(_("Width:%d, Height:%d"), _width, _height);
_renderer.reset(agg->createRenderHandler());
}
#endif
if ((renderer != "openvg") && (renderer != "agg")) {
- log_error("No renderer! %s not supported.", renderer);
+ log_error(_("No renderer! %s not supported."), renderer);
}
disable_terminal();
@@ -237,7 +237,7 @@ FBGui::init(int argc, char *** argv)
_uinput.init();
_uinput.moveTo(0, 0);
} else {
- log_error("Found no accessible User mode input event device");
+ log_error(_("Found no accessible User mode input event device"));
}
// Initialize all the input devices
@@ -246,9 +246,9 @@ FBGui::init(int argc, char *** argv)
std::vector<boost::shared_ptr<InputDevice> > possibles
= InputDevice::scanForDevices();
if (possibles.empty()) {
- log_error("Found no accessible input event devices");
+ log_error(_("Found no accessible input event devices"));
} else {
- log_debug("Found %d input event devices.", possibles.size());
+ log_debug(_("Found %d input event devices."), possibles.size());
}
std::vector<boost::shared_ptr<InputDevice> >::iterator it;
@@ -259,7 +259,7 @@ FBGui::init(int argc, char *** argv)
// (*it)->dump();
#if defined(USE_MOUSE_PS2) || defined(USE_MOUSE_ETT)
if ((*it)->getType() == InputDevice::MOUSE) {
- log_debug("WARNING: Mouse support may conflict with the input
event support.");
+ log_debug(_("WARNING: Mouse support may conflict with the input
event support."));
// For now we only want keyboard input events, as the mouse
// interface default of /dev/input/mice supports hotpluging
devices,
// unlike the regular events.
@@ -273,19 +273,19 @@ FBGui::init(int argc, char *** argv)
// use that instead of handling the events directly. The
// Babbage is configured as a tablet when using input events.
if ((*it)->getType() == InputDevice::TOUCHSCREEN) {
- log_debug("Enabling Touchscreen support.");
+ log_debug(_("Enabling Touchscreen support."));
_inputs.push_back(*it);
}
if ((*it)->getType() == InputDevice::TABLET) {
#if 1
- log_debug("WARNING: Babbage Tablet support disabled as it
conflicts with TSlib");
+ log_debug(_("WARNING: Babbage Tablet support disabled as it
conflicts with TSlib"));
#else
- log_debug("Enabling Babbage Touchscreen support");
+ log_debug(_("Enabling Babbage Touchscreen support"));
_inputs.push_back(*it);
#endif
}
if ((*it)->getType() == InputDevice::POWERBUTTON) {
- log_debug("Enabling Power Button support");
+ log_debug(_("Enabling Power Button support"));
_inputs.push_back(*it);
}
}
@@ -320,7 +320,7 @@ FBGui::init(int argc, char *** argv)
if ( _ypos < 0 ) _ypos += _var_screeninfo.yres - _height;
_ypos = clamp<int>(_ypos, 0, _var_screeninfo.yres-_height);
- log_debug("X:%d, Y:%d", _xpos, _ypos);
+ log_debug(_("X:%d, Y:%d"), _xpos, _ypos);
#endif
_validbounds.setTo(0, 0, _width - 1, _height - 1);
@@ -365,7 +365,7 @@ FBGui::run()
// 10ms per heart beat
delay = 10000;
}
- log_debug("Movie Frame Rate is %d, adjusting delay to %dms", fps,
+ log_debug(_("Movie Frame Rate is %d, adjusting delay to %dms"), fps,
_interval * delay);
// This loops endlessly at the frame rate
@@ -737,7 +737,7 @@ FBGui::checkForData()
#if 1
double x = 0.655 * ie->x;
double y = 0.46875 * ie->y;
- log_debug("Mouse clicked at: %g:%g", x, y);
+ log_debug(_("Mouse clicked at: %g:%g"), x, y);
notifyMouseMove(int(x), int(y));
#else
notifyMouseMove(ie->x, ie->y);
diff --git a/gui/fb/fb_glue_agg.cpp b/gui/fb/fb_glue_agg.cpp
index 5d21ea7..864ac9a 100644
--- a/gui/fb/fb_glue_agg.cpp
+++ b/gui/fb/fb_glue_agg.cpp
@@ -73,7 +73,7 @@ FBAggGlue::setInvalidatedRegion(const SWFRect &/*bounds */)
// GNASH_REPORT_FUNCTION;
if (!_renderer) {
- log_error("No renderer set!");
+ log_error(_("No renderer set!"));
return;
}
}
@@ -84,7 +84,7 @@ FBAggGlue::setInvalidatedRegions(const InvalidatedRanges
&ranges)
// GNASH_REPORT_FUNCTION;
if (!_renderer) {
- log_error("No renderer set in %s!", __FUNCTION__);
+ log_error(_("No renderer set in %s!"), __FUNCTION__);
return;
}
@@ -127,7 +127,7 @@ FBAggGlue::init (int argc, char ***argv)
if (rend) {
_renderer.reset(rend);
} else {
- log_error("failed to create a render handler for AGG!");
+ log_error(_("failed to create a render handler for AGG!"));
return false;
}
@@ -148,7 +148,7 @@ FBAggGlue::createRenderHandler()
// GNASH_REPORT_FUNCTION;
if (!_device) {
- log_error("No Device layer initialized yet!");
+ log_error(_("No Device layer initialized yet!"));
return 0;
}
@@ -179,7 +179,7 @@ FBAggGlue::createRenderHandler()
if (pixelformat) {
agg_handler = create_Renderer_agg(pixelformat);
} else {
- log_error("The pixel format of your framebuffer could not be
detected.");
+ log_error(_("The pixel format of your framebuffer could not be
detected."));
return false;
}
@@ -218,7 +218,7 @@ FBAggGlue::render()
// GNASH_REPORT_FUNCTION;
if (_drawbounds.size() == 0 ) {
- log_debug("No Drawbounds set in %s!", __FUNCTION__);
+ log_debug(_("No Drawbounds set in %s!"), __FUNCTION__);
return; // nothing to do..
}
diff --git a/gui/fb/fb_glue_gles1.cpp b/gui/fb/fb_glue_gles1.cpp
index ef0652d..84ee763 100644
--- a/gui/fb/fb_glue_gles1.cpp
+++ b/gui/fb/fb_glue_gles1.cpp
@@ -95,39 +95,39 @@ FBgles1Glue::init(int /*argc*/, char *** /*argv*/)
if (_display == EGL_NO_DISPLAY) {
return false;
}
- log_trace("EGL: getDisplay ok");
+ log_trace(_("EGL: getDisplay ok"));
result = eglInitialize(_display, &majorVersion, &minorVersion);
if (result == EGL_FALSE) {
return false;
}
- log_trace("EGL: initialize ok");
+ log_trace(_("EGL: initialize ok"));
result = eglChooseConfig(_display, main_attrib_list, &_config, 1,
&numOfConfigs);
if (result == EGL_FALSE || numOfConfigs != 1) {
return false;
}
- log_trace("EGL: config ok");
+ log_trace(_("EGL: config ok"));
_surface = eglCreateWindowSurface(_display, _config, (NativeWindowType)0,
NULL);
if (eglGetError () != EGL_SUCCESS) {
return false;
}
- log_trace("EGL: surface ok");
+ log_trace(_("EGL: surface ok"));
_context = eglCreateContext(_display, _config, NULL, NULL);
if (eglGetError () != EGL_SUCCESS) {
return false;
}
- log_trace("EGL: context ok");
+ log_trace(_("EGL: context ok"));
eglMakeCurrent(_display, _surface, _surface, _context);
if (eglGetError () != EGL_SUCCESS) {
return false;
}
- log_trace("EGL: current ok");
+ log_trace(_("EGL: current ok"));
const EGLint pbuffer_config_list[] = {
EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
@@ -143,7 +143,7 @@ FBgles1Glue::init(int /*argc*/, char *** /*argv*/)
if (result == EGL_FALSE || numOfConfigs == 0) {
return false;
}
- log_trace("EGL: pbuffer config ok");
+ log_trace(_("EGL: pbuffer config ok"));
const EGLint pbuffer_attrib_list[] = {
EGL_WIDTH, EGL_MAX_PBUFFER_WIDTH,
@@ -159,7 +159,7 @@ FBgles1Glue::init(int /*argc*/, char *** /*argv*/)
if (eglGetError () != EGL_SUCCESS) {
return false;
}
- log_trace("EGL: pbuffer surface ok");
+ log_trace(_("EGL: pbuffer surface ok"));
return true;
}
@@ -168,7 +168,7 @@ int
FBgles1Glue::width() {
EGLint result;
eglQuerySurface (_display, _surface, EGL_WIDTH, &result);
- log_trace("EGL: width %d", result);
+ log_trace(_("EGL: width %d"), result);
return result;
}
@@ -176,7 +176,7 @@ int
FBgles1Glue::height() {
EGLint result;
eglQuerySurface (_display, _surface, EGL_HEIGHT, &result);
- log_trace("EGL: height %d", result);
+ log_trace(_("EGL: height %d"), result);
return result;
}
diff --git a/gui/fb/fb_glue_ovg.cpp b/gui/fb/fb_glue_ovg.cpp
index 24b8951..f723476 100644
--- a/gui/fb/fb_glue_ovg.cpp
+++ b/gui/fb/fb_glue_ovg.cpp
@@ -70,24 +70,24 @@ FBOvgGlue::init(int argc, char **argv[])
while (devs[i] != renderer::GnashDevice::NODEV) {
switch (devs[i++]) {
case renderer::GnashDevice::EGL:
- log_debug("Probing found an EGL display device");
+ log_debug(_("Probing found an EGL display device"));
egl = true;
break;
case renderer::GnashDevice::RAWFB:
- log_debug("Probing found a raw Framebuffer display device");
+ log_debug(_("Probing found a raw Framebuffer display
device"));
rawfb = true;
break;
case renderer::GnashDevice::X11:
- log_debug("Probing found an X11 display device");
+ log_debug(_("Probing found an X11 display device"));
x11 = true;
break;
case renderer::GnashDevice::DIRECTFB:
- log_debug("Probing found a DirectFB display device");
+ log_debug(_("Probing found a DirectFB display device"));
dfb = true;
break;
case renderer::GnashDevice::NODEV:
default:
- log_error("No display devices found by probing!");
+ log_error(_("No display devices found by probing!"));
break;
}
}
@@ -165,7 +165,7 @@ void
FBOvgGlue::setInvalidatedRegions(const InvalidatedRanges& ranges)
{
if (!_renderer) {
- log_error("No renderer set!");
+ log_error(_("No renderer set!"));
return;
}
diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index 5c97cb8..78e95b9 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -156,7 +156,7 @@ GtkGui::init(int argc, char **argv[])
{
#ifdef HAVE_X11
if (!XInitThreads()) {
- log_debug("Failed to initialize X threading support\n");
+ log_debug(_("Failed to initialize X threading support\n"));
return false;
}
#endif
@@ -186,20 +186,20 @@ GtkGui::init(int argc, char **argv[])
// there is no point in trying to use OpenGL.
bool dri = false;
if (checkX11Extension("DRI")) {
- log_debug("DRI extension found");
+ log_debug(_("DRI extension found"));
dri = true;
}
bool glx = false;
// See if our X11 server supports the GLX extension, otherwise
// there is no point in trying to use OpenGL.
if (checkX11Extension("GLX")) {
- log_debug("GLX extension found");
+ log_debug(_("GLX extension found"));
glx = true;
}
// If we don't have these extensions, don't bother with OpenGl,
// drop back to AGG.
if (!glx || !dri) {
- g_warning("This system lacks a hardware OpenGL driver!");
+ log_error(_("This system lacks a hardware OpenGL driver!"));
}
}
@@ -208,7 +208,7 @@ GtkGui::init(int argc, char **argv[])
// See if our X11 server supports the Xvideo extension, otherwise
// there is no point in trying to use Xvideo for scaling.
if (checkX11Extension("XVideo")) {
- log_debug("Xvideo extension found");
+ log_debug(_("Xvideo extension found"));
}
}
@@ -2273,7 +2273,7 @@ createPixbuf (const gchar *filename)
if (!pathname) {
log_error (_("Couldn't find pixmap file: %s"), filename);
- g_warning (_("Couldn't find pixmap file: %s"), filename);
+ g_warning(_("Couldn't find pixmap file: %s"), filename);
return NULL;
}
@@ -2588,7 +2588,7 @@ openFile(GtkWidget *widget, gpointer /* user_data */)
// run() will return. If run() is then changed to return a pointer to the
// next file to be played, then the Player class can play the next file,
// unless run() returns NULL.
- log_error (_("Attempting to open file %s.\n"
+ log_error(_("Attempting to open file %s.\n"
"NOTE: the file open functionality is not yet implemented!"),
filename);
diff --git a/gui/gtk/gtk_canvas.cpp b/gui/gtk/gtk_canvas.cpp
index 13072d5..3798dbd 100644
--- a/gui/gtk/gtk_canvas.cpp
+++ b/gui/gtk/gtk_canvas.cpp
@@ -120,8 +120,8 @@ gnash_canvas_size_allocate(GtkWidget *widget, GtkAllocation
*allocation)
{
GnashCanvas *canvas = GNASH_CANVAS(widget);
- gnash::log_debug("gnash_canvas_size_allocate %d %d", allocation->width,
- allocation->height);
+ gnash::log_debug(_("gnash_canvas_size_allocate %d %d"), allocation->width,
+ allocation->height);
if (canvas->renderer.get()) {
canvas->glue->setRenderHandlerSize(allocation->width,
diff --git a/gui/gtk/gtk_glue_agg_vaapi.cpp b/gui/gtk/gtk_glue_agg_vaapi.cpp
index 9a21695..e40cfbc 100644
--- a/gui/gtk/gtk_glue_agg_vaapi.cpp
+++ b/gui/gtk/gtk_glue_agg_vaapi.cpp
@@ -201,9 +201,8 @@ GtkAggVaapiGlue::createRenderHandler()
const char *agg_pixel_format;
agg_pixel_format = find_pixel_format(_vaapi_image_format);
if (!agg_pixel_format) {
- log_debug("GTK-AGG: Unknown RGB format %s reported by VA-API."
- " Please report this to the gnash-dev "
- "mailing list.", string_of_FOURCC(_vaapi_image_format));
+ log_debug(_("GTK-AGG: Unknown RGB format %s reported by VA-API. Please
report this to the gnash-dev mailing list."),
+ string_of_FOURCC(_vaapi_image_format));
return NULL;
}
diff --git a/gui/gtk/gtk_glue_cairo.cpp b/gui/gtk/gtk_glue_cairo.cpp
index dc033e3..b46693f 100644
--- a/gui/gtk/gtk_glue_cairo.cpp
+++ b/gui/gtk/gtk_glue_cairo.cpp
@@ -220,7 +220,7 @@ GtkCairoGlue::configure(GtkWidget *const /*widget*/,
}
if (!surface) {
- log_error("Cairo: failed to create a rendering buffer!");
+ log_error(_("Cairo: failed to create a rendering buffer!"));
return;
}
diff --git a/gui/gtk/gtk_glue_ovg.cpp b/gui/gtk/gtk_glue_ovg.cpp
index 4f494ad..9a202d4 100644
--- a/gui/gtk/gtk_glue_ovg.cpp
+++ b/gui/gtk/gtk_glue_ovg.cpp
@@ -85,24 +85,24 @@ GtkOvgGlue::init(int /*argc*/, char ** /*argv*/[])
while (devs[i] != renderer::GnashDevice::NODEV) {
switch (devs[i++]) {
case renderer::GnashDevice::EGL:
- log_debug("Probing found an EGL display device");
+ log_debug(_("Probing found an EGL display device"));
egl = true;
break;
case renderer::GnashDevice::RAWFB:
- log_debug("Probing found a raw Framebuffer display device");
+ log_debug(_("Probing found a raw Framebuffer display
device"));
rawfb = true;
break;
case renderer::GnashDevice::X11:
- log_debug("Probing found an X11 display device");
+ log_debug(_("Probing found an X11 display device"));
x11 = true;
break;
case renderer::GnashDevice::DIRECTFB:
- log_debug("Probing found a DirectFB display device");
+ log_debug(_("Probing found a DirectFB display device"));
dfb = true;
break;
case renderer::GnashDevice::NODEV:
default:
- log_error("No display devices found by probing!");
+ log_error(_("No display devices found by probing!"));
break;
}
}
@@ -262,7 +262,7 @@ GtkOvgGlue::render()
}
if (!_offscreenbuf) {
- log_error("No off screen buffer!");
+ log_error(_("No off screen buffer!"));
return;
}
@@ -279,7 +279,7 @@ GtkOvgGlue::render(int /* minx */, int /* miny */, int /*
maxx */, int /* maxy *
#ifdef ENABLE_EGL_OFFSCREEN
if (!_offscreenbuf) {
- log_error("No off screen buffer!");
+ log_error(_("No off screen buffer!"));
return;
}
@@ -380,29 +380,29 @@ GtkOvgGlue::queryEGLConfig(EGLDisplay display)
// Get the number of supported configurations
if ( EGL_FALSE == eglGetConfigs(display, 0, 0, &max_num_config) ) {
- log_error("eglGetConfigs() failed to retrive the number of configs
(error %s)",
+ log_error(_("eglGetConfigs() failed to retrive the number of configs
(error %s)"),
getErrorString(eglGetError()));
return 0;
}
if(max_num_config <= 0) {
- printf( "No EGLconfigs found\n" );
+ log_error(_("No EGLconfigs found\n"));
return 0;
}
- log_debug("Max number of EGL Configs is %d", max_num_config);
+ log_debug(_("Max number of EGL Configs is %d"), max_num_config);
configs = new EGLConfig[max_num_config];
if (0 == configs) {
- log_error( "Out of memory\n" );
+ log_error(_("Out of memory\n"));
return 0;
}
if ( EGL_FALSE == eglGetConfigs(display, configs, max_num_config,
&max_num_config)) {
- log_error("eglGetConfigs() failed to retrive the configs (error %s)",
+ log_error(_("eglGetConfigs() failed to retrive the configs (error
%s)"),
getErrorString(eglGetError()));
return 0;
}
for (int i=0; i<max_num_config; i++ ) {
- log_debug("Config[%d] is:", i);
+ log_debug(_("Config[%d] is:"), i);
printEGLConfig(configs[i]);
}
-----------------------------------------------------------------------
Summary of changes:
gui/dump/dump.am | 4 +++-
gui/fb/fb.cpp | 28 ++++++++++++++--------------
gui/fb/fb_glue_agg.cpp | 12 ++++++------
gui/fb/fb_glue_gles1.cpp | 20 ++++++++++----------
gui/fb/fb_glue_ovg.cpp | 12 ++++++------
gui/gtk/gtk.cpp | 14 +++++++-------
gui/gtk/gtk_canvas.cpp | 4 ++--
gui/gtk/gtk_glue_agg_vaapi.cpp | 5 ++---
gui/gtk/gtk_glue_cairo.cpp | 2 +-
gui/gtk/gtk_glue_ovg.cpp | 26 +++++++++++++-------------
10 files changed, 64 insertions(+), 63 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1351-g54fa1b9,
Rob Savoye <=