eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

cleaned up a bit

Browse source
This commit is contained in:
Volker Fischer 2006-10-30 20:38:33 +00:00
parent ab24ff7d00
commit f280ad4b3b
2 changed files with 1 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

101
linux/sound.cpp
View file

@ -126,24 +126,6 @@ bool CSound::Read(CVector<short>& psData)
} }
ret = snd_pcm_readi(rhandle, &psData[0], iBufferSizeIn); ret = snd_pcm_readi(rhandle, &psData[0], iBufferSizeIn);
//snd_pcm_sframes_t test = snd_pcm_avail_update ( rhandle );
//qDebug ( "test: %d", test );
//if ( test == 64 )
// snd_pcm_prepare ( rhandle );
/*
snd_pcm_status( rhandle, status );
snd_pcm_sframes_t test = snd_pcm_status_get_delay(status);
//qDebug ( "test: %d", test );
*/
//static FILE* pFile = fopen("test.dat", "w");
//fprintf(pFile, "%d\n", test);
//fflush(pFile);
if ( ret < 0 ) if ( ret < 0 )
{ {
@ -251,60 +233,6 @@ void CSound::InitPlayback ( int iNewBufferSize, bool bNewBlocking )
// set hardware parameters // set hardware parameters
SetHWParams ( phandle, iBufferSizeOut, iCurPeriodSizeOut ); SetHWParams ( phandle, iBufferSizeOut, iCurPeriodSizeOut );
#if 0
/* sw parameters --------------------------------------------------------- */
snd_pcm_sw_params_t* swparams;
// TEST
// allocate an invalid snd_pcm_sw_params_t using standard malloc
if ( err = snd_pcm_sw_params_malloc ( &swparams ) != 0 )
{
qDebug ( "snd_pcm_sw_params_malloc: %s", snd_strerror ( err ) );
}
/* get the current swparams */
err = snd_pcm_sw_params_current(phandle, swparams);
if (err < 0)
{
qDebug("Unable to determine current swparams for playback: %s\n", snd_strerror(err));
}
/* start the transfer when the buffer is almost full: */
/* (buffer_size / avail_min) * avail_min */
err = snd_pcm_sw_params_set_start_threshold(phandle, swparams, iCurPeriodSizeOut - 1);
if (err < 0) {
qDebug("Unable to set start threshold mode for playback: %s\n", snd_strerror(err));
}
/* allow the transfer when at least period_size samples can be processed */
err = snd_pcm_sw_params_set_avail_min(phandle, swparams, iBufferSizeOut);
if (err < 0) {
qDebug("Unable to set avail min for playback: %s\n", snd_strerror(err));
}
/* align all transfers to 1 sample */
err = snd_pcm_sw_params_set_xfer_align(phandle, swparams, 1);
if (err < 0) {
qDebug("Unable to set transfer align for playback: %s\n", snd_strerror(err));
}
/* write the parameters to the playback device */
err = snd_pcm_sw_params(phandle, swparams);
if (err < 0) {
qDebug("Unable to set sw params for playback: %s\n", snd_strerror(err));
}
// clean-up
snd_pcm_sw_params_free ( swparams );
#endif
// start playback // start playback
snd_pcm_start ( phandle ); snd_pcm_start ( phandle );
@ -329,35 +257,6 @@ bool CSound::Write ( CVector<short>& psData )
while ( size ) while ( size )
{ {
ret = snd_pcm_writei ( phandle, &psData[start], size ); ret = snd_pcm_writei ( phandle, &psData[start], size );
//snd_pcm_sframes_t test = snd_pcm_avail_update ( phandle );
//qDebug ( "test: %d", test );
//if ( test == 64 )
// snd_pcm_prepare ( rhandle );
/*
snd_pcm_sframes_t delayp;
snd_pcm_delay ( phandle, &delayp ) ;
qDebug ( "test: %d", delayp );
*/
//snd_pcm_status_t* status;
//snd_pcm_status_alloca(&status);
//snd_pcm_status( phandle, status );
//snd_pcm_sframes_t test = snd_pcm_status_get_delay(status);
//qDebug ( "test: %d", test );
//snd_pcm_status( phandle, status );
//snd_pcm_sframes_t test = snd_pcm_status_get_delay(status);
//qDebug ( "test: %d", test );
//static FILE* pFile = fopen("test.dat", "w");
//fprintf(pFile, "%d\n", test);
//fflush(pFile);
if ( ret < 0 ) if ( ret < 0 )
{ {

8
linux/sound.h
View file

@ -87,13 +87,7 @@ protected:
bool bChangParamIn; bool bChangParamIn;
int iCurPeriodSizeIn; int iCurPeriodSizeIn;
bool bChangParamOut; bool bChangParamOut;
int iCurPeriodSizeOut; int iCurPeriodSizeOut;
// TEST
snd_pcm_status_t* status;
#else #else
/* Dummy definitions */ /* Dummy definitions */
void SetInNumBuf(int iNewNum) {} void SetInNumBuf(int iNewNum) {}