make the project compilable again

This commit is contained in:
Volker Fischer 2009-07-30 18:36:37 +00:00
parent bb7e32872f
commit 9837af237d
6 changed files with 13 additions and 9 deletions

View file

@ -77,7 +77,7 @@ public:
int GetSize() const { return iMemSize; } int GetSize() const { return iMemSize; }
bool CConvBuf::Put ( const CVector<TData>& vecsData ) bool Put ( const CVector<TData>& vecsData )
{ {
const int iVecSize = vecsData.Size(); const int iVecSize = vecsData.Size();
@ -93,7 +93,7 @@ public:
return ( iEnd == iMemSize ); return ( iEnd == iMemSize );
} }
CVector<TData> CConvBuf::Get() CVector<TData> Get()
{ {
iPutPos = 0; iPutPos = 0;
return vecsMemory; return vecsMemory;

View file

@ -140,6 +140,9 @@ void CChannel::SetNetwFrameSizeAndFact ( const int iNewNetwFrameSize,
SYSTEM_SAMPLE_RATE, TIME_MOV_AV_RESPONSE ); SYSTEM_SAMPLE_RATE, TIME_MOV_AV_RESPONSE );
CycleTimeVariance.Reset(); CycleTimeVariance.Reset();
// tell the server that audio coding has changed
CreateNetTranspPropsMessFromCurrentSettings();
} }
bool CChannel::SetSockBufSize ( const int iNumBlocks ) bool CChannel::SetSockBufSize ( const int iNumBlocks )

View file

@ -168,11 +168,6 @@ void CClient::SetSndCrdPreferredMonoBlSizeIndex ( const int iNewIdx )
{ {
Sound.Start(); Sound.Start();
} }
// tell the server that audio coding has changed (it
// is important to call this function AFTER we have applied
// the new setting to the channel!)
Channel.CreateNetTranspPropsMessFromCurrentSettings();
} }
QString CClient::SetSndCrdDev ( const int iNewDev ) QString CClient::SetSndCrdDev ( const int iNewDev )

Binary file not shown.

View file

@ -23,6 +23,7 @@
\******************************************************************************/ \******************************************************************************/
#include "socket.h" #include "socket.h"
#include "server.h"
/* Implementation *************************************************************/ /* Implementation *************************************************************/

View file

@ -34,6 +34,11 @@
#include "channel.h" #include "channel.h"
#include "util.h" #include "util.h"
// The header file server.h requires to include this header file so we get a
// cyclic dependency. To solve this issue, a prototype of the server class is
// defined here.
class CServer; // forward declaration of CServer
/* Definitions ****************************************************************/ /* Definitions ****************************************************************/
// Maximum block size for network input buffer. Consider a maximum sample rate // Maximum block size for network input buffer. Consider a maximum sample rate
@ -49,7 +54,7 @@ class CSocket : public QObject
public: public:
CSocket ( CChannel* pNewChannel, const quint16 iPortNumber ) : CSocket ( CChannel* pNewChannel, const quint16 iPortNumber ) :
pChannel( pNewChannel ), bIsClient ( true ) { Init ( iPortNumber ); } pChannel( pNewChannel ), bIsClient ( true ) { Init ( iPortNumber ); }
CSocket ( QObject* pNServP, const quint16 iPortNumber ) : CSocket ( CServer* pNServP, const quint16 iPortNumber ) :
pServer ( pNServP ), bIsClient ( false ) pServer ( pNServP ), bIsClient ( false )
{ Init ( iPortNumber ); } { Init ( iPortNumber ); }
virtual ~CSocket() {} virtual ~CSocket() {}
@ -66,8 +71,8 @@ protected:
CHostAddress RecHostAddr; CHostAddress RecHostAddr;
CChannel* pChannel; // for client CChannel* pChannel; // for client
CServer* pServer; // for server
QObject* pServer;
bool bIsClient; bool bIsClient;
public slots: public slots: