[Alpp-cvs] openalpp/include/openalpp netupdater.h,1.1,1.2 netstream.h,1.4,1.5

[<tom...@us...>]

Update of /cvsroot/alpp/openalpp/include/openalpp
In directory sc8-pr-cvs1:/tmp/cvs-serv4788

Modified Files:
	netupdater.h netstream.h 
Log Message:
Changed so that buffer size is given in samples instead of bytes. Also, the size given is now _buffer_ size not _packet_ size...

Index: netupdater.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/netupdater.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** netupdater.h	18 Oct 2002 07:50:11 -0000	1.1
--- netupdater.h	7 Mar 2003 20:37:20 -0000	1.2
***************
*** 47,53 ****
  
    /**
!    * Size of sound packets (in bytes).
     */
!   unsigned int packetsize_;
   public:
    /**
--- 47,53 ----
  
    /**
!    * Size of sound buffer (in bytes).
     */
!   unsigned int buffersize_;
   public:
    /**
***************
*** 60,69 ****
     * @param format is the (OpenAL) format of the sound data.
     * @param frequency is the frequency of the sound data.
!    * @param packetsize is the size of the sound packets.
     */
    NetUpdater(ost::UDPSocket *socket,ost::TCPStream *controlsocket,
  	     const ALuint buffer1,ALuint buffer2,
  	     ALenum format,unsigned int frequency,
! 	     unsigned int packetsize);
  
    /**
--- 60,69 ----
     * @param format is the (OpenAL) format of the sound data.
     * @param frequency is the frequency of the sound data.
!    * @param buffersize is how much data to buffer before adding to the stream.
     */
    NetUpdater(ost::UDPSocket *socket,ost::TCPStream *controlsocket,
  	     const ALuint buffer1,ALuint buffer2,
  	     ALenum format,unsigned int frequency,
! 	     unsigned int buffersize);
  
    /**

Index: netstream.h
===================================================================
RCS file: /cvsroot/alpp/openalpp/include/openalpp/netstream.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** netstream.h	21 Feb 2003 14:37:10 -0000	1.4
--- netstream.h	7 Mar 2003 20:37:21 -0000	1.5
***************
*** 47,54 ****
     * @param controlsocket is an (optional) TCPStream that can be used to send
     * information about the stream. The constructor will begin with trying to
!    * read SampleFormat, frequency, and packetsize. The sender can also use the
     * control socket to send "EXIT" when it's run out of data to send. If
     * this parameter is not given, defaults will be used (format=Mono8,
!    * frequency=11025, packetsize=1024).
     */
    NetStream(ost::UDPSocket *socket,ost::TCPStream *controlsocket=NULL);
--- 47,54 ----
     * @param controlsocket is an (optional) TCPStream that can be used to send
     * information about the stream. The constructor will begin with trying to
!    * read SampleFormat, frequency, and buffer size. The sender can also use the
     * control socket to send "EXIT" when it's run out of data to send. If
     * this parameter is not given, defaults will be used (format=Mono8,
!    * frequency=11025, buffersize=4096).
     */
    NetStream(ost::UDPSocket *socket,ost::TCPStream *controlsocket=NULL);
***************
*** 59,66 ****
     * @param format is the format the data will be in.
     * @param frequency is the frequency of the sound.
!    * @param packetsize is the size of the packets the sound will be sent in.
     */
    NetStream(ost::UDPSocket *socket,SampleFormat format,unsigned int frequency,
! 	    unsigned int packetsize);
  
    /**
--- 59,68 ----
     * @param format is the format the data will be in.
     * @param frequency is the frequency of the sound.
!    * @param buffersize is the size of the sound buffer. Note that the actual
!    * packets sent over the network can be smaller (or bigger!); this is just
!    * the size of the buffer OpenAL++ will use to receive the data.
     */
    NetStream(ost::UDPSocket *socket,SampleFormat format,unsigned int frequency,
! 	    unsigned int buffersize);
  
    /**