diff --git a/src/channel.cpp b/src/channel.cpp index 70a0eaef..57dc6965 100755 --- a/src/channel.cpp +++ b/src/channel.cpp @@ -27,9 +27,9 @@ // CChannel implementation ***************************************************** CChannel::CChannel ( const bool bNIsServer ) : - bIsServer ( bNIsServer ), vecdGains ( USED_NUM_CHANNELS, (double) 1.0 ), bIsEnabled ( false ), + bIsServer ( bNIsServer ), iNetwFrameSizeFact ( FRAME_SIZE_FACTOR_DEFAULT ), iNetwFrameSize ( 20 ), // must be > 0 and should be close to a valid size iNumAudioChannels ( 1 ) // mono diff --git a/src/client.cpp b/src/client.cpp index 8103c477..8c8768f5 100755 --- a/src/client.cpp +++ b/src/client.cpp @@ -27,17 +27,18 @@ /* Implementation *************************************************************/ CClient::CClient ( const quint16 iPortNumber ) : - Channel ( false ), /* we need a client channel -> "false" */ - Sound ( AudioCallback, this ), - Socket ( &Channel, iPortNumber ), - iAudioInFader ( AUD_FADER_IN_MIDDLE ), - iReverbLevel ( 0 ), - bReverbOnLeftChan ( false ), vstrIPAddress ( MAX_NUM_SERVER_ADDR_ITEMS, "" ), strName ( "" ), - bOpenChatOnNewMessage ( true ), - eGUIDesign ( GD_ORIGINAL ), + Channel ( false ), /* we need a client channel -> "false" */ bDoAutoSockBufSize ( true ), + iCeltNumCodedBytes ( CELT_NUM_BYTES_MONO_NORMAL_QUALITY ), + bCeltDoHighQuality ( false ), + bUseStereo ( false ), + Socket ( &Channel, iPortNumber ), + Sound ( AudioCallback, this ), + iAudioInFader ( AUD_FADER_IN_MIDDLE ), + bReverbOnLeftChan ( false ), + iReverbLevel ( 0 ), #if defined ( __APPLE__ ) || defined ( __MACOSX ) // we assume on Mac always the preferred frame size works fine iSndCrdPrefFrameSizeFactor ( FRAME_SIZE_FACTOR_PREFERRED ), @@ -47,14 +48,13 @@ CClient::CClient ( const quint16 iPortNumber ) : iSndCrdPrefFrameSizeFactor ( FRAME_SIZE_FACTOR_DEFAULT ), iSndCrdFrameSizeFactor ( FRAME_SIZE_FACTOR_DEFAULT ), #endif + bSndCrdConversionBufferRequired ( false ), + iSndCardMonoBlockSizeSamConvBuff ( 0 ), bFraSiFactPrefSupported ( false ), bFraSiFactDefSupported ( false ), bFraSiFactSafeSupported ( false ), - iCeltNumCodedBytes ( CELT_NUM_BYTES_MONO_NORMAL_QUALITY ), - bCeltDoHighQuality ( false ), - bUseStereo ( false ), - bSndCrdConversionBufferRequired ( false ), - iSndCardMonoBlockSizeSamConvBuff ( 0 ) + bOpenChatOnNewMessage ( true ), + eGUIDesign ( GD_ORIGINAL ) { // init audio encoder/decoder (mono) CeltModeMono = celt_mode_create ( diff --git a/src/client.h b/src/client.h index 256c70d6..5a00740f 100755 --- a/src/client.h +++ b/src/client.h @@ -217,8 +217,8 @@ public: CChannel* GetChannel() { return &Channel; } // settings - CVector vstrIPAddress; - QString strName; + CVector vstrIPAddress; + QString strName; #ifdef LLCON_VST_PLUGIN // VST version must have direct access to sound object diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp index e4bb189a..100a32b5 100755 --- a/src/clientsettingsdlg.cpp +++ b/src/clientsettingsdlg.cpp @@ -27,7 +27,7 @@ /* Implementation *************************************************************/ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent, - Qt::WindowFlags f ) : pClient ( pNCliP ), QDialog ( parent, f ) + Qt::WindowFlags f ) : QDialog ( parent, f ), pClient ( pNCliP ) { setupUi ( this ); diff --git a/src/llconclientdlg.cpp b/src/llconclientdlg.cpp index 7b8cca74..8afaf09a 100755 --- a/src/llconclientdlg.cpp +++ b/src/llconclientdlg.cpp @@ -31,8 +31,8 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, const bool bNewDisalbeLEDs, QWidget* parent, Qt::WindowFlags f ) : - pClient ( pNCliP ), QDialog ( parent, f ), + pClient ( pNCliP ), bUnreadChatMessage ( false ), ClientSettingsDlg ( pNCliP, parent #ifdef _WIN32 diff --git a/src/llconserverdlg.cpp b/src/llconserverdlg.cpp index 6f6c1a01..c8dda8c7 100755 --- a/src/llconserverdlg.cpp +++ b/src/llconserverdlg.cpp @@ -27,7 +27,7 @@ /* Implementation *************************************************************/ CLlconServerDlg::CLlconServerDlg ( CServer* pNServP, QWidget* parent ) - : pServer ( pNServP ), QDialog ( parent ) + : QDialog ( parent ), pServer ( pNServP ) { setupUi ( this ); diff --git a/src/server.h b/src/server.h index c2cbf25f..abd9bbb5 100755 --- a/src/server.h +++ b/src/server.h @@ -149,33 +149,34 @@ protected: // do not use the vector class since CChannel does not have appropriate // copy constructor/operator - CChannel vecChannels[MAX_NUM_CHANNELS]; - QMutex Mutex; + CChannel vecChannels[MAX_NUM_CHANNELS]; + CConnectionLessChannel ConnLessChannel; + QMutex Mutex; // audio encoder/decoder - CELTMode* CeltModeMono[MAX_NUM_CHANNELS]; - CELTEncoder* CeltEncoderMono[MAX_NUM_CHANNELS]; - CELTDecoder* CeltDecoderMono[MAX_NUM_CHANNELS]; - CELTMode* CeltModeStereo[MAX_NUM_CHANNELS]; - CELTEncoder* CeltEncoderStereo[MAX_NUM_CHANNELS]; - CELTDecoder* CeltDecoderStereo[MAX_NUM_CHANNELS]; + CELTMode* CeltModeMono[MAX_NUM_CHANNELS]; + CELTEncoder* CeltEncoderMono[MAX_NUM_CHANNELS]; + CELTDecoder* CeltDecoderMono[MAX_NUM_CHANNELS]; + CELTMode* CeltModeStereo[MAX_NUM_CHANNELS]; + CELTEncoder* CeltEncoderStereo[MAX_NUM_CHANNELS]; + CELTDecoder* CeltDecoderStereo[MAX_NUM_CHANNELS]; - CVector vstrChatColors; + CVector vstrChatColors; // actual working objects - CSocket Socket; - CCycleTimeVariance CycleTimeVariance; + CSocket Socket; + CCycleTimeVariance CycleTimeVariance; // logging - CServerLogging Logging; + CServerLogging Logging; // HTML file server status - bool bWriteStatusHTMLFile; - QString strServerHTMLFileListName; - QString strServerNameWithPort; + bool bWriteStatusHTMLFile; + QString strServerHTMLFileListName; + QString strServerNameWithPort; - CHighPrecisionTimer HighPrecisionTimer; - CVector vecsSendData; + CHighPrecisionTimer HighPrecisionTimer; + CVector vecsSendData; public slots: void OnTimer(); diff --git a/src/serverlogging.h b/src/serverlogging.h index de10a21f..37e833d3 100755 --- a/src/serverlogging.h +++ b/src/serverlogging.h @@ -70,37 +70,44 @@ protected: void AddMarker ( const SHistoryData& curHistoryData ); void Save ( const QString sFileName ); - bool bDoHistory; - int iYAxisStart; - int iYAxisEnd; - int iNumTicksX; - int iNumTicksY; - int iGridFrameOffset; - int iGridWidthWeekend; - int iTextOffsetToGrid; - int iTextOffsetX; - int iXAxisTextHeight; - int iMarkerSizeNewCon; - int iMarkerSizeServSt; - double dXSpace; - int iYSpace; - QFont AxisFont; - QColor PlotBackgroundColor; - QColor PlotFrameColor; - QColor PlotGridColor; - QColor PlotTextColor; - QColor PlotMarkerNewColor; - QColor PlotMarkerNewLocalColor; - QColor PlotMarkerStopColor; - QDate curDate; - QImage PlotPixmap; - QRect PlotCanvasRect; - QRect PlotGridFrame; QString sFileName; - QTimer TimerDailyUpdate; + bool bDoHistory; CFIFO vHistoryDataFifo; + QRect PlotCanvasRect; + + int iNumTicksX; + int iYAxisStart; + int iYAxisEnd; + int iNumTicksY; + int iGridFrameOffset; + int iGridWidthWeekend; + int iTextOffsetToGrid; + int iXAxisTextHeight; + int iMarkerSizeNewCon; + int iMarkerSizeServSt; + + QFont AxisFont; + int iTextOffsetX; + + QColor PlotBackgroundColor; + QColor PlotFrameColor; + QColor PlotGridColor; + QColor PlotTextColor; + QColor PlotMarkerNewColor; + QColor PlotMarkerNewLocalColor; + QColor PlotMarkerStopColor; + + QImage PlotPixmap; + + double dXSpace; + int iYSpace; + + QDate curDate; + QRect PlotGridFrame; + QTimer TimerDailyUpdate; + public slots: void OnTimerDailyUpdate() { Update(); } }; diff --git a/src/socket.cpp b/src/socket.cpp index a91601e7..73401994 100755 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -120,6 +120,10 @@ void CSocket::OnDataReceived() case PS_PROT_ERR: PostWinMessage ( MS_JIT_BUF_PUT, MUL_COL_LED_YELLOW ); break; + + default: + // other put data states need not to be considered here + break; } } else