mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2024-11-14 22:42:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

redesign

Browse Source
This commit is contained in:
AlexandreRouma 2023-04-21 22:44:45 +02:00
parent 2e3e2a7dca
commit 0277232bdb
2 changed files with 100 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
core/src/signal_path/stream.cpp
View File

@ -1,135 +0,0 @@
#include "stream.h"
#include <utils/flog.h>
void Sink::showMenu() {}
SinkEntry::SinkEntry(std::unique_ptr<Sink> sink) {
this->sink = std::move(sink);
}
float SinkEntry::getVolume() {
return volume;
}
void SinkEntry::setVolume(float volume) {
this->volume = volume;
volumeAdjust.setVolume(volume);
}
bool SinkEntry::getMuted() {
return muted;
}
void SinkEntry::setMuted(bool muted) {
this->muted = muted;
volumeAdjust.setMuted(muted);
}
float SinkEntry::getPanning() {
return panning;
}
void SinkEntry::setPanning(float panning) {
this->panning = panning;
// TODO: Update DSP
}
AudioStream::AudioStream(StreamManager* manager, const std::string& name, dsp::stream<dsp::stereo_t>* stream, double samplerate) {
this->manager = manager;
this->name = name;
this->samplerate = samplerate;
split.init(stream);
}
void AudioStream::setInput(dsp::stream<dsp::stereo_t>* stream) {
std::lock_guard<std::recursive_mutex> lck(mtx);
split.setInput(stream);
}
const std::string& AudioStream::getName() {
return name;
}
void AudioStream::bindStream(dsp::stream<dsp::stereo_t>* stream) {
std::lock_guard<std::recursive_mutex> lck(mtx);
split.bindStream(stream);
}
void AudioStream::unbindStream(dsp::stream<dsp::stereo_t>* stream) {
std::lock_guard<std::recursive_mutex> lck(mtx);
split.unbindStream(stream);
}
int AudioStream::addSink(const std::string& type) {
std::lock_guard<std::recursive_mutex> lck(mtx);
std::lock_guard<std::recursive_mutex> lck2(manager->mtx);
// Check that the sink provider is available
if (manager->providers.find(type) == manager->providers.end()) {
flog::error("Could not add sink of type '{}'. No provider is available for such a type.", type);
return -1;
}
// Create sink instance
int id = sinks.size();
auto sink = manager->providers[type]->createSink(this, id);
// Check that the sink was created succesfully
if (!sink) {
flog::error("Could not create sink of type '{}'. Provider returned null.", type);
return -1;
}
// Create and save entry
sinks.push_back(std::make_shared<SinkEntry>(std::move(sink)));
return id;
}
void AudioStream::removeSink(int index) {
std::lock_guard<std::recursive_mutex> lck(mtx);
// Check that the index exists
if (index >= sinks.size()) {
flog::error("Can't remove sink of index {} from stream '{}'. Index out of range.", index, name);
return;
}
// TODO: Free stuff
}
const std::vector<std::shared_ptr<SinkEntry>>& AudioStream::getSinks() {
return sinks;
}
std::shared_ptr<AudioStream> StreamManager::createStream(const std::string& name, dsp::stream<dsp::stereo_t>* stream, double samplerate) {
std::lock_guard<std::recursive_mutex> lck(mtx);
// Check that an audio stream that name doesn't already exist
if (streams.find(name) != streams.end()) {
flog::error("Could not register audio stream with name '{}', a stream with this name already exists.", name);
return NULL;
}
// Create stream and add to list
streams[name] = std::make_shared<AudioStream>(this, stream, samplerate);
}
void StreamManager::destroyStream(const std::string& name) {
std::lock_guard<std::recursive_mutex> lck(mtx);
// Check that stream exists
auto it = streams.find(name);
if (it == streams.end()) {
flog::error("Could not unregister audio stream with name '{}', no stream exists with that name.", name);
return;
}
// Remove from list
streams.erase(it);
}
const std::map<std::string, std::shared_ptr<AudioStream>>& StreamManager::getStreams() {
return streams;
}

134
core/src/signal_path/stream.h
View File

@ -7,6 +7,8 @@
#include <dsp/routing/splitter.h> #include <dsp/routing/splitter.h>
#include <dsp/multirate/rational_resampler.h> #include <dsp/multirate/rational_resampler.h>
#include <dsp/audio/volume.h> #include <dsp/audio/volume.h>
#include <utils/new_event.h>
#include <shared_mutex>
class AudioStream; class AudioStream;
@ -22,24 +24,58 @@ private:
}; };
class SinkEntry { class SinkEntry {
friend AudioStream;
SinkEntry(dsp::stream<dsp::stereo_t>* stream, const std::string& type, int index);
public: public:
SinkEntry(std::unique_ptr<Sink> sink);
~SinkEntry(); ~SinkEntry();
float getVolume(); /**
* Change the type of the sink.
* @param type New sink type.
*/
void setType(const std::string& type);
/**
* Get sink volume.
* @return Volume as value between 0 and 1.
*/
float getVolume() const;
/**
* Set sink volume.
* @param volume Volume as value between 0 and 1.
*/
void setVolume(float volume); void setVolume(float volume);
bool getMuted(); /**
* Check if the sink is muted.
* @return True if muted, false if not.
*/
bool getMuted() const;
/**
* Set wether or not the sink is muted
* @param muted True to mute, false to unmute.
*/
void setMuted(bool muted); void setMuted(bool muted);
float getPanning(); /**
* Get sink panning.
* @return Panning as value between -1 and 1 meaning panning to the left and right respectively.
*/
float getPanning() const;
/**
* Set sink panning.
* @param panning Panning as value between -1 and 1 meaning panning to the left and right respectively.
*/
void setPanning(float panning); void setPanning(float panning);
private: private:
dsp::stream<dsp::stereo_t> stream;
dsp::audio::Volume volumeAdjust; dsp::audio::Volume volumeAdjust;
dsp::multirate::RationalResampler<dsp::stereo_t> resamp;
std::unique_ptr<Sink> sink; std::unique_ptr<Sink> sink;
const int index;
float volume = 1.0f; float volume = 1.0f;
bool muted = false; bool muted = false;
float panning = 0.0f; float panning = 0.0f;
@ -49,8 +85,8 @@ class StreamManager;
class AudioStream { class AudioStream {
friend StreamManager; friend StreamManager;
public:
AudioStream(StreamManager* manager, const std::string& name, dsp::stream<dsp::stereo_t>* stream, double samplerate); AudioStream(StreamManager* manager, const std::string& name, dsp::stream<dsp::stereo_t>* stream, double samplerate);
public:
/** /**
* Set DSP stream input. * Set DSP stream input.
@ -58,18 +94,17 @@ public:
*/ */
void setInput(dsp::stream<dsp::stereo_t>* stream); void setInput(dsp::stream<dsp::stereo_t>* stream);
/**
* Set the samplerate of the input stream.
* @param samplerate Samplerate in Hz.
*/
void setSamplerate(double samplerate);
/** /**
* Get the name of the stream. * Get the name of the stream.
* @return Name of the stream. * @return Name of the stream.
*/ */
const std::string& getName(); const std::string& getName() const;
// TODO: Maybe instead we want to resample the data?
void bindStream(dsp::stream<dsp::stereo_t>* stream);
void unbindStream(dsp::stream<dsp::stereo_t>* stream);
double getSamplerate();
void setSamplerate(double samplerate);
/** /**
* Add a sink to the stream. * Add a sink to the stream.
@ -78,33 +113,33 @@ public:
*/ */
int addSink(const std::string& type); int addSink(const std::string& type);
/**
* Change the type of a sink.
* @param index Index of the sink.
* @param type New sink type.
*/
void setSinkType(int index, const std::string& type);
/** /**
* Remove a sink from a stream. * Remove a sink from a stream.
* @param index Index of the sink. * @param index Index of the sink.
*/ */
void removeSink(int index); void removeSink(int index);
/**
* Aquire a lock for the sink list.
* @return Shared lock for the sink list.
*/
std::shared_lock<std::shared_mutex> getSinksLock();
/** /**
* Get the list of all sinks belonging to this stream. * Get the list of all sinks belonging to this stream.
* @return Sink list. * @return Sink list.
*/ */
const std::vector<std::shared_ptr<SinkEntry>>& getSinks(); const std::vector<std::shared_ptr<SinkEntry>>& getSinks() const;
private: private:
std::recursive_mutex mtx; std::recursive_mutex mtx;
StreamManager* manager; StreamManager* manager;
std::string name; std::string name;
double samplerate; double samplerate;
dsp::routing::Splitter<dsp::stereo_t> split; dsp::routing::Splitter<dsp::stereo_t> split;
std::vector<std::shared_ptr<SinkEntry>> sinks; std::vector<std::shared_ptr<SinkEntry>> sinks;
std::shared_mutex sinksMtx;
}; };
class SinkProvider { class SinkProvider {
@ -114,13 +149,13 @@ public:
* @param name Name of the audio stream. * @param name Name of the audio stream.
* @param index Index of the sink in the menu. Should be use to keep settings. * @param index Index of the sink in the menu. Should be use to keep settings.
*/ */
std::unique_ptr<Sink> createSink(const std::string& name, int index); virtual std::unique_ptr<Sink> createSink(dsp::stream<dsp::stereo_t>* stream, const std::string& name, int index) = 0;
/** /**
* Destroy a sink instance. This function is so that the provide knows at all times how many instances there are. * Destroy a sink instance. This function is so that the provide knows at all times how many instances there are.
* @param sink Instance of the sink. * @param sink Instance of the sink.
*/ */
void destroySink(std::unique_ptr<Sink> sink); virtual void destroySink(std::unique_ptr<Sink> sink) = 0;
}; };
class StreamManager { class StreamManager {
@ -137,9 +172,23 @@ public:
/** /**
* Destroy an audio stream. * Destroy an audio stream.
* @param name Name of the stream. * @param stream Stream to destroy. The passed shared pointer will be automatically reset.
*/ */
void destroyStream(const std::string& name); void destroyStream(std::shared_ptr<AudioStream>& stream);
/**
* Aquire a lock for the stream list.
* @return Shared lock for the stream list.
*/
std::shared_lock<std::shared_mutex> getStreamsLock() {
return std::shared_lock<std::shared_mutex>(streamsMtx);
}
/**
* Get a list of streams and their associated names.
* @return Map of names to stream instance.
*/
const std::map<std::string, std::shared_ptr<AudioStream>>& getStreams() const;
/** /**
* Register a sink provider. * Register a sink provider.
@ -152,17 +201,34 @@ public:
* Unregister a sink provider. * Unregister a sink provider.
* @param name Name of the sink type. * @param name Name of the sink type.
*/ */
void unregisterSinkProvider(const std::string& name); void unregisterSinkProvider(SinkProvider* provider);
// TODO: Need a way to lock the list
/** /**
* Get a list of streams and their associated names. * Aquire a lock for the sink type list.
* @return Map of names to stream instance. * @return Shared lock for the sink type list.
*/ */
const std::map<std::string, std::shared_ptr<AudioStream>>& getStreams(); std::shared_lock<std::shared_mutex> getSinkTypesLock();
/**
* Get a list of sink types.
* @return List of sink type names.
*/
const std::vector<std::string>& getSinkTypes() const;
// Emitted when a stream was created
NewEvent<std::shared_ptr<AudioStream>> onStreamCreated;
// Emitted when a stream is about to be destroyed
NewEvent<std::shared_ptr<AudioStream>> onStreamDestroy;
// Emitted when a sink provider was registered
NewEvent<std::string> onSinkProviderRegistered;
// Emitted when a sink provider is about to be unregistered
NewEvent<std::string> onSinkProviderUnregister;
private: private:
std::recursive_mutex mtx;
std::map<std::string, std::shared_ptr<AudioStream>> streams; std::map<std::string, std::shared_ptr<AudioStream>> streams;
std::shared_mutex streamsMtx;
std::map<std::string, SinkProvider*> providers; std::map<std::string, SinkProvider*> providers;
std::vector<std::string> sinkTypes;
std::shared_mutex providersMtx;
}; };