hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #554 from tresf/stable-1.0

Browse Source 
OSX Mavericks Support
This commit is contained in:
Tobias Doerffel
2014-04-02 11:27:46 +02:00
parent 9916febb66 1ac0c51744
commit 49cfbda916
10 changed files with 295 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/CMakeLists.txt
View File

@@ -12,8 +12,10 @@ ADD_SUBDIRECTORY(LadspaEffect)
ADD_SUBDIRECTORY(lb302)
#ADD_SUBDIRECTORY(lb303)
ADD_SUBDIRECTORY(midi_import)
IF(NOT LMMS_BUILD_APPLE)
ADD_SUBDIRECTORY(opl2)
ENDIF()
ADD_SUBDIRECTORY(organic)
ADD_SUBDIRECTORY(opl2)
ADD_SUBDIRECTORY(papu)
ADD_SUBDIRECTORY(patman)
ADD_SUBDIRECTORY(peak_controller_effect)

2
plugins/dynamics_processor/dynamics_processor.cpp
View File

@@ -28,7 +28,7 @@
#include <math.h>
#include "embed.cpp"
#ifdef LMMS_BUILD_WIN32
#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE)
#ifndef isnanf
#define isnanf(x) isnan(x)
#endif

5
plugins/zynaddsubfx/ZynAddSubFx.cpp
View File

@@ -24,7 +24,12 @@
#include "lmmsconfig.h"
#ifndef LMMS_BUILD_APPLE
#include <Qt/QtXml>
#endif
#ifdef LMMS_BUILD_APPLE
#include <QtXml>
#endif
#include <QtCore/QTemporaryFile>
#include <QtGui/QDropEvent>
#include <QtGui/QGridLayout>

4
plugins/zynaddsubfx/src/Effects/Alienwah.cpp
View File

@@ -67,7 +67,7 @@ void Alienwah::out(const Stereo<float *> &smp)
tmp = clfol * x + oldclfol * x1;
out = tmp * oldl[oldk];
out.real() += (1 - fabs(fb)) * smp.l[i] * (1.0 - panning);
out += (1 - fabs(fb)) * smp.l[i] * (1.0 - panning);
oldl[oldk] = out;
REALTYPE l = out.real() * 10.0 * (fb + 0.1);
@@ -76,7 +76,7 @@ void Alienwah::out(const Stereo<float *> &smp)
tmp = clfor * x + oldclfor * x1;
out = tmp * oldr[oldk];
out.real() += (1 - fabs(fb)) * smp.r[i] * (1.0 - panning);
out += (1 - fabs(fb)) * smp.r[i] * (1.0 - panning);
oldr[oldk] = out;
REALTYPE r = out.real() * 10.0 * (fb + 0.1);