small merge fix
This commit is contained in:
parent
a5fd9129a2
commit
0c59a805fe
3 changed files with 1 additions and 3 deletions
|
@ -20,7 +20,6 @@ TODO auto jitter buffer performance not good at 64 samples frame size -> to be c
|
|||
TODO for different frame sizes (64/128) the start value of 6 for the jitter buffer might be too low
|
||||
|
||||
TODO store Central Server jamulus.server start scripts on the Repo (one for Central Server, one for Central Server North America)
|
||||
TODO should LHostAddr be QHostAddress instead of CHostAddress? See https://github.com/corrados/jamulus/pull/48#issuecomment-612594981
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -1567,7 +1567,7 @@ void CProtocol::CreateCLServerListMes ( const CHostAddress& InetAddr,
|
|||
{
|
||||
// convert server list strings to utf-8
|
||||
const QByteArray strUTF8Name = vecServerInfo[i].strName.toUtf8();
|
||||
const QByteArray strUTF8Empty = QString("").toUtf8();
|
||||
const QByteArray strUTF8Empty = QString ( "" ).toUtf8();
|
||||
const QByteArray strUTF8City = vecServerInfo[i].strCity.toUtf8();
|
||||
|
||||
// size of current list entry
|
||||
|
|
|
@ -183,7 +183,6 @@ protected:
|
|||
|
||||
QList<CServerListEntry> ServerList;
|
||||
|
||||
quint16 iPortNumber;
|
||||
QString strCentralServerAddress;
|
||||
int iNumPredefinedServers;
|
||||
bool bEnabled;
|
||||
|
|
Loading…
Reference in a new issue