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

small merge fixes

Browse source
This commit is contained in:
Volker Fischer 2020-04-30 19:26:04 +02:00
parent afe5de4c72
commit 1494de7b05
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -9,6 +9,8 @@
* bug fix: for mono capture jack audio interface Jamulus complains it cannot make connections (Ticket #137) * bug fix: for mono capture jack audio interface Jamulus complains it cannot make connections (Ticket #137)
TODO implement panning for channels (Ticket #52, #145)
TODO improve help menu, see https://github.com/corrados/jamulus/issues/90 TODO improve help menu, see https://github.com/corrados/jamulus/issues/90
TODO support internationalization TODO support internationalization
@ -19,8 +21,6 @@ TODO sometimes I cannot see the central server in the server list
TODO server: warning if Central server selected but OS location is different (e.g. US) -> warning in GUI and command line TODO server: warning if Central server selected but OS location is different (e.g. US) -> warning in GUI and command line
TODO implement panning for channels (Ticket #52, #145)
TODO show mute state of others TODO show mute state of others

17
src/serverlist.cpp
View file

@ -31,13 +31,13 @@ CServerListManager::CServerListManager ( const quint16 iNPortNum,
const int iNumChannels, const int iNumChannels,
const bool bNCentServPingServerInList, const bool bNCentServPingServerInList,
CProtocol* pNConLProt ) CProtocol* pNConLProt )
: iNumPredefinedServers ( 0 ), : tsConsoleStream ( *( ( new ConsoleWriterFactory() )->get() ) ),
iNumPredefinedServers ( 0 ),
eCentralServerAddressType ( AT_MANUAL ), // must be AT_MANUAL for the "no GUI" case eCentralServerAddressType ( AT_MANUAL ), // must be AT_MANUAL for the "no GUI" case
bCentServPingServerInList ( bNCentServPingServerInList ), bCentServPingServerInList ( bNCentServPingServerInList ),
pConnLessProtocol ( pNConLProt ), pConnLessProtocol ( pNConLProt ),
eSvrRegStatus ( SRS_UNREGISTERED ), eSvrRegStatus ( SRS_UNREGISTERED ),
iSvrRegRetries ( 0 ), iSvrRegRetries ( 0 )
tsConsoleStream ( *( ( new ConsoleWriterFactory() )->get() ) )
{ {
// set the central server address // set the central server address
SetCentralServerAddress ( sNCentServAddr ); SetCentralServerAddress ( sNCentServAddr );
@ -308,7 +308,7 @@ void CServerListManager::OnTimerPingServerInList()
void CServerListManager::OnTimerPollList() void CServerListManager::OnTimerPollList()
{ {
CVector<CHostAddress> removals; CVector<CHostAddress> vecRemovedHostAddr;
QMutexLocker locker ( &Mutex ); QMutexLocker locker ( &Mutex );
@ -322,7 +322,7 @@ void CServerListManager::OnTimerPollList()
if ( ServerList[iIdx].RegisterTime.elapsed() > ( SERVLIST_TIME_OUT_MINUTES * 60000 ) ) if ( ServerList[iIdx].RegisterTime.elapsed() > ( SERVLIST_TIME_OUT_MINUTES * 60000 ) )
{ {
// remove this list entry // remove this list entry
removals.Add ( ServerList[iIdx].HostAddr ); vecRemovedHostAddr.Add ( ServerList[iIdx].HostAddr );
ServerList.removeAt ( iIdx ); ServerList.removeAt ( iIdx );
} }
else else
@ -331,11 +331,12 @@ void CServerListManager::OnTimerPollList()
iIdx++; iIdx++;
} }
} }
locker.unlock(); locker.unlock();
foreach ( const CHostAddress HostAddr , removals )
foreach ( const CHostAddress HostAddr, vecRemovedHostAddr )
{ {
tsConsoleStream << "Expired entry for " tsConsoleStream << "Expired entry for " << HostAddr.toString() << endl;
<< HostAddr.toString() << endl;
} }
} }

3
src/serverlist.h
View file

@ -186,6 +186,7 @@ protected:
QTimer TimerCLRegisterServerResp; QTimer TimerCLRegisterServerResp;
QMutex Mutex; QMutex Mutex;
QTextStream& tsConsoleStream;
QList<CServerListEntry> ServerList; QList<CServerListEntry> ServerList;
@ -207,8 +208,6 @@ protected:
// count of registration retries // count of registration retries
int iSvrRegRetries; int iSvrRegRetries;
QTextStream& tsConsoleStream;
public slots: public slots:
void OnTimerPollList(); void OnTimerPollList();
void OnTimerPingServerInList(); void OnTimerPingServerInList();