( CSignalHandler::getSingletonP()->pSignalBase.data() );
+ }
+
+};
+
+#ifdef _WIN32
+
+class CSignalWin : public CSignalBase
+{
+public:
+ CSignalWin ( CSignalHandler* );
+ ~CSignalWin() override;
+
+ virtual QReadWriteLock* getLock() const override;
+
+private:
+ mutable QReadWriteLock lock;
+
+ static BOOL WINAPI signalHandler ( _In_ DWORD sigNum );
+};
+
+#else
+
+class CSignalUnix : public CSignalBase
+{
+public:
+ CSignalUnix ( CSignalHandler* );
+ ~CSignalUnix() override;
+
+ virtual QReadWriteLock* getLock() const override;
+
+private:
+ QSocketNotifier* socketNotifier = nullptr;
+ bool setSignalHandled ( int sigNum, bool state );
+
+ static int socketPair[2];
+ static void signalHandler ( int sigNum );
+};
+
+#endif
diff --git a/src/socket.cpp b/src/socket.cpp
index f4cdf5f1..ebcddb5d 100755
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -65,11 +65,9 @@ void CSocket::Init ( const quint16 iPortNumber )
}
else
{
- // Per definition use the port number plus ten for the client to make
- // it possible to run server and client on the same computer. If the
- // port is not available, try "NUM_SOCKET_PORTS_TO_TRY" times with
- // incremented port numbers.
- quint16 iClientPortIncrement = 10; // start value: port nubmer plus ten
+ // if the port is not available, try "NUM_SOCKET_PORTS_TO_TRY" times
+ // with incremented port numbers
+ quint16 iClientPortIncrement = 0;
bSuccess = false; // initialization for while loop
while ( !bSuccess && ( iClientPortIncrement <= NUM_SOCKET_PORTS_TO_TRY ) )
diff --git a/src/util.cpp b/src/util.cpp
index ec2a90ff..91a17abc 100755
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -348,16 +348,14 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
{
setupUi ( this );
- // set the text for the about dialog html text control
- txvCredits->setOpenExternalLinks ( true );
- txvCredits->setText (
- "" // general description of software
- "" + tr ( "The " ) + APP_NAME +
+ // general description of software
+ txvAbout->setText (
+ "
" + tr ( "The " ) + APP_NAME +
tr ( " software enables musicians to perform real-time jam sessions "
- "over the internet. There is a " ) + APP_NAME + tr ( " "
+ "over the internet." ) + "
" + tr ( "There is a " ) + APP_NAME + tr ( " "
"server which collects the audio data from each " ) +
APP_NAME + tr ( " client, mixes the audio data and sends the mix back "
- "to each client." ) + "
"
+ "to each client." ) + ""
"" // GPL header text
"This program is free software; you can redistribute it and/or modify "
"it under the terms of the GNU General Public License as published by "
@@ -370,27 +368,53 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : QDialog ( parent )
"License along with his program; if not, write to the Free Software "
"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 "
"USA"
- "
"
- "" + APP_NAME + // libraries used by this compilation
+ "
" );
+
+ // libraries used by this compilation
+ txvLibraries->setText ( APP_NAME +
tr ( " uses the following libraries, resources or code snippets:" ) +
- ""
- ""
- "We would like to acknowledge the contributors listed in the "
- "Github Contributors list"
- "
");
+ "
" + tr ( "Qt cross-platform application framework" ) +
+ ", http://www.qt.io
"
+ "Opus Interactive Audio Codec"
+ ", http://www.opus-codec.org
"
+ "" + tr ( "Audio reverberation code by Perry R. Cook and Gary P. Scavone" ) +
+ ", 1995 - 2004, "
+ "The Synthesis ToolKit in C++ (STK)
"
+ "" + tr ( "Some pixmaps are from the" ) + " Open Clip Art Library (OCAL), "
+ "http://openclipart.org
"
+ "" + tr ( "Country flag icons from Mark James" ) +
+ ", http://www.famfamfam.com
" );
+
+ // contributors list
+ txvContributors->setText (
+ "Peter L. Jones (pljones)
"
+ "Jonathan Baker-Bates (gilgongo)
"
+ "Daniele Masato (doloopuntil)
"
+ "Simon Tomlinson (sthenos)
"
+ "Marc jr. Landolt (braindef)
"
+ "Olivier Humbert (trebmuh)
"
+ "mirabilos (mirabilos)
"
+ "newlaurent62 (newlaurent62)
"
+ "Emlyn Bolton (emlynmac)
"
+ "Jos van den Oever (vandenoever)
"
+ "Tormod Volden (tormodvolden)
"
+ "Stanislas Michalak (stanislas-m)
"
+ "JP Cimalando (jpcima)
"
+ "
" + tr ( "For details on the contributions check out the " ) +
+ "" + tr ( "Github Contributors list" ) + "." );
+
+ // translators
+ txvTranslation->setText (
+ "" + tr ( "Spanish" ) + "
"
+ "Daryl Hanlon (ignotus666)
"
+ "" + tr ( "French" ) + "
"
+ "Olivier Humbert (trebmuh)
"
+ "" + tr ( "Portuguese" ) + "
"
+ "Miguel de Matos (Snayler)
"
+ "" + tr ( "Dutch" ) + "
"
+ "Jeroen Geertzen (jerogee)
"
+ "" + tr ( "German" ) + "
"
+ "Volker Fischer (corrados)
" );
// set version number in about dialog
lblVersion->setText ( GetVersionAndNameStr() );
@@ -406,7 +430,7 @@ QString CAboutDlg::GetVersionAndNameStr ( const bool bWithHtml )
// name, short description and GPL hint
if ( bWithHtml )
{
- strVersionText += "";
+ strVersionText += "";
}
else
{
@@ -424,24 +448,14 @@ QString CAboutDlg::GetVersionAndNameStr ( const bool bWithHtml )
strVersionText += "\n *** ";
}
- strVersionText += tr ( "Internet Jam Session Software" );
-
- if ( bWithHtml )
- {
- strVersionText += "
";
- }
- else
+ if ( !bWithHtml )
{
+ strVersionText += tr ( "Internet Jam Session Software" );
strVersionText += "\n *** ";
}
strVersionText += tr ( "Under the GNU General Public License (GPL)" );
- if ( bWithHtml )
- {
- strVersionText += "";
- }
-
return strVersionText;
}
@@ -823,7 +837,7 @@ void CMusProfDlg::OnSkillActivated ( int iCntryListItem )
// Help menu -------------------------------------------------------------------
-CHelpMenu::CHelpMenu ( const bool bIsClient, QWidget* parent ) : QMenu ( "&Help", parent )
+CHelpMenu::CHelpMenu ( const bool bIsClient, QWidget* parent ) : QMenu ( tr ( "&Help" ), parent )
{
// standard help menu consists of about and what's this help
if ( bIsClient )
@@ -850,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();
@@ -937,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
}
}
@@ -989,6 +1003,8 @@ CVector& CInstPictures::GetTable()
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Oboe" ), ":/png/instr/res/instruments/oboe.png", IC_WIND_INSTRUMENT ) );
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Harp" ), ":/png/instr/res/instruments/harp.png", IC_STRING_INSTRUMENT ) );
vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Viola" ), ":/png/instr/res/instruments/viola.png", IC_STRING_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Congas" ), ":/png/instr/res/instruments/congas.png", IC_PERCUSSION_INSTRUMENT ) );
+ vecDataBase.Add ( CInstPictProps ( QCoreApplication::translate ( "CMusProfDlg", "Bongo" ), ":/png/instr/res/instruments/bongo.png", IC_PERCUSSION_INSTRUMENT ) );
// now the table is initialized
TableIsInitialized = true;
diff --git a/src/util.h b/src/util.h
index 3c688f59..a2d52844 100755
--- a/src/util.h
+++ b/src/util.h
@@ -39,9 +39,7 @@
#include
#include
#include
-#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
-# include
-#endif
+#include
#include
#include
#include "global.h"
@@ -1217,7 +1215,6 @@ public:
// Timing measurement ----------------------------------------------------------
// intended for debugging the timing jitter of the sound card or server timer
-#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
class CTimingMeas
{
public:
@@ -1269,7 +1266,6 @@ protected:
QElapsedTimer ElapsedTimer;
int iCnt;
};
-#endif
/******************************************************************************\