commit 88f8e0fda28f80ff1348da242b69e26fad9f2c69 parent 7a2441c42c3f34b81fdeb9d4b4869cd62e377f92 Author: fundamental <mark.d.mccurry@gmail.com> Date: Sat, 8 May 2010 15:17:13 -0400 Merge branch 'master' into nio Conflicts: src/CMakeLists.txt src/Input/ALSAMidiIn.cpp src/Input/OSSMidiIn.cpp src/Makefile src/Nio/Engine.h src/Output/JACK_RTaudiooutput.cpp src/Output/JACKaudiooutput.cpp src/Output/OSSaudiooutput.cpp Diffstat:
62 files changed, 71 insertions(+), 274 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt @@ -202,14 +202,12 @@ set(NONGUI_LIBRARIES zynaddsubfx_params zynaddsubfx_dsp zynaddsubfx_samples - zynaddsubfx_controls zynaddsubfx_nio ) set(CXXTEST_LINK_LIBS ${NONGUI_LIBRARIES}) add_subdirectory(Misc) -add_subdirectory(Controls) add_subdirectory(Synth) add_subdirectory(Seq) add_subdirectory(Effects) diff --git a/src/Controls/CMakeLists.txt b/src/Controls/CMakeLists.txt @@ -1,8 +0,0 @@ -set(zynaddsubfx_controls_SRCS - Control.cpp - DelayCtl.cpp -) - -add_library(zynaddsubfx_controls STATIC - ${zynaddsubfx_controls_SRCS} - ) diff --git a/src/Controls/Control.cpp b/src/Controls/Control.cpp @@ -1,40 +0,0 @@ -/* - ZynAddSubFX - a software synthesizer - - Control.C - Control base class - Copyright (C) 2009-2009 Mark McCurry - Author: Mark McCurry - - This program is free software; you can redistribute it and/or modify - 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 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License (version 2 or later) for more details. - - You should have received a copy of the GNU General Public License (version 2) - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ -#include "Control.h" - -Control::Control(char ndefaultval) - :defaultval(ndefaultval), lockqueue(-1), locked(false) -{} - -void Control::lock() -{ - locked = true; - lockqueue = -1; -} - -void Control::ulock() -{ - if(locked && (lockqueue >= 0)) - setmVal(lockqueue); - locked = false; -} - diff --git a/src/Controls/Control.h b/src/Controls/Control.h @@ -1,58 +0,0 @@ -/* - ZynAddSubFX - a software synthesizer - - Control.h - Control base class - Copyright (C) 2009-2009 Mark McCurry - Author: Mark McCurry - - This program is free software; you can redistribute it and/or modify - 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 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License (version 2 or later) for more details. - - You should have received a copy of the GNU General Public License (version 2) - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ -#ifndef CONTROL_H -#define CONTROL_H -#include <string> -/**A control for a parameter within the program*/ -class Control -{ - public: - Control(char ndefaultval); /**\todo create proper initialization list*/ - ~Control() {} - /**Return the string, which represents the internal value - * @return a string representation of the current value*/ - virtual std::string getString() const = 0; - /**Set the Control to the given value - * @param nval A number 0-127*/ - virtual void setmVal(char nval) = 0; - /**Return the midi value (aka the char) - * @return the current value*/ - virtual char getmVal() const = 0; - /** Will lock the Control until it is ulocked - * - * Locking a Control will Stop it from having - * its internal data altered*/ - void lock(); - /** Will unlock the Control - * - * This will also update the Control - * if something attempted to update it while it was locked*/ - void ulock(); - private: - char defaultval; /**<Default value of the Control*/ - char lockqueue; /**<The value is that is stored, while the Control is locked - * and something attempts to update it*/ - bool locked; //upgrade this to a integer lock level if problems occur -}; - -#endif - diff --git a/src/Controls/DelayCtl.cpp b/src/Controls/DelayCtl.cpp @@ -1,51 +0,0 @@ -/* - ZynAddSubFX - a software synthesizer - - DelayCtl.C - Control For Delays - Copyright (C) 2009-2009 Mark McCurry - Author: Mark McCurry - - This program is free software; you can redistribute it and/or modify - 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 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License (version 2 or later) for more details. - - You should have received a copy of the GNU General Public License (version 2) - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ -#include "DelayCtl.h" -#include <sstream> - -DelayCtl::DelayCtl() - :Control(64), value(64 / 127.0 * 1.5) {} /**\todo finishme*/ - -std::string DelayCtl::getString() const -{ - std::ostringstream buf; - buf << value; - return buf.str() + " Seconds"; -} - -void DelayCtl::setmVal(char nval) -{ - /**\todo add locking code*/ - //value=1+(int)(nval/127.0*SAMPLE_RATE*1.5);//0 .. 1.5 sec - value = (nval / 127.0 * 1.5); //0 .. 1.5 sec -} - -char DelayCtl::getmVal() const -{ - return (char)(value / 1.5 * 127.0); -} - -float DelayCtl::getiVal() const -{ - return value; -} - diff --git a/src/Controls/DelayCtl.h b/src/Controls/DelayCtl.h @@ -1,43 +0,0 @@ -/* - ZynAddSubFX - a software synthesizer - - DelayCtl.h - Control For Delays - Copyright (C) 2009-2009 Mark McCurry - Author: Mark McCurry - - This program is free software; you can redistribute it and/or modify - 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 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License (version 2 or later) for more details. - - You should have received a copy of the GNU General Public License (version 2) - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ -#include "Control.h" - -#ifndef DELAYCTL_H -#define DELAYCTL_H -/**A Control for Delays - * - * Will vary from 0 seconds to 1.5 seconds*/ -class DelayCtl:public Control -{ - public: - DelayCtl(); - ~DelayCtl() {} - std::string getString() const; - void setmVal(char nval); - char getmVal() const; - float getiVal() const; - private: - float value; -}; - -#endif - diff --git a/src/DSP/AnalogFilter.cpp b/src/DSP/AnalogFilter.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - AnalogFilter.C - Several analog filters (lowpass, highpass...) + AnalogFilter.cpp - Several analog filters (lowpass, highpass...) Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/DSP/Filter.cpp b/src/DSP/Filter.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Filter.C - Filters, uses analog,formant,etc. filters + Filter.cpp - Filters, uses analog,formant,etc. filters Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/DSP/FormantFilter.cpp b/src/DSP/FormantFilter.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - FormantFilter.C - formant filters + FormantFilter.cpp - formant filters Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/DSP/SVFilter.cpp b/src/DSP/SVFilter.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - SVFilter.C - Several state-variable filters + SVFilter.cpp - Several state-variable filters Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Effects/APhaser.cpp b/src/Effects/APhaser.cpp @@ -1,6 +1,6 @@ /* - APhaser.C - Approximate digital model of an analog JFET phaser. + APhaser.cpp - Approximate digital model of an analog JFET phaser. Analog modeling implemented by Ryan Billing aka Transmogrifox. November, 2009 @@ -8,7 +8,7 @@ /////////////////// ZynAddSubFX - a software synthesizer - Phaser.C - Phaser effect + Phaser.cpp - Phaser effect Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Effects/APhaser.h b/src/Effects/APhaser.h @@ -47,7 +47,7 @@ class Analog_Phaser:public Effect private: //Phaser parameters EffectLFO lfo; //Phaser modulator - unsigned char Pvolume; //Used in Process.C to set wet/dry mix + unsigned char Pvolume; //Used in Process.cpp to set wet/dry mix unsigned char Pdistortion; //Model distortion added by FET element unsigned char Pwidth; //Phaser width (LFO amplitude) unsigned char Pfb; //feedback diff --git a/src/Effects/Alienwah.cpp b/src/Effects/Alienwah.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Alienwah.C - "AlienWah" effect + Alienwah.cpp - "AlienWah" effect Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Effects/Chorus.cpp b/src/Effects/Chorus.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Chorus.C - Chorus and Flange effects + Chorus.cpp - Chorus and Flange effects Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul @@ -62,7 +62,7 @@ REALTYPE Chorus::getdelay(REALTYPE xlfo) if((result + 0.5) >= maxdelay) { cerr << - "WARNING: Chorus.C::getdelay(..) too big delay (see setdelay and setdepth funcs.)\n"; + "WARNING: Chorus.cpp::getdelay(..) too big delay (see setdelay and setdepth funcs.)\n"; result = maxdelay - 1.0; } return result; diff --git a/src/Effects/Distorsion.cpp b/src/Effects/Distorsion.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Distorsion.C - Distorsion effect + Distorsion.cpp - Distorsion effect Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Effects/DynamicFilter.cpp b/src/Effects/DynamicFilter.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - DynamicFilter.C - "WahWah" effect and others + DynamicFilter.cpp - "WahWah" effect and others Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Effects/EQ.cpp b/src/Effects/EQ.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - EQ.C - EQ effect + EQ.cpp - EQ effect Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Effects/Echo.cpp b/src/Effects/Echo.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Echo.C - Echo effect + Echo.cpp - Echo effect Copyright (C) 2002-2005 Nasca Octavian Paul Copyright (C) 2009-2010 Mark McCurry Author: Nasca Octavian Paul @@ -31,9 +31,9 @@ Echo::Echo(const int &insertion_, REALTYPE *const efxoutl_, REALTYPE *const efxoutr_) :Effect(insertion_, efxoutl_, efxoutr_, NULL, 0), - Pvolume(50), Ppanning(64), //Pdelay(60), + Pvolume(50), Ppanning(64), Pdelay(60), Plrdelay(100), Plrcross(100), Pfb(40), Phidamp(60), - delayTime(1), lrdelay(0), + delayTime(1), lrdelay(0), avgDelay(0), delay(new REALTYPE[(int)(MAX_DELAY * SAMPLE_RATE)], new REALTYPE[(int)(MAX_DELAY * SAMPLE_RATE)]), old(0.0), pos(0), delta(1), ndelta(1) @@ -70,10 +70,10 @@ void Echo::initdelays() { cleanup(); //number of seconds to delay left chan - float dl = delayCtl.getiVal() - lrdelay; + float dl = avgDelay - lrdelay; //number of seconds to delay right chan - float dr = delayCtl.getiVal() + lrdelay; + float dr = avgDelay + lrdelay; ndelta.l() = max(1,(int) (dl * SAMPLE_RATE)); ndelta.r() = max(1,(int) (dr * SAMPLE_RATE)); @@ -140,9 +140,8 @@ void Echo::setpanning(unsigned char Ppanning) void Echo::setdelay(unsigned char Pdelay) { - delayCtl.setmVal(Pdelay); - //this->Pdelay=Pdelay; - //delay=1+(int)(Pdelay/127.0*SAMPLE_RATE*1.5);//0 .. 1.5 sec + this->Pdelay=Pdelay; + avgDelay=(Pdelay/127.0*1.5);//0 .. 1.5 sec initdelays(); } @@ -250,7 +249,7 @@ unsigned char Echo::getpar(int npar) const return Ppanning; break; case 2: - return delayCtl.getmVal(); + return Pdelay; break; case 3: return Plrdelay; diff --git a/src/Effects/Echo.h b/src/Effects/Echo.h @@ -27,7 +27,6 @@ #include "Effect.h" #include "../Misc/Stereo.h" #include "../Samples/Sample.h" -#include "../Controls/DelayCtl.h" /**Echo Effect*/ class Echo:public Effect @@ -102,7 +101,7 @@ class Echo:public Effect //Parameters char Pvolume; /**<#1 Volume or Dry/Wetness*/ char Ppanning; /**<#2 Panning*/ - DelayCtl delayCtl; /**<#3 Delay of the Echo*/ + char Pdelay; /**<#3 Delay of the Echo*/ char Plrdelay; /**<#4 L/R delay difference*/ char Plrcross; /**<#5 L/R Mixing*/ char Pfb; /**<#6Feedback*/ @@ -120,7 +119,8 @@ class Echo:public Effect REALTYPE panning, lrcross, fb, hidamp; //Left/Right delay lengths Stereo<int> delayTime; - float lrdelay; + REALTYPE lrdelay; + REALTYPE avgDelay; void initdelays(); //2 channel ring buffer diff --git a/src/Effects/Effect.cpp b/src/Effects/Effect.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Effect.C - this class is inherited by the all effects(Reverb, Echo, ..) + Effect.cpp - this class is inherited by the all effects(Reverb, Echo, ..) Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Effects/EffectLFO.cpp b/src/Effects/EffectLFO.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - EffectLFO.C - Stereo LFO used by some effects + EffectLFO.cpp - Stereo LFO used by some effects Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Effects/EffectMgr.cpp b/src/Effects/EffectMgr.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - EffectMgr.C - Effect manager, an interface betwen the program and effects + EffectMgr.cpp - Effect manager, an interface betwen the program and effects Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Effects/Phaser.cpp b/src/Effects/Phaser.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Phaser.C - Phaser effect + Phaser.cpp - Phaser effect Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Effects/Reverb.cpp b/src/Effects/Reverb.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Reverb.C - Reverberation effect + Reverb.cpp - Reverberation effect Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Input/MidiIn.cpp b/src/Input/MidiIn.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - MidiIn.C - This class is inherited by all the Midi input classes + MidiIn.cpp - This class is inherited by all the Midi input classes Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Input/WINMidiIn.cpp b/src/Input/WINMidiIn.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - WINMidiIn.C - Midi input for Windows + WINMidiIn.cpp - Midi input for Windows Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Misc/Bank.h b/src/Misc/Bank.h @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Bank.C - Instrument Bank + Bank.h - Instrument Bank Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Misc/Config.cpp b/src/Misc/Config.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Config.C - Configuration file functions + Config.cpp - Configuration file functions Copyright (C) 2003-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Misc/Dump.cpp b/src/Misc/Dump.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Dump.C - It dumps the notes to a text file + Dump.cpp - It dumps the notes to a text file Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Misc/LASHClient.cpp b/src/Misc/LASHClient.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - LASHClient.C - LASH support + LASHClient.cpp - LASH support Copyright (C) 2006-2009 Lars Luthman Author: Lars Luthman diff --git a/src/Misc/Master.cpp b/src/Misc/Master.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Master.C - It sends Midi Messages to Parts, receives samples from parts, + Master.cpp - It sends Midi Messages to Parts, receives samples from parts, process them with system/insertion effects and mix them Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Misc/Microtonal.cpp b/src/Misc/Microtonal.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Microtonal.C - Tuning settings and microtonal capabilities + Microtonal.cpp - Tuning settings and microtonal capabilities Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Misc/Part.cpp b/src/Misc/Part.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Part.C - Part implementation + Part.cpp - Part implementation Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul @@ -256,7 +256,7 @@ void Part::NoteOn(unsigned char note, if(Ppolymode != 0) { fprintf( stderr, - "ZynAddSubFX WARNING: Poly and Legato modes are both On, that should not happen ! ... Disabling Legato mode ! - (Part.C::NoteOn(..))\n"); + "ZynAddSubFX WARNING: Poly and Legato modes are both On, that should not happen ! ... Disabling Legato mode ! - (Part.cpp::NoteOn(..))\n"); Plegatomode = 0; } else { @@ -300,7 +300,7 @@ void Part::NoteOn(unsigned char note, //test fprintf(stderr, "%s", - "NOTES TOO MANY (> POLIPHONY) - (Part.C::NoteOn(..))\n"); + "NOTES TOO MANY (> POLIPHONY) - (Part.cpp::NoteOn(..))\n"); else { //start the note partnote[pos].status = KEY_PLAYING; diff --git a/src/Misc/Recorder.cpp b/src/Misc/Recorder.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Recorder.C - Records sound to a file + Recorder.cpp - Records sound to a file Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Misc/Stereo.cpp b/src/Misc/Stereo.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Stereo.C - Object for storing a pair of objects + Stereo.cpp - Object for storing a pair of objects Copyright (C) 2009-2009 Mark McCurry Author: Mark McCurry diff --git a/src/Misc/Util.cpp b/src/Misc/Util.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Util.C - Miscellaneous functions + Util.cpp - Miscellaneous functions Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Misc/XMLwrapper.cpp b/src/Misc/XMLwrapper.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - XMLwrapper.C - XML wrapper + XMLwrapper.cpp - XML wrapper Copyright (C) 2003-2005 Nasca Octavian Paul Copyright (C) 2009-2009 Mark McCurry Author: Nasca Octavian Paul diff --git a/src/Output/DSSIaudiooutput.cpp b/src/Output/DSSIaudiooutput.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - DSSIaudiooutput.C - Audio functions for DSSI + DSSIaudiooutput.cpp - Audio functions for DSSI Copyright (C) 2002 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Output/PAaudiooutput.cpp b/src/Output/PAaudiooutput.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - PAaudiooutput.C - Audio output for PortAudio + PAaudiooutput.cpp - Audio output for PortAudio Copyright (C) 2002 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Output/VSTaudiooutput.cpp b/src/Output/VSTaudiooutput.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - VSTaudiooutput.C - Audio output for VST + VSTaudiooutput.cpp - Audio output for VST Copyright (C) 2002 Nasca Octavian Paul Author: Nasca Octavian Paul @@ -22,7 +22,7 @@ #include <string.h> #include "VSTaudiooutput.h" -//the constructor and the destructor are defined in main.C +//the constructor and the destructor are defined in main.cpp void VSTSynth::process(float **inputs, float **outputs, long sampleframes) { diff --git a/src/Params/ADnoteParameters.cpp b/src/Params/ADnoteParameters.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - ADnoteParameters.C - Parameters for ADnote (ADsynth) + ADnoteParameters.cpp - Parameters for ADnote (ADsynth) Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Params/Controller.cpp b/src/Params/Controller.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Controller.C - (Midi) Controllers implementation + Controller.cpp - (Midi) Controllers implementation Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Params/EnvelopeParams.cpp b/src/Params/EnvelopeParams.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - EnvelopeParams.C - Parameters for Envelope + EnvelopeParams.cpp - Parameters for Envelope Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Params/FilterParams.cpp b/src/Params/FilterParams.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - FilterParams.C - Parameters for filter + FilterParams.cpp - Parameters for filter Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Params/LFOParams.cpp b/src/Params/LFOParams.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - LFOParams.C - Parameters for LFO + LFOParams.cpp - Parameters for LFO Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Params/PADnoteParameters.cpp b/src/Params/PADnoteParameters.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - PADnoteParameters.C - Parameters for PADnote (PADsynth) + PADnoteParameters.cpp - Parameters for PADnote (PADsynth) Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Params/Presets.cpp b/src/Params/Presets.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Presets.C - Presets and Clipboard management + Presets.cpp - Presets and Clipboard management Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Params/PresetsArray.cpp b/src/Params/PresetsArray.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - PresetsArray.C - PresetsArray and Clipboard management + PresetsArray.cpp - PresetsArray and Clipboard management Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Params/PresetsStore.cpp b/src/Params/PresetsStore.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - PresetsStore.C - Presets and Clipboard store + PresetsStore.cpp - Presets and Clipboard store Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Params/PresetsStore.h b/src/Params/PresetsStore.h @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - PresetsStore.C - Presets and Clipboard store + PresetsStore.cpp - Presets and Clipboard store Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Params/SUBnoteParameters.cpp b/src/Params/SUBnoteParameters.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - SUBnoteParameters.C - Parameters for SUBnote (SUBsynth) + SUBnoteParameters.cpp - Parameters for SUBnote (SUBsynth) Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Seq/MIDIEvents.cpp b/src/Seq/MIDIEvents.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - MIDIEvents.C - It stores the midi events from midi file or sequencer + MIDIEvents.cpp - It stores the midi events from midi file or sequencer Copyright (C) 2003-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Seq/MIDIFile.cpp b/src/Seq/MIDIFile.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - MIDIFile.C - MIDI file loader + MIDIFile.cpp - MIDI file loader Copyright (C) 2003-2005 Nasca Octavian Paul Author: Nasca Octavian Paul @@ -101,7 +101,7 @@ int MIDIFile::parsemidifile(MIDIEvents *me_) } else //SMPTE (frames/second and ticks/frame) printf( - "ERROR:in MIDIFile.C::parsemidifile() - SMPTE not implemented yet."); + "ERROR:in MIDIFile.cpp::parsemidifile() - SMPTE not implemented yet."); ; if(ntracks >= NUM_MIDI_TRACKS) diff --git a/src/Seq/Sequencer.cpp b/src/Seq/Sequencer.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Sequencer.C - The Sequencer + Sequencer.cpp - The Sequencer Copyright (C) 2003-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Synth/ADnote.cpp b/src/Synth/ADnote.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - ADnote.C - The "additive" synthesizer + ADnote.cpp - The "additive" synthesizer Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Synth/Envelope.cpp b/src/Synth/Envelope.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Envelope.C - Envelope implementation + Envelope.cpp - Envelope implementation Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Synth/LFO.cpp b/src/Synth/LFO.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - LFO.C - LFO implementation + LFO.cpp - LFO implementation Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Synth/OscilGen.cpp b/src/Synth/OscilGen.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - OscilGen.C - Waveform generator for ADnote + OscilGen.cpp - Waveform generator for ADnote Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Synth/PADnote.cpp b/src/Synth/PADnote.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - PADnote.C - The "pad" synthesizer + PADnote.cpp - The "pad" synthesizer Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Synth/Resonance.cpp b/src/Synth/Resonance.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - Resonance.C - Resonance + Resonance.cpp - Resonance Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/Synth/SUBnote.cpp b/src/Synth/SUBnote.cpp @@ -1,7 +1,7 @@ /* ZynAddSubFX - a software synthesizer - SUBnote.C - The "subtractive" synthesizer + SUBnote.cpp - The "subtractive" synthesizer Copyright (C) 2002-2005 Nasca Octavian Paul Author: Nasca Octavian Paul diff --git a/src/UI/EffUI.fl b/src/UI/EffUI.fl @@ -1943,7 +1943,7 @@ refresh(eff);} Function {make_analog_phaser_window()} {} { Fl_Window effaphaserwindow { xywh {367 295 230 95} type Double box PLASTIC_UP_BOX color 221 labelfont 1 hide - code0 {putchar('a'); putchar('b'); putchar('c');} + code0 {} class Fl_Group } { Fl_Choice aphaserp {