From 162ef6c39337ec60d6c51b320e8b143b37ce4261 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 25 May 2022 22:26:43 +0200 Subject: [PATCH] AMBE feature: restore Windows and Mac support --- plugins/channelrx/demoddsd/readme.md | 2 -- plugins/feature/CMakeLists.txt | 2 +- plugins/feature/ambe/ambeengine.cpp | 4 ++-- plugins/feature/ambe/readme.md | 2 -- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/plugins/channelrx/demoddsd/readme.md b/plugins/channelrx/demoddsd/readme.md index 2e0b07e40..b2ce48abc 100644 --- a/plugins/channelrx/demoddsd/readme.md +++ b/plugins/channelrx/demoddsd/readme.md @@ -18,8 +18,6 @@ To enable this plugin at compile time you will need to have DSDcc installed in y

DV serial device support

-⚠ This is supported in Linux only since the AMBE feature plugin is supported in Linux only. - You can use a serial device connected to your system that implements and exposes the packet interface of the AMBE3000 chip. This can be for example a ThumbDV USB dongle. You may also connect to an AMBE server instance over the network. This is supported via the [AMBE feature](../../feature/ambe/readme.md). If no AMBE features are active or the AMBE support is not engaged (B.19) AMBE decoding will take place with Mbelib. Possible copyright issues apart (see next) the audio quality with the DVSI AMBE chip is much better. diff --git a/plugins/feature/CMakeLists.txt b/plugins/feature/CMakeLists.txt index 3367631f2..4a79484d5 100644 --- a/plugins/feature/CMakeLists.txt +++ b/plugins/feature/CMakeLists.txt @@ -40,6 +40,6 @@ if (ENABLE_LIMESUITE AND LIMESUITE_FOUND) add_subdirectory(limerfe) endif() -if (LINUX AND LIBSERIALDV_FOUND) +if (LIBSERIALDV_FOUND) add_subdirectory(ambe) endif() diff --git a/plugins/feature/ambe/ambeengine.cpp b/plugins/feature/ambe/ambeengine.cpp index faa91610a..03571a8da 100644 --- a/plugins/feature/ambe/ambeengine.cpp +++ b/plugins/feature/ambe/ambeengine.cpp @@ -78,7 +78,7 @@ void AMBEEngine::getComList() } // Do not activate serial support at all for windows -void AMBEEngine::scan(std::vector& ambeDevices) +void AMBEEngine::scan(QList& ambeDevices) { (void) ambeDevices; } @@ -87,7 +87,7 @@ void AMBEEngine::getComList() { qDebug("AMBEEngine::getComList: Apple"); } -void AMBEEngine::scan(std::vector& ambeDevices) +void AMBEEngine::scan(QList& ambeDevices) { (void) ambeDevices; } diff --git a/plugins/feature/ambe/readme.md b/plugins/feature/ambe/readme.md index 6fa077727..9b6bdf98e 100644 --- a/plugins/feature/ambe/readme.md +++ b/plugins/feature/ambe/readme.md @@ -4,8 +4,6 @@ Control AMBE3000 serial a.k.a. DV serial devices or AMBE server addresses to use for AMBE digital voice processing. -⚠ Note: this plugin is supported in Linux only. - DV serial devices are supported using the [SerialDV](https://github.com/f4exb/serialDV) library that is a mandatory requirement for this feature to be compiled. Therefore you have to compile and install SerialDV in your system. Please refer to this project Readme.md to compile and install SerialDV. f you install it in a custom location say `/opt/install/serialdv` you will need to add this define to the cmake command: `-DSERIALDV_DIR=/opt/install/serialdv` To effectively use serial DV devices for AMBE decoding you will have to add at least one device to the list of AMBE devices (6) in use.