From b7b39ba6f2b19940275363a9f830a46e9c813b8b Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sat, 20 Jun 2020 17:26:52 +0200 Subject: [PATCH] some fixes for headless mode --- src/global.h | 5 +++++ src/multicolorledbar.h | 23 ++++++----------------- src/server.h | 1 - src/util.h | 4 +--- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/src/global.h b/src/global.h index eb893c73..22b9bb90 100755 --- a/src/global.h +++ b/src/global.h @@ -171,6 +171,11 @@ LED bar: lbr #define LOW_BOUND_SIG_METER ( -50.0 ) // dB #define UPPER_BOUND_SIG_METER ( 0.0 ) // dB +// defines for LED level meter CMultiColorLEDBar +#define NUM_STEPS_LED_BAR 8 +#define RED_BOUND_LED_BAR 7 +#define YELLOW_BOUND_LED_BAR 5 + // maximum number of connected clients at the server (must not be larger than 256) #define MAX_NUM_CHANNELS 50 // max number channels for server diff --git a/src/multicolorledbar.h b/src/multicolorledbar.h index 6f855b5b..d22d0f09 100755 --- a/src/multicolorledbar.h +++ b/src/multicolorledbar.h @@ -24,27 +24,17 @@ #pragma once -#ifndef HEADLESS -# include -# include -# include -# include -# include -# include -#endif +#include +#include +#include +#include +#include +#include #include "util.h" #include "global.h" -/* Definitions ****************************************************************/ -// defines for LED level meter CMultiColorLEDBar -#define NUM_STEPS_LED_BAR 8 -#define RED_BOUND_LED_BAR 7 -#define YELLOW_BOUND_LED_BAR 5 - - /* Classes ********************************************************************/ -#ifndef HEADLESS class CMultiColorLEDBar : public QWidget { Q_OBJECT @@ -98,4 +88,3 @@ protected: CVector vecpLEDs; QProgressBar* pProgressBar; }; -#endif diff --git a/src/server.h b/src/server.h index 28bcd2e4..4a370ad0 100755 --- a/src/server.h +++ b/src/server.h @@ -43,7 +43,6 @@ #include "util.h" #include "serverlogging.h" #include "serverlist.h" -#include "multicolorledbar.h" #include "recorder/jamrecorder.h" diff --git a/src/util.h b/src/util.h index ee70d662..71e5babf 100755 --- a/src/util.h +++ b/src/util.h @@ -38,6 +38,7 @@ # include # include # include +# include "ui_aboutdlgbase.h" #endif #include #include @@ -59,9 +60,6 @@ using namespace std; // because of the library: "vector" #else # include #endif -#ifndef HEADLESS -# include "ui_aboutdlgbase.h" -#endif class CClient; // forward declaration of CClient