Browse Source

More work & fixing, add needed icons

tags/1.9.4
falkTX 12 years ago
parent
commit
80bad943cb
27 changed files with 1577 additions and 1582 deletions
  1. BIN
      resources/16x16/application-exit.png
  2. BIN
      resources/16x16/arrow-right.png
  3. BIN
      resources/16x16/configure.png
  4. BIN
      resources/16x16/dialog-error.png
  5. BIN
      resources/16x16/dialog-ok-apply.png
  6. BIN
      resources/16x16/document-new.png
  7. BIN
      resources/16x16/document-open.png
  8. BIN
      resources/16x16/document-save-as.png
  9. BIN
      resources/16x16/document-save.png
  10. BIN
      resources/16x16/edit-delete.png
  11. BIN
      resources/16x16/list-add.png
  12. BIN
      resources/16x16/media-playback-start.png
  13. BIN
      resources/16x16/media-playback-stop.png
  14. BIN
      resources/16x16/network-connect.png
  15. BIN
      resources/16x16/view-refresh.png
  16. BIN
      resources/16x16/window-close.png
  17. +17
    -0
      resources/resources.qrc
  18. +5
    -2
      source/backend/engine/carla_engine.cpp
  19. +3
    -3
      source/backend/engine/carla_engine_osc.cpp
  20. +2
    -0
      source/backend/plugin/carla_plugin_internal.hpp
  21. +2
    -2
      source/backend/standalone/carla_standalone.cpp
  22. +837
    -853
      source/carla.py
  23. +0
    -1
      source/carla_backend.py
  24. +704
    -716
      source/carla_shared.py
  25. +1
    -1
      source/ladspa_rdf.py
  26. +5
    -3
      source/utils/carla_utils.hpp
  27. +1
    -1
      source/widgets/paramspinbox.py

BIN
resources/16x16/application-exit.png View File

Before After
Width: 16  |  Height: 16  |  Size: 842B

BIN
resources/16x16/arrow-right.png View File

Before After
Width: 16  |  Height: 16  |  Size: 438B

BIN
resources/16x16/configure.png View File

Before After
Width: 16  |  Height: 16  |  Size: 609B

BIN
resources/16x16/dialog-error.png View File

Before After
Width: 16  |  Height: 16  |  Size: 663B

BIN
resources/16x16/dialog-ok-apply.png View File

Before After
Width: 16  |  Height: 16  |  Size: 605B

BIN
resources/16x16/document-new.png View File

Before After
Width: 16  |  Height: 16  |  Size: 517B

BIN
resources/16x16/document-open.png View File

Before After
Width: 16  |  Height: 16  |  Size: 702B

BIN
resources/16x16/document-save-as.png View File

Before After
Width: 16  |  Height: 16  |  Size: 771B

BIN
resources/16x16/document-save.png View File

Before After
Width: 16  |  Height: 16  |  Size: 559B

BIN
resources/16x16/edit-delete.png View File

Before After
Width: 16  |  Height: 16  |  Size: 575B

BIN
resources/16x16/list-add.png View File

Before After
Width: 16  |  Height: 16  |  Size: 516B

BIN
resources/16x16/media-playback-start.png View File

Before After
Width: 16  |  Height: 16  |  Size: 501B

BIN
resources/16x16/media-playback-stop.png View File

Before After
Width: 16  |  Height: 16  |  Size: 499B

BIN
resources/16x16/network-connect.png View File

Before After
Width: 16  |  Height: 16  |  Size: 615B

BIN
resources/16x16/view-refresh.png View File

Before After
Width: 16  |  Height: 16  |  Size: 874B

BIN
resources/16x16/window-close.png View File

Before After
Width: 16  |  Height: 16  |  Size: 732B

+ 17
- 0
resources/resources.qrc View File

@@ -3,6 +3,23 @@
<file>16x16/carla.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-control.png</file>



+ 5
- 2
source/backend/engine/carla_engine.cpp View File

@@ -704,6 +704,8 @@ bool CarlaEngine::addPlugin(const BinaryType btype, const PluginType ptype, cons
CARLA_ASSERT(filename);
CARLA_ASSERT(label);

qWarning("CarlaEngine::addPlugin() started");

if (fData->curPluginCount == fData->maxPluginNumber)
{
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[1] = 0.0f;

fData->curPluginCount++;
fData->curPluginCount += 1;
qWarning("CarlaEngine::addPlugin() finished");

// FIXME
//callback(CALLBACK_PLUGIN_ADDED, id, 0, 0, 0.0f, nullptr);
callback(CALLBACK_PLUGIN_ADDED, id, 0, 0, 0.0f, nullptr);

return true;
}


+ 3
- 3
source/backend/engine/carla_engine_osc.cpp View File

@@ -36,9 +36,9 @@ CarlaEngineOsc::CarlaEngineOsc(CarlaEngine* const engine)
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(fServerUDP == nullptr);
}


+ 2
- 0
source/backend/plugin/carla_plugin_internal.hpp View File

@@ -195,6 +195,8 @@ struct PluginParameterData {

if (ranges == nullptr)
ranges = new ParameterRanges[count];

this->count = count;
}

void clear()


+ 2
- 2
source/backend/standalone/carla_standalone.cpp View File

@@ -284,7 +284,7 @@ bool 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);

standalone.lastError = "Engine is not started";
return -1;
return false;
}

bool carla_remove_plugin(unsigned int pluginId)


+ 837
- 853
source/carla.py
File diff suppressed because it is too large
View File


+ 0
- 1
source/carla_backend.py View File

@@ -105,7 +105,6 @@ class CarlaNativePluginInfo(Structure):
("midiOuts", c_uint32),
("parameterIns", c_uint32),
("parameterOuts", c_uint32),
("binary", c_char_p),
("name", c_char_p),
("label", c_char_p),
("maker", c_char_p),


+ 704
- 716
source/carla_shared.py
File diff suppressed because it is too large
View File


+ 1
- 1
source/ladspa_rdf.py View File

@@ -706,7 +706,7 @@ def recheck_all_plugins(qobject, startValue, percentValue, curValue):
# Tell GUI we're parsing this bundle
if qobject:
percent = (float(i) / len(rdfFiles) ) * percentValue
qobject.pluginLook(startValue + (percent * curValue), rdfFile)
qobject._pluginLook(startValue + (percent * curValue), rdfFile)

# Parse RDF
parse_rdf_file(rdfFile)


+ 5
- 3
source/utils/carla_utils.hpp View File

@@ -479,6 +479,9 @@ public:
{
for (size_t i=n; i < bufferLen; i++)
buffer[i] = '\0';

// FIXME
bufferLen = std::strlen(buffer);
}

void toBasic()
@@ -629,12 +632,11 @@ private:
}

bufferLen = (size > 0) ? size : std::strlen(strBuf);
buffer = new char[bufferLen];
buffer = new char[bufferLen+1];

std::strcpy(buffer, strBuf);

// FIXME?
buffer[bufferLen-1] = '\0';
buffer[bufferLen] = '\0';

firstInit = false;
}


+ 1
- 1
source/widgets/paramspinbox.py View File

@@ -266,7 +266,7 @@ class ParamSpinBox(QAbstractSpinBox):
def setReadOnly(self, yesNo):
self.setButtonSymbols(QAbstractSpinBox.UpDownArrows if yesNo else QAbstractSpinBox.NoButtons)
self.fReadOnly = yesNo
ParamSpinBox.setReadOnly(self, yesNo)
QAbstractSpinBox.setReadOnly(self, yesNo)

def setScalePoints(self, scalePoints, useScalePoints):
if len(scalePoints) == 0:


Loading…
Cancel
Save