mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
acdf733936
* Creating Audio Grabber Creating Audio Grabber Creating Audio Grabber. Successfully began capturing audio in windows. Starting to implement a hard-coded UV Visualizer. Got Windows DirectSound Implementation working. Hardcoded basic VU Meter. Begin working on linux audio grabber implementation. Finished Linux Draft Implementation. Minor Mods to windows implementation. Windows: - Free memory used by device id. - Prevent starting audio if the grabber is disabled - More debug logging Linux: - Prevent starting audio if the grabber is disabled Added strings to english Removed "custom" from device selection Made hard-coded visualizer values configurable. wrote values to imageData with BGR priority to enable configurable values to be set in RGB format. created logic to support "Automatic" to enable the API to select the default device. Add language key for audio in "Remote Control" section. Removed audio configuration for number of channels. This was causing an error with some devices. Fixed logic to update capture while its active. Optimizing code . UI Tweaks Destructuring. Fixed build error on linux. Custom Effects - Clean-ups and Enhancements (#1163) * Cleanup EffectFileHandler * Support Custom Effect Schemas and align EffectFileHandler * Change back to colon prefix for system effects * WebSockets - Fix error in handling fragmented frames * Correct missing colon updates * Update json with image file location for custom gif effects * Image effect deletion - considere full filename is stored in JSON * Correct selection lists indentions Creating Audio Grabber Creating Audio Grabber Creating Audio Grabber. Successfully began capturing audio in windows. Starting to implement a hard-coded UV Visualizer. Got Windows DirectSound Implementation working. Hardcoded basic VU Meter. Begin working on linux audio grabber implementation. Finished Linux Draft Implementation. Minor Mods to windows implementation. Windows: - Free memory used by device id. - Prevent starting audio if the grabber is disabled - More debug logging Linux: - Prevent starting audio if the grabber is disabled Added strings to english Removed "custom" from device selection Made hard-coded visualizer values configurable. wrote values to imageData with BGR priority to enable configurable values to be set in RGB format. created logic to support "Automatic" to enable the API to select the default device. Add language key for audio in "Remote Control" section. Removed audio configuration for number of channels. This was causing an error with some devices. Fixed logic to update capture while its active. Optimizing code . UI Tweaks Destructuring. Fixed build error on linux. Commented setVideoMode from AudioGrabber. Linux Threading changes. Implementing new API Continuing to implement audio into new APIs Fixed Audio Grabber for DirectSound on Windows Fixed UI for Audio Grabber Configuration Default AUDIO to off unless specified. fixed missing #ifdef for audio grabber. Added logic to calculate a dynamic multiplier from the signal input. Updating linux api for discovering devices. Fixed HTML/JS issues with view. Fixed NPE in Windows. Disabled setting thread priority in linux. updated the schema options check to pass through hidden states and commented the change. Updated grabber start conditions Updated Audio grabber to instantiate similar to video grabber Updated windows grabber to set "started" flag to false when shutting down. Removed "tryStart" to prevent enabling audio capture unnecessarily. Fixing instance audio grabber device configuration Added configurable resolution Reduced tolerance to 5% Fixed issue where grabber failed for additional instances when "start" was called multiple times. Fixed resolution calculation Change averaging algorithm to prevent overflowing the sum. Updated logic to stop audio grabber when disabled. Fix integer casting and rounding. Restart grabber on configuration change. Fix missing include/grabber/AudioGrabber. Disable tolerance. Added configurable tolerance. Fixed tolerance algorithm. reset multiplier on configuration change. Line Endings Proposed change and questions/request to fix implementing more of LordGrey's suggestions. Fix mode for snd_pcm_open. Latest ALSA uses SND_PCM_NONBLOCK instead of SND_PCM_OPEN_NONBLOCK defaulted multiplier to 0 "auto" defaulted tolerance to 20% changed 100 to 100.0 for pixel value percentage calculation to fix value from being 0. missed a 100 as a double so precision isn't lost during math operation. Fix Windows grabber and further cleanups Enable Audio grabbing in standard build Remove empty methods Fix audio capture priority setting Remove unused code Clean-up default config Allow additional json-editor attributes Allow multiple effects and resetting to defaults Correct default values Allow to build for Qt < 5.14 Update CodeQL build dependency Update build dependencies Remove effect1 placeholder * Renamed uvMeter to VU Meter (Volume Unit) - Fixed issues flagged by code scanning bot. * Moved stop call into destructor of implementing class. * Removed commented linux audio channel configuration logic. --------- Co-authored-by: Michael Rochelle <michael@j2inn.com>
128 lines
3.4 KiB
C++
128 lines
3.4 KiB
C++
#pragma once
|
|
#include <QString>
|
|
|
|
#include "HyperionConfig.h"
|
|
|
|
namespace hyperion
|
|
{
|
|
|
|
/**
|
|
* Enumeration of components in Hyperion.
|
|
*/
|
|
enum Components
|
|
{
|
|
COMP_INVALID,
|
|
COMP_ALL,
|
|
COMP_SMOOTHING,
|
|
COMP_BLACKBORDER,
|
|
#if defined(ENABLE_FORWARDER)
|
|
COMP_FORWARDER,
|
|
#endif
|
|
#if defined(ENABLE_BOBLIGHT_SERVER)
|
|
COMP_BOBLIGHTSERVER,
|
|
#endif
|
|
COMP_GRABBER,
|
|
COMP_V4L,
|
|
COMP_AUDIO,
|
|
COMP_COLOR,
|
|
COMP_IMAGE,
|
|
COMP_EFFECT,
|
|
COMP_LEDDEVICE,
|
|
#if defined(ENABLE_FLATBUF_SERVER)
|
|
COMP_FLATBUFSERVER,
|
|
#endif
|
|
#if defined(ENABLE_PROTOBUF_SERVER)
|
|
COMP_PROTOSERVER
|
|
#endif
|
|
};
|
|
|
|
inline const char* componentToString(Components c)
|
|
{
|
|
switch (c)
|
|
{
|
|
case COMP_ALL: return "Hyperion";
|
|
case COMP_SMOOTHING: return "Smoothing";
|
|
case COMP_BLACKBORDER: return "Blackborder detector";
|
|
#if defined(ENABLE_FORWARDER)
|
|
case COMP_FORWARDER: return "Json/Proto forwarder";
|
|
#endif
|
|
#if defined(ENABLE_BOBLIGHT_SERVER)
|
|
case COMP_BOBLIGHTSERVER:return "Boblight server";
|
|
#endif
|
|
case COMP_GRABBER: return "Framegrabber";
|
|
case COMP_V4L: return "V4L capture device";
|
|
case COMP_AUDIO: return "Audio capture device";
|
|
case COMP_COLOR: return "Solid color";
|
|
case COMP_EFFECT: return "Effect";
|
|
case COMP_IMAGE: return "Image";
|
|
case COMP_LEDDEVICE: return "LED device";
|
|
#if defined(ENABLE_FLATBUF_SERVER)
|
|
case COMP_FLATBUFSERVER: return "Image Receiver";
|
|
#endif
|
|
#if defined(ENABLE_PROTOBUF_SERVER)
|
|
case COMP_PROTOSERVER: return "Proto Server";
|
|
#endif
|
|
default: return "";
|
|
}
|
|
}
|
|
|
|
inline const char* componentToIdString(Components c)
|
|
{
|
|
switch (c)
|
|
{
|
|
case COMP_ALL: return "ALL";
|
|
case COMP_SMOOTHING: return "SMOOTHING";
|
|
case COMP_BLACKBORDER: return "BLACKBORDER";
|
|
#if defined(ENABLE_FORWARDER)
|
|
case COMP_FORWARDER: return "FORWARDER";
|
|
#endif
|
|
#if defined(ENABLE_BOBLIGHT_SERVER)
|
|
case COMP_BOBLIGHTSERVER:return "BOBLIGHTSERVER";
|
|
#endif
|
|
case COMP_GRABBER: return "GRABBER";
|
|
case COMP_V4L: return "V4L";
|
|
case COMP_AUDIO: return "AUDIO";
|
|
case COMP_COLOR: return "COLOR";
|
|
case COMP_EFFECT: return "EFFECT";
|
|
case COMP_IMAGE: return "IMAGE";
|
|
case COMP_LEDDEVICE: return "LEDDEVICE";
|
|
#if defined(ENABLE_FLATBUF_SERVER)
|
|
case COMP_FLATBUFSERVER: return "FLATBUFSERVER";
|
|
#endif
|
|
#if defined(ENABLE_PROTOBUF_SERVER)
|
|
case COMP_PROTOSERVER: return "PROTOSERVER";
|
|
#endif
|
|
default: return "";
|
|
}
|
|
}
|
|
|
|
inline Components stringToComponent(const QString& component)
|
|
{
|
|
const QString cmp = component.toUpper();
|
|
if (cmp == "ALL") return COMP_ALL;
|
|
if (cmp == "SMOOTHING") return COMP_SMOOTHING;
|
|
if (cmp == "BLACKBORDER") return COMP_BLACKBORDER;
|
|
#if defined(ENABLE_FORWARDER)
|
|
if (cmp == "FORWARDER") return COMP_FORWARDER;
|
|
#endif
|
|
#if defined(ENABLE_BOBLIGHT_SERVER)
|
|
if (cmp == "BOBLIGHTSERVER")return COMP_BOBLIGHTSERVER;
|
|
#endif
|
|
if (cmp == "GRABBER") return COMP_GRABBER;
|
|
if (cmp == "V4L") return COMP_V4L;
|
|
if (cmp == "AUDIO") return COMP_AUDIO;
|
|
if (cmp == "COLOR") return COMP_COLOR;
|
|
if (cmp == "EFFECT") return COMP_EFFECT;
|
|
if (cmp == "IMAGE") return COMP_IMAGE;
|
|
if (cmp == "LEDDEVICE") return COMP_LEDDEVICE;
|
|
#if defined(ENABLE_FLATBUF_SERVER)
|
|
if (cmp == "FLATBUFSERVER") return COMP_FLATBUFSERVER;
|
|
#endif
|
|
#if defined(ENABLE_PROTOBUF_SERVER)
|
|
if (cmp == "PROTOSERVER") return COMP_PROTOSERVER;
|
|
#endif
|
|
return COMP_INVALID;
|
|
}
|
|
|
|
} // end of namespace
|