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

get rid of "Llcon"

Browse source
This commit is contained in:
Volker Fischer 2013-03-24 15:42:23 +00:00
parent 28defb82cb
commit ddbc1d3d8d
12 changed files with 107 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
src/clientdlg.cpp
View file

@ -26,14 +26,14 @@
/* Implementation *************************************************************/
CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP,
CSettings* pNSetP,
const bool bNewConnectOnStartup,
const bool bNewDisalbeLEDs,
const bool bNewShowComplRegConnList,
const bool bShowAnalyzerConsole,
QWidget* parent,
Qt::WindowFlags f ) :
CClientDlg::CClientDlg ( CClient* pNCliP,
CSettings* pNSetP,
const bool bNewConnectOnStartup,
const bool bNewDisalbeLEDs,
const bool bNewShowComplRegConnList,
const bool bShowAnalyzerConsole,
QWidget* parent,
Qt::WindowFlags f ) :
QDialog ( parent, f ),
pClient ( pNCliP ),
pSettings ( pNSetP ),
@ -339,7 +339,7 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP,
pMenu = new QMenuBar ( this );
pMenu->addMenu ( pViewMenu );
pMenu->addMenu ( new CLlconHelpMenu ( this ) );
pMenu->addMenu ( new CHelpMenu ( this ) );
// Now tell the layout about the menu
layout()->setMenuBar ( pMenu );
@ -473,7 +473,7 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP,
TimerStatus.start ( LED_BAR_UPDATE_TIME_MS );
}
void CLlconClientDlg::closeEvent ( QCloseEvent* Event )
void CClientDlg::closeEvent ( QCloseEvent* Event )
{
// if settings/connect dialog or chat dialog is open, close it
ClientSettingsDlg.close();
@ -501,7 +501,7 @@ void CLlconClientDlg::closeEvent ( QCloseEvent* Event )
Event->accept();
}
void CLlconClientDlg::UpdateAudioFaderSlider()
void CClientDlg::UpdateAudioFaderSlider()
{
// update slider and label of audio fader
const int iCurAudInFader = pClient->GetAudioInFader();
@ -530,7 +530,7 @@ void CLlconClientDlg::UpdateAudioFaderSlider()
}
}
void CLlconClientDlg::UpdateRevSelection()
void CClientDlg::UpdateRevSelection()
{
if ( pClient->GetUseStereo() )
{
@ -557,20 +557,20 @@ void CLlconClientDlg::UpdateRevSelection()
}
}
void CLlconClientDlg::OnAudioPanValueChanged ( int value )
void CClientDlg::OnAudioPanValueChanged ( int value )
{
pClient->SetAudioInFader ( value );
UpdateAudioFaderSlider();
}
void CLlconClientDlg::OnConnectDisconBut()
void CClientDlg::OnConnectDisconBut()
{
// the connect/disconnect button implements a toggle functionality
// -> apply inverted running state
ConnectDisconnect ( !pClient->IsRunning() );
}
void CLlconClientDlg::OnInstPictureBut()
void CClientDlg::OnInstPictureBut()
{
// open a menu which shows all available instrument pictures which
// always appears at the same position relative to the instrument
@ -578,7 +578,7 @@ void CLlconClientDlg::OnInstPictureBut()
pInstrPictPopupMenu->exec ( this->mapToGlobal ( butInstPicture->pos() ) );
}
void CLlconClientDlg::OnInstPicturesMenuTriggered ( QAction* SelAction )
void CClientDlg::OnInstPicturesMenuTriggered ( QAction* SelAction )
{
// get selected instrument
const int iSelInstrument = SelAction->data().toInt();
@ -594,7 +594,7 @@ void CLlconClientDlg::OnInstPicturesMenuTriggered ( QAction* SelAction )
CInstPictures::GetResourceReference ( iSelInstrument ) ) );
}
void CLlconClientDlg::OnChatTextReceived ( QString strChatText )
void CClientDlg::OnChatTextReceived ( QString strChatText )
{
// init flag (will maybe overwritten later in this function)
bUnreadChatMessage = false;
@ -617,7 +617,7 @@ void CLlconClientDlg::OnChatTextReceived ( QString strChatText )
UpdateDisplay();
}
void CLlconClientDlg::OnDisconnected()
void CClientDlg::OnDisconnected()
{
// channel is now disconnected, clear mixer board (remove all faders)
MainMixerBoard->HideAll();
@ -625,19 +625,19 @@ void CLlconClientDlg::OnDisconnected()
UpdateDisplay();
}
void CLlconClientDlg::OnConClientListMesReceived ( CVector<CChannelInfo> vecChanInfo )
void CClientDlg::OnConClientListMesReceived ( CVector<CChannelInfo> vecChanInfo )
{
// update mixer board with the additional client infos
MainMixerBoard->ApplyNewConClientList ( vecChanInfo );
}
void CLlconClientDlg::OnNumClientsChanged ( int iNewNumClients )
void CClientDlg::OnNumClientsChanged ( int iNewNumClients )
{
// update window title
SetMyWindowTitle ( iNewNumClients );
}
void CLlconClientDlg::SetMyWindowTitle ( const int iNumClients )
void CClientDlg::SetMyWindowTitle ( const int iNumClients )
{
// show number of connected clients in window title (and therefore also in
// the task bar of the OS)
@ -660,7 +660,7 @@ void CLlconClientDlg::SetMyWindowTitle ( const int iNumClients )
}
}
void CLlconClientDlg::ShowGeneralSettings()
void CClientDlg::ShowGeneralSettings()
{
// open general settings dialog
ClientSettingsDlg.show();
@ -670,7 +670,7 @@ void CLlconClientDlg::ShowGeneralSettings()
ClientSettingsDlg.activateWindow();
}
void CLlconClientDlg::ShowChatWindow()
void CClientDlg::ShowChatWindow()
{
// open chat dialog
ChatDlg.show();
@ -685,7 +685,7 @@ void CLlconClientDlg::ShowChatWindow()
UpdateDisplay();
}
void CLlconClientDlg::ShowAnalyzerConsole()
void CClientDlg::ShowAnalyzerConsole()
{
// open analyzer console dialog
AnalyzerConsole.show();
@ -695,7 +695,7 @@ void CLlconClientDlg::ShowAnalyzerConsole()
AnalyzerConsole.activateWindow();
}
void CLlconClientDlg::OnSettingsStateChanged ( int value )
void CClientDlg::OnSettingsStateChanged ( int value )
{
if ( value == Qt::Checked )
{
@ -707,7 +707,7 @@ void CLlconClientDlg::OnSettingsStateChanged ( int value )
}
}
void CLlconClientDlg::OnChatStateChanged ( int value )
void CClientDlg::OnChatStateChanged ( int value )
{
if ( value == Qt::Checked )
{
@ -719,7 +719,7 @@ void CLlconClientDlg::OnChatStateChanged ( int value )
}
}
void CLlconClientDlg::OnFaderTagTextChanged ( const QString& strNewName )
void CClientDlg::OnFaderTagTextChanged ( const QString& strNewName )
{
// check length
if ( strNewName.length() <= MAX_LEN_FADER_TAG )
@ -737,7 +737,7 @@ void CLlconClientDlg::OnFaderTagTextChanged ( const QString& strNewName )
}
}
void CLlconClientDlg::OnTimerSigMet()
void CClientDlg::OnTimerSigMet()
{
// get current input levels
double dCurSigLevelL = pClient->MicLevelL();
@ -770,13 +770,13 @@ void CLlconClientDlg::OnTimerSigMet()
lbrInputLevelR->setValue ( (int) ceil ( dCurSigLevelR ) );
}
void CLlconClientDlg::OnTimerPing()
void CClientDlg::OnTimerPing()
{
// send ping message to the server
pClient->CreateCLPingMes();
}
void CLlconClientDlg::OnPingTimeResult ( int iPingTime )
void CClientDlg::OnPingTimeResult ( int iPingTime )
{
// calculate overall delay
const int iOverallDelayMs = pClient->EstimatedOverallDelay ( iPingTime );
@ -813,9 +813,9 @@ void CLlconClientDlg::OnPingTimeResult ( int iPingTime )
ledDelay->SetLight ( iOverallDelayLEDColor );
}
void CLlconClientDlg::OnCLPingTimeWithNumClientsReceived ( CHostAddress InetAddr,
int iPingTime,
int iNumClients )
void CClientDlg::OnCLPingTimeWithNumClientsReceived ( CHostAddress InetAddr,
int iPingTime,
int iNumClients )
{
// color definition: <= 25 ms green, <= 50 ms yellow, otherwise red
int iPingTimeLEDColor;
@ -842,8 +842,8 @@ void CLlconClientDlg::OnCLPingTimeWithNumClientsReceived ( CHostAddress InetAddr
iNumClients );
}
void CLlconClientDlg::ConnectDisconnect ( const bool bDoStart,
const bool bConnectOnStartup )
void CClientDlg::ConnectDisconnect ( const bool bDoStart,
const bool bConnectOnStartup )
{
// start/stop client, set button text
if ( bDoStart )
@ -995,7 +995,7 @@ ledChat->Reset();
}
}
void CLlconClientDlg::UpdateDisplay()
void CClientDlg::UpdateDisplay()
{
// update status LEDs
if ( pClient->IsRunning() )
@ -1050,7 +1050,7 @@ void CLlconClientDlg::UpdateDisplay()
}
}
void CLlconClientDlg::SetGUIDesign ( const EGUIDesign eNewDesign )
void CClientDlg::SetGUIDesign ( const EGUIDesign eNewDesign )
{
// apply GUI design to current window
switch ( eNewDesign )
@ -1108,12 +1108,12 @@ rbtReverbSelR->setStyleSheet ( "" );
MainMixerBoard->SetGUIDesign ( eNewDesign );
}
void CLlconClientDlg::customEvent ( QEvent* Event )
void CClientDlg::customEvent ( QEvent* Event )
{
if ( Event->type() == QEvent::User + 11 )
{
const int iMessType = ( (CLlconEvent*) Event )->iMessType;
const int iStatus = ( (CLlconEvent*) Event )->iStatus;
const int iMessType = ( (CCustomEvent*) Event )->iMessType;
const int iStatus = ( (CCustomEvent*) Event )->iStatus;
switch ( iMessType )
{

18
src/clientdlg.h
View file

@ -63,19 +63,19 @@
/* Classes ********************************************************************/
class CLlconClientDlg : public QDialog, private Ui_CLlconClientDlgBase
class CClientDlg : public QDialog, private Ui_CClientDlgBase
{
Q_OBJECT
public:
CLlconClientDlg ( CClient* pNCliP,
CSettings* pNSetP,
const bool bNewConnectOnStartup,
const bool bNewDisalbeLEDs,
const bool bNewShowComplRegConnList,
const bool bShowAnalyzerConsole,
QWidget* parent = 0,
Qt::WindowFlags f = 0 );
CClientDlg ( CClient* pNCliP,
CSettings* pNSetP,
const bool bNewConnectOnStartup,
const bool bNewDisalbeLEDs,
const bool bNewShowComplRegConnList,
const bool bShowAnalyzerConsole,
QWidget* parent = 0,
Qt::WindowFlags f = 0 );
protected:
void SetGUIDesign ( const EGUIDesign eNewDesign );

4
src/clientdlgbase.ui
View file

@ -1,6 +1,6 @@
<ui version="4.0" >
<class>CLlconClientDlgBase</class>
<widget class="QDialog" name="CLlconClientDlgBase" >
<class>CClientDlgBase</class>
<widget class="QDialog" name="CClientDlgBase" >
<property name="geometry" >
<rect>
<x>0</x>

6
src/global.h
View file

@ -3,7 +3,7 @@
* \author Volker Fischer
*
\mainpage Llcon source code documentation
\mainpage Jamulus source code documentation
\section intro_sec Introduction
@ -285,10 +285,10 @@ protected:
QString strErrorType;
};
class CLlconEvent : public QEvent
class CCustomEvent : public QEvent
{
public:
CLlconEvent ( int iNewMeTy, int iNewSt, int iNewChN = 0 ) :
CCustomEvent ( int iNewMeTy, int iNewSt, int iNewChN = 0 ) :
QEvent ( QEvent::Type ( QEvent::User + 11 ) ), iMessType ( iNewMeTy ), iStatus ( iNewSt ),
iChanNum ( iNewChN ) {}

32
src/main.cpp
View file

@ -403,14 +403,14 @@ int main ( int argc, char** argv )
Settings.Load();
// GUI object
CLlconClientDlg ClientDlg ( &Client,
&Settings,
bConnectOnStartup,
bDisalbeLEDs,
bShowComplRegConnList,
bShowAnalyzerConsole,
0,
Qt::Window );
CClientDlg ClientDlg ( &Client,
&Settings,
bConnectOnStartup,
bDisalbeLEDs,
bShowComplRegConnList,
bShowAnalyzerConsole,
0,
Qt::Window );
// set main window
pMainWindow = &ClientDlg;
@ -451,11 +451,11 @@ int main ( int argc, char** argv )
Server.UpdateServerList();
// GUI object for the server
CLlconServerDlg ServerDlg ( &Server,
&Settings,
bStartMinimized,
0,
Qt::Window );
CServerDlg ServerDlg ( &Server,
&Settings,
bStartMinimized,
0,
Qt::Window );
// set main window
pMainWindow = &ServerDlg;
@ -643,10 +643,10 @@ void PostWinMessage ( const _MESSAGE_IDENT MessID,
// first check if application is initialized
if ( pApp != NULL )
{
CLlconEvent* LlconEv =
new CLlconEvent ( MessID, iMessageParam, iChanNum );
CCustomEvent* CustomEvent =
new CCustomEvent ( MessID, iMessageParam, iChanNum );
// Qt will delete the event object when done
QCoreApplication::postEvent ( pMainWindow, LlconEv );
QCoreApplication::postEvent ( pMainWindow, CustomEvent );
}
}

2
src/server.cpp
View file

@ -1410,7 +1410,7 @@ void CServer::customEvent ( QEvent* pEvent )
{
if ( pEvent->type() == QEvent::User + 11 )
{
const int iMessType = ( (CLlconEvent*) pEvent )->iMessType;
const int iMessType = ( (CCustomEvent*) pEvent )->iMessType;
switch ( iMessType )
{

48
src/serverdlg.cpp
View file

@ -26,11 +26,11 @@
/* Implementation *************************************************************/
CLlconServerDlg::CLlconServerDlg ( CServer* pNServP,
CSettings* pNSetP,
const bool bStartMinimized,
QWidget* parent,
Qt::WindowFlags f )
CServerDlg::CServerDlg ( CServer* pNServP,
CSettings* pNSetP,
const bool bStartMinimized,
QWidget* parent,
Qt::WindowFlags f )
: QDialog ( parent, f ),
pServer ( pNServP ),
pSettings ( pNSetP ),
@ -268,7 +268,7 @@ lvwClients->setMinimumHeight ( 140 );
pMenu = new QMenuBar ( this );
pMenu->addMenu ( pViewMenu );
pMenu->addMenu ( new CLlconHelpMenu ( this ) );
pMenu->addMenu ( new CHelpMenu ( this ) );
// Now tell the layout about the menu
layout()->setMenuBar ( pMenu );
@ -322,7 +322,7 @@ lvwClients->setMinimumHeight ( 140 );
Timer.start ( GUI_CONTRL_UPDATE_TIME );
}
void CLlconServerDlg::closeEvent ( QCloseEvent* Event )
void CServerDlg::closeEvent ( QCloseEvent* Event )
{
// if server was registered at the central server, unregister on shutdown
if ( pServer->GetServerListEnabled() )
@ -334,7 +334,7 @@ void CLlconServerDlg::closeEvent ( QCloseEvent* Event )
Event->accept();
}
void CLlconServerDlg::OnStartOnOSStartStateChanged ( int value )
void CServerDlg::OnStartOnOSStartStateChanged ( int value )
{
const bool bCurAutoStartMinState = ( value == Qt::Checked );
@ -343,7 +343,7 @@ void CLlconServerDlg::OnStartOnOSStartStateChanged ( int value )
ModifyAutoStartEntry ( bCurAutoStartMinState );
}
void CLlconServerDlg::OnDefaultCentralServerStateChanged ( int value )
void CServerDlg::OnDefaultCentralServerStateChanged ( int value )
{
// apply new setting to the server and update it
pServer->SetUseDefaultCentralServerAddress ( value == Qt::Checked );
@ -353,7 +353,7 @@ void CLlconServerDlg::OnDefaultCentralServerStateChanged ( int value )
UpdateGUIDependencies();
}
void CLlconServerDlg::OnRegisterServerStateChanged ( int value )
void CServerDlg::OnRegisterServerStateChanged ( int value )
{
const bool bRegState = ( value == Qt::Checked );
@ -372,7 +372,7 @@ void CLlconServerDlg::OnRegisterServerStateChanged ( int value )
UpdateGUIDependencies();
}
void CLlconServerDlg::OnCentralServerAddressEditingFinished()
void CServerDlg::OnCentralServerAddressEditingFinished()
{
// apply new setting to the server and update it
pServer->SetServerListCentralServerAddress (
@ -381,7 +381,7 @@ void CLlconServerDlg::OnCentralServerAddressEditingFinished()
pServer->UpdateServerList();
}
void CLlconServerDlg::OnServerNameTextChanged ( const QString& strNewName )
void CServerDlg::OnServerNameTextChanged ( const QString& strNewName )
{
// check length
if ( strNewName.length() <= MAX_LEN_SERVER_NAME )
@ -397,7 +397,7 @@ void CLlconServerDlg::OnServerNameTextChanged ( const QString& strNewName )
}
}
void CLlconServerDlg::OnLocationCityTextChanged ( const QString& strNewCity )
void CServerDlg::OnLocationCityTextChanged ( const QString& strNewCity )
{
// check length
if ( strNewCity.length() <= MAX_LEN_SERVER_CITY )
@ -413,7 +413,7 @@ void CLlconServerDlg::OnLocationCityTextChanged ( const QString& strNewCity )
}
}
void CLlconServerDlg::OnLocationCountryActivated ( int iCntryListItem )
void CServerDlg::OnLocationCountryActivated ( int iCntryListItem )
{
// apply new setting to the server and update it
pServer->SetServerCountry ( static_cast<QLocale::Country> (
@ -422,7 +422,7 @@ void CLlconServerDlg::OnLocationCountryActivated ( int iCntryListItem )
pServer->UpdateServerList();
}
void CLlconServerDlg::OnSysTrayActivated ( QSystemTrayIcon::ActivationReason ActReason )
void CServerDlg::OnSysTrayActivated ( QSystemTrayIcon::ActivationReason ActReason )
{
// on double click on the icon, show window in fore ground
if ( ActReason == QSystemTrayIcon::DoubleClick )
@ -431,7 +431,7 @@ void CLlconServerDlg::OnSysTrayActivated ( QSystemTrayIcon::ActivationReason Act
}
}
void CLlconServerDlg::OnTimer()
void CServerDlg::OnTimer()
{
CVector<CHostAddress> vecHostAddresses;
CVector<QString> vecsName;
@ -481,7 +481,7 @@ void CLlconServerDlg::OnTimer()
ListViewMutex.unlock();
}
void CLlconServerDlg::UpdateGUIDependencies()
void CServerDlg::UpdateGUIDependencies()
{
// get the states which define the GUI dependencies from the server
const bool bCurSerListEnabled = pServer->GetServerListEnabled();
@ -511,7 +511,7 @@ void CLlconServerDlg::UpdateGUIDependencies()
!bCurUseDefCentServAddr && bCurSerListEnabled );
}
void CLlconServerDlg::UpdateSystemTrayIcon ( const bool bIsActive )
void CServerDlg::UpdateSystemTrayIcon ( const bool bIsActive )
{
if ( bSystemTrayIconAvaialbe )
{
@ -526,7 +526,7 @@ void CLlconServerDlg::UpdateSystemTrayIcon ( const bool bIsActive )
}
}
void CLlconServerDlg::ModifyAutoStartEntry ( const bool bDoAutoStart )
void CServerDlg::ModifyAutoStartEntry ( const bool bDoAutoStart )
{
// auto start is currently only supported for Windows
#ifdef _WIN32
@ -567,7 +567,7 @@ void CLlconServerDlg::ModifyAutoStartEntry ( const bool bDoAutoStart )
}
}
void CLlconServerDlg::changeEvent ( QEvent* pEvent )
void CServerDlg::changeEvent ( QEvent* pEvent )
{
// if we have a system tray icon, we make the window invisible if it is
// minimized
@ -583,15 +583,15 @@ void CLlconServerDlg::changeEvent ( QEvent* pEvent )
}
}
void CLlconServerDlg::customEvent ( QEvent* pEvent )
void CServerDlg::customEvent ( QEvent* pEvent )
{
if ( pEvent->type() == QEvent::User + 11 )
{
ListViewMutex.lock();
{
const int iMessType = ( (CLlconEvent*) pEvent )->iMessType;
const int iStatus = ( (CLlconEvent*) pEvent )->iStatus;
const int iChanNum = ( (CLlconEvent*) pEvent )->iChanNum;
const int iMessType = ( (CCustomEvent*) pEvent )->iMessType;
const int iStatus = ( (CCustomEvent*) pEvent )->iStatus;
const int iChanNum = ( (CCustomEvent*) pEvent )->iChanNum;
switch(iMessType)
{

12
src/serverdlg.h
View file

@ -46,16 +46,16 @@
/* Classes ********************************************************************/
class CLlconServerDlg : public QDialog, private Ui_CLlconServerDlgBase
class CServerDlg : public QDialog, private Ui_CServerDlgBase
{
Q_OBJECT
public:
CLlconServerDlg ( CServer* pNServP,
CSettings* pNSetP,
const bool bStartMinimized,
QWidget* parent = 0,
Qt::WindowFlags f = 0 );
CServerDlg ( CServer* pNServP,
CSettings* pNSetP,
const bool bStartMinimized,
QWidget* parent = 0,
Qt::WindowFlags f = 0 );
protected:
virtual void customEvent ( QEvent* pEvent );

4
src/serverdlgbase.ui
View file

@ -1,6 +1,6 @@
<ui version="4.0" >
<class>CLlconServerDlgBase</class>
<widget class="QDialog" name="CLlconServerDlgBase" >
<class>CServerDlgBase</class>
<widget class="QDialog" name="CServerDlgBase" >
<property name="geometry" >
<rect>
<x>0</x>

2
src/socket.cpp
View file

@ -174,7 +174,7 @@ void CSocket::OnDataReceived()
// tell the server object to wake up if it
// is in sleep mode (Qt will delete the event object when done)
QCoreApplication::postEvent ( pServer,
new CLlconEvent ( MS_PACKET_RECEIVED, 0, 0 ) );
new CCustomEvent ( MS_PACKET_RECEIVED, 0, 0 ) );
}
}
}

2
src/util.cpp
View file

@ -402,7 +402,7 @@ QString CAboutDlg::GetVersionAndNameStr ( const bool bWithHtml )
// Help menu -------------------------------------------------------------------
CLlconHelpMenu::CLlconHelpMenu ( QWidget* parent ) : QMenu ( "&?", parent )
CHelpMenu::CHelpMenu ( QWidget* parent ) : QMenu ( "&?", parent )
{
// standard help menu consists of about and what's this help
addAction ( tr ( "What's &This" ), this,

4
src/util.h
View file

@ -418,12 +418,12 @@ public:
// Help menu -------------------------------------------------------------------
class CLlconHelpMenu : public QMenu
class CHelpMenu : public QMenu
{
Q_OBJECT
public:
CLlconHelpMenu ( QWidget* parent = 0 );
CHelpMenu ( QWidget* parent = 0 );
protected:
CAboutDlg AboutDlg;