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

small cleanup

Browse source
This commit is contained in:
Volker Fischer 2020-04-13 12:05:56 +02:00
parent abf523bdfd
commit 90620b8da3
4 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -8,13 +8,13 @@
* bug fix: the server welcome message may appear twice if the server list was double clicked * bug fix: the server welcome message may appear twice if the server list was double clicked
TODO mixer faders linear -> log gain is better
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 client: larger sound card buffers are managed by conversion buffer, not in processintern for loop (note iSndCrdFrameSizeFactor!)
maybe let the use select all possible sound card buffer sizes, this should solve Ticket #53 maybe let the use select all possible sound card buffer sizes, this should solve Ticket #53
TODO mixer faders linear -> log gain is better: CalcFaderGain() -> x = -50:1:0; plot(x, (10 .^ (x / 10)))
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 auto jitter buffer performance not good at 64 samples frame size -> to be checked again TODO auto jitter buffer performance not good at 64 samples frame size -> to be checked again
TODO for different frame sizes (64/128) the start value of 6 for the jitter buffer might be too low TODO for different frame sizes (64/128) the start value of 6 for the jitter buffer might be too low

2
linux/sound.cpp
View file

@ -62,7 +62,7 @@ void CSound::OpenJack()
"use a tool like <i><a href=""http://qjackctl.sourceforge.net"">QJackCtl</a></i> " "use a tool like <i><a href=""http://qjackctl.sourceforge.net"">QJackCtl</a></i> "
"to adjust the Jack server sample rate.<br>Make sure to set the " "to adjust the Jack server sample rate.<br>Make sure to set the "
"<b>Frames/Period</b> to a low value like <b>" ) + "<b>Frames/Period</b> to a low value like <b>" ) +
QString().setNum ( SYSTEM_FRAME_SIZE_SAMPLES * FRAME_SIZE_FACTOR_PREFERRED ) + QString().setNum ( DOUBLE_SYSTEM_FRAME_SIZE_SAMPLES ) +
tr ( "</b> to achieve a low delay." ) ); tr ( "</b> to achieve a low delay." ) );
} }

14
src/global.h
View file

@ -107,7 +107,7 @@ LED bar: lbr
#define DEFAULT_SERVER_NAME "Central Server" #define DEFAULT_SERVER_NAME "Central Server"
// download URL // download URL
#define LLCON_DOWNLOAD_URL "http://sourceforge.net/projects/llcon/files" #define JAMULUS_DOWNLOAD_URL "http://sourceforge.net/projects/llcon/files"
// determining server internal address uses well-known host and port // determining server internal address uses well-known host and port
// (Google DNS, or something else reliable) // (Google DNS, or something else reliable)
@ -116,11 +116,7 @@ LED bar: lbr
#define IP_LOOKUP_TIMEOUT 500 // ms #define IP_LOOKUP_TIMEOUT 500 // ms
// defined port numbers for client and server // defined port numbers for client and server
#if ( SYSTEM_FRAME_SIZE_SAMPLES == 64 ) #define LLCON_DEFAULT_PORT_NUMBER 22124
# define LLCON_DEFAULT_PORT_NUMBER 22064 // different port number for 64 samples frame size version
#else
# define LLCON_DEFAULT_PORT_NUMBER 22124
#endif
#define LLCON_PORT_NUMBER_NORTHAMERICA 22224 #define LLCON_PORT_NUMBER_NORTHAMERICA 22224
// system sample rate (the sound card and audio coder works on this sample rate) // system sample rate (the sound card and audio coder works on this sample rate)
@ -133,9 +129,9 @@ LED bar: lbr
// define the allowed audio frame size factors (since the // define the allowed audio frame size factors (since the
// "SYSTEM_FRAME_SIZE_SAMPLES" is quite small, it may be that on some // "SYSTEM_FRAME_SIZE_SAMPLES" is quite small, it may be that on some
// computers a larger value is required) // computers a larger value is required)
#define FRAME_SIZE_FACTOR_PREFERRED 1 // 128 (for frame size 128), 64 (for frame size 64) #define FRAME_SIZE_FACTOR_PREFERRED 1 // 64 samples accumulated frame size
#define FRAME_SIZE_FACTOR_DEFAULT 2 // 256 (for frame size 128), 128 (for frame size 64) #define FRAME_SIZE_FACTOR_DEFAULT 2 // 128 samples accumulated frame size
#define FRAME_SIZE_FACTOR_SAFE 4 // 512 (for frame size 128), 256 (for frame size 64) #define FRAME_SIZE_FACTOR_SAFE 4 // 256 samples accumulated frame size
// define the minimum allowed number of coded bytes for CELT (the encoder // define the minimum allowed number of coded bytes for CELT (the encoder
// gets in trouble if the value is too low) // gets in trouble if the value is too low)

2
src/util.h
View file

@ -482,7 +482,7 @@ public slots:
void OnHelpWhatsThis() { QWhatsThis::enterWhatsThisMode(); } void OnHelpWhatsThis() { QWhatsThis::enterWhatsThisMode(); }
void OnHelpAbout() { AboutDlg.exec(); } void OnHelpAbout() { AboutDlg.exec(); }
void OnHelpDownloadLink() void OnHelpDownloadLink()
{ QDesktopServices::openUrl ( QUrl ( LLCON_DOWNLOAD_URL ) ); } { QDesktopServices::openUrl ( QUrl ( JAMULUS_DOWNLOAD_URL ) ); }
}; };