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

Fixed a bug with the default server port (Ticket #194)

Browse source
This commit is contained in:
Volker Fischer 2020-05-10 19:06:27 +02:00
parent d0608156e2
commit ac3255afbf
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main.cpp
View file

@ -60,6 +60,7 @@ int main ( int argc, char** argv )
bool bCentServPingServerInList = false; bool bCentServPingServerInList = false;
bool bNoAutoJackConnect = false; bool bNoAutoJackConnect = false;
bool bUseTranslation = true; bool bUseTranslation = true;
bool bCustomPortNumberGiven = false;
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;
@ -77,13 +78,6 @@ int main ( int argc, char** argv )
QString strWelcomeMessage = ""; QString strWelcomeMessage = "";
QString strClientName = APP_NAME; QString strClientName = APP_NAME;
// adjust default port number for client: use different default port than the server since
// if the client is started before the server, the server would get a socket bind error
if ( bIsClient )
{
iPortNumber += 10; // increment by 10
}
// QT docu: argv()[0] is the program name, argv()[1] is the first // QT docu: argv()[0] is the program name, argv()[1] is the first
// argument and argv()[argc()-1] is the last argument. // argument and argv()[argc()-1] is the last argument.
// Start with first argument, therefore "i = 1" // Start with first argument, therefore "i = 1"
@ -313,6 +307,7 @@ int main ( int argc, char** argv )
rDbleArgument ) ) rDbleArgument ) )
{ {
iPortNumber = static_cast<quint16> ( rDbleArgument ); iPortNumber = static_cast<quint16> ( rDbleArgument );
bCustomPortNumberGiven = true;
tsConsole << "- selected port number: " << iPortNumber << endl; tsConsole << "- selected port number: " << iPortNumber << endl;
continue; continue;
} }
@ -507,13 +502,22 @@ int main ( int argc, char** argv )
strCentralServer = DEFAULT_SERVER_ADDRESS; strCentralServer = DEFAULT_SERVER_ADDRESS;
} }
// adjust default port number for client: use different default port than the server since
// if the client is started before the server, the server would get a socket bind error
if ( bIsClient && !bCustomPortNumberGiven )
{
iPortNumber += 10; // increment by 10
}
// Application/GUI setup --------------------------------------------------- // display a warning if in server no GUI mode and a history file is requested
// Application object if ( !bIsClient && !bUseGUI && !strHistoryFileName.isEmpty() )
if ( !bUseGUI && !strHistoryFileName.isEmpty() )
{ {
tsConsole << "Qt5 requires a windowing system to paint a JPEG image; image will use SVG" << endl; tsConsole << "Qt5 requires a windowing system to paint a JPEG image; image will use SVG" << endl;
} }
// Application/GUI setup ---------------------------------------------------
// Application object
QCoreApplication* pApp = bUseGUI QCoreApplication* pApp = bUseGUI
? new QApplication ( argc, argv ) ? new QApplication ( argc, argv )
: new QCoreApplication ( argc, argv ); : new QCoreApplication ( argc, argv );