[FIX] DspFaust::deleteVoice now reset the voice. Set version to 2.38.18.

grame-cncm · Jan 17, 2022 · 99fee17 · 99fee17
1 parent 6acf27f
commit 99fee17
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 22 deletions.
diff --git a/COPYING.txt b/COPYING.txt
@@ -1,4 +1,4 @@
-    FAUST compiler, Version 2.38.17
+    FAUST compiler, Version 2.38.18
     Copyright (C) 2003-2019 GRAME, Centre National de Creation Musicale
     ---------------------------------------------------------------------
     This program is free software; you can redistribute it and/or modify

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-version := 2.38.17
+version := 2.38.18
 
 system	?= $(shell uname -s)
 

diff --git a/architecture/api/DspFaust.h b/architecture/api/DspFaust.h
@@ -179,10 +179,10 @@ class DspFaust
         //
         // #### Arguments
         //
-        // * `voice`: the address of the voice given by `newVoice`
+        // * `voice`: the address of the voice given by `newVoice` or `keyOn`
         //--------------------------------------------------------
         int deleteVoice(uintptr_t voice);
-
+    
         //-----------------`void allNotesOff(bool hard = false)`----------------
         // Terminates all the active voices, gently (with release when hard = false or immediately when hard = true).
         //--------------------------------------------------------

diff --git a/architecture/faust/dsp/poly-dsp.h b/architecture/faust/dsp/poly-dsp.h
@@ -245,6 +245,11 @@ struct dsp_voice : public MapUI, public decorator_dsp {
             }
         }
     }
+
+    void reset()
+    {
+        init(getSampleRate());
+    }
 
     void instanceClear()
     {
@@ -845,7 +850,9 @@ class mydsp_poly : public dsp_voice_group, public dsp_poly {
         {
             auto it = find(fVoiceTable.begin(), fVoiceTable.end(), reinterpret_cast<dsp_voice*>(voice));
             if (it != fVoiceTable.end()) {
-                (*it)->keyOff();
+                dsp_voice* voice = *it;
+                voice->keyOff();
+                voice->reset();
             } else {
                 fprintf(stderr, "Voice not found\n");
             }

diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
@@ -3,7 +3,7 @@ project (faust)
 
 #######################################
 # versions management
-set (VERSION 2.38.17)
+set (VERSION 2.38.18)
 macro (get_major_minor_patch version)
 	string( REGEX REPLACE "([0-9]*)\\.([0-9]*)\\.([0-9]*)" "\\1"  VERSION_MAJOR ${version} )
 	string( REGEX REPLACE "([0-9]*)\\.([0-9]*)\\.([0-9]*)" "\\2"  VERSION_MINOR ${version} )

diff --git a/build/MakeRelease.bat b/build/MakeRelease.bat
@@ -3,7 +3,7 @@ echo off
 IF [%1]==[]     GOTO USAGE
 IF NOT EXIST %1 GOTO USAGE
 
-SET VERSION=2.38.17
+SET VERSION=2.38.18
 SET BUILD=%1
 SET FAUSTGENVERSION=1.53
 SET FAUSTLIVE=../../faustlive

diff --git a/build/Makefile b/build/Makefile
@@ -11,7 +11,7 @@ system := $(shell echo $(system) | grep MINGW > /dev/null && echo MINGW || echo
 # output directories
 FAUSTDIR ?= faustdir
 IOSDIR   := iosdir
-VERSION := 2.38.17
+VERSION := 2.38.18
 
 #===============================================================
 # current generator and backends

diff --git a/compiler/README.md b/compiler/README.md
@@ -1,4 +1,4 @@
-% man(1) Version 2.38.17 (13-January-2022) | Faust man page
+% man(1) Version 2.38.18 (17-January-2022) | Faust man page
 
 NAME
 ====

diff --git a/compiler/generator/export.hh b/compiler/generator/export.hh
@@ -22,7 +22,7 @@
 #ifndef __export__
 #define __export__
 
-#define FAUSTVERSION "2.38.17"
+#define FAUSTVERSION "2.38.18"
 
 #ifdef _WIN32
 #define EXPORT __declspec(dllexport)

diff --git a/documentation/man/README.md b/documentation/man/README.md
@@ -1,4 +1,4 @@
-% man(1) Version 2.38.17 (13-January-2022) | Faust man page
+% man(1) Version 2.38.18 (17-January-2022) | Faust man page
 
 NAME
 ====

diff --git a/documentation/man/man-header.txt b/documentation/man/man-header.txt
@@ -1,4 +1,4 @@
-% man(1) Version 2.38.17 (13-January-2022) | Faust man page
+% man(1) Version 2.38.18 (17-January-2022) | Faust man page
 
 NAME
 ====

diff --git a/documentation/man/man1/faust.1 b/documentation/man/man1/faust.1
@@ -1,6 +1,6 @@
-.\" Automatically generated by Pandoc 2.16.2
+.\" Automatically generated by Pandoc 2.17.0.1
 .\"
-.TH "man" "1" "" "Version 2.38.17 (13-January-2022)" "Faust man page"
+.TH "man" "1" "" "Version 2.38.18 (17-January-2022)" "Faust man page"
 .hy
 .SH NAME
 .PP

diff --git a/windows/faust.rc b/windows/faust.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,38,17,0
- PRODUCTVERSION 2,38,17,0
+ FILEVERSION 2,38,18,0
+ PRODUCTVERSION 2,38,18,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "Faust compiler"
-            VALUE "FileVersion", "2, 38, 17, 0"
+            VALUE "FileVersion", "2, 38, 18, 0"
             VALUE "InternalName", "Faust"
             VALUE "LegalCopyright", "Copyright (C) 2009-2019 - Grame"
             VALUE "OriginalFilename", "faust.exe"
             VALUE "ProductName", "Faust"
-            VALUE "ProductVersion", "2, 38, 17, 0"
+            VALUE "ProductVersion", "2, 38, 18, 0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/windows/faustdll.rc b/windows/faustdll.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,38,17,0
- PRODUCTVERSION 2,38,17,0
+ FILEVERSION 2,38,18,0
+ PRODUCTVERSION 2,38,18,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BLOCK "040c04b0"
         BEGIN
             VALUE "FileDescription", "Faust compiler"
-            VALUE "FileVersion", "2, 38, 17, 0"
+            VALUE "FileVersion", "2, 38, 18, 0"
             VALUE "InternalName", "Faust"
             VALUE "LegalCopyright", "Copyright (C) 2009-2019 - Grame"
             VALUE "OriginalFilename", "faust.exe"
             VALUE "ProductName", "Faust"
-            VALUE "ProductVersion", "2, 38, 17, 0"
+            VALUE "ProductVersion", "2, 38, 18, 0"
         END
     END
     BLOCK "VarFileInfo"