TooBAmp x11 UI merge
This commit is contained in:
+5
-5
@@ -256,7 +256,7 @@ private:
|
||||
|
||||
AudioDriver *audioDriver = nullptr;
|
||||
|
||||
inherit_priority_recursive_mutex mutex;
|
||||
std::recursive_mutex mutex;
|
||||
int64_t overrunGracePeriodSamples = 0;
|
||||
|
||||
IAudioHostCallbacks *pNotifyCallbacks = nullptr;
|
||||
@@ -328,7 +328,7 @@ private:
|
||||
|
||||
virtual void Close()
|
||||
{
|
||||
std::lock_guard guard(mutex);
|
||||
std::lock_guard guard {mutex};
|
||||
if (!isOpen)
|
||||
return;
|
||||
|
||||
@@ -927,7 +927,7 @@ public:
|
||||
// bump thread prioriy two levels to
|
||||
// ensure that the service thread doesn't
|
||||
// get bogged down by UIwork. Doesn't have to be realtime, but it
|
||||
// MUST run at higher priority than UI threads.
|
||||
// MUST run at higher _ than UI threads.
|
||||
xxx; // TO DO.
|
||||
#elif defined(__linux__)
|
||||
int min = sched_get_priority_min(SCHED_RR);
|
||||
@@ -1564,7 +1564,7 @@ private:
|
||||
std::vector<RestartThread *> restartThreads;
|
||||
|
||||
public:
|
||||
inherit_priority_recursive_mutex restart_mutex;
|
||||
std::recursive_mutex restart_mutex;
|
||||
virtual void UpdateServerConfiguration(const JackServerSettings &jackServerSettings,
|
||||
std::function<void(bool success, const std::string &errorMessage)> onComplete)
|
||||
{
|
||||
@@ -1575,7 +1575,7 @@ public:
|
||||
}
|
||||
void CleanRestartThreads(bool final)
|
||||
{
|
||||
std::lock_guard guard(restart_mutex);
|
||||
std::lock_guard guard {restart_mutex};
|
||||
for (size_t i = 0; i < restartThreads.size(); ++i)
|
||||
{
|
||||
if (final)
|
||||
|
||||
@@ -6,9 +6,9 @@ using namespace std;
|
||||
|
||||
|
||||
|
||||
inherit_priority_recursive_mutex::inherit_priority_recursive_mutex()
|
||||
inherit_priority_mutex::inherit_priority_mutex()
|
||||
{
|
||||
#ifdef __linux__ // (I think windows mutexes have priority inheritance alread)
|
||||
#ifdef __linux__ // (windows mutexes do NOT have priority inheritance alread)
|
||||
|
||||
// Recreate the raw mutex with priory inheritance.
|
||||
::pthread_mutex_destroy(native_handle());
|
||||
|
||||
@@ -25,8 +25,10 @@
|
||||
namespace pipedal {
|
||||
using namespace std;
|
||||
|
||||
class inherit_priority_recursive_mutex: public recursive_mutex {
|
||||
|
||||
|
||||
class inherit_priority_mutex: public mutex {
|
||||
public:
|
||||
inherit_priority_recursive_mutex();
|
||||
inherit_priority_mutex();
|
||||
};
|
||||
}; // namespace
|
||||
+7
-5
@@ -213,11 +213,11 @@ namespace pipedal
|
||||
bool is_logarithmic_ = false;
|
||||
int display_priority_ = -1;
|
||||
int range_steps_ = 0;
|
||||
bool trigger_;
|
||||
bool integer_property_;
|
||||
bool enumeration_property_;
|
||||
bool toggled_property_;
|
||||
bool not_on_gui_;
|
||||
bool trigger_ = false;
|
||||
bool integer_property_ = false;
|
||||
bool enumeration_property_ = false;
|
||||
bool toggled_property_ = false;
|
||||
bool not_on_gui_ = false;
|
||||
std::string buffer_type_;
|
||||
std::string port_group_;
|
||||
|
||||
@@ -226,6 +226,7 @@ namespace pipedal
|
||||
std::string comment_;
|
||||
PiPedalUI::ptr piPedalUI_;
|
||||
|
||||
|
||||
public:
|
||||
bool IsSwitch() const
|
||||
{
|
||||
@@ -303,6 +304,7 @@ namespace pipedal
|
||||
return Lv2BufferType::Unknown;
|
||||
}
|
||||
|
||||
|
||||
public:
|
||||
Lv2PortInfo() {}
|
||||
~Lv2PortInfo() = default;
|
||||
|
||||
Reference in New Issue
Block a user