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 2020-05-15 21:00:41 +02:00
parent 20d6f8d2d4
commit d9008d1541
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/connectdlg.cpp
View file

@ -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 " " 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, " "address or URL using a colon as a separator, e.g, "
"example.org:" ) + "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 " "the most recent used server IP addresses or URLs is available for "
"selection." ); "selection." );
@ -304,7 +304,7 @@ void CConnectDlg::SetServerList ( const CHostAddress& InetAddr,
// IP address and port (use IP number without last byte) // IP address and port (use IP number without last byte)
// Definition: If the port number is the default port number, we do // Definition: If the port number is the default port number, we do
// not show it. // 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 // only show IP number, no port number
pNewListViewItem->setText ( 0, CurHostAddress.toString ( CHostAddress::SM_IP_NO_LAST_BYTE ) ); pNewListViewItem->setText ( 0, CurHostAddress.toString ( CHostAddress::SM_IP_NO_LAST_BYTE ) );

4
src/global.h
View file

@ -117,8 +117,8 @@ LED bar: lbr
#define IP_LOOKUP_TIMEOUT 500 // ms #define IP_LOOKUP_TIMEOUT 500 // ms
// defined port numbers for client and server // defined port numbers for client and server
#define LLCON_DEFAULT_PORT_NUMBER 22124 #define DEFAULT_PORT_NUMBER 22124
#define LLCON_PORT_NUMBER_NORTHAMERICA 22224 #define DEFAULT_PORT_NUMBER_NORTHAMERICA 22224
// system sample rate (the sound card and audio coder works on this sample rate) // system sample rate (the sound card and audio coder works on this sample rate)
#define SYSTEM_SAMPLE_RATE_HZ 48000 // Hz #define SYSTEM_SAMPLE_RATE_HZ 48000 // Hz

4
src/main.cpp
View file

@ -69,7 +69,7 @@ int main ( int argc, char** argv )
int iNumServerChannels = DEFAULT_USED_NUM_CHANNELS; int iNumServerChannels = DEFAULT_USED_NUM_CHANNELS;
int iMaxDaysHistory = DEFAULT_DAYS_HISTORY; int iMaxDaysHistory = DEFAULT_DAYS_HISTORY;
int iCtrlMIDIChannel = INVALID_MIDI_CH; int iCtrlMIDIChannel = INVALID_MIDI_CH;
quint16 iPortNumber = LLCON_DEFAULT_PORT_NUMBER; quint16 iPortNumber = DEFAULT_PORT_NUMBER;
ELicenceType eLicenceType = LT_NO_LICENCE; ELicenceType eLicenceType = LT_NO_LICENCE;
QString strConnOnStartupAddress = ""; QString strConnOnStartupAddress = "";
QString strIniFileName = ""; QString strIniFileName = "";
@ -573,7 +573,7 @@ int main ( int argc, char** argv )
// TEST -> activate the following line to activate the test bench, // 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 try

4
src/util.cpp
View file

@ -864,7 +864,7 @@ bool NetworkUtil::ParseNetworkAddress ( QString strAddress,
CHostAddress& HostAddress ) CHostAddress& HostAddress )
{ {
QHostAddress InetAddr; QHostAddress InetAddr;
quint16 iNetPort = LLCON_DEFAULT_PORT_NUMBER; quint16 iNetPort = DEFAULT_PORT_NUMBER;
// init requested host address with invalid address first // init requested host address with invalid address first
HostAddress = CHostAddress(); HostAddress = CHostAddress();
@ -951,7 +951,7 @@ QString NetworkUtil::GetCentralServerAddress ( const ECSAddType eCentralServerAd
switch ( eCentralServerAddressType ) switch ( eCentralServerAddressType )
{ {
case AT_MANUAL: return strCentralServerAddress; 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 default: return DEFAULT_SERVER_ADDRESS; // AT_DEFAULT
} }
} }