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

fix

Browse source
This commit is contained in:
Volker Fischer 2006-03-06 20:09:26 +00:00
parent 8be422898c
commit 864ef33eb0
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/channel.cpp
View file

@ -30,7 +30,7 @@
\******************************************************************************/ \******************************************************************************/
CChannelSet::CChannelSet() CChannelSet::CChannelSet()
{ {
/*
// seems not to work... // 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++ )
@ -39,7 +39,7 @@ 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!!! // make sure we have MAX_NUM_CHANNELS connections!!!
QObject::connect(&vecChannels[0],SIGNAL(MessReadyForSending(CVector<uint8_t>)), QObject::connect(&vecChannels[0],SIGNAL(MessReadyForSending(CVector<uint8_t>)),
this,SLOT(OnSendProtMessCh0(CVector<uint8_t>))); this,SLOT(OnSendProtMessCh0(CVector<uint8_t>)));
@ -61,17 +61,16 @@ QObject::connect(&vecChannels[8],SIGNAL(MessReadyForSending(CVector<uint8_t>)),
this,SLOT(OnSendProtMessCh8(CVector<uint8_t>))); this,SLOT(OnSendProtMessCh8(CVector<uint8_t>)));
QObject::connect(&vecChannels[9],SIGNAL(MessReadyForSending(CVector<uint8_t>)), QObject::connect(&vecChannels[9],SIGNAL(MessReadyForSending(CVector<uint8_t>)),
this,SLOT(OnSendProtMessCh9(CVector<uint8_t>))); this,SLOT(OnSendProtMessCh9(CVector<uint8_t>)));
*/
} }
/*
// seems not to work... // 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()
{ {

6
src/channel.h
View file

@ -172,11 +172,10 @@ protected:
QMutex Mutex; QMutex Mutex;
public slots: public slots:
/*
// seems not to work... // 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!!! // make sure we have MAX_NUM_CHANNELS connections!!!
void OnSendProtMessCh0(CVector<uint8_t> mess) {emit MessReadyForSending(0,mess);} void OnSendProtMessCh0(CVector<uint8_t> mess) {emit MessReadyForSending(0,mess);}
void OnSendProtMessCh1(CVector<uint8_t> mess) {emit MessReadyForSending(1,mess);} void OnSendProtMessCh1(CVector<uint8_t> mess) {emit MessReadyForSending(1,mess);}
@ -188,7 +187,6 @@ void OnSendProtMessCh6(CVector<uint8_t> mess) {emit MessReadyForSending(6,mess);
void OnSendProtMessCh7(CVector<uint8_t> mess) {emit MessReadyForSending(7,mess);} void OnSendProtMessCh7(CVector<uint8_t> mess) {emit MessReadyForSending(7,mess);}
void OnSendProtMessCh8(CVector<uint8_t> mess) {emit MessReadyForSending(8,mess);} void OnSendProtMessCh8(CVector<uint8_t> mess) {emit MessReadyForSending(8,mess);}
void OnSendProtMessCh9(CVector<uint8_t> mess) {emit MessReadyForSending(9,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 );