From e39d03b8f54a1d181a5ff75bf72d762de987effe Mon Sep 17 00:00:00 2001 From: Marco Randazzo Date: Tue, 17 Sep 2024 15:51:28 +0200 Subject: [PATCH] Portaudio device, previously marked as deprecated, has been definitely removed from devices' CMakeLists.txt --- doc/release/master.md | 4 ++++ src/devices/CMakeLists.txt | 2 -- src/devices/portaudio/DEPRECATION_NOTICE.TXT | 2 ++ src/devices/portaudio/PortAudioBuffer.h | 2 +- src/devices/portaudio/PortAudioDeviceDriver.cpp | 9 +++++---- src/devices/portaudio/PortAudioDeviceDriver.h | 8 ++++---- 6 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 src/devices/portaudio/DEPRECATION_NOTICE.TXT diff --git a/doc/release/master.md b/doc/release/master.md index 0c2317a0391..6c4d043b47a 100644 --- a/doc/release/master.md +++ b/doc/release/master.md @@ -92,6 +92,10 @@ New Features * Deprecated device +#### portaudio + +* Portaudio device, previously marked as deprecated, has been definitely removed from devices' CMakeLists.txt + #### FakePythonSpeechTranscription * Added new device `FakePythonSpeechTranscription`. The device is also an example which demonstrates the encapsulation of python code inside a c++ device implementing a Yarp interface. diff --git a/src/devices/CMakeLists.txt b/src/devices/CMakeLists.txt index aca55db72ae..85709b88fd2 100644 --- a/src/devices/CMakeLists.txt +++ b/src/devices/CMakeLists.txt @@ -46,8 +46,6 @@ yarp_begin_plugin_library(yarpmod add_subdirectory(JoypadControlNetUtils) add_subdirectory(frameGrabberCropper) - add_subdirectory(portaudio) # DEPRECATED Since YARP 3.2 - # Test devices add_subdirectory(test_segfault) add_subdirectory(test_nop) diff --git a/src/devices/portaudio/DEPRECATION_NOTICE.TXT b/src/devices/portaudio/DEPRECATION_NOTICE.TXT new file mode 100644 index 00000000000..d14b6c90997 --- /dev/null +++ b/src/devices/portaudio/DEPRECATION_NOTICE.TXT @@ -0,0 +1,2 @@ +The code contained in this folder has been deprecated and it is no more maintained. +It will be removed in the near future. diff --git a/src/devices/portaudio/PortAudioBuffer.h b/src/devices/portaudio/PortAudioBuffer.h index d22b5450ce1..a280747d0e6 100644 --- a/src/devices/portaudio/PortAudioBuffer.h +++ b/src/devices/portaudio/PortAudioBuffer.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/src/devices/portaudio/PortAudioDeviceDriver.cpp b/src/devices/portaudio/PortAudioDeviceDriver.cpp index 3b70d3536ee..6b20d9bec65 100644 --- a/src/devices/portaudio/PortAudioDeviceDriver.cpp +++ b/src/devices/portaudio/PortAudioDeviceDriver.cpp @@ -18,6 +18,7 @@ using namespace yarp::os; using namespace yarp::dev; +using namespace yarp::sig; #define SLEEP_TIME 0.005f @@ -618,13 +619,13 @@ bool PortAudioDeviceDriver::appendSound(const yarp::sig::Sound& sound) return true; } -bool PortAudioDeviceDriver::getPlaybackAudioBufferCurrentSize(yarp::dev::AudioBufferSize& size) +bool PortAudioDeviceDriver::getPlaybackAudioBufferCurrentSize(yarp::sig::AudioBufferSize& size) { size = this->dataBuffers.playData->size(); return true; } -bool PortAudioDeviceDriver::getPlaybackAudioBufferMaxSize(yarp::dev::AudioBufferSize& size) +bool PortAudioDeviceDriver::getPlaybackAudioBufferMaxSize(yarp::sig::AudioBufferSize& size) { size = this->dataBuffers.playData->getMaxSize(); return true; @@ -636,13 +637,13 @@ bool PortAudioDeviceDriver::resetPlaybackAudioBuffer() return true; } -bool PortAudioDeviceDriver::getRecordingAudioBufferCurrentSize(yarp::dev::AudioBufferSize& size) +bool PortAudioDeviceDriver::getRecordingAudioBufferCurrentSize(yarp::sig::AudioBufferSize& size) { size = this->dataBuffers.recData->size(); return true; } -bool PortAudioDeviceDriver::getRecordingAudioBufferMaxSize(yarp::dev::AudioBufferSize& size) +bool PortAudioDeviceDriver::getRecordingAudioBufferMaxSize(yarp::sig::AudioBufferSize& size) { size = this->dataBuffers.recData->getMaxSize(); return true; diff --git a/src/devices/portaudio/PortAudioDeviceDriver.h b/src/devices/portaudio/PortAudioDeviceDriver.h index 6438c658723..47e608a45c8 100644 --- a/src/devices/portaudio/PortAudioDeviceDriver.h +++ b/src/devices/portaudio/PortAudioDeviceDriver.h @@ -114,12 +114,12 @@ class PortAudioDeviceDriver : bool immediateSound(const yarp::sig::Sound& sound); bool appendSound(const yarp::sig::Sound& sound); - bool getPlaybackAudioBufferMaxSize(yarp::dev::AudioBufferSize& size) override; - bool getPlaybackAudioBufferCurrentSize(yarp::dev::AudioBufferSize& size) override; + bool getPlaybackAudioBufferMaxSize(yarp::sig::AudioBufferSize& size) override; + bool getPlaybackAudioBufferCurrentSize(yarp::sig::AudioBufferSize& size) override; bool resetPlaybackAudioBuffer() override; - bool getRecordingAudioBufferMaxSize(yarp::dev::AudioBufferSize& size) override; - bool getRecordingAudioBufferCurrentSize(yarp::dev::AudioBufferSize& size) override; + bool getRecordingAudioBufferMaxSize(yarp::sig::AudioBufferSize& size) override; + bool getRecordingAudioBufferCurrentSize(yarp::sig::AudioBufferSize& size) override; bool resetRecordingAudioBuffer() override; bool setHWGain(double gain) override;