Browse Source

Fix build

tags/1.9.7
falkTX 10 years ago
parent
commit
6b348f6a20
2 changed files with 3 additions and 2 deletions
  1. +1
    -0
      data/copy-zynaddsubfx
  2. +2
    -2
      source/native-plugins/zynaddsubfx/UI/Fl_Osc_TSlider.cpp

+ 1
- 0
data/copy-zynaddsubfx View File

@@ -40,3 +40,4 @@ sed -i "s|emplace_uint32(|emplace_uint32_cpp(|" $CARLA_ZYN_DIR/rtosc/cpp/subtre
sed -i "s|../../include/rtosc/|../|" $CARLA_ZYN_DIR/rtosc/cpp/*.cpp sed -i "s|../../include/rtosc/|../|" $CARLA_ZYN_DIR/rtosc/cpp/*.cpp
sed -i "s|../../tlsf/tlsf.h|tlsf/tlsf.h|" $CARLA_ZYN_DIR/Misc/Allocator.cpp sed -i "s|../../tlsf/tlsf.h|tlsf/tlsf.h|" $CARLA_ZYN_DIR/Misc/Allocator.cpp
sed -i "s|../src/globals.h|globals.h|" $CARLA_ZYN_DIR/Misc/Config.cpp sed -i "s|../src/globals.h|globals.h|" $CARLA_ZYN_DIR/Misc/Config.cpp
sed -i "s|identity|identity_ts|" $CARLA_ZYN_DIR/UI/Fl_Osc_TSlider.cpp

+ 2
- 2
source/native-plugins/zynaddsubfx/UI/Fl_Osc_TSlider.cpp View File

@@ -3,13 +3,13 @@
//Copyright (c) 2015 Christopher Oliver //Copyright (c) 2015 Christopher Oliver
//License: GNU GPL version 2 or later //License: GNU GPL version 2 or later


static float identity(float value)
static float identity_ts(float value)
{ {
return value; return value;
} }


Fl_Osc_TSlider::Fl_Osc_TSlider(int x, int y, int w, int h, const char *label) Fl_Osc_TSlider::Fl_Osc_TSlider(int x, int y, int w, int h, const char *label)
:Fl_Osc_Slider(x, y, w, h, label), transform(identity)
:Fl_Osc_Slider(x, y, w, h, label), transform(identity_ts)
{ {
Fl_Group *save = Fl_Group::current(); Fl_Group *save = Fl_Group::current();
tipwin = new TipWin(); tipwin = new TipWin();


Loading…
Cancel
Save