openvrml-commit

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

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

Modified Files:
	command_istream.cpp command_istream.h 
Log Message:
Use a more compact representation for the command_streambuf.

Index: command_istream.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player/command_istream.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** command_istream.h	9 Jan 2006 00:21:09 -0000	1.1
--- command_istream.h	8 Jul 2006 07:00:34 -0000	1.2
***************
*** 38,42 ****
                                                     gpointer data);
  
!         bounded_buffer<int_type, 64> source_buffer_;
          char_type c_;
  
--- 38,42 ----
                                                     gpointer data);
  
!         bounded_buffer<char_type, 64> source_buffer_;
          char_type c_;
  

Index: command_istream.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player/command_istream.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** command_istream.cpp	29 Jan 2006 07:00:59 -0000	1.3
--- command_istream.cpp	8 Jul 2006 07:00:34 -0000	1.4
***************
*** 30,38 ****
  openvrml_player::command_streambuf::underflow()
  {
!     int_type c = this->source_buffer_.get();
      if (c == traits_type::eof()) { return traits_type::eof(); }
!     this->c_ = c;
      this->setg(&this->c_, &this->c_, &this->c_ + 1);
!     return *this->gptr();
  }
  
--- 30,38 ----
  openvrml_player::command_streambuf::underflow()
  {
!     int_type c = traits_type::to_int_type(this->source_buffer_.get());
      if (c == traits_type::eof()) { return traits_type::eof(); }
!     this->c_ = traits_type::to_char_type(c);
      this->setg(&this->c_, &this->c_, &this->c_ + 1);
!     return traits_type::to_int_type(*this->gptr());
  }
  
***************
*** 75,79 ****
          g_assert(bytes_read == 1);
  
!         streambuf.source_buffer_.put(traits_type::to_int_type(c));
  
      } while (g_io_channel_get_buffer_condition(source) & G_IO_IN);
--- 75,79 ----
          g_assert(bytes_read == 1);
  
!         streambuf.source_buffer_.put(c);
  
      } while (g_io_channel_get_buffer_condition(source) & G_IO_IN);