falkTX
/
Carla
mirror of https://github.com/falkTX/Carla
1
0
Fork 0
Code Releases 43 Activity
Browse Source

Misc

tags/1.9.4
falkTX 12 years ago
parent
2f591347a7
commit
6b77b1ac8b
6 changed files with 60 additions and 46 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +12
    -1
      source/Makefile.mk
  2. +5
    -5
      source/backend/CarlaEngine.hpp
  3. +31
    -31
      source/backend/engine/CarlaEngine.cpp
  4. +3
    -1
      source/backend/engine/CarlaEngineNative.cpp
  5. +1
    -0
      source/backend/engine/CarlaEngineOsc.cpp
  6. +8
    -8
      source/utils/LinkedList.hpp

+ 12
- 1
source/Makefile.mk View File

@@ -45,9 +45,20 @@ BASE_FLAGS = -Wall -Wextra -Wcast-qual -Wconversion -pipe -DREAL_BUILD
BASE_OPTS = -O3 -ffast-math -mtune=generic -msse -msse2 -mfpmath=sse -fdata-sections -ffunction-sections
LINK_OPTS = -fdata-sections -ffunction-sections -Wl,--gc-sections

ifeq ($(TESTBUILD),true)
# TODO: check which ones are valid on OSX
BASE_FLAGS += -Wcast-align -Wredundant-decls -Wshadow
BASE_FLAGS += -Wmissing-declarations -Wstrict-overflow -Wundef -Wwrite-strings -fstrict-overflow -Wsuggest-attribute=noreturn -Wunsafe-loop-optimizations
BASE_FLAGS += -Werror
CFLAGS += -isystem /opt/kxstudio/include
CFLAGS += -Wstrict-prototypes -Wmissing-prototypes
CXXFLAGS += -isystem /opt/kxstudio/include
CXXFLAGS += -Wnon-virtual-dtor -Woverloaded-virtual
endif

# -Wcast-align -Wredundant-decls -Wshadow -Wstrict-prototypes -Wmissing-prototypes
# -Wmissing-declarations -Wstrict-overflow -Wundef -Wwrite-strings -fstrict-overflow -Wsuggest-attribute=noreturn -Wunsafe-loop-optimizations
# -Wnon-virtual-dtor -Woverloaded-virtual
# -Wnon-virtual-dtor -Woverloaded-virtual
# -Werror

# -Waggregate-return -Wsign-conversion


+ 5
- 5
source/backend/CarlaEngine.hpp View File

@@ -305,10 +305,10 @@ class CarlaEnginePort
protected:
/*!
* The constructor.\n
* Param \a isInput defines wherever this is an input port or not (output otherwise).\n
* Param \a isInputPort defines wherever this is an input port or not (output otherwise).\n
* Input/output and process mode are constant for the lifetime of the port.
*/
CarlaEnginePort(const CarlaEngine& engine, const bool isInput);
CarlaEnginePort(const CarlaEngine& engine, const bool isInputPort);

public:
/*!
@@ -353,7 +353,7 @@ public:
* The constructor.\n
* All constructor parameters are constant and will never change in the lifetime of the port.
*/
CarlaEngineAudioPort(const CarlaEngine& engine, const bool isInput);
CarlaEngineAudioPort(const CarlaEngine& engine, const bool isInputPort);

/*!
* The destructor.
@@ -399,7 +399,7 @@ public:
* The constructor.\n
* All constructor parameters are constant and will never change in the lifetime of the port.
*/
CarlaEngineCVPort(const CarlaEngine& engine, const bool isInput);
CarlaEngineCVPort(const CarlaEngine& engine, const bool isInputPort);

/*!
* The destructor.
@@ -460,7 +460,7 @@ public:
* The constructor.\n
* All constructor parameters are constant and will never change in the lifetime of the port.
*/
CarlaEngineEventPort(const CarlaEngine& engine, const bool isInput);
CarlaEngineEventPort(const CarlaEngine& engine, const bool isInputPort);

/*!
* The destructor.


+ 31
- 31
source/backend/engine/CarlaEngine.cpp View File

@@ -62,11 +62,11 @@ static const EngineEvent kFallbackEngineEvent = { kEngineEventTypeNull, 0, 0, {{
// -----------------------------------------------------------------------
// Carla Engine port (Abstract)

CarlaEnginePort::CarlaEnginePort(const CarlaEngine& engine, const bool isInput)
CarlaEnginePort::CarlaEnginePort(const CarlaEngine& engine, const bool isInputPort)
: fEngine(engine),
fIsInput(isInput)
fIsInput(isInputPort)
{
carla_debug("CarlaEnginePort::CarlaEnginePort(%s)", bool2str(isInput));
carla_debug("CarlaEnginePort::CarlaEnginePort(%s)", bool2str(isInputPort));
}

CarlaEnginePort::~CarlaEnginePort()
@@ -77,11 +77,11 @@ CarlaEnginePort::~CarlaEnginePort()
// -----------------------------------------------------------------------
// Carla Engine Audio port

CarlaEngineAudioPort::CarlaEngineAudioPort(const CarlaEngine& engine, const bool isInput)
: CarlaEnginePort(engine, isInput),
CarlaEngineAudioPort::CarlaEngineAudioPort(const CarlaEngine& engine, const bool isInputPort)
: CarlaEnginePort(engine, isInputPort),
fBuffer(nullptr)
{
carla_debug("CarlaEngineAudioPort::CarlaEngineAudioPort(%s)", bool2str(isInput));
carla_debug("CarlaEngineAudioPort::CarlaEngineAudioPort(%s)", bool2str(isInputPort));
}

CarlaEngineAudioPort::~CarlaEngineAudioPort()
@@ -96,12 +96,12 @@ void CarlaEngineAudioPort::initBuffer()
// -----------------------------------------------------------------------
// Carla Engine CV port

CarlaEngineCVPort::CarlaEngineCVPort(const CarlaEngine& engine, const bool isInput)
: CarlaEnginePort(engine, isInput),
CarlaEngineCVPort::CarlaEngineCVPort(const CarlaEngine& engine, const bool isInputPort)
: CarlaEnginePort(engine, isInputPort),
fBuffer(nullptr),
fProcessMode(engine.getProccessMode())
{
carla_debug("CarlaEngineCVPort::CarlaEngineCVPort(%s)", bool2str(isInput));
carla_debug("CarlaEngineCVPort::CarlaEngineCVPort(%s)", bool2str(isInputPort));

if (fProcessMode != ENGINE_PROCESS_MODE_SINGLE_CLIENT && fProcessMode != ENGINE_PROCESS_MODE_MULTIPLE_CLIENTS)
fBuffer = new float[engine.getBufferSize()];
@@ -140,12 +140,12 @@ void CarlaEngineCVPort::setBufferSize(const uint32_t bufferSize)
// -----------------------------------------------------------------------
// Carla Engine Event port

CarlaEngineEventPort::CarlaEngineEventPort(const CarlaEngine& engine, const bool isInput)
: CarlaEnginePort(engine, isInput),
CarlaEngineEventPort::CarlaEngineEventPort(const CarlaEngine& engine, const bool isInputPort)
: CarlaEnginePort(engine, isInputPort),
fBuffer(nullptr),
fProcessMode(engine.getProccessMode())
{
carla_debug("CarlaEngineEventPort::CarlaEngineEventPort(%s)", bool2str(isInput));
carla_debug("CarlaEngineEventPort::CarlaEngineEventPort(%s)", bool2str(isInputPort));

if (fProcessMode == ENGINE_PROCESS_MODE_PATCHBAY)
fBuffer = new EngineEvent[kMaxEngineEventInternalCount];
@@ -741,7 +741,7 @@ bool CarlaEngine::addPlugin(const BinaryType btype, const PluginType ptype, cons
CARLA_SAFE_ASSERT_RETURN_ERR(pData->plugins[id].plugin == nullptr, "Invalid engine internal data (err #13)");
}

CarlaPlugin::Initializer init = {
CarlaPlugin::Initializer initializer = {
this,
id,
filename,
@@ -830,70 +830,70 @@ bool CarlaEngine::addPlugin(const BinaryType btype, const PluginType ptype, cons
case PLUGIN_INTERNAL:
if (std::strcmp(label, "Csound") == 0)
{
plugin = CarlaPlugin::newCsound(init);
plugin = CarlaPlugin::newCsound(initializer);
}
else if (std::strcmp(label, "FluidSynth") == 0)
{
use16Outs = (extra != nullptr && std::strcmp((const char*)extra, "true"));
plugin = CarlaPlugin::newFluidSynth(init, use16Outs);
plugin = CarlaPlugin::newFluidSynth(initializer, use16Outs);
}
else if (std::strcmp(label, "LinuxSampler (GIG)") == 0)
{
use16Outs = (extra != nullptr && std::strcmp((const char*)extra, "true"));
plugin = CarlaPlugin::newLinuxSampler(init, "GIG", use16Outs);
plugin = CarlaPlugin::newLinuxSampler(initializer, "GIG", use16Outs);
}
else if (std::strcmp(label, "LinuxSampler (SF2)") == 0)
{
use16Outs = (extra != nullptr && std::strcmp((const char*)extra, "true"));
plugin = CarlaPlugin::newLinuxSampler(init, "SF2", use16Outs);
plugin = CarlaPlugin::newLinuxSampler(initializer, "SF2", use16Outs);
}
else if (std::strcmp(label, "LinuxSampler (SFZ)") == 0)
{
use16Outs = (extra != nullptr && std::strcmp((const char*)extra, "true"));
plugin = CarlaPlugin::newLinuxSampler(init, "SFZ", use16Outs);
plugin = CarlaPlugin::newLinuxSampler(initializer, "SFZ", use16Outs);
}
else
{
plugin = CarlaPlugin::newNative(init);
plugin = CarlaPlugin::newNative(initializer);
}
break;

case PLUGIN_LADSPA:
plugin = CarlaPlugin::newLADSPA(init, (const LADSPA_RDF_Descriptor*)extra);
plugin = CarlaPlugin::newLADSPA(initializer, (const LADSPA_RDF_Descriptor*)extra);
break;

case PLUGIN_DSSI:
plugin = CarlaPlugin::newDSSI(init);
plugin = CarlaPlugin::newDSSI(initializer);
break;

case PLUGIN_LV2:
plugin = CarlaPlugin::newLV2(init);
plugin = CarlaPlugin::newLV2(initializer);
break;

case PLUGIN_VST:
plugin = CarlaPlugin::newVST(init);
plugin = CarlaPlugin::newVST(initializer);
break;

case PLUGIN_AU:
plugin = CarlaPlugin::newAU(init);
plugin = CarlaPlugin::newAU(initializer);
break;

case PLUGIN_FILE_CSD:
plugin = CarlaPlugin::newFileCSD(init);
plugin = CarlaPlugin::newFileCSD(initializer);
break;

case PLUGIN_FILE_GIG:
use16Outs = (extra != nullptr && std::strcmp((const char*)extra, "true"));
plugin = CarlaPlugin::newFileGIG(init, use16Outs);
plugin = CarlaPlugin::newFileGIG(initializer, use16Outs);
break;

case PLUGIN_FILE_SF2:
use16Outs = (extra != nullptr && std::strcmp((const char*)extra, "true"));
plugin = CarlaPlugin::newFileSF2(init, use16Outs);
plugin = CarlaPlugin::newFileSF2(initializer, use16Outs);
break;

case PLUGIN_FILE_SFZ:
plugin = CarlaPlugin::newFileSFZ(init);
plugin = CarlaPlugin::newFileSFZ(initializer);
break;
}
}
@@ -1941,16 +1941,16 @@ void CarlaEngine::sampleRateChanged(const double newSampleRate)
callback(ENGINE_CALLBACK_SAMPLE_RATE_CHANGED, 0, 0, 0, static_cast<float>(newSampleRate), nullptr);
}

void CarlaEngine::offlineModeChanged(const bool isOffline)
void CarlaEngine::offlineModeChanged(const bool isOfflineNow)
{
carla_debug("CarlaEngine::offlineModeChanged(%s)", bool2str(isOffline));
carla_debug("CarlaEngine::offlineModeChanged(%s)", bool2str(isOfflineNow));

for (unsigned int i=0; i < pData->curPluginCount; ++i)
{
CarlaPlugin* const plugin(pData->plugins[i].plugin);

if (plugin != nullptr && plugin->isEnabled())
plugin->offlineModeChanged(isOffline);
plugin->offlineModeChanged(isOfflineNow);
}
}



+ 3
- 1
source/backend/engine/CarlaEngineNative.cpp View File

@@ -560,7 +560,7 @@ public:
~CarlaEngineNative() override
{
CARLA_ASSERT(! fIsActive);
carla_debug("CarlaEngineNative::~CarlaEngineNative()");
carla_debug("CarlaEngineNative::~CarlaEngineNative() - START");

pData->aboutToClose = true;
fIsRunning = false;
@@ -568,6 +568,8 @@ public:
removeAllPlugins();
runPendingRtEvents();
close();

carla_debug("CarlaEngineNative::~CarlaEngineNative() - END");
}

protected:


+ 1
- 0
source/backend/engine/CarlaEngineOsc.cpp View File

@@ -154,6 +154,7 @@ void CarlaEngineOsc::close()

// -----------------------------------------------------------------------

bool isDigit(const char c);
bool isDigit(const char c)
{
return (c >= '0' && c <= '9');


+ 8
- 8
source/utils/LinkedList.hpp View File

@@ -225,7 +225,7 @@ public:
return fRetValue;
}

T& getAt(const size_t index, const bool remove)
T& getAt(const size_t index, const bool removeObj)
{
if (fCount == 0 || index >= fCount)
return fRetValue;
@@ -245,7 +245,7 @@ public:
if (data != nullptr)
fRetValue = data->value;

if (remove)
if (removeObj)
{
--fCount;
list_del(entry);
@@ -263,14 +263,14 @@ public:
return fRetValue;
}

T& getFirst(const bool remove = false)
T& getFirst(const bool removeObj = false)
{
return _getFirstOrLast(true, remove);
return _getFirstOrLast(true, removeObj);
}

T& getLast(const bool remove = false)
T& getLast(const bool removeObj = false)
{
return _getFirstOrLast(false, remove);
return _getFirstOrLast(false, removeObj);
}

void remove(Itenerator& it)
@@ -382,7 +382,7 @@ private:
INIT_LIST_HEAD(&fQueue);
}

T& _getFirstOrLast(const bool first, const bool remove)
T& _getFirstOrLast(const bool first, const bool removeObj)
{
if (fCount == 0)
return fRetValue;
@@ -393,7 +393,7 @@ private:
if (data != nullptr)
fRetValue = data->value;

if (remove)
if (removeObj)
{
--fCount;
list_del(entry);


Write Preview
Loading…
Cancel
Save