commit 218c622efa445a06dcdcb25312074a117f4e9a12 parent 4b6fd2421b83058d37ea7834de3cd5beb9880418 Author: Johannes Lorenz <[email protected]> Date: Sat, 2 Jun 2018 16:53:16 +0200 Merge master and default_values Diffstat:
43 files changed, 485 insertions(+), 207 deletions(-)
diff --git a/.gitignore b/.gitignore @@ -1,9 +1,17 @@ *.o *~ *.bc +*.swp +*.config +*.creator +*.creator.user +*.files +*.includes src/zynaddsubfx src/Tests/runner src/Tests/runner.cpp CMakeCache.txt CMakeFiles build +doc/gen/ +doc/zynaddsubfx.html diff --git a/.gitmodules b/.gitmodules @@ -1,10 +1,10 @@ [submodule "instruments"] path = instruments - url = git://git.code.sf.net/p/zynaddsubfx/instruments + url = https://github.com/zynaddsubfx/instruments [submodule "rtosc"] path = rtosc url = https://github.com/fundamental/rtosc branch = default_values [submodule "DPF"] path = DPF - url = git://github.com/DISTRHO/DPF + url = https://github.com/DISTRHO/DPF diff --git a/AUTHORS.txt b/AUTHORS.txt @@ -6,6 +6,7 @@ Active Developers: Hans Petter Selasky (BSD Compat) Christopher Oliver (Unison + presets fix, mousewheel support, SUBnote overtones, unison enhancements, ...) + Daniel Sheeler Contributors: Gerald Folcher (legato, mono notes memory) diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -38,7 +38,7 @@ add_subdirectory(doc) # Doxygen only install(FILES AUTHORS.txt COPYING HISTORY.txt README.adoc DESTINATION share/doc/zynaddsubfx ) -install(FILES zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop zynaddsubfx-oss.desktop +install(FILES zynaddsubfx-jack-multi.desktop zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop zynaddsubfx-oss.desktop DESTINATION share/applications) install(FILES zynaddsubfx.svg DESTINATION share/pixmaps) diff --git a/README.adoc b/README.adoc @@ -3,73 +3,79 @@ ZynAddSubFX image::https://travis-ci.org/zynaddsubfx/zynaddsubfx.svg?branch=master[alt="Build status", link="https://travis-ci.org/zynaddsubfx/zynaddsubfx"] -It is a feature heavy realtime software synthesizer for Linux, OSX, -and Windows. - -Originally written by Nasca Octavian Paul <zynaddsubfx AT yahoo D0T com> - -Maintained by Mark McCurry 2009+. - -ZynAddSubFX is free program and is distributed WITH NO WARRANTY. -It is licensed under GNU General Public License version 2+. +ZynAddSubFX is a fully featured musical software synthesizer for Linux, MacOS, +BSD, and Windows. +ZynAddSubFX exposes a wide array of synthesis parameters to make it flexible +tool for sound design and a fun experience for playing instruments. + +image::doc/zyn-fusion-add.png[Zyn-Fusion Add Synth Editor] + +Features +~~~~~~~~ + +* Polyphonic with support for legato and mono playing modes +* Three synthesizer engines: +** Additive Synthesis for classic synth sounds composed of a variety of voices with powerful modulation. This exposes modulators ranging from LFOs and envelopes to oscillator modulators for FM, PM, and AM. +** Subtractive Synthesis for creating variable bandwidth harmonics from filtered white noise +** PAD synthesis for creating beautiful pads and other instruments +* Powerful waveform generator with up to 128 sine/non-sine harmonics +* A variety of filters including analogue modeled filters, formant filters, and state variable filters. +* Envelopes can have ADSR (or ASR, etc..) modes or can be free modes (with any shape) +* Effects for Reverb, Echo, Chorus/Flange, Phasing, Wave-shaping, Equalizing, Dynamic Filtering with flexible signal routing +* Instruments can be organized in kits, which allows you to make drum kits or layered instruments; this makes possible to use more than one instrument for a single part. It is possible to choose what items from the kit should be processed by the Part's effects. +* Randomness settings to create subtle differences in each sound to help create that familiar analogue warmth. +* Microtonal capabilities with any scale, up to 128 notes per octave, and key mapping +* Extensive MIDI/Audio driver support including JACK, ALSA, OSS, and PortAudio +* Session Management Support via LASH/NSM +* Plugin Support via DSSI/LV2/VST +* Over 1100 high quality instruments included + + +For more information see: + +- The project page: http://zynaddsubfx.sf.net +- The mailing list: http://lists.sourceforge.net/mailman/listinfo/zynaddsubfx-user +- The public forum: http://www.kvraudio.com/forum/viewforum.php?f=47 +- The IRC channel: ##zynaddsubfx on freenode + +Dependencies +~~~~~~~~~~~~ -The project page is -http://sourceforge.net/projects/zynaddsubfx -or -http://zynaddsubfx.sourceforge.net - -Mailing List: -http://lists.sourceforge.net/mailman/listinfo/zynaddsubfx-user +ZynAddSubFX depends on a number of dependencies for building. +For more information on building the core along with the FLTK based interface +see doc/building.txt and for building the new interface see +https://github.com/zynaddsubfx/zyn-fusion-build -Public Forum: -http://www.kvraudio.com/forum/viewforum.php?f=47 +Required: -Requirements: -~~~~~~~~~~~~~ - FFTW 3.x.x - necessary for Fast Fourier computations -- MXML-2.5+ from www.minixml.org +- MXML-2.5+ - from www.minixml.org - zlib library from http://www.zlib.org -- Jack Audio (may be optional in the future) +- Liblo - networked open sound control Optional: -~~~~~~~~~ -- FLTK 1.x.x (tested with fltk 1.3+) -- a VST host for the VST version [For more information see: - http://www.kvraudio.com/forum/viewtopic.php?t=268277&sid=95be0b6c9909300d566006428bcbb97d] -Compilation: -~~~~~~~~~~~~ - For the main program see doc/build.txt. - To compile the Spliter, run "make" from the "Spliter" directory. - To compile the Controller, run "make" from the "Controller" directory. - -Running on Linux -~~~~~~~~~~~~~~~~ -Under linux there are several options for both audio output and MIDI input. -Defaults are set at compile time and the desired backend can be set when -starting ZynAddSubFX with the '-I' and '-O' options. -The currently supported backends are: - -- Audio Output - * ALSA (Advanced Linux Sound Architecture) - * OSS (Open Sound System) - * JACK (JACK Audio Connection Kit) - * Port Audio - -- MIDI Input - * ALSA - * OSS - * JACK - -Running on OSX -~~~~~~~~~~~~~~ -Under OSX simply download the binary available on http://sourceforge.net/projects/zynaddsubfx -and run with JACK - -Running on Windows -~~~~~~~~~~~~~~~~~~ -NOTE: At this time only older versions of ZynAddSubFX were compiled on windows - See older versions on sf.net (ie version 2.2.1) +- FLTK (for the old user interface) +- NTK (for the old user interface) +- JACK +- OSS +- ALSA +- CxxTest (for unit tests) +- LASH +- DSSI + +Sibling projects: + +- rtosc - realtime open sound control https://github.com/fundamental/rtosc +- mruby-zest - the framework for the zyn-fusion GUI + https://github.com/mruby-zest/mruby-zest + + +License +~~~~~~~ + +ZynAddSubFX is available under the GPLv2+ license. Have fun! :-) + --The ZynAddSubFX team diff --git a/doc/Makefile b/doc/Makefile @@ -8,32 +8,26 @@ gen-files: xhtml: zynaddsubfx.txt envelope.txt intro.txt lfo.txt - asciidoc -a numbered -a toc -b html5 \ + asciidoctor -a numbered -a toc -b html5 \ -a latexmath \ zynaddsubfx.txt chunked: - asciidoc --doctype=article -b docbook \ - zynaddsubfx.txt rm -rf ./zynaddsubfx.chunked mkdir ./zynaddsubfx.chunked rm -f "./zynaddsubfx.chunked/*.html" ln -s ../images/ zynaddsubfx.chunked/images - xsltproc --stringparam html.stylesheet "./docbook-xsl.css" \ - --stringparam callout.graphics 0 \ - --stringparam navig.graphics 0 \ - --stringparam admon.textlabel 1 \ - --stringparam admon.graphics 0 \ - --nonet \ - --stringparam base.dir "zynaddsubfx.chunked/" \ - "/etc/asciidoc/docbook-xsl/chunked.xsl" \ - "./zynaddsubfx.xml" \ + cp *.txt zynaddsubfx.chunked/ + @curl https://raw.githubusercontent.com/asciidoctor/asciidoctor-extensions-lab/master/lib/multipage-html5-converter.rb -o ./zynaddsubfx.chunked/multipage-html5-converter.rb + cd ./zynaddsubfx.chunked; asciidoctor -r ./multipage-html5-converter.rb -b multipage_html5 zynaddsubfx.txt + ln -s zynaddsubfx-chunked.html ./zynaddsubfx.chunked/index.html + rm ./zynaddsubfx.chunked/multipage-html5-converter.rb ./zynaddsubfx.chunked/*.txt pdf: - a2x -f pdf zynaddsubfx.txt + asciidoctor-pdf zynaddsubfx.txt man: zynaddsubfx.1.txt - a2x -f manpage zynaddsubfx.1.txt + asciidoctor -b manpage zynaddsubfx.1.txt clean: rm -f *~ *html *pdf *xml *tex *log zynaddsubfx.chunked/images diff --git a/doc/intro.txt b/doc/intro.txt @@ -14,7 +14,9 @@ zynaddsubfx -I alsa -O jack -a ------------------------------ This sets the input driver to be alsa and the output driver to be jack, which -should attempt to autoconnect to your soundcard as per the '-a' flag. +should attempt to autoconnect to your soundcard as per the '-a' flag. For more +details, see the <<Output engines>> chapter. + If this is your first time running ZynAddSubFX, you will see a screen that lets you choose between the advanced and beginner interface. Currently the beginner interface is deprecated, so the advanced one is diff --git a/doc/output.txt b/doc/output.txt @@ -0,0 +1,49 @@ +Output engines +-------------- + +There are different output engines for zynaddsubfx. + +ALSA +~~~~ +Simply start zyn using `zynaddsubfx -O alsa`. + +NOTE: If your system is using PulseAudio, this may not work. Even if it does, +and ALSA redirects to PulseAudio, realtime guarantees can not be made. It is +recommended to follow the steps in the <<PulseAudio>> section. + +Jack +~~~~ +NOTE: If your system is using PulseAudio, this is the suggested way, but may +not work out of the box, or it may not do what you want. Please seee the +<<PulseAudio>> section. + +There are different ways to forward zyn to jack: + +* Automatic connecting with `zynaddsfubx -O jack -a` will usually do what you + want +* Manual selective connecting can be done by using `zynaddsfubx -O jack` and + then using one of + - the `qjackctl` gui + - the `jack_connect` commandline utility +* Automatic selective connecting can be done using + http://www.rncbc.org/drupal/node/76[jack's patchbays] + +PulseAudio +~~~~~~~~~~ +PulseAudio is *not* **directly** implemented in zyn. While PulseAudio can be +really practical in many cases, it has no realtime guarantees. Running zyn +right through pulse is thus not intended. In case you want to keep +PulseAudio and still use zyn, the suggested way is to route PulseAudio through +jack. You need to + +* Install jack2 +* Route pulse through jack2 using cadence + +These steps should be described for your distribution. Check out one of the +following links. + +* https://wiki.archlinux.org/index.php/PulseAudio/Examples#The_KXStudio_method[Arch Linux] +* please add more here ... + +After that, follow the usual steps described under <<Jack>>. + diff --git a/doc/zyn-fusion-add.png b/doc/zyn-fusion-add.png Binary files differ. diff --git a/doc/zynaddsubfx.txt b/doc/zynaddsubfx.txt @@ -6,6 +6,8 @@ This documentation is a work in progress include::intro.txt[] +include::output.txt[] + include::filter.txt[] include::lfo.txt[] diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt @@ -491,6 +491,8 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") wsock32 "-static" iphlpapi "-static" winpthread) +elseif(APPLE) + set(PTHREAD_LIBRARY pthread) else() set(PLATFORM_LIBRARIES rt) set(PTHREAD_LIBRARY pthread) diff --git a/src/DSP/SVFilter.cpp b/src/DSP/SVFilter.cpp @@ -26,6 +26,12 @@ namespace zyn { +enum FilterInterpolationType { + INTERPOLATE_EXTREME = 0x01, + INTERPOLATE_NON_ZERO, + INTERPOLATE_NONE +}; + SVFilter::SVFilter(unsigned char Ftype, float Ffreq, float Fq, unsigned char Fstages, unsigned int srate, int bufsize) :Filter(srate, bufsize), @@ -34,7 +40,7 @@ SVFilter::SVFilter(unsigned char Ftype, float Ffreq, float Fq, freq(Ffreq), q(Fq), gain(1.0f), - needsinterpolation(false), + needsinterpolation(INTERPOLATE_NONE), firsttime(true) { if(stages >= MAX_FILTER_STAGES) @@ -100,6 +106,8 @@ SVFilter::response SVFilter::computeResponse(int type, } } + + void SVFilter::computefiltercoefs(void) { par.f = freq / samplerate_f * 4.0f; @@ -127,8 +135,14 @@ void SVFilter::setfreq(float frequency) //if the frequency is changed fast, it needs interpolation if((rap > 3.0f) || nyquistthresh) { //(now, filter and coefficients backup) if(!firsttime) - needsinterpolation = true; + needsinterpolation = INTERPOLATE_EXTREME; + ipar = par; + } else if(rap != 1.0) { + if (!firsttime) + needsinterpolation = INTERPOLATE_NON_ZERO; ipar = par; + } else { + needsinterpolation = INTERPOLATE_NONE; } freq = frequency; computefiltercoefs(); @@ -168,8 +182,7 @@ void SVFilter::setstages(int stages_) computefiltercoefs(); } -void SVFilter::singlefilterout(float *smp, fstage &x, parameters &par) -{ +float *SVFilter::getfilteroutfortype(SVFilter::fstage &x) { float *out = NULL; switch(type) { case 0: @@ -188,11 +201,20 @@ void SVFilter::singlefilterout(float *smp, fstage &x, parameters &par) out = &x.low; warnx("Impossible SVFilter type encountered [%d]", type); } + return out; +} +void SVFilter::singlefilterout_with_par_interpolation(float *smp, fstage &x, parameters &par1, parameters &par2) +{ + float *out = getfilteroutfortype(x); for(int i = 0; i < buffersize; ++i) { - x.low = x.low + par.f * x.band; - x.high = par.q_sqrt * smp[i] - x.low - par.q * x.band; - x.band = par.f * x.high + x.band; + float p = i / buffersize_f; + float f = par1.f + (par2.f - par1.f) * p; + float q = par1.q + (par2.q - par1.q) * p; + float q_sqrt = sqrtf(q); + x.low = x.low + f * x.band; + x.high = q_sqrt * smp[i] - x.low - q * x.band; + x.band = f * x.high + x.band; x.notch = x.high + x.low; smp[i] = *out; } @@ -209,23 +231,38 @@ void SVFilter::singlefilterout(float *smp, fstage &x, parameters &par) // xl = pf*pfxh*z(-1)/(1-z(-1))^2 -void SVFilter::filterout(float *smp) + +void SVFilter::singlefilterout(float *smp, SVFilter::fstage &x, SVFilter::parameters &par) { - for(int i = 0; i < stages + 1; ++i) - singlefilterout(smp, st[i], par); + float *out = getfilteroutfortype(x); + for(int i = 0; i < buffersize; ++i) { + x.low = x.low + par.f * x.band; + x.high = par.q_sqrt * smp[i] - x.low - par.q * x.band; + x.band = par.f * x.high + x.band; + x.notch = x.high + x.low; + smp[i] = *out; + } +} - if(needsinterpolation) { +void SVFilter::filterout(float *smp) +{ + if (needsinterpolation == INTERPOLATE_EXTREME) { float ismp[buffersize]; + for(int i = 0; i < stages + 1; ++i) + singlefilterout(smp, st[i], par); memcpy(ismp, smp, bufferbytes); - for(int i = 0; i < stages + 1; ++i) singlefilterout(ismp, st[i], ipar); - for(int i = 0; i < buffersize; ++i) { float x = i / buffersize_f; smp[i] = ismp[i] * (1.0f - x) + smp[i] * x; } - needsinterpolation = false; + } else if (needsinterpolation == INTERPOLATE_NON_ZERO) { + for(int i = 0; i < stages + 1; ++i) + singlefilterout_with_par_interpolation(smp, st[i], ipar, par); + } else { + for(int i = 0; i < stages + 1; ++i) + singlefilterout(smp, st[i], par); } for(int i = 0; i < buffersize; ++i) diff --git a/src/DSP/SVFilter.h b/src/DSP/SVFilter.h @@ -56,7 +56,9 @@ class SVFilter:public Filter float f, q, q_sqrt; } par, ipar; + float *getfilteroutfortype(SVFilter::fstage &x); void singlefilterout(float *smp, fstage &x, parameters &par); + void singlefilterout_with_par_interpolation(float *smp, fstage &x, parameters &par1, parameters &par2); void computefiltercoefs(void); int type; // The type of the filter (LPF1,HPF1,LPF2,HPF2...) int stages; // how many times the filter is applied (0->1,1->2,etc.) @@ -66,7 +68,8 @@ class SVFilter:public Filter bool abovenq, //if the frequency is above the nyquist oldabovenq; - bool needsinterpolation, firsttime; + int needsinterpolation; + bool firsttime; }; } diff --git a/src/Misc/Allocator.h b/src/Misc/Allocator.h @@ -61,7 +61,7 @@ class Allocator T *valloc(size_t len, Ts&&... ts) { T *data = (T*)alloc_mem(len*sizeof(T)); - if(!data) { + if(!data && len != 0) { rollbackTransaction(); throw std::bad_alloc(); } diff --git a/src/Misc/Bank.cpp b/src/Misc/Bank.cpp @@ -34,6 +34,18 @@ #include <windows.h> #endif +#ifdef __APPLE__ +#include <dlfcn.h> + +static const char* my_dylib_path () { + static Dl_info info; + if (dladdr((const void*) &my_dylib_path, &info)) { + return info.dli_fname; + } + return NULL; +} +#endif + using namespace std; namespace zyn { @@ -377,6 +389,22 @@ void Bank::rescanforbanks() } } #endif +#ifdef __APPLE__ + { + const char* path = my_dylib_path (); + if (path && strstr(path, "ZynAddSubFX.dylib") && strlen (path) < 1000) { + char tmp[1024]; + strcpy (tmp, path); + strstr (tmp, "ZynAddSubFX.dylib")[0] = 0; // LV2 + strcat (tmp, "banks"); + scanrootdir(tmp); + strcpy (tmp, path); + strstr (tmp, "ZynAddSubFX.dylib")[0] = 0; + strcat (tmp, "../Resources/banks"); // VST + scanrootdir(tmp); + } + } +#endif //sort the banks sort(banks.begin(), banks.end()); diff --git a/src/Misc/BankDb.cpp b/src/Misc/BankDb.cpp @@ -237,7 +237,11 @@ BankEntry BankDb::processXiz(std::string filename, #ifndef WIN32 int ret = lstat(fname.c_str(), &st); if(ret != -1) +# ifdef __APPLE__ + time = st.st_mtimespec.tv_sec; +# else time = st.st_mtim.tv_sec; +# endif #else int ret = 0; time = rand(); diff --git a/src/Misc/Master.cpp b/src/Misc/Master.cpp @@ -681,6 +681,7 @@ void Master::loadAutomation(XMLwrapper &xml, rtosc::AutomationMgr &midi) midi.createBinding(i, path.c_str(), false); midi.setSlotSubGain(i, j, gain); midi.setSlotSubOffset(i, j, offset); + midi.updateMapping(i, j); xml.exitbranch(); } } diff --git a/src/Misc/Microtonal.cpp b/src/Misc/Microtonal.cpp @@ -51,6 +51,7 @@ const rtosc::Ports Microtonal::ports = { rParamZyn(PAnote, rShort("1/1 midi note"), rDefault(69), "The note for 'A'"), rParamF(PAfreq, rShort("ref freq"), rDefault(440.0f), + rLog(1.0,20000.0), "Frequency of the 'A' note"), rParamZyn(Pscaleshift, rShort("shift"), rDefault(64), "UNDOCUMENTED"), diff --git a/src/Misc/MiddleWare.cpp b/src/Misc/MiddleWare.cpp @@ -62,6 +62,26 @@ namespace zyn { using std::string; int Pexitprogram = 0; +#ifdef __APPLE__ +#include <mach/clock.h> +#include <mach/mach.h> +#endif + +/* work around missing clock_gettime on OSX */ +static void monotonic_clock_gettime(struct timespec *ts) { +#ifdef __APPLE__ + clock_serv_t cclock; + mach_timespec_t mts; + host_get_clock_service(mach_host_self(), SYSTEM_CLOCK, &cclock); + clock_get_time(cclock, &mts); + mach_port_deallocate(mach_task_self(), cclock); + ts->tv_sec = mts.tv_sec; + ts->tv_nsec = mts.tv_nsec; +#else + clock_gettime(CLOCK_MONOTONIC, ts); +#endif +} + /****************************************************************************** * LIBLO And Reflection Code * * * @@ -1601,7 +1621,7 @@ MiddleWareImpl::MiddleWareImpl(MiddleWare *mw, SYNTH_T synth_, //Setup starting time struct timespec time; - clock_gettime(CLOCK_MONOTONIC, &time); + monotonic_clock_gettime(&time); start_time_sec = time.tv_sec; start_time_nsec = time.tv_nsec; @@ -1696,7 +1716,7 @@ void MiddleWareImpl::heartBeat(Master *master) //Current offline status struct timespec time; - clock_gettime(CLOCK_MONOTONIC, &time); + monotonic_clock_gettime(&time); uint32_t now = (time.tv_sec-start_time_sec)*100 + (time.tv_nsec-start_time_nsec)*1e-9*100; int32_t last_ack = master->last_ack; diff --git a/src/Misc/Part.cpp b/src/Misc/Part.cpp @@ -133,7 +133,7 @@ static const Ports partPorts = { p->Ppolymode = 0; p->Plegatomode = 1; }}}, - {"clear:", rProp(internal) rDoc("Reset Part To Defaults"), 0, + {"clear:", rProp(internal) rDoc("Reset Part To Defaults"), 0, [](const char *, RtData &d) { //XXX todo forward this event for middleware to handle @@ -534,7 +534,7 @@ bool Part::NoteOn(unsigned char note, wm, (pre+"kit"+i+"/adpars/").c_str), 0, i}); if(item.Psubenabled) notePool.insertNote(note, sendto, - {memory.alloc<SUBnote>(kit[i].subpars, pars), 1, i}); + {memory.alloc<SUBnote>(kit[i].subpars, pars, wm, (pre+"kit"+i+"/subpars/").c_str), 1, i}); if(item.Ppadenabled) notePool.insertNote(note, sendto, {memory.alloc<PADnote>(kit[i].padpars, pars, interpolation, wm, @@ -571,7 +571,7 @@ void Part::NoteOff(unsigned char note) //release the key if(!ctl.sustain.sustain) { //the sustain pedal is not pushed if((isMonoMode() || isLegatoMode()) && !monomemEmpty()) MonoMemRenote();//Play most recent still active note - else + else notePool.release(desc); } else { //the sustain pedal is pushed diff --git a/src/Params/ADnoteParameters.cpp b/src/Params/ADnoteParameters.cpp @@ -153,12 +153,12 @@ static const Ports voicePorts = { //Modulator Stuff - rOption(PFMEnabled, rShort("mode"), rOptions(none, morph, ring, phase, + rOption(PFMEnabled, rShort("mode"), rOptions(none, mix, ring, phase, frequency, pulse), rDefault(none), "Modulator mode"), rParamI(PFMVoice, rShort("voice"), rDefault(-1), "Modulator Oscillator Selection"), - rParamZyn(PFMVolume, rShort("vol."), rDefault(90), - "Modulator Magnitude"), + rParamF(FMvolume, rShort("vol."), rLinear(0.0, 100.0), + rDefault(70.0), "Modulator Magnitude"), rParamZyn(PFMVolumeDamp, rShort("damp."), rDefault(64), "Modulator HF dampening"), rParamZyn(PFMVelocityScaleFunction, rShort("sense"), rDefault(64), @@ -222,7 +222,17 @@ static const Ports voicePorts = { obj->PCoarseDetune = k + (obj->PCoarseDetune/1024)*1024; } }}, - + {"PFMVolume::i", rShort("vol.") rLinear(0,127) + rDoc("Modulator Magnitude"), NULL, + [](const char *msg, RtData &d) + { + rObject *obj = (rObject *)d.obj; + if (!rtosc_narguments(msg)) + d.reply(d.loc, "i", (int)roundf(127.0f * obj->FMvolume + / 100.0f)); + else + obj->FMvolume = 100.0f * rtosc_argument(msg, 0).i / 127.0f; + }}, //weird stuff for PCoarseDetune {"FMdetunevalue:", rMap(unit,cents) rDoc("Get modulator detune"), NULL, [](const char *, RtData &d) { @@ -525,7 +535,7 @@ void ADnoteVoiceParam::defaults() //I use the internal oscillator (-1) PFMVoice = -1; - PFMVolume = 90; + FMvolume = 70.0; PFMVolumeDamp = 64; PFMDetune = 8192; PFMCoarseDetune = 0; @@ -789,7 +799,7 @@ void ADnoteVoiceParam::add2XML(XMLwrapper& xml, bool fmoscilused) xml.beginbranch("FM_PARAMETERS"); xml.addpar("input_voice", PFMVoice); - xml.addpar("volume", PFMVolume); + xml.addparreal("volume", FMvolume); xml.addpar("volume_damp", PFMVolumeDamp); xml.addpar("velocity_sensing", PFMVelocityScaleFunction); @@ -1090,7 +1100,7 @@ void ADnoteVoiceParam::paste(ADnoteVoiceParam &a) RCopy(FilterLfo); copy(PFMVoice); - copy(PFMVolume); + copy(FMvolume); copy(PFMVolumeDamp); copy(PFMVelocityScaleFunction); @@ -1264,8 +1274,16 @@ void ADnoteVoiceParam::getfromXML(XMLwrapper& xml, unsigned nvoice) } if(xml.enterbranch("FM_PARAMETERS")) { + const bool upgrade_3_0_3 = (xml.fileversion() < version_type(3,0,3)) || + (xml.getparreal("volume", -1) < 0); + PFMVoice = xml.getpar("input_voice", PFMVoice, -1, nvoice - 1); - PFMVolume = xml.getpar127("volume", PFMVolume); + if (upgrade_3_0_3) { + int Pvolume = xml.getpar127("volume", 0); + FMvolume = 100.0f * Pvolume / 127.0f; + } else { + FMvolume = xml.getparreal("volume", FMvolume); + } PFMVolumeDamp = xml.getpar127("volume_damp", PFMVolumeDamp); PFMVelocityScaleFunction = xml.getpar127("velocity_sensing", PFMVelocityScaleFunction); diff --git a/src/Params/ADnoteParameters.h b/src/Params/ADnoteParameters.h @@ -20,7 +20,7 @@ namespace zyn { enum FMTYPE { - NONE, MORPH, RING_MOD, PHASE_MOD, FREQ_MOD, PW_MOD + NONE, MIX, RING_MOD, PHASE_MOD, FREQ_MOD, PW_MOD }; /*****************************************************************/ @@ -258,7 +258,7 @@ struct ADnoteVoiceParam { * MODULLATOR PARAMETERS * ****************************/ - /* Modullator Parameters (0=off,1=Morph,2=RM,3=PM,4=FM.. */ + /* Modullator Parameters (0=off,1=Mix,2=RM,3=PM,4=FM.. */ unsigned char PFMEnabled; /* Voice that I use as modullator instead of FMSmp. @@ -270,7 +270,7 @@ struct ADnoteVoiceParam { OscilGen *FMSmp; /* Modullator Volume */ - unsigned char PFMVolume; + float FMvolume; /* Modullator damping at higher frequencies */ unsigned char PFMVolumeDamp; diff --git a/src/Plugin/AlienWah/CMakeLists.txt b/src/Plugin/AlienWah/CMakeLists.txt @@ -14,8 +14,13 @@ set_target_properties(ZynAlienWah_vst PROPERTIES LIBRARY_OUTPUT_DIRECTORY "vst") set_target_properties(ZynAlienWah_vst PROPERTIES OUTPUT_NAME "ZynAlienWah") set_target_properties(ZynAlienWah_vst PROPERTIES PREFIX "") -target_link_libraries(ZynAlienWah_lv2 zynaddsubfx_core ${OS_LIBRARIES}) -target_link_libraries(ZynAlienWah_vst zynaddsubfx_core ${OS_LIBRARIES}) +if(APPLE) + target_link_libraries(ZynAlienWah_lv2 zynaddsubfx_core ${OS_LIBRARIES} "-Wl,-exported_symbol,_lv2_descriptor" "-Wl,-exported_symbol,_lv2_generate_ttl") + target_link_libraries(ZynAlienWah_vst zynaddsubfx_core ${OS_LIBRARIES} "-Wl,-exported_symbol,_VSTPluginMain") +else() + target_link_libraries(ZynAlienWah_lv2 zynaddsubfx_core ${OS_LIBRARIES}) + target_link_libraries(ZynAlienWah_vst zynaddsubfx_core ${OS_LIBRARIES}) +endif() install(TARGETS ZynAlienWah_lv2 LIBRARY DESTINATION ${PluginLibDir}/lv2/ZynAlienWah.lv2/) install(TARGETS ZynAlienWah_vst LIBRARY DESTINATION ${PluginLibDir}/vst/) diff --git a/src/Plugin/Chorus/CMakeLists.txt b/src/Plugin/Chorus/CMakeLists.txt @@ -14,8 +14,13 @@ set_target_properties(ZynChorus_vst PROPERTIES LIBRARY_OUTPUT_DIRECTORY "vst") set_target_properties(ZynChorus_vst PROPERTIES OUTPUT_NAME "ZynChorus") set_target_properties(ZynChorus_vst PROPERTIES PREFIX "") -target_link_libraries(ZynChorus_lv2 zynaddsubfx_core ${OS_LIBRARIES}) -target_link_libraries(ZynChorus_vst zynaddsubfx_core ${OS_LIBRARIES}) +if(APPLE) + target_link_libraries(ZynChorus_lv2 zynaddsubfx_core ${OS_LIBRARIES} "-Wl,-exported_symbol,_lv2_descriptor" "-Wl,-exported_symbol,_lv2_generate_ttl") + target_link_libraries(ZynChorus_vst zynaddsubfx_core ${OS_LIBRARIES} "-Wl,-exported_symbol,_VSTPluginMain") +else() + target_link_libraries(ZynChorus_lv2 zynaddsubfx_core ${OS_LIBRARIES}) + target_link_libraries(ZynChorus_vst zynaddsubfx_core ${OS_LIBRARIES}) +endif() install(TARGETS ZynChorus_lv2 LIBRARY DESTINATION ${PluginLibDir}/lv2/ZynChorus.lv2/) install(TARGETS ZynChorus_vst LIBRARY DESTINATION ${PluginLibDir}/vst/) diff --git a/src/Plugin/Distortion/CMakeLists.txt b/src/Plugin/Distortion/CMakeLists.txt @@ -14,8 +14,13 @@ set_target_properties(ZynDistortion_vst PROPERTIES LIBRARY_OUTPUT_DIRECTORY "vst set_target_properties(ZynDistortion_vst PROPERTIES OUTPUT_NAME "ZynDistortion") set_target_properties(ZynDistortion_vst PROPERTIES PREFIX "") -target_link_libraries(ZynDistortion_lv2 zynaddsubfx_core ${OS_LIBRARIES}) -target_link_libraries(ZynDistortion_vst zynaddsubfx_core ${OS_LIBRARIES}) +if(APPLE) + target_link_libraries(ZynDistortion_lv2 zynaddsubfx_core ${OS_LIBRARIES} "-Wl,-exported_symbol,_lv2_descriptor" "-Wl,-exported_symbol,_lv2_generate_ttl") + target_link_libraries(ZynDistortion_vst zynaddsubfx_core ${OS_LIBRARIES} "-Wl,-exported_symbol,_VSTPluginMain") +else() + target_link_libraries(ZynDistortion_lv2 zynaddsubfx_core ${OS_LIBRARIES}) + target_link_libraries(ZynDistortion_vst zynaddsubfx_core ${OS_LIBRARIES}) +endif() install(TARGETS ZynDistortion_lv2 LIBRARY DESTINATION ${PluginLibDir}/lv2/ZynDistortion.lv2/) install(TARGETS ZynDistortion_vst LIBRARY DESTINATION ${PluginLibDir}/vst/) diff --git a/src/Plugin/DynamicFilter/CMakeLists.txt b/src/Plugin/DynamicFilter/CMakeLists.txt @@ -14,8 +14,13 @@ set_target_properties(ZynDynamicFilter_vst PROPERTIES LIBRARY_OUTPUT_DIRECTORY " set_target_properties(ZynDynamicFilter_vst PROPERTIES OUTPUT_NAME "ZynDynamicFilter") set_target_properties(ZynDynamicFilter_vst PROPERTIES PREFIX "") -target_link_libraries(ZynDynamicFilter_lv2 zynaddsubfx_core ${OS_LIBRARIES}) -target_link_libraries(ZynDynamicFilter_vst zynaddsubfx_core ${OS_LIBRARIES}) +if(APPLE) + target_link_libraries(ZynDynamicFilter_lv2 zynaddsubfx_core ${OS_LIBRARIES} "-Wl,-exported_symbol,_lv2_descriptor" "-Wl,-exported_symbol,_lv2_generate_ttl") + target_link_libraries(ZynDynamicFilter_vst zynaddsubfx_core ${OS_LIBRARIES} "-Wl,-exported_symbol,_VSTPluginMain") +else() + target_link_libraries(ZynDynamicFilter_lv2 zynaddsubfx_core ${OS_LIBRARIES}) + target_link_libraries(ZynDynamicFilter_vst zynaddsubfx_core ${OS_LIBRARIES}) +endif() install(TARGETS ZynDynamicFilter_lv2 LIBRARY DESTINATION ${PluginLibDir}/lv2/ZynDynamicFilter.lv2/) install(TARGETS ZynDynamicFilter_vst LIBRARY DESTINATION ${PluginLibDir}/vst/) diff --git a/src/Plugin/Echo/CMakeLists.txt b/src/Plugin/Echo/CMakeLists.txt @@ -14,8 +14,13 @@ set_target_properties(ZynEcho_vst PROPERTIES LIBRARY_OUTPUT_DIRECTORY "vst") set_target_properties(ZynEcho_vst PROPERTIES OUTPUT_NAME "ZynEcho") set_target_properties(ZynEcho_vst PROPERTIES PREFIX "") -target_link_libraries(ZynEcho_lv2 zynaddsubfx_core ${OS_LIBRARIES}) -target_link_libraries(ZynEcho_vst zynaddsubfx_core ${OS_LIBRARIES}) +if(APPLE) + target_link_libraries(ZynEcho_lv2 zynaddsubfx_core ${OS_LIBRARIES} "-Wl,-exported_symbol,_lv2_descriptor" "-Wl,-exported_symbol,_lv2_generate_ttl") + target_link_libraries(ZynEcho_vst zynaddsubfx_core ${OS_LIBRARIES} "-Wl,-exported_symbol,_VSTPluginMain") +else() + target_link_libraries(ZynEcho_lv2 zynaddsubfx_core ${OS_LIBRARIES}) + target_link_libraries(ZynEcho_vst zynaddsubfx_core ${OS_LIBRARIES}) +endif() install(TARGETS ZynEcho_lv2 LIBRARY DESTINATION ${PluginLibDir}/lv2/ZynEcho.lv2/) install(TARGETS ZynEcho_vst LIBRARY DESTINATION ${PluginLibDir}/vst/) diff --git a/src/Plugin/Phaser/CMakeLists.txt b/src/Plugin/Phaser/CMakeLists.txt @@ -14,8 +14,13 @@ set_target_properties(ZynPhaser_vst PROPERTIES LIBRARY_OUTPUT_DIRECTORY "vst") set_target_properties(ZynPhaser_vst PROPERTIES OUTPUT_NAME "ZynPhaser") set_target_properties(ZynPhaser_vst PROPERTIES PREFIX "") -target_link_libraries(ZynPhaser_lv2 zynaddsubfx_core ${OS_LIBRARIES}) -target_link_libraries(ZynPhaser_vst zynaddsubfx_core ${OS_LIBRARIES}) +if(APPLE) + target_link_libraries(ZynPhaser_lv2 zynaddsubfx_core ${OS_LIBRARIES} "-Wl,-exported_symbol,_lv2_descriptor" "-Wl,-exported_symbol,_lv2_generate_ttl") + target_link_libraries(ZynPhaser_vst zynaddsubfx_core ${OS_LIBRARIES} "-Wl,-exported_symbol,_VSTPluginMain") +else() + target_link_libraries(ZynPhaser_lv2 zynaddsubfx_core ${OS_LIBRARIES}) + target_link_libraries(ZynPhaser_vst zynaddsubfx_core ${OS_LIBRARIES}) +endif() install(TARGETS ZynPhaser_lv2 LIBRARY DESTINATION ${PluginLibDir}/lv2/ZynPhaser.lv2/) install(TARGETS ZynPhaser_vst LIBRARY DESTINATION ${PluginLibDir}/vst/) diff --git a/src/Plugin/Reverb/CMakeLists.txt b/src/Plugin/Reverb/CMakeLists.txt @@ -14,8 +14,13 @@ set_target_properties(ZynReverb_vst PROPERTIES LIBRARY_OUTPUT_DIRECTORY "vst") set_target_properties(ZynReverb_vst PROPERTIES OUTPUT_NAME "ZynReverb") set_target_properties(ZynReverb_vst PROPERTIES PREFIX "") -target_link_libraries(ZynReverb_lv2 zynaddsubfx_core ${OS_LIBRARIES}) -target_link_libraries(ZynReverb_vst zynaddsubfx_core ${OS_LIBRARIES}) +if(APPLE) + target_link_libraries(ZynReverb_lv2 zynaddsubfx_core ${OS_LIBRARIES} "-Wl,-exported_symbol,_lv2_descriptor" "-Wl,-exported_symbol,_lv2_generate_ttl") + target_link_libraries(ZynReverb_vst zynaddsubfx_core ${OS_LIBRARIES} "-Wl,-exported_symbol,_VSTPluginMain") +else() + target_link_libraries(ZynReverb_lv2 zynaddsubfx_core ${OS_LIBRARIES}) + target_link_libraries(ZynReverb_vst zynaddsubfx_core ${OS_LIBRARIES}) +endif() install(TARGETS ZynReverb_lv2 LIBRARY DESTINATION ${PluginLibDir}/lv2/ZynReverb.lv2/) install(TARGETS ZynReverb_vst LIBRARY DESTINATION ${PluginLibDir}/vst/) diff --git a/src/Plugin/ZynAddSubFX/CMakeLists.txt b/src/Plugin/ZynAddSubFX/CMakeLists.txt @@ -115,7 +115,11 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") "-static" iphlpapi "-static" winpthread) elseif(ZestGui) - set(PLATFORM_LIBRARIES X11 GL rt) + if(APPLE) + set(PLATFORM_LIBRARIES) + else() + set(PLATFORM_LIBRARIES X11 GL rt) + endif() elseif(NtkGui OR FltkGui) set(PLATFORM_LIBRARIES X11 rt) else() @@ -126,10 +130,20 @@ if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows") target_link_libraries(ZynAddSubFX_lv2 zynaddsubfx_core ${OS_LIBRARIES} ${LIBLO_LIBRARIES} ${PLATFORM_LIBRARIES}) endif() -target_link_libraries(ZynAddSubFX_vst zynaddsubfx_core ${OS_LIBRARIES} ${LIBLO_LIBRARIES} - ${PLATFORM_LIBRARIES}) +if(APPLE) + target_link_libraries(ZynAddSubFX_vst zynaddsubfx_core ${OS_LIBRARIES} ${LIBLO_LIBRARIES} + ${PLATFORM_LIBRARIES} "-framework Cocoa" "-framework openGL" "-Wl,-exported_symbol,_VSTPluginMain") +else() + target_link_libraries(ZynAddSubFX_vst zynaddsubfx_core ${OS_LIBRARIES} ${LIBLO_LIBRARIES} + ${PLATFORM_LIBRARIES}) +endif() if(ZestGui AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows") - target_link_libraries(ZynAddSubFX_lv2_ui X11 GL) + if(APPLE) + target_link_libraries(ZynAddSubFX_lv2_ui "-framework Cocoa" "-framework openGL" "-Wl,-exported_symbol,_lv2ui_descriptor") + target_link_libraries(ZynAddSubFX_lv2 "-Wl,-exported_symbol,_lv2_descriptor" "-Wl,-exported_symbol,_lv2_generate_ttl") + else() + target_link_libraries(ZynAddSubFX_lv2_ui X11 GL) + endif() endif() if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows") diff --git a/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp b/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp @@ -60,6 +60,10 @@ public: handle = LoadLibrary("./libzest.dll"); if(!handle) handle = LoadLibrary("libzest.dll"); +#elif defined __APPLE__ + handle = dlopen("@loader_path/libzest.dylib", RTLD_NOW | RTLD_LOCAL); + if(!handle) // VST + handle = dlopen("@loader_path/../Resources/libzest.dylib", RTLD_LAZY); #else handle = dlopen("./libzest.so", RTLD_LAZY); if(!handle) @@ -190,8 +194,8 @@ protected: if(!z.zest) { if(!z.zest_open) return; -if(!oscPort) - return; + if(!oscPort) + return; printf("[INFO:Zyn] zest_open()\n"); char address[1024]; snprintf(address, sizeof(address), "osc.udp://127.0.0.1:%d",oscPort); @@ -203,7 +207,6 @@ if(!oscPort) } z.zest_draw(z.zest); - repaint(); } bool onKeyboard(const KeyboardEvent &ev) @@ -218,8 +221,11 @@ if(!oscPort) void uiIdle(void) override { - if(z.zest) - z.zest_tick(z.zest); + if(z.zest) { + if (z.zest_tick(z.zest)) { + repaint(); + } + } } void uiReshape(uint width, uint height) diff --git a/src/Synth/ADnote.cpp b/src/Synth/ADnote.cpp @@ -216,7 +216,7 @@ void ADnote::setupVoice(int nvoice) voice.filterbypass = param.Pfilterbypass; setupVoiceMod(nvoice); - + voice.FMVoice = param.PFMVoice; voice.FMFreqEnvelope = NULL; voice.FMAmpEnvelope = NULL; @@ -422,7 +422,7 @@ void ADnote::setupVoiceMod(int nvoice, bool first_run) else switch(param.PFMEnabled) { case 1: - voice.FMEnabled = MORPH; + voice.FMEnabled = MIX; break; case 2: voice.FMEnabled = RING_MOD; @@ -453,7 +453,7 @@ void ADnote::setupVoiceMod(int nvoice, bool first_run) float tmp = 1.0f; if((pars.VoicePar[vc].FMSmp->Padaptiveharmonics != 0) - || (voice.FMEnabled == MORPH) + || (voice.FMEnabled == MIX) || (voice.FMEnabled == RING_MOD)) tmp = getFMvoicebasefreq(nvoice); @@ -482,7 +482,7 @@ void ADnote::setupVoiceMod(int nvoice, bool first_run) //Compute the Voice's modulator volume (incl. damping) float fmvoldamp = powf(440.0f / getvoicebasefreq(nvoice), param.PFMVolumeDamp / 64.0f - 1.0f); - const float fmvolume_ = param.PFMVolume / 127.0f; + const float fmvolume_ = param.FMvolume / 100.0f; switch(voice.FMEnabled) { case PHASE_MOD: case PW_MOD: @@ -508,7 +508,7 @@ void ADnote::setupVoiceMod(int nvoice, bool first_run) SynthNote *ADnote::cloneLegato(void) { - SynthParams sp{memory, ctl, synth, time, legato.param.freq, velocity, + SynthParams sp{memory, ctl, synth, time, legato.param.freq, velocity, (bool)portamento, legato.param.midinote, true}; return memory.alloc<ADnote>(&pars, sp); } @@ -520,7 +520,6 @@ SynthNote *ADnote::cloneLegato(void) void ADnote::legatonote(LegatoParams lpars) { //ADnoteParameters &pars = *partparams; - // Manage legato stuff if(legato.update(lpars)) return; @@ -543,7 +542,7 @@ void ADnote::legatonote(LegatoParams lpars) else NoteGlobalPar.Panning = pars.GlobalPar.PPanning / 128.0f; - NoteGlobalPar.Filter->updateSense(velocity, + NoteGlobalPar.Filter->updateSense(velocity, pars.GlobalPar.PFilterVelocityScale, pars.GlobalPar.PFilterVelocityScaleFunction); @@ -587,7 +586,6 @@ void ADnote::legatonote(LegatoParams lpars) pars.VoicePar[nvoice].PFMCoarseDetune, pars.VoicePar[nvoice].PFMDetune); - //Get the voice's oscil or external's voice oscil int vc = nvoice; if(pars.VoicePar[nvoice].Pextoscil != -1) @@ -631,20 +629,20 @@ void ADnote::legatonote(LegatoParams lpars) nvoice), pars.VoicePar[nvoice].PFMVolumeDamp / 64.0f); NoteVoicePar[nvoice].FMVolume = - (expf(pars.VoicePar[nvoice].PFMVolume / 127.0f + (expf(pars.VoicePar[nvoice].FMvolume / 100.0f * FM_AMP_MULTIPLIER) - 1.0f) * fmvoldamp * 4.0f; break; case FREQ_MOD: NoteVoicePar[nvoice].FMVolume = - (expf(pars.VoicePar[nvoice].PFMVolume / 127.0f + (expf(pars.VoicePar[nvoice].FMvolume / 100.0f * FM_AMP_MULTIPLIER) - 1.0f) * fmvoldamp * 4.0f; break; default: if(fmvoldamp > 1.0f) fmvoldamp = 1.0f; NoteVoicePar[nvoice].FMVolume = - pars.VoicePar[nvoice].PFMVolume - / 127.0f * fmvoldamp; + pars.VoicePar[nvoice].FMvolume + / 100.0f * fmvoldamp; } //Voice's modulator velocity sensing @@ -657,7 +655,6 @@ void ADnote::legatonote(LegatoParams lpars) * logf(50.0f)) - 1.0f) / synth.buffersize_f / 10.0f * synth.samplerate_f); } - /// initparameters(); /////////////// @@ -672,7 +669,6 @@ void ADnote::legatonote(LegatoParams lpars) * VelF( velocity, pars.GlobalPar.PAmpVelocityScaleFunction); //velocity sensing - globalnewamplitude = NoteGlobalPar.Volume * NoteGlobalPar.AmpEnvelope->envout_dB() * NoteGlobalPar.AmpLfo->amplfoout(); @@ -734,7 +730,7 @@ void ADnote::legatonote(LegatoParams lpars) && (NoteVoicePar[nvoice].FMVoice < 0)) { pars.VoicePar[nvoice].FMSmp->newrandseed(prng()); - //Perform Anti-aliasing only on MORPH or RING MODULATION + //Perform Anti-aliasing only on MIX or RING MODULATION int vc = nvoice; if(pars.VoicePar[nvoice].PextFMoscil != -1) @@ -924,7 +920,7 @@ void ADnote::initparameters(WatchManager *wm, const char *prefix) param.FMSmp->newrandseed(prng()); vce.FMSmp = memory.valloc<float>(synth.oscilsize + OSCIL_SMP_EXTRA_SAMPLES); - //Perform Anti-aliasing only on MORPH or RING MODULATION + //Perform Anti-aliasing only on MIX or RING MODULATION int vc = nvoice; if(param.PextFMoscil != -1) @@ -932,7 +928,7 @@ void ADnote::initparameters(WatchManager *wm, const char *prefix) float tmp = 1.0f; if((pars.VoicePar[vc].FMSmp->Padaptiveharmonics != 0) - || (vce.FMEnabled == MORPH) + || (vce.FMEnabled == MIX) || (vce.FMEnabled == RING_MOD)) tmp = getFMvoicebasefreq(nvoice); @@ -1305,9 +1301,9 @@ inline void ADnote::ComputeVoiceOscillator_CubicInterpolation(int nvoice){ }; */ /* - * Computes the Oscillator (Morphing) + * Computes the Oscillator (Mixing) */ -inline void ADnote::ComputeVoiceOscillatorMorph(int nvoice) +inline void ADnote::ComputeVoiceOscillatorMix(int nvoice) { ComputeVoiceOscillator_LinearInterpolation(nvoice); if(FMnewamplitude[nvoice] > 1.0f) @@ -1564,15 +1560,15 @@ inline void ADnote::ComputeVoicePinkNoise(int nvoice) float *tw = tmpwave_unison[k]; float *f = &pinking[nvoice][k > 0 ? 7 : 0]; for(int i = 0; i < synth.buffersize; ++i) { - float white = (RND-0.5)/4.0; - f[0] = 0.99886*f[0]+white*0.0555179; - f[1] = 0.99332*f[1]+white*0.0750759; - f[2] = 0.96900*f[2]+white*0.1538520; - f[3] = 0.86650*f[3]+white*0.3104856; - f[4] = 0.55000*f[4]+white*0.5329522; - f[5] = -0.7616*f[5]-white*0.0168980; - tw[i] = f[0]+f[1]+f[2]+f[3]+f[4]+f[5]+f[6]+white*0.5362; - f[6] = white*0.115926; + float white = (RND-0.5)/4.0; + f[0] = 0.99886*f[0]+white*0.0555179; + f[1] = 0.99332*f[1]+white*0.0750759; + f[2] = 0.96900*f[2]+white*0.1538520; + f[3] = 0.86650*f[3]+white*0.3104856; + f[4] = 0.55000*f[4]+white*0.5329522; + f[5] = -0.7616*f[5]-white*0.0168980; + tw[i] = f[0]+f[1]+f[2]+f[3]+f[4]+f[5]+f[6]+white*0.5362; + f[6] = white*0.115926; } } } @@ -1621,8 +1617,8 @@ int ADnote::noteout(float *outl, float *outr) switch (NoteVoicePar[nvoice].noisetype) { case 0: //voice mode=sound switch(NoteVoicePar[nvoice].FMEnabled) { - case MORPH: - ComputeVoiceOscillatorMorph(nvoice); + case MIX: + ComputeVoiceOscillatorMix(nvoice); break; case RING_MOD: ComputeVoiceOscillatorRingModulation(nvoice); @@ -1983,7 +1979,7 @@ void ADnote::Global::initparameters(const ADnoteGlobalParam ¶m, Volume = 4.0f * powf(0.1f, 3.0f * (1.0f - param.PVolume / 96.0f)) //-60 dB .. 0 dB * VelF(velocity, param.PAmpVelocityScaleFunction); //sensing - Filter = memory.alloc<ModFilter>(*param.GlobalFilter, synth, time, memory, + Filter = memory.alloc<ModFilter>(*param.GlobalFilter, synth, time, memory, stereo, basefreq); FilterEnvelope = memory.alloc<Envelope>(*param.FilterEnvelope, basefreq, @@ -1993,7 +1989,7 @@ void ADnote::Global::initparameters(const ADnoteGlobalParam ¶m, Filter->addMod(*FilterEnvelope); Filter->addMod(*FilterLfo); - + { Filter->updateSense(velocity, param.PFilterVelocityScale, param.PFilterVelocityScaleFunction); diff --git a/src/Synth/ADnote.h b/src/Synth/ADnote.h @@ -86,9 +86,9 @@ class ADnote:public SynthNote * Affects tmpwave_unison and updates oscposhi/oscposlo * @todo remove this declaration if it is commented out*/ inline void ComputeVoiceOscillator_CubicInterpolation(int nvoice); - /**Computes the Oscillator samples with morphing. + /**Computes the Oscillator samples with mixing. * updates tmpwave_unison*/ - inline void ComputeVoiceOscillatorMorph(int nvoice); + inline void ComputeVoiceOscillatorMix(int nvoice); /**Computes the Ring Modulated Oscillator.*/ inline void ComputeVoiceOscillatorRingModulation(int nvoice); /**Computes the Frequency Modulated Oscillator. @@ -255,8 +255,8 @@ class ADnote:public SynthNote /* INTERNAL VALUES OF THE NOTE AND OF THE VOICES */ /********************************************************/ - //pinking filter (Paul Kellet) - float pinking[NUM_VOICES][14]; + //pinking filter (Paul Kellet) + float pinking[NUM_VOICES][14]; //the size of unison for a single voice int unison_size[NUM_VOICES]; diff --git a/src/Synth/Envelope.cpp b/src/Synth/Envelope.cpp @@ -32,7 +32,7 @@ Envelope::Envelope(EnvelopeParams &pars, float basefreq, float bufferdt, if(!pars.Pfreemode) pars.converttofree(); - int mode = pars.Envmode; + mode = pars.Envmode; //for amplitude envelopes if((mode == 1) && !linearenvelope) @@ -101,26 +101,54 @@ void Envelope::forceFinish(void) envfinish = true; } +void Envelope::watch(float time, float value) +{ + float pos[2]; + float factor1; + float factor2; + pos[0] = time; + switch(mode) { + case 2: + pos[1] = 1 - value / -40.f; + watchOut(pos, 2); + break; + case 3: + factor1 = log(value/100. + 1.) / (6. * log(2)); + factor2 = log(1. - value/100.) / (6. * log(2)); + pos[1] = ((0.5 * factor1) >= 0) ? (0.5 * factor1 + 0.5) : (0.5 - factor2 * 0.5); + watchOut(pos, 2); + break; + case 4: + pos[1] = (value + 6.) / 12.f; + watchOut(pos, 2); + break; + case 5: + pos[1] = (value + 10.) / 20.f; + watchOut(pos, 2); + break; + default: + pos[1] = value; + watchOut(pos, 2); + } +} + /* * Envelope Output */ float Envelope::envout(bool doWatch) { float out; - if(envfinish) { //if the envelope is finished envoutval = envval[envpoints - 1]; if(doWatch) { - float pos[2] = {(float)envpoints - 1, envoutval}; - watchOut(pos, 2); + watch(envpoints - 1, envoutval); } return envoutval; } if((currentpoint == envsustain + 1) && !keyreleased) { //if it is sustaining now envoutval = envval[envsustain]; if(doWatch) { - float pos[2] = {(float)envsustain, envoutval}; - watchOut(pos, 2); + watch(envsustain, envoutval); } return envoutval; } @@ -144,8 +172,7 @@ float Envelope::envout(bool doWatch) } if(doWatch) { - float pos[2] = {(float)tmp + t, envoutval}; - watchOut(pos, 2); + watch(tmp + t, envoutval); } return out; @@ -169,8 +196,7 @@ float Envelope::envout(bool doWatch) envoutval = out; if(doWatch) { - float pos[2] = {(float)currentpoint + t, envoutval}; - watchOut(pos, 2); + watch(currentpoint + t, envoutval); } return out; } @@ -201,13 +227,13 @@ float Envelope::envout_dB() envoutval = EnvelopeParams::env_rap2dB(out); else envoutval = MIN_ENVELOPE_DB; + out = envoutval; } else - out = EnvelopeParams::env_dB2rap(envout(false)); + out = envout(false); - float pos[2] = {(float)currentpoint + t, out}; - watchOut(pos, 2); + watch(currentpoint + t, out); + return EnvelopeParams::env_dB2rap(out); - return out; } bool Envelope::finished() const diff --git a/src/Synth/Envelope.h b/src/Synth/Envelope.h @@ -23,7 +23,6 @@ namespace zyn { class Envelope { public: - /**Constructor*/ Envelope(class EnvelopeParams &pars, float basefreq, float dt, WatchManager *m=0, const char *watch_prefix=0); @@ -37,6 +36,8 @@ class Envelope /**Determines the status of the Envelope * @return returns 1 if the envelope is finished*/ bool finished(void) const; + void watch(float time, float value); + private: int envpoints; int envsustain; //"-1" means disabled @@ -44,6 +45,7 @@ class Envelope float envval[MAX_ENVELOPE_POINTS]; // [0.0f .. 1.0f] float envstretch; int linearenvelope; + int mode; int currentpoint; //current envelope point (starts from 1) bool forcedrelease; diff --git a/src/Synth/SUBnote.cpp b/src/Synth/SUBnote.cpp @@ -34,7 +34,8 @@ namespace zyn { -SUBnote::SUBnote(const SUBnoteParameters *parameters, SynthParams &spars) +SUBnote::SUBnote(const SUBnoteParameters *parameters, SynthParams &spars, WatchManager *wm, const char *prefix + ) :SynthNote(spars), pars(*parameters), AmpEnvelope(nullptr), FreqEnvelope(nullptr), @@ -42,10 +43,9 @@ SUBnote::SUBnote(const SUBnoteParameters *parameters, SynthParams &spars) GlobalFilter(nullptr), GlobalFilterEnvelope(nullptr), NoteEnabled(true), - lfilter(nullptr), rfilter(nullptr), - wm(nullptr) + lfilter(nullptr), rfilter(nullptr) { - setup(spars.frequency, spars.velocity, spars.portamento, spars.note); + setup(spars.frequency, spars.velocity, spars.portamento, spars.note, false, wm, prefix); } float SUBnote::setupFilters(int *pos, bool automation) @@ -91,7 +91,9 @@ void SUBnote::setup(float freq, float velocity, int portamento_, int midinote, - bool legato) + bool legato, + WatchManager *wm, + const char *prefix) { this->velocity = velocity; portamento = portamento_; @@ -175,9 +177,9 @@ void SUBnote::setup(float freq, oldbandwidth = 64; if(!legato) { //normal note if(pars.Pfixedfreq == 0) - initparameters(basefreq, wm); + initparameters(basefreq, wm, prefix); else - initparameters(basefreq / 440.0f * freq, wm); + initparameters(basefreq / 440.0f * freq, wm, prefix); } else { if(pars.Pfixedfreq == 0) @@ -207,7 +209,7 @@ void SUBnote::legatonote(LegatoParams pars) try { setup(pars.frequency, pars.velocity, pars.portamento, pars.midinote, - true); + true, wm); } catch (std::bad_alloc &ba) { std::cerr << "failed to set legato note parameter in SUBnote: " << ba.what() << std::endl; } @@ -353,10 +355,9 @@ void SUBnote::filter(bpfilter &filter, float *smps) /* * Init Parameters */ -void SUBnote::initparameters(float freq, WatchManager *wm) +void SUBnote::initparameters(float freq, WatchManager *wm, const char *prefix) { - //TODO populate this base string - ScratchString pre; + ScratchString pre = prefix; AmpEnvelope = memory.alloc<Envelope>(*pars.AmpEnvelope, freq, synth.dt(), wm, (pre+"AmpEnvelope/").c_str); diff --git a/src/Synth/SUBnote.h b/src/Synth/SUBnote.h @@ -22,7 +22,8 @@ namespace zyn { class SUBnote:public SynthNote { public: - SUBnote(const SUBnoteParameters *parameters, SynthParams &pars); + SUBnote(const SUBnoteParameters *parameters, SynthParams &pars, + WatchManager *wm = 0, const char *prefix = 0); ~SUBnote(); SynthNote *cloneLegato(void); @@ -38,14 +39,14 @@ class SUBnote:public SynthNote float velocity, int portamento_, int midinote, - bool legato = false); + bool legato = false, WatchManager *wm = 0, const char *prefix = 0); float setupFilters(int *pos, bool automation); void computecurrentparameters(); /* * Initialize envelopes and global filter * calls computercurrentparameters() */ - void initparameters(float freq, WatchManager *wm); + void initparameters(float freq, WatchManager *wm, const char *prefix); void KillNote(); const SUBnoteParameters &pars; diff --git a/src/Synth/WatchPoint.cpp b/src/Synth/WatchPoint.cpp @@ -50,7 +50,7 @@ bool WatchPoint::is_active(void) return false; } - + FloatWatchPoint::FloatWatchPoint(WatchManager *ref, const char *prefix, const char *id) :WatchPoint(ref, prefix, id) {} @@ -58,7 +58,7 @@ FloatWatchPoint::FloatWatchPoint(WatchManager *ref, const char *prefix, const ch VecWatchPoint::VecWatchPoint(WatchManager *ref, const char *prefix, const char *id) :WatchPoint(ref, prefix, id) {} - + WatchManager::WatchManager(thrlnk *link) :write_back(link), new_active(false) { @@ -67,7 +67,7 @@ WatchManager::WatchManager(thrlnk *link) memset(data_list, 0, sizeof(data_list)); memset(deactivate, 0, sizeof(deactivate)); } - + void WatchManager::add_watch(const char *id) { //Don't add duplicate watchs @@ -136,7 +136,7 @@ bool WatchManager::active(const char *id) const return false; } - + int WatchManager::samples(const char *id) const { for(int i=0; i<MAX_WATCH; ++i) @@ -144,7 +144,7 @@ int WatchManager::samples(const char *id) const return sample_list[i]; return 0; } - + void WatchManager::satisfy(const char *id, float f) { //printf("trying to satisfy '%s'\n", id); diff --git a/src/Tests/CMakeLists.txt b/src/Tests/CMakeLists.txt @@ -78,7 +78,7 @@ target_link_libraries(save-osc zynaddsubfx_gui_bridge ${GUI_LIBRARIES} ${NIO_LIBRARIES} ${AUDIO_LIBRARIES}) #this will be replaced with a for loop when the code will get more stable: -add_test(SaveOsc save-osc ../../../instruments/examples/Arpeggio\ 1.xmz) +add_test(SaveOsc save-osc ${CMAKE_CURRENT_SOURCE_DIR}/../../instruments/examples/Arpeggio\ 1.xmz) #message(STATUS "Plugin Test ${GUI_LIBRARIES} ${NIO_LIBRARIES} ${AUDIO_LIBRARIES}") diff --git a/src/Tests/MessageTest.h b/src/Tests/MessageTest.h @@ -303,10 +303,10 @@ class MessageTest:public CxxTest::TestSuite while(ms->bToU->hasNext()) { const char *msg = ms->bToU->read(); if(state == 0) { - TS_ASSERT_EQUALS(rtosc_narguments(msg), 0); + TS_ASSERT_EQUALS(rtosc_narguments(msg), 0U); state = 1; } else if(state == 1) { - TS_ASSERT_EQUALS(rtosc_narguments(msg), 1); + TS_ASSERT_EQUALS(rtosc_narguments(msg), 1U); value = rtosc_argument(msg, 0).i; state = 2; } else if(state == 2) { diff --git a/src/Tests/guitar-adnote.xmz b/src/Tests/guitar-adnote.xmz @@ -349,7 +349,7 @@ version-revision="3" ZynAddSubFX-author="Nasca Octavian Paul"> </FILTER_PARAMETERS> <FM_PARAMETERS> <par name="input_voice" value="-1" /> -<par name="volume" value="46" /> +<par_real name="volume" value="36.2205" exact_value="0x4210E1C3" /> <par name="volume_damp" value="36" /> <par name="velocity_sensing" value="92" /> <par_bool name="amp_envelope_enabled" value="yes" /> diff --git a/src/main.cpp b/src/main.cpp @@ -28,6 +28,9 @@ #include <getopt.h> +#include <sys/types.h> +#include <signal.h> + #include <rtosc/rtosc.h> #include <rtosc/ports.h> #include "Params/PADnoteParameters.h" @@ -735,7 +738,14 @@ done: #endif #endif } - +#ifdef ZEST_GUI +#ifndef WIN32 + int ret = kill(gui_pid, SIGHUP); + if (ret == -1) { + err(1, "Failed to terminate Zyn-Fusion...\n"); + } +#endif +#endif exitprogram(config); return 0; } diff --git a/zynaddsubfx-jack-multi.desktop b/zynaddsubfx-jack-multi.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=ZynAddSubFX - Jack (multi channel) +Comment=A powerful realtime software synthesizer +Comment[fr]=Un synthétiseur logiciel temps-réel puissant +Comment[pl]=Funkcjonalny syntezator wirtualny czasu rzeczywistego +Keywords=audio;sound;jack;midi;synth;synthesizer; +Exec=zynaddsubfx -I jack -O jack-multi +Icon=zynaddsubfx +Terminal=false +Type=Application +Categories=AudioVideo;Audio;
