Browse Source

Fix build

tags/1.9.4
falkTX 11 years ago
parent
commit
8c4ebc7841
5 changed files with 31 additions and 12 deletions
  1. +9
    -0
      source/backend/plugin/BridgePlugin.cpp
  2. +3
    -0
      source/backend/plugin/CarlaPlugin.cpp
  3. +9
    -6
      source/backend/plugin/JucePlugin.cpp
  4. +4
    -2
      source/bridges/Makefile
  5. +6
    -4
      source/plugin/Makefile

+ 9
- 0
source/backend/plugin/BridgePlugin.cpp View File

@@ -565,9 +565,18 @@ public:
void showCustomUI(const bool yesNo) override
{
if (yesNo)
{
osc_send_show(pData->osc.data);

if (pData->engine->getOptions().frontendWinId != 0)
pData->transientTryCounter = 1;
}
else
{
pData->transientTryCounter = 0;

osc_send_hide(pData->osc.data);
}
}

void idle() override


+ 3
- 0
source/backend/plugin/CarlaPlugin.cpp View File

@@ -1639,7 +1639,10 @@ void CarlaPlugin::updateOscData(const lo_address& source, const char* const url)

#ifndef BUILD_BRIDGE
if (pData->hints & PLUGIN_IS_BRIDGE)
{
carla_stdout("CarlaPlugin::updateOscData() - done");
return;
}
#endif

osc_send_sample_rate(pData->osc.data, static_cast<float>(pData->engine->getSampleRate()));


+ 9
- 6
source/backend/plugin/JucePlugin.cpp View File

@@ -655,7 +655,7 @@ protected:
// -------------------------------------------------------------------

public:
bool init(const char* const filename, const char* const name, const char* const label)
bool init(const char* const filename, const char* const name, const char* const label, const char* const format)
{
CARLA_SAFE_ASSERT_RETURN(pData->engine != nullptr, false);

@@ -698,15 +698,18 @@ public:
#endif

//fDesc.name = fDesc.descriptiveName = label;
//fDesc.pluginFormatName = "VST";
fDesc.uid = 0; // TODO - set uid for shell plugins
fDesc.fileOrIdentifier = jfilename;
fDesc.pluginFormatName = format;

fInstance = fFormat.createInstanceFromDescription(fDesc, 44100, 512);
fFormatManager.addDefaultFormats();

String error;
fInstance = fFormatManager.createPluginInstance(fDesc, 44100, 512, error);

if (fInstance == nullptr)
{
pData->engine->setLastError("Plugin failed to initialize");
pData->engine->setLastError(error.toRawUTF8());
return false;
}

@@ -768,8 +771,8 @@ public:

private:
PluginDescription fDesc;
VSTPluginFormat fFormat;
AudioPluginInstance* fInstance;
AudioPluginFormatManager fFormatManager;

AudioSampleBuffer fAudioBuffer;
MidiBuffer fMidiBuffer;
@@ -794,7 +797,7 @@ CarlaPlugin* CarlaPlugin::newJuce(const Initializer& init, const char* const for
#ifdef HAVE_JUCE
JucePlugin* const plugin(new JucePlugin(init.engine, init.id));

if (! plugin->init(init.filename, init.name, init.label))
if (! plugin->init(init.filename, init.name, init.label, format))
{
delete plugin;
return nullptr;


+ 4
- 2
source/bridges/Makefile View File

@@ -440,7 +440,8 @@ LIBS_PLUGIN += \
../modules/juce_events.a \
../modules/juce_data_structures.a \
../modules/juce_graphics.a \
../modules/juce_gui_basics.a
../modules/juce_gui_basics.a \
../modules/juce_gui_extra.a
endif

ifeq ($(CARLA_PLUGIN_SUPPORT),true)
@@ -514,7 +515,8 @@ LIBS_NATIVE += \
../modules/juce_events.a \
../modules/juce_data_structures.a \
../modules/juce_graphics.a \
../modules/juce_gui_basics.a
../modules/juce_gui_basics.a \
../modules/juce_gui_extra.a
endif

ifeq ($(CARLA_PLUGIN_SUPPORT),true)


+ 6
- 4
source/plugin/Makefile View File

@@ -53,6 +53,10 @@ endif
# --------------------------------------------------------------
# Coomon

ifeq ($(HAVE_DGL),true)
LINK_FLAGS += $(DGL_LIBS)
endif

ifeq ($(HAVE_JUCE),true)
LINK_FLAGS += $(JUCE_AUDIO_BASICS_LIBS)
LINK_FLAGS += $(JUCE_CORE_LIBS)
@@ -60,10 +64,7 @@ LINK_FLAGS += $(JUCE_DATA_STRUCTURES_LIBS)
LINK_FLAGS += $(JUCE_EVENTS_LIBS)
LINK_FLAGS += $(JUCE_GRAPHICS_LIBS)
LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)
endif

ifeq ($(HAVE_DGL),true)
LINK_FLAGS += $(DGL_LIBS)
LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
endif

# --------------------------------------------------------------
@@ -109,6 +110,7 @@ LIBS += ../modules/juce_data_structures.a
LIBS += ../modules/juce_events.a
LIBS += ../modules/juce_graphics.a
LIBS += ../modules/juce_gui_basics.a
LIBS += ../modules/juce_gui_extra.a
endif

ifeq ($(HAVE_DGL),true)


Loading…
Cancel
Save