[Gnash-commit] [SCM] Gnash branch, master, updated. d1a5bd694abcccf8dbb3c0b1b0fb630fc05d089e

[Sandro Santilli]

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  d1a5bd694abcccf8dbb3c0b1b0fb630fc05d089e (commit)
      from  7b86b3e884249681fd8cd081d0f5e4653c2959e3 (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=d1a5bd694abcccf8dbb3c0b1b0fb630fc05d089e


commit d1a5bd694abcccf8dbb3c0b1b0fb630fc05d089e
Author: Sandro Santilli <address@hidden>
Date:   Tue Aug 24 20:07:57 2010 +0200

    Add a virtual Renderer::description, use it in Help->About dialog to show 
which renderer is being used.

diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index 9dd11f4..e744107 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -1880,7 +1880,7 @@ GtkGui::showAboutDialog()
     media::MediaHandler* m = _runResources.mediaHandler();
 
     comments.append(_("\nRenderer: "));
-    comments.append(RENDERER_CONFIG);
+    comments.append(_renderer->description());
     comments.append(_("\nHardware Acceleration: "));
     comments.append(HWACCEL_CONFIG);
     comments.append(_("\nGUI: "));
diff --git a/librender/Renderer.h b/librender/Renderer.h
index 179216c..037cd58 100644
--- a/librender/Renderer.h
+++ b/librender/Renderer.h
@@ -199,6 +199,9 @@ public:
 
     virtual ~Renderer() {}
 
+    /// Return a description of this renderer.
+    virtual std::string description() const = 0;
+
     /// ==================================================================
     /// Interfaces for adjusting renderer output.
     /// ==================================================================
diff --git a/librender/Renderer_agg.cpp b/librender/Renderer_agg.cpp
index b2945cc..5cfc4cc 100644
--- a/librender/Renderer_agg.cpp
+++ b/librender/Renderer_agg.cpp
@@ -687,6 +687,11 @@ class Renderer_agg : public Renderer_agg_base
   
 public:
 
+    std::string description() const {
+        // TODO: make an effort to express pixel format
+        return "AGG";
+    }
+
     // Given an image, returns a pointer to a bitmap_info class
     // that can later be passed to FillStyleX_bitmap(), to set a
     // bitmap fill style.
diff --git a/librender/Renderer_agg.h b/librender/Renderer_agg.h
index ea9ec12..7931dcd 100644
--- a/librender/Renderer_agg.h
+++ b/librender/Renderer_agg.h
@@ -37,7 +37,7 @@ public:
 
   // virtual classes should have virtual destructors
   virtual ~Renderer_agg_base() {}
-  
+
   // these methods need to be accessed from outside:
   virtual void init_buffer(unsigned char *mem, int size, int x, int y, int 
rowstride)=0;
 
diff --git a/librender/Renderer_cairo.h b/librender/Renderer_cairo.h
index 58752d7..1cd9bd5 100644
--- a/librender/Renderer_cairo.h
+++ b/librender/Renderer_cairo.h
@@ -38,6 +38,8 @@ public:
     Renderer_cairo();
     ~Renderer_cairo();
 
+    std::string description() const { return "Cairo"; }
+
     CachedBitmap* createCachedBitmap(std::auto_ptr<GnashImage> im);
 
     void drawVideoFrame(GnashImage* baseframe, const SWFMatrix* m,
diff --git a/librender/Renderer_ogl.cpp b/librender/Renderer_ogl.cpp
index 891f7fa..34217bb 100644
--- a/librender/Renderer_ogl.cpp
+++ b/librender/Renderer_ogl.cpp
@@ -714,6 +714,8 @@ public:
       _drawing_mask(false)
   {
   }
+
+  std::string description() const { return "OpenGL"; }
   
   void init()
   {

-----------------------------------------------------------------------

Summary of changes:
 gui/gtk/gtk.cpp            |    2 +-
 librender/Renderer.h       |    3 +++
 librender/Renderer_agg.cpp |    5 +++++
 librender/Renderer_agg.h   |    2 +-
 librender/Renderer_cairo.h |    2 ++
 librender/Renderer_ogl.cpp |    2 ++
 6 files changed, 14 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash