openvrml-commit

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

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23362/mozilla-plugin/src

Modified Files:
	openvrml.cpp 
Log Message:
While the Mozilla plug-in needs to be able to send an initial stream to openvrml-gtkplug, it seems likely that most clients will want to start openvrml-gtkplug without having it expect an initial stream.  Added --initial-stream argument to openvrml-gtkplug to enable the old default behavior.

Index: openvrml.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** openvrml.cpp	28 Nov 2006 06:12:44 -0000	1.46
--- openvrml.cpp	30 Nov 2006 06:47:43 -0000	1.47
***************
*** 1150,1160 ****
          }
  
!         string socket_id_arg = lexical_cast<string>(this->window);
!         const char * socket_id_arg_c_str = socket_id_arg.c_str();
!         vector<char> socket_id_arg_vec(
              socket_id_arg_c_str,
              socket_id_arg_c_str + socket_id_arg.length() + 1);
  
!         const gint argv_size = openvrml_gtkplug_cmd_argc + 2;
          gchar ** const argv =
              static_cast<gchar **>(g_malloc(sizeof (gchar *) * argv_size));
--- 1150,1167 ----
          }
  
!         static const char initial_stream_arg_c_str[] = "--initial-stream";
!         static const size_t initial_stream_arg_c_str_size =
!             sizeof initial_stream_arg_c_str / sizeof (gchar);
!         vector<gchar> initial_stream_arg_vec(
!             initial_stream_arg_c_str,
!             initial_stream_arg_c_str + initial_stream_arg_c_str_size);
! 
!         const string socket_id_arg = lexical_cast<string>(this->window);
!         const char * const socket_id_arg_c_str = socket_id_arg.c_str();
!         vector<gchar> socket_id_arg_vec(
              socket_id_arg_c_str,
              socket_id_arg_c_str + socket_id_arg.length() + 1);
  
!         const gint argv_size = openvrml_gtkplug_cmd_argc + 3;
          gchar ** const argv =
              static_cast<gchar **>(g_malloc(sizeof (gchar *) * argv_size));
***************
*** 1166,1169 ****
--- 1173,1177 ----
              argv[i] = openvrml_gtkplug_cmd_argv[i];
          }
+         argv[i++] = &initial_stream_arg_vec.front();
          argv[i++] = &socket_id_arg_vec.front();
          argv[i]   = 0;