Skip to content

Commit acdf733

Browse files
EliteScientistMichael Rochelle
andauthored
Audio Grabber Feature (#1570)
* 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>
1 parent a1bfa63 commit acdf733

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+2395
-248
lines changed

.github/workflows/apt/amd64.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,64 +2,64 @@
22
{
33
"distribution": "Bionic",
44
"architecture": "amd64",
5-
"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libturbojpeg0-dev, libjpeg-dev, libssl1.0-dev, libmbedtls-dev",
6-
"package-depends": "libpython3.6, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls10, libturbojpeg, libcec4",
5+
"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libasound2-dev, libturbojpeg0-dev, libjpeg-dev, libssl1.0-dev, libmbedtls-dev",
6+
"package-depends": "libpython3.6, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls10, libasound2, libturbojpeg, libcec4",
77
"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
88
"description": "Ubuntu 18.04 (Bionic Beaver) (amd64)"
99
},
1010
{
1111
"distribution": "Focal",
1212
"architecture": "amd64",
13-
"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libturbojpeg0-dev, libjpeg-dev, libssl-dev, libmbedtls-dev",
14-
"package-depends": "libpython3.8, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls12, libturbojpeg, libcec4",
13+
"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libasound2-dev, libturbojpeg0-dev, libjpeg-dev, libssl-dev, libmbedtls-dev",
14+
"package-depends": "libpython3.8, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls12, libasound2, libturbojpeg, libcec4",
1515
"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
1616
"description": "Ubuntu 20.04 (Focal Fossa) (amd64)"
1717
},
1818
{
1919
"distribution": "Jammy",
2020
"architecture": "amd64",
21-
"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libturbojpeg0-dev, libjpeg-dev, libssl-dev, libmbedtls-dev",
22-
"package-depends": "libpython3.10, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls14, libturbojpeg, libcec6",
21+
"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libasound2-dev, libturbojpeg0-dev, libjpeg-dev, libssl-dev, libmbedtls-dev",
22+
"package-depends": "libpython3.10, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls14, libasound2, libturbojpeg, libcec6",
2323
"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
2424
"description": "Ubuntu 22.04 (Jammy Jellyfish) (amd64)"
2525
},
2626
{
2727
"distribution": "Kinetic",
2828
"architecture": "amd64",
29-
"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libturbojpeg0-dev, libjpeg-dev, libssl-dev, libmbedtls-dev",
30-
"package-depends": "libpython3.10, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls14, libturbojpeg, libcec6",
29+
"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libasound2-dev, libturbojpeg0-dev, libjpeg-dev, libssl-dev, libmbedtls-dev",
30+
"package-depends": "libpython3.10, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls14, libasound2, libturbojpeg, libcec6",
3131
"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
3232
"description": "Ubuntu 22.10 (Kinetic Kudu) (amd64)"
3333
},
3434
{
3535
"distribution": "Stretch",
3636
"architecture": "amd64",
37-
"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libturbojpeg0-dev, libjpeg-dev, libssl1.0-dev, libmbedtls-dev",
38-
"package-depends": "libpython3.5, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls10, libturbojpeg0, libcec4",
37+
"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libasound2-dev, libturbojpeg0-dev, libjpeg-dev, libssl1.0-dev, libmbedtls-dev",
38+
"package-depends": "libpython3.5, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls10, libasound2, libturbojpeg0, libcec4",
3939
"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
4040
"description": "Debian 9.x (Stretch) (amd64)"
4141
},
4242
{
4343
"distribution": "Buster",
4444
"architecture": "amd64",
45-
"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libturbojpeg0-dev, libjpeg-dev, libssl-dev, libmbedtls-dev",
46-
"package-depends": "libpython3.7, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls12, libturbojpeg0, libcec4",
45+
"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libasound2-dev, libturbojpeg0-dev, libjpeg-dev, libssl-dev, libmbedtls-dev",
46+
"package-depends": "libpython3.7, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls12, libasound2, libturbojpeg0, libcec4",
4747
"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
4848
"description": "Debian 10.x (Buster) (amd64)"
4949
},
5050
{
5151
"distribution": "Bullseye",
5252
"architecture": "amd64",
53-
"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libturbojpeg0-dev, libjpeg-dev, libssl-dev, libmbedtls-dev",
54-
"package-depends": "libpython3.9, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls12, libturbojpeg0, libcec6",
53+
"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libasound2-dev, libturbojpeg0-dev, libjpeg-dev, libssl-dev, libmbedtls-dev",
54+
"package-depends": "libpython3.9, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls12, libasound2, libturbojpeg0, libcec6",
5555
"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
5656
"description": "Debian 11.x (Bullseye) (amd64)"
5757
},
5858
{
5959
"distribution": "Bookworm",
6060
"architecture": "amd64",
61-
"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libturbojpeg0-dev, libjpeg-dev, libssl-dev, libmbedtls-dev",
62-
"package-depends": "libpython3.9, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls12, libturbojpeg0, libcec6",
61+
"build-depends": "git, cmake, build-essential, qtbase5-dev, libqt5serialport5-dev, libqt5sql5-sqlite, libqt5svg5-dev, libqt5x11extras5-dev, libusb-1.0-0-dev, python3-dev, libcec-dev, libxcb-image0-dev, libxcb-util0-dev, libxcb-shm0-dev, libxcb-render0-dev, libxcb-randr0-dev, libxrandr-dev, libxrender-dev, libasound2-dev, libturbojpeg0-dev, libjpeg-dev, libssl-dev, libmbedtls-dev",
62+
"package-depends": "libpython3.9, libusb-1.0-0, libqt5widgets5, libqt5x11extras5, libqt5sql5, libqt5sql5-sqlite, libqt5serialport5, libmbedtls12, libasound2, libturbojpeg0, libcec6",
6363
"cmake-environment": "-DUSE_SYSTEM_MBEDTLS_LIBS=ON -DENABLE_DEPLOY_DEPENDENCIES=OFF -DCMAKE_BUILD_TYPE=Release",
6464
"description": "Debian 12.x (Bookworm) (amd64)"
6565
}

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
if: ${{ matrix.language == 'cpp' }}
3333
run: |
3434
sudo apt-get update
35-
sudo apt-get install --yes git cmake build-essential qtbase5-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5x11extras5-dev libusb-1.0-0-dev python3-dev libcec-dev libxcb-image0-dev libxcb-util0-dev libxcb-shm0-dev libxcb-render0-dev libxcb-randr0-dev libxrandr-dev libxrender-dev libavahi-core-dev libavahi-compat-libdnssd-dev libturbojpeg0-dev libjpeg-dev libssl-dev
35+
sudo apt-get install --yes git cmake build-essential qtbase5-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5x11extras5-dev libusb-1.0-0-dev python3-dev libcec-dev libxcb-image0-dev libxcb-util0-dev libxcb-shm0-dev libxcb-render0-dev libxcb-randr0-dev libxrandr-dev libxrender-dev libavahi-core-dev libavahi-compat-libdnssd-dev libasound2-dev libturbojpeg0-dev libjpeg-dev libssl-dev
3636
3737
- name: Initialize CodeQL
3838
uses: github/codeql-action/init@v2

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ libsrc/flatbufserver/hyperion_request_generated.h
3030
# Ignore
3131
.vs/*
3232
CMakeSettings.json
33+
/out
3334
# Allow
3435
!.vs/launch.vs.json
3536

CMakeLists.txt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ SET ( DEFAULT_MF OFF )
6767
SET ( DEFAULT_OSX OFF )
6868
SET ( DEFAULT_QT ON )
6969
SET ( DEFAULT_V4L2 OFF )
70+
SET ( DEFAULT_AUDIO ON )
7071
SET ( DEFAULT_X11 OFF )
7172
SET ( DEFAULT_XCB OFF )
7273

@@ -172,8 +173,10 @@ if ( "${PLATFORM}" MATCHES "osx" )
172173
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${SUBDIRPY})
173174

174175
include_directories("/opt/X11/include/")
175-
SET ( DEFAULT_OSX ON )
176-
SET ( DEFAULT_DEV_USB_HID ON )
176+
SET ( DEFAULT_OSX ON )
177+
SET ( DEFAULT_AUDIO OFF )
178+
SET ( DEFAULT_DEV_USB_HID ON )
179+
177180
elseif ( "${PLATFORM}" MATCHES "rpi" )
178181
SET ( DEFAULT_DISPMANX ON )
179182
SET ( DEFAULT_DEV_WS281XPWM ON )
@@ -222,6 +225,7 @@ if (HYPERION_LIGHT)
222225
SET ( DEFAULT_OSX OFF )
223226
SET ( DEFAULT_QT OFF )
224227
SET ( DEFAULT_V4L2 OFF )
228+
SET ( DEFAULT_AUDIO OFF )
225229
SET ( DEFAULT_X11 OFF )
226230
SET ( DEFAULT_XCB OFF )
227231

@@ -273,6 +277,11 @@ message(STATUS "ENABLE_V4L2 = ${ENABLE_V4L2}")
273277

274278
option(ENABLE_X11 "Enable the X11 grabber" ${DEFAULT_X11})
275279
message(STATUS "ENABLE_X11 = ${ENABLE_X11}")
280+
option(ENABLE_AUDIO "Enable the AUDIO grabber" ${DEFAULT_AUDIO})
281+
message(STATUS "ENABLE_AUDIO = ${ENABLE_AUDIO}")
282+
283+
option(ENABLE_WS281XPWM "Enable the WS281x-PWM device" ${DEFAULT_WS281XPWM} )
284+
message(STATUS "ENABLE_WS281XPWM = ${ENABLE_WS281XPWM}")
276285

277286
option(ENABLE_XCB "Enable the XCB grabber" ${DEFAULT_XCB})
278287
message(STATUS "ENABLE_XCB = ${ENABLE_XCB}")

HyperionConfig.h.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
// Define to enable the DirectX grabber
1010
#cmakedefine ENABLE_DX
1111

12+
// Define to enable the framebuffer grabber
13+
// Define to enable the Audio grabber
14+
#cmakedefine ENABLE_AUDIO
15+
1216
// Define to enable the Framebuffer grabber
1317
#cmakedefine ENABLE_FB
1418

assets/webconfig/content/dashboard.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ <h3 class="page-header"><i class="fa fa-dashboard fa-fw"></i><span data-i18n="ma
4242
<a class="fa fa-cog fa-fw" onclick="SwitchToMenuItem('MenuItemGrabber', 'editor_container_videograbber')" style="text-decoration: none; cursor: pointer"></a>
4343
</td>
4444
</tr>
45+
<tr id="dash_audio_grabber_row">
46+
<td></td>
47+
<td data-i18n="edt_conf_audio_heading_title">Audio-Grabber</td>
48+
<td style="text-align: right; padding-right: 0">
49+
<span id="dash_audio_grabber">disabled</span>
50+
<a class="fa fa-cog fa-fw" onclick="SwitchToMenuItem('MenuItemGrabber', 'editor_container_audiograbber')" style="text-decoration: none; cursor: pointer"></a>
51+
</td>
52+
</tr>
4553
</tbody>
4654
</table>
4755
<table id="dash_ports" class="table borderless">
@@ -135,6 +143,7 @@ <h3 class="page-header"><i class="fa fa-dashboard fa-fw"></i><span data-i18n="ma
135143
</div>
136144
<!-- /.row -->
137145
</div>
146+
</div>
138147
<!-- /.container-fluid -->
139148

140149
<script src="/js/content_dashboard.js"></script>

assets/webconfig/i18n/en.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
"conf_grabber_fg_intro": "Screen capture is your local system capture as input source, Hyperion is installed on.",
5252
"conf_grabber_inst_grabber_config_info": "Configure your capturing hardware devices to be used by the instance in advance",
5353
"conf_grabber_v4l_intro": "USB capture is a (capture) device connected via USB which is used to input source pictures for processing.",
54+
"conf_grabber_audio_intro": "Audio capture utilizes an audio input device as the source for visualization.",
5455
"conf_helptable_expl": "Explanation",
5556
"conf_helptable_option": "Option",
5657
"conf_leds_config_error": "Error in LED/LED layout configuration",
@@ -427,6 +428,8 @@
427428
"edt_conf_instC_systemEnable_title": "Enable screen capture",
428429
"edt_conf_instC_v4lEnable_expl": "Enables the USB capture for this LED hardware instance",
429430
"edt_conf_instC_v4lEnable_title": "Enable USB capture",
431+
"edt_conf_instC_audioEnable_expl": "Enables the Audio capture for this led hardware instance",
432+
"edt_conf_instC_audioEnable_title": "Enable Audio capture",
430433
"edt_conf_instC_video_grabber_device_expl": "The video capture device used",
431434
"edt_conf_instC_video_grabber_device_title": "Video capture device",
432435
"edt_conf_instCapture_heading_title": "Capture Devices",
@@ -527,6 +530,27 @@
527530
"edt_conf_v4l2_hardware_set_defaults_tip": "Set device's default values for brightness, contrast, hue and saturation",
528531
"edt_conf_v4l2_noSignalCounterThreshold_title": "Signal Counter Threshold",
529532
"edt_conf_v4l2_noSignalCounterThreshold_expl": "Count of frames (check that with grabber's current FPS mode) after which the no signal is triggered",
533+
"edt_conf_audio_device_expl": "Selected audio input device",
534+
"edt_conf_audio_device_title": "Audio Device",
535+
"edt_conf_audio_effects_expl": "Select an effect on how the audio signal is transformed to",
536+
"edt_conf_audio_effects_title": "Audio Effects",
537+
"edt_conf_audio_effect_enum_vumeter": "VU-Meter",
538+
"edt_conf_audio_effect_hotcolor_expl": "Hot Color",
539+
"edt_conf_audio_effect_hotcolor_title": "Hot Color",
540+
"edt_conf_audio_effect_multiplier_expl": "Audio Signal Value multiplier",
541+
"edt_conf_audio_effect_multiplier_title": "Multiplier",
542+
"edt_conf_audio_effect_safecolor_expl": "Safe Color",
543+
"edt_conf_audio_effect_safecolor_title": "Safe Color",
544+
"edt_conf_audio_effect_safevalue_expl": "Safe Threshold",
545+
"edt_conf_audio_effect_safevalue_title": "Safe Threshold",
546+
"edt_conf_audio_effect_set_defaults": "Reset to default values",
547+
"edt_conf_audio_effect_tolerance_expl": "Tolerance used when auto calculating a signal multipler from 0-100",
548+
"edt_conf_audio_effect_tolerance_title": "Tolerance",
549+
"edt_conf_audio_effect_warncolor_expl": "Warning Color",
550+
"edt_conf_audio_effect_warncolor_title": "Warning Color",
551+
"edt_conf_audio_effect_warnvalue_expl": "Warning Threshold",
552+
"edt_conf_audio_effect_warnvalue_title": "Warning Threshold",
553+
"edt_conf_audio_heading_title": "Audio Capture",
530554
"edt_conf_webc_crtPath_expl": "Path to the certification file (format should be PEM)",
531555
"edt_conf_webc_crtPath_title": "Certificate path",
532556
"edt_conf_webc_docroot_expl": "Local webinterface root path (just for webui developer)",
@@ -876,6 +900,7 @@
876900
"general_comp_PROTOSERVER": "Protocol Buffers Server",
877901
"general_comp_SMOOTHING": "Smoothing",
878902
"general_comp_V4L": "Capture USB-Input",
903+
"general_comp_AUDIO": "Audio Capture",
879904
"general_country_cn": "China",
880905
"general_country_de": "Germany",
881906
"general_country_es": "Spain",

assets/webconfig/index.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@
2424
<script src="js/lib/jquery/jquery-migrate-3.3.2.min.js"></script>
2525

2626
<!-- jQuery - Dev -->
27-
<!script src="js/lib/jquery/dev/jquery-3.6.0.js"></script>
28-
<!script src="js/lib/jquery/dev/jquery-migrate-3.3.2.js"></script>
27+
<!--
28+
<script src="js/lib/jquery/dev/jquery-3.6.0.js"></script>
29+
<script src="js/lib/jquery/dev/jquery-migrate-3.3.2.js"></script>
30+
-->
2931

3032
<!-- SemVer -->
3133
<script src='js/lib/semver.js'></script>

0 commit comments

Comments
 (0)