// solves a compile problem on recent Ubuntu
+#endif
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+/* Definitions ****************************************************************/
+// define this macro to get debug output
+//#define _DEBUG_
+#undef _DEBUG_
+
+// version and application name (use version from qt prject file)
+#undef VERSION
+#define VERSION APP_VERSION
+#define APP_NAME "Jamulus"
+
+// Windows registry key name of auto run entry for the server
+#define AUTORUN_SERVER_REG_NAME "Jamulus server"
+
+// default names of the ini-file for client and server
+#define DEFAULT_INI_FILE_NAME "Jamulus.ini"
+#define DEFAULT_INI_FILE_NAME_SERVER "Jamulusserver.ini"
+
+// file name for logging file
+#define DEFAULT_LOG_FILE_NAME "Jamulussrvlog.txt"
+
+// System block size, this is the block size on which the audio coder works.
+// All other block sizes must be a multiple of this size.
+// Note that the UpdateAutoSetting() function assumes a value of 128.
+#define SYSTEM_FRAME_SIZE_SAMPLES 64
+#define DOUBLE_SYSTEM_FRAME_SIZE_SAMPLES ( 2 * SYSTEM_FRAME_SIZE_SAMPLES )
+
+// additional buffer for delay panning
+#define MAX_DELAY_PANNING_SAMPLES 64
+
+// default server address and port numbers
+#define DEFAULT_QOS_NUMBER 128 // CS4 (Quality of Service)
+#define DEFAULT_SERVER_ADDRESS "anygenre1.jamulus.io"
+#define DEFAULT_PORT_NUMBER 22124
+#define CENTSERV_ANY_GENRE2 "anygenre2.jamulus.io:22224"
+#define CENTSERV_ANY_GENRE3 "anygenre3.jamulus.io:22624"
+#define CENTSERV_GENRE_ROCK "rock.jamulus.io:22424"
+#define CENTSERV_GENRE_JAZZ "jazz.jamulus.io:22324"
+#define CENTSERV_GENRE_CLASSICAL_FOLK "classical.jamulus.io:22524"
+#define CENTSERV_GENRE_CHORAL "choral.jamulus.io:22724"
+
+// specify an invalid port to disable the server
+#define INVALID_PORT -1
+
+// servers to check for new versions
+#define UPDATECHECK1_ADDRESS "updatecheck1.jamulus.io"
+#define UPDATECHECK2_ADDRESS "updatecheck2.jamulus.io"
+
+// getting started and software manual URL
+#define CLIENT_GETTING_STARTED_URL "https://jamulus.io/wiki/Getting-Started"
+#define SERVER_GETTING_STARTED_URL "https://jamulus.io/wiki/Running-a-Server"
+#define SOFTWARE_MANUAL_URL "https://jamulus.io/wiki/Software-Manual"
+
+// app update message
+#define APP_UPGRADE_AVAILABLE_MSG_TEXT \
+ QCoreApplication::translate ( \
+ "global", \
+ "A %1 upgrade is available: go to details and downloads" )
+
+// determining server internal address uses well-known host and port
+// We just need a valid, public Internet IP here. We will not send any
+// traffic there as we will only set up an UDP socket without sending any
+// data.
+#define WELL_KNOWN_HOST "1.1.1.1" // CloudFlare
+#define WELL_KNOWN_HOST6 "2606:4700:4700::1111" // CloudFlare
+#define WELL_KNOWN_PORT DEFAULT_PORT_NUMBER
+#define IP_LOOKUP_TIMEOUT 500 // ms
+
+// system sample rate (the sound card and audio coder works on this sample rate)
+#define SYSTEM_SAMPLE_RATE_HZ 48000 // Hz
+
+// 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)
+#define FRAME_SIZE_FACTOR_PREFERRED 1 // 64 samples accumulated frame size
+#define FRAME_SIZE_FACTOR_DEFAULT 2 // 128 samples accumulated frame size
+#define FRAME_SIZE_FACTOR_SAFE 4 // 256 samples accumulated frame size
+
+// define the minimum allowed number of coded bytes for CELT (the encoder
+// gets in trouble if the value is too low)
+#define CELT_MINIMUM_NUM_BYTES 10
+
+// Maximum block size for network input buffer. It is defined by the longest
+// protocol message which is PROTMESSID_CLM_SERVER_LIST: Worst case:
+// (2+2+1+2+2)+200*(4+2+2+1+1+2+20+2+32+2+20)=17609
+// We add some headroom to that value.
+#define MAX_SIZE_BYTES_NETW_BUF 20000
+
+// minimum/maximum network buffer size (which can be chosen by slider)
+#define MIN_NET_BUF_SIZE_NUM_BL 1 // number of blocks
+#define MAX_NET_BUF_SIZE_NUM_BL 20 // number of blocks
+#define AUTO_NET_BUF_SIZE_FOR_PROTOCOL ( MAX_NET_BUF_SIZE_NUM_BL + 1 ) // auto set parameter (only used for protocol)
+
+// default network buffer size
+#define DEF_NET_BUF_SIZE_NUM_BL 10 // number of blocks
+
+// audio mixer fader and panning maximum value
+#define AUD_MIX_FADER_MAX 100
+#define AUD_MIX_PAN_MAX 100
+
+// range of audio mixer fader
+#define AUD_MIX_FADER_RANGE_DB 35.0f
+
+// coefficient for averaging channel levels for automatic fader adjustment
+#define AUTO_FADER_ADJUST_ALPHA 0.2f
+
+// target level for auto fader adjustment in decibels
+#define AUTO_FADER_TARGET_LEVEL_DB -30.0f
+
+// threshold in decibels below which the channel is considered as noise
+// and not adjusted
+#define AUTO_FADER_NOISE_THRESHOLD_DB -40.0f
+
+// maximum number of fader groups (must be consistent to audiomixerboard implementation)
+#define MAX_NUM_FADER_GROUPS 8
+
+// maximum number of recognized sound cards installed in the system
+#define MAX_NUMBER_SOUND_CARDS 129 // e.g. 16 inputs, 8 outputs + default entry (MacOS)
+
+// define the maximum number of audio channel for input/output we can store
+// channel infos for (and therefore this is the maximum number of entries in
+// the channel selection combo box regardless of the actual available number
+// of channels by the audio device)
+#define MAX_NUM_IN_OUT_CHANNELS 64
+
+// maximum number of elemts in the server address combo box
+#define MAX_NUM_SERVER_ADDR_ITEMS 12
+
+// maximum number of fader settings to be stored (together with the fader tags)
+#define MAX_NUM_STORED_FADER_SETTINGS 250
+
+// range for signal level meter
+#define LOW_BOUND_SIG_METER ( -50.0 ) // dB
+#define UPPER_BOUND_SIG_METER ( 0.0 ) // dB
+
+// defines for LED level meter CLevelMeter
+#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 150 // max number channels for server
+
+// actual number of used channels in the server
+// this parameter can safely be changed from 1 to MAX_NUM_CHANNELS
+// without any other changes in the code
+#define DEFAULT_USED_NUM_CHANNELS 10 // default used number channels for server
+
+// Maximum number of servers registered in the server list. If you want to
+// change this parameter, you most probably have to adjust MAX_SIZE_BYTES_NETW_BUF.
+#define MAX_NUM_SERVERS_IN_SERVER_LIST 150 // reduced to 150 because we now have genre-based server lists
+
+// defines the time interval at which the ping time is updated in the GUI
+#define PING_UPDATE_TIME_MS 500 // ms
+
+// defines the time interval at which the ping time is updated for the server list
+#define PING_UPDATE_TIME_SERVER_LIST_MS 2500 // ms
+
+// defines the interval between Channel Level updates from the server
+#define CHANNEL_LEVEL_UPDATE_INTERVAL 200 // number of frames at 64 samples frame size
+
+// time-out until a registered server is deleted from the server list if no
+// new registering was made in minutes
+#define SERVLIST_TIME_OUT_MINUTES 33 // minutes (should include 3 UDP registration messages)
+
+// poll time for server list (to check if entries are time-out)
+#define SERVLIST_POLL_TIME_MINUTES 1 // minute
+
+// time interval for sending ping messages to servers in the server list
+#define SERVLIST_UPDATE_PING_SERVERS_MS 59000 // ms
+
+// time between server registration refreshes
+#define SERVLIST_REGIST_INTERV_MINUTES 15 // minutes
+
+// defines the minimum time a server must run to be a permanent server
+#define SERVLIST_TIME_PERMSERV_MINUTES 2880 // minutes, 2880 = 60 min * 24 h * 2 d
+
+// registration response timeout
+#define REGISTER_SERVER_TIME_OUT_MS 500 // ms
+
+// defines the maximum number of times to retry server registration
+// when no response is received within the timeout (before reverting
+// to SERVLIST_REGIST_INTERV_MINUTES)
+#define REGISTER_SERVER_RETRY_LIMIT 5 // count
+
+// Maximum length of fader tag and text message strings (Since for chat messages
+// some HTML code is added, we also have to define a second length which includes
+// this additionl HTML code. Right now the length of the HTML code is approx. 66
+// characters. Here, we add some headroom to this number)
+#define MAX_LEN_FADER_TAG 16
+#define MAX_LEN_CHAT_TEXT 1600
+#define MAX_LEN_CHAT_TEXT_PLUS_HTML 1800
+#define MAX_LEN_SERVER_NAME 20
+#define MAX_LEN_IP_ADDRESS 15
+#define MAX_LEN_SERVER_CITY 20
+#define MAX_LEN_VERSION_TEXT 30
+
+// define Settings tab indexes
+#define SETTING_TAB_USER 0
+#define SETTING_TAB_AUDIONET 1
+#define SETTING_TAB_ADVANCED 2
+
+// common tool tip bottom line text
+#define TOOLTIP_COM_END_TEXT \
+ "
" + \
+ QCoreApplication::translate ( "global", \
+ "For more information use the \"What's " \
+ "This\" help (help menu, right mouse button or Shift+F1)" ) + \
+ "
"
+
+// server welcome message title (do not change for compatibility!)
+#define WELCOME_MESSAGE_PREFIX "Server Welcome Message: "
+
+// mixer settings file name suffix
+#define MIX_SETTINGS_FILE_SUFFIX "jch"
+
+// minimum length of JSON-RPC secret string (main.cpp)
+#define JSON_RPC_MINIMUM_SECRET_LENGTH 16
+
+// JSON-RPC listen address (Default)
+#define DEFAULT_JSON_RPC_LISTEN_ADDRESS "127.0.0.1"
+
+#define _MAXSHORT 32767
+#define _MINSHORT ( -32768 )
+#define INVALID_INDEX -1 // define invalid index as a negative value (a valid index must always be >= 0)
+
+#if HAVE_STDINT_H
+# include
+#elif HAVE_INTTYPES_H
+# include
+#elif defined( _WIN32 )
+typedef __int64 int64_t;
+typedef __int32 int32_t;
+typedef __int16 int16_t;
+typedef unsigned __int64 uint64_t;
+typedef unsigned __int32 uint32_t;
+typedef unsigned __int16 uint16_t;
+typedef unsigned __int8 uint8_t;
+#elif defined( ANDROID )
+// don't redfine types for android as these ones below don't work
+#else
+typedef long long int64_t;
+typedef int int32_t;
+typedef short int16_t;
+typedef unsigned long long uint64_t;
+typedef unsigned int uint32_t;
+typedef unsigned short uint16_t;
+typedef unsigned char uint8_t;
+#endif
+
+/* Pseudo enum definitions -------------------------------------------------- */
+// definition for custom event
+#define MS_PACKET_RECEIVED 0
+
+/* Classes ********************************************************************/
+class CGenErr
+{
+public:
+ CGenErr ( QString strNewErrorMsg, QString strNewErrorType = "" ) : strErrorMsg ( strNewErrorMsg ), strErrorType ( strNewErrorType ) {}
+
+ QString GetErrorText() const
+ {
+ // return formatted error text
+ if ( strErrorType.isEmpty() )
+ {
+ return strErrorMsg;
+ }
+ else
+ {
+ return strErrorType + ": " + strErrorMsg;
+ }
+ }
+
+protected:
+ QString strErrorMsg;
+ QString strErrorType;
+};
+
+class CCustomEvent : public QEvent
+{
+public:
+ CCustomEvent ( int iNewMeTy, int iNewSt, int iNewChN = 0 ) :
+ QEvent ( QEvent::Type ( QEvent::User + 11 ) ),
+ iMessType ( iNewMeTy ),
+ iStatus ( iNewSt ),
+ iChanNum ( iNewChN )
+ {}
+
+ int iMessType;
+ int iStatus;
+ int iChanNum;
+};
+
+/* Prototypes for global functions ********************************************/
+// command line parsing, TODO do not declare functions globally but in a class
+QString UsageArguments ( char** argv );
+
+bool GetFlagArgument ( char** argv, int& i, QString strShortOpt, QString strLongOpt );
+
+bool GetStringArgument ( int argc, char** argv, int& i, QString strShortOpt, QString strLongOpt, QString& strArg );
+
+bool GetNumericArgument ( int argc,
+ char** argv,
+ int& i,
+ QString strShortOpt,
+ QString strLongOpt,
+ double rRangeStart,
+ double rRangeStop,
+ double& rValue );
diff --git a/src/levelmeter.cpp b/src/levelmeter.cpp
index 11adc17921..b5c47bcbf1 100644
--- a/src/levelmeter.cpp
+++ b/src/levelmeter.cpp
@@ -28,53 +28,11 @@
#include "levelmeter.h"
/* Implementation *************************************************************/
-CLevelMeter::CLevelMeter ( QWidget* parent ) : QWidget ( parent ), eLevelMeterType ( MT_BAR_WIDE )
+CLevelMeter::CLevelMeter ( QObject* parent )
+ : QObject(parent),
+ m_doubleVal(0.0)
{
- // initialize LED meter
- QWidget* pLEDMeter = new QWidget();
- QVBoxLayout* pLEDLayout = new QVBoxLayout ( pLEDMeter );
- pLEDLayout->setAlignment ( Qt::AlignHCenter );
- pLEDLayout->setContentsMargins ( 0, 0, 0, 0 );
- pLEDLayout->setSpacing ( 0 );
-
- // create LEDs plus the clip LED
- vecpLEDs.Init ( NUM_LEDS_INCL_CLIP_LED );
-
- for ( int iLEDIdx = NUM_LEDS_INCL_CLIP_LED - 1; iLEDIdx >= 0; iLEDIdx-- )
- {
- // create LED object
- vecpLEDs[iLEDIdx] = new cLED ( parent );
-
- // add LED to layout with spacer (do not add spacer on the bottom of the first LED)
- if ( iLEDIdx < NUM_LEDS_INCL_CLIP_LED - 1 )
- {
- pLEDLayout->addStretch();
- }
-
- pLEDLayout->addWidget ( vecpLEDs[iLEDIdx]->GetLabelPointer() );
- }
-
- // initialize bar meter
- pBarMeter = new QProgressBar();
- pBarMeter->setOrientation ( Qt::Vertical );
- pBarMeter->setRange ( 0, 100 * NUM_STEPS_LED_BAR ); // use factor 100 to reduce quantization (bar is continuous)
- pBarMeter->setFormat ( "" ); // suppress percent numbers
-
- // setup stacked layout for meter type switching mechanism
- pMinStackedLayout = new CMinimumStackedLayout ( this );
- pMinStackedLayout->addWidget ( pLEDMeter );
- pMinStackedLayout->addWidget ( pBarMeter );
-
- // according to QScrollArea description: "When using a scroll area to display the
- // contents of a custom widget, it is important to ensure that the size hint of
- // the child widget is set to a suitable value."
- pBarMeter->setMinimumSize ( QSize ( 1, 1 ) );
- pLEDMeter->setMinimumSize ( QSize ( 1, 1 ) );
-
- // update the meter type (using the default value of the meter type)
- SetLevelMeterType ( eLevelMeterType );
-
- // setup clip indicator timer
+ // setup clip indicator timer
TimerClip.setSingleShot ( true );
TimerClip.setInterval ( CLIP_IND_TIME_OUT_MS );
@@ -84,243 +42,38 @@ CLevelMeter::CLevelMeter ( QWidget* parent ) : QWidget ( parent ), eLevelMeterTy
CLevelMeter::~CLevelMeter()
{
- // clean up the LED objects
- for ( int iLEDIdx = 0; iLEDIdx < NUM_LEDS_INCL_CLIP_LED; iLEDIdx++ )
- {
- delete vecpLEDs[iLEDIdx];
- }
+ // nothing for now
+ ;
}
-void CLevelMeter::SetLevelMeterType ( const ELevelMeterType eNType )
+bool CLevelMeter::clipStatus()
{
- eLevelMeterType = eNType;
-
- switch ( eNType )
- {
- case MT_LED_STRIPE:
- // initialize all LEDs
- for ( int iLEDIdx = 0; iLEDIdx < NUM_LEDS_INCL_CLIP_LED; iLEDIdx++ )
- {
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_BLACK );
- }
- pMinStackedLayout->setCurrentIndex ( 0 );
- break;
-
- case MT_LED_ROUND_BIG:
- // initialize all LEDs
- for ( int iLEDIdx = 0; iLEDIdx < NUM_LEDS_INCL_CLIP_LED; iLEDIdx++ )
- {
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_ROUND_BIG_BLACK );
- }
- pMinStackedLayout->setCurrentIndex ( 0 );
- break;
-
- case MT_LED_ROUND_SMALL:
- // initialize all LEDs
- for ( int iLEDIdx = 0; iLEDIdx < NUM_LEDS_INCL_CLIP_LED; iLEDIdx++ )
- {
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_ROUND_SMALL_BLACK );
- }
- pMinStackedLayout->setCurrentIndex ( 0 );
- break;
-
- case MT_BAR_WIDE:
- case MT_BAR_NARROW:
- pMinStackedLayout->setCurrentIndex ( 1 );
- break;
- }
-
- // update bar meter style and reset clip state
- SetBarMeterStyleAndClipStatus ( eNType, false );
+ return m_clipStatus;
}
-void CLevelMeter::SetBarMeterStyleAndClipStatus ( const ELevelMeterType eNType, const bool bIsClip )
+void CLevelMeter::setClipStatus( const bool bIsClip )
{
- switch ( eNType )
- {
- case MT_BAR_NARROW:
- if ( bIsClip )
- {
- pBarMeter->setStyleSheet ( "QProgressBar { border: 0px solid red;"
- " margin: 0px;"
- " padding: 0px;"
- " width: 4px;"
- " background: red; }"
- "QProgressBar::chunk { background: green; }" );
- }
- else
- {
- pBarMeter->setStyleSheet ( "QProgressBar { border: 0px;"
- " margin: 0px;"
- " padding: 0px;"
- " width: 4px; }"
- "QProgressBar::chunk { background: green; }" );
- }
- break;
+ m_clipStatus = bIsClip;
- default: /* MT_BAR_WIDE */
- if ( bIsClip )
- {
- pBarMeter->setStyleSheet ( "QProgressBar { border: 2px solid red;"
- " margin: 1px;"
- " padding: 1px;"
- " width: 15px;"
- " background: transparent; }"
- "QProgressBar::chunk { background: green; }" );
- }
- else
- {
- pBarMeter->setStyleSheet ( "QProgressBar { margin: 1px;"
- " padding: 1px;"
- " width: 15px; }"
- "QProgressBar::chunk { background: green; }" );
- }
- break;
- }
+ emit clipStatusChanged();
}
-void CLevelMeter::SetValue ( const double dValue )
+void CLevelMeter::setDoubleVal ( const double value )
{
- switch ( eLevelMeterType )
- {
- case MT_LED_STRIPE:
- // update state of all LEDs for current level value (except of the clip LED)
- for ( int iLEDIdx = 0; iLEDIdx < NUM_STEPS_LED_BAR; iLEDIdx++ )
- {
- // set active LED color if value is above current LED index
- if ( iLEDIdx < dValue )
- {
- // check which color we should use (green, yellow or red)
- if ( iLEDIdx < YELLOW_BOUND_LED_BAR )
- {
- // green region
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_GREEN );
- }
- else
- {
- if ( iLEDIdx < RED_BOUND_LED_BAR )
- {
- // yellow region
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_YELLOW );
- }
- else
- {
- // red region
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_RED );
- }
- }
- }
- else
- {
- // we use black LED for inactive state
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_BLACK );
- }
- }
- break;
-
- case MT_LED_ROUND_BIG:
- // update state of all LEDs for current level value (except of the clip LED)
- for ( int iLEDIdx = 0; iLEDIdx < NUM_STEPS_LED_BAR; iLEDIdx++ )
- {
- // set active LED color if value is above current LED index
- if ( iLEDIdx < dValue )
- {
- // check which color we should use (green, yellow or red)
- if ( iLEDIdx < YELLOW_BOUND_LED_BAR )
- {
- // green region
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_ROUND_BIG_GREEN );
- }
- else
- {
- if ( iLEDIdx < RED_BOUND_LED_BAR )
- {
- // yellow region
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_ROUND_BIG_YELLOW );
- }
- else
- {
- // red region
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_ROUND_BIG_RED );
- }
- }
- }
- else
- {
- // we use black LED for inactive state
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_ROUND_BIG_BLACK );
- }
- }
- break;
-
- case MT_LED_ROUND_SMALL:
- // update state of all LEDs for current level value (except of the clip LED)
- for ( int iLEDIdx = 0; iLEDIdx < NUM_STEPS_LED_BAR; iLEDIdx++ )
- {
- // set active LED color if value is above current LED index
- if ( iLEDIdx < dValue )
- {
- // check which color we should use (green, yellow or red)
- if ( iLEDIdx < YELLOW_BOUND_LED_BAR )
- {
- // green region
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_ROUND_SMALL_GREEN );
- }
- else
- {
- if ( iLEDIdx < RED_BOUND_LED_BAR )
- {
- // yellow region
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_ROUND_SMALL_YELLOW );
- }
- else
- {
- // red region
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_ROUND_SMALL_RED );
- }
- }
- }
- else
- {
- // we use black LED for inactive state
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_ROUND_SMALL_BLACK );
- }
- }
- break;
-
- case MT_BAR_WIDE:
- case MT_BAR_NARROW:
- pBarMeter->setValue ( 100 * dValue );
- break;
- }
+ m_doubleVal = value / NUM_STEPS_LED_BAR;
+ emit doubleValChanged();
+ // qDebug() << "Level doubleVal: " << m_doubleVal;
// clip indicator management (note that in case of clipping, i.e. full
// scale level, the value is above NUM_STEPS_LED_BAR since the minimum
// value of int16 is -32768 but we normalize with 32767 -> therefore
// we really only show the clipping indicator, if actually the largest
// value of int16 is used)
- if ( dValue > NUM_STEPS_LED_BAR )
+ if ( value > NUM_STEPS_LED_BAR )
{
- switch ( eLevelMeterType )
- {
- case MT_LED_STRIPE:
- vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_RED );
- break;
-
- case MT_LED_ROUND_BIG:
- vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_ROUND_BIG_RED );
- break;
-
- case MT_LED_ROUND_SMALL:
- vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_ROUND_SMALL_RED );
- break;
-
- case MT_BAR_WIDE:
- case MT_BAR_NARROW:
- SetBarMeterStyleAndClipStatus ( eLevelMeterType, true );
- break;
- }
-
+ qDebug() << "Level value: " << value;
+ setClipStatus(true);
+ emit clipStatusChanged();
TimerClip.start();
}
}
@@ -330,110 +83,6 @@ void CLevelMeter::ClipReset()
// we manually want to reset the clipping indicator: stop timer and reset
// clipping indicator GUI element
TimerClip.stop();
-
- switch ( eLevelMeterType )
- {
- case MT_LED_STRIPE:
- vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_BLACK );
- break;
-
- case MT_LED_ROUND_BIG:
- vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_ROUND_BIG_BLACK );
- break;
-
- case MT_LED_ROUND_SMALL:
- vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_ROUND_SMALL_BLACK );
- break;
-
- case MT_BAR_WIDE:
- case MT_BAR_NARROW:
- SetBarMeterStyleAndClipStatus ( eLevelMeterType, false );
- break;
- }
-}
-
-CLevelMeter::cLED::cLED ( QWidget* parent ) :
- BitmCubeLedBlack ( QString::fromUtf8 ( ":/png/LEDs/res/HLEDBlack.png" ) ),
- BitmCubeLedGreen ( QString::fromUtf8 ( ":/png/LEDs/res/HLEDGreen.png" ) ),
- BitmCubeLedYellow ( QString::fromUtf8 ( ":/png/LEDs/res/HLEDYellow.png" ) ),
- BitmCubeLedRed ( QString::fromUtf8 ( ":/png/LEDs/res/HLEDRed.png" ) ),
- BitmCubeRoundSmallLedBlack ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDBlackSmall.png" ) ),
- BitmCubeRoundSmallLedGreen ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreenSmall.png" ) ),
- BitmCubeRoundSmallLedYellow ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDYellowSmall.png" ) ),
- BitmCubeRoundSmallLedRed ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDRedSmall.png" ) ),
- BitmCubeRoundBigLedBlack ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDBlackBig.png" ) ),
- BitmCubeRoundBigLedGreen ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreenBig.png" ) ),
- BitmCubeRoundBigLedYellow ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDYellowBig.png" ) ),
- BitmCubeRoundBigLedRed ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDRedBig.png" ) )
-{
- // create LED label
- pLEDLabel = new QLabel ( "", parent );
-
- // set initial bitmap
- pLEDLabel->setPixmap ( BitmCubeLedBlack );
- eCurLightColor = RL_BLACK;
-}
-
-void CLevelMeter::cLED::SetColor ( const ELightColor eNewColor )
-{
- // only update LED if color has changed
- if ( eNewColor != eCurLightColor )
- {
- switch ( eNewColor )
- {
- case RL_DISABLED:
- // note that this is required for the compact channel mode
- pLEDLabel->setPixmap ( QPixmap() );
- break;
-
- case RL_BLACK:
- pLEDLabel->setPixmap ( BitmCubeLedBlack );
- break;
-
- case RL_GREEN:
- pLEDLabel->setPixmap ( BitmCubeLedGreen );
- break;
-
- case RL_YELLOW:
- pLEDLabel->setPixmap ( BitmCubeLedYellow );
- break;
-
- case RL_RED:
- pLEDLabel->setPixmap ( BitmCubeLedRed );
- break;
-
- case RL_ROUND_SMALL_BLACK:
- pLEDLabel->setPixmap ( BitmCubeRoundSmallLedBlack );
- break;
-
- case RL_ROUND_SMALL_GREEN:
- pLEDLabel->setPixmap ( BitmCubeRoundSmallLedGreen );
- break;
-
- case RL_ROUND_SMALL_YELLOW:
- pLEDLabel->setPixmap ( BitmCubeRoundSmallLedYellow );
- break;
-
- case RL_ROUND_SMALL_RED:
- pLEDLabel->setPixmap ( BitmCubeRoundSmallLedRed );
- break;
-
- case RL_ROUND_BIG_BLACK:
- pLEDLabel->setPixmap ( BitmCubeRoundBigLedBlack );
- break;
-
- case RL_ROUND_BIG_GREEN:
- pLEDLabel->setPixmap ( BitmCubeRoundBigLedGreen );
- break;
-
- case RL_ROUND_BIG_YELLOW:
- pLEDLabel->setPixmap ( BitmCubeRoundBigLedYellow );
- break;
-
- case RL_ROUND_BIG_RED:
- pLEDLabel->setPixmap ( BitmCubeRoundBigLedRed );
- break;
- }
- eCurLightColor = eNewColor;
- }
+ setClipStatus(false);
+ emit clipStatusChanged();
}
diff --git a/src/levelmeter.h b/src/levelmeter.h
index 819882d475..0627e7ef0d 100644
--- a/src/levelmeter.h
+++ b/src/levelmeter.h
@@ -24,11 +24,7 @@
#pragma once
-#include
-#include
#include