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

Revert Zynaddsubfx changes

Browse Source
This commit is contained in:
Daniel Winzen
2014-12-24 20:08:14 +01:00
parent 36d02b9887
commit 5bf095b6b9
4 changed files with 11 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,14 +43,6 @@ 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)

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

@@ -30,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);

27
plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.cpp
View File

@@ -42,16 +42,10 @@ void Config::init()
cfg.OscilSize = 1024;
cfg.SwapStereo = 0;
if( cfg.LinuxOSSWaveOutDev == NULL ) //Check, if object already exists befroe creating it.
{
cfg.LinuxOSSWaveOutDev = new char[MAX_STRING_SIZE];
snprintf(cfg.LinuxOSSWaveOutDev, MAX_STRING_SIZE, "/dev/dsp");
}
if( cfg.LinuxOSSSeqInDev == NULL ) //Check, if object already exists befroe creating it.
{
cfg.LinuxOSSSeqInDev = new char[MAX_STRING_SIZE];
snprintf(cfg.LinuxOSSSeqInDev, MAX_STRING_SIZE, "/dev/sequencer");
}
cfg.LinuxOSSWaveOutDev = new char[MAX_STRING_SIZE];
snprintf(cfg.LinuxOSSWaveOutDev, MAX_STRING_SIZE, "/dev/dsp");
cfg.LinuxOSSSeqInDev = new char[MAX_STRING_SIZE];
snprintf(cfg.LinuxOSSSeqInDev, MAX_STRING_SIZE, "/dev/sequencer");
cfg.DumpFile = "zynaddsubfx_dump.txt";
@@ -73,14 +67,11 @@ void Config::init()
winwavemax = 1;
winmidimax = 1;
//try to find out how many input midi devices are there
if( winmididevices == NULL ) //Check, if object already exists befroe creating it.
{
winmididevices = new winmidionedevice[winmidimax];
for(int i = 0; i < winmidimax; ++i) {
winmididevices[i].name = new char[MAX_STRING_SIZE];
for(int j = 0; j < MAX_STRING_SIZE; ++j)
winmididevices[i].name[j] = '\0';
}
winmididevices = new winmidionedevice[winmidimax];
for(int i = 0; i < winmidimax; ++i) {
winmididevices[i].name = new char[MAX_STRING_SIZE];
for(int j = 0; j < MAX_STRING_SIZE; ++j)
winmididevices[i].name[j] = '\0';
}

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;
}