[Gnash-commit] gnash ChangeLog backend/sound_handler_gst.cpp b...

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     06/10/21 09:54:44

Modified files:
        .              : ChangeLog 
        backend        : sound_handler_gst.cpp sound_handler_sdl.cpp 
                         sound_handler_sdl.h 
        gui            : gtk.cpp 
        server         : gnash.h 

Log message:
                * server/gnash.h: Declare sound_handler::is_muted().
                * backend/{sound_handler_gst.cpp, sound_handler_sdl.cpp,
                sound_handler_sdl.h}: Implement is_muted().
                * gui/gtk.cpp: Use is_muted() instead of a static Gui variable 
to
                determine whether or not sound is muted.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1333&r2=1.1334
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_gst.cpp?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.66&r2=1.67

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1333
retrieving revision 1.1334
diff -u -b -r1.1333 -r1.1334
--- ChangeLog   21 Oct 2006 03:39:59 -0000      1.1333
+++ ChangeLog   21 Oct 2006 09:54:44 -0000      1.1334
@@ -1,3 +1,11 @@
+2006-10-21 Bastiaan Jacques <address@hidden>
+
+       * server/gnash.h: Declare sound_handler::is_muted().
+       * backend/{sound_handler_gst.cpp, sound_handler_sdl.cpp,
+       sound_handler_sdl.h}: Implement is_muted().
+       * gui/gtk.cpp: Use is_muted() instead of a static Gui variable to
+       determine whether or not sound is muted.
+
 2006-10-21 Markus Gothe <address@hidden>
 
        * plugin/plugin.cpp: Experimental code to support Firefox compiled

Index: backend/sound_handler_gst.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_gst.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- backend/sound_handler_gst.cpp       16 Oct 2006 22:17:14 -0000      1.21
+++ backend/sound_handler_gst.cpp       21 Oct 2006 09:54:44 -0000      1.22
@@ -18,7 +18,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-/* $Id: sound_handler_gst.cpp,v 1.21 2006/10/16 22:17:14 tgc Exp $ */
+/* $Id: sound_handler_gst.cpp,v 1.22 2006/10/21 09:54:44 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -674,6 +674,9 @@
                        muted = false;
        }
 
+       virtual bool is_muted() {
+               return muted;
+       }
 
 };
 

Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- backend/sound_handler_sdl.cpp       17 Oct 2006 22:00:38 -0000      1.28
+++ backend/sound_handler_sdl.cpp       21 Oct 2006 09:54:44 -0000      1.29
@@ -470,6 +470,10 @@
        muted = false;
 }
 
+bool SDL_sound_handler::is_muted()
+{
+       return muted;
+}
 
 
 void SDL_sound_handler::convert_raw_data(

Index: backend/sound_handler_sdl.h
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- backend/sound_handler_sdl.h 17 Oct 2006 21:14:18 -0000      1.6
+++ backend/sound_handler_sdl.h 21 Oct 2006 09:54:44 -0000      1.7
@@ -170,6 +170,8 @@
        // gnash calls this to unmute audio
        virtual void    unmute();
 
+       virtual bool    is_muted();
+
        // Converts input data to the SDL output format.
        virtual void    convert_raw_data(int16_t** adjusted_data,
                          int* adjusted_size, void* data, int sample_count,

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- gui/gtk.cpp 18 Oct 2006 22:36:21 -0000      1.40
+++ gui/gtk.cpp 21 Oct 2006 09:54:44 -0000      1.41
@@ -61,10 +61,6 @@
 namespace gnash 
 {
 
-// This has to be a static instead of private data so we can access it
-// from static member functions.
-static bool s_use_sound;
-
 GtkGui::~GtkGui()
 {
 }
@@ -123,12 +119,6 @@
     glue.prepDrawingArea(_drawing_area);
 #endif
 
-    if (get_sound_handler()) {
-        s_use_sound = true;
-    } else {
-        s_use_sound = false;
-    }
-
     _renderer = glue.createRenderHandler();
     set_render_handler(_renderer);
 
@@ -447,14 +437,15 @@
 {
     GNASH_REPORT_FUNCTION;
     
-    if (get_sound_handler()) {
-        if (s_use_sound) {
-            get_sound_handler()->mute();
-            s_use_sound = false;
+    sound_handler* snd_handler = get_sound_handler();
+
+    if (!snd_handler)
+       return;
+    
+    if (snd_handler->is_muted()) {
+       snd_handler->unmute();
         } else {
-            get_sound_handler()->unmute();
-            s_use_sound = true;
-        }
+       snd_handler->mute();
     }
 }
 

Index: server/gnash.h
===================================================================
RCS file: /sources/gnash/gnash/server/gnash.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- server/gnash.h      19 Oct 2006 09:17:06 -0000      1.66
+++ server/gnash.h      21 Oct 2006 09:54:44 -0000      1.67
@@ -35,7 +35,7 @@
 // 
 //
 
-/* $Id: gnash.h,v 1.66 2006/10/19 09:17:06 strk Exp $ */
+/* $Id: gnash.h,v 1.67 2006/10/21 09:54:44 bjacques Exp $ */
 
 /// \mainpage
 ///
@@ -479,6 +479,9 @@
        // gnash calls this to unmute audio
        virtual void    unmute() = 0;
 
+       //// @return Whether or not sound is muted.
+       virtual bool    is_muted() = 0;
+
 
        virtual ~sound_handler() {};