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

client port always +1 per definition, some files unix2dos

Browse source
This commit is contained in:
Volker Fischer 2009-11-29 03:36:42 +00:00
parent 8e79f5b9ee
commit 682c2e5877
3 changed files with 903 additions and 901 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1546
src/llconclientdlg.cpp
View file

File diff suppressed because it is too large Load diff

238
src/llconclientdlg.h
View file

@ -1,119 +1,119 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2009 * Copyright (c) 2004-2009
* *
* Author(s): * Author(s):
* Volker Fischer * Volker Fischer
* *
****************************************************************************** ******************************************************************************
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software * the terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later * Foundation; either version 2 of the License, or (at your option) any later
* version. * version.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., * this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
\******************************************************************************/ \******************************************************************************/
#include <qlabel.h> #include <qlabel.h>
#include <qstring.h> #include <qstring.h>
#include <qlineedit.h> #include <qlineedit.h>
#include <qpushbutton.h> #include <qpushbutton.h>
#include <qprogressbar.h> #include <qprogressbar.h>
#include <qwhatsthis.h> #include <qwhatsthis.h>
#include <qtimer.h> #include <qtimer.h>
#include <qslider.h> #include <qslider.h>
#include <qradiobutton.h> #include <qradiobutton.h>
#include <qmenubar.h> #include <qmenubar.h>
#include <qlayout.h> #include <qlayout.h>
#include "global.h" #include "global.h"
#include "client.h" #include "client.h"
#include "multicolorled.h" #include "multicolorled.h"
#include "audiomixerboard.h" #include "audiomixerboard.h"
#include "clientsettingsdlg.h" #include "clientsettingsdlg.h"
#include "chatdlg.h" #include "chatdlg.h"
#ifdef _WIN32 #ifdef _WIN32
# include "../windows/moc/llconclientdlgbase.h" # include "../windows/moc/llconclientdlgbase.h"
#else #else
# include "moc/llconclientdlgbase.h" # include "moc/llconclientdlgbase.h"
#endif #endif
/* Definitions ****************************************************************/ /* Definitions ****************************************************************/
// text strings for connection button for connect and disconnect // text strings for connection button for connect and disconnect
#define CON_BUT_CONNECTTEXT "C&onnect" #define CON_BUT_CONNECTTEXT "C&onnect"
#define CON_BUT_DISCONNECTTEXT "D&isconnect" #define CON_BUT_DISCONNECTTEXT "D&isconnect"
// update time for GUI controls // update time for GUI controls
#define LEVELMETER_UPDATE_TIME 100 // ms #define LEVELMETER_UPDATE_TIME 100 // ms
#define STATUSBAR_UPDATE_TIME 1000 // ms #define STATUSBAR_UPDATE_TIME 1000 // ms
// range for signal level meter // range for signal level meter
#define LOW_BOUND_SIG_METER ( -50.0 ) // dB #define LOW_BOUND_SIG_METER ( -50.0 ) // dB
#define UPPER_BOUND_SIG_METER ( 0.0 ) // dB #define UPPER_BOUND_SIG_METER ( 0.0 ) // dB
/* Classes ********************************************************************/ /* Classes ********************************************************************/
class CLlconClientDlg : public QDialog, private Ui_CLlconClientDlgBase class CLlconClientDlg : public QDialog, private Ui_CLlconClientDlgBase
{ {
Q_OBJECT Q_OBJECT
public: public:
CLlconClientDlg ( CClient* pNCliP, const bool bNewConnectOnStartup, CLlconClientDlg ( CClient* pNCliP, const bool bNewConnectOnStartup,
const bool bNewDisalbeLEDs, const bool bNewDisalbeLEDs,
QWidget* parent = 0, Qt::WindowFlags f = 0 ); QWidget* parent = 0, Qt::WindowFlags f = 0 );
protected: protected:
void SetGUIDesign ( const EGUIDesign eNewDesign ); void SetGUIDesign ( const EGUIDesign eNewDesign );
void SetMyWindowTitle ( const int iNumClients ); void SetMyWindowTitle ( const int iNumClients );
void ShowChatWindow(); void ShowChatWindow();
void UpdateAudioFaderSlider(); void UpdateAudioFaderSlider();
void ConnectDisconnect ( const bool bDoStart ); void ConnectDisconnect ( const bool bDoStart );
CClient* pClient; CClient* pClient;
bool bConnected; bool bConnected;
bool bUnreadChatMessage; bool bUnreadChatMessage;
QTimer TimerSigMet; QTimer TimerSigMet;
QTimer TimerStatus; QTimer TimerStatus;
virtual void customEvent ( QEvent* Event ); virtual void customEvent ( QEvent* Event );
virtual void closeEvent ( QCloseEvent* Event ); virtual void closeEvent ( QCloseEvent* Event );
void UpdateDisplay(); void UpdateDisplay();
QMenu* pViewMenu; QMenu* pViewMenu;
QMenuBar* pMenu; QMenuBar* pMenu;
CClientSettingsDlg ClientSettingsDlg; CClientSettingsDlg ClientSettingsDlg;
CChatDlg ChatDlg; CChatDlg ChatDlg;
public slots: public slots:
void OnConnectDisconBut(); void OnConnectDisconBut();
void OnTimerSigMet(); void OnTimerSigMet();
void OnTimerStatus() { UpdateDisplay(); } void OnTimerStatus() { UpdateDisplay(); }
void OnOpenGeneralSettings(); void OnOpenGeneralSettings();
void OnOpenChatDialog() { ShowChatWindow(); } void OnOpenChatDialog() { ShowChatWindow(); }
void OnSliderAudInFader ( int value ); void OnSliderAudInFader ( int value );
void OnSliderAudReverb ( int value ) { pClient->SetReverbLevel ( value ); } void OnSliderAudReverb ( int value ) { pClient->SetReverbLevel ( value ); }
void OnRevSelL() { pClient->SetReverbOnLeftChan ( true ); } void OnRevSelL() { pClient->SetReverbOnLeftChan ( true ); }
void OnRevSelR() { pClient->SetReverbOnLeftChan ( false ); } void OnRevSelR() { pClient->SetReverbOnLeftChan ( false ); }
void OnConClientListMesReceived ( CVector<CChannelShortInfo> vecChanInfo ); void OnConClientListMesReceived ( CVector<CChannelShortInfo> vecChanInfo );
void OnChangeChanGain ( int iId, double dGain ) void OnChangeChanGain ( int iId, double dGain )
{ pClient->SetRemoteChanGain ( iId, dGain ); } { pClient->SetRemoteChanGain ( iId, dGain ); }
void OnFaderTagTextChanged ( const QString& strNewName ); void OnFaderTagTextChanged ( const QString& strNewName );
void OnChatTextReceived ( QString strChatText ); void OnChatTextReceived ( QString strChatText );
void OnNewLocalInputText ( QString strChatText ) void OnNewLocalInputText ( QString strChatText )
{ pClient->SendTextMess ( strChatText ); } { pClient->SendTextMess ( strChatText ); }
void OnLineEditServerAddrTextChanged ( const QString sNewText ); void OnLineEditServerAddrTextChanged ( const QString sNewText );
void OnLineEditServerAddrActivated ( int index ); void OnLineEditServerAddrActivated ( int index );
void OnDisconnected(); void OnDisconnected();
void OnStopped(); void OnStopped();
void OnGUIDesignChanged() { SetGUIDesign ( pClient->GetGUIDesign() ); } void OnGUIDesignChanged() { SetGUIDesign ( pClient->GetGUIDesign() ); }
void OnNumClientsChanged ( int iNewNumClients ); void OnNumClientsChanged ( int iNewNumClients );
}; };

20
src/socket.cpp
View file

@ -32,17 +32,19 @@ void CSocket::Init ( const quint16 iPortNumber )
// allocate memory for network receive and send buffer in samples // allocate memory for network receive and send buffer in samples
vecbyRecBuf.Init ( MAX_SIZE_BYTES_NETW_BUF ); vecbyRecBuf.Init ( MAX_SIZE_BYTES_NETW_BUF );
// initialize the listening socket // initialize the listening socket, per definition use the port number plus
bool bSuccess = SocketDevice.bind ( // one for the client to make it possible to run server and client on the
QHostAddress ( QHostAddress::Any ), iPortNumber ); // same computer
bool bSuccess;
// if no success, try if server is on same machine (only for client) if ( bIsClient )
if ( ( !bSuccess ) && bIsClient )
{ {
// if server and client is on same machine, decrease port number by
// one by definition
bSuccess = SocketDevice.bind ( bSuccess = SocketDevice.bind (
QHostAddress( QHostAddress::Any ), iPortNumber - 1 ); QHostAddress( QHostAddress::Any ), iPortNumber + 1 );
}
else
{
bSuccess = SocketDevice.bind (
QHostAddress ( QHostAddress::Any ), iPortNumber );
} }
if ( !bSuccess ) if ( !bSuccess )