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

added command line argument for new 64 samples server mode

Browse source
This commit is contained in:
Volker Fischer 2020-04-10 12:28:50 +02:00
parent dca678c83c
commit ed46357ac4
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -3,11 +3,10 @@
3.4.7git
TODO add command line argument for 64/124 frame size at the server
* added support for 64 samples frame size in the server (if server runs in 64 or 128 samples
mode it is still compatible to both, 64 and 128 samples frame size clients)
TODO support OPUS 64 in the server as a first step towards official 64 samples frame size support
TODO for different frame sizes (64/128) the start value of 6 for the jitter buffer might be too low
TODO #12 A server in the same NAT region as the client is not visible (https://sourceforge.net/p/llcon/bugs/12/)
@ -18,15 +17,18 @@ TODO https://sourceforge.net/p/llcon/discussion/533517/thread/62bd07fbcb/?limit=
TODO in CreateLevelsForAllConChannels we should call CStereoSignalLevelMeter::CalcLogResult instead -> make it public and static
TODO Multichannel CoreAudio Support #44 -> integrate important code lines in Mac sound interface
TODO for different frame sizes (64/128) the start value of 6 for the jitter buffer might be too low
TODO offer the Jamulus ASIO settingspanel in case of an ASIO ERROR to fix, e.g., incorrect sample rate (https://sourceforge.net/p/llcon/discussion/533517/thread/777663cf94/#035f)
TODO client: larger sound card buffers are managed by conversion buffer, not in processintern for loop (note iSndCrdFrameSizeFactor!)
TODO Multichannel CoreAudio Support #44 -> integrate important code lines in Mac sound interface
TODO update text in CAboutDlg
TODO client: larger sound card buffers are managed by conversion buffer, not in processintern for loop (note iSndCrdFrameSizeFactor!)
TODO mixer faders linear -> log gain is better

18
src/main.cpp
View file

@ -49,6 +49,7 @@ int main ( int argc, char** argv )
bool bStartMinimized = false;
bool bShowComplRegConnList = false;
bool bDisconnectAllClients = false;
bool bUseDoubleSystemFrameSize = true; // default is 128 samples frame size
bool bShowAnalyzerConsole = false;
bool bCentServPingServerInList = false;
bool bNoAutoJackConnect = false;
@ -110,6 +111,18 @@ int main ( int argc, char** argv )
}
// Use 64 samples frame size mode ----------------------------------------------------
if ( GetFlagArgument ( argv,
i,
"-F",
"--fastupdate" ) )
{
bUseDoubleSystemFrameSize = false; // 64 samples frame size
tsConsole << "- using " << SYSTEM_FRAME_SIZE_SAMPLES_SMALL << " samples frame size mode" << endl;
continue;
}
// Maximum number of channels ------------------------------------------
if ( GetNumericArgument ( tsConsole,
argc,
@ -513,10 +526,6 @@ int main ( int argc, char** argv )
}
else
{
// TODO
const bool bUseDoubleSystemFrameSize = true; // TODO for now this value is fixed but has to be changeable by command line argument
// Server:
// actual server object
CServer Server ( iNumServerChannels,
@ -615,6 +624,7 @@ QString UsageArguments ( char **argv )
" -c, --connect connect to given server address on startup\n"
" (client only)\n"
" -e, --centralserver address of the central server (server only)\n"
" -F, --fastupdate use 64 samples frame size mode (server only)\n"
" -g, --pingservers ping servers in list to keep NAT port open\n"
" (central server only)\n"
" -h, -?, --help this help text\n"