Browse Source

General fixing

tags/1.9.4
falkTX 11 years ago
parent
commit
c854422d31
5 changed files with 68 additions and 25 deletions
  1. +2
    -4
      source/backend/CarlaEngine.hpp
  2. +3
    -3
      source/backend/engine/CarlaEngineJack.cpp
  3. +2
    -0
      source/backend/standalone/CarlaStandalone.cpp
  4. +60
    -13
      source/carla_host.py
  5. +1
    -5
      source/modules/juce_core/AppConfig.h

+ 2
- 4
source/backend/CarlaEngine.hpp View File

@@ -184,10 +184,8 @@ struct EngineMidiEvent {
* MIDI data, without channel bit.
* If size > kDataSize, dataExt is used.
*/
union {
uint8_t data[kDataSize];
const uint8_t* dataExt;
};
uint8_t data[kDataSize];
const uint8_t* dataExt;
};

/*!


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

@@ -1343,7 +1343,7 @@ protected:
ConnectionToId connectionToId(fLastConnectionId++, portIdA, portIdB);
fUsedConnections.append(connectionToId);

callback(ENGINE_CALLBACK_PATCHBAY_CONNECTION_ADDED, connectionToId.id, portIdA, portIdB, 0.0f, nullptr);
callback(ENGINE_CALLBACK_PATCHBAY_CONNECTION_ADDED, connectionToId.id, connectionToId.portOut, connectionToId.portIn, 0.0f, nullptr);
}
else
{
@@ -1353,7 +1353,7 @@ protected:

if (connectionToId.portOut == portIdA && connectionToId.portIn == portIdB)
{
callback(ENGINE_CALLBACK_PATCHBAY_CONNECTION_REMOVED, 0, connectionToId.id, 0, 0.0f, nullptr);
callback(ENGINE_CALLBACK_PATCHBAY_CONNECTION_REMOVED, connectionToId.id, connectionToId.portOut, connectionToId.portIn, 0.0f, nullptr);
fUsedConnections.remove(it);
break;
}
@@ -1764,7 +1764,7 @@ private:
ConnectionToId connectionToId(fLastConnectionId++, thisPortId, targetPortId);
fUsedConnections.append(connectionToId);

callback(ENGINE_CALLBACK_PATCHBAY_CONNECTION_ADDED, connectionToId.id, thisPortId, targetPortId, 0.0f, nullptr);
callback(ENGINE_CALLBACK_PATCHBAY_CONNECTION_ADDED, connectionToId.id, connectionToId.portOut, connectionToId.portIn, 0.0f, nullptr);
}

jackbridge_free(connections);


+ 2
- 0
source/backend/standalone/CarlaStandalone.cpp View File

@@ -89,6 +89,8 @@ protected:
while ((! shouldExit()) && msgMgr->runDispatchLoopUntil(250))
{}
}

fInitialised = false;
}

private:


+ 60
- 13
source/carla_host.py View File

@@ -357,27 +357,74 @@ class HostWindow(QMainWindow):
# read settings

# bool values
forceStereo = settings.value(CARLA_KEY_ENGINE_FORCE_STEREO, CARLA_DEFAULT_FORCE_STEREO, type=bool)
preferPluginBridges = settings.value(CARLA_KEY_ENGINE_PREFER_PLUGIN_BRIDGES, CARLA_DEFAULT_PREFER_PLUGIN_BRIDGES, type=bool)
preferUiBridges = settings.value(CARLA_KEY_ENGINE_PREFER_UI_BRIDGES, CARLA_DEFAULT_PREFER_UI_BRIDGES, type=bool)
uisAlwaysOnTop = settings.value(CARLA_KEY_ENGINE_UIS_ALWAYS_ON_TOP, CARLA_DEFAULT_UIS_ALWAYS_ON_TOP, type=bool)
try:
forceStereo = settings.value(CARLA_KEY_ENGINE_FORCE_STEREO, CARLA_DEFAULT_FORCE_STEREO, type=bool)
except:
forceStereo = CARLA_DEFAULT_FORCE_STEREO

try:
preferPluginBridges = settings.value(CARLA_KEY_ENGINE_PREFER_PLUGIN_BRIDGES, CARLA_DEFAULT_PREFER_PLUGIN_BRIDGES, type=bool)
except:
preferPluginBridges = CARLA_DEFAULT_PREFER_PLUGIN_BRIDGES

try:
preferUiBridges = settings.value(CARLA_KEY_ENGINE_PREFER_UI_BRIDGES, CARLA_DEFAULT_PREFER_UI_BRIDGES, type=bool)
except:
preferUiBridges = CARLA_DEFAULT_PREFER_UI_BRIDGES

try:
uisAlwaysOnTop = settings.value(CARLA_KEY_ENGINE_UIS_ALWAYS_ON_TOP, CARLA_DEFAULT_UIS_ALWAYS_ON_TOP, type=bool)
except:
uisAlwaysOnTop = CARLA_DEFAULT_UIS_ALWAYS_ON_TOP

# int values
maxParameters = settings.value(CARLA_KEY_ENGINE_MAX_PARAMETERS, CARLA_DEFAULT_MAX_PARAMETERS, type=int)
uiBridgesTimeout = settings.value(CARLA_KEY_ENGINE_UI_BRIDGES_TIMEOUT, CARLA_DEFAULT_UI_BRIDGES_TIMEOUT, type=int)
try:
maxParameters = settings.value(CARLA_KEY_ENGINE_MAX_PARAMETERS, CARLA_DEFAULT_MAX_PARAMETERS, type=int)
except:
maxParameters = CARLA_DEFAULT_MAX_PARAMETERS

try:
uiBridgesTimeout = settings.value(CARLA_KEY_ENGINE_UI_BRIDGES_TIMEOUT, CARLA_DEFAULT_UI_BRIDGES_TIMEOUT, type=int)
except:
uiBridgesTimeout = CARLA_DEFAULT_UI_BRIDGES_TIMEOUT

# enums
processMode = settings.value(CARLA_KEY_ENGINE_PROCESS_MODE, CARLA_DEFAULT_PROCESS_MODE, type=int)
transportMode = settings.value(CARLA_KEY_ENGINE_TRANSPORT_MODE, CARLA_DEFAULT_TRANSPORT_MODE, type=int)
try:
processMode = settings.value(CARLA_KEY_ENGINE_PROCESS_MODE, CARLA_DEFAULT_PROCESS_MODE, type=int)
except:
processMode = CARLA_DEFAULT_PROCESS_MODE

try:
transportMode = settings.value(CARLA_KEY_ENGINE_TRANSPORT_MODE, CARLA_DEFAULT_TRANSPORT_MODE, type=int)
except:
transportMode = CARLA_DEFAULT_TRANSPORT_MODE

# driver name
audioDriver = settings.value(CARLA_KEY_ENGINE_AUDIO_DRIVER, CARLA_DEFAULT_AUDIO_DRIVER, type=str)
try:
audioDriver = settings.value(CARLA_KEY_ENGINE_AUDIO_DRIVER, CARLA_DEFAULT_AUDIO_DRIVER, type=str)
except:
audioDriver = CARLA_DEFAULT_AUDIO_DRIVER

# driver options
audioDevice = settings.value("%s%s/Device" % (CARLA_KEY_ENGINE_DRIVER_PREFIX, audioDriver), "", type=str)
audioNumPeriods = settings.value("%s%s/NumPeriods" % (CARLA_KEY_ENGINE_DRIVER_PREFIX, audioDriver), CARLA_DEFAULT_AUDIO_NUM_PERIODS, type=int)
audioBufferSize = settings.value("%s%s/BufferSize" % (CARLA_KEY_ENGINE_DRIVER_PREFIX, audioDriver), CARLA_DEFAULT_AUDIO_BUFFER_SIZE, type=int)
audioSampleRate = settings.value("%s%s/SampleRate" % (CARLA_KEY_ENGINE_DRIVER_PREFIX, audioDriver), CARLA_DEFAULT_AUDIO_SAMPLE_RATE, type=int)
try:
audioDevice = settings.value("%s%s/Device" % (CARLA_KEY_ENGINE_DRIVER_PREFIX, audioDriver), "", type=str)
except:
audioDevice = ""

try:
audioNumPeriods = settings.value("%s%s/NumPeriods" % (CARLA_KEY_ENGINE_DRIVER_PREFIX, audioDriver), CARLA_DEFAULT_AUDIO_NUM_PERIODS, type=int)
except:
audioNumPeriods = CARLA_DEFAULT_AUDIO_NUM_PERIODS

try:
audioBufferSize = settings.value("%s%s/BufferSize" % (CARLA_KEY_ENGINE_DRIVER_PREFIX, audioDriver), CARLA_DEFAULT_AUDIO_BUFFER_SIZE, type=int)
except:
audioBufferSize = CARLA_DEFAULT_AUDIO_BUFFER_SIZE

try:
audioSampleRate = settings.value("%s%s/SampleRate" % (CARLA_KEY_ENGINE_DRIVER_PREFIX, audioDriver), CARLA_DEFAULT_AUDIO_SAMPLE_RATE, type=int)
except:
audioSampleRate = CARLA_DEFAULT_AUDIO_SAMPLE_RATE

# -------------------------------------------------------------
# fix things if needed


+ 1
- 5
source/modules/juce_core/AppConfig.h View File

@@ -17,11 +17,7 @@
Normally, JUCE_DEBUG is set to 1 or 0 based on compiler and project settings,
but if you define this value, you can override this to force it to be true or false.
*/
#if DEBUG
#define JUCE_FORCE_DEBUG 1
#else
#define JUCE_FORCE_DEBUG 0
#endif
#define JUCE_FORCE_DEBUG 0
//=============================================================================
/** Config: JUCE_LOG_ASSERTIONS


Loading…
Cancel
Save