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

fixed some compiler warnings

Browse source
This commit is contained in:
Volker Fischer 2011-03-27 12:28:43 +00:00
parent 8926dec08b
commit 5aa210533b
9 changed files with 75 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/channel.cpp
View file

@ -27,9 +27,9 @@
// CChannel implementation ***************************************************** // CChannel implementation *****************************************************
CChannel::CChannel ( const bool bNIsServer ) : CChannel::CChannel ( const bool bNIsServer ) :
bIsServer ( bNIsServer ),
vecdGains ( USED_NUM_CHANNELS, (double) 1.0 ), vecdGains ( USED_NUM_CHANNELS, (double) 1.0 ),
bIsEnabled ( false ), bIsEnabled ( false ),
bIsServer ( bNIsServer ),
iNetwFrameSizeFact ( FRAME_SIZE_FACTOR_DEFAULT ), iNetwFrameSizeFact ( FRAME_SIZE_FACTOR_DEFAULT ),
iNetwFrameSize ( 20 ), // must be > 0 and should be close to a valid size iNetwFrameSize ( 20 ), // must be > 0 and should be close to a valid size
iNumAudioChannels ( 1 ) // mono iNumAudioChannels ( 1 ) // mono

26
src/client.cpp
View file

@ -27,17 +27,18 @@
/* Implementation *************************************************************/ /* Implementation *************************************************************/
CClient::CClient ( const quint16 iPortNumber ) : 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, "" ), vstrIPAddress ( MAX_NUM_SERVER_ADDR_ITEMS, "" ),
strName ( "" ), strName ( "" ),
bOpenChatOnNewMessage ( true ), Channel ( false ), /* we need a client channel -> "false" */
eGUIDesign ( GD_ORIGINAL ),
bDoAutoSockBufSize ( true ), 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 ) #if defined ( __APPLE__ ) || defined ( __MACOSX )
// we assume on Mac always the preferred frame size works fine // we assume on Mac always the preferred frame size works fine
iSndCrdPrefFrameSizeFactor ( FRAME_SIZE_FACTOR_PREFERRED ), iSndCrdPrefFrameSizeFactor ( FRAME_SIZE_FACTOR_PREFERRED ),
@ -47,14 +48,13 @@ CClient::CClient ( const quint16 iPortNumber ) :
iSndCrdPrefFrameSizeFactor ( FRAME_SIZE_FACTOR_DEFAULT ), iSndCrdPrefFrameSizeFactor ( FRAME_SIZE_FACTOR_DEFAULT ),
iSndCrdFrameSizeFactor ( FRAME_SIZE_FACTOR_DEFAULT ), iSndCrdFrameSizeFactor ( FRAME_SIZE_FACTOR_DEFAULT ),
#endif #endif
bSndCrdConversionBufferRequired ( false ),
iSndCardMonoBlockSizeSamConvBuff ( 0 ),
bFraSiFactPrefSupported ( false ), bFraSiFactPrefSupported ( false ),
bFraSiFactDefSupported ( false ), bFraSiFactDefSupported ( false ),
bFraSiFactSafeSupported ( false ), bFraSiFactSafeSupported ( false ),
iCeltNumCodedBytes ( CELT_NUM_BYTES_MONO_NORMAL_QUALITY ), bOpenChatOnNewMessage ( true ),
bCeltDoHighQuality ( false ), eGUIDesign ( GD_ORIGINAL )
bUseStereo ( false ),
bSndCrdConversionBufferRequired ( false ),
iSndCardMonoBlockSizeSamConvBuff ( 0 )
{ {
// init audio encoder/decoder (mono) // init audio encoder/decoder (mono)
CeltModeMono = celt_mode_create ( CeltModeMono = celt_mode_create (

4
src/client.h
View file

@ -217,8 +217,8 @@ public:
CChannel* GetChannel() { return &Channel; } CChannel* GetChannel() { return &Channel; }
// settings // settings
CVector<QString> vstrIPAddress; CVector<QString> vstrIPAddress;
QString strName; QString strName;
#ifdef LLCON_VST_PLUGIN #ifdef LLCON_VST_PLUGIN
// VST version must have direct access to sound object // VST version must have direct access to sound object

2
src/clientsettingsdlg.cpp
View file

@ -27,7 +27,7 @@
/* Implementation *************************************************************/ /* Implementation *************************************************************/
CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent, CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
Qt::WindowFlags f ) : pClient ( pNCliP ), QDialog ( parent, f ) Qt::WindowFlags f ) : QDialog ( parent, f ), pClient ( pNCliP )
{ {
setupUi ( this ); setupUi ( this );

2
src/llconclientdlg.cpp
View file

@ -31,8 +31,8 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP,
const bool bNewDisalbeLEDs, const bool bNewDisalbeLEDs,
QWidget* parent, QWidget* parent,
Qt::WindowFlags f ) : Qt::WindowFlags f ) :
pClient ( pNCliP ),
QDialog ( parent, f ), QDialog ( parent, f ),
pClient ( pNCliP ),
bUnreadChatMessage ( false ), bUnreadChatMessage ( false ),
ClientSettingsDlg ( pNCliP, parent ClientSettingsDlg ( pNCliP, parent
#ifdef _WIN32 #ifdef _WIN32

2
src/llconserverdlg.cpp
View file

@ -27,7 +27,7 @@
/* Implementation *************************************************************/ /* Implementation *************************************************************/
CLlconServerDlg::CLlconServerDlg ( CServer* pNServP, QWidget* parent ) CLlconServerDlg::CLlconServerDlg ( CServer* pNServP, QWidget* parent )
: pServer ( pNServP ), QDialog ( parent ) : QDialog ( parent ), pServer ( pNServP )
{ {
setupUi ( this ); setupUi ( this );

35
src/server.h
View file

@ -149,33 +149,34 @@ protected:
// do not use the vector class since CChannel does not have appropriate // do not use the vector class since CChannel does not have appropriate
// copy constructor/operator // copy constructor/operator
CChannel vecChannels[MAX_NUM_CHANNELS]; CChannel vecChannels[MAX_NUM_CHANNELS];
QMutex Mutex; CConnectionLessChannel ConnLessChannel;
QMutex Mutex;
// audio encoder/decoder // audio encoder/decoder
CELTMode* CeltModeMono[MAX_NUM_CHANNELS]; CELTMode* CeltModeMono[MAX_NUM_CHANNELS];
CELTEncoder* CeltEncoderMono[MAX_NUM_CHANNELS]; CELTEncoder* CeltEncoderMono[MAX_NUM_CHANNELS];
CELTDecoder* CeltDecoderMono[MAX_NUM_CHANNELS]; CELTDecoder* CeltDecoderMono[MAX_NUM_CHANNELS];
CELTMode* CeltModeStereo[MAX_NUM_CHANNELS]; CELTMode* CeltModeStereo[MAX_NUM_CHANNELS];
CELTEncoder* CeltEncoderStereo[MAX_NUM_CHANNELS]; CELTEncoder* CeltEncoderStereo[MAX_NUM_CHANNELS];
CELTDecoder* CeltDecoderStereo[MAX_NUM_CHANNELS]; CELTDecoder* CeltDecoderStereo[MAX_NUM_CHANNELS];
CVector<QString> vstrChatColors; CVector<QString> vstrChatColors;
// actual working objects // actual working objects
CSocket Socket; CSocket Socket;
CCycleTimeVariance CycleTimeVariance; CCycleTimeVariance CycleTimeVariance;
// logging // logging
CServerLogging Logging; CServerLogging Logging;
// HTML file server status // HTML file server status
bool bWriteStatusHTMLFile; bool bWriteStatusHTMLFile;
QString strServerHTMLFileListName; QString strServerHTMLFileListName;
QString strServerNameWithPort; QString strServerNameWithPort;
CHighPrecisionTimer HighPrecisionTimer; CHighPrecisionTimer HighPrecisionTimer;
CVector<short> vecsSendData; CVector<short> vecsSendData;
public slots: public slots:
void OnTimer(); void OnTimer();

61
src/serverlogging.h
View file

@ -70,37 +70,44 @@ protected:
void AddMarker ( const SHistoryData& curHistoryData ); void AddMarker ( const SHistoryData& curHistoryData );
void Save ( const QString sFileName ); 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; QString sFileName;
QTimer TimerDailyUpdate;
bool bDoHistory;
CFIFO<SHistoryData> vHistoryDataFifo; CFIFO<SHistoryData> 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: public slots:
void OnTimerDailyUpdate() { Update(); } void OnTimerDailyUpdate() { Update(); }
}; };

4
src/socket.cpp
View file

@ -120,6 +120,10 @@ void CSocket::OnDataReceived()
case PS_PROT_ERR: case PS_PROT_ERR:
PostWinMessage ( MS_JIT_BUF_PUT, MUL_COL_LED_YELLOW ); PostWinMessage ( MS_JIT_BUF_PUT, MUL_COL_LED_YELLOW );
break; break;
default:
// other put data states need not to be considered here
break;
} }
} }
else else