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

moved one more settings in the settings class

Browse source
This commit is contained in:
Volker Fischer 2020-07-04 20:23:00 +02:00
parent 9fe9c4c261
commit d479c09307
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/client.cpp
View file

@ -31,8 +31,7 @@ CClient::CClient ( const quint16 iPortNumber,
const int iCtrlMIDIChannel,
const bool bNoAutoJackConnect,
const QString& strNClientName ) :
vstrIPAddress ( MAX_NUM_SERVER_ADDR_ITEMS, "" ),
ChannelInfo (),
ChannelInfo ( ),
strClientName ( strNClientName ),
Channel ( false ), /* we need a client channel -> "false" */
CurOpusEncoder ( nullptr ),

1
src/client.h
View file

@ -278,7 +278,6 @@ public:
{ Channel.GetBufErrorRates ( vecErrRates, dLimit, dMaxUpLimit ); }
// settings
CVector<QString> vstrIPAddress;
CChannelCoreInfo ChannelInfo;
QString strClientName;

4
src/clientdlg.cpp
View file

@ -697,7 +697,7 @@ void CClientDlg::OnConnectDlgAccepted()
{
// store new address at the top of the list, if the list was already
// full, the last element is thrown out
pClient->vstrIPAddress.StringFiFoWithCompare ( strSelectedAddress );
pSettings->vstrIPAddress.StringFiFoWithCompare ( strSelectedAddress );
}
// get name to be set in audio mixer group box title
@ -881,7 +881,7 @@ void CClientDlg::SetMyWindowTitle ( const int iNumClients )
void CClientDlg::ShowConnectionSetupDialog()
{
// init the connect dialog
ConnectDlg.Init ( pClient->vstrIPAddress );
ConnectDlg.Init ( pSettings->vstrIPAddress );
ConnectDlg.SetCentralServerAddress ( NetworkUtil::GetCentralServerAddress ( pClient->GetCentralServerAddressType(),
pClient->GetServerListCentralServerAddress() ) );

4
src/settings.cpp
View file

@ -221,7 +221,7 @@ void CClientSettings::ReadFromXML ( const QDomDocument& IniXMLDocument )
// IP addresses
for ( iIdx = 0; iIdx < MAX_NUM_SERVER_ADDR_ITEMS; iIdx++ )
{
pClient->vstrIPAddress[iIdx] =
vstrIPAddress[iIdx] =
GetIniSetting ( IniXMLDocument, "client",
QString ( "ipaddress%1" ).arg ( iIdx ), "" );
}
@ -554,7 +554,7 @@ void CClientSettings::WriteToXML ( QDomDocument& IniXMLDocument )
{
PutIniSetting ( IniXMLDocument, "client",
QString ( "ipaddress%1" ).arg ( iIdx ),
pClient->vstrIPAddress[iIdx] );
vstrIPAddress[iIdx] );
}
// stored fader tags

2
src/settings.h
View file

@ -117,6 +117,7 @@ public:
vecStoredFaderIsSolo ( MAX_NUM_STORED_FADER_SETTINGS, false ),
vecStoredFaderIsMute ( MAX_NUM_STORED_FADER_SETTINGS, false ),
vecStoredFaderGroupID ( MAX_NUM_STORED_FADER_SETTINGS, INVALID_INDEX ),
vstrIPAddress ( MAX_NUM_SERVER_ADDR_ITEMS, "" ),
iNewClientFaderLevel ( 100 ),
bConnectDlgShowAllMusicians ( true ),
vecWindowPosMain ( ), // empty array
@ -137,6 +138,7 @@ public:
CVector<int> vecStoredFaderIsSolo;
CVector<int> vecStoredFaderIsMute;
CVector<int> vecStoredFaderGroupID;
CVector<QString> vstrIPAddress;
int iNewClientFaderLevel;
bool bConnectDlgShowAllMusicians;