added a debugging command line argument so that the complete server list of registered servers can be seen

This commit is contained in:
Volker Fischer 2011-11-19 21:24:03 +00:00
parent 580ccd9060
commit d4a6ea617f
7 changed files with 49 additions and 5 deletions

View file

@ -5,6 +5,12 @@ TODO working on bug fix: Windows: driver is changed during connection results
sometimes in lowed noise sometimes in lowed noise
- connect dialog list is sorted by the ping time
- software icon changed
- bug fix: fixed crash on slave server unregistering
3.2.0 3.2.0

View file

@ -26,11 +26,14 @@
/* Implementation *************************************************************/ /* Implementation *************************************************************/
CConnectDlg::CConnectDlg ( QWidget* parent, Qt::WindowFlags f ) CConnectDlg::CConnectDlg ( const bool bNewShowCompleteRegList,
QWidget* parent,
Qt::WindowFlags f )
: QDialog ( parent, f ), : QDialog ( parent, f ),
strCentralServerAddress ( "" ), strCentralServerAddress ( "" ),
strSelectedAddress ( "" ), strSelectedAddress ( "" ),
strSelectedServerName ( "" ), strSelectedServerName ( "" ),
bShowCompleteRegList ( bNewShowCompleteRegList ),
bServerListReceived ( false ), bServerListReceived ( false ),
bStateOK ( false ), bStateOK ( false ),
bServerListItemWasChosen ( false ) bServerListItemWasChosen ( false )
@ -239,8 +242,11 @@ void CConnectDlg::SetServerList ( const CHostAddress& InetAddr,
QTreeWidgetItem* pNewListViewItem = new QTreeWidgetItem ( lvwServers ); QTreeWidgetItem* pNewListViewItem = new QTreeWidgetItem ( lvwServers );
// make the entry invisible (will be set to visible on successful ping // make the entry invisible (will be set to visible on successful ping
// result) // result) if the complete list of registered servers shall not be shown
if ( !bShowCompleteRegList )
{
pNewListViewItem->setHidden ( true ); pNewListViewItem->setHidden ( true );
}
// server name (if empty, show host address instead) // server name (if empty, show host address instead)
if ( !vecServerInfo[iIdx].strName.isEmpty() ) if ( !vecServerInfo[iIdx].strName.isEmpty() )

View file

@ -54,7 +54,9 @@ class CConnectDlg : public QDialog, private Ui_CConnectDlgBase
Q_OBJECT Q_OBJECT
public: public:
CConnectDlg ( QWidget* parent = 0, Qt::WindowFlags f = 0 ); CConnectDlg ( const bool bNewShowCompleteRegList,
QWidget* parent = 0,
Qt::WindowFlags f = 0 );
void Init ( const QString strNewCentralServerAddr, void Init ( const QString strNewCentralServerAddr,
const CVector<QString>& vstrIPAddresses ); const CVector<QString>& vstrIPAddresses );
@ -83,6 +85,7 @@ protected:
CVector<QString> vstrIPAddresses; CVector<QString> vstrIPAddresses;
QString strSelectedAddress; QString strSelectedAddress;
QString strSelectedServerName; QString strSelectedServerName;
bool bShowCompleteRegList;
bool bServerListReceived; bool bServerListReceived;
bool bStateOK; bool bStateOK;
bool bServerListItemWasChosen; bool bServerListItemWasChosen;

View file

@ -30,6 +30,7 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP,
CSettings* pNSetP, CSettings* pNSetP,
const bool bNewConnectOnStartup, const bool bNewConnectOnStartup,
const bool bNewDisalbeLEDs, const bool bNewDisalbeLEDs,
const bool bNewShowComplRegConnList,
QWidget* parent, QWidget* parent,
Qt::WindowFlags f ) : Qt::WindowFlags f ) :
QDialog ( parent, f ), QDialog ( parent, f ),
@ -38,7 +39,7 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP,
bUnreadChatMessage ( false ), bUnreadChatMessage ( false ),
ClientSettingsDlg ( pNCliP, parent, Qt::Window ), ClientSettingsDlg ( pNCliP, parent, Qt::Window ),
ChatDlg ( parent, Qt::Window ), ChatDlg ( parent, Qt::Window ),
ConnectDlg ( parent, Qt::Dialog ) ConnectDlg ( bNewShowComplRegConnList, parent, Qt::Dialog )
{ {
setupUi ( this ); setupUi ( this );

View file

@ -79,6 +79,7 @@ public:
CSettings* pNSetP, CSettings* pNSetP,
const bool bNewConnectOnStartup, const bool bNewConnectOnStartup,
const bool bNewDisalbeLEDs, const bool bNewDisalbeLEDs,
const bool bNewShowComplRegConnList,
QWidget* parent = 0, QWidget* parent = 0,
Qt::WindowFlags f = 0 ); Qt::WindowFlags f = 0 );

View file

@ -58,6 +58,7 @@ int main ( int argc, char** argv )
bool bStartMinimized = false; bool bStartMinimized = false;
bool bConnectOnStartup = false; bool bConnectOnStartup = false;
bool bDisalbeLEDs = false; bool bDisalbeLEDs = false;
bool bShowComplRegConnList = false;
int iNumServerChannels = DEFAULT_USED_NUM_CHANNELS; int iNumServerChannels = DEFAULT_USED_NUM_CHANNELS;
quint16 iPortNumber = LLCON_DEFAULT_PORT_NUMBER; quint16 iPortNumber = LLCON_DEFAULT_PORT_NUMBER;
QString strIniFileName = ""; QString strIniFileName = "";
@ -142,6 +143,21 @@ int main ( int argc, char** argv )
} }
// Show all registered servers in the server list ----------------------
// Undocumented debugging command line argument: Show all registered
// servers in the server list regardless if a ping to the server is
// possible or not
if ( GetFlagArgument ( argv,
i,
"--showallservers", // no short form
"--showallservers" ) )
{
bShowComplRegConnList = true;
tsConsole << "- show all registered servers in server list" << endl;
continue;
}
// Use logging --------------------------------------------------------- // Use logging ---------------------------------------------------------
if ( GetStringArgument ( tsConsole, if ( GetStringArgument ( tsConsole,
argc, argc,
@ -353,6 +369,7 @@ int main ( int argc, char** argv )
&Settings, &Settings,
bConnectOnStartup, bConnectOnStartup,
bDisalbeLEDs, bDisalbeLEDs,
bShowComplRegConnList,
0, 0,
Qt::Window ); Qt::Window );

View file

@ -972,6 +972,16 @@ long CSound::asioMessages ( long selector,
// TODO implement separate ASIO reset function in base class! // TODO implement separate ASIO reset function in base class!
// kAsioBufferSizeChange:
// Informs the application that the driver has a new preferred buffer size.
//
// kAsioResetRequest:
// Requests a driver reset. If accepted, this will close the driver
// (ASIOExit() ) and re-open it again (ASIOInit() etc.) at the next
// "safe" time (usually during the application IDLE time). Some
// drivers need to reconfigure for instance when the sample rate
// changes, or some basic changes have been made in ASIOControlPanel().
pSound->EmitReinitRequestSignal(); pSound->EmitReinitRequestSignal();
ret = 1L; // 1L if request is accepted or 0 otherwise ret = 1L; // 1L if request is accepted or 0 otherwise