diff --git a/src/channel.cpp b/src/channel.cpp index 55c9da31..4c372bd0 100755 --- a/src/channel.cpp +++ b/src/channel.cpp @@ -362,6 +362,7 @@ void CChannelSet::GetBlockAllConC ( CVector& vecChanID, } void CChannelSet::GetConCliParam ( CVector& vecHostAddresses, + CVector& vecsName, CVector& veciJitBufSize, CVector& veciNetwOutBlSiFact, CVector& veciNetwInBlSiFact ) @@ -370,6 +371,7 @@ void CChannelSet::GetConCliParam ( CVector& vecHostAddresses, // init return values vecHostAddresses.Init ( MAX_NUM_CHANNELS ); + vecsName.Init ( MAX_NUM_CHANNELS ); veciJitBufSize.Init ( MAX_NUM_CHANNELS ); veciNetwOutBlSiFact.Init ( MAX_NUM_CHANNELS ); veciNetwInBlSiFact.Init ( MAX_NUM_CHANNELS ); @@ -381,9 +383,10 @@ void CChannelSet::GetConCliParam ( CVector& vecHostAddresses, { // get requested data vecHostAddresses[i] = InetAddr; - veciJitBufSize[i] = vecChannels[i].GetSockBufSize (); - veciNetwOutBlSiFact[i] = vecChannels[i].GetNetwBufSizeFactOut (); - veciNetwInBlSiFact[i] = vecChannels[i].GetNetwBufSizeFactIn (); + vecsName[i] = vecChannels[i].GetName(); + veciJitBufSize[i] = vecChannels[i].GetSockBufSize(); + veciNetwOutBlSiFact[i] = vecChannels[i].GetNetwBufSizeFactOut(); + veciNetwInBlSiFact[i] = vecChannels[i].GetNetwBufSizeFactIn(); } } } diff --git a/src/channel.h b/src/channel.h index 165e2b4a..5028c86e 100755 --- a/src/channel.h +++ b/src/channel.h @@ -216,6 +216,7 @@ public: CVector >& vecvecdGains ); void GetConCliParam ( CVector& vecHostAddresses, + CVector& vecsName, CVector& veciJitBufSize, CVector& veciNetwOutBlSiFact, CVector& veciNetwInBlSiFact ); diff --git a/src/llconserverdlg.cpp b/src/llconserverdlg.cpp index af8d9a78..d72e2e92 100755 --- a/src/llconserverdlg.cpp +++ b/src/llconserverdlg.cpp @@ -31,34 +31,37 @@ CLlconServerDlg::CLlconServerDlg ( CServer* pNServP, QWidget* parent, CLlconServerDlgBase ( parent, name, modal, f ) { /* set text for version and application name */ - TextLabelNameVersion-> - setText(QString(APP_NAME) + tr(" server ") + QString(VERSION)); + TextLabelNameVersion->setText ( QString ( APP_NAME ) + + tr ( " server " ) + QString ( VERSION ) ); /* Create bitmaps */ /* Define size of the bitmaps */ const int iXSize = 13; const int iYSize = 13; - BitmCubeGreen.resize(iXSize, iYSize); - BitmCubeGreen.fill(QColor(0, 255, 0)); - BitmCubeRed.resize(iXSize, iYSize); - BitmCubeRed.fill(QColor(255, 0, 0)); - BitmCubeYellow.resize(iXSize, iYSize); - BitmCubeYellow.fill(QColor(255, 255, 0)); + BitmCubeGreen.resize ( iXSize, iYSize ); + BitmCubeGreen.fill ( QColor ( 0, 255, 0 ) ); + BitmCubeRed.resize ( iXSize, iYSize ); + BitmCubeRed.fill ( QColor ( 255, 0, 0 ) ); + BitmCubeYellow.resize ( iXSize, iYSize ); + BitmCubeYellow.fill ( QColor ( 255, 255, 0 ) ); /* set up list view for connected clients (We assume that one column is already there) */ - ListViewClients->setColumnText(0, tr("Client IP : Port")); - ListViewClients->setColumnWidth(0, 170); - ListViewClients->addColumn(tr("Put")); - ListViewClients->setColumnAlignment(1, Qt::AlignCenter); - ListViewClients->addColumn(tr("Get")); - ListViewClients->setColumnAlignment(2, Qt::AlignCenter); - ListViewClients->addColumn(tr("Jitter buffer size")); - ListViewClients->setColumnAlignment(3, Qt::AlignRight); - ListViewClients->addColumn(tr("Block Size In")); - ListViewClients->setColumnAlignment(4, Qt::AlignRight); - ListViewClients->addColumn(tr("Block Size Out")); - ListViewClients->setColumnAlignment(5, Qt::AlignRight); + ListViewClients->setColumnText ( 0, tr ( "Client IP : Port" ) ); + ListViewClients->setColumnWidth ( 0, 170 ); + ListViewClients->addColumn ( tr ( "Name" ) ); + ListViewClients->setColumnAlignment ( 1, Qt::AlignLeft ); + ListViewClients->setColumnWidth ( 1, 150 ); + ListViewClients->addColumn ( tr ( "Put" ) ); + ListViewClients->setColumnAlignment ( 2, Qt::AlignCenter ); + ListViewClients->addColumn ( tr ( "Get" ) ); + ListViewClients->setColumnAlignment ( 3, Qt::AlignCenter ); + ListViewClients->addColumn ( tr ( "Jitter buffer size" ) ); + ListViewClients->setColumnAlignment ( 4, Qt::AlignRight ); + ListViewClients->addColumn ( tr ( "Block Size In" ) ); + ListViewClients->setColumnAlignment ( 5, Qt::AlignRight ); + ListViewClients->addColumn ( tr ( "Block Size Out" ) ); + ListViewClients->setColumnAlignment ( 6, Qt::AlignRight ); ListViewClients->clear(); /* insert items in reverse order because in Windows all of them are @@ -99,6 +102,7 @@ CLlconServerDlg::CLlconServerDlg ( CServer* pNServP, QWidget* parent, void CLlconServerDlg::OnTimer() { CVector vecHostAddresses; + CVector vecsName; CVector veciJitBufSize; CVector veciNetwOutBlSiFact; CVector veciNetwInBlSiFact; @@ -106,30 +110,33 @@ void CLlconServerDlg::OnTimer() ListViewMutex.lock(); - pServer->GetConCliParam ( vecHostAddresses, veciJitBufSize, + pServer->GetConCliParam ( vecHostAddresses, vecsName, veciJitBufSize, veciNetwOutBlSiFact, veciNetwInBlSiFact ); /* fill list with connected clients */ - for (int i = 0; i < MAX_NUM_CHANNELS; i++) + for ( int i = 0; i < MAX_NUM_CHANNELS; i++ ) { - if (!(vecHostAddresses[i].InetAddr == QHostAddress((Q_UINT32) 0))) + if ( ! ( vecHostAddresses[i].InetAddr == QHostAddress ( (Q_UINT32) 0 ) ) ) { - /* main text (IP, port number) */ - vecpListViewItems[i]->setText(0, QString().sprintf("%s : %d", + // IP, port number + vecpListViewItems[i]->setText ( 0, QString().sprintf ( "%s : %d", vecHostAddresses[i].InetAddr.toString().latin1(), - vecHostAddresses[i].iPort) /* IP, port */); + vecHostAddresses[i].iPort ) /* IP, port */); - /* jitter buffer size (polling for updates) */ - vecpListViewItems[i]->setText(3, - QString().setNum(veciJitBufSize[i])); + // name + vecpListViewItems[i]->setText ( 1, vecsName[i].c_str() ); - /* in / out network block sizes */ - vecpListViewItems[i]->setText(4, - QString().setNum( - double(veciNetwInBlSiFact[i] * MIN_BLOCK_DURATION_MS), 'f', 2)); - vecpListViewItems[i]->setText(5, - QString().setNum( - double(veciNetwOutBlSiFact[i] * MIN_BLOCK_DURATION_MS), 'f', 2)); + // jitter buffer size (polling for updates) + vecpListViewItems[i]->setText ( 4, + QString().setNum ( veciJitBufSize[i] ) ); + + // in/out network block sizes + vecpListViewItems[i]->setText ( 5, + QString().setNum ( + double ( veciNetwInBlSiFact[i] * MIN_BLOCK_DURATION_MS), 'f', 2 ) ); + vecpListViewItems[i]->setText(6, + QString().setNum ( + double ( veciNetwOutBlSiFact[i] * MIN_BLOCK_DURATION_MS), 'f', 2 ) ); #ifndef _WIN32 vecpListViewItems[i]->setVisible ( true ); @@ -138,10 +145,11 @@ void CLlconServerDlg::OnTimer() else { #ifdef _WIN32 - /* remove text for Windows version */ - vecpListViewItems[i]->setText(0, ""); - vecpListViewItems[i]->setText(3, ""); - vecpListViewItems[i]->setText(4, ""); + // remove text for Windows version + vecpListViewItems[i]->setText ( 0, "" ); + vecpListViewItems[i]->setText ( 1, "" ); + vecpListViewItems[i]->setText ( 4, "" ); + vecpListViewItems[i]->setText ( 5, "" ); #else vecpListViewItems[i]->setVisible ( false ); #endif @@ -150,36 +158,36 @@ void CLlconServerDlg::OnTimer() ListViewMutex.unlock(); - /* response time (if available) */ + // response time (if available) if ( pServer->GetTimingStdDev ( dCurTiStdDev ) ) { - TextLabelResponseTime->setText(QString(). - setNum(dCurTiStdDev, 'f', 2) + " ms"); + TextLabelResponseTime->setText ( QString(). + setNum ( dCurTiStdDev, 'f', 2 ) + " ms" ); } else { - TextLabelResponseTime->setText("---"); + TextLabelResponseTime->setText ( "---" ); } } -void CLlconServerDlg::customEvent(QCustomEvent* Event) +void CLlconServerDlg::customEvent ( QCustomEvent* Event ) { - if (Event->type() == QEvent::User + 11) + if ( Event->type() == QEvent::User + 11 ) { ListViewMutex.lock(); - const int iMessType = ((CLlconEvent*) Event)->iMessType; - const int iStatus = ((CLlconEvent*) Event)->iStatus; - const int iChanNum = ((CLlconEvent*) Event)->iChanNum; + const int iMessType = ( (CLlconEvent*) Event )->iMessType; + const int iStatus = ( (CLlconEvent*) Event )->iStatus; + const int iChanNum = ( (CLlconEvent*) Event )->iChanNum; switch(iMessType) { case MS_JIT_BUF_PUT: - vecpListViewItems[iChanNum]->SetLight(0, iStatus); + vecpListViewItems[iChanNum]->SetLight ( 0, iStatus ); break; case MS_JIT_BUF_GET: - vecpListViewItems[iChanNum]->SetLight(1, iStatus); + vecpListViewItems[iChanNum]->SetLight ( 1, iStatus ); break; } diff --git a/src/llconserverdlgbase.ui b/src/llconserverdlgbase.ui index 9631f4bb..cf248b59 100755 --- a/src/llconserverdlgbase.ui +++ b/src/llconserverdlgbase.ui @@ -11,8 +11,8 @@ 0 0 - 629 - 240 + 752 + 239 diff --git a/src/multicolorled.h b/src/multicolorled.h index 50848c4b..92f2444b 100755 --- a/src/multicolorled.h +++ b/src/multicolorled.h @@ -126,7 +126,7 @@ protected: class CServerListViewItem : public QListViewItem { public: - CServerListViewItem ( QListView* parent ) : LED0 ( 1 ), LED1 ( 2 ), + CServerListViewItem ( QListView* parent ) : LED0 ( 2 ), LED1 ( 3 ), QListViewItem ( parent ) { LED0.SetListViewItemPointer ( this ); diff --git a/src/server.h b/src/server.h index 2838bafa..e0cd9ba3 100755 --- a/src/server.h +++ b/src/server.h @@ -50,10 +50,11 @@ public: bool IsRunning() { return Timer.isActive (); } void GetConCliParam ( CVector& vecHostAddresses, + CVector& vecsName, CVector& veciJitBufSize, CVector& veciNetwOutBlSiFact, CVector& veciNetwInBlSiFact) { - ChannelSet.GetConCliParam ( vecHostAddresses, + ChannelSet.GetConCliParam ( vecHostAddresses, vecsName, veciJitBufSize, veciNetwOutBlSiFact, veciNetwInBlSiFact ); }