From 2fdce7f63869ee691697be55b9407407a544bd3a Mon Sep 17 00:00:00 2001 From: Alexandre Gobbo Date: Thu, 14 Feb 2019 15:48:13 +0100 Subject: [PATCH 1/3] Included Diffcalc commands to the API of diffutils, and adapted to latest version. --- src/main/java/ch/psi/mxsc/Controller.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/ch/psi/mxsc/Controller.java b/src/main/java/ch/psi/mxsc/Controller.java index 72ac39c..82834ae 100644 --- a/src/main/java/ch/psi/mxsc/Controller.java +++ b/src/main/java/ch/psi/mxsc/Controller.java @@ -226,8 +226,14 @@ public class Controller { try { currentMountedSample = (String) Context.getInstance().evalLineBackground("get_setting('mounted_sample_position')"); Sample sample = basePlate.getSampleByName(currentMountedSample); + if ((sample == null) && (roomTemperatureBasePlate!=null)){ + sample = roomTemperatureBasePlate.getSampleByName(currentMountedSample); + roomTemperatureBasePlate.resetLoadedSample(); + } basePlate.resetLoadedSample(); - sample.setLoaded(true); + if (sample != null) { + sample.setLoaded(true); + } } catch (Exception ex) { currentMountedSample = null; basePlate.resetLoadedSample(); From de6600ce4e7e5396efedae7cc7b14c186116e3d3 Mon Sep 17 00:00:00 2001 From: Alexandre Gobbo Date: Thu, 14 Feb 2019 17:03:09 +0100 Subject: [PATCH 2/3] Ability to play audio clips without interrupting previous --- src/main/java/ch/psi/mxsc/Controller.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/psi/mxsc/Controller.java b/src/main/java/ch/psi/mxsc/Controller.java index 82834ae..e7e590d 100644 --- a/src/main/java/ch/psi/mxsc/Controller.java +++ b/src/main/java/ch/psi/mxsc/Controller.java @@ -8,7 +8,7 @@ import ch.psi.pshell.core.Context; import ch.psi.pshell.core.DevicePool; import ch.psi.pshell.core.DevicePoolListener; import ch.psi.pshell.core.JsonSerializer; -import ch.psi.pshell.device.Device; +import ch.psi.pshell.device.Device; import ch.psi.pshell.device.DeviceAdapter; import ch.psi.pshell.device.DeviceListener; import ch.psi.pshell.device.GenericDevice; @@ -700,7 +700,7 @@ public class Controller { void playSound(String name){ try{ - Audio.playFile(new File(Context.getInstance().getSetup().expandPath("{home}/sounds/" + name + ".wav"))); + Audio.playFile(new File(Context.getInstance().getSetup().expandPath("{home}/sounds/" + name + ".wav")), false); } catch (Exception ex){ Logger.getLogger(Controller.class.getName()).log(Level.FINE, null, ex); } From 1320d269eaabea79c95859f58f35e9b02ed1bc59 Mon Sep 17 00:00:00 2001 From: gac-S_Changer Date: Tue, 19 Feb 2019 12:03:50 +0100 Subject: [PATCH 3/3] --- src/main/java/ch/psi/mxsc/Controller.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ch/psi/mxsc/Controller.java b/src/main/java/ch/psi/mxsc/Controller.java index 748d153..a6beab7 100644 --- a/src/main/java/ch/psi/mxsc/Controller.java +++ b/src/main/java/ch/psi/mxsc/Controller.java @@ -691,7 +691,7 @@ public class Controller { void playSound(String name){ try{ - Audio.playFile(new File(Context.getInstance().getSetup().expandPath("{home}/sounds/" + name + ".wav"))); + Audio.playFile(new File(Context.getInstance().getSetup().expandPath("{home}/sounds/" + name + ".wav")), false); } catch (Exception ex){ Logger.getLogger(Controller.class.getName()).log(Level.FINE, null, ex); }