mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-05-19 12:16:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Sync zyn with repo version (#3715)

Browse Source 
Sync zyn plugin with zyn repo fixes
This commit is contained in:
Tres Finocchiaro
2017-07-22 04:21:04 -04:00
committed by GitHub
parent fda557fd10
commit ebfdc0491a
7 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.cpp
View File

@@ -43,6 +43,14 @@ EQ::EQ(bool insertion_, float *efxoutl_, float *efxoutr_, unsigned int srate, in
cleanup();
}
EQ::~EQ()
{
for(int i = 0; i < MAX_EQ_BANDS; ++i) {
delete filter[i].l;
delete filter[i].r;
}
}
// Cleanup the effect
void EQ::cleanup(void)

7
plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.h
View File

@@ -6,9 +6,8 @@
Author: Nasca Octavian Paul
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of version 2 of the GNU General Public License
as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,7 +30,7 @@ class EQ:public Effect
{
public:
EQ(bool insertion_, float *efxoutl_, float *efxoutr_, unsigned int srate, int bufsize);
~EQ() {}
~EQ();
void out(const Stereo<float *> &smp);
void setpreset(unsigned char npreset);
void changepar(int npar, unsigned char value);

4
plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp
View File

@@ -47,8 +47,8 @@
*/
#include <QDomDocument>
#include <QDebug>
#include <QtXml/QDomDocument>
#include <QtCore/QDebug>
#include "QtXmlWrapper.h"
#include <string>
#include <sstream>

3
plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.cpp
View File

@@ -189,7 +189,8 @@ void returnTmpBuffer(float *buf)
return;
}
fprintf(stderr,
"ERROR: invalid buffer returned src/Misc/Util.cpp %d\n",
"ERROR: invalid buffer returned %s %d\n",
__FILE__,
__LINE__);
}

2
plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.cpp
View File

@@ -694,7 +694,7 @@ void ADnote::KillNote()
KillVoice(nvoice);
if(NoteVoicePar[nvoice].VoiceOut)
delete NoteVoicePar[nvoice].VoiceOut;
delete[] NoteVoicePar[nvoice].VoiceOut;
NoteVoicePar[nvoice].VoiceOut = NULL;
}

6
plugins/zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl
View File

@@ -204,14 +204,12 @@ if (event==FL_RELEASE){
if ((event==FL_DRAG)&&(currentpoint>=0)){
int ny=127-(int) (y_*127.0/h());
if (ny<0) ny=0;
if (ny>127) ny=127;
if (ny<0) ny=0;if (ny>127) ny=127;
env->Penvval[currentpoint]=ny;
int dx=(int)((x_-cpx)*0.1);
int newdt=cpdt+dx;
if (newdt<0) newdt=0;
if (newdt>127) newdt=127;
if (newdt<0) newdt=0;if (newdt>127) newdt=127;
if (currentpoint!=0) env->Penvdt[currentpoint]=newdt;
else env->Penvdt[currentpoint]=0;

6
plugins/zynaddsubfx/zynaddsubfx/src/UI/ResonanceUI.fl
View File

@@ -133,10 +133,8 @@ if ( (x_>=0)&&(x_<w()) && (y_>=0)&&(y_<h())){
if ((event==FL_PUSH)||(event==FL_DRAG)){
int leftbutton=1;
if (Fl::event_button()==FL_RIGHT_MOUSE) leftbutton=0;
if (x_<0) x_=0;
if (y_<0) y_=0;
if (x_>=w()) x_=w();
if (y_>=h()-1) y_=h()-1;
if (x_<0) x_=0;if (y_<0) y_=0;
if (x_>=w()) x_=w();if (y_>=h()-1) y_=h()-1;
if ((oldx<0)||(oldx==x_)){
int sn=(int)(x_*1.0/w()*N_RES_POINTS);