Legacy Modifications
Added legacy integration so that upon upgrade, the device does not fail.
This commit is contained in:
@@ -254,6 +254,7 @@ JSON_MAP_REFERENCE(JackServerSettings, valid)
|
|||||||
JSON_MAP_REFERENCE(JackServerSettings, isOnboarding)
|
JSON_MAP_REFERENCE(JackServerSettings, isOnboarding)
|
||||||
JSON_MAP_REFERENCE(JackServerSettings, rebootRequired)
|
JSON_MAP_REFERENCE(JackServerSettings, rebootRequired)
|
||||||
JSON_MAP_REFERENCE(JackServerSettings, isJackAudio)
|
JSON_MAP_REFERENCE(JackServerSettings, isJackAudio)
|
||||||
|
JSON_MAP_REFERENCE(JackServerSettings, alsaDevice) // legacy field
|
||||||
JSON_MAP_REFERENCE(JackServerSettings, alsaInputDevice)
|
JSON_MAP_REFERENCE(JackServerSettings, alsaInputDevice)
|
||||||
JSON_MAP_REFERENCE(JackServerSettings, alsaOutputDevice)
|
JSON_MAP_REFERENCE(JackServerSettings, alsaOutputDevice)
|
||||||
JSON_MAP_REFERENCE(JackServerSettings, sampleRate)
|
JSON_MAP_REFERENCE(JackServerSettings, sampleRate)
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ namespace pipedal
|
|||||||
bool rebootRequired_ = false;
|
bool rebootRequired_ = false;
|
||||||
std::string alsaInputDevice_;
|
std::string alsaInputDevice_;
|
||||||
std::string alsaOutputDevice_;
|
std::string alsaOutputDevice_;
|
||||||
|
std::string alsaDevice_; // legacy
|
||||||
uint64_t sampleRate_ = 0;
|
uint64_t sampleRate_ = 0;
|
||||||
uint32_t bufferSize_ = 64;
|
uint32_t bufferSize_ = 64;
|
||||||
uint32_t numberOfBuffers_ = 3;
|
uint32_t numberOfBuffers_ = 3;
|
||||||
@@ -62,6 +63,8 @@ namespace pipedal
|
|||||||
uint32_t GetNumberOfBuffers() const { return numberOfBuffers_; }
|
uint32_t GetNumberOfBuffers() const { return numberOfBuffers_; }
|
||||||
const std::string &GetAlsaInputDevice() const { return alsaInputDevice_; }
|
const std::string &GetAlsaInputDevice() const { return alsaInputDevice_; }
|
||||||
const std::string &GetAlsaOutputDevice() const { return alsaOutputDevice_; }
|
const std::string &GetAlsaOutputDevice() const { return alsaOutputDevice_; }
|
||||||
|
const std::string &GetLegacyAlsaDevice() const { return alsaDevice_; } //legacy
|
||||||
|
void SetLegacyAlsaDevice(const std::string &d) { alsaDevice_ = d; }
|
||||||
void UseDummyAudioDevice() {
|
void UseDummyAudioDevice() {
|
||||||
this->valid_ = true;
|
this->valid_ = true;
|
||||||
if (sampleRate_ == 0) sampleRate_ = 48000;
|
if (sampleRate_ == 0) sampleRate_ = 48000;
|
||||||
|
|||||||
@@ -1573,6 +1573,14 @@ std::map<std::string, bool> Storage::GetFavorites() const
|
|||||||
{
|
{
|
||||||
json_reader reader(f);
|
json_reader reader(f);
|
||||||
reader.read(&result);
|
reader.read(&result);
|
||||||
|
if (!result.GetLegacyAlsaDevice().empty() &&
|
||||||
|
result.GetAlsaInputDevice().empty() &&
|
||||||
|
result.GetAlsaOutputDevice().empty())
|
||||||
|
{
|
||||||
|
result.SetAlsaInputDevice(result.GetLegacyAlsaDevice());
|
||||||
|
result.SetAlsaOutputDevice(result.GetLegacyAlsaDevice());
|
||||||
|
result.SetLegacyAlsaDevice("");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user