Minor tweaks to ZamSFZ

Signed-off-by: Damien Zammit <damien@zamaudio.com>

4 files changed, 6 insertions, 19 deletions

diff --git a/plugins/ZamSFZ/Sfz.cpp b/plugins/ZamSFZ/Sfz.cpp
index f522d99..32754b4 100644
--- a/plugins/ZamSFZ/Sfz.cpp
+++ b/plugins/ZamSFZ/Sfz.cpp
@@ -51,6 +51,9 @@ void Sfz::loadsamples(std::string path, std::string filename)
 
 	int maxregions = sfzinstrument->regions.size();
 	layer = 0;
+  if (maxregions == 0) {
+	printf("No samples found\n");
+  } else {
 	for (i = 0; i < maxregions; i++) {
 		for (note = 0; note < 128; note++) {
 			if (note >= sfzinstrument->regions[i]->lokey &&
@@ -74,5 +77,6 @@ void Sfz::loadsamples(std::string path, std::string filename)
 		}
 	}
 	printf("All samples loaded, Woot!\n");
-	delete sfzfile;
+  }
+  delete sfzfile;
 }
diff --git a/plugins/ZamSFZ/ZamSFZPlugin.cpp b/plugins/ZamSFZ/ZamSFZPlugin.cpp
index 15c75d1..54b2cc2 100644
--- a/plugins/ZamSFZ/ZamSFZPlugin.cpp
+++ b/plugins/ZamSFZ/ZamSFZPlugin.cpp
@@ -44,15 +44,6 @@ void ZamSFZPlugin::d_initParameter(uint32_t index, Parameter& parameter)
         parameter.ranges.min = -30.0f;
         parameter.ranges.max = 30.0f;
         break;
-    case paramSpeed:
-        parameter.hints      = kParameterIsAutomable | kParameterIsInteger;
-        parameter.name       = "Speed";
-        parameter.symbol     = "speed";
-        parameter.unit       = " ";
-        parameter.ranges.def = 10.0f;
-        parameter.ranges.min = 1.0f;
-        parameter.ranges.max = 20.0f;
-        break;
     }
 }
 
@@ -74,9 +65,6 @@ float ZamSFZPlugin::d_getParameterValue(uint32_t index) const
     case paramGain:
         return gain;
         break;
-    case paramSpeed:
-        return speed;
-        break;
     default:
         return 0.0f;
     }
@@ -89,9 +77,6 @@ void ZamSFZPlugin::d_setParameterValue(uint32_t index, float value)
     case paramGain:
         gain = value;
         break;
-    case paramSpeed:
-        speed = value;
-        break;
     }
 }
 
diff --git a/plugins/ZamSFZ/ZamSFZPlugin.hpp b/plugins/ZamSFZ/ZamSFZPlugin.hpp
index d325afe..90ff40a 100644
--- a/plugins/ZamSFZ/ZamSFZPlugin.hpp
+++ b/plugins/ZamSFZ/ZamSFZPlugin.hpp
@@ -35,7 +35,6 @@ public:
     enum Parameters
     {
         paramGain,
-        paramSpeed,
         paramCount
     };
 
@@ -119,7 +118,6 @@ private:
     bool loading;
     float gain, graph, speed;
     int nvoices;
-    float* wave_y[128];
     float env_y[MAX_ENV];
 	typedef struct v {
 		bool playing;
diff --git a/plugins/ZamSFZ/ZamSFZUI.cpp b/plugins/ZamSFZ/ZamSFZUI.cpp
index 2a15515..11a440b 100644
--- a/plugins/ZamSFZ/ZamSFZUI.cpp
+++ b/plugins/ZamSFZ/ZamSFZUI.cpp
@@ -130,7 +130,7 @@ void ZamSFZUI::imageButtonClicked(ImageButton*, int)
 	
 	gtk_widget_destroy(dialog);
 */	
-	d_setState("filepath", "/home/damien/Music/rhodes-nord/rhodes-nord-wav.sfz");
+	d_setState("filepath", "/home/damien/Music/rhodes-nord/rhodes-nord.sfz");
 }
 
 void ZamSFZUI::onDisplay()