[Gnash-commit] /srv/bzr/gnash/trunk r10293: Fix "click-to-play" for the standalone case. If you like it, we might

[Sandro Santilli]

------------------------------------------------------------
revno: 10293
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Tue 2008-11-18 13:24:43 +0100
message:
  Fix "click-to-play" for the standalone case. If you like it, we might
  use the same model for the plugin, as the bug (#23477) really seem
  to depend on the mechanism we use to show the button (no bug with standalone
  and this model)
modified:
  gui/gtk.cpp
  gui/gui.cpp

=== modified file 'gui/gtk.cpp'
--- a/gui/gtk.cpp       2008-11-03 08:02:31 +0000
+++ b/gui/gtk.cpp       2008-11-18 12:24:43 +0000
@@ -2544,17 +2544,27 @@
     // FIXME: this can't work for the stand-alone player, because
     // _drawingArea is
     // packed into a vbox.
-    if (! _xid) return;
-
-    // Assert they're either both initialised or both uninitialised
-    assert ((_resumeButton && _drawingArea) || !(_resumeButton || 
_drawingArea));
-
-    if (_drawingArea) {
-        gtk_container_remove(GTK_CONTAINER(_window), _drawingArea);
+    if (! _xid)
+    {
+        // Assert they're either both initialised or both uninitialised
+        assert ((_resumeButton && _vbox) || !(_resumeButton || _vbox));
+        if (_resumeButton) {
+            gtk_container_add(GTK_CONTAINER(_vbox), _resumeButton);
+        }
+
     }
-    
-    if (_resumeButton) {
-        gtk_container_add(GTK_CONTAINER(_window), _resumeButton);
+    else
+    {
+        // Assert they're either both initialised or both uninitialised
+        assert ((_resumeButton && _drawingArea) || !(_resumeButton || 
_drawingArea));
+
+        if (_drawingArea) {
+            gtk_container_remove(GTK_CONTAINER(_window), _drawingArea);
+        }
+        
+        if (_resumeButton) {
+            gtk_container_add(GTK_CONTAINER(_window), _resumeButton);
+        }
     }
 
 }
@@ -2564,16 +2574,23 @@
 {
     // FIXME: this can't work for the stand-alone player, because _drawingArea 
is
     // packed into a vbox.
-    if (! _xid) return;
-
-    // Assert they're either both initialised or both uninitialised
-    assert ((_resumeButton && _drawingArea) || !(_resumeButton || 
_drawingArea));
-
-    if (_resumeButton) {
-        gtk_container_remove(GTK_CONTAINER(_window), _resumeButton);
+    if (! _xid)
+    {
+        if (_resumeButton) {
+            gtk_container_remove(GTK_CONTAINER(_vbox), _resumeButton);
+        }
     }
-    if (_drawingArea) {
-        gtk_container_add(GTK_CONTAINER(_window), _drawingArea);
+    else
+    {
+        // Assert they're either both initialised or both uninitialised
+        assert ((_resumeButton && _drawingArea) || !(_resumeButton || 
_drawingArea));
+
+        if (_resumeButton) {
+            gtk_container_remove(GTK_CONTAINER(_window), _resumeButton);
+        }
+        if (_drawingArea) {
+            gtk_container_add(GTK_CONTAINER(_window), _drawingArea);
+        }
     }
 
 }

=== modified file 'gui/gui.cpp'
--- a/gui/gui.cpp       2008-11-03 08:02:31 +0000
+++ b/gui/gui.cpp       2008-11-18 12:24:43 +0000
@@ -877,6 +877,8 @@
        sound::sound_handler* s = _stage->runInfo().soundHandler();
        if ( s ) s->pause();
         _stopped = true;
+
+        stopHook();
     }
 }