Browse Source

Set UI pipe to not close on exec; Fix build

tags/1.9.4
falkTX 11 years ago
parent
commit
323be46a4e
4 changed files with 19 additions and 8 deletions
  1. +1
    -1
      source/backend/plugin/CarlaPlugin.cpp
  2. +6
    -6
      source/modules/native-plugins/vex/lookandfeel/MyLookAndFeel.cpp
  3. +11
    -0
      source/utils/CarlaPipeUtils.hpp
  4. +1
    -1
      source/utils/JucePluginWindow.hpp

+ 1
- 1
source/backend/plugin/CarlaPlugin.cpp View File

@@ -1763,7 +1763,7 @@ void CarlaPlugin::updateOscData(const lo_address& source, const char* const url)
carla_stdout("CarlaPlugin::updateOscData() - done");
}

bool CarlaPlugin::updateOscDataExtra() override
bool CarlaPlugin::updateOscDataExtra()
{
return false;
}


+ 6
- 6
source/modules/native-plugins/vex/lookandfeel/MyLookAndFeel.cpp View File

@@ -47,17 +47,17 @@ MyLookAndFeel::MyLookAndFeel()
// Topaz->setHorizontalScale (1.0f);
}
MyLookAndFeel::~MyLookAndFeel() override
MyLookAndFeel::~MyLookAndFeel()
{
delete Topaz;
}
Font MyLookAndFeel::getComboBoxFont(ComboBox&) override
Font MyLookAndFeel::getComboBoxFont(ComboBox&)
{
return *Topaz;
}
Font MyLookAndFeel::getPopupMenuFont() override
Font MyLookAndFeel::getPopupMenuFont()
{
return *Topaz;
}
@@ -66,7 +66,7 @@ void MyLookAndFeel::getIdealPopupMenuItemSize(const String& text,
const bool isSeparator,
int standardMenuItemHeight,
int& idealWidth,
int& idealHeight) override
int& idealHeight)
{
if (isSeparator)
{
@@ -86,7 +86,7 @@ void MyLookAndFeel::getIdealPopupMenuItemSize(const String& text,
void MyLookAndFeel::drawToggleButton(Graphics& g,
ToggleButton& button,
bool isMouseOverButton,
bool isButtonDown) override
bool isButtonDown)
{
const int tickWidth = jmin (20, button.getHeight() - 4);
@@ -114,7 +114,7 @@ void MyLookAndFeel::drawRotarySlider(Graphics& g,
float sliderPos,
const float rotaryStartAngle,
const float rotaryEndAngle,
Slider& /*slider*/) override
Slider& /*slider*/)
{
const float radius = jmin (width / 2, height / 2) - 2.0f;
const float centreX = x + width * 0.5f;


+ 11
- 0
source/utils/CarlaPipeUtils.hpp View File

@@ -161,6 +161,17 @@ public:
fail("failed to set pipe as non-block");
}

if (ret != -1)
{
// set to not close on exec
try {
ret = ::fcntl(fPipeRecv, F_SETFD, ::fcntl(fPipeRecv, F_GETFD) & ~FD_CLOEXEC);
} catch (...) {
ret = -1;
fail("failed to set pipe to not close on exec");
}
}

//----------------------------------------------------------------
// wait a while for child process to confirm it is alive



+ 1
- 1
source/utils/JucePluginWindow.hpp View File

@@ -80,7 +80,7 @@ public:
return fClosed;
}

void setTransientWinId(const uintptr_t winId) const override
void setTransientWinId(const uintptr_t winId) const
{
CARLA_SAFE_ASSERT_RETURN(winId != 0,);



Loading…
Cancel
Save