Thread: [openvrml-commit] openvrml/src/openvrml-xembed bounded_buffer.h, 1.4, 1.5 command_istream.cpp, 1.2,

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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