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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/10/18 21:39:53

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

Log message:
                * gui/gtk.cpp: Include rc.h, to get the default sound
                setting. Toggle the sound using mute() & unmute() via the menu
                item.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1307&r2=1.1308
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtksup.h?cvsroot=gnash&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1307
retrieving revision 1.1308
diff -u -b -r1.1307 -r1.1308
--- ChangeLog   18 Oct 2006 18:16:00 -0000      1.1307
+++ ChangeLog   18 Oct 2006 21:39:53 -0000      1.1308
@@ -1,3 +1,9 @@
+2006-10-18  Rob Savoye  <address@hidden>
+
+       * gui/gtk.cpp: Include rc.h, to get the default sound
+       setting. Toggle the sound using mute() & unmute() via the menu
+       item.
+
 2006-10-18 Udo Giacomozzi <address@hidden>
 
        * gnash/server/button_character_instance.cpp, 

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- gui/gtk.cpp 18 Oct 2006 14:57:31 -0000      1.38
+++ gui/gtk.cpp 18 Oct 2006 21:39:53 -0000      1.39
@@ -44,6 +44,7 @@
 #include "log.h"
 
 #include "gui.h"
+#include "rc.h"
 #include "gtksup.h"
 #include "render_handler.h"
 
@@ -431,8 +432,18 @@
 void
 GtkGui::menuitem_sound_callback(GtkMenuItem* /*menuitem*/, gpointer /*data*/)
 {
-//    GNASH_REPORT_FUNCTION;
-    get_sound_handler()->stop_all_sounds();
+    GNASH_REPORT_FUNCTION;
+    static bool use_sound = rcfile.useSound();
+    
+    if (get_sound_handler()) {
+        if (use_sound) {
+            get_sound_handler()->mute();
+            use_sound = false;
+        } else {
+            get_sound_handler()->unmute();
+            use_sound = true;
+        }
+    }
 }
 
 

Index: gui/gtksup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtksup.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gui/gtksup.h        16 Oct 2006 16:14:07 -0000      1.23
+++ gui/gtksup.h        18 Oct 2006 21:39:53 -0000      1.24
@@ -157,7 +157,6 @@
 #elif defined(RENDERER_AGG)
     GtkAggGlue  glue;
 #endif
-
     static gnash::key::code gdk_to_gnash_key(guint key);
 };