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

Merge remote-tracking branch 'origin/stable-1.0'

Browse Source 
Conflicts:
	plugins/CMakeLists.txt
	plugins/zynaddsubfx/src/Effects/Alienwah.cpp
	src/core/track.cpp
This commit is contained in:
Tobias Doerffel
2014-04-12 11:08:27 +02:00
parent b09d4f5f5d b31c7fcf07
commit 1f661be72c
13 changed files with 1843 additions and 1500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/CMakeLists.txt
View File

@@ -13,8 +13,10 @@ ADD_SUBDIRECTORY(lb302)
#ADD_SUBDIRECTORY(lb303)
ADD_SUBDIRECTORY(midi_import)
ADD_SUBDIRECTORY(monstro)
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

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

18
plugins/opl2/fmopl.c
View File

@@ -31,7 +31,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#define INLINE __inline
#define INLINE static inline
#define HAS_YM3812 1
#include <stdio.h>
@@ -39,7 +39,7 @@
#include <string.h>
#include <stdarg.h>
#include <math.h>
//#include "driver.h" /* use M.A.M.E. */
/* #include "driver.h" */ /* use M.A.M.E. */
#include "fmopl.h"
#ifndef PI
@@ -236,10 +236,10 @@ INT32 feedback2; /* connect for SLOT 2 */
#define LOG_WAR 2 /* WARNING */
#define LOG_INF 1 /* INFORMATION */
//#define LOG_LEVEL LOG_INF
/* #define LOG_LEVEL LOG_INF */
#define LOG_LEVEL LOG_ERR
//#define LOG(n,x) if( (n)>=LOG_LEVEL ) logerror x
/* #define LOG(n,x) if( (n)>=LOG_LEVEL ) logerror x */
#define LOG(n,x)
/* --------------------- subroutines --------------------- */
@@ -313,7 +313,7 @@ INLINE void OPL_KEYOFF(OPL_SLOT *SLOT)
/* set envelope counter from envleope output */
SLOT->evm = ENV_MOD_RR;
if( !(SLOT->evc&EG_DST) )
//SLOT->evc = (ENV_CURVE[SLOT->evc>>ENV_BITS]<<ENV_BITS) + EG_DST;
/* SLOT->evc = (ENV_CURVE[SLOT->evc>>ENV_BITS]<<ENV_BITS) + EG_DST; */
SLOT->evc = EG_DST;
SLOT->eve = EG_DED;
SLOT->evs = SLOT->evsr;
@@ -545,10 +545,10 @@ INLINE void OPL_CALC_RH( OPL_CH *CH )
outd[0] += OP_OUT(SLOT,env_out, feedback2)*2;
}
// SD (17) = mul14[fnum7] + white noise
// TAM (15) = mul15[fnum8]
// TOP (18) = fnum6(mul18[fnum8]+whitenoise)
// HH (14) = fnum7(mul18[fnum8]+whitenoise) + white noise
/* SD (17) = mul14[fnum7] + white noise
TAM (15) = mul15[fnum8]
TOP (18) = fnum6(mul18[fnum8]+whitenoise)
HH (14) = fnum7(mul18[fnum8]+whitenoise) + white noise */
env_sd =OPL_CALC_SLOT(SLOT7_2) + whitenoise;
env_tam=OPL_CALC_SLOT(SLOT8_1);
env_top=OPL_CALC_SLOT(SLOT8_2);

4
plugins/opl2/fmopl.h
View File

@@ -3,8 +3,8 @@
/* --- select emulation chips --- */
#define BUILD_YM3812 (HAS_YM3812)
//#define BUILD_YM3526 (HAS_YM3526)
//#define BUILD_Y8950 (HAS_Y8950)
/* #define BUILD_YM3526 (HAS_YM3526) */
/* #define BUILD_Y8950 (HAS_Y8950) */
/* --- system optimize --- */
/* select bit size of output : 8 or 16 */

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>