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

some linux compilation fixes

Browse source
This commit is contained in:
Volker Fischer 2009-07-26 07:29:32 +00:00
parent 60482269ed
commit 1c4f06ff5e
4 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
linux/Makefile.am
View file

@ -1,5 +1,10 @@
#SUBDIRS = ../libs/celt/libcelt # First compile additional libraries where the code is in our repository -------
# CELT
SUBDIRS = ../libs/celt/libcelt
LIB_INCL_DIRS = -I../libs/celt/libcelt
# Now we can deal with the actual llcon code -----------------------------------
bin_PROGRAMS = llcon bin_PROGRAMS = llcon
llcon_SOURCES = ../src/buffer.cpp \ llcon_SOURCES = ../src/buffer.cpp \
@ -185,4 +190,4 @@ moc/resources.cpp: ../src/resources.qrc
$(QT_RCC) ../src/resources.qrc -o moc/resources.cpp $(QT_RCC) ../src/resources.qrc -o moc/resources.cpp
llcon_CXXFLAGS=-I../src $(QT_CFLAGS) -DQT_THREAD_SUPPORT -D_REENTRANT -g llcon_CXXFLAGS=-I../src $(LIB_INCL_DIRS) $(QT_CFLAGS) -DQT_THREAD_SUPPORT -D_REENTRANT -g

6
linux/sound.cpp
View file

@ -36,7 +36,7 @@ void CSound::OpenJack()
jack_on_shutdown ( pJackClient, shutdownCallback, this ); jack_on_shutdown ( pJackClient, shutdownCallback, this );
// TEST check sample rate, if not correct, just fire error // TEST check sample rate, if not correct, just fire error
if ( jack_get_sample_rate ( pJackClient ) != SND_CRD_SAMPLE_RATE ) if ( jack_get_sample_rate ( pJackClient ) != SYSTEM_SAMPLE_RATE )
{ {
throw CGenErr ( "Jack server sample rate is different from " throw CGenErr ( "Jack server sample rate is different from "
"required one" ); "required one" );
@ -501,13 +501,13 @@ bool CSound::SetHWParams ( snd_pcm_t* handle, const int iDesiredBufferSize,
// restrict a configuration space to have rate nearest to a target: // restrict a configuration space to have rate nearest to a target:
// set the sample-rate // set the sample-rate
unsigned int rrate = SND_CRD_SAMPLE_RATE; unsigned int rrate = SYSTEM_SAMPLE_RATE;
if ( err = snd_pcm_hw_params_set_rate_near ( handle, hwparams, &rrate, 0 ) < 0 ) if ( err = snd_pcm_hw_params_set_rate_near ( handle, hwparams, &rrate, 0 ) < 0 )
{ {
qDebug ( "Rate %iHz not available : %s", rrate, snd_strerror ( err ) ); qDebug ( "Rate %iHz not available : %s", rrate, snd_strerror ( err ) );
return true; return true;
} }
if ( rrate != SND_CRD_SAMPLE_RATE ) // check if rate is possible if ( rrate != SYSTEM_SAMPLE_RATE ) // check if rate is possible
{ {
qDebug ( "Rate doesn't match (requested %iHz, get %iHz)", rrate, err ); qDebug ( "Rate doesn't match (requested %iHz, get %iHz)", rrate, err );
return true; return true;

4
src/channel.cpp
View file

@ -983,6 +983,10 @@ EGetDataStat CChannel::GetData ( CVector<uint8_t>& vecbyData )
// time out counter is based on samples not on blocks (definition: // time out counter is based on samples not on blocks (definition:
// always one atomic block is get by using the GetData() function // always one atomic block is get by using the GetData() function
// where the atomic block size is "SYSTEM_BLOCK_SIZE_SAMPLES") // where the atomic block size is "SYSTEM_BLOCK_SIZE_SAMPLES")
// TODO this code only works with the above assumption -> better
// implementation so that we are not depending on assumptions
iConTimeOut -= SYSTEM_BLOCK_SIZE_SAMPLES; iConTimeOut -= SYSTEM_BLOCK_SIZE_SAMPLES;
if ( iConTimeOut <= 0 ) if ( iConTimeOut <= 0 )

6
src/channel.h
View file

@ -86,7 +86,7 @@ public:
void SetAddress ( const CHostAddress NAddr ) { InetAddr = NAddr; } void SetAddress ( const CHostAddress NAddr ) { InetAddr = NAddr; }
bool GetAddress ( CHostAddress& RetAddr ); bool GetAddress ( CHostAddress& RetAddr );
CHostAddress GetAddress() { return InetAddr; } CHostAddress GetAddress() const { return InetAddr; }
void SetName ( const QString sNNa ); void SetName ( const QString sNNa );
QString GetName(); QString GetName();
@ -101,7 +101,7 @@ public:
{ Protocol.CreateChanGainMes ( iId, dGain ); } { Protocol.CreateChanGainMes ( iId, dGain ); }
bool SetSockBufSize ( const int iNumBlocks ); bool SetSockBufSize ( const int iNumBlocks );
int GetSockBufSize() { return iCurSockBufSize; } int GetSockBufSize() const { return iCurSockBufSize; }
int GetAudioBlockSizeIn() { return NetwBufferInProps.iAudioBlockSize; } int GetAudioBlockSizeIn() { return NetwBufferInProps.iAudioBlockSize; }
int GetUploadRateKbps(); int GetUploadRateKbps();
@ -109,7 +109,7 @@ public:
double GetTimingStdDev() { return CycleTimeVariance.GetStdDev(); } double GetTimingStdDev() { return CycleTimeVariance.GetStdDev(); }
void SetNetwBufSizeFactOut ( const int iNewNetwBlSiFactOut ); void SetNetwBufSizeFactOut ( const int iNewNetwBlSiFactOut );
int GetNetwBufSizeFactOut() { return iCurNetwOutBlSiFact; } int GetNetwBufSizeFactOut() const { return iCurNetwOutBlSiFact; }
// network protocol interface // network protocol interface
void CreateJitBufMes ( const int iJitBufSize ) void CreateJitBufMes ( const int iJitBufSize )