From 6a27a37a182e49c436d9e9a4551a6233a8dedc5c Mon Sep 17 00:00:00 2001
From: tobias <tobias.ullerich@icloud.com>
Date: Tue, 30 Aug 2016 09:49:47 +0200
Subject: [PATCH] Fixed min height in modern design, rename audio interfaces
---
PlayWall/src/de/tobias/playpad/PlayPadImpl.java | 2 +-
.../src/de/tobias/playpad/components/AudioHandler.xml | 6 +++---
.../playpad/design/modern/ModernGlobalDesign.java | 2 +-
.../de/tobias/playpad/pad/content/AudioContent.java | 2 +-
.../src/de/tobias/playpad/audio/AudioRegistry.java | 8 ++++++--
.../de/tobias/playpad/pad/conntent/PadContent.java | 11 +++--------
6 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/PlayWall/src/de/tobias/playpad/PlayPadImpl.java b/PlayWall/src/de/tobias/playpad/PlayPadImpl.java
index 8cc7555b..83b0ae9f 100644
--- a/PlayWall/src/de/tobias/playpad/PlayPadImpl.java
+++ b/PlayWall/src/de/tobias/playpad/PlayPadImpl.java
@@ -236,7 +236,7 @@ public class PlayPadImpl implements PlayPad {
registryCollection.getMainLayouts().loadComponentsFromFile("de/tobias/playpad/components/Layout.xml");
// Set Default
- registryCollection.getAudioHandlers().setDefaultID(JavaFXAudioHandler.NAME);
+ registryCollection.getAudioHandlers().setDefaultID(JavaFXAudioHandler.TYPE);
registryCollection.getDesigns().setDefaultID(ModernGlobalDesign.TYPE);
} catch (IllegalAccessException | ClassNotFoundException | InstantiationException | IOException | DocumentException
| NoSuchComponentException e) {
diff --git a/PlayWall/src/de/tobias/playpad/components/AudioHandler.xml b/PlayWall/src/de/tobias/playpad/components/AudioHandler.xml
index ae4c5e19..f2179775 100644
--- a/PlayWall/src/de/tobias/playpad/components/AudioHandler.xml
+++ b/PlayWall/src/de/tobias/playpad/components/AudioHandler.xml
@@ -1,5 +1,5 @@
<Actions>
- <Component id="Java FX Media">de.tobias.playpad.audio.JavaFXHandlerConnect</Component>
- <Component id="Java Audiostream">de.tobias.playpad.audio.TinyAudioHandlerConnect</Component>
- <Component id="Clip (Experimental)">de.tobias.playpad.audio.ClipAudioHandlerConnect</Component>
+ <Component id="JavaFx">de.tobias.playpad.audio.JavaFXHandlerConnect</Component>
+ <Component id="TinyAudio">de.tobias.playpad.audio.TinyAudioHandlerConnect</Component>
+ <Component id="clip">de.tobias.playpad.audio.ClipAudioHandlerConnect</Component>
</Actions>
\ No newline at end of file
diff --git a/PlayWall/src/de/tobias/playpad/design/modern/ModernGlobalDesign.java b/PlayWall/src/de/tobias/playpad/design/modern/ModernGlobalDesign.java
index ce30da27..8a1903ab 100644
--- a/PlayWall/src/de/tobias/playpad/design/modern/ModernGlobalDesign.java
+++ b/PlayWall/src/de/tobias/playpad/design/modern/ModernGlobalDesign.java
@@ -31,7 +31,7 @@ public class ModernGlobalDesign extends Design implements GlobalDesign, DesignCo
public static final String TYPE = "modern";
public static final double minWidth = 205;
- public static final double minHeight = 110;
+ public static final double minHeight = 115;
private ModernColor backgroundColor = ModernColor.GRAY1;
private ModernColor playColor = ModernColor.RED3;
diff --git a/PlayWall/src/de/tobias/playpad/pad/content/AudioContent.java b/PlayWall/src/de/tobias/playpad/pad/content/AudioContent.java
index ecad385a..2d9b2200 100644
--- a/PlayWall/src/de/tobias/playpad/pad/content/AudioContent.java
+++ b/PlayWall/src/de/tobias/playpad/pad/content/AudioContent.java
@@ -218,7 +218,7 @@ public class AudioContent extends PadContent implements Pauseable, Durationable,
}
@Override
- public void loadMedia() throws NoSuchComponentException {
+ public void loadMedia() {
// init audio implementation
AudioRegistry audioRegistry = PlayPadPlugin.getRegistryCollection().getAudioHandlers();
audioHandler = audioRegistry.getCurrentAudioHandler().createAudioHandler(this);
diff --git a/PlayWallCore/src/de/tobias/playpad/audio/AudioRegistry.java b/PlayWallCore/src/de/tobias/playpad/audio/AudioRegistry.java
index 9247dfa9..bb44d27a 100644
--- a/PlayWallCore/src/de/tobias/playpad/audio/AudioRegistry.java
+++ b/PlayWallCore/src/de/tobias/playpad/audio/AudioRegistry.java
@@ -10,7 +10,11 @@ public class AudioRegistry extends DefaultComponentRegistry<AudioHandlerConnect>
super("Audio Handler");
}
- public AudioHandlerConnect getCurrentAudioHandler() throws NoSuchComponentException {
- return getComponent(Profile.currentProfile().getProfileSettings().getAudioClass());
+ public AudioHandlerConnect getCurrentAudioHandler() {
+ try {
+ return getComponent(Profile.currentProfile().getProfileSettings().getAudioClass());
+ } catch (NoSuchComponentException e) {
+ return getDefault();
+ }
}
}
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/conntent/PadContent.java b/PlayWallCore/src/de/tobias/playpad/pad/conntent/PadContent.java
index f0c6f6e7..d5433801 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/conntent/PadContent.java
+++ b/PlayWallCore/src/de/tobias/playpad/pad/conntent/PadContent.java
@@ -47,8 +47,7 @@ public abstract class PadContent {
* @param path
* path
* @throws NoSuchComponentException
- * Wird geworfen, wenn ein Pad eine Componenten nicht laden kann. Beispiel bei Audio das richtige
- * Soundsystem
+ * Wird geworfen, wenn ein Pad eine Componenten nicht laden kann. Beispiel bei Audio das richtige Soundsystem
* @throws IOException
* IO Fehler
*/
@@ -56,12 +55,8 @@ public abstract class PadContent {
/**
* Lädt die Medien, sodass sie auf abruf verfügbar sind.
- *
- * @throws NoSuchComponentException
- * Wird geworfen, wenn ein Pad eine Componenten nicht laden kann. Beispiel bei Audio das richtige
- * Soundsystem
*/
- public abstract void loadMedia() throws NoSuchComponentException;
+ public abstract void loadMedia();
/**
* Entfernt die Medien aus dem Speicher (lässt diese aber im Pad).
@@ -113,7 +108,7 @@ public abstract class PadContent {
if (Files.notExists(mediaFolder)) {
Files.createDirectories(mediaFolder);
}
-
+
Files.copy(orginal, newPath, StandardCopyOption.REPLACE_EXISTING);
return newPath;
}
--
GitLab