SF.net SVN: openvrml:[3753] trunk

[<br...@us...>]

Revision: 3753
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3753&view=rev
Author:   braden
Date:     2008-10-26 07:50:46 +0000 (Sun, 26 Oct 2008)

Log Message:
-----------
"got_initial_stream" flag needs to be per-XEmbed browser instance.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/openvrml-xembed/browser.cpp

Property Changed:
----------------
    trunk/
    trunk/src/libopenvrml/openvrml/bad_url.cpp
    trunk/src/libopenvrml/openvrml/scene.cpp
    trunk/src/libopenvrml/openvrml/scene.h
    trunk/src/libopenvrml/openvrml/script.cpp


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
   + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-10-26 07:48:14 UTC (rev 3752)
+++ trunk/ChangeLog	2008-10-26 07:50:46 UTC (rev 3753)
@@ -1,5 +1,15 @@
 2008-10-26 Braden McDaniel  <br...@en...>
 
+	"got_initial_stream" flag needs to be per-XEmbed browser instance.
+
+	* src/openvrml-xembed/browser.cpp
+	(OpenvrmlXembedBrowserPrivate_): Added member got_initial_stream.
+	(openvrml_xembed_browser_new_stream(OpenvrmlXembedStreamClient *,
+	guint64, const char *, const char *, GError **)): Use the
+	got_initial_stream private member instead of a static variable.
+
+2008-10-26 Braden McDaniel  <br...@en...>
+
 	Set GErrors on failure of the XEmbed browser control's stream
 	handling functions.
 


Property changes on: trunk/src/libopenvrml/openvrml/bad_url.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750
   + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752


Property changes on: trunk/src/libopenvrml/openvrml/scene.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750
   + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752


Property changes on: trunk/src/libopenvrml/openvrml/scene.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750
   + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752


Property changes on: trunk/src/libopenvrml/openvrml/script.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750
   + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752

Modified: trunk/src/openvrml-xembed/browser.cpp
===================================================================
--- trunk/src/openvrml-xembed/browser.cpp	2008-10-26 07:48:14 UTC (rev 3752)
+++ trunk/src/openvrml-xembed/browser.cpp	2008-10-26 07:50:46 UTC (rev 3753)
@@ -209,6 +209,7 @@
     openvrml_xembed::plugin_streambuf_map * streambuf_map;
     boost::thread * initial_stream_reader_thread;
     bool expect_initial_stream;
+    bool got_initial_stream;
 };
 
 #   define OPENVRML_XEMBED_BROWSER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), OPENVRML_XEMBED_TYPE_BROWSER, OpenvrmlXembedBrowserPrivate))
@@ -216,7 +217,6 @@
 void openvrml_xembed_browser_init(OpenvrmlXembedBrowser * const vrml_browser)
 {
     vrml_browser->priv = OPENVRML_XEMBED_BROWSER_GET_PRIVATE(vrml_browser);
-
 }
 
 namespace {
@@ -580,14 +580,13 @@
     shared_ptr<plugin_streambuf> streambuf =
         browser->priv->uninitialized_streambuf_map->find(url);
 
-    static bool got_initial_stream = false;
     if (!streambuf) {
-        if (!got_initial_stream) {
+        if (!browser->priv->got_initial_stream) {
             g_assert(
                 browser->priv->uninitialized_streambuf_map->size() == 1);
             streambuf =
                 browser->priv->uninitialized_streambuf_map->front();
-            got_initial_stream = true;
+            browser->priv->got_initial_stream = true;
         } else {
             g_set_error(
                 error,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.