preparing project for release

.gitignore

@@ -4,3 +4,4 @@ out
 hs_err_pid*.log
 src/content/visuals
 config
+visuals

src/META-INF/MANIFEST.MF

@@ -1,3 +1,3 @@
-Manifest-Version: 1.0
-Main-Class: ch.bildspur.visualpush.Main
-
+Manifest-Version: 1.0
+Main-Class: ch.bildspur.visualpush.Main
+

src/ch/bildspur/visualpush/sketch/RenderSketch.java

@@ -18,7 +18,7 @@
  */
 public class RenderSketch extends PApplet {
 
-    final static String CONFIG = "djrush.json";
+    final static String CONFIG = "guenther.json";
 
     final static int PUSH_DISPLAY_REFRESH_STEP = 1;
 
@@ -208,6 +208,10 @@ public PGraphics getOutputScreen() {
         return outputScreen;
     }
 
+    public ConfigurationController getConfig() {
+        return config;
+    }
+
     public DataModel<Float> getGlobalOpacity() {
         return globalOpacity;
     }

src/ch/bildspur/visualpush/sketch/controller/ConfigurationController.java

@@ -21,13 +21,20 @@ public class ConfigurationController extends PushController {
 
     protected RenderSketch sketch;
 
+    String visualPath = "";
+
     List<ConfigLoadedHandler> configLoadedListener = new ArrayList<>();
 
     public void addConfigLoadedListener(ConfigLoadedHandler observer)
     {
         configLoadedListener.add(observer);
     }
 
+    public String getVisualPath()
+    {
+        return visualPath;
+    }
+
     public void setup(PApplet sketch) {
         super.setup(sketch);
         this.sketch = (RenderSketch)sketch;
@@ -36,6 +43,7 @@ public void setup(PApplet sketch) {
     public void load(String fileName)
     {
         JSONObject root = sketch.loadJSONObject(CONFIG_DIR + fileName);
+        visualPath = root.getString("visualPath");
         JSONArray clips = root.getJSONArray("clips");
 
         // load clips from config

src/ch/bildspur/visualpush/sketch/state/AddClipState.java

@@ -4,6 +4,7 @@
 import ch.bildspur.visualpush.event.ControlChangeHandler;
 import ch.bildspur.visualpush.event.midi.MidiEventListener;
 import ch.bildspur.visualpush.push.color.RGBColor;
+import ch.bildspur.visualpush.sketch.RenderSketch;
 import ch.bildspur.visualpush.sketch.controller.ClipController;
 import ch.bildspur.visualpush.ui.FaderListControl;
 import ch.bildspur.visualpush.ui.ListElement;
@@ -125,7 +126,7 @@ public void controlChange(int channel, int number, int value) {
 
 
         // load clips from folder
-        for(Path path : fileList(ContentUtil.getContent("visuals/")))
+        for(Path path : fileList(((RenderSketch)sketch).getConfig().getVisualPath()))
         {
             clipFiles.add(new ListElement(path, path.getFileName().toString()));
         }

src/ch/bildspur/visualpush/util/ContentUtil.java

@@ -8,11 +8,6 @@
 public class ContentUtil {
     public static String getContent(String name)
     {
-        try {
-            return ContentUtil.class.getResource("/content/" + name).toURI().getPath();
-        } catch (URISyntaxException e) {
-            e.printStackTrace();
-            return null;
-        }
+        return "content/" + name;
     }
 }