zynaddsubfx

commit 8722bd441455df26b4ce514d69041bee4792fd5b
parent c0ddcaa95788a9d9e0b259c326de7a213ed5dca9
Author: Johannes Lorenz <johannes89@ist-einmalig.de>
Date:   Thu, 28 Dec 2017 15:42:27 +0100

Merge branch 'master' into default_values

Diffstat:
M
HISTORY.txt
 | 
2
+-
M
src/Misc/MiddleWare.cpp
 | 
7
+++++++
M
src/Params/ADnoteParameters.cpp
 | 
4
++--
M
src/UI/MasterUI.fl
 | 
2
+-

4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/HISTORY.txt b/HISTORY.txt
@@ -1,4 +1,4 @@
-3.0.3 (Mid October 2017)
+3.0.3 (4 December 2017)
         - Add bank search to FLTK/NTK GUI
         - Add parallel padsynth sample generation
         - Remove X11 dependency for non-GUI builds
diff --git a/src/Misc/MiddleWare.cpp b/src/Misc/MiddleWare.cpp
@@ -904,6 +904,7 @@ static std::vector<std::string> getFiles(const char *folder, bool finddir)
 
     struct dirent *fn;
     std::vector<string> files;
+    bool has_updir = false;
 
     while((fn = readdir(dir))) {
 #ifndef WIN32
@@ -929,8 +930,14 @@ static std::vector<std::string> getFiles(const char *folder, bool finddir)
 #endif
         if(finddir == is_dir && strcmp(".", fn->d_name))
             files.push_back(fn->d_name);
+
+        if(!strcmp("..", fn->d_name))
+            has_updir = true;
     }
 
+    if(finddir == true && has_updir == false)
+        files.push_back("..");
+
     closedir(dir);
     std::sort(begin(files), end(files));
     return files;
diff --git a/src/Params/ADnoteParameters.cpp b/src/Params/ADnoteParameters.cpp
@@ -306,8 +306,8 @@ static const Ports globalPorts = {
     rParamZyn(PPanning, rShort("pan"), rDefault(64),
         "Panning of ADsynth (0 random, 1 left, 127 right)"),
     rParamZyn(PVolume,  rShort("vol"), rDefault(90), "volume control"),
-    rParamZyn(PAmpVelocityScaleFunction, rShort("scale"), rDefault(64),
-        "Volume Velocity Control"),
+    rParamZyn(PAmpVelocityScaleFunction, rShort("sense"), rDefault(64),
+        "Volume velocity sense"),
 
     rParamZyn(Fadein_adjustment, rDefault(FADEIN_ADJUSTMENT_SCALE),
         "Adjustment for anti-pop strategy."),
diff --git a/src/UI/MasterUI.fl b/src/UI/MasterUI.fl
@@ -869,7 +869,7 @@ panelwindow->show();}
       xywh {411 344 365 280} type Double hide
     } {
       Fl_Box {} {
-        label {Copyright (c) 2002-2009 Nasca O. PAUL, 2009-2016 Mark McCurry, and others. Please read AUTHORS.txt}
+        label {Copyright (c) 2002-2009 Nasca O. PAUL, 2009-2017 Mark McCurry, and others. Please read AUTHORS.txt}
         xywh {15 35 335 55} labeltype EMBOSSED_LABEL labelsize 15 align 208
       }
       Fl_Box {} {