support for testbench under Linux, added some lines in change log

This commit is contained in:
Volker Fischer 2009-05-09 17:38:25 +00:00
parent fad28f4322
commit e7e158d630
5 changed files with 38 additions and 7 deletions

View file

@ -1,3 +1,14 @@
2.2.2
- Mute and Solo check boxes for each connected client fader
- changes to the main GUI (grouped "local" and "server" settings)
- LED status lights and LED input level meter
- better behaviour on disconnection (introduced disconnection protocol message)
2.2.1 2.2.1
- bug fix and improvements for automatic jitter buffer size setting - bug fix and improvements for automatic jitter buffer size setting

View file

@ -35,6 +35,7 @@ llcon_SOURCES = ../src/buffer.cpp \
../src/multicolorled.h \ ../src/multicolorled.h \
../src/multicolorledbar.h \ ../src/multicolorledbar.h \
../src/audiomixerboard.h \ ../src/audiomixerboard.h \
../src/testbench.h \
../src/soundbase.h \ ../src/soundbase.h \
../src/llconserverdlg.h \ ../src/llconserverdlg.h \
../src/chatdlg.h \ ../src/chatdlg.h \
@ -92,6 +93,7 @@ BUILT_SOURCES=moc/moc_server.cpp \
moc/moc_multicolorledbar.cpp \ moc/moc_multicolorledbar.cpp \
moc/moc_audiomixerboard.cpp \ moc/moc_audiomixerboard.cpp \
moc/moc_util.cpp \ moc/moc_util.cpp \
moc/moc_testbench.cpp \
moc/moc_llconclientdlg.cpp \ moc/moc_llconclientdlg.cpp \
moc/llconclientdlgbase.h \ moc/llconclientdlgbase.h \
moc/moc_clientsettingsdlg.cpp \ moc/moc_clientsettingsdlg.cpp \
@ -141,6 +143,9 @@ moc/moc_protocol.cpp: ../src/protocol.h
moc/moc_channel.cpp: ../src/channel.h moc/moc_channel.cpp: ../src/channel.h
$(QT_MOC) ../src/channel.h -o moc/moc_channel.cpp $(QT_MOC) ../src/channel.h -o moc/moc_channel.cpp
moc/moc_testbench.cpp: ../src/testbench.h
$(QT_MOC) ../src/testbench.h -o moc/moc_testbench.cpp
moc/moc_llconclientdlg.cpp: ../src/llconclientdlg.h moc/moc_llconclientdlg.cpp: ../src/llconclientdlg.h
$(QT_MOC) ../src/llconclientdlg.h -o moc/moc_llconclientdlg.cpp $(QT_MOC) ../src/llconclientdlg.h -o moc/moc_llconclientdlg.cpp

View file

@ -238,7 +238,11 @@ void CClient::Stop()
// stop audio interface // stop audio interface
Sound.Stop(); Sound.Stop();
// send disconnect message to server // send disconnect message to server (since we disable our protocol
// receive mechanism with the next command, we do not evaluate any
// respond from the server, therefore we just hope that the message
// gets its way to the server, if not, the old behaviour time-out
// disconnects the connection anyway)
Channel.CreateDisconnectionMes(); Channel.CreateDisconnectionMes();
// disable channel // disable channel

View file

@ -31,12 +31,11 @@
#include "settings.h" #include "settings.h"
/*
// TEST -> activate the following two lines to activate the test bench, // TEST -> activate the following two lines to activate the test bench,
// currently only supported for Windows #if 0
#include "testbench.h" # include "testbench.h"
CTestbench Testbench; CTestbench Testbench;
*/ #endif
// Implementation ************************************************************** // Implementation **************************************************************

View file

@ -31,6 +31,7 @@
#include <qhostaddress.h> #include <qhostaddress.h>
#include "global.h" #include "global.h"
#include "socket.h" #include "socket.h"
#include "protocol.h"
#include "util.h" #include "util.h"
@ -49,13 +50,24 @@ public:
} }
protected: protected:
int GenRandomIntInRange ( const int iStart, const int iEnd ) const
{
return static_cast<int> ( iStart +
( ( static_cast<double> ( iEnd - iStart) * rand() ) / RAND_MAX ) );
}
QTimer Timer; QTimer Timer;
CSocket Socket; CSocket Socket;
CProtocol Protocol;
public slots: public slots:
void OnTimer() void OnTimer()
{ {
// TEST check if random number generator works as expected
static FILE* pFile = fopen ( "test.txt", "w" );
fprintf ( pFile, "%d\n", GenRandomIntInRange ( 2, 5 ) );
fflush ( pFile );
} }
}; };