openvrml-commit — Changes to OpenVRML's source revision repository

[openvrml-commit] openvrml ChangeLog,1.1310.2.128,1.1310.2.129

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12715

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Define the scoped_lock before the call to setjmp; otherwise, a longjmp call from libjpeg code will prevent the destructor from running (and freeing the mutex).

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.128
retrieving revision 1.1310.2.129
diff -C2 -d -r1.1310.2.128 -r1.1310.2.129
*** ChangeLog	12 Feb 2007 21:54:40 -0000	1.1310.2.128
--- ChangeLog	13 Feb 2007 08:56:40 -0000	1.1310.2.129
***************
*** 1,2 ****
--- 1,10 ----
+ 2007-02-13 Braden McDaniel  <br...@en...>
+ 
+ 	* src/libopenvrml/openvrml/vrml97node.cpp
+ 	(image_stream_listener::jpeg_reader::do_read(const
+ 	std::vector<unsigned char> &)): Define the scoped_lock before the
+ 	call to setjmp; otherwise, a longjmp call from libjpeg code will
+ 	prevent the destructor from running (and freeing the mutex).
+ 
  2007-02-12 Braden McDaniel  <br...@en...>
  

[openvrml-commit] openvrml/src/libopenvrml/openvrml vrml97node.cpp, 1.108.2.8, 1.108.2.9

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

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12715/src/libopenvrml/openvrml

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	vrml97node.cpp 
Log Message:
Define the scoped_lock before the call to setjmp; otherwise, a longjmp call from libjpeg code will prevent the destructor from running (and freeing the mutex).

Index: vrml97node.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v
retrieving revision 1.108.2.8
retrieving revision 1.108.2.9
diff -C2 -d -r1.108.2.8 -r1.108.2.9
*** vrml97node.cpp	2 Jan 2007 03:54:39 -0000	1.108.2.8
--- vrml97node.cpp	13 Feb 2007 08:56:40 -0000	1.108.2.9
***************
*** 7245,7248 ****
--- 7245,7251 ----
      do_read(const std::vector<unsigned char> & data)
      {
+         boost::recursive_mutex::scoped_lock
+             lock(this->stream_listener.node_mutex_);
+ 
          if (data.size() > this->buffer.size()) {
              this->buffer.resize(data.size());
***************
*** 7256,7262 ****
          case jpeg_reader::header:
          {
-             boost::recursive_mutex::scoped_lock
-                 lock(this->stream_listener.node_mutex_);
- 
              static const bool require_image = true;
              const int read_header_result = jpeg_read_header(&this->cinfo_,
--- 7259,7262 ----

[openvrml-commit] openvrml ChangeLog, 1.1452, 1.1453 configure.ac, 1.110, 1.111

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5154

Modified Files:
	ChangeLog configure.ac 
Log Message:
Fixed FreeType const test to use pkg-config to get the compiler flags.

Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/configure.ac,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** configure.ac	5 Feb 2007 05:36:10 -0000	1.110
--- configure.ac	12 Feb 2007 21:55:11 -0000	1.111
***************
*** 92,96 ****
  [AC_LANG_PUSH([C++])
  save_CXXFLAGS="${CXXFLAGS}"
! CXXFLAGS="${CXXFLAGS} `${FREETYPE_CONFIG} --cflags`"
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
                    [#include <ft2build.h>
--- 92,96 ----
  [AC_LANG_PUSH([C++])
  save_CXXFLAGS="${CXXFLAGS}"
! CXXFLAGS="${CXXFLAGS} `${PKG_CONFIG} --cflags ${REQUIRE_FREETYPE}`"
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
                    [#include <ft2build.h>

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1452
retrieving revision 1.1453
diff -C2 -d -r1.1452 -r1.1453
*** ChangeLog	12 Feb 2007 02:19:30 -0000	1.1452
--- ChangeLog	12 Feb 2007 21:55:11 -0000	1.1453
***************
*** 1,2 ****
--- 1,7 ----
+ 2007-02-12 Braden McDaniel  <br...@en...>
+ 
+ 	* configure.ac: Fixed FreeType const test to use pkg-config to get
+ 	the compiler flags.
+ 
  2007-02-11 Braden McDaniel  <br...@en...>
  

[openvrml-commit] openvrml ChangeLog, 1.1310.2.127, 1.1310.2.128 configure.ac, 1.92.2.18, 1.92.2.19

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4802

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog configure.ac 
Log Message:
Fixed FreeType const test to use pkg-config to get the compiler flags.

Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/configure.ac,v
retrieving revision 1.92.2.18
retrieving revision 1.92.2.19
diff -C2 -d -r1.92.2.18 -r1.92.2.19
*** configure.ac	5 Feb 2007 04:41:52 -0000	1.92.2.18
--- configure.ac	12 Feb 2007 21:54:40 -0000	1.92.2.19
***************
*** 92,96 ****
  [AC_LANG_PUSH([C++])
  save_CXXFLAGS="${CXXFLAGS}"
! CXXFLAGS="${CXXFLAGS} `${FREETYPE_CONFIG} --cflags`"
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
                    [#include <ft2build.h>
--- 92,96 ----
  [AC_LANG_PUSH([C++])
  save_CXXFLAGS="${CXXFLAGS}"
! CXXFLAGS="${CXXFLAGS} `${PKG_CONFIG} --cflags ${REQUIRE_FREETYPE}`"
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
                    [#include <ft2build.h>

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.127
retrieving revision 1.1310.2.128
diff -C2 -d -r1.1310.2.127 -r1.1310.2.128
*** ChangeLog	12 Feb 2007 02:19:13 -0000	1.1310.2.127
--- ChangeLog	12 Feb 2007 21:54:40 -0000	1.1310.2.128
***************
*** 1,2 ****
--- 1,7 ----
+ 2007-02-12 Braden McDaniel  <br...@en...>
+ 
+ 	* configure.ac: Fixed FreeType const test to use pkg-config to get
+ 	the compiler flags.
+ 
  2007-02-11 Braden McDaniel  <br...@en...>
  

[openvrml-commit] openvrml/src/openvrml-xembed bounded_buffer.h, 1.4, 1.5 command_istream.cpp, 1.2, 1.3 command_istream.h, 1.2, 1.3 gtkvrmlbrowser.cpp, 1.3, 1.4 main.cpp, 1.4, 1.5 plugin_streambuf.cpp, 1.2, 1.3 plugin_streambuf.h, 1.2, 1.3

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-xembed
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5628/src/openvrml-xembed

Modified Files:
	bounded_buffer.h command_istream.cpp command_istream.h 
	gtkvrmlbrowser.cpp main.cpp plugin_streambuf.cpp 
	plugin_streambuf.h 
Log Message:
openvrml-xembed isn't openvrml-player anymore.  Renamed namespace accordingly.

Index: main.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/main.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** main.cpp	5 Feb 2007 09:00:04 -0000	1.4
--- main.cpp	12 Feb 2007 02:19:30 -0000	1.5
***************
*** 38,42 ****
  # include "plugin_streambuf.h"
  
! using namespace openvrml_player;
  using namespace boost::multi_index::detail; // for scope_guard
  
--- 38,42 ----
  # include "plugin_streambuf.h"
  
! using namespace openvrml_xembed;
  using namespace boost::multi_index::detail; // for scope_guard
  
***************
*** 54,58 ****
  }
  
! namespace openvrml_player {
  
      struct command_istream_reader {
--- 54,58 ----
  }
  
! namespace openvrml_xembed {
  
      struct command_istream_reader {
***************
*** 311,315 ****
      using boost::thread_group;
  
!     using namespace openvrml_player;
  
      g_thread_init(0);
--- 311,315 ----
      using boost::thread_group;
  
!     using namespace openvrml_xembed;
  
      g_thread_init(0);

Index: gtkvrmlbrowser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/gtkvrmlbrowser.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gtkvrmlbrowser.cpp	11 Feb 2007 07:10:26 -0000	1.3
--- gtkvrmlbrowser.cpp	12 Feb 2007 02:19:30 -0000	1.4
***************
*** 532,536 ****
      resource_fetcher::do_get_resource(const std::string & uri)
      {
!         using openvrml_player::plugin_streambuf;
  
          class plugin_resource_istream : public openvrml::resource_istream {
--- 532,536 ----
      resource_fetcher::do_get_resource(const std::string & uri)
      {
!         using openvrml_xembed::plugin_streambuf;
  
          class plugin_resource_istream : public openvrml::resource_istream {
***************
*** 547,551 ****
                  using std::ostringstream;
                  using boost::ref;
!                 using openvrml_player::uninitialized_plugin_streambuf_map_;
  
                  this->rdbuf(this->streambuf_.get());
--- 547,551 ----
                  using std::ostringstream;
                  using boost::ref;
!                 using openvrml_xembed::uninitialized_plugin_streambuf_map_;
  
                  this->rdbuf(this->streambuf_.get());

Index: plugin_streambuf.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/plugin_streambuf.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** plugin_streambuf.h	5 Feb 2007 05:36:13 -0000	1.2
--- plugin_streambuf.h	12 Feb 2007 02:19:30 -0000	1.3
***************
*** 19,24 ****
  //
  
! # ifndef OPENVRML_PLAYER_PLUGIN_STREAMBUF_H
! #   define OPENVRML_PLAYER_PLUGIN_STREAMBUF_H
  
  #   include <map>
--- 19,24 ----
  //
  
! # ifndef OPENVRML_XEMBED_PLUGIN_STREAMBUF_H
! #   define OPENVRML_XEMBED_PLUGIN_STREAMBUF_H
  
  #   include <map>
***************
*** 29,33 ****
  #   include "bounded_buffer.h"
  
! namespace openvrml_player {
  
      class command_istream_reader;
--- 29,33 ----
  #   include "bounded_buffer.h"
  
! namespace openvrml_xembed {
  
      class command_istream_reader;
***************
*** 90,92 ****
  }
  
! # endif // ifndef OPENVRML_PLAYER_PLUGIN_STREAMBUF_H
--- 90,92 ----
  }
  
! # endif // ifndef OPENVRML_XEMBED_PLUGIN_STREAMBUF_H

Index: command_istream.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/command_istream.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** command_istream.h	5 Feb 2007 05:36:12 -0000	1.2
--- command_istream.h	12 Feb 2007 02:19:30 -0000	1.3
***************
*** 19,24 ****
  //
  
! # ifndef OPENVRML_PLAYER_COMMAND_ISTREAM_H
! #   define OPENVRML_PLAYER_COMMAND_ISTREAM_H
  
  #   include <streambuf>
--- 19,24 ----
  //
  
! # ifndef OPENVRML_XEMBED_COMMAND_ISTREAM_H
! #   define OPENVRML_XEMBED_COMMAND_ISTREAM_H
  
  #   include <streambuf>
***************
*** 31,35 ****
                                             gpointer data);
  
! namespace openvrml_player {
  
      class command_streambuf : boost::noncopyable, public std::streambuf {
--- 31,35 ----
                                             gpointer data);
  
! namespace openvrml_xembed {
  
      class command_streambuf : boost::noncopyable, public std::streambuf {
***************
*** 57,59 ****
  }
  
! # endif // ifndef OPENVRML_PLAYER_COMMAND_ISTREAM_H
--- 57,59 ----
  }
  
! # endif // ifndef OPENVRML_XEMBED_COMMAND_ISTREAM_H

Index: command_istream.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/command_istream.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** command_istream.cpp	5 Feb 2007 05:36:12 -0000	1.2
--- command_istream.cpp	12 Feb 2007 02:19:30 -0000	1.3
***************
*** 23,27 ****
  # include "command_istream.h"
  
! openvrml_player::command_streambuf::command_streambuf():
      c_('\0')
  {
--- 23,27 ----
  # include "command_istream.h"
  
! openvrml_xembed::command_streambuf::command_streambuf():
      c_('\0')
  {
***************
*** 29,34 ****
  }
  
! openvrml_player::command_streambuf::int_type
! openvrml_player::command_streambuf::underflow()
  {
      const int_type i = this->source_buffer_.get();
--- 29,34 ----
  }
  
! openvrml_xembed::command_streambuf::int_type
! openvrml_xembed::command_streambuf::underflow()
  {
      const int_type i = this->source_buffer_.get();
***************
*** 42,46 ****
  
  
! openvrml_player::command_istream::command_istream():
      std::istream(&this->buf_)
  {}
--- 42,46 ----
  
  
! openvrml_xembed::command_istream::command_istream():
      std::istream(&this->buf_)
  {}
***************
*** 50,54 ****
                                  gpointer data)
  {
!     using namespace openvrml_player;
  
      typedef command_istream::traits_type traits_type;
--- 50,54 ----
                                  gpointer data)
  {
!     using namespace openvrml_xembed;
  
      typedef command_istream::traits_type traits_type;

Index: plugin_streambuf.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/plugin_streambuf.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** plugin_streambuf.cpp	5 Feb 2007 05:36:13 -0000	1.2
--- plugin_streambuf.cpp	12 Feb 2007 02:19:30 -0000	1.3
***************
*** 22,26 ****
  # include "plugin_streambuf.h"
  
! openvrml_player::plugin_streambuf::
  plugin_streambuf(const std::string & requested_url):
      get_url_result_(-1),
--- 22,26 ----
  # include "plugin_streambuf.h"
  
! openvrml_xembed::plugin_streambuf::
  plugin_streambuf(const std::string & requested_url):
      get_url_result_(-1),
***************
*** 41,45 ****
  }
  
! void openvrml_player::plugin_streambuf::set_get_url_result(const int result)
  {
      boost::mutex::scoped_lock lock(this->mutex_);
--- 41,45 ----
  }
  
! void openvrml_xembed::plugin_streambuf::set_get_url_result(const int result)
  {
      boost::mutex::scoped_lock lock(this->mutex_);
***************
*** 49,53 ****
  }
  
! int openvrml_player::plugin_streambuf::get_url_result() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
--- 49,53 ----
  }
  
! int openvrml_xembed::plugin_streambuf::get_url_result() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
***************
*** 58,62 ****
  }
  
! void openvrml_player::plugin_streambuf::init(const size_t stream_id,
                                               const std::string & received_url,
                                               const std::string & type)
--- 58,62 ----
  }
  
! void openvrml_xembed::plugin_streambuf::init(const size_t stream_id,
                                               const std::string & received_url,
                                               const std::string & type)
***************
*** 78,82 ****
  }
  
! void openvrml_player::plugin_streambuf::fail()
  {
      boost::mutex::scoped_lock lock(this->mutex_);
--- 78,82 ----
  }
  
! void openvrml_xembed::plugin_streambuf::fail()
  {
      boost::mutex::scoped_lock lock(this->mutex_);
***************
*** 88,92 ****
  }
  
! const std::string & openvrml_player::plugin_streambuf::url() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
--- 88,92 ----
  }
  
! const std::string & openvrml_xembed::plugin_streambuf::url() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
***************
*** 97,101 ****
  }
  
! const std::string & openvrml_player::plugin_streambuf::type() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
--- 97,101 ----
  }
  
! const std::string & openvrml_xembed::plugin_streambuf::type() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
***************
*** 106,110 ****
  }
  
! bool openvrml_player::plugin_streambuf::data_available() const
  {
      //
--- 106,110 ----
  }
  
! bool openvrml_xembed::plugin_streambuf::data_available() const
  {
      //
***************
*** 116,121 ****
  }
  
! openvrml_player::plugin_streambuf::int_type
! openvrml_player::plugin_streambuf::underflow()
  {
      boost::mutex::scoped_lock lock(this->mutex_);
--- 116,121 ----
  }
  
! openvrml_xembed::plugin_streambuf::int_type
! openvrml_xembed::plugin_streambuf::underflow()
  {
      boost::mutex::scoped_lock lock(this->mutex_);
***************
*** 140,148 ****
  
  
! openvrml_player::uninitialized_plugin_streambuf_map
! openvrml_player::uninitialized_plugin_streambuf_map_;
  
! const boost::shared_ptr<openvrml_player::plugin_streambuf>
! openvrml_player::uninitialized_plugin_streambuf_map::
  find(const std::string & url) const
  {
--- 140,148 ----
  
  
! openvrml_xembed::uninitialized_plugin_streambuf_map
! openvrml_xembed::uninitialized_plugin_streambuf_map_;
  
! const boost::shared_ptr<openvrml_xembed::plugin_streambuf>
! openvrml_xembed::uninitialized_plugin_streambuf_map::
  find(const std::string & url) const
  {
***************
*** 155,159 ****
  
  void
! openvrml_player::uninitialized_plugin_streambuf_map::
  insert(const std::string & url,
         const boost::shared_ptr<plugin_streambuf> & streambuf)
--- 155,159 ----
  
  void
! openvrml_xembed::uninitialized_plugin_streambuf_map::
  insert(const std::string & url,
         const boost::shared_ptr<plugin_streambuf> & streambuf)
***************
*** 173,177 ****
   */
  bool
! openvrml_player::uninitialized_plugin_streambuf_map::
  erase(const std::string & url)
  {
--- 173,177 ----
   */
  bool
! openvrml_xembed::uninitialized_plugin_streambuf_map::
  erase(const std::string & url)
  {
***************
*** 183,187 ****
  }
  
! size_t openvrml_player::uninitialized_plugin_streambuf_map::size() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
--- 183,187 ----
  }
  
! size_t openvrml_xembed::uninitialized_plugin_streambuf_map::size() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
***************
*** 189,193 ****
  }
  
! bool openvrml_player::uninitialized_plugin_streambuf_map::empty() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
--- 189,193 ----
  }
  
! bool openvrml_xembed::uninitialized_plugin_streambuf_map::empty() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
***************
*** 195,200 ****
  }
  
! const boost::shared_ptr<openvrml_player::plugin_streambuf>
! openvrml_player::uninitialized_plugin_streambuf_map::front() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
--- 195,200 ----
  }
  
! const boost::shared_ptr<openvrml_xembed::plugin_streambuf>
! openvrml_xembed::uninitialized_plugin_streambuf_map::front() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
***************
*** 204,206 ****
  
  
! openvrml_player::plugin_streambuf_map_t openvrml_player::plugin_streambuf_map;
--- 204,206 ----
  
  
! openvrml_xembed::plugin_streambuf_map_t openvrml_xembed::plugin_streambuf_map;

Index: bounded_buffer.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/bounded_buffer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** bounded_buffer.h	6 Feb 2007 08:24:46 -0000	1.4
--- bounded_buffer.h	12 Feb 2007 02:19:30 -0000	1.5
***************
*** 19,24 ****
  //
  
! # ifndef OPENVRML_PLAYER_BOUNDED_BUFFER_H
! #   define OPENVRML_PLAYER_BOUNDED_BUFFER_H
  
  #   include <string>
--- 19,24 ----
  //
  
! # ifndef OPENVRML_XEMBED_BOUNDED_BUFFER_H
! #   define OPENVRML_XEMBED_BOUNDED_BUFFER_H
  
  #   include <string>
***************
*** 26,30 ****
  #   include <boost/thread/condition.hpp>
  
! namespace openvrml_player {
  
      template <typename CharT, size_t BufferSize>
--- 26,30 ----
  #   include <boost/thread/condition.hpp>
  
! namespace openvrml_xembed {
  
      template <typename CharT, size_t BufferSize>
***************
*** 113,115 ****
  }
  
! # endif // ifndef OPENVRML_PLAYER_BOUNDED_BUFFER_H
--- 113,115 ----
  }
  
! # endif // ifndef OPENVRML_XEMBED_BOUNDED_BUFFER_H

[openvrml-commit] openvrml ChangeLog,1.1451,1.1452

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5628

Modified Files:
	ChangeLog 
Log Message:
openvrml-xembed isn't openvrml-player anymore.  Renamed namespace accordingly.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1451
retrieving revision 1.1452
diff -C2 -d -r1.1451 -r1.1452
*** ChangeLog	11 Feb 2007 07:10:25 -0000	1.1451
--- ChangeLog	12 Feb 2007 02:19:30 -0000	1.1452
***************
*** 1,4 ****
--- 1,17 ----
  2007-02-11 Braden McDaniel  <br...@en...>
  
+ 	openvrml-xembed isn't openvrml-player anymore.  Renamed namespace
+ 	accordingly.
+ 
+ 	* src/openvrml-xembed/bounded_buffer.h
+ 	* src/openvrml-xembed/command_istream.cpp
+ 	* src/openvrml-xembed/command_istream.h
+ 	* src/openvrml-xembed/gtkvrmlbrowser.cpp
+ 	* src/openvrml-xembed/main.cpp
+ 	* src/openvrml-xembed/plugin_streambuf.cpp
+ 	* src/openvrml-xembed/plugin_streambuf.h
+ 
+ 2007-02-11 Braden McDaniel  <br...@en...>
+ 
  	* src/openvrml-xembed/gtkvrmlbrowser.cpp
  	(browser_listener::do_browser_changed(const

[openvrml-commit] openvrml/src/openvrml-xembed bounded_buffer.h, 1.1.2.1, 1.1.2.2 command_istream.cpp, 1.1.2.1, 1.1.2.2 command_istream.h, 1.1.2.1, 1.1.2.2 gtkvrmlbrowser.cpp, 1.1.2.2, 1.1.2.3 main.cpp, 1.1.2.3, 1.1.2.4 plugin_streambuf.cpp, 1.1.2.1, 1.1.2.2 plugin_streambuf.h, 1.1.2.1, 1.1.2.2

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-xembed
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5596/src/openvrml-xembed

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	bounded_buffer.h command_istream.cpp command_istream.h 
	gtkvrmlbrowser.cpp main.cpp plugin_streambuf.cpp 
	plugin_streambuf.h 
Log Message:
openvrml-xembed isn't openvrml-player anymore.  Renamed namespace accordingly.

Index: main.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/main.cpp,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** main.cpp	5 Feb 2007 08:59:50 -0000	1.1.2.3
--- main.cpp	12 Feb 2007 02:19:13 -0000	1.1.2.4
***************
*** 38,42 ****
  # include "plugin_streambuf.h"
  
! using namespace openvrml_player;
  using namespace boost::multi_index::detail; // for scope_guard
  
--- 38,42 ----
  # include "plugin_streambuf.h"
  
! using namespace openvrml_xembed;
  using namespace boost::multi_index::detail; // for scope_guard
  
***************
*** 54,58 ****
  }
  
! namespace openvrml_player {
  
      struct command_istream_reader {
--- 54,58 ----
  }
  
! namespace openvrml_xembed {
  
      struct command_istream_reader {
***************
*** 311,315 ****
      using boost::thread_group;
  
!     using namespace openvrml_player;
  
      g_thread_init(0);
--- 311,315 ----
      using boost::thread_group;
  
!     using namespace openvrml_xembed;
  
      g_thread_init(0);

Index: gtkvrmlbrowser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/gtkvrmlbrowser.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** gtkvrmlbrowser.cpp	11 Feb 2007 07:10:08 -0000	1.1.2.2
--- gtkvrmlbrowser.cpp	12 Feb 2007 02:19:13 -0000	1.1.2.3
***************
*** 536,540 ****
      browser::do_get_resource(const std::string & uri)
      {
!         using openvrml_player::plugin_streambuf;
  
          class plugin_resource_istream : public openvrml::resource_istream {
--- 536,540 ----
      browser::do_get_resource(const std::string & uri)
      {
!         using openvrml_xembed::plugin_streambuf;
  
          class plugin_resource_istream : public openvrml::resource_istream {
***************
*** 551,555 ****
                  using std::ostringstream;
                  using boost::ref;
!                 using openvrml_player::uninitialized_plugin_streambuf_map_;
  
                  this->rdbuf(this->streambuf_.get());
--- 551,555 ----
                  using std::ostringstream;
                  using boost::ref;
!                 using openvrml_xembed::uninitialized_plugin_streambuf_map_;
  
                  this->rdbuf(this->streambuf_.get());

Index: plugin_streambuf.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/plugin_streambuf.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** plugin_streambuf.h	5 Feb 2007 04:41:53 -0000	1.1.2.1
--- plugin_streambuf.h	12 Feb 2007 02:19:13 -0000	1.1.2.2
***************
*** 19,24 ****
  //
  
! # ifndef OPENVRML_PLAYER_PLUGIN_STREAMBUF_H
! #   define OPENVRML_PLAYER_PLUGIN_STREAMBUF_H
  
  #   include <map>
--- 19,24 ----
  //
  
! # ifndef OPENVRML_XEMBED_PLUGIN_STREAMBUF_H
! #   define OPENVRML_XEMBED_PLUGIN_STREAMBUF_H
  
  #   include <map>
***************
*** 29,33 ****
  #   include "bounded_buffer.h"
  
! namespace openvrml_player {
  
      class command_istream_reader;
--- 29,33 ----
  #   include "bounded_buffer.h"
  
! namespace openvrml_xembed {
  
      class command_istream_reader;
***************
*** 90,92 ****
  }
  
! # endif // ifndef OPENVRML_PLAYER_PLUGIN_STREAMBUF_H
--- 90,92 ----
  }
  
! # endif // ifndef OPENVRML_XEMBED_PLUGIN_STREAMBUF_H

Index: command_istream.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/command_istream.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** command_istream.h	5 Feb 2007 04:41:53 -0000	1.1.2.1
--- command_istream.h	12 Feb 2007 02:19:13 -0000	1.1.2.2
***************
*** 19,24 ****
  //
  
! # ifndef OPENVRML_PLAYER_COMMAND_ISTREAM_H
! #   define OPENVRML_PLAYER_COMMAND_ISTREAM_H
  
  #   include <streambuf>
--- 19,24 ----
  //
  
! # ifndef OPENVRML_XEMBED_COMMAND_ISTREAM_H
! #   define OPENVRML_XEMBED_COMMAND_ISTREAM_H
  
  #   include <streambuf>
***************
*** 31,35 ****
                                             gpointer data);
  
! namespace openvrml_player {
  
      class command_streambuf : boost::noncopyable, public std::streambuf {
--- 31,35 ----
                                             gpointer data);
  
! namespace openvrml_xembed {
  
      class command_streambuf : boost::noncopyable, public std::streambuf {
***************
*** 57,59 ****
  }
  
! # endif // ifndef OPENVRML_PLAYER_COMMAND_ISTREAM_H
--- 57,59 ----
  }
  
! # endif // ifndef OPENVRML_XEMBED_COMMAND_ISTREAM_H

Index: command_istream.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/command_istream.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** command_istream.cpp	5 Feb 2007 04:41:53 -0000	1.1.2.1
--- command_istream.cpp	12 Feb 2007 02:19:13 -0000	1.1.2.2
***************
*** 23,27 ****
  # include "command_istream.h"
  
! openvrml_player::command_streambuf::command_streambuf():
      c_('\0')
  {
--- 23,27 ----
  # include "command_istream.h"
  
! openvrml_xembed::command_streambuf::command_streambuf():
      c_('\0')
  {
***************
*** 29,34 ****
  }
  
! openvrml_player::command_streambuf::int_type
! openvrml_player::command_streambuf::underflow()
  {
      const int_type i = this->source_buffer_.get();
--- 29,34 ----
  }
  
! openvrml_xembed::command_streambuf::int_type
! openvrml_xembed::command_streambuf::underflow()
  {
      const int_type i = this->source_buffer_.get();
***************
*** 42,46 ****
  
  
! openvrml_player::command_istream::command_istream():
      std::istream(&this->buf_)
  {}
--- 42,46 ----
  
  
! openvrml_xembed::command_istream::command_istream():
      std::istream(&this->buf_)
  {}
***************
*** 50,54 ****
                                  gpointer data)
  {
!     using namespace openvrml_player;
  
      typedef command_istream::traits_type traits_type;
--- 50,54 ----
                                  gpointer data)
  {
!     using namespace openvrml_xembed;
  
      typedef command_istream::traits_type traits_type;

Index: plugin_streambuf.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/plugin_streambuf.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** plugin_streambuf.cpp	5 Feb 2007 04:41:53 -0000	1.1.2.1
--- plugin_streambuf.cpp	12 Feb 2007 02:19:13 -0000	1.1.2.2
***************
*** 22,26 ****
  # include "plugin_streambuf.h"
  
! openvrml_player::plugin_streambuf::
  plugin_streambuf(const std::string & requested_url):
      get_url_result_(-1),
--- 22,26 ----
  # include "plugin_streambuf.h"
  
! openvrml_xembed::plugin_streambuf::
  plugin_streambuf(const std::string & requested_url):
      get_url_result_(-1),
***************
*** 41,45 ****
  }
  
! void openvrml_player::plugin_streambuf::set_get_url_result(const int result)
  {
      boost::mutex::scoped_lock lock(this->mutex_);
--- 41,45 ----
  }
  
! void openvrml_xembed::plugin_streambuf::set_get_url_result(const int result)
  {
      boost::mutex::scoped_lock lock(this->mutex_);
***************
*** 49,53 ****
  }
  
! int openvrml_player::plugin_streambuf::get_url_result() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
--- 49,53 ----
  }
  
! int openvrml_xembed::plugin_streambuf::get_url_result() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
***************
*** 58,62 ****
  }
  
! void openvrml_player::plugin_streambuf::init(const size_t stream_id,
                                               const std::string & received_url,
                                               const std::string & type)
--- 58,62 ----
  }
  
! void openvrml_xembed::plugin_streambuf::init(const size_t stream_id,
                                               const std::string & received_url,
                                               const std::string & type)
***************
*** 78,82 ****
  }
  
! void openvrml_player::plugin_streambuf::fail()
  {
      boost::mutex::scoped_lock lock(this->mutex_);
--- 78,82 ----
  }
  
! void openvrml_xembed::plugin_streambuf::fail()
  {
      boost::mutex::scoped_lock lock(this->mutex_);
***************
*** 88,92 ****
  }
  
! const std::string & openvrml_player::plugin_streambuf::url() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
--- 88,92 ----
  }
  
! const std::string & openvrml_xembed::plugin_streambuf::url() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
***************
*** 97,101 ****
  }
  
! const std::string & openvrml_player::plugin_streambuf::type() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
--- 97,101 ----
  }
  
! const std::string & openvrml_xembed::plugin_streambuf::type() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
***************
*** 106,110 ****
  }
  
! bool openvrml_player::plugin_streambuf::data_available() const
  {
      //
--- 106,110 ----
  }
  
! bool openvrml_xembed::plugin_streambuf::data_available() const
  {
      //
***************
*** 116,121 ****
  }
  
! openvrml_player::plugin_streambuf::int_type
! openvrml_player::plugin_streambuf::underflow()
  {
      boost::mutex::scoped_lock lock(this->mutex_);
--- 116,121 ----
  }
  
! openvrml_xembed::plugin_streambuf::int_type
! openvrml_xembed::plugin_streambuf::underflow()
  {
      boost::mutex::scoped_lock lock(this->mutex_);
***************
*** 140,148 ****
  
  
! openvrml_player::uninitialized_plugin_streambuf_map
! openvrml_player::uninitialized_plugin_streambuf_map_;
  
! const boost::shared_ptr<openvrml_player::plugin_streambuf>
! openvrml_player::uninitialized_plugin_streambuf_map::
  find(const std::string & url) const
  {
--- 140,148 ----
  
  
! openvrml_xembed::uninitialized_plugin_streambuf_map
! openvrml_xembed::uninitialized_plugin_streambuf_map_;
  
! const boost::shared_ptr<openvrml_xembed::plugin_streambuf>
! openvrml_xembed::uninitialized_plugin_streambuf_map::
  find(const std::string & url) const
  {
***************
*** 155,159 ****
  
  void
! openvrml_player::uninitialized_plugin_streambuf_map::
  insert(const std::string & url,
         const boost::shared_ptr<plugin_streambuf> & streambuf)
--- 155,159 ----
  
  void
! openvrml_xembed::uninitialized_plugin_streambuf_map::
  insert(const std::string & url,
         const boost::shared_ptr<plugin_streambuf> & streambuf)
***************
*** 173,177 ****
   */
  bool
! openvrml_player::uninitialized_plugin_streambuf_map::
  erase(const std::string & url)
  {
--- 173,177 ----
   */
  bool
! openvrml_xembed::uninitialized_plugin_streambuf_map::
  erase(const std::string & url)
  {
***************
*** 183,187 ****
  }
  
! size_t openvrml_player::uninitialized_plugin_streambuf_map::size() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
--- 183,187 ----
  }
  
! size_t openvrml_xembed::uninitialized_plugin_streambuf_map::size() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
***************
*** 189,193 ****
  }
  
! bool openvrml_player::uninitialized_plugin_streambuf_map::empty() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
--- 189,193 ----
  }
  
! bool openvrml_xembed::uninitialized_plugin_streambuf_map::empty() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
***************
*** 195,200 ****
  }
  
! const boost::shared_ptr<openvrml_player::plugin_streambuf>
! openvrml_player::uninitialized_plugin_streambuf_map::front() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
--- 195,200 ----
  }
  
! const boost::shared_ptr<openvrml_xembed::plugin_streambuf>
! openvrml_xembed::uninitialized_plugin_streambuf_map::front() const
  {
      boost::mutex::scoped_lock lock(this->mutex_);
***************
*** 204,206 ****
  
  
! openvrml_player::plugin_streambuf_map_t openvrml_player::plugin_streambuf_map;
--- 204,206 ----
  
  
! openvrml_xembed::plugin_streambuf_map_t openvrml_xembed::plugin_streambuf_map;

Index: bounded_buffer.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/bounded_buffer.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** bounded_buffer.h	5 Feb 2007 04:41:53 -0000	1.1.2.1
--- bounded_buffer.h	12 Feb 2007 02:19:13 -0000	1.1.2.2
***************
*** 19,24 ****
  //
  
! # ifndef OPENVRML_PLAYER_BOUNDED_BUFFER_H
! #   define OPENVRML_PLAYER_BOUNDED_BUFFER_H
  
  #   include <string>
--- 19,24 ----
  //
  
! # ifndef OPENVRML_XEMBED_BOUNDED_BUFFER_H
! #   define OPENVRML_XEMBED_BOUNDED_BUFFER_H
  
  #   include <string>
***************
*** 26,30 ****
  #   include <boost/thread/condition.hpp>
  
! namespace openvrml_player {
  
      template <typename CharT, size_t BufferSize>
--- 26,30 ----
  #   include <boost/thread/condition.hpp>
  
! namespace openvrml_xembed {
  
      template <typename CharT, size_t BufferSize>
***************
*** 113,115 ****
  }
  
! # endif // ifndef OPENVRML_PLAYER_BOUNDED_BUFFER_H
--- 113,115 ----
  }
  
! # endif // ifndef OPENVRML_XEMBED_BOUNDED_BUFFER_H

[openvrml-commit] openvrml ChangeLog,1.1310.2.126,1.1310.2.127

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5596

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
openvrml-xembed isn't openvrml-player anymore.  Renamed namespace accordingly.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.126
retrieving revision 1.1310.2.127
diff -C2 -d -r1.1310.2.126 -r1.1310.2.127
*** ChangeLog	11 Feb 2007 07:10:07 -0000	1.1310.2.126
--- ChangeLog	12 Feb 2007 02:19:13 -0000	1.1310.2.127
***************
*** 1,4 ****
--- 1,17 ----
  2007-02-11 Braden McDaniel  <br...@en...>
  
+ 	openvrml-xembed isn't openvrml-player anymore.  Renamed namespace
+ 	accordingly.
+ 
+ 	* src/openvrml-xembed/bounded_buffer.h
+ 	* src/openvrml-xembed/command_istream.cpp
+ 	* src/openvrml-xembed/command_istream.h
+ 	* src/openvrml-xembed/gtkvrmlbrowser.cpp
+ 	* src/openvrml-xembed/main.cpp
+ 	* src/openvrml-xembed/plugin_streambuf.cpp
+ 	* src/openvrml-xembed/plugin_streambuf.h
+ 
+ 2007-02-11 Braden McDaniel  <br...@en...>
+ 
  	* src/openvrml-xembed/gtkvrmlbrowser.cpp
  	(browser_listener::do_browser_changed(const

[openvrml-commit] openvrml ChangeLog,1.1450,1.1451

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7079

Modified Files:
	ChangeLog 
Log Message:
Set redrawNeeded to false to ensure that the call to post_redraw triggers a redraw.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1450
retrieving revision 1.1451
diff -C2 -d -r1.1450 -r1.1451
*** ChangeLog	10 Feb 2007 04:31:53 -0000	1.1450
--- ChangeLog	11 Feb 2007 07:10:25 -0000	1.1451
***************
*** 1,2 ****
--- 1,9 ----
+ 2007-02-11 Braden McDaniel  <br...@en...>
+ 
+ 	* src/openvrml-xembed/gtkvrmlbrowser.cpp
+ 	(browser_listener::do_browser_changed(const
+ 	openvrml::browser_event &)): Set redrawNeeded to false to ensure
+ 	that the call to post_redraw triggers a redraw.
+ 
  2007-02-09 Braden McDaniel  <br...@en...>
  

[openvrml-commit] openvrml/src/openvrml-xembed gtkvrmlbrowser.cpp, 1.2, 1.3

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-xembed
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7079/src/openvrml-xembed

Modified Files:
	gtkvrmlbrowser.cpp 
Log Message:
Set redrawNeeded to false to ensure that the call to post_redraw triggers a redraw.

Index: gtkvrmlbrowser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/gtkvrmlbrowser.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gtkvrmlbrowser.cpp	5 Feb 2007 05:36:12 -0000	1.2
--- gtkvrmlbrowser.cpp	11 Feb 2007 07:10:26 -0000	1.3
***************
*** 621,626 ****
              this->viewer_.browser_initialized_ = true;
              gdk_threads_enter();
              this->viewer_.post_redraw();
-             gdk_threads_leave();
          }
      }
--- 621,632 ----
              this->viewer_.browser_initialized_ = true;
              gdk_threads_enter();
+             scope_guard gdk_threads_guard = make_guard(gdk_threads_leave);
+             boost::ignore_unused_variable_warning(gdk_threads_guard);
+             //
+             // Set redrawNeeded to false to ensure that this particular call to
+             // post_redraw results in a redraw.
+             //
+             this->viewer_.redrawNeeded = false;
              this->viewer_.post_redraw();
          }
      }

[openvrml-commit] openvrml/src/openvrml-xembed gtkvrmlbrowser.cpp, 1.1.2.1, 1.1.2.2

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-xembed
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6994/src/openvrml-xembed

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	gtkvrmlbrowser.cpp 
Log Message:
Set redrawNeeded to false to ensure that the call to post_redraw triggers a redraw.

Index: gtkvrmlbrowser.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-xembed/gtkvrmlbrowser.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** gtkvrmlbrowser.cpp	5 Feb 2007 04:41:53 -0000	1.1.2.1
--- gtkvrmlbrowser.cpp	11 Feb 2007 07:10:08 -0000	1.1.2.2
***************
*** 625,630 ****
              this->viewer_.browser_initialized_ = true;
              gdk_threads_enter();
              this->viewer_.post_redraw();
-             gdk_threads_leave();
          }
      }
--- 625,636 ----
              this->viewer_.browser_initialized_ = true;
              gdk_threads_enter();
+             scope_guard gdk_threads_guard = make_guard(gdk_threads_leave);
+             boost::ignore_unused_variable_warning(gdk_threads_guard);
+             //
+             // Set redrawNeeded to false to ensure that this particular call to
+             // post_redraw results in a redraw.
+             //
+             this->viewer_.redrawNeeded = false;
              this->viewer_.post_redraw();
          }
      }

[openvrml-commit] openvrml ChangeLog,1.1310.2.125,1.1310.2.126

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6994

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Set redrawNeeded to false to ensure that the call to post_redraw triggers a redraw.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.125
retrieving revision 1.1310.2.126
diff -C2 -d -r1.1310.2.125 -r1.1310.2.126
*** ChangeLog	10 Feb 2007 04:31:44 -0000	1.1310.2.125
--- ChangeLog	11 Feb 2007 07:10:07 -0000	1.1310.2.126
***************
*** 1,2 ****
--- 1,9 ----
+ 2007-02-11 Braden McDaniel  <br...@en...>
+ 
+ 	* src/openvrml-xembed/gtkvrmlbrowser.cpp
+ 	(browser_listener::do_browser_changed(const
+ 	openvrml::browser_event &)): Set redrawNeeded to false to ensure
+ 	that the call to post_redraw triggers a redraw.
+ 
  2007-02-09 Braden McDaniel  <br...@en...>
  

[openvrml-commit] openvrml/src/openvrml-player player.cpp, 1.13, 1.14

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-player
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6785/src/openvrml-player

Modified Files:
	player.cpp 
Log Message:
Set the location entry text once a file has been selected.

Index: player.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** player.cpp	10 Feb 2007 04:16:10 -0000	1.13
--- player.cpp	10 Feb 2007 04:31:53 -0000	1.14
***************
*** 51,54 ****
--- 51,57 ----
          OpenvrmlPlayerFileChooserDialog * dialog);
      void openvrml_player_on_locationentry_activated(GtkEntry * entry);
+     void openvrml_player_on_filechooserdialog_response(GtkDialog * dialog,
+                                                        gint arg1,
+                                                        gpointer user_data);
      void openvrml_player_quit();
  
***************
*** 190,193 ****
--- 193,203 ----
                                   GTK_WINDOW(app_window));
  
+     GtkWidget * const location_entry =
+         glade_xml_get_widget(xml, "locationentry");
+     g_signal_connect(file_chooser_dialog,
+                      "response",
+                      G_CALLBACK(openvrml_player_on_filechooserdialog_response),
+                      location_entry);
+ 
      //
      // The OPENVRML_XEMBED environment variable overrides the default
***************
*** 324,329 ****
                         &req_data);
  
!     GtkWidget * const window = glade_xml_get_widget(xml, "window");
!     gtk_widget_show(window);
  
      gtk_main();
--- 334,338 ----
                         &req_data);
  
!     gtk_widget_show(app_window);
  
      gtk_main();
***************
*** 823,826 ****
--- 832,850 ----
  }
  
+ void openvrml_player_on_filechooserdialog_response(GtkDialog * const dialog,
+                                                    const gint arg1,
+                                                    const gpointer user_data)
+ {
+     if (arg1 == GTK_RESPONSE_ACCEPT) {
+         GtkEntry * const location_entry = static_cast<GtkEntry *>(user_data);
+         gchar * uri = 0;
+         uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog));
+         g_return_if_fail(uri);
+         scope_guard uri_guard = make_guard(g_free, uri);
+         boost::ignore_unused_variable_warning(uri_guard);
+         gtk_entry_set_text(location_entry, uri);
+     }
+ }
+ 
  //
  // Start the quit dance.  We just shut down the I/O channels here.  When the

[openvrml-commit] openvrml ChangeLog,1.1449,1.1450

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6785

Modified Files:
	ChangeLog 
Log Message:
Set the location entry text once a file has been selected.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1449
retrieving revision 1.1450
diff -C2 -d -r1.1449 -r1.1450
*** ChangeLog	10 Feb 2007 04:13:52 -0000	1.1449
--- ChangeLog	10 Feb 2007 04:31:53 -0000	1.1450
***************
*** 1,4 ****
--- 1,16 ----
  2007-02-09 Braden McDaniel  <br...@en...>
  
+ 	Set the location entry text once a file has been selected.
+ 
+ 	* src/openvrml-player/player.cpp
+ 	(main(int, char *[])): Connect
+ 	openvrml_player_on_filechooserdialog_response to the file chooser
+ 	dialog's "response" signal.
+ 	(openvrml_player_on_filechooserdialog_response(GtkDialog *, gint,
+ 	gpointer)): Added function; set the location entry text once a
+ 	file has been selected.
+ 
+ 2007-02-09 Braden McDaniel  <br...@en...>
+ 
  	* src/openvrml-player/player.cpp
  	(main(int, char *[])): Use ScopeGuard to manage libcurl clean up.

[openvrml-commit] openvrml ChangeLog,1.1310.2.124,1.1310.2.125

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6760

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Set the location entry text once a file has been selected.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.124
retrieving revision 1.1310.2.125
diff -C2 -d -r1.1310.2.124 -r1.1310.2.125
*** ChangeLog	10 Feb 2007 04:13:39 -0000	1.1310.2.124
--- ChangeLog	10 Feb 2007 04:31:44 -0000	1.1310.2.125
***************
*** 1,4 ****
--- 1,16 ----
  2007-02-09 Braden McDaniel  <br...@en...>
  
+ 	Set the location entry text once a file has been selected.
+ 
+ 	* src/openvrml-player/player.cpp
+ 	(main(int, char *[])): Connect
+ 	openvrml_player_on_filechooserdialog_response to the file chooser
+ 	dialog's "response" signal.
+ 	(openvrml_player_on_filechooserdialog_response(GtkDialog *, gint,
+ 	gpointer)): Added function; set the location entry text once a
+ 	file has been selected.
+ 
+ 2007-02-09 Braden McDaniel  <br...@en...>
+ 
  	* src/openvrml-player/player.cpp
  	(main(int, char *[])): Use ScopeGuard to manage libcurl clean up.

[openvrml-commit] openvrml/src/openvrml-player player.cpp, 1.1.2.12, 1.1.2.13

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-player
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6760/src/openvrml-player

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	player.cpp 
Log Message:
Set the location entry text once a file has been selected.

Index: player.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -C2 -d -r1.1.2.12 -r1.1.2.13
*** player.cpp	10 Feb 2007 04:16:01 -0000	1.1.2.12
--- player.cpp	10 Feb 2007 04:31:44 -0000	1.1.2.13
***************
*** 51,54 ****
--- 51,57 ----
          OpenvrmlPlayerFileChooserDialog * dialog);
      void openvrml_player_on_locationentry_activated(GtkEntry * entry);
+     void openvrml_player_on_filechooserdialog_response(GtkDialog * dialog,
+                                                        gint arg1,
+                                                        gpointer user_data);
      void openvrml_player_quit();
  
***************
*** 190,193 ****
--- 193,203 ----
                                   GTK_WINDOW(app_window));
  
+     GtkWidget * const location_entry =
+         glade_xml_get_widget(xml, "locationentry");
+     g_signal_connect(file_chooser_dialog,
+                      "response",
+                      G_CALLBACK(openvrml_player_on_filechooserdialog_response),
+                      location_entry);
+ 
      //
      // The OPENVRML_XEMBED environment variable overrides the default
***************
*** 324,329 ****
                         &req_data);
  
!     GtkWidget * const window = glade_xml_get_widget(xml, "window");
!     gtk_widget_show(window);
  
      gtk_main();
--- 334,338 ----
                         &req_data);
  
!     gtk_widget_show(app_window);
  
      gtk_main();
***************
*** 823,826 ****
--- 832,850 ----
  }
  
+ void openvrml_player_on_filechooserdialog_response(GtkDialog * const dialog,
+                                                    const gint arg1,
+                                                    const gpointer user_data)
+ {
+     if (arg1 == GTK_RESPONSE_ACCEPT) {
+         GtkEntry * const location_entry = static_cast<GtkEntry *>(user_data);
+         gchar * uri = 0;
+         uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog));
+         g_return_if_fail(uri);
+         scope_guard uri_guard = make_guard(g_free, uri);
+         boost::ignore_unused_variable_warning(uri_guard);
+         gtk_entry_set_text(location_entry, uri);
+     }
+ }
+ 
  //
  // Start the quit dance.  We just shut down the I/O channels here.  When the

[openvrml-commit] openvrml/src/openvrml-player player.cpp, 1.12, 1.13

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-player
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv731/src/openvrml-player

Modified Files:
	player.cpp 
Log Message:
Use ScopeGuard to manage libcurl clean up.

Index: player.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** player.cpp	10 Feb 2007 04:13:52 -0000	1.12
--- player.cpp	10 Feb 2007 04:16:10 -0000	1.13
***************
*** 328,334 ****
  
      gtk_main();
- 
-     curl_multi_cleanup(multi_handle);
-     curl_global_cleanup();
  }
  
--- 328,331 ----

[openvrml-commit] openvrml/src/openvrml-player player.cpp, 1.1.2.11, 1.1.2.12

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-player
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv358/src/openvrml-player

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	player.cpp 
Log Message:
Use ScopeGuard to manage libcurl clean up.

Index: player.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -C2 -d -r1.1.2.11 -r1.1.2.12
*** player.cpp	10 Feb 2007 04:13:39 -0000	1.1.2.11
--- player.cpp	10 Feb 2007 04:16:01 -0000	1.1.2.12
***************
*** 328,334 ****
  
      gtk_main();
- 
-     curl_multi_cleanup(multi_handle);
-     curl_global_cleanup();
  }
  
--- 328,331 ----

[openvrml-commit] openvrml/src/openvrml-player player.cpp, 1.11, 1.12

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-player
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32001/src/openvrml-player

Modified Files:
	player.cpp 
Log Message:
Use ScopeGuard to manage libcurl clean up.

Index: player.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** player.cpp	9 Feb 2007 22:37:56 -0000	1.11
--- player.cpp	10 Feb 2007 04:13:52 -0000	1.12
***************
*** 142,145 ****
--- 142,147 ----
          return EXIT_FAILURE;
      }
+     scope_guard curl_global_guard = make_guard(curl_global_cleanup);
+     boost::ignore_unused_variable_warning(curl_global_guard);
  
      gchar ** remaining_args = 0;
***************
*** 298,301 ****
--- 300,306 ----
      CURLM * const multi_handle = curl_multi_init();
      g_return_val_if_fail(multi_handle, EXIT_FAILURE);
+     scope_guard multi_handle_guard = make_guard(curl_multi_cleanup,
+                                                 multi_handle);
+     boost::ignore_unused_variable_warning(multi_handle_guard);
  
      GSource * const curl_source = curl_source_new(multi_handle);

[openvrml-commit] openvrml ChangeLog,1.1448,1.1449

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32001

Modified Files:
	ChangeLog 
Log Message:
Use ScopeGuard to manage libcurl clean up.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1448
retrieving revision 1.1449
diff -C2 -d -r1.1448 -r1.1449
*** ChangeLog	9 Feb 2007 22:37:56 -0000	1.1448
--- ChangeLog	10 Feb 2007 04:13:52 -0000	1.1449
***************
*** 1,4 ****
--- 1,9 ----
  2007-02-09 Braden McDaniel  <br...@en...>
  
+ 	* src/openvrml-player/player.cpp
+ 	(main(int, char *[])): Use ScopeGuard to manage libcurl clean up.
+ 
+ 2007-02-09 Braden McDaniel  <br...@en...>
+ 
  	* src/openvrml-player/player.cpp: Added comments; applied
  	G_GNUC_INTERNAL to 'extern "C"' functions that libglade doesn't

[openvrml-commit] openvrml ChangeLog,1.1310.2.123,1.1310.2.124

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31970

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Use ScopeGuard to manage libcurl clean up.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.123
retrieving revision 1.1310.2.124
diff -C2 -d -r1.1310.2.123 -r1.1310.2.124
*** ChangeLog	9 Feb 2007 22:37:44 -0000	1.1310.2.123
--- ChangeLog	10 Feb 2007 04:13:39 -0000	1.1310.2.124
***************
*** 1,4 ****
--- 1,9 ----
  2007-02-09 Braden McDaniel  <br...@en...>
  
+ 	* src/openvrml-player/player.cpp
+ 	(main(int, char *[])): Use ScopeGuard to manage libcurl clean up.
+ 
+ 2007-02-09 Braden McDaniel  <br...@en...>
+ 
  	* src/openvrml-player/player.cpp: Added comments; applied
  	G_GNUC_INTERNAL to 'extern "C"' functions that libglade doesn't

[openvrml-commit] openvrml/src/openvrml-player player.cpp, 1.1.2.10, 1.1.2.11

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-player
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31970/src/openvrml-player

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	player.cpp 
Log Message:
Use ScopeGuard to manage libcurl clean up.

Index: player.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -C2 -d -r1.1.2.10 -r1.1.2.11
*** player.cpp	9 Feb 2007 22:37:44 -0000	1.1.2.10
--- player.cpp	10 Feb 2007 04:13:39 -0000	1.1.2.11
***************
*** 142,145 ****
--- 142,147 ----
          return EXIT_FAILURE;
      }
+     scope_guard curl_global_guard = make_guard(curl_global_cleanup);
+     boost::ignore_unused_variable_warning(curl_global_guard);
  
      gchar ** remaining_args = 0;
***************
*** 298,301 ****
--- 300,306 ----
      CURLM * const multi_handle = curl_multi_init();
      g_return_val_if_fail(multi_handle, EXIT_FAILURE);
+     scope_guard multi_handle_guard = make_guard(curl_multi_cleanup,
+                                                 multi_handle);
+     boost::ignore_unused_variable_warning(multi_handle_guard);
  
      GSource * const curl_source = curl_source_new(multi_handle);

[openvrml-commit] openvrml/src/openvrml-player player.cpp, 1.10, 1.11

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-player
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24227/src/openvrml-player

Modified Files:
	player.cpp 
Log Message:
Added comments; applied G_GNUC_INTERNAL to 'extern "C"' functions that libglade doesn't need to be visible.

Index: player.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** player.cpp	9 Feb 2007 08:24:41 -0000	1.10
--- player.cpp	9 Feb 2007 22:37:56 -0000	1.11
***************
*** 43,64 ****
  
  extern "C" {
      gboolean openvrml_player_request_data_available(GIOChannel * source,
                                                      GIOCondition condition,
                                                      gpointer data);
!     gboolean openvrml_player_curl_prepare(GSource * source, gint * timeout);
!     gboolean openvrml_player_curl_check(GSource * source);
      gboolean openvrml_player_curl_dispatch(GSource * source,
                                             GSourceFunc callback,
                                             gpointer user_data);
!     void openvrml_player_curl_finalize(GSource * source);
      gboolean openvrml_player_curl_source_callback(gpointer data);
!     size_t openvrml_player_curl_write(void * ptr, size_t size, size_t nmemb,
!                                       void * stream);
!     void openvrml_player_on_about_activated(GtkWindow * window);
!     void openvrml_player_on_file_open_activated(
!         OpenvrmlPlayerFileChooserDialog * dialog);
!     void openvrml_player_on_locationentry_activated(GtkEntry * entry);
!     void openvrml_player_quit();
! 
      G_GNUC_INTERNAL void openvrml_player_watch_child(GPid pid,
                                                       gint status,
--- 43,78 ----
  
  extern "C" {
+     //
+     // GTK+ signal handlers; libglade needs them to have external linkage in
+     // order to connect them.
+     //
+     void openvrml_player_on_about_activated(GtkWindow * window);
+     void openvrml_player_on_file_open_activated(
+         OpenvrmlPlayerFileChooserDialog * dialog);
+     void openvrml_player_on_locationentry_activated(GtkEntry * entry);
+     void openvrml_player_quit();
+ 
+     //
+     // The following functions are 'extern "C"' because they get passed as
+     // callbacks to C APIs; however, their symbols don't need to be exposed.
+     //
+     G_GNUC_INTERNAL
      gboolean openvrml_player_request_data_available(GIOChannel * source,
                                                      GIOCondition condition,
                                                      gpointer data);
!     G_GNUC_INTERNAL gboolean openvrml_player_curl_prepare(GSource * source,
!                                                           gint * timeout);
!     G_GNUC_INTERNAL gboolean openvrml_player_curl_check(GSource * source);
!     G_GNUC_INTERNAL
      gboolean openvrml_player_curl_dispatch(GSource * source,
                                             GSourceFunc callback,
                                             gpointer user_data);
!     G_GNUC_INTERNAL void openvrml_player_curl_finalize(GSource * source);
!     G_GNUC_INTERNAL
      gboolean openvrml_player_curl_source_callback(gpointer data);
!     G_GNUC_INTERNAL size_t openvrml_player_curl_write(void * ptr,
!                                                       size_t size,
!                                                       size_t nmemb,
!                                                       void * stream);
      G_GNUC_INTERNAL void openvrml_player_watch_child(GPid pid,
                                                       gint status,
***************
*** 562,566 ****
              --curl_source->outstanding_handles;
              std::ostringstream command;
!             command << "destroy-stream " << ptrdiff_t(msg->easy_handle) << '\n';
              const ssize_t bytes_written = ::write_command(command.str());
              g_return_val_if_fail(
--- 576,581 ----
              --curl_source->outstanding_handles;
              std::ostringstream command;
!             command << "destroy-stream " << ptrdiff_t(msg->easy_handle)
!                     << '\n';
              const ssize_t bytes_written = ::write_command(command.str());
              g_return_val_if_fail(
***************
*** 575,579 ****
              CURL * const easy_handle = msg->easy_handle;
              const CURLMcode multi_remove_result =
!                 curl_multi_remove_handle(curl_source->multi_handle, easy_handle);
              if (multi_remove_result != CURLM_OK) {
                  g_critical("%s", curl_multi_strerror(multi_remove_result));
--- 590,595 ----
              CURL * const easy_handle = msg->easy_handle;
              const CURLMcode multi_remove_result =
!                 curl_multi_remove_handle(curl_source->multi_handle,
!                                          easy_handle);
              if (multi_remove_result != CURLM_OK) {
                  g_critical("%s", curl_multi_strerror(multi_remove_result));
***************
*** 631,635 ****
                                     curl_stream_data(handle, url.c_str())))
                  .first;
!             g_assert(pos != req_data.source_callback_data->stream_data_map.end());
              curl_stream_data & stream_data = pos->second;
              CURLcode setopt_result;
--- 647,652 ----
                                     curl_stream_data(handle, url.c_str())))
                  .first;
!             g_assert(
!                 pos != req_data.source_callback_data->stream_data_map.end());
              curl_stream_data & stream_data = pos->second;
              CURLcode setopt_result;
***************
*** 675,680 ****
                  CURLMcode perform_result;
                  do {
!                     perform_result = curl_multi_perform(curl_source->multi_handle,
!                                                         &running_handles);
                  } while (perform_result == CURLM_CALL_MULTI_PERFORM);
              }
--- 692,698 ----
                  CURLMcode perform_result;
                  do {
!                     perform_result =
!                         curl_multi_perform(curl_source->multi_handle,
!                                            &running_handles);
                  } while (perform_result == CURLM_CALL_MULTI_PERFORM);
              }
***************
*** 754,770 ****
      const gchar copyright[] = "Copyright 2006";
      const gchar license[] =
!         "This program is free software; you can redistribute it and/or modify it under "
!         "the terms of the GNU General Public License as published by the Free Software "
!         "Foundation; either version 2 of the License, or (at your option) any later "
!         "version.\n\n"
  
!         "This program is distributed in the hope that it will be useful, but WITHOUT "
!         "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
!         "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
!         "details.\n\n"
  
!         "You should have received a copy of the GNU General Public License along with "
!         "this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
!         "Place, Suite 330, Boston, MA 02111-1307 USA";
  
      gtk_show_about_dialog(parent,
--- 772,789 ----
      const gchar copyright[] = "Copyright 2006";
      const gchar license[] =
!         "This program is free software; you can redistribute it and/or modify "
!         "it under the terms of the GNU General Public License as published by "
!         "the Free Software Foundation; either version 2 of the License, or "
!         "(at your option) any later version.\n\n"
  
!         "This program is distributed in the hope that it will be useful, but "
!         "WITHOUT ANY WARRANTY; without even the implied warranty of "
!         "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU "
!         "General Public License for more details.\n\n"
  
!         "You should have received a copy of the GNU General Public License "
!         "along with this program; if not, write to the Free Software "
!         "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 "
!         "USA";
  
      gtk_show_about_dialog(parent,
***************
*** 802,805 ****
--- 821,830 ----
  }
  
+ //
+ // Start the quit dance.  We just shut down the I/O channels here.  When the
+ // child process gets EOF on the request_channel, it will shut down.  The
+ // openvrml-player process (us) ultimately shuts down in the watch_child
+ // callback.
+ //
  void openvrml_player_quit()
  {
***************
*** 829,832 ****
--- 854,860 ----
  }
  
+ //
+ // Once the child process has terminated, it's time for us to go.
+ //
  void openvrml_player_watch_child(const GPid pid,
                                   gint /* status */,

[openvrml-commit] openvrml ChangeLog,1.1447,1.1448

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

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24227

Modified Files:
	ChangeLog 
Log Message:
Added comments; applied G_GNUC_INTERNAL to 'extern "C"' functions that libglade doesn't need to be visible.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1447
retrieving revision 1.1448
diff -C2 -d -r1.1447 -r1.1448
*** ChangeLog	9 Feb 2007 08:24:41 -0000	1.1447
--- ChangeLog	9 Feb 2007 22:37:56 -0000	1.1448
***************
*** 1,4 ****
--- 1,10 ----
  2007-02-09 Braden McDaniel  <br...@en...>
  
+ 	* src/openvrml-player/player.cpp: Added comments; applied
+ 	G_GNUC_INTERNAL to 'extern "C"' functions that libglade doesn't
+ 	need to be visible.
+ 
+ 2007-02-09 Braden McDaniel  <br...@en...>
+ 
  	Use Glade XML to manage the OpenvrmlPlayerFileChooserDialog.
  

[openvrml-commit] openvrml/src/openvrml-player player.cpp, 1.1.2.9, 1.1.2.10

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

Update of /cvsroot/openvrml/openvrml/src/openvrml-player
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24191/src/openvrml-player

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	player.cpp 
Log Message:
Added comments; applied G_GNUC_INTERNAL to 'extern "C"' functions that libglade doesn't need to be visible.

Index: player.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -d -r1.1.2.9 -r1.1.2.10
*** player.cpp	9 Feb 2007 08:24:31 -0000	1.1.2.9
--- player.cpp	9 Feb 2007 22:37:44 -0000	1.1.2.10
***************
*** 43,64 ****
  
  extern "C" {
      gboolean openvrml_player_request_data_available(GIOChannel * source,
                                                      GIOCondition condition,
                                                      gpointer data);
!     gboolean openvrml_player_curl_prepare(GSource * source, gint * timeout);
!     gboolean openvrml_player_curl_check(GSource * source);
      gboolean openvrml_player_curl_dispatch(GSource * source,
                                             GSourceFunc callback,
                                             gpointer user_data);
!     void openvrml_player_curl_finalize(GSource * source);
      gboolean openvrml_player_curl_source_callback(gpointer data);
!     size_t openvrml_player_curl_write(void * ptr, size_t size, size_t nmemb,
!                                       void * stream);
!     void openvrml_player_on_about_activated(GtkWindow * window);
!     void openvrml_player_on_file_open_activated(
!         OpenvrmlPlayerFileChooserDialog * dialog);
!     void openvrml_player_on_locationentry_activated(GtkEntry * entry);
!     void openvrml_player_quit();
! 
      G_GNUC_INTERNAL void openvrml_player_watch_child(GPid pid,
                                                       gint status,
--- 43,78 ----
  
  extern "C" {
+     //
+     // GTK+ signal handlers; libglade needs them to have external linkage in
+     // order to connect them.
+     //
+     void openvrml_player_on_about_activated(GtkWindow * window);
+     void openvrml_player_on_file_open_activated(
+         OpenvrmlPlayerFileChooserDialog * dialog);
+     void openvrml_player_on_locationentry_activated(GtkEntry * entry);
+     void openvrml_player_quit();
+ 
+     //
+     // The following functions are 'extern "C"' because they get passed as
+     // callbacks to C APIs; however, their symbols don't need to be exposed.
+     //
+     G_GNUC_INTERNAL
      gboolean openvrml_player_request_data_available(GIOChannel * source,
                                                      GIOCondition condition,
                                                      gpointer data);
!     G_GNUC_INTERNAL gboolean openvrml_player_curl_prepare(GSource * source,
!                                                           gint * timeout);
!     G_GNUC_INTERNAL gboolean openvrml_player_curl_check(GSource * source);
!     G_GNUC_INTERNAL
      gboolean openvrml_player_curl_dispatch(GSource * source,
                                             GSourceFunc callback,
                                             gpointer user_data);
!     G_GNUC_INTERNAL void openvrml_player_curl_finalize(GSource * source);
!     G_GNUC_INTERNAL
      gboolean openvrml_player_curl_source_callback(gpointer data);
!     G_GNUC_INTERNAL size_t openvrml_player_curl_write(void * ptr,
!                                                       size_t size,
!                                                       size_t nmemb,
!                                                       void * stream);
      G_GNUC_INTERNAL void openvrml_player_watch_child(GPid pid,
                                                       gint status,
***************
*** 562,566 ****
              --curl_source->outstanding_handles;
              std::ostringstream command;
!             command << "destroy-stream " << ptrdiff_t(msg->easy_handle) << '\n';
              const ssize_t bytes_written = ::write_command(command.str());
              g_return_val_if_fail(
--- 576,581 ----
              --curl_source->outstanding_handles;
              std::ostringstream command;
!             command << "destroy-stream " << ptrdiff_t(msg->easy_handle)
!                     << '\n';
              const ssize_t bytes_written = ::write_command(command.str());
              g_return_val_if_fail(
***************
*** 575,579 ****
              CURL * const easy_handle = msg->easy_handle;
              const CURLMcode multi_remove_result =
!                 curl_multi_remove_handle(curl_source->multi_handle, easy_handle);
              if (multi_remove_result != CURLM_OK) {
                  g_critical("%s", curl_multi_strerror(multi_remove_result));
--- 590,595 ----
              CURL * const easy_handle = msg->easy_handle;
              const CURLMcode multi_remove_result =
!                 curl_multi_remove_handle(curl_source->multi_handle,
!                                          easy_handle);
              if (multi_remove_result != CURLM_OK) {
                  g_critical("%s", curl_multi_strerror(multi_remove_result));
***************
*** 631,635 ****
                                     curl_stream_data(handle, url.c_str())))
                  .first;
!             g_assert(pos != req_data.source_callback_data->stream_data_map.end());
              curl_stream_data & stream_data = pos->second;
              CURLcode setopt_result;
--- 647,652 ----
                                     curl_stream_data(handle, url.c_str())))
                  .first;
!             g_assert(
!                 pos != req_data.source_callback_data->stream_data_map.end());
              curl_stream_data & stream_data = pos->second;
              CURLcode setopt_result;
***************
*** 675,680 ****
                  CURLMcode perform_result;
                  do {
!                     perform_result = curl_multi_perform(curl_source->multi_handle,
!                                                         &running_handles);
                  } while (perform_result == CURLM_CALL_MULTI_PERFORM);
              }
--- 692,698 ----
                  CURLMcode perform_result;
                  do {
!                     perform_result =
!                         curl_multi_perform(curl_source->multi_handle,
!                                            &running_handles);
                  } while (perform_result == CURLM_CALL_MULTI_PERFORM);
              }
***************
*** 754,770 ****
      const gchar copyright[] = "Copyright 2006";
      const gchar license[] =
!         "This program is free software; you can redistribute it and/or modify it under "
!         "the terms of the GNU General Public License as published by the Free Software "
!         "Foundation; either version 2 of the License, or (at your option) any later "
!         "version.\n\n"
  
!         "This program is distributed in the hope that it will be useful, but WITHOUT "
!         "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
!         "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
!         "details.\n\n"
  
!         "You should have received a copy of the GNU General Public License along with "
!         "this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
!         "Place, Suite 330, Boston, MA 02111-1307 USA";
  
      gtk_show_about_dialog(parent,
--- 772,789 ----
      const gchar copyright[] = "Copyright 2006";
      const gchar license[] =
!         "This program is free software; you can redistribute it and/or modify "
!         "it under the terms of the GNU General Public License as published by "
!         "the Free Software Foundation; either version 2 of the License, or "
!         "(at your option) any later version.\n\n"
  
!         "This program is distributed in the hope that it will be useful, but "
!         "WITHOUT ANY WARRANTY; without even the implied warranty of "
!         "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU "
!         "General Public License for more details.\n\n"
  
!         "You should have received a copy of the GNU General Public License "
!         "along with this program; if not, write to the Free Software "
!         "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 "
!         "USA";
  
      gtk_show_about_dialog(parent,
***************
*** 802,805 ****
--- 821,830 ----
  }
  
+ //
+ // Start the quit dance.  We just shut down the I/O channels here.  When the
+ // child process gets EOF on the request_channel, it will shut down.  The
+ // openvrml-player process (us) ultimately shuts down in the watch_child
+ // callback.
+ //
  void openvrml_player_quit()
  {
***************
*** 829,832 ****
--- 854,860 ----
  }
  
+ //
+ // Once the child process has terminated, it's time for us to go.
+ //
  void openvrml_player_watch_child(const GPid pid,
                                   gint /* status */,