From d9008d1541cd848bbf3592fdee8c77ca03ff36a2 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Fri, 15 May 2020 21:00:41 +0200 Subject: [PATCH] get rid of LLCON --- src/connectdlg.cpp | 4 ++-- src/global.h | 4 ++-- src/main.cpp | 4 ++-- src/util.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/connectdlg.cpp b/src/connectdlg.cpp index b3aa823e..dc4b2d7b 100755 --- a/src/connectdlg.cpp +++ b/src/connectdlg.cpp @@ -63,7 +63,7 @@ CConnectDlg::CConnectDlg ( const bool bNewShowCompleteRegList, " server software must be set here. An optional port number can be added after the IP " "address or URL using a colon as a separator, e.g, " "example.org:" ) + - QString().setNum ( LLCON_DEFAULT_PORT_NUMBER ) + tr ( ". A list of " + QString().setNum ( DEFAULT_PORT_NUMBER ) + tr ( ". A list of " "the most recent used server IP addresses or URLs is available for " "selection." ); @@ -304,7 +304,7 @@ void CConnectDlg::SetServerList ( const CHostAddress& InetAddr, // IP address and port (use IP number without last byte) // Definition: If the port number is the default port number, we do // not show it. - if ( vecServerInfo[iIdx].HostAddr.iPort == LLCON_DEFAULT_PORT_NUMBER ) + if ( vecServerInfo[iIdx].HostAddr.iPort == DEFAULT_PORT_NUMBER ) { // only show IP number, no port number pNewListViewItem->setText ( 0, CurHostAddress.toString ( CHostAddress::SM_IP_NO_LAST_BYTE ) ); diff --git a/src/global.h b/src/global.h index 4caf2fe8..cb0e3bb5 100755 --- a/src/global.h +++ b/src/global.h @@ -117,8 +117,8 @@ LED bar: lbr #define IP_LOOKUP_TIMEOUT 500 // ms // defined port numbers for client and server -#define LLCON_DEFAULT_PORT_NUMBER 22124 -#define LLCON_PORT_NUMBER_NORTHAMERICA 22224 +#define DEFAULT_PORT_NUMBER 22124 +#define DEFAULT_PORT_NUMBER_NORTHAMERICA 22224 // system sample rate (the sound card and audio coder works on this sample rate) #define SYSTEM_SAMPLE_RATE_HZ 48000 // Hz diff --git a/src/main.cpp b/src/main.cpp index 7dea11ac..6dda5852 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -69,7 +69,7 @@ int main ( int argc, char** argv ) int iNumServerChannels = DEFAULT_USED_NUM_CHANNELS; int iMaxDaysHistory = DEFAULT_DAYS_HISTORY; int iCtrlMIDIChannel = INVALID_MIDI_CH; - quint16 iPortNumber = LLCON_DEFAULT_PORT_NUMBER; + quint16 iPortNumber = DEFAULT_PORT_NUMBER; ELicenceType eLicenceType = LT_NO_LICENCE; QString strConnOnStartupAddress = ""; QString strIniFileName = ""; @@ -573,7 +573,7 @@ int main ( int argc, char** argv ) // TEST -> activate the following line to activate the test bench, -//CTestbench Testbench ( "127.0.0.1", LLCON_DEFAULT_PORT_NUMBER ); +//CTestbench Testbench ( "127.0.0.1", DEFAULT_PORT_NUMBER ); try diff --git a/src/util.cpp b/src/util.cpp index 77a3cbf8..91a17abc 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -864,7 +864,7 @@ bool NetworkUtil::ParseNetworkAddress ( QString strAddress, CHostAddress& HostAddress ) { QHostAddress InetAddr; - quint16 iNetPort = LLCON_DEFAULT_PORT_NUMBER; + quint16 iNetPort = DEFAULT_PORT_NUMBER; // init requested host address with invalid address first HostAddress = CHostAddress(); @@ -951,7 +951,7 @@ QString NetworkUtil::GetCentralServerAddress ( const ECSAddType eCentralServerAd switch ( eCentralServerAddressType ) { case AT_MANUAL: return strCentralServerAddress; - case AT_NORTH_AMERICA: return QString ( "%1:%2" ).arg ( DEFAULT_SERVER_ADDRESS ).arg ( LLCON_PORT_NUMBER_NORTHAMERICA ); + case AT_NORTH_AMERICA: return QString ( "%1:%2" ).arg ( DEFAULT_SERVER_ADDRESS ).arg ( DEFAULT_PORT_NUMBER_NORTHAMERICA ); default: return DEFAULT_SERVER_ADDRESS; // AT_DEFAULT } }