[Gnash-commit] gnash ChangeLog gui/gtk.cpp gui/gui.cpp gui/gui.h

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/04/11 10:46:21

Modified files:
        .              : ChangeLog 
        gui            : gtk.cpp gui.cpp gui.h 

Log message:
        Clean up and rename region debugging ifdef (in gui.h now
        for disabling gtk menu item).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6252&r2=1.6253
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.166&r2=1.167
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.149&r2=1.150
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.h?cvsroot=gnash&r1=1.84&r2=1.85

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6252
retrieving revision 1.6253
diff -u -b -r1.6252 -r1.6253
--- ChangeLog   11 Apr 2008 10:05:06 -0000      1.6252
+++ ChangeLog   11 Apr 2008 10:46:20 -0000      1.6253
@@ -1,5 +1,10 @@
 2008-04-11 Benjamin Wolsey <address@hidden>
 
+       * gui/gui.{cpp,h}, gui/gtk.cpp: cleanup and rename region debugging
+         ifdef.
+
+2008-04-11 Benjamin Wolsey <address@hidden>
+
        * gui/gui.{cpp,h}: add flag for showing invalidated ranges for
          runtime option. Enable show invalidated ranges by default, 
          check runtime flag.

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -b -r1.166 -r1.167
--- gui/gtk.cpp 11 Apr 2008 10:05:07 -0000      1.166
+++ gui/gtk.cpp 11 Apr 2008 10:46:20 -0000      1.167
@@ -1968,6 +1968,8 @@
     g_signal_connect(GTK_OBJECT(menuitem_fullscreen), "activate",
                          G_CALLBACK(&menuitem_fullscreen_callback), this);
 
+// Can be disabled at compile time.
+#ifndef DISABLE_REGION_UPDATES_DEBUGGING
     GtkCheckMenuItem *menuitem_show_updated_regions =
         GTK_CHECK_MENU_ITEM(gtk_check_menu_item_new_with_label(_("Show updated 
ranges")));
    
@@ -1978,7 +1980,7 @@
     gtk_widget_show(GTK_WIDGET(menuitem_show_updated_regions));
     g_signal_connect(GTK_OBJECT(menuitem_show_updated_regions), "activate",
                      G_CALLBACK(&menuitem_show_updated_regions_callback), 
this);
-
+#endif
 
 }
 

Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -b -r1.149 -r1.150
--- gui/gui.cpp 11 Apr 2008 10:05:08 -0000      1.149
+++ gui/gui.cpp 11 Apr 2008 10:46:21 -0000      1.150
@@ -45,26 +45,17 @@
 /// even if no motion has been detected in the movie.
 //#define FORCE_REDRAW 1
 
-/// Define this to have updated regions enclosed in a red rectangle.
-/// In the future, enabling this might actually use a runtime flag
-/// as an additional conditional.
-/// This has the side effect that all frames will be re-rendered completely
-/// but in contrast to FORCE_REDRAW it won't re-render when no motion
-/// has been detected in the movie (for example when the movie is stopped).
-///
-#define ENABLE_REGION_UPDATES_DEBUGGING 1
-
 /// Define this if you want to debug the *detection* of region updates only.
 /// This will disable region updates for the backend (GUI+renderer) completely 
 /// so that only the last region (red frame) will be visible. However, this 
 /// slows down rendering as each frame is fully re-rendered. If you want to 
 /// debug the GUI part, however (see if blitting the region works), then you 
 /// probably won't define this.
-#ifdef ENABLE_REGION_UPDATES_DEBUGGING 
+#ifndef DISABLE_REGION_UPDATES_DEBUGGING 
 //#define REGION_UPDATES_DEBUGGING_FULL_REDRAW 1
 #endif 
 
-#ifdef ENABLE_REGION_UPDATES_DEBUGGING
+#ifndef DISABLE_REGION_UPDATES_DEBUGGING
 // a runtime check would make the { x; } block conditionally executed
 #define IF_DEBUG_REGION_UPDATES(x) { if (_showUpdatedRegions) { x } }
 #else
@@ -353,15 +344,15 @@
 Gui::menu_toggle_sound()
 {
 //    GNASH_REPORT_FUNCTION;
-    media::sound_handler* snd_handler = get_sound_handler();
+    media::sound_handler* s = get_sound_handler();
 
-    if (!snd_handler)
+    if (!s)
        return;
 
-    if (snd_handler->is_muted()) {
-       snd_handler->unmute();
+    if (s->is_muted()) {
+       s->unmute();
     } else {
-       snd_handler->mute();
+       s->mute();
     }
 }
 

Index: gui/gui.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.h,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- gui/gui.h   11 Apr 2008 10:05:08 -0000      1.84
+++ gui/gui.h   11 Apr 2008 10:46:21 -0000      1.85
@@ -36,6 +36,20 @@
 // This is an experimental feature, so it's off by default
 //#define SKIP_RENDERING_IF_LATE
 
+
+/// Define this to disable region updates debugging altogether. If undefined,
+/// debugging will be a runtime option. The flag and flag-setting functions
+/// will not be disabled (too ugly).
+///
+/// This should go in gnashconfig.h
+///
+/// This has the side effect that all frames will be re-rendered completely
+/// but in contrast to FORCE_REDRAW it won't re-render when no motion
+/// has been detected in the movie (for example when the movie is stopped).
+///
+//#define DISABLE_REGION_UPDATES_DEBUGGING 1
+
+
 /// Define this to support keyboard-based pointer movements
 #define ENABLE_KEYBOARD_MOUSE_MOVEMENTS 1