Startup crash; crash when no audio device
This commit is contained in:
+3
-1
@@ -214,7 +214,9 @@ set (DEBIAN_COPYRIGHT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../debian/copyright)
|
||||
|
||||
# generate Copyright section of settings page.
|
||||
# warning: there may be multiple versions. Pick the latest.
|
||||
if(EXISTS "/usr/share/doc/libboost1.71-dev")
|
||||
if(EXISTS "/usr/share/doc/libboost1.74-dev")
|
||||
set (BOOST_COPYRIGHT_DIR "libboost1.74-dev")
|
||||
elseif(EXISTS "/usr/share/doc/libboost1.71-dev")
|
||||
set (BOOST_COPYRIGHT_DIR "libboost1.71-dev")
|
||||
elseif(EXISTS "/usr/share/doc/libboost1.67-dev")
|
||||
set (BOOST_COPYRIGHT_DIR "libboost1.67-dev")
|
||||
|
||||
@@ -176,12 +176,12 @@ void JackConfiguration::Initialize()
|
||||
|
||||
JackChannelSelection JackChannelSelection::MakeDefault(const JackConfiguration&config){
|
||||
JackChannelSelection result;
|
||||
for (size_t i = 0; i < std::max((size_t)2,config.GetInputAudioPorts().size()); ++i)
|
||||
for (size_t i = 0; i < std::min((size_t)2,config.GetInputAudioPorts().size()); ++i)
|
||||
{
|
||||
result.inputAudioPorts_.push_back(config.GetInputAudioPorts()[i]);
|
||||
|
||||
}
|
||||
for (size_t i = 0; i < std::max((size_t)2,config.GetOutputAudioPorts().size()); ++i)
|
||||
for (size_t i = 0; i < std::min((size_t)2,config.GetOutputAudioPorts().size()); ++i)
|
||||
{
|
||||
result.outputAudioPorts_.push_back(config.GetOutputAudioPorts()[i]);
|
||||
}
|
||||
|
||||
@@ -917,6 +917,11 @@ public:
|
||||
{
|
||||
|
||||
std::lock_guard guard(mutex);
|
||||
if (channelSelection.GetInputAudioPorts().size() == 0
|
||||
|| channelSelection.getOutputAudioPorts().size() == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
this->currentSample = 0;
|
||||
this->underruns = 0;
|
||||
|
||||
+3
-4
@@ -352,13 +352,12 @@ void Lv2Host::Load(const char *lv2Path)
|
||||
pWorld = lilv_world_new();
|
||||
lilv_world_load_all(pWorld);
|
||||
|
||||
if (!classesLoaded)
|
||||
{
|
||||
LoadPluginClassesFromLilv();
|
||||
}
|
||||
|
||||
const LilvPlugins *plugins = lilv_world_get_all_plugins(pWorld);
|
||||
|
||||
LoadPluginClassesFromLilv();
|
||||
|
||||
|
||||
LILV_FOREACH(plugins, iPlugin, plugins)
|
||||
{
|
||||
const LilvPlugin *lilvPlugin = lilv_plugins_get(plugins, iPlugin);
|
||||
|
||||
+1
-1
@@ -81,7 +81,7 @@ class Lv2PluginClass {
|
||||
public:
|
||||
friend class Lv2Host;
|
||||
private:
|
||||
Lv2PluginClass* parent_; // NOT SERIALIZED!
|
||||
Lv2PluginClass* parent_ = nullptr; // NOT SERIALIZED!
|
||||
std::string parent_uri_;
|
||||
std::string display_name_;
|
||||
std::string uri_;
|
||||
|
||||
+14
-13
@@ -92,19 +92,6 @@ PiPedalModel::~PiPedalModel()
|
||||
|
||||
void PiPedalModel::LoadLv2PluginInfo(const PiPedalConfiguration&configuration)
|
||||
{
|
||||
lv2Host.Load(configuration.GetLv2Path().c_str());
|
||||
|
||||
}
|
||||
|
||||
void PiPedalModel::Load(const PiPedalConfiguration &configuration)
|
||||
{
|
||||
|
||||
this->jackServerSettings.ReadJackConfiguration();
|
||||
|
||||
|
||||
storage.SetDataRoot(configuration.GetLocalStoragePath().c_str());
|
||||
storage.Initialize();
|
||||
|
||||
// Not all Lv2 directories have the lv2 base declarations. Load a full set of plugin classes generated on a default /usr/local/lib/lv2 directory.
|
||||
std::filesystem::path pluginClassesPath = configuration.GetDocRoot() / "plugin_classes.json";
|
||||
try
|
||||
@@ -119,6 +106,20 @@ void PiPedalModel::Load(const PiPedalConfiguration &configuration)
|
||||
s << "Unable to load " << pluginClassesPath << ". " << e.what();
|
||||
throw PiPedalException(s.str().c_str());
|
||||
}
|
||||
|
||||
lv2Host.Load(configuration.GetLv2Path().c_str());
|
||||
|
||||
}
|
||||
|
||||
void PiPedalModel::Load(const PiPedalConfiguration &configuration)
|
||||
{
|
||||
|
||||
this->jackServerSettings.ReadJackConfiguration();
|
||||
|
||||
|
||||
storage.SetDataRoot(configuration.GetLocalStoragePath().c_str());
|
||||
storage.Initialize();
|
||||
|
||||
// lv2Host.Load(configuration.GetLv2Path().c_str());
|
||||
|
||||
this->pedalBoard = storage.GetCurrentPreset(); // the current *saved* preset.
|
||||
|
||||
+29
-24
@@ -552,39 +552,44 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// pre-cache device info before we let audio services run.
|
||||
model.GetAlsaDevices();
|
||||
}
|
||||
|
||||
// Get heavy IO out of the way before letting dependent (Jack) services run.
|
||||
model.LoadLv2PluginInfo(configuration);
|
||||
// Get heavy IO out of the way before letting dependent (Jack) services run.
|
||||
model.LoadLv2PluginInfo(configuration);
|
||||
if (systemd)
|
||||
{
|
||||
// Tell systemd we're done.
|
||||
sd_notify(0, "READY=1");
|
||||
sd_notifyf(0, "READY=1\n"
|
||||
"MAINPID=%lu",
|
||||
(unsigned long) getpid());
|
||||
}
|
||||
|
||||
if (!isJackServiceRunning())
|
||||
if (!isJackServiceRunning())
|
||||
{
|
||||
Lv2Log::info("Waiting for Jack service.");
|
||||
// wait up to 15 seconds for the jack service to come online.
|
||||
for (int i = 0; i < 15; ++i)
|
||||
{
|
||||
Lv2Log::info("Waiting for Jack service.");
|
||||
// wait up to 15 seconds for the jack service to come online.
|
||||
for (int i = 0; i < 15; ++i)
|
||||
{
|
||||
// use the time to prepopulate ALSA device cache before jack
|
||||
// opens the device and we can't read properties.
|
||||
model.GetAlsaDevices();
|
||||
// use the time to prepopulate ALSA device cache before jack
|
||||
// opens the device and we can't read properties.
|
||||
model.GetAlsaDevices();
|
||||
|
||||
sleep(1);
|
||||
if (isJackServiceRunning())
|
||||
{
|
||||
break;
|
||||
}
|
||||
sleep(1);
|
||||
if (isJackServiceRunning())
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (isJackServiceRunning())
|
||||
{
|
||||
Lv2Log::info("Found Jack service.");
|
||||
sleep(3); // jack needs a little time to get up to speed.
|
||||
} else {
|
||||
Lv2Log::info("Jack service not started.");
|
||||
}
|
||||
}
|
||||
if (isJackServiceRunning())
|
||||
{
|
||||
Lv2Log::info("Found Jack service.");
|
||||
sleep(3); // jack needs a little time to get up to speed.
|
||||
} else {
|
||||
Lv2Log::info("Jack service not started.");
|
||||
}
|
||||
|
||||
model.Load(configuration);
|
||||
|
||||
Reference in New Issue
Block a user