From f51dd662c4917e70b5216248543ae878e0e44fa6 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Wed, 15 Apr 2020 15:21:58 +0200 Subject: [PATCH] some cleanup --- ChangeLog | 4 +--- src/global.h | 5 ----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76d3aeff..a5fec4c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,11 +15,9 @@ * bug fix: the server welcome message may appear twice if the server list was double clicked -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 issue with Mac audio interface: https://sourceforge.net/p/llcon/discussion/software/thread/7c443f2ed9/#eeab -TODO let the user select all possible sound card buffer sizes, this should solve Ticket #53 +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 diff --git a/src/global.h b/src/global.h index c509722b..45bc4781 100755 --- a/src/global.h +++ b/src/global.h @@ -100,7 +100,6 @@ LED bar: lbr // Note that the UpdateAutoSetting() function assumes a value of 128. #define SYSTEM_FRAME_SIZE_SAMPLES_SMALL 64 // TODO this is temporary and shall be replaced by SYSTEM_FRAME_SIZE_SAMPLES later on #define DOUBLE_SYSTEM_FRAME_SIZE_SAMPLES ( 2 * SYSTEM_FRAME_SIZE_SAMPLES_SMALL ) -#define SYSTEM_FRAME_SIZE_SAMPLES 128 // default server address #define DEFAULT_SERVER_ADDRESS "jamulus.fischvolk.de" @@ -122,10 +121,6 @@ LED bar: lbr // system sample rate (the sound card and audio coder works on this sample rate) #define SYSTEM_SAMPLE_RATE_HZ 48000 // Hz -#define SYSTEM_BLOCK_DURATION_MS_FLOAT \ - ( static_cast ( SYSTEM_FRAME_SIZE_SAMPLES ) / \ - SYSTEM_SAMPLE_RATE_HZ * 1000 ) - // define the allowed audio frame size factors (since the // "SYSTEM_FRAME_SIZE_SAMPLES" is quite small, it may be that on some // computers a larger value is required)