mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-10-02 13:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added the ability to configure the selected device id for SndioOut via preferences.

Browse Source
This commit is contained in:
casey langen 2017-12-23 23:48:45 +00:00
parent 69ff6058c5
commit 0cade3f4cb
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/sndioout/SndioOut.cpp
View File

@ -35,6 +35,7 @@
#include "SndioOut.h" #include "SndioOut.h"
#include <core/sdk/constants.h> #include <core/sdk/constants.h>
#include <core/sdk/IPreferences.h>
#include <math.h> #include <math.h>
#include <limits.h> #include <limits.h>
#include <iostream> #include <iostream>
@ -43,10 +44,23 @@
#define ERROR(str) std::cerr << "SndioOut Error: " << str << "\n"; #define ERROR(str) std::cerr << "SndioOut Error: " << str << "\n";
#define INFO(str) std::cerr << "SndioOut Info: " << str << "\n"; #define INFO(str) std::cerr << "SndioOut Info: " << str << "\n";
#define LOCK() std::unique_lock<std::recursive_mutex> lock(this->mutex); #define LOCK() std::unique_lock<std::recursive_mutex> lock(this->mutex);
#define PREF_DEVICE_ID "device_id"
using namespace musik::core::sdk; using namespace musik::core::sdk;
static char* deviceId = nullptr;
extern "C" void SetPreferences(musik::core::sdk::IPreferences* prefs) {
size_t len = prefs->GetString(PREF_DEVICE_ID, nullptr, 0, "");
if (len > 1) {
delete[] deviceId;
deviceId = new char[len];
prefs->GetString(PREF_DEVICE_ID, deviceId, len, "");
prefs->Save();
INFO("setting deviceId to " + std::string(deviceId));
}
}
SndioOut::SndioOut() { SndioOut::SndioOut() {
this->volume = 1.0f; this->volume = 1.0f;
this->state = StateStopped; this->state = StateStopped;
@ -144,7 +158,9 @@ IDevice* SndioOut::GetDefaultDevice() {
} }
bool SndioOut::InitDevice(IBuffer *buffer) { bool SndioOut::InitDevice(IBuffer *buffer) {
this->handle = sio_open(nullptr, SIO_PLAY, 0); const char* device = (::deviceId && strlen(::deviceId)) ? deviceId : nullptr;
this->handle = sio_open(device, SIO_PLAY, 0);
if (this->handle == nullptr) { if (this->handle == nullptr) {
return false; return false;