| @@ -3,6 +3,23 @@ | |||||
| <file>16x16/carla.png</file> | <file>16x16/carla.png</file> | ||||
| <file>16x16/carla-control.png</file> | <file>16x16/carla-control.png</file> | ||||
| <file>16x16/application-exit.png</file> | |||||
| <file>16x16/arrow-right.png</file> | |||||
| <file>16x16/configure.png</file> | |||||
| <file>16x16/dialog-error.png</file> | |||||
| <file>16x16/dialog-ok-apply.png</file> | |||||
| <file>16x16/document-new.png</file> | |||||
| <file>16x16/document-open.png</file> | |||||
| <file>16x16/document-save.png</file> | |||||
| <file>16x16/document-save-as.png</file> | |||||
| <file>16x16/edit-delete.png</file> | |||||
| <file>16x16/list-add.png</file> | |||||
| <file>16x16/media-playback-start.png</file> | |||||
| <file>16x16/media-playback-stop.png</file> | |||||
| <file>16x16/network-connect.png</file> | |||||
| <file>16x16/view-refresh.png</file> | |||||
| <file>16x16/window-close.png</file> | |||||
| <file>48x48/carla.png</file> | <file>48x48/carla.png</file> | ||||
| <file>48x48/carla-control.png</file> | <file>48x48/carla-control.png</file> | ||||
| @@ -704,6 +704,8 @@ bool CarlaEngine::addPlugin(const BinaryType btype, const PluginType ptype, cons | |||||
| CARLA_ASSERT(filename); | CARLA_ASSERT(filename); | ||||
| CARLA_ASSERT(label); | CARLA_ASSERT(label); | ||||
| qWarning("CarlaEngine::addPlugin() started"); | |||||
| if (fData->curPluginCount == fData->maxPluginNumber) | if (fData->curPluginCount == fData->maxPluginNumber) | ||||
| { | { | ||||
| setLastError("Maximum number of plugins reached"); | setLastError("Maximum number of plugins reached"); | ||||
| @@ -841,10 +843,11 @@ bool CarlaEngine::addPlugin(const BinaryType btype, const PluginType ptype, cons | |||||
| fData->plugins[id].outsPeak[0] = 0.0f; | fData->plugins[id].outsPeak[0] = 0.0f; | ||||
| fData->plugins[id].outsPeak[1] = 0.0f; | fData->plugins[id].outsPeak[1] = 0.0f; | ||||
| fData->curPluginCount++; | |||||
| fData->curPluginCount += 1; | |||||
| qWarning("CarlaEngine::addPlugin() finished"); | |||||
| // FIXME | // FIXME | ||||
| //callback(CALLBACK_PLUGIN_ADDED, id, 0, 0, 0.0f, nullptr); | |||||
| callback(CALLBACK_PLUGIN_ADDED, id, 0, 0, 0.0f, nullptr); | |||||
| return true; | return true; | ||||
| } | } | ||||
| @@ -36,9 +36,9 @@ CarlaEngineOsc::CarlaEngineOsc(CarlaEngine* const engine) | |||||
| CarlaEngineOsc::~CarlaEngineOsc() | CarlaEngineOsc::~CarlaEngineOsc() | ||||
| { | { | ||||
| qDebug("CarlaEngineOsc::~CarlaEngineOsc()"); | qDebug("CarlaEngineOsc::~CarlaEngineOsc()"); | ||||
| CARLA_ASSERT(fName.isEmpty()); | |||||
| CARLA_ASSERT(fServerPathTCP.isEmpty()); | |||||
| CARLA_ASSERT(fServerPathUDP.isEmpty()); | |||||
| //CARLA_ASSERT(fName.isEmpty()); // FIXME | |||||
| //CARLA_ASSERT(fServerPathTCP.isEmpty()); // FIXME | |||||
| //CARLA_ASSERT(fServerPathUDP.isEmpty()); // FIXME | |||||
| CARLA_ASSERT(fServerTCP == nullptr); | CARLA_ASSERT(fServerTCP == nullptr); | ||||
| CARLA_ASSERT(fServerUDP == nullptr); | CARLA_ASSERT(fServerUDP == nullptr); | ||||
| } | } | ||||
| @@ -195,6 +195,8 @@ struct PluginParameterData { | |||||
| if (ranges == nullptr) | if (ranges == nullptr) | ||||
| ranges = new ParameterRanges[count]; | ranges = new ParameterRanges[count]; | ||||
| this->count = count; | |||||
| } | } | ||||
| void clear() | void clear() | ||||
| @@ -284,7 +284,7 @@ bool carla_is_engine_running() | |||||
| { | { | ||||
| qDebug("carla_is_engine_running()"); | qDebug("carla_is_engine_running()"); | ||||
| return standalone.engine && standalone.engine->isRunning(); | |||||
| return standalone.engine != nullptr && standalone.engine->isRunning(); | |||||
| } | } | ||||
| // ------------------------------------------------------------------------------------------------------------------- | // ------------------------------------------------------------------------------------------------------------------- | ||||
| @@ -298,7 +298,7 @@ bool carla_add_plugin(CarlaBackend::BinaryType btype, CarlaBackend::PluginType p | |||||
| return standalone.engine->addPlugin(btype, ptype, filename, name, label, extraStuff); | return standalone.engine->addPlugin(btype, ptype, filename, name, label, extraStuff); | ||||
| standalone.lastError = "Engine is not started"; | standalone.lastError = "Engine is not started"; | ||||
| return -1; | |||||
| return false; | |||||
| } | } | ||||
| bool carla_remove_plugin(unsigned int pluginId) | bool carla_remove_plugin(unsigned int pluginId) | ||||
| @@ -105,7 +105,6 @@ class CarlaNativePluginInfo(Structure): | |||||
| ("midiOuts", c_uint32), | ("midiOuts", c_uint32), | ||||
| ("parameterIns", c_uint32), | ("parameterIns", c_uint32), | ||||
| ("parameterOuts", c_uint32), | ("parameterOuts", c_uint32), | ||||
| ("binary", c_char_p), | |||||
| ("name", c_char_p), | ("name", c_char_p), | ||||
| ("label", c_char_p), | ("label", c_char_p), | ||||
| ("maker", c_char_p), | ("maker", c_char_p), | ||||
| @@ -706,7 +706,7 @@ def recheck_all_plugins(qobject, startValue, percentValue, curValue): | |||||
| # Tell GUI we're parsing this bundle | # Tell GUI we're parsing this bundle | ||||
| if qobject: | if qobject: | ||||
| percent = (float(i) / len(rdfFiles) ) * percentValue | percent = (float(i) / len(rdfFiles) ) * percentValue | ||||
| qobject.pluginLook(startValue + (percent * curValue), rdfFile) | |||||
| qobject._pluginLook(startValue + (percent * curValue), rdfFile) | |||||
| # Parse RDF | # Parse RDF | ||||
| parse_rdf_file(rdfFile) | parse_rdf_file(rdfFile) | ||||
| @@ -479,6 +479,9 @@ public: | |||||
| { | { | ||||
| for (size_t i=n; i < bufferLen; i++) | for (size_t i=n; i < bufferLen; i++) | ||||
| buffer[i] = '\0'; | buffer[i] = '\0'; | ||||
| // FIXME | |||||
| bufferLen = std::strlen(buffer); | |||||
| } | } | ||||
| void toBasic() | void toBasic() | ||||
| @@ -629,12 +632,11 @@ private: | |||||
| } | } | ||||
| bufferLen = (size > 0) ? size : std::strlen(strBuf); | bufferLen = (size > 0) ? size : std::strlen(strBuf); | ||||
| buffer = new char[bufferLen]; | |||||
| buffer = new char[bufferLen+1]; | |||||
| std::strcpy(buffer, strBuf); | std::strcpy(buffer, strBuf); | ||||
| // FIXME? | |||||
| buffer[bufferLen-1] = '\0'; | |||||
| buffer[bufferLen] = '\0'; | |||||
| firstInit = false; | firstInit = false; | ||||
| } | } | ||||
| @@ -266,7 +266,7 @@ class ParamSpinBox(QAbstractSpinBox): | |||||
| def setReadOnly(self, yesNo): | def setReadOnly(self, yesNo): | ||||
| self.setButtonSymbols(QAbstractSpinBox.UpDownArrows if yesNo else QAbstractSpinBox.NoButtons) | self.setButtonSymbols(QAbstractSpinBox.UpDownArrows if yesNo else QAbstractSpinBox.NoButtons) | ||||
| self.fReadOnly = yesNo | self.fReadOnly = yesNo | ||||
| ParamSpinBox.setReadOnly(self, yesNo) | |||||
| QAbstractSpinBox.setReadOnly(self, yesNo) | |||||
| def setScalePoints(self, scalePoints, useScalePoints): | def setScalePoints(self, scalePoints, useScalePoints): | ||||
| if len(scalePoints) == 0: | if len(scalePoints) == 0: | ||||