diff --git a/source/backend/plugin/CarlaBridge.cpp b/source/backend/plugin/CarlaBridge.cpp index b1269f1e8..b8f8b2410 100644 --- a/source/backend/plugin/CarlaBridge.cpp +++ b/source/backend/plugin/CarlaBridge.cpp @@ -22,27 +22,27 @@ #include #include -#define CARLA_BRIDGE_CHECK_OSC_TYPES(/* argc, types, */ argcToCompare, typesToCompare) \ - /* check argument count */ \ - if (argc != argcToCompare) \ - { \ - qCritical("BridgePlugin::%s() - argument count mismatch: %i != %i", __FUNCTION__, argc, argcToCompare); \ - return 1; \ - } \ - if (argc > 0) \ - { \ - /* check for nullness */ \ - if (! (types && typesToCompare)) \ - { \ - qCritical("BridgePlugin::%s() - argument types are null", __FUNCTION__); \ - return 1; \ - } \ - /* check argument types */ \ - if (strcmp(types, typesToCompare) != 0) \ - { \ - qCritical("BridgePlugin::%s() - argument types mismatch: '%s' != '%s'", __FUNCTION__, types, typesToCompare); \ - return 1; \ - } \ +#define CARLA_BRIDGE_CHECK_OSC_TYPES(/* argc, types, */ argcToCompare, typesToCompare) \ + /* check argument count */ \ + if (argc != argcToCompare) \ + { \ + carla_stderr("BridgePlugin::%s() - argument count mismatch: %i != %i", __FUNCTION__, argc, argcToCompare); \ + return 1; \ + } \ + if (argc > 0) \ + { \ + /* check for nullness */ \ + if (! (types && typesToCompare)) \ + { \ + carla_stderr("BridgePlugin::%s() - argument types are null", __FUNCTION__); \ + return 1; \ + } \ + /* check argument types */ \ + if (strcmp(types, typesToCompare) != 0) \ + { \ + carla_stderr("BridgePlugin::%s() - argument types mismatch: '%s' != '%s'", __FUNCTION__, types, typesToCompare); \ + return 1; \ + } \ } CARLA_BACKEND_START_NAMESPACE @@ -63,7 +63,7 @@ public: : CarlaPlugin(engine, id)//, //m_binary(btype) { - qDebug("BridgePlugin::BridgePlugin()"); + carla_debug("BridgePlugin::BridgePlugin()"); #if 0 m_type = ptype; @@ -95,7 +95,7 @@ public: #if 0 ~BridgePlugin() { - qDebug("BridgePlugin::~BridgePlugin()"); + carla_debug("BridgePlugin::~BridgePlugin()"); if (osc.data.target) { @@ -109,7 +109,7 @@ public: // Wait a bit first, try safe quit, then force kill if (osc.thread->isRunning() && ! osc.thread->wait(3000)) { - qWarning("Failed to properly stop Plugin Bridge thread"); + carla_stderr("Failed to properly stop Plugin Bridge thread"); osc.thread->terminate(); } @@ -254,7 +254,7 @@ public: int setOscPluginBridgeInfo(const PluginBridgeInfoType type, const int argc, const lo_arg* const* const argv, const char* const types) { - qDebug("setOscPluginBridgeInfo(%i, %i, %p, \"%s\")", type, argc, argv, types); + carla_debug("setOscPluginBridgeInfo(%i, %i, %p, \"%s\")", type, argc, argv, types); #if 0 switch (type) @@ -817,7 +817,7 @@ public: void idleGui() { if (! osc.thread->isRunning()) - qWarning("TESTING: Bridge has closed!"); + carla_stderr("TESTING: Bridge has closed!"); CarlaPlugin::idleGui(); } @@ -838,9 +838,9 @@ public: } if (! m_saved) - qWarning("BridgePlugin::prepareForSave() - Timeout while requesting save state"); + carla_stderr("BridgePlugin::prepareForSave() - Timeout while requesting save state"); else - qDebug("BridgePlugin::prepareForSave() - success!"); + carla_debug("BridgePlugin::prepareForSave() - success!"); } // ------------------------------------------------------------------- @@ -917,7 +917,7 @@ public: void deleteBuffers() { - qDebug("BridgePlugin::delete_buffers() - start"); + carla_debug("BridgePlugin::delete_buffers() - start"); if (param.count > 0) delete[] params; @@ -926,7 +926,7 @@ public: CarlaPlugin::deleteBuffers(); - qDebug("BridgePlugin::delete_buffers() - end"); + carla_debug("BridgePlugin::delete_buffers() - end"); } // ------------------------------------------------------------------- @@ -998,7 +998,7 @@ private: CarlaPlugin* CarlaPlugin::newBridge(const Initializer& init, BinaryType btype, PluginType ptype, const char* const extra) { - qDebug("CarlaPlugin::newBridge(%p, \"%s\", \"%s\", \"%s\", %s, %s)", init.engine, init.filename, init.name, init.label, BinaryType2Str(btype), PluginType2Str(ptype)); + carla_debug("CarlaPlugin::newBridge(%p, \"%s\", \"%s\", \"%s\", %s, %s)", init.engine, init.filename, init.name, init.label, BinaryType2Str(btype), PluginType2Str(ptype)); #if 0 if (! extra) diff --git a/source/backend/plugin/DssiPlugin.cpp b/source/backend/plugin/DssiPlugin.cpp index 0348f7757..c42b20871 100644 --- a/source/backend/plugin/DssiPlugin.cpp +++ b/source/backend/plugin/DssiPlugin.cpp @@ -30,7 +30,7 @@ public: DssiPlugin(CarlaEngine* const engine, const unsigned int id) : CarlaPlugin(engine, id) { - qDebug("DssiPlugin::DssiPlugin()"); + carla_debug("DssiPlugin::DssiPlugin()"); fHandle = nullptr; fHandle2 = nullptr; @@ -46,7 +46,7 @@ public: ~DssiPlugin() { - qDebug("DssiPlugin::~DssiPlugin()"); + carla_debug("DssiPlugin::~DssiPlugin()"); // close UI if (fHints & PLUGIN_HAS_GUI) @@ -56,7 +56,7 @@ public: // Wait a bit first, try safe quit, then force kill if (kData->osc.thread.isRunning() && ! kData->osc.thread.stop(kData->engine->getOptions().oscUiTimeout)) { - qWarning("Failed to properly stop DSSI GUI thread"); + carla_stderr("Failed to properly stop DSSI GUI thread"); kData->osc.thread.terminate(); } } @@ -216,16 +216,16 @@ public: CARLA_ASSERT(value != nullptr); if (type == nullptr) - return qCritical("DssiPlugin::setCustomData(\"%s\", \"%s\", \"%s\", %s) - type is invalid", type, key, value, bool2str(sendGui)); + return carla_stderr2("DssiPlugin::setCustomData(\"%s\", \"%s\", \"%s\", %s) - type is invalid", type, key, value, bool2str(sendGui)); if (std::strcmp(type, CUSTOM_DATA_STRING) != 0) - return qCritical("DssiPlugin::setCustomData(\"%s\", \"%s\", \"%s\", %s) - type is not string", type, key, value, bool2str(sendGui)); + return carla_stderr2("DssiPlugin::setCustomData(\"%s\", \"%s\", \"%s\", %s) - type is not string", type, key, value, bool2str(sendGui)); if (key == nullptr) - return qCritical("DssiPlugin::setCustomData(\"%s\", \"%s\", \"%s\", %s) - key is null", type, key, value, bool2str(sendGui)); + return carla_stderr2("DssiPlugin::setCustomData(\"%s\", \"%s\", \"%s\", %s) - key is null", type, key, value, bool2str(sendGui)); if (value == nullptr) - return qCritical("DssiPlugin::setCustomData(\"%s\", \"%s\", \"%s\", %s) - value is null", type, key, value, bool2str(sendGui)); + return carla_stderr2("DssiPlugin::setCustomData(\"%s\", \"%s\", \"%s\", %s) - value is null", type, key, value, bool2str(sendGui)); if (fDssiDescriptor->configure != nullptr) { @@ -340,7 +340,7 @@ public: void reload() { - qDebug("DssiPlugin::reload() - start"); + carla_debug("DssiPlugin::reload() - start"); CARLA_ASSERT(kData->engine != nullptr); CARLA_ASSERT(fDescriptor != nullptr); CARLA_ASSERT(fHandle != nullptr); @@ -479,7 +479,7 @@ public: } } else - qWarning("WARNING - Got a broken Port (Audio, but not input or output)"); + carla_stderr2("WARNING - Got a broken Port (Audio, but not input or output)"); } else if (LADSPA_IS_PORT_CONTROL(portType)) { @@ -511,7 +511,7 @@ public: if (max - min == 0.0f) { - qWarning("Broken plugin parameter: max - min == 0"); + carla_stderr2("WARNING - Broken plugin parameter '%s': max - min == 0.0f", fDescriptor->PortNames[i]); max = min + 0.1f; } @@ -607,7 +607,7 @@ public: else { kData->param.data[j].type = PARAMETER_UNKNOWN; - qWarning("WARNING - Got a broken Port (Control, but not input or output)"); + carla_stderr2("WARNING - Got a broken Port (Control, but not input or output)"); } // extra parameter hints @@ -632,7 +632,7 @@ public: else { // Not Audio or Control - qCritical("ERROR - Got a broken Port (neither Audio or Control)"); + carla_stderr2("ERROR - Got a broken Port (neither Audio or Control)"); fDescriptor->connect_port(fHandle, i, nullptr); @@ -752,12 +752,12 @@ public: kData->client->activate(); - qDebug("DssiPlugin::reload() - end"); + carla_debug("DssiPlugin::reload() - end"); } void reloadPrograms(const bool init) { - qDebug("DssiPlugin::reloadPrograms(%s)", bool2str(init)); + carla_debug("DssiPlugin::reloadPrograms(%s)", bool2str(init)); uint32_t i, oldCount = kData->midiprog.count; // Delete old programs @@ -966,7 +966,6 @@ public: if (time > timeOffset && sampleAccurate) { - qWarning("Variable proccessing @ frame %04i/%04i for %04i frames, cur:%04i", timeOffset, frames, time - timeOffset, time); processSingle(inBuffer, outBuffer, time - timeOffset, timeOffset, midiEventCount); midiEventCount = 0; nextBankId = 0; @@ -1254,12 +1253,7 @@ public: kData->postRtEvents.trySplice(); if (frames > timeOffset) - { - if (timeOffset != 0) - qWarning("FINAL proccessing @ frame %04i/%04i for %04i frames, cur:%04i", timeOffset, frames, frames - timeOffset, time); - processSingle(inBuffer, outBuffer, frames - timeOffset, timeOffset, midiEventCount); - } } // End of Event Input and Processing @@ -1572,7 +1566,7 @@ public: void deleteBuffers() { - qDebug("DssiPlugin::deleteBuffers() - start"); + carla_debug("DssiPlugin::deleteBuffers() - start"); if (fAudioInBuffers != nullptr) { @@ -1612,7 +1606,7 @@ public: CarlaPlugin::deleteBuffers(); - qDebug("DssiPlugin::deleteBuffers() - end"); + carla_debug("DssiPlugin::deleteBuffers() - end"); } // ------------------------------------------------------------------- @@ -1732,7 +1726,7 @@ CARLA_BACKEND_START_NAMESPACE CarlaPlugin* CarlaPlugin::newDSSI(const Initializer& init, const char* const guiFilename) { - qDebug("CarlaPlugin::newDSSI({%p, \"%s\", \"%s\", \"%s\"}, \"%s\")", init.engine, init.filename, init.name, init.label, guiFilename); + carla_debug("CarlaPlugin::newDSSI({%p, \"%s\", \"%s\", \"%s\"}, \"%s\")", init.engine, init.filename, init.name, init.label, guiFilename); #ifdef WANT_DSSI DssiPlugin* const plugin = new DssiPlugin(init.engine, init.id); diff --git a/source/backend/plugin/FluidSynthPlugin.cpp b/source/backend/plugin/FluidSynthPlugin.cpp index d907d7e57..220e2ca04 100644 --- a/source/backend/plugin/FluidSynthPlugin.cpp +++ b/source/backend/plugin/FluidSynthPlugin.cpp @@ -31,7 +31,7 @@ public: FluidSynthPlugin(CarlaEngine* const engine, const unsigned int id) : CarlaPlugin(engine, id) { - qDebug("FluidSynthPlugin::FluidSynthPlugin()"); + carla_debug("FluidSynthPlugin::FluidSynthPlugin()"); // create settings fSettings = new_fluid_settings(); @@ -62,7 +62,7 @@ public: ~FluidSynthPlugin() { - qDebug("FluidSynthPlugin::~FluidSynthPlugin()"); + carla_debug("FluidSynthPlugin::~FluidSynthPlugin()"); delete_fluid_synth(fSynth); delete_fluid_settings(fSettings); @@ -385,7 +385,7 @@ public: void reload() { - qDebug("FluidSynthPlugin::reload() - start"); + carla_debug("FluidSynthPlugin::reload() - start"); CARLA_ASSERT(kData->engine != nullptr); CARLA_ASSERT(fSynth != nullptr); @@ -718,12 +718,12 @@ public: kData->client->activate(); - qDebug("FluidSynthPlugin::reload() - end"); + carla_debug("FluidSynthPlugin::reload() - end"); } void reloadPrograms(const bool init) { - qDebug("FluidSynthPlugin::reloadPrograms(%s)", bool2str(init)); + carla_debug("FluidSynthPlugin::reloadPrograms(%s)", bool2str(init)); // Delete old programs kData->midiprog.clear(); @@ -1292,7 +1292,7 @@ CARLA_BACKEND_START_NAMESPACE CarlaPlugin* CarlaPlugin::newSF2(const Initializer& init) { - qDebug("CarlaPlugin::newSF2({%p, \"%s\", \"%s\", \"%s\"})", init.engine, init.filename, init.name, init.label); + carla_debug("CarlaPlugin::newSF2({%p, \"%s\", \"%s\", \"%s\"})", init.engine, init.filename, init.name, init.label); #ifdef WANT_FLUIDSYNTH diff --git a/source/backend/plugin/LadspaPlugin.cpp b/source/backend/plugin/LadspaPlugin.cpp index 5f66026e5..b80471759 100644 --- a/source/backend/plugin/LadspaPlugin.cpp +++ b/source/backend/plugin/LadspaPlugin.cpp @@ -29,7 +29,7 @@ public: LadspaPlugin(CarlaEngine* const engine, const unsigned int id) : CarlaPlugin(engine, id) { - qDebug("LadspaPlugin::LadspaPlugin(%p, %i)", engine, id); + carla_debug("LadspaPlugin::LadspaPlugin(%p, %i)", engine, id); fHandle = nullptr; fHandle2 = nullptr; @@ -43,7 +43,7 @@ public: ~LadspaPlugin() { - qDebug("LadspaPlugin::~LadspaPlugin()"); + carla_debug("LadspaPlugin::~LadspaPlugin()"); if (fDescriptor != nullptr) { @@ -343,7 +343,7 @@ public: void reload() { - qDebug("LadspaPlugin::reload() - start"); + carla_debug("LadspaPlugin::reload() - start"); CARLA_ASSERT(kData->engine != nullptr); CARLA_ASSERT(fDescriptor != nullptr); CARLA_ASSERT(fHandle != nullptr); @@ -477,7 +477,7 @@ public: } } else - qWarning("WARNING - Got a broken Port (Audio, but not input or output)"); + carla_stderr2("WARNING - Got a broken Port (Audio, but not input or output)"); } else if (LADSPA_IS_PORT_CONTROL(portType)) { @@ -509,7 +509,7 @@ public: if (max - min == 0.0f) { - qWarning("Broken plugin parameter: max - min == 0"); + carla_stderr2("Broken plugin parameter: max - min == 0"); max = min + 0.1f; } @@ -596,7 +596,7 @@ public: else { kData->param.data[j].type = PARAMETER_UNKNOWN; - qWarning("WARNING - Got a broken Port (Control, but not input or output)"); + carla_stderr2("WARNING - Got a broken Port (Control, but not input or output)"); } // extra parameter hints @@ -625,7 +625,7 @@ public: else { // Not Audio or Control - qCritical("ERROR - Got a broken Port (neither Audio or Control)"); + carla_stderr2("ERROR - Got a broken Port (neither Audio or Control)"); fDescriptor->connect_port(fHandle, i, nullptr); @@ -735,7 +735,7 @@ public: kData->client->activate(); - qDebug("LadspaPlugin::reload() - end"); + carla_debug("LadspaPlugin::reload() - end"); } // ------------------------------------------------------------------- @@ -1180,7 +1180,7 @@ public: void deleteBuffers() { - qDebug("LadspaPlugin::deleteBuffers() - start"); + carla_debug("LadspaPlugin::deleteBuffers() - start"); if (fAudioInBuffers != nullptr) { @@ -1220,7 +1220,7 @@ public: CarlaPlugin::deleteBuffers(); - qDebug("LadspaPlugin::deleteBuffers() - end"); + carla_debug("LadspaPlugin::deleteBuffers() - end"); } // ------------------------------------------------------------------- @@ -1331,7 +1331,7 @@ CARLA_BACKEND_START_NAMESPACE CarlaPlugin* CarlaPlugin::newLADSPA(const Initializer& init, const LADSPA_RDF_Descriptor* const rdfDescriptor) { - qDebug("CarlaPlugin::newLADSPA({%p, \"%s\", \"%s\", \"%s\"}, %p)", init.engine, init.filename, init.name, init.label, rdfDescriptor); + carla_debug("CarlaPlugin::newLADSPA({%p, \"%s\", \"%s\", \"%s\"}, %p)", init.engine, init.filename, init.name, init.label, rdfDescriptor); #ifdef WANT_LADSPA LadspaPlugin* const plugin = new LadspaPlugin(init.engine, init.id); diff --git a/source/backend/plugin/LinuxSamplerPlugin.cpp b/source/backend/plugin/LinuxSamplerPlugin.cpp index 2eda959f8..2025e77b0 100644 --- a/source/backend/plugin/LinuxSamplerPlugin.cpp +++ b/source/backend/plugin/LinuxSamplerPlugin.cpp @@ -173,7 +173,7 @@ public: LinuxSamplerPlugin(CarlaEngine* const engine_, const unsigned short id, const bool isGIG) : CarlaPlugin(engine_, id) { - qDebug("LinuxSamplerPlugin::LinuxSamplerPlugin()"); + carla_debug("LinuxSamplerPlugin::LinuxSamplerPlugin()"); m_type = isGIG ? PLUGIN_GIG : PLUGIN_SFZ; @@ -195,7 +195,7 @@ public: ~LinuxSamplerPlugin() { - qDebug("LinuxSamplerPlugin::~LinuxSamplerPlugin()"); + carla_debug("LinuxSamplerPlugin::~LinuxSamplerPlugin()"); if (m_activeBefore) audioOutputDevice->Stop(); @@ -257,7 +257,7 @@ public: void reload() { - qDebug("LinuxSamplerPlugin::reload() - start"); + carla_debug("LinuxSamplerPlugin::reload() - start"); CARLA_ASSERT(instrument); const ProcessMode processMode(x_engine->getOptions().processMode); @@ -370,12 +370,12 @@ public: x_client->activate(); - qDebug("LinuxSamplerPlugin::reload() - end"); + carla_debug("LinuxSamplerPlugin::reload() - end"); } void reloadPrograms(bool init) { - qDebug("LinuxSamplerPlugin::reloadPrograms(%s)", bool2str(init)); + carla_debug("LinuxSamplerPlugin::reloadPrograms(%s)", bool2str(init)); // Delete old programs if (midiprog.count > 0) @@ -928,7 +928,7 @@ private: CarlaPlugin* LinuxSamplerPlugin::newLinuxSampler(const Initializer& init, bool isGIG) { - qDebug("LinuxSamplerPlugin::newLinuxSampler(%p, \"%s\", \"%s\", \"%s\", %s)", init.engine, init.filename, init.name, init.label, bool2str(isGIG)); + carla_debug("LinuxSamplerPlugin::newLinuxSampler(%p, \"%s\", \"%s\", \"%s\", %s)", init.engine, init.filename, init.name, init.label, bool2str(isGIG)); short id = init.engine->getNewPluginId(); @@ -964,7 +964,7 @@ CARLA_BACKEND_START_NAMESPACE CarlaPlugin* CarlaPlugin::newGIG(const Initializer& init) { - qDebug("CarlaPlugin::newGIG(%p, \"%s\", \"%s\", \"%s\")", init.engine, init.filename, init.name, init.label); + carla_debug("CarlaPlugin::newGIG(%p, \"%s\", \"%s\", \"%s\")", init.engine, init.filename, init.name, init.label); #ifdef WANT_LINUXSAMPLER return LinuxSamplerPlugin::newLinuxSampler(init, true); #else @@ -975,7 +975,7 @@ CarlaPlugin* CarlaPlugin::newGIG(const Initializer& init) CarlaPlugin* CarlaPlugin::newSFZ(const Initializer& init) { - qDebug("CarlaPlugin::newSFZ(%p, \"%s\", \"%s\", \"%s\")", init.engine, init.filename, init.name, init.label); + carla_debug("CarlaPlugin::newSFZ(%p, \"%s\", \"%s\", \"%s\")", init.engine, init.filename, init.name, init.label); #ifdef WANT_LINUXSAMPLER return LinuxSamplerPlugin::newLinuxSampler(init, false); #else diff --git a/source/backend/plugin/Lv2Plugin.cpp b/source/backend/plugin/Lv2Plugin.cpp index 307ad8f91..c0500c68c 100644 --- a/source/backend/plugin/Lv2Plugin.cpp +++ b/source/backend/plugin/Lv2Plugin.cpp @@ -199,7 +199,7 @@ public: Lv2Plugin(CarlaEngine* const engine, const unsigned short id) : CarlaPlugin(engine, id) { - qDebug("Lv2Plugin::Lv2Plugin()"); + carla_debug("Lv2Plugin::Lv2Plugin()"); m_type = PLUGIN_LV2; m_count += 1; @@ -315,7 +315,7 @@ public: ~Lv2Plugin() { - qDebug("Lv2Plugin::~Lv2Plugin()"); + carla_debug("Lv2Plugin::~Lv2Plugin()"); m_count -= 1; // close UI @@ -346,7 +346,7 @@ public: // Wait a bit first, try safe quit, then force kill if (osc.thread->isRunning() && ! osc.thread->wait(x_engine->getOptions().oscUiTimeout)) { - qWarning("Failed to properly stop LV2 OSC GUI thread"); + carla_stderr("Failed to properly stop LV2 OSC GUI thread"); osc.thread->terminate(); } @@ -830,13 +830,13 @@ public: CARLA_ASSERT(value); if (! type) - return qCritical("Lv2Plugin::setCustomData(\"%s\", \"%s\", \"%s\", %s) - type is invalid", type, key, value, bool2str(sendGui)); + return carla_stderr2("Lv2Plugin::setCustomData(\"%s\", \"%s\", \"%s\", %s) - type is invalid", type, key, value, bool2str(sendGui)); if (! key) - return qCritical("Lv2Plugin::setCustomData(\"%s\", \"%s\", \"%s\", %s) - key is null", type, key, value, bool2str(sendGui)); + return carla_stderr2("Lv2Plugin::setCustomData(\"%s\", \"%s\", \"%s\", %s) - key is null", type, key, value, bool2str(sendGui)); if (! value) - return qCritical("Lv2Plugin::setCustomData(\"%s\", \"%s\", \"%s\", %s) - value is null", type, key, value, bool2str(sendGui)); + return carla_stderr2("Lv2Plugin::setCustomData(\"%s\", \"%s\", \"%s\", %s) - value is null", type, key, value, bool2str(sendGui)); CarlaPlugin::setCustomData(type, key, value, sendGui); @@ -860,22 +860,22 @@ public: switch (status) { case LV2_STATE_SUCCESS: - qDebug("Lv2Plugin::setCustomData(\"%s\", \"%s\", , %s) - success", type, key, bool2str(sendGui)); + carla_debug("Lv2Plugin::setCustomData(\"%s\", \"%s\", , %s) - success", type, key, bool2str(sendGui)); break; case LV2_STATE_ERR_UNKNOWN: - qWarning("Lv2Plugin::setCustomData(\"%s\", \"%s\", , %s) - unknown error", type, key, bool2str(sendGui)); + carla_stderr("Lv2Plugin::setCustomData(\"%s\", \"%s\", , %s) - unknown error", type, key, bool2str(sendGui)); break; case LV2_STATE_ERR_BAD_TYPE: - qWarning("Lv2Plugin::setCustomData(\"%s\", \"%s\", , %s) - error, bad type", type, key, bool2str(sendGui)); + carla_stderr("Lv2Plugin::setCustomData(\"%s\", \"%s\", , %s) - error, bad type", type, key, bool2str(sendGui)); break; case LV2_STATE_ERR_BAD_FLAGS: - qWarning("Lv2Plugin::setCustomData(\"%s\", \"%s\", , %s) - error, bad flags", type, key, bool2str(sendGui)); + carla_stderr("Lv2Plugin::setCustomData(\"%s\", \"%s\", , %s) - error, bad flags", type, key, bool2str(sendGui)); break; case LV2_STATE_ERR_NO_FEATURE: - qWarning("Lv2Plugin::setCustomData(\"%s\", \"%s\", , %s) - error, missing feature", type, key, bool2str(sendGui)); + carla_stderr("Lv2Plugin::setCustomData(\"%s\", \"%s\", , %s) - error, missing feature", type, key, bool2str(sendGui)); break; case LV2_STATE_ERR_NO_PROPERTY: - qWarning("Lv2Plugin::setCustomData(\"%s\", \"%s\", , %s) - error, missing property", type, key, bool2str(sendGui)); + carla_stderr("Lv2Plugin::setCustomData(\"%s\", \"%s\", , %s) - error, missing property", type, key, bool2str(sendGui)); break; } } @@ -923,7 +923,7 @@ public: void setGuiContainer(GuiContainer* const container) { - qDebug("Lv2Plugin::setGuiContainer(%p)", container); + carla_debug("Lv2Plugin::setGuiContainer(%p)", container); CARLA_ASSERT(container); switch(gui.type) @@ -967,7 +967,7 @@ public: void showGui(const bool yesNo) { - qDebug("Lv2Plugin::showGui(%s)", bool2str(yesNo)); + carla_debug("Lv2Plugin::showGui(%s)", bool2str(yesNo)); switch(gui.type) { @@ -998,7 +998,7 @@ public: if (rdf_descriptor->Author && strcmp(rdf_descriptor->Author, "linuxDSP") == 0) { - qWarning("linuxDSP LV2 UI hack (force close instead of hide)"); + carla_stderr("linuxDSP LV2 UI hack (force close instead of hide)"); if (ui.descriptor->cleanup) ui.descriptor->cleanup(ui.handle); @@ -1037,7 +1037,7 @@ public: if (! osc.thread) { - qCritical("Lv2Plugin::showGui(%s) - attempt to show gui, but it does not exist!", bool2str(yesNo)); + carla_stderr2("Lv2Plugin::showGui(%s) - attempt to show gui, but it does not exist!", bool2str(yesNo)); return; } @@ -1102,7 +1102,7 @@ public: void reload() { - qDebug("Lv2Plugin::reload() - start"); + carla_debug("Lv2Plugin::reload() - start"); CARLA_ASSERT(descriptor && rdf_descriptor); const ProcessMode processMode(x_engine->getOptions().processMode); @@ -1347,20 +1347,20 @@ public: } } else - qWarning("WARNING - Got a broken Port (Audio, but not input or output)"); + carla_stderr("WARNING - Got a broken Port (Audio, but not input or output)"); } else if (LV2_IS_PORT_CV(portTypes)) { if (LV2_IS_PORT_INPUT(portTypes)) { - qWarning("WARNING - CV Ports are not supported yet"); + carla_stderr("WARNING - CV Ports are not supported yet"); } else if (LV2_IS_PORT_OUTPUT(portTypes)) { - qWarning("WARNING - CV Ports are not supported yet"); + carla_stderr("WARNING - CV Ports are not supported yet"); } else - qWarning("WARNING - Got a broken Port (CV, but not input or output)"); + carla_stderr("WARNING - Got a broken Port (CV, but not input or output)"); descriptor->connect_port(handle, i, nullptr); if (h2) descriptor->connect_port(h2, i, nullptr); @@ -1404,7 +1404,7 @@ public: } } else - qWarning("WARNING - Got a broken Port (Atom Sequence, but not input or output)"); + carla_stderr("WARNING - Got a broken Port (Atom Sequence, but not input or output)"); } else if (LV2_IS_PORT_EVENT(portTypes)) { @@ -1437,7 +1437,7 @@ public: } } else - qWarning("WARNING - Got a broken Port (Event, but not input or output)"); + carla_stderr("WARNING - Got a broken Port (Event, but not input or output)"); } else if (LV2_IS_PORT_MIDI_LL(portTypes)) { @@ -1462,7 +1462,7 @@ public: evOut.data[j].rindex = i; } else - qWarning("WARNING - Got a broken Port (Midi, but not input or output)"); + carla_stderr("WARNING - Got a broken Port (Midi, but not input or output)"); } else if (LV2_IS_PORT_CONTROL(portTypes)) { @@ -1505,7 +1505,7 @@ public: if (max - min == 0.0) { - qWarning("Broken plugin parameter: max - min == 0"); + carla_stderr("Broken plugin parameter: max - min == 0"); max = min + 0.1; } @@ -1562,7 +1562,7 @@ public: { if (LV2_IS_PORT_DESIGNATION_LATENCY(portDesignation)) { - qWarning("Plugin has latency input port, this should not happen!"); + carla_stderr("Plugin has latency input port, this should not happen!"); } else if (LV2_IS_PORT_DESIGNATION_SAMPLE_RATE(portDesignation)) { @@ -1624,7 +1624,7 @@ public: } else if (LV2_IS_PORT_DESIGNATION_FREEWHEELING(portDesignation)) { - qWarning("Plugin has freewheeling output port, this should not happen!"); + carla_stderr("Plugin has freewheeling output port, this should not happen!"); } else if (LV2_IS_PORT_DESIGNATION_TIME(portDesignation)) { @@ -1641,7 +1641,7 @@ public: else { param.data[j].type = PARAMETER_UNKNOWN; - qWarning("WARNING - Got a broken Port (Control, but not input or output)"); + carla_stderr("WARNING - Got a broken Port (Control, but not input or output)"); } // extra parameter hints @@ -1806,12 +1806,12 @@ public: x_client->activate(); - qDebug("Lv2Plugin::reload() - end"); + carla_debug("Lv2Plugin::reload() - end"); } void reloadPrograms(const bool init) { - qDebug("Lv2Plugin::reloadPrograms(%s)", bool2str(init)); + carla_debug("Lv2Plugin::reloadPrograms(%s)", bool2str(init)); uint32_t i, oldCount = midiprog.count; // Delete old programs @@ -2726,13 +2726,13 @@ public: while (offset < size) { - qDebug("output event??, offset:%i, size:%i", offset, size); + carla_debug("output event??, offset:%i, size:%i", offset, size); const LV2_Atom_Event* const aev = (LV2_Atom_Event*)((char*)LV2_ATOM_CONTENTS(LV2_Atom_Sequence, evOut.data[i].atom) + offset); if ((! aev) || aev->body.type == CARLA_URI_MAP_ID_NULL) break; - qDebug("output event ------------------------------ YES!"); + carla_debug("output event ------------------------------ YES!"); if (aev->body.type == CARLA_URI_MAP_ID_MIDI_EVENT) { @@ -2809,7 +2809,7 @@ public: void postEventHandleCustom(const int32_t size, const int32_t, const double, const void* const data) { - qDebug("Lv2Plugin::postEventHandleCustom(%i, %p)", size, data); + carla_debug("Lv2Plugin::postEventHandleCustom(%i, %p)", size, data); CARLA_ASSERT(ext.worker && ext.worker->work); if (ext.worker && ext.worker->work) @@ -2928,7 +2928,7 @@ public: void removeClientPorts() { - qDebug("Lv2Plugin::removeClientPorts() - start"); + carla_debug("Lv2Plugin::removeClientPorts() - start"); for (uint32_t i=0; i < evIn.count; i++) { @@ -2950,7 +2950,7 @@ public: CarlaPlugin::removeClientPorts(); - qDebug("Lv2Plugin::removeClientPorts() - end"); + carla_debug("Lv2Plugin::removeClientPorts() - end"); } void initBuffers() @@ -2974,7 +2974,7 @@ public: void deleteBuffers() { - qDebug("Lv2Plugin::deleteBuffers() - start"); + carla_debug("Lv2Plugin::deleteBuffers() - start"); if (evIn.count > 0) { @@ -3033,14 +3033,14 @@ public: CarlaPlugin::deleteBuffers(); - qDebug("Lv2Plugin::deleteBuffers() - end"); + carla_debug("Lv2Plugin::deleteBuffers() - end"); } // ------------------------------------------------------------------- uint32_t getCustomURID(const char* const uri) { - qDebug("Lv2Plugin::getCustomURID(%s)", uri); + carla_debug("Lv2Plugin::getCustomURID(%s)", uri); CARLA_ASSERT(uri); if (! uri) @@ -3059,7 +3059,7 @@ public: const char* getCustomURIString(const LV2_URID urid) const { - qDebug("Lv2Plugin::getCustomURIString(%i)", urid); + carla_debug("Lv2Plugin::getCustomURIString(%i)", urid); CARLA_ASSERT(urid > CARLA_URI_MAP_ID_NULL); if (urid == CARLA_URI_MAP_ID_NULL) @@ -3074,7 +3074,7 @@ public: void handleTransferAtom(const int32_t portIndex, const LV2_Atom* const atom) { - qDebug("Lv2Plugin::handleTransferAtom(%i, %p)", portIndex, atom); + carla_debug("Lv2Plugin::handleTransferAtom(%i, %p)", portIndex, atom); CARLA_ASSERT(portIndex >= 0); CARLA_ASSERT(atom); @@ -3083,7 +3083,7 @@ public: void handleTransferEvent(const int32_t portIndex, const LV2_Atom* const atom) { - qDebug("Lv2Plugin::handleTransferEvent(%i, %p)", portIndex, atom); + carla_debug("Lv2Plugin::handleTransferEvent(%i, %p)", portIndex, atom); CARLA_ASSERT(portIndex >= 0); CARLA_ASSERT(atom); @@ -3127,31 +3127,31 @@ public: // do basic checks if (! key) { - qWarning("Lv2Plugin::handleStateStore(%i, %p, " P_SIZE ", %i, %i) - invalid key", key, value, size, type, flags); + carla_stderr("Lv2Plugin::handleStateStore(%i, %p, " P_SIZE ", %i, %i) - invalid key", key, value, size, type, flags); return LV2_STATE_ERR_NO_PROPERTY; } if (! value) { - qWarning("Lv2Plugin::handleStateStore(%i, %p, " P_SIZE ", %i, %i) - invalid value", key, value, size, type, flags); + carla_stderr("Lv2Plugin::handleStateStore(%i, %p, " P_SIZE ", %i, %i) - invalid value", key, value, size, type, flags); return LV2_STATE_ERR_NO_PROPERTY; } if (! uriKey) { - qWarning("Lv2Plugin::handleStateStore(%i, %p, " P_SIZE ", %i, %i) - invalid key URI", key, value, size, type, flags); + carla_stderr("Lv2Plugin::handleStateStore(%i, %p, " P_SIZE ", %i, %i) - invalid key URI", key, value, size, type, flags); return LV2_STATE_ERR_NO_PROPERTY; } if (! flags & LV2_STATE_IS_POD) { - qWarning("Lv2Plugin::handleStateStore(%i, %p, " P_SIZE ", %i, %i) - invalid flags", key, value, size, type, flags); + carla_stderr("Lv2Plugin::handleStateStore(%i, %p, " P_SIZE ", %i, %i) - invalid flags", key, value, size, type, flags); return LV2_STATE_ERR_BAD_FLAGS; } if (! stype) { - qCritical("Lv2Plugin::handleStateStore(%i, %p, " P_SIZE ", %i, %i) - invalid type", key, value, size, type, flags); + carla_stderr2("Lv2Plugin::handleStateStore(%i, %p, " P_SIZE ", %i, %i) - invalid type", key, value, size, type, flags); return LV2_STATE_ERR_BAD_TYPE; } @@ -3195,7 +3195,7 @@ public: if (! uriKey) { - qCritical("Lv2Plugin::handleStateRetrieve(%i, %p, %p, %p) - failed to find key", key, size, type, flags); + carla_stderr2("Lv2Plugin::handleStateRetrieve(%i, %p, %p, %p) - failed to find key", key, size, type, flags); return nullptr; } @@ -3214,7 +3214,7 @@ public: if (! stringData) { - qCritical("Lv2Plugin::handleStateRetrieve(%i, %p, %p, %p) - invalid key '%s'", key, size, type, flags, uriKey); + carla_stderr2("Lv2Plugin::handleStateRetrieve(%i, %p, %p, %p) - invalid key '%s'", key, size, type, flags, uriKey); return nullptr; } @@ -3240,7 +3240,7 @@ public: return chunk.constData(); } - qCritical("Lv2Plugin::handleStateRetrieve(%i, %p, %p, %p) - invalid key type '%s'", key, size, type, flags, stype); + carla_stderr2("Lv2Plugin::handleStateRetrieve(%i, %p, %p, %p) - invalid key type '%s'", key, size, type, flags, stype); return nullptr; } @@ -3248,7 +3248,7 @@ public: { if (! ext.worker) { - qWarning("Lv2Plugin::handleWorkerSchedule(%i, %p) - plugin has no worker", size, data); + carla_stderr("Lv2Plugin::handleWorkerSchedule(%i, %p) - plugin has no worker", size, data); return LV2_WORKER_ERR_UNKNOWN; } @@ -3423,7 +3423,7 @@ public: void initExternalUi() { - qDebug("Lv2Plugin::initExternalUi()"); + carla_debug("Lv2Plugin::initExternalUi()"); ui.widget = nullptr; ui.handle = ui.descriptor->instantiate(ui.descriptor, descriptor->URI, ui.rdf_descriptor->Bundle, carla_lv2_ui_write_function, this, &ui.widget, features); @@ -3434,7 +3434,7 @@ public: } else { - qWarning("Lv2Plugin::initExternalUi() - failed to instantiate UI"); + carla_stderr("Lv2Plugin::initExternalUi() - failed to instantiate UI"); ui.handle = nullptr; ui.widget = nullptr; x_engine->callback(CALLBACK_SHOW_GUI, m_id, -1, 0, 0.0, nullptr); @@ -3521,7 +3521,7 @@ public: static uint32_t carla_lv2_event_ref(const LV2_Event_Callback_Data callback_data, LV2_Event* const event) { - qDebug("Lv2Plugin::carla_lv2_event_ref(%p, %p)", callback_data, event); + carla_debug("Lv2Plugin::carla_lv2_event_ref(%p, %p)", callback_data, event); CARLA_ASSERT(callback_data); CARLA_ASSERT(event); @@ -3530,7 +3530,7 @@ public: static uint32_t carla_lv2_event_unref(const LV2_Event_Callback_Data callback_data, LV2_Event* const event) { - qDebug("Lv2Plugin::carla_lv2_event_unref(%p, %p)", callback_data, event); + carla_debug("Lv2Plugin::carla_lv2_event_unref(%p, %p)", callback_data, event); CARLA_ASSERT(callback_data); CARLA_ASSERT(event); @@ -3541,7 +3541,7 @@ public: static int carla_lv2_log_printf(const LV2_Log_Handle handle, const LV2_URID type, const char* const fmt, ...) { - qDebug("Lv2Plugin::carla_lv2_log_printf(%p, %i, \"%s\", ...)", handle, type, fmt); + carla_debug("Lv2Plugin::carla_lv2_log_printf(%p, %i, \"%s\", ...)", handle, type, fmt); CARLA_ASSERT(handle); CARLA_ASSERT(type > 0); @@ -3560,7 +3560,7 @@ public: static int carla_lv2_log_vprintf(const LV2_Log_Handle handle, const LV2_URID type, const char* const fmt, va_list ap) { - qDebug("Lv2Plugin::carla_lv2_log_vprintf(%p, %i, \"%s\", ...)", handle, type, fmt); + carla_debug("Lv2Plugin::carla_lv2_log_vprintf(%p, %i, \"%s\", ...)", handle, type, fmt); CARLA_ASSERT(handle); CARLA_ASSERT(type > 0); @@ -3578,16 +3578,16 @@ public: switch (type) { case CARLA_URI_MAP_ID_LOG_ERROR: - qCritical("%s", buf); + carla_stderr2("%s", buf); break; case CARLA_URI_MAP_ID_LOG_NOTE: printf("%s\n", buf); break; case CARLA_URI_MAP_ID_LOG_TRACE: - qDebug("%s", buf); + carla_debug("%s", buf); break; case CARLA_URI_MAP_ID_LOG_WARNING: - qWarning("%s", buf); + carla_stderr("%s", buf); break; default: break; @@ -3600,7 +3600,7 @@ public: static void carla_lv2_program_changed(const LV2_Programs_Handle handle, const int32_t index) { - qDebug("Lv2Plugin::carla_lv2_program_changed(%p, %i)", handle, index); + carla_debug("Lv2Plugin::carla_lv2_program_changed(%p, %i)", handle, index); CARLA_ASSERT(handle); if (! handle) @@ -3614,7 +3614,7 @@ public: static char* carla_lv2_state_make_path(const LV2_State_Make_Path_Handle handle, const char* const path) { - qDebug("Lv2Plugin::carla_lv2_state_make_path(%p, \"%s\")", handle, path); + carla_debug("Lv2Plugin::carla_lv2_state_make_path(%p, \"%s\")", handle, path); CARLA_ASSERT(handle); CARLA_ASSERT(path); @@ -3628,7 +3628,7 @@ public: static char* carla_lv2_state_map_abstract_path(const LV2_State_Map_Path_Handle handle, const char* const absolute_path) { - qDebug("Lv2Plugin::carla_lv2_state_map_abstract_path(%p, \"%s\")", handle, absolute_path); + carla_debug("Lv2Plugin::carla_lv2_state_map_abstract_path(%p, \"%s\")", handle, absolute_path); CARLA_ASSERT(handle); CARLA_ASSERT(absolute_path); @@ -3641,7 +3641,7 @@ public: static char* carla_lv2_state_map_absolute_path(const LV2_State_Map_Path_Handle handle, const char* const abstract_path) { - qDebug("Lv2Plugin::carla_lv2_state_map_absolute_path(%p, \"%s\")", handle, abstract_path); + carla_debug("Lv2Plugin::carla_lv2_state_map_absolute_path(%p, \"%s\")", handle, abstract_path); CARLA_ASSERT(handle); CARLA_ASSERT(abstract_path); @@ -3654,7 +3654,7 @@ public: static LV2_State_Status carla_lv2_state_store(const LV2_State_Handle handle, const uint32_t key, const void* const value, const size_t size, const uint32_t type, const uint32_t flags) { - qDebug("Lv2Plugin::carla_lv2_state_store(%p, %i, %p, " P_SIZE ", %i, %i)", handle, key, value, size, type, flags); + carla_debug("Lv2Plugin::carla_lv2_state_store(%p, %i, %p, " P_SIZE ", %i, %i)", handle, key, value, size, type, flags); CARLA_ASSERT(handle); if (! handle) @@ -3666,7 +3666,7 @@ public: static const void* carla_lv2_state_retrieve(const LV2_State_Handle handle, const uint32_t key, size_t* const size, uint32_t* const type, uint32_t* const flags) { - qDebug("Lv2Plugin::carla_lv2_state_retrieve(%p, %i, %p, %p, %p)", handle, key, size, type, flags); + carla_debug("Lv2Plugin::carla_lv2_state_retrieve(%p, %i, %p, %p, %p)", handle, key, size, type, flags); CARLA_ASSERT(handle); if (! handle) @@ -3680,7 +3680,7 @@ public: static uint32_t carla_lv2_uri_to_id(const LV2_URI_Map_Callback_Data data, const char* const map, const char* const uri) { - qDebug("Lv2Plugin::carla_lv2_uri_to_id(%p, \"%s\", \"%s\")", data, map, uri); + carla_debug("Lv2Plugin::carla_lv2_uri_to_id(%p, \"%s\", \"%s\")", data, map, uri); return carla_lv2_urid_map((LV2_URID_Map_Handle*)data, uri); } @@ -3688,7 +3688,7 @@ public: static LV2_URID carla_lv2_urid_map(const LV2_URID_Map_Handle handle, const char* const uri) { - qDebug("Lv2Plugin::carla_lv2_urid_map(%p, \"%s\")", handle, uri); + carla_debug("Lv2Plugin::carla_lv2_urid_map(%p, \"%s\")", handle, uri); CARLA_ASSERT(handle); CARLA_ASSERT(uri); @@ -3747,7 +3747,7 @@ public: static const char* carla_lv2_urid_unmap(const LV2_URID_Map_Handle handle, const LV2_URID urid) { - qDebug("Lv2Plugin::carla_lv2_urid_unmap(%p, %i)", handle, urid); + carla_debug("Lv2Plugin::carla_lv2_urid_unmap(%p, %i)", handle, urid); CARLA_ASSERT(handle); CARLA_ASSERT(urid > CARLA_URI_MAP_ID_NULL); @@ -3810,7 +3810,7 @@ public: static LV2_Worker_Status carla_lv2_worker_schedule(const LV2_Worker_Schedule_Handle handle, const uint32_t size, const void* const data) { - qDebug("Lv2Plugin::carla_lv2_worker_schedule(%p, %i, %p)", handle, size, data); + carla_debug("Lv2Plugin::carla_lv2_worker_schedule(%p, %i, %p)", handle, size, data); CARLA_ASSERT(handle); if (! handle) @@ -3822,7 +3822,7 @@ public: static LV2_Worker_Status carla_lv2_worker_respond(const LV2_Worker_Respond_Handle handle, const uint32_t size, const void* const data) { - qDebug("Lv2Plugin::carla_lv2_worker_respond(%p, %i, %p)", handle, size, data); + carla_debug("Lv2Plugin::carla_lv2_worker_respond(%p, %i, %p)", handle, size, data); CARLA_ASSERT(handle); if (! handle) @@ -3836,7 +3836,7 @@ public: static uint32_t carla_lv2_ui_port_map(const LV2UI_Feature_Handle handle, const char* const symbol) { - qDebug("Lv2Plugin::carla_lv2_ui_port_map(%p, \"%s\")", handle, symbol); + carla_debug("Lv2Plugin::carla_lv2_ui_port_map(%p, \"%s\")", handle, symbol); CARLA_ASSERT(handle); if (! handle) @@ -3850,7 +3850,7 @@ public: static int carla_lv2_ui_resize(const LV2UI_Feature_Handle handle, const int width, const int height) { - qDebug("Lv2Plugin::carla_lv2_ui_resize(%p, %i, %i)", handle, width, height); + carla_debug("Lv2Plugin::carla_lv2_ui_resize(%p, %i, %i)", handle, width, height); CARLA_ASSERT(handle); if (! handle) @@ -3864,7 +3864,7 @@ public: static void carla_lv2_external_ui_closed(const LV2UI_Controller controller) { - qDebug("Lv2Plugin::carla_lv2_external_ui_closed(%p)", controller); + carla_debug("Lv2Plugin::carla_lv2_external_ui_closed(%p)", controller); CARLA_ASSERT(controller); if (! controller) @@ -3878,7 +3878,7 @@ public: static void carla_lv2_ui_write_function(const LV2UI_Controller controller, const uint32_t port_index, const uint32_t buffer_size, const uint32_t format, const void* const buffer) { - qDebug("Lv2Plugin::carla_lv2_ui_write_function(%p, %i, %i, %i, %p)", controller, port_index, buffer_size, format, buffer); + carla_debug("Lv2Plugin::carla_lv2_ui_write_function(%p, %i, %i, %i, %p)", controller, port_index, buffer_size, format, buffer); CARLA_ASSERT(controller); if (! controller) @@ -4137,7 +4137,7 @@ public: else if (strcmp(rdf_descriptor->Extensions[i], LV2_WORKER__interface) == 0) m_hints |= PLUGIN_HAS_EXTENSION_WORKER; else - qDebug("Plugin has non-supported extension: '%s'", rdf_descriptor->Extensions[i]); + carla_debug("Plugin has non-supported extension: '%s'", rdf_descriptor->Extensions[i]); } if (! canContinue) @@ -4202,7 +4202,7 @@ public: if (! rdf_descriptor->UIs[i].URI) { - qWarning("Plugin has an UI without a valid URI"); + carla_stderr("Plugin has an UI without a valid URI"); continue; } @@ -4296,7 +4296,7 @@ public: if (iFinal < 0) { - qWarning("Failed to find an appropriate LV2 UI for this plugin"); + carla_stderr("Failed to find an appropriate LV2 UI for this plugin"); return true; } @@ -4311,7 +4311,7 @@ public: { if (LV2_IS_FEATURE_REQUIRED(ui.rdf_descriptor->Features[i].Type) && is_lv2_ui_feature_supported(ui.rdf_descriptor->Features[i].URI) == false) { - qCritical("Plugin UI requires a feature that is not supported:\n%s", ui.rdf_descriptor->Features[i].URI); + carla_stderr2("Plugin UI requires a feature that is not supported:\n%s", ui.rdf_descriptor->Features[i].URI); canContinue = false; break; } @@ -4339,7 +4339,7 @@ public: if (! uiLibOpen(ui.rdf_descriptor->Binary)) { - qCritical("Could not load UI library, error was:\n%s", libError(ui.rdf_descriptor->Binary)); + carla_stderr2("Could not load UI library, error was:\n%s", libError(ui.rdf_descriptor->Binary)); ui.rdf_descriptor = nullptr; return true; } @@ -4351,7 +4351,7 @@ public: if (! ui_descFn) { - qCritical("Could not find the LV2UI Descriptor in the UI library"); + carla_stderr2("Could not find the LV2UI Descriptor in the UI library"); uiLibClose(); ui.lib = nullptr; ui.rdf_descriptor = nullptr; @@ -4370,7 +4370,7 @@ public: if (! ui.descriptor) { - qCritical("Could not find the requested GUI in the plugin UI library"); + carla_stderr2("Could not find the requested GUI in the plugin UI library"); uiLibClose(); ui.lib = nullptr; ui.rdf_descriptor = nullptr; @@ -4451,7 +4451,7 @@ public: switch (uiType) { case LV2_UI_QT4: - qDebug("Will use LV2 Qt4 UI"); + carla_debug("Will use LV2 Qt4 UI"); gui.type = GUI_INTERNAL_QT4; gui.resizable = isUiResizable(); ui.handle = ui.descriptor->instantiate(ui.descriptor, descriptor->URI, ui.rdf_descriptor->Bundle, carla_lv2_ui_write_function, this, &ui.widget, features); @@ -4459,26 +4459,26 @@ public: break; case LV2_UI_COCOA: - qDebug("Will use LV2 Cocoa UI"); + carla_debug("Will use LV2 Cocoa UI"); gui.type = GUI_INTERNAL_COCOA; gui.resizable = isUiResizable(); break; case LV2_UI_WINDOWS: - qDebug("Will use LV2 Windows UI"); + carla_debug("Will use LV2 Windows UI"); gui.type = GUI_INTERNAL_HWND; gui.resizable = isUiResizable(); break; case LV2_UI_X11: - qDebug("Will use LV2 X11 UI"); + carla_debug("Will use LV2 X11 UI"); gui.type = GUI_INTERNAL_X11; gui.resizable = isUiResizable(); break; case LV2_UI_GTK2: #ifdef WANT_SUIL - qDebug("Will use LV2 Gtk2 UI (suil)"); + carla_debug("Will use LV2 Gtk2 UI (suil)"); gui.type = GUI_EXTERNAL_SUIL; gui.resizable = isUiResizable(); suil.handle = suil_instance_new(suil.host, this, LV2_UI__Qt4UI, rdf_descriptor->URI, ui.rdf_descriptor->URI, ui.rdf_descriptor->Type.URI, ui.rdf_descriptor->Bundle, ui.rdf_descriptor->Binary, features); @@ -4497,17 +4497,17 @@ public: } } #else - qDebug("Will use LV2 Gtk2 UI, NOT!"); + carla_debug("Will use LV2 Gtk2 UI, NOT!"); #endif break; case LV2_UI_GTK3: - qDebug("Will use LV2 Gtk3 UI, NOT!"); + carla_debug("Will use LV2 Gtk3 UI, NOT!"); break; case LV2_UI_EXTERNAL: case LV2_UI_OLD_EXTERNAL: - qDebug("Will use LV2 External UI"); + carla_debug("Will use LV2 External UI"); gui.type = GUI_EXTERNAL_LV2; break; } @@ -4592,7 +4592,7 @@ Lv2Plugin::Ft Lv2Plugin::ft = { nullptr, nullptr, nullptr, nullptr, nullptr, nul int CarlaEngineOsc::handleMsgLv2AtomTransfer(CARLA_ENGINE_OSC_HANDLE_ARGS2) { - qDebug("CarlaOsc::handleMsgLv2AtomTransfer()"); + carla_debug("CarlaOsc::handleMsgLv2AtomTransfer()"); CARLA_ENGINE_OSC_CHECK_OSC_TYPES(3, "iss"); const int32_t portIndex = argv[0]->i; @@ -4613,7 +4613,7 @@ int CarlaEngineOsc::handleMsgLv2AtomTransfer(CARLA_ENGINE_OSC_HANDLE_ARGS2) int CarlaEngineOsc::handleMsgLv2EventTransfer(CARLA_ENGINE_OSC_HANDLE_ARGS2) { - qDebug("CarlaOsc::handleMsgLv2EventTransfer()"); + carla_debug("CarlaOsc::handleMsgLv2EventTransfer()"); CARLA_ENGINE_OSC_CHECK_OSC_TYPES(3, "iss"); const int32_t portIndex = argv[0]->i; @@ -4642,7 +4642,7 @@ CARLA_BACKEND_START_NAMESPACE CarlaPlugin* CarlaPlugin::newLV2(const Initializer& init) { - qDebug("CarlaPlugin::newLV2(%p, \"%s\", \"%s\", \"%s\")", init.engine, init.filename, init.name, init.label); + carla_debug("CarlaPlugin::newLV2(%p, \"%s\", \"%s\", \"%s\")", init.engine, init.filename, init.name, init.label); #ifdef WANT_LV2 short id = init.engine->getNewPluginId(); diff --git a/source/backend/plugin/NativePlugin.cpp b/source/backend/plugin/NativePlugin.cpp index 299ac1e52..e3d8bcc42 100644 --- a/source/backend/plugin/NativePlugin.cpp +++ b/source/backend/plugin/NativePlugin.cpp @@ -38,7 +38,7 @@ public: NativePlugin(CarlaEngine* const engine, const unsigned int id) : CarlaPlugin(engine, id) { - qDebug("NativePlugin::NativePlugin(%p, %i)", engine, id); + carla_debug("NativePlugin::NativePlugin(%p, %i)", engine, id); fHandle = nullptr; fHandle2 = nullptr; @@ -61,7 +61,7 @@ public: ~NativePlugin() { - qDebug("NativePlugin::~NativePlugin()"); + carla_debug("NativePlugin::~NativePlugin()"); if (fDescriptor != nullptr) { @@ -324,13 +324,13 @@ public: CARLA_ASSERT(value); if (! type) - return qCritical("NativePlugin::setCustomData(\"%s\", \"%s\", \"%s\", %s) - type is not string", type, key, value, bool2str(sendGui)); + return carla_stderr2("NativePlugin::setCustomData(\"%s\", \"%s\", \"%s\", %s) - type is not string", type, key, value, bool2str(sendGui)); if (! key) - return qCritical("NativePlugin::setCustomData(\"%s\", \"%s\", \"%s\", %s) - key is null", type, key, value, bool2str(sendGui)); + return carla_stderr2("NativePlugin::setCustomData(\"%s\", \"%s\", \"%s\", %s) - key is null", type, key, value, bool2str(sendGui)); if (! value) - return qCritical("Nativelugin::setCustomData(\"%s\", \"%s\", \"%s\", %s) - value is null", type, key, value, bool2str(sendGui)); + return carla_stderr2("Nativelugin::setCustomData(\"%s\", \"%s\", \"%s\", %s) - value is null", type, key, value, bool2str(sendGui)); if (descriptor && handle) { @@ -405,7 +405,7 @@ public: void reload() { - qDebug("NativePlugin::reload() - start"); + carla_debug("NativePlugin::reload() - start"); CARLA_ASSERT(fDescriptor != nullptr); #if 0 @@ -516,7 +516,7 @@ public: else sprintf(portName, "output_%02i", j+1); - qDebug("Audio Out #%i", j); + carla_debug("Audio Out #%i", j); aOut.ports[j] = (CarlaEngineAudioPort*)x_client->addPort(CarlaEnginePortTypeAudio, portName, false); aOut.rindexes[j] = j; needsCtrlIn = true; @@ -584,7 +584,7 @@ public: if (max - min == 0.0) { - qWarning("Broken plugin parameter: max - min == 0"); + carla_stderr("Broken plugin parameter: max - min == 0"); max = min + 0.1; } @@ -723,13 +723,13 @@ public: kData->client->activate(); - qDebug("NativePlugin::reload() - end"); + carla_debug("NativePlugin::reload() - end"); } #if 0 void reloadPrograms(const bool init) { - qDebug("NativePlugin::reloadPrograms(%s)", bool2str(init)); + carla_debug("NativePlugin::reloadPrograms(%s)", bool2str(init)); uint32_t i, oldCount = midiprog.count; // Delete old programs @@ -1365,7 +1365,7 @@ public: void removeClientPorts() { - qDebug("NativePlugin::removeClientPorts() - start"); + carla_debug("NativePlugin::removeClientPorts() - start"); for (uint32_t i=0; i < mIn.count; i++) { @@ -1381,7 +1381,7 @@ public: CarlaPlugin::removeClientPorts(); - qDebug("NativePlugin::removeClientPorts() - end"); + carla_debug("NativePlugin::removeClientPorts() - end"); } void initBuffers() @@ -1403,7 +1403,7 @@ public: void deleteBuffers() { - qDebug("NativePlugin::deleteBuffers() - start"); + carla_debug("NativePlugin::deleteBuffers() - start"); if (mIn.count > 0) { @@ -1427,7 +1427,7 @@ public: CarlaPlugin::deleteBuffers(); - qDebug("NativePlugin::deleteBuffers() - end"); + carla_debug("NativePlugin::deleteBuffers() - end"); } // ------------------------------------------------------------------- @@ -1465,7 +1465,7 @@ protected: if (! fIsProcessing) { - qCritical("NativePlugin::handleWriteMidiEvent(%p) - received MIDI out events outside audio thread, ignoring", event); + carla_stderr2("NativePlugin::handleWriteMidiEvent(%p) - received MIDI out events outside audio thread, ignoring", event); return false; } @@ -1687,7 +1687,7 @@ const PluginDescriptor* CarlaPlugin::getNativePluginDescriptor(const size_t inde CarlaPlugin* CarlaPlugin::newNative(const Initializer& init) { - qDebug("CarlaPlugin::newNative(%p, \"%s\", \"%s\", \"%s\")", init.engine, init.filename, init.name, init.label); + carla_debug("CarlaPlugin::newNative(%p, \"%s\", \"%s\", \"%s\")", init.engine, init.filename, init.name, init.label); NativePlugin* const plugin = new NativePlugin(init.engine, init.id); diff --git a/source/backend/plugin/VstPlugin.cpp b/source/backend/plugin/VstPlugin.cpp index 82830736c..dcafe44c0 100644 --- a/source/backend/plugin/VstPlugin.cpp +++ b/source/backend/plugin/VstPlugin.cpp @@ -50,7 +50,7 @@ public: VstPlugin(CarlaEngine* const engine, const unsigned short id) : CarlaPlugin(engine, id) { - qDebug("VstPlugin::VstPlugin()"); + carla_debug("VstPlugin::VstPlugin()"); m_type = PLUGIN_VST; @@ -80,7 +80,7 @@ public: ~VstPlugin() { - qDebug("VstPlugin::~VstPlugin()"); + carla_debug("VstPlugin::~VstPlugin()"); // make plugin invalid unique2 += 1; @@ -99,7 +99,7 @@ public: // Wait a bit first, try safe quit, then force kill if (osc.thread->isRunning() && ! osc.thread->wait(x_engine->getOptions().oscUiTimeout)) { - qWarning("Failed to properly stop VST OSC GUI thread"); + carla_stderr("Failed to properly stop VST OSC GUI thread"); osc.thread->terminate(); } @@ -338,7 +338,7 @@ public: void setGuiContainer(GuiContainer* const container) { - qDebug("VstPlugin::setGuiContainer(%p)", container); + carla_debug("VstPlugin::setGuiContainer(%p)", container); CARLA_ASSERT(container); if (gui.type == GUI_EXTERNAL_OSC) @@ -383,7 +383,7 @@ public: if (width <= 0 || height <= 0) { - qCritical("VstPlugin::setGuiContainer(%p) - failed to get proper editor size", container); + carla_stderr2("VstPlugin::setGuiContainer(%p) - failed to get proper editor size", container); return; } @@ -391,15 +391,15 @@ public: gui.height = height; container->setFixedSize(width, height); - qDebug("VstPlugin::setGuiContainer(%p) -> setFixedSize(%i, %i)", container, width, height); + carla_debug("VstPlugin::setGuiContainer(%p) -> setFixedSize(%i, %i)", container, width, height); } else - qCritical("VstPlugin::setGuiContainer(%p) - failed to get plugin editor size", container); + carla_stderr2("VstPlugin::setGuiContainer(%p) - failed to get plugin editor size", container); } else { // failed to open UI - qWarning("VstPlugin::setGuiContainer(%p) - failed to open UI", container); + carla_stderr("VstPlugin::setGuiContainer(%p) - failed to open UI", container); m_hints &= ~PLUGIN_HAS_GUI; x_engine->callback(CALLBACK_SHOW_GUI, m_id, -1, 0, 0.0, nullptr); @@ -416,7 +416,7 @@ public: if (! osc.thread) { - qCritical("VstPlugin::showGui(%s) - attempt to show gui, but it does not exist!", bool2str(yesNo)); + carla_stderr2("VstPlugin::showGui(%s) - attempt to show gui, but it does not exist!", bool2str(yesNo)); return; } @@ -469,7 +469,7 @@ public: void reload() { - qDebug("VstPlugin::reload() - start"); + carla_debug("VstPlugin::reload() - start"); CARLA_ASSERT(effect); const ProcessMode processMode(x_engine->getOptions().processMode); @@ -604,7 +604,7 @@ public: if (max - min == 0.0) { - qWarning("Broken plugin parameter: max - min == 0"); + carla_stderr("Broken plugin parameter: max - min == 0"); max = min + 0.1; } @@ -787,12 +787,12 @@ public: x_client->activate(); - qDebug("VstPlugin::reload() - end"); + carla_debug("VstPlugin::reload() - end"); } void reloadPrograms(const bool init) { - qDebug("VstPlugin::reloadPrograms(%s)", bool2str(init)); + carla_debug("VstPlugin::reloadPrograms(%s)", bool2str(init)); uint32_t i, oldCount = prog.count; // Delete old programs @@ -1610,7 +1610,7 @@ public: intptr_t handleAudioMasterIOChanged() { - qDebug("VstPlugin::handleAudioMasterIOChanged()"); + carla_debug("VstPlugin::handleAudioMasterIOChanged()"); CARLA_ASSERT(m_enabled); // TESTING @@ -1620,7 +1620,7 @@ public: if (x_engine->getOptions().processMode == PROCESS_MODE_CONTINUOUS_RACK) { - qCritical("VstPlugin::handleAudioMasterIOChanged() - plugin asked IO change, but it's not supported in rack mode"); + carla_stderr2("VstPlugin::handleAudioMasterIOChanged() - plugin asked IO change, but it's not supported in rack mode"); return 0; } @@ -1649,7 +1649,7 @@ public: void handleAudioMasterNeedIdle() { - qDebug("VstPlugin::handleAudioMasterNeedIdle()"); + carla_debug("VstPlugin::handleAudioMasterNeedIdle()"); needIdle = true; } @@ -1667,7 +1667,7 @@ public: if (! isProcessing) { - qCritical("VstPlugin::handleAudioMasterProcessEvents(%p) - received MIDI out events outside audio thread, ignoring", vstEvents); + carla_stderr2("VstPlugin::handleAudioMasterProcessEvents(%p) - received MIDI out events outside audio thread, ignoring", vstEvents); return 0; } @@ -1687,7 +1687,7 @@ public: intptr_t handleAdioMasterSizeWindow(int32_t width, int32_t height) { - qDebug("VstPlugin::handleAudioMasterSizeWindow(%i, %i)", width, height); + carla_debug("VstPlugin::handleAudioMasterSizeWindow(%i, %i)", width, height); gui.width = width; gui.height = height; @@ -1699,7 +1699,7 @@ public: void handleAudioMasterUpdateDisplay() { - qDebug("VstPlugin::handleAudioMasterUpdateDisplay()"); + carla_debug("VstPlugin::handleAudioMasterUpdateDisplay()"); // Update current program name if (prog.count > 0 && prog.current >= 0) @@ -1726,7 +1726,7 @@ public: void handleAudioMasterWantMidi() { - qDebug("VstPlugin::handleAudioMasterWantMidi()"); + carla_debug("VstPlugin::handleAudioMasterWantMidi()"); m_hints |= PLUGIN_WANTS_MIDI_INPUT; } @@ -1735,7 +1735,7 @@ public: static intptr_t hostCanDo(const char* const feature) { - qDebug("VstPlugin::hostCanDo(\"%s\")", feature); + carla_debug("VstPlugin::hostCanDo(\"%s\")", feature); if (strcmp(feature, "supplyIdle") == 0) return 1; @@ -1777,7 +1777,7 @@ public: return -1; // unimplemented - qWarning("VstPlugin::hostCanDo(\"%s\") - unknown feature", feature); + carla_stderr("VstPlugin::hostCanDo(\"%s\") - unknown feature", feature); return 0; } @@ -1785,7 +1785,7 @@ public: { #ifdef DEBUG if (opcode != audioMasterGetTime && opcode != audioMasterProcessEvents && opcode != audioMasterGetCurrentProcessLevel && opcode != audioMasterGetOutputLatency) - qDebug("VstPlugin::hostCallback(%p, %02i:%s, %i, " P_INTPTR ", %p, %f)", effect, opcode, vstMasterOpcode2str(opcode), index, value, ptr, opt); + carla_debug("VstPlugin::hostCallback(%p, %02i:%s, %i, " P_INTPTR ", %p, %f)", effect, opcode, vstMasterOpcode2str(opcode), index, value, ptr, opt); #endif #if 0 @@ -1848,7 +1848,7 @@ public: if (self->effect != effect) { - qWarning("VstPlugin::hostCallback() - host pointer mismatch: %p != %p", self->effect, effect); + carla_stderr("VstPlugin::hostCallback() - host pointer mismatch: %p != %p", self->effect, effect); self = nullptr; } } @@ -1872,7 +1872,7 @@ public: if (self) self->handleAudioMasterAutomate(index, opt); else - qWarning("VstPlugin::hostCallback::audioMasterAutomate called without valid object"); + carla_stderr("VstPlugin::hostCallback::audioMasterAutomate called without valid object"); break; case audioMasterVersion: @@ -1889,7 +1889,7 @@ public: if (effect) effect->dispatcher(effect, effEditIdle, 0, 0, nullptr, 0.0f); else - qWarning("VstPlugin::hostCallback::audioMasterIdle called without valid effect"); + carla_stderr("VstPlugin::hostCallback::audioMasterIdle called without valid effect"); break; #if ! VST_FORCE_DEPRECATED @@ -1904,7 +1904,7 @@ public: if (self) self->handleAudioMasterWantMidi(); else - qWarning("VstPlugin::hostCallback::audioMasterWantMidi called without valid object"); + carla_stderr("VstPlugin::hostCallback::audioMasterWantMidi called without valid object"); break; #endif @@ -1940,10 +1940,10 @@ public: if (ptr) ret = self->handleAudioMasterProcessEvents((const VstEvents*)ptr); else - qWarning("VstPlugin::hostCallback::audioMasterProcessEvents called with invalid pointer"); + carla_stderr("VstPlugin::hostCallback::audioMasterProcessEvents called with invalid pointer"); } else - qWarning("VstPlugin::hostCallback::audioMasterProcessEvents called without valid object"); + carla_stderr("VstPlugin::hostCallback::audioMasterProcessEvents called without valid object"); break; #if ! VST_FORCE_DEPRECATED @@ -1957,7 +1957,7 @@ public: if (self) ret = self->handleAudioMasterTempoAt(); else - qWarning("VstPlugin::hostCallback::audioMasterTempoAt called without valid object"); + carla_stderr("VstPlugin::hostCallback::audioMasterTempoAt called without valid object"); if (ret == 0) ret = 120 * 10000; break; @@ -1983,7 +1983,7 @@ public: if (self) ret = self->handleAudioMasterIOChanged(); else - qWarning("VstPlugin::hostCallback::audioMasterIOChanged called without valid object"); + carla_stderr("VstPlugin::hostCallback::audioMasterIOChanged called without valid object"); break; case audioMasterNeedIdle: @@ -1992,7 +1992,7 @@ public: if (self) self->handleAudioMasterNeedIdle(); else - qWarning("VstPlugin::hostCallback::audioMasterNeedIdle called without valid object"); + carla_stderr("VstPlugin::hostCallback::audioMasterNeedIdle called without valid object"); break; case audioMasterSizeWindow: @@ -2002,10 +2002,10 @@ public: if (index > 0 && value > 0) ret = self->handleAdioMasterSizeWindow(index, value); else - qWarning("VstPlugin::hostCallback::audioMasterSizeWindow called with invalid size"); + carla_stderr("VstPlugin::hostCallback::audioMasterSizeWindow called with invalid size"); } else - qWarning("VstPlugin::hostCallback::audioMasterSizeWindow called without valid object"); + carla_stderr("VstPlugin::hostCallback::audioMasterSizeWindow called without valid object"); break; case audioMasterGetSampleRate: @@ -2013,7 +2013,7 @@ public: if (self) ret = self->handleAudioMasterGetSampleRate(); else - qWarning("VstPlugin::hostCallback::audioMasterGetSampleRate called without valid object"); + carla_stderr("VstPlugin::hostCallback::audioMasterGetSampleRate called without valid object"); if (ret == 0) ret = 44100; break; @@ -2023,7 +2023,7 @@ public: if (self) ret = self->handleAudioMasterGetBlockSize(); else - qWarning("VstPlugin::hostCallback::audioMasterGetBlockSize called without valid object"); + carla_stderr("VstPlugin::hostCallback::audioMasterGetBlockSize called without valid object"); if (ret == 0) // ret = CarlaEngine::processHighPrecision ? 8 : 512; ret = 512; @@ -2061,7 +2061,7 @@ public: } else { - qWarning("VstPlugin::hostCallback::audioMasterGetCurrentProcessLevel called without valid object"); + carla_stderr("VstPlugin::hostCallback::audioMasterGetCurrentProcessLevel called without valid object"); ret = kVstProcessLevelUnknown; } break; @@ -2097,7 +2097,7 @@ public: ret = 1; } else - qWarning("VstPlugin::hostCallback::audioMasterGetVendorString called with invalid pointer"); + carla_stderr("VstPlugin::hostCallback::audioMasterGetVendorString called with invalid pointer"); break; case audioMasterGetProductString: @@ -2108,7 +2108,7 @@ public: ret = 1; } else - qWarning("VstPlugin::hostCallback::audioMasterGetProductString called with invalid pointer"); + carla_stderr("VstPlugin::hostCallback::audioMasterGetProductString called with invalid pointer"); break; case audioMasterGetVendorVersion: @@ -2130,7 +2130,7 @@ public: if (ptr) ret = hostCanDo((const char*)ptr); else - qWarning("VstPlugin::hostCallback::audioMasterCanDo called with invalid pointer"); + carla_stderr("VstPlugin::hostCallback::audioMasterCanDo called with invalid pointer"); break; case audioMasterGetLanguage: @@ -2150,7 +2150,7 @@ public: //if (ptr) // strcpy((char*)ptr, "stuff"); //else - // qWarning("VstPlugin::hostCallback::audioMasterGetDirectory called with invalid pointer"); + // carla_stderr("VstPlugin::hostCallback::audioMasterGetDirectory called with invalid pointer"); break; case audioMasterUpdateDisplay: @@ -2191,7 +2191,7 @@ public: default: #ifdef DEBUG - qDebug("VstPlugin::hostCallback(%p, %02i:%s, %i, " P_INTPTR ", %p, %f)", effect, opcode, vstMasterOpcode2str(opcode), index, value, ptr, opt); + carla_debug("VstPlugin::hostCallback(%p, %02i:%s, %i, " P_INTPTR ", %p, %f)", effect, opcode, vstMasterOpcode2str(opcode), index, value, ptr, opt); #endif break; } @@ -2302,7 +2302,7 @@ public: // special checks if ((uintptr_t)effect->dispatcher(effect, effCanDo, 0, 0, (void*)"hasCockosExtensions", 0.0f) == 0xbeef0000) { - qDebug("Plugin has Cockos extensions!"); + carla_debug("Plugin has Cockos extensions!"); m_hints |= PLUGIN_HAS_COCKOS_EXTENSIONS; } @@ -2388,7 +2388,7 @@ CARLA_BACKEND_START_NAMESPACE CarlaPlugin* CarlaPlugin::newVST(const Initializer& init) { - qDebug("CarlaPlugin::newVST(%p, \"%s\", \"%s\", \"%s\")", init.engine, init.filename, init.name, init.label); + carla_debug("CarlaPlugin::newVST(%p, \"%s\", \"%s\", \"%s\")", init.engine, init.filename, init.name, init.label); #ifdef WANT_VST short id = init.engine->getNewPluginId();