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

fix for chat/settings button

Browse source
This commit is contained in:
Volker Fischer 2011-05-29 06:25:58 +00:00
parent 037cdeaf83
commit 2303efb046
3 changed files with 199 additions and 173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/channel.cpp
View file

@ -626,7 +626,7 @@ void CChannel::UpdateSocketBufferSize ( const double dLocalStdDev )
// completely filled // completely filled
// - we need at least a jitter buffer size of the audio packet duration // - we need at least a jitter buffer size of the audio packet duration
// -> add audio buffer duration // -> add audio buffer duration
const double dHysteresis = 0.3; const double dHysteresis = 0.2;
// accumulate the standard deviations of input network stream and // accumulate the standard deviations of input network stream and
// internal timer, // internal timer,

27
src/llconclientdlg.cpp
View file

@ -915,6 +915,33 @@ void CLlconClientDlg::UpdateDisplay()
ledConnection->SetLight ( MUL_COL_LED_RED ); ledConnection->SetLight ( MUL_COL_LED_RED );
} }
} }
// update settings/chat buttons (do not fire signals since it is an update)
if ( chbSettings->isChecked() && !ClientSettingsDlg.isVisible() )
{
chbSettings->blockSignals ( true );
chbSettings->setChecked ( false );
chbSettings->blockSignals ( false );
}
if ( !chbSettings->isChecked() && ClientSettingsDlg.isVisible() )
{
chbSettings->blockSignals ( true );
chbSettings->setChecked ( true );
chbSettings->blockSignals ( false );
}
if ( chbChat->isChecked() && !ChatDlg.isVisible() )
{
chbChat->blockSignals ( true );
chbChat->setChecked ( false );
chbChat->blockSignals ( false );
}
if ( !chbChat->isChecked() && ChatDlg.isVisible() )
{
chbChat->blockSignals ( true );
chbChat->setChecked ( true );
chbChat->blockSignals ( false );
}
} }
void CLlconClientDlg::SetGUIDesign ( const EGUIDesign eNewDesign ) void CLlconClientDlg::SetGUIDesign ( const EGUIDesign eNewDesign )

343
src/llconclientdlg.h
View file

@ -1,173 +1,172 @@
/******************************************************************************\ /******************************************************************************\
* Copyright (c) 2004-2011 * Copyright (c) 2004-2011
* *
* 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 "settings.h" #include "settings.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"
#include "connectdlg.h" #include "connectdlg.h"
#ifdef _WIN32 #ifdef _WIN32
# include "../windows/moc/llconclientdlgbase.h" # include "../windows/moc/llconclientdlgbase.h"
#else #else
# ifdef _IS_QMAKE_CONFIG # ifdef _IS_QMAKE_CONFIG
# include "ui_llconclientdlgbase.h" # include "ui_llconclientdlgbase.h"
# else # else
# include "moc/llconclientdlgbase.h" # include "moc/llconclientdlgbase.h"
# endif # endif
#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_MS 100 // ms #define LEVELMETER_UPDATE_TIME_MS 100 // ms
#define LED_BAR_UPDATE_TIME_MS 1000 // ms #define LED_BAR_UPDATE_TIME_MS 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
// number of ping times > upper bound until error message is shown // number of ping times > upper bound until error message is shown
#define NUM_HIGH_PINGS_UNTIL_ERROR 5 #define NUM_HIGH_PINGS_UNTIL_ERROR 5
/* 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, CLlconClientDlg ( CClient* pNCliP,
CSettings* pNSetP, CSettings* pNSetP,
const bool bNewConnectOnStartup, const bool bNewConnectOnStartup,
const bool bNewDisalbeLEDs, const bool bNewDisalbeLEDs,
QWidget* parent = 0, QWidget* parent = 0,
Qt::WindowFlags f = 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 ShowGeneralSettings(); void ShowGeneralSettings();
void ShowChatWindow(); void ShowChatWindow();
void UpdateAudioFaderSlider(); void UpdateAudioFaderSlider();
void UpdateRevSelection(); void UpdateRevSelection();
void ConnectDisconnect ( const bool bDoStart ); void ConnectDisconnect ( const bool bDoStart );
CClient* pClient; CClient* pClient;
CSettings* pSettings; CSettings* pSettings;
bool bConnected; bool bConnected;
bool bUnreadChatMessage; bool bUnreadChatMessage;
QTimer TimerSigMet; QTimer TimerSigMet;
QTimer TimerStatus; QTimer TimerStatus;
QTimer TimerPing; QTimer TimerPing;
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;
CConnectDlg ConnectDlg; CConnectDlg ConnectDlg;
public slots: public slots:
void OnAboutToQuit() { pSettings->Save(); } void OnAboutToQuit() { pSettings->Save(); }
void OnConnectDisconBut(); void OnConnectDisconBut();
void OnTimerSigMet(); void OnTimerSigMet();
void OnTimerStatus() void OnTimerStatus() { UpdateDisplay(); }
{ UpdateDisplay(); }
void OnTimerPing();
void OnTimerPing(); void OnPingTimeResult ( int iPingTime );
void OnPingTimeResult ( int iPingTime ); void OnCLPingTimeWithNumClientsReceived ( CHostAddress InetAddr,
void OnCLPingTimeWithNumClientsReceived ( CHostAddress InetAddr, int iPingTime,
int iPingTime, int iNumClients );
int iNumClients );
void OnOpenGeneralSettings() { ShowGeneralSettings(); }
void OnOpenGeneralSettings() { ShowGeneralSettings(); } void OnOpenChatDialog() { ShowChatWindow(); }
void OnOpenChatDialog() { ShowChatWindow(); }
void OnSettingsStateChanged ( int value ); void OnSettingsStateChanged ( int value );
void OnChatStateChanged ( int value ); void OnChatStateChanged ( int value );
void OnAudioPanValueChanged ( int value ); void OnAudioPanValueChanged ( int value );
void OnAudioReverbValueChanged ( int value ) void OnAudioReverbValueChanged ( int value )
{ pClient->SetReverbLevel ( value ); } { pClient->SetReverbLevel ( value ); }
void OnReverbSelLClicked() void OnReverbSelLClicked()
{ pClient->SetReverbOnLeftChan ( true ); } { pClient->SetReverbOnLeftChan ( true ); }
void OnReverbSelRClicked() void OnReverbSelRClicked()
{ pClient->SetReverbOnLeftChan ( false ); } { pClient->SetReverbOnLeftChan ( false ); }
void OnConClientListMesReceived ( CVector<CChannelShortInfo> vecChanInfo ); void OnConClientListMesReceived ( CVector<CChannelShortInfo> vecChanInfo );
void OnFaderTagTextChanged ( const QString& strNewName ); void OnFaderTagTextChanged ( const QString& strNewName );
void OnChatTextReceived ( QString strChatText ); void OnChatTextReceived ( QString strChatText );
void OnChangeChanGain ( int iId, double dGain ) void OnChangeChanGain ( int iId, double dGain )
{ pClient->SetRemoteChanGain ( iId, dGain ); } { pClient->SetRemoteChanGain ( iId, dGain ); }
void OnNewLocalInputText ( QString strChatText ) void OnNewLocalInputText ( QString strChatText )
{ pClient->CreateChatTextMes ( strChatText ); } { pClient->CreateChatTextMes ( strChatText ); }
void OnReqServerListQuery ( CHostAddress InetAddr ) void OnReqServerListQuery ( CHostAddress InetAddr )
{ pClient->CreateCLReqServerListMes ( InetAddr ); } { pClient->CreateCLReqServerListMes ( InetAddr ); }
void OnCreateCLServerListPingMes ( CHostAddress InetAddr ) void OnCreateCLServerListPingMes ( CHostAddress InetAddr )
{ pClient->CreateCLServerListPingMes ( InetAddr ); } { pClient->CreateCLServerListPingMes ( InetAddr ); }
void OnCLServerListReceived ( CHostAddress InetAddr, void OnCLServerListReceived ( CHostAddress InetAddr,
CVector<CServerInfo> vecServerInfo ) CVector<CServerInfo> vecServerInfo )
{ ConnectDlg.SetServerList ( InetAddr, vecServerInfo ); } { ConnectDlg.SetServerList ( InetAddr, vecServerInfo ); }
void OnDisconnected(); void OnDisconnected();
void OnGUIDesignChanged() void OnGUIDesignChanged()
{ SetGUIDesign ( pClient->GetGUIDesign() ); } { SetGUIDesign ( pClient->GetGUIDesign() ); }
void OnStereoCheckBoxChanged() { UpdateRevSelection(); } void OnStereoCheckBoxChanged() { UpdateRevSelection(); }
void OnNumClientsChanged ( int iNewNumClients ); void OnNumClientsChanged ( int iNewNumClients );
}; };