alpp-cvs

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

Update of /cvsroot/alpp/openalpp/src
In directory sc8-pr-cvs1:/tmp/cvs-serv1170

Modified Files:
	filestream.cpp inputdevice.cpp netstream.cpp 
Log Message:
Changed so that buffer size is given in samples instead of bytes.

Index: filestream.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/filestream.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** filestream.cpp	16 Feb 2003 23:11:21 -0000	1.2
--- filestream.cpp	7 Mar 2003 20:30:03 -0000	1.3
***************
*** 25,28 ****
--- 25,29 ----
  #include "openalpp/filestreamupdater.h"
  #include "openalpp/filestream.h"
+ #include "openalpp/sample.h"
  
  namespace openalpp {
***************
*** 48,52 ****
  				   buffername_,buffer2_->GetName(),
  				   format,ogginfo->rate,
! 				   buffersize); 
    } else {
      fclose(filehandle);
--- 49,53 ----
  				   buffername_,buffer2_->GetName(),
  				   format,ogginfo->rate,
! 				   buffersize*SampleSize(format)); 
    } else {
      fclose(filehandle);

Index: inputdevice.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/inputdevice.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** inputdevice.cpp	21 Feb 2003 14:47:15 -0000	1.7
--- inputdevice.cpp	7 Mar 2003 20:30:07 -0000	1.8
***************
*** 25,28 ****
--- 25,29 ----
  #include "openalpp/deviceupdater.h"
  #include "openalpp/inputdevice.h"
+ #include "openalpp/sample.h"
  #include <portaudio.h>
  
***************
*** 50,54 ****
    Init();
  
!   updater_=new DeviceUpdater(device,samplerate,buffersize,format,buffername_,buffer2_->GetName());
  }
  
--- 51,55 ----
    Init();
  
!   updater_=new DeviceUpdater(device,samplerate,buffersize*SampleFormat(format),format,buffername_,buffer2_->GetName());
  }
  

Index: netstream.cpp
===================================================================
RCS file: /cvsroot/alpp/openalpp/src/netstream.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** netstream.cpp	21 Feb 2003 14:47:15 -0000	1.6
--- netstream.cpp	7 Mar 2003 20:30:08 -0000	1.7
***************
*** 25,28 ****
--- 25,29 ----
  #include "openalpp/netupdater.h"
  #include "openalpp/netstream.h"
+ #include "openalpp/sample.h"
  
  namespace openalpp {
***************
*** 30,47 ****
  NetStream::NetStream(ost::UDPSocket *socket,ost::TCPStream *controlsocket) 
    : Stream() {
!   unsigned int frequency=11025,packetsize=1024;
    ALenum format=AL_FORMAT_MONO8;
    if(controlsocket) {
      *controlsocket >> format;
      *controlsocket >> frequency;
!     *controlsocket >> packetsize;
    }
    updater_=new NetUpdater(socket,controlsocket,
  			  buffername_,buffer2_->GetName(),
! 			  format,frequency,packetsize);
  }
  
  NetStream::NetStream(ost::UDPSocket *socket,SampleFormat format,
! 		     unsigned int frequency,unsigned int packetsize) 
    : Stream() {
    ALenum alformat=0;
--- 31,48 ----
  NetStream::NetStream(ost::UDPSocket *socket,ost::TCPStream *controlsocket) 
    : Stream() {
!   unsigned int frequency=11025,buffersize=2048;
    ALenum format=AL_FORMAT_MONO8;
    if(controlsocket) {
      *controlsocket >> format;
      *controlsocket >> frequency;
!     *controlsocket >> buffersize;
    }
    updater_=new NetUpdater(socket,controlsocket,
  			  buffername_,buffer2_->GetName(),
! 			  format,frequency,buffersize*SampleSize(format));
  }
  
  NetStream::NetStream(ost::UDPSocket *socket,SampleFormat format,
! 		     unsigned int frequency,unsigned int buffersize) 
    : Stream() {
    ALenum alformat=0;
***************
*** 61,65 ****
    }
    updater_=new NetUpdater(socket,NULL,buffername_,buffer2_->GetName(),
! 			  alformat,frequency,packetsize);
  }
  
--- 62,66 ----
    }
    updater_=new NetUpdater(socket,NULL,buffername_,buffer2_->GetName(),
! 			  alformat,frequency,buffersize*SampleSize(format));
  }