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

go back to previous implementation since the new version seems not to work correctly

Browse source
This commit is contained in:
Volker Fischer 2006-03-04 16:27:26 +00:00
parent bcb421e175
commit 0bc32bf296
2 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/channel.cpp
View file

@ -30,6 +30,8 @@
\******************************************************************************/ \******************************************************************************/
CChannelSet::CChannelSet() CChannelSet::CChannelSet()
{ {
/*
// seems not to work...
// connect "message send"-message for each channel // connect "message send"-message for each channel
for ( int i = 0; i < MAX_NUM_CHANNELS; i++ ) for ( int i = 0; i < MAX_NUM_CHANNELS; i++ )
{ {
@ -37,13 +39,38 @@ CChannelSet::CChannelSet()
SIGNAL ( MessReadyForSending ( CVector<uint8_t> ) ), SIGNAL ( MessReadyForSending ( CVector<uint8_t> ) ),
this, SLOT ( OnSendProtMessage ( i, CVector<uint8_t> ) ) ); this, SLOT ( OnSendProtMessage ( i, CVector<uint8_t> ) ) );
} }
*/
// make sure we have MAX_NUM_CHANNELS connections!!!
QObject::connect(&vecChannels[0],SIGNAL(MessReadyForSending(CVector<uint8_t>)),
this,SLOT(OnSendProtMessCh0(CVector<uint8_t>)));
QObject::connect(&vecChannels[1],SIGNAL(MessReadyForSending(CVector<uint8_t>)),
this,SLOT(OnSendProtMessCh1(CVector<uint8_t>)));
QObject::connect(&vecChannels[2],SIGNAL(MessReadyForSending(CVector<uint8_t>)),
this,SLOT(OnSendProtMessCh2(CVector<uint8_t>)));
QObject::connect(&vecChannels[3],SIGNAL(MessReadyForSending(CVector<uint8_t>)),
this,SLOT(OnSendProtMessCh3(CVector<uint8_t>)));
QObject::connect(&vecChannels[4],SIGNAL(MessReadyForSending(CVector<uint8_t>)),
this,SLOT(OnSendProtMessCh4(CVector<uint8_t>)));
QObject::connect(&vecChannels[5],SIGNAL(MessReadyForSending(CVector<uint8_t>)),
this,SLOT(OnSendProtMessCh5(CVector<uint8_t>)));
QObject::connect(&vecChannels[6],SIGNAL(MessReadyForSending(CVector<uint8_t>)),
this,SLOT(OnSendProtMessCh6(CVector<uint8_t>)));
QObject::connect(&vecChannels[7],SIGNAL(MessReadyForSending(CVector<uint8_t>)),
this,SLOT(OnSendProtMessCh7(CVector<uint8_t>)));
QObject::connect(&vecChannels[8],SIGNAL(MessReadyForSending(CVector<uint8_t>)),
this,SLOT(OnSendProtMessCh8(CVector<uint8_t>)));
QObject::connect(&vecChannels[9],SIGNAL(MessReadyForSending(CVector<uint8_t>)),
this,SLOT(OnSendProtMessCh9(CVector<uint8_t>)));
} }
/*
// seems not to work...
void CChannelSet::OnSendProtMessage ( int iChID, CVector<uint8_t> vecMessage ) void CChannelSet::OnSendProtMessage ( int iChID, CVector<uint8_t> vecMessage )
{ {
// just pass message through and add channel ID // just pass message through and add channel ID
emit MessReadyForSending ( iChID,vecMessage ); emit MessReadyForSending ( iChID,vecMessage );
} }
*/
int CChannelSet::GetFreeChan() int CChannelSet::GetFreeChan()
{ {

14
src/channel.h
View file

@ -181,7 +181,21 @@ protected:
QMutex Mutex; QMutex Mutex;
public slots: public slots:
/*
// seems not to work...
void OnSendProtMessage ( int iChID, CVector<uint8_t> vecMessage ); void OnSendProtMessage ( int iChID, CVector<uint8_t> vecMessage );
*/
// make sure we have MAX_NUM_CHANNELS connections!!!
void OnSendProtMessCh0(CVector<uint8_t> mess) {emit MessReadyForSending(0,mess);}
void OnSendProtMessCh1(CVector<uint8_t> mess) {emit MessReadyForSending(1,mess);}
void OnSendProtMessCh2(CVector<uint8_t> mess) {emit MessReadyForSending(2,mess);}
void OnSendProtMessCh3(CVector<uint8_t> mess) {emit MessReadyForSending(3,mess);}
void OnSendProtMessCh4(CVector<uint8_t> mess) {emit MessReadyForSending(4,mess);}
void OnSendProtMessCh5(CVector<uint8_t> mess) {emit MessReadyForSending(5,mess);}
void OnSendProtMessCh6(CVector<uint8_t> mess) {emit MessReadyForSending(6,mess);}
void OnSendProtMessCh7(CVector<uint8_t> mess) {emit MessReadyForSending(7,mess);}
void OnSendProtMessCh8(CVector<uint8_t> mess) {emit MessReadyForSending(8,mess);}
void OnSendProtMessCh9(CVector<uint8_t> mess) {emit MessReadyForSending(9,mess);}
signals: signals:
void MessReadyForSending ( int iChID, CVector<uint8_t> vecMessage ); void MessReadyForSending ( int iChID, CVector<uint8_t> vecMessage );