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

Add CarlaPipeCommon::flush function and use it

tags/1.9.6
falkTX 10 years ago
parent
c0d40ed9ae
commit
699966ae49
5 changed files with 77 additions and 30 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +48
    -28
      source/backend/engine/CarlaEngineNative.cpp
  2. +3
    -0
      source/modules/CarlaNativeExtUI.hpp
  3. +1
    -0
      source/utils/CarlaExternalUI.hpp
  4. +23
    -1
      source/utils/CarlaPipeUtils.cpp
  5. +2
    -1
      source/utils/CarlaPipeUtils.hpp

+ 48
- 28
source/backend/engine/CarlaEngineNative.cpp View File

@@ -80,6 +80,7 @@ public:
{
const CarlaMutexLocker cml(getLock());
writeMsg("show\n", 5);
flush();
}

protected:
@@ -547,6 +548,7 @@ protected:
const CarlaMutexLocker cml(getLock());
writeMsg("error\n", 6);
writeAndFixMsg(fEngine->getLastError());
flush();
}

return true;
@@ -715,6 +717,7 @@ protected:
fUiServer.writeAndFixMsg("buffer-size");
std::sprintf(fTmpBuf, "%i\n", newBufferSize);
fUiServer.writeMsg(fTmpBuf);
fUiServer.flush();
}

pData->bufferSize = newBufferSize;
@@ -733,6 +736,7 @@ protected:
fUiServer.writeAndFixMsg("sample-rate");
std::sprintf(fTmpBuf, "%f\n", newSampleRate);
fUiServer.writeMsg(fTmpBuf);
fUiServer.flush();
}

pData->sampleRate = newSampleRate;
@@ -794,6 +798,8 @@ protected:

std::sprintf(fTmpBuf, "MIDI_COUNT_%i:%i:%i\n", pluginId, plugin->getMidiInCount(), plugin->getMidiOutCount());
fUiServer.writeMsg(fTmpBuf);

fUiServer.flush();
}

void uiServerSendPluginParameters(CarlaPlugin* const plugin)
@@ -809,6 +815,7 @@ protected:
fUiServer.writeMsg(fTmpBuf);
std::sprintf(fTmpBuf, "%f\n", plugin->getInternalParameterValue(i));
fUiServer.writeMsg(fTmpBuf);
fUiServer.flush();
}

uint32_t ins, outs, count;
@@ -841,6 +848,8 @@ protected:
std::sprintf(fTmpBuf, "%f\n", plugin->getParameterValue(i));
fUiServer.writeMsg(fTmpBuf);
}

fUiServer.flush();
}

void uiServerSendPluginPrograms(CarlaPlugin* const plugin)
@@ -861,6 +870,8 @@ protected:
fUiServer.writeAndFixMsg(fTmpBuf);
}

fUiServer.flush();

count = plugin->getMidiProgramCount();
std::sprintf(fTmpBuf, "MIDI_PROGRAM_COUNT_%i:%i:%i\n", pluginId, count, plugin->getCurrentMidiProgram());
fUiServer.writeMsg(fTmpBuf);
@@ -876,6 +887,8 @@ protected:
std::sprintf(fTmpBuf, "%s", mpData.name);
fUiServer.writeAndFixMsg(fTmpBuf);
}

fUiServer.flush();
}

void uiServerCallback(const EngineCallbackOpcode action, const uint pluginId, const int value1, const int value2, const float value3, const char* const valueStr)
@@ -955,6 +968,8 @@ protected:
fUiServer.writeMsg(fTmpBuf);

fUiServer.writeAndFixMsg(valueStr);

fUiServer.flush();
}

void uiServerInfo()
@@ -986,6 +1001,8 @@ protected:
fUiServer.writeAndFixMsg("sample-rate");
std::sprintf(fTmpBuf, "%f\n", pData->sampleRate);
fUiServer.writeMsg(fTmpBuf);

fUiServer.flush();
}

void uiServerOptions()
@@ -996,75 +1013,74 @@ protected:
const EngineOptions& options(pData->options);
const CarlaMutexLocker cml(fUiServer.getLock());

const char* const optionsForcedStr(fOptionsForced ? "true\n" : "false\n");
const std::size_t optionsForcedStrSize(fOptionsForced ? 5 : 6);

std::sprintf(fTmpBuf, "ENGINE_OPTION_%i\n", ENGINE_OPTION_PROCESS_MODE);
fUiServer.writeMsg(fTmpBuf);
std::sprintf(fTmpBuf, "%s\n", bool2str(fOptionsForced));
fUiServer.writeMsg(fTmpBuf);
fUiServer.writeMsg(optionsForcedStr, optionsForcedStrSize);
std::sprintf(fTmpBuf, "%i\n", options.processMode);
fUiServer.writeMsg(fTmpBuf);
fUiServer.flush();

std::sprintf(fTmpBuf, "ENGINE_OPTION_%i\n", ENGINE_OPTION_TRANSPORT_MODE);
fUiServer.writeMsg(fTmpBuf);
std::sprintf(fTmpBuf, "%s\n", bool2str(fOptionsForced));
fUiServer.writeMsg(fTmpBuf);
fUiServer.writeMsg(optionsForcedStr, optionsForcedStrSize);
std::sprintf(fTmpBuf, "%i\n", options.transportMode);
fUiServer.writeMsg(fTmpBuf);
fUiServer.flush();

std::sprintf(fTmpBuf, "ENGINE_OPTION_%i\n", ENGINE_OPTION_FORCE_STEREO);
fUiServer.writeMsg(fTmpBuf);
std::sprintf(fTmpBuf, "%s\n", bool2str(fOptionsForced));
fUiServer.writeMsg(fTmpBuf);
std::sprintf(fTmpBuf, "%s\n", bool2str(options.forceStereo));
fUiServer.writeMsg(fTmpBuf);
fUiServer.writeMsg(optionsForcedStr, optionsForcedStrSize);
fUiServer.writeMsg(options.forceStereo ? "true\n" : "false\n");
fUiServer.flush();

std::sprintf(fTmpBuf, "ENGINE_OPTION_%i\n", ENGINE_OPTION_PREFER_PLUGIN_BRIDGES);
fUiServer.writeMsg(fTmpBuf);
std::sprintf(fTmpBuf, "%s\n", bool2str(fOptionsForced));
fUiServer.writeMsg(fTmpBuf);
std::sprintf(fTmpBuf, "%s\n", bool2str(options.preferPluginBridges));
fUiServer.writeMsg(fTmpBuf);
fUiServer.writeMsg(optionsForcedStr, optionsForcedStrSize);
fUiServer.writeMsg(options.preferPluginBridges ? "true\n" : "false\n");
fUiServer.flush();

std::sprintf(fTmpBuf, "ENGINE_OPTION_%i\n", ENGINE_OPTION_PREFER_UI_BRIDGES);
fUiServer.writeMsg(fTmpBuf);
std::sprintf(fTmpBuf, "%s\n", bool2str(fOptionsForced));
fUiServer.writeMsg(fTmpBuf);
std::sprintf(fTmpBuf, "%s\n", bool2str(options.preferUiBridges));
fUiServer.writeMsg(fTmpBuf);
fUiServer.writeMsg(optionsForcedStr, optionsForcedStrSize);
fUiServer.writeMsg(options.preferUiBridges ? "true\n" : "false\n");
fUiServer.flush();

std::sprintf(fTmpBuf, "ENGINE_OPTION_%i\n", ENGINE_OPTION_UIS_ALWAYS_ON_TOP);
fUiServer.writeMsg(fTmpBuf);
std::sprintf(fTmpBuf, "%s\n", bool2str(fOptionsForced));
fUiServer.writeMsg(fTmpBuf);
std::sprintf(fTmpBuf, "%s\n", bool2str(options.uisAlwaysOnTop));
fUiServer.writeMsg(fTmpBuf);
fUiServer.writeMsg(optionsForcedStr, optionsForcedStrSize);
fUiServer.writeMsg(options.uisAlwaysOnTop ? "true\n" : "false\n");
fUiServer.flush();

std::sprintf(fTmpBuf, "ENGINE_OPTION_%i\n", ENGINE_OPTION_MAX_PARAMETERS);
fUiServer.writeMsg(fTmpBuf);
std::sprintf(fTmpBuf, "%s\n", bool2str(fOptionsForced));
fUiServer.writeMsg(fTmpBuf);
fUiServer.writeMsg(optionsForcedStr, optionsForcedStrSize);
std::sprintf(fTmpBuf, "%i\n", options.maxParameters);
fUiServer.writeMsg(fTmpBuf);
fUiServer.flush();

std::sprintf(fTmpBuf, "ENGINE_OPTION_%i\n", ENGINE_OPTION_UI_BRIDGES_TIMEOUT);
fUiServer.writeMsg(fTmpBuf);
std::sprintf(fTmpBuf, "%s\n", bool2str(fOptionsForced));
fUiServer.writeMsg(fTmpBuf);
fUiServer.writeMsg(optionsForcedStr, optionsForcedStrSize);
std::sprintf(fTmpBuf, "%i\n", options.uiBridgesTimeout);
fUiServer.writeMsg(fTmpBuf);
fUiServer.flush();

std::sprintf(fTmpBuf, "ENGINE_OPTION_%i\n", ENGINE_OPTION_PATH_BINARIES);
fUiServer.writeMsg(fTmpBuf);
std::sprintf(fTmpBuf, "%s\n", "true");
fUiServer.writeMsg(fTmpBuf);
fUiServer.writeMsg("true\n", 5);
std::sprintf(fTmpBuf, "%s\n", options.binaryDir);
fUiServer.writeMsg(fTmpBuf);
fUiServer.flush();

std::sprintf(fTmpBuf, "ENGINE_OPTION_%i\n", ENGINE_OPTION_PATH_RESOURCES);
fUiServer.writeMsg(fTmpBuf);
std::sprintf(fTmpBuf, "%s\n", "true");
fUiServer.writeMsg(fTmpBuf);
fUiServer.writeMsg("true\n", 5);
std::sprintf(fTmpBuf, "%s\n", options.resourceDir);
fUiServer.writeMsg(fTmpBuf);
fUiServer.flush();
}

// -------------------------------------------------------------------
@@ -1465,6 +1481,8 @@ protected:
fUiServer.writeMsg("0.0\n");
}

fUiServer.flush();

// send peaks and param outputs for all plugins
for (uint i=0; i < pData->curPluginCount; ++i)
{
@@ -1476,6 +1494,7 @@ protected:

std::sprintf(fTmpBuf, "%f:%f:%f:%f\n", plugData.insPeak[0], plugData.insPeak[1], plugData.outsPeak[0], plugData.outsPeak[1]);
fUiServer.writeMsg(fTmpBuf);
fUiServer.flush();

for (uint32_t j=0, count=plugin->getParameterCount(); j < count; ++j)
{
@@ -1486,6 +1505,7 @@ protected:
fUiServer.writeMsg(fTmpBuf);
std::sprintf(fTmpBuf, "%f\n", plugin->getParameterValue(j));
fUiServer.writeMsg(fTmpBuf);
fUiServer.flush();
}
}
}


+ 3
- 0
source/modules/CarlaNativeExtUI.hpp View File

@@ -94,6 +94,7 @@ protected:
writeMsg(tmpBuf);
std::sprintf(tmpBuf, "%f\n", value);
writeMsg(tmpBuf);
flush();
}

void uiSetMidiProgram(const uint8_t channel, const uint32_t bank, const uint32_t program) override
@@ -111,6 +112,7 @@ protected:
writeMsg(tmpBuf);
std::sprintf(tmpBuf, "%i\n", program);
writeMsg(tmpBuf);
flush();
}

void uiSetCustomData(const char* const key, const char* const value) override
@@ -123,6 +125,7 @@ protected:
writeMsg("configure\n", 10);
writeAndFixMsg(key);
writeAndFixMsg(value);
flush();
}

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


+ 1
- 0
source/utils/CarlaExternalUI.hpp View File

@@ -68,6 +68,7 @@ public:

const CarlaMutexLocker cml(getLock());
writeMsg("show\n", 5);
flush();
}

protected:


+ 23
- 1
source/utils/CarlaPipeUtils.cpp View File

@@ -648,7 +648,7 @@ bool CarlaPipeCommon::writeMsg(const char* const msg, std::size_t size) const no
return writeMsgBuffer(msg, size);
}

bool CarlaPipeCommon::writeAndFixMsg(const char* const msg) noexcept
bool CarlaPipeCommon::writeAndFixMsg(const char* const msg) const noexcept
{
CARLA_SAFE_ASSERT_RETURN(msg != nullptr, false);

@@ -687,6 +687,27 @@ bool CarlaPipeCommon::writeAndFixMsg(const char* const msg) noexcept
return writeMsgBuffer(fixedMsg, size+1);
}

bool CarlaPipeCommon::flush() const noexcept
{
// TESTING remove later (replace with trylock scope)
if (pData->writeLock.tryLock())
{
carla_safe_assert("! pData->writeLock.tryLock()", __FILE__, __LINE__);
pData->writeLock.unlock();
return false;
}

CARLA_SAFE_ASSERT_RETURN(pData->pipeSend != INVALID_PIPE_VALUE, false);

try {
#ifdef CARLA_OS_WIN
return (::FlushFileBuffers(pData->pipeSend) != FALSE);
#else
return (::fsync(pData->pipeSend) == 0);
#endif
} CARLA_SAFE_EXCEPTION_RETURN("CarlaPipeCommon::writeMsgBuffer", false);
}

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

// internal
@@ -1194,6 +1215,7 @@ bool CarlaPipeClient::init(char* argv[]) noexcept
pData->pipeSend = pipeSendServer;

writeMsg("\n");
flush();

return true;
}


+ 2
- 1
source/utils/CarlaPipeUtils.hpp View File

@@ -67,7 +67,8 @@ public:

bool writeMsg(const char* const msg) const noexcept;
bool writeMsg(const char* const msg, std::size_t size) const noexcept;
bool writeAndFixMsg(const char* const msg) noexcept;
bool writeAndFixMsg(const char* const msg) const noexcept;
bool flush() const noexcept;

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



Write Preview
Loading…
Cancel
Save