Skip to content
Snippets Groups Projects
Commit 6a27a37a authored by tobias's avatar tobias
Browse files

Fixed min height in modern design, rename audio interfaces

parent 6c012031
Branches
Tags
No related merge requests found
...@@ -236,7 +236,7 @@ public class PlayPadImpl implements PlayPad { ...@@ -236,7 +236,7 @@ public class PlayPadImpl implements PlayPad {
registryCollection.getMainLayouts().loadComponentsFromFile("de/tobias/playpad/components/Layout.xml"); registryCollection.getMainLayouts().loadComponentsFromFile("de/tobias/playpad/components/Layout.xml");
// Set Default // Set Default
registryCollection.getAudioHandlers().setDefaultID(JavaFXAudioHandler.NAME); registryCollection.getAudioHandlers().setDefaultID(JavaFXAudioHandler.TYPE);
registryCollection.getDesigns().setDefaultID(ModernGlobalDesign.TYPE); registryCollection.getDesigns().setDefaultID(ModernGlobalDesign.TYPE);
} catch (IllegalAccessException | ClassNotFoundException | InstantiationException | IOException | DocumentException } catch (IllegalAccessException | ClassNotFoundException | InstantiationException | IOException | DocumentException
| NoSuchComponentException e) { | NoSuchComponentException e) {
......
<Actions> <Actions>
<Component id="Java FX Media">de.tobias.playpad.audio.JavaFXHandlerConnect</Component> <Component id="JavaFx">de.tobias.playpad.audio.JavaFXHandlerConnect</Component>
<Component id="Java Audiostream">de.tobias.playpad.audio.TinyAudioHandlerConnect</Component> <Component id="TinyAudio">de.tobias.playpad.audio.TinyAudioHandlerConnect</Component>
<Component id="Clip (Experimental)">de.tobias.playpad.audio.ClipAudioHandlerConnect</Component> <Component id="clip">de.tobias.playpad.audio.ClipAudioHandlerConnect</Component>
</Actions> </Actions>
\ No newline at end of file
...@@ -31,7 +31,7 @@ public class ModernGlobalDesign extends Design implements GlobalDesign, DesignCo ...@@ -31,7 +31,7 @@ public class ModernGlobalDesign extends Design implements GlobalDesign, DesignCo
public static final String TYPE = "modern"; public static final String TYPE = "modern";
public static final double minWidth = 205; 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 backgroundColor = ModernColor.GRAY1;
private ModernColor playColor = ModernColor.RED3; private ModernColor playColor = ModernColor.RED3;
......
...@@ -218,7 +218,7 @@ public class AudioContent extends PadContent implements Pauseable, Durationable, ...@@ -218,7 +218,7 @@ public class AudioContent extends PadContent implements Pauseable, Durationable,
} }
@Override @Override
public void loadMedia() throws NoSuchComponentException { public void loadMedia() {
// init audio implementation // init audio implementation
AudioRegistry audioRegistry = PlayPadPlugin.getRegistryCollection().getAudioHandlers(); AudioRegistry audioRegistry = PlayPadPlugin.getRegistryCollection().getAudioHandlers();
audioHandler = audioRegistry.getCurrentAudioHandler().createAudioHandler(this); audioHandler = audioRegistry.getCurrentAudioHandler().createAudioHandler(this);
......
...@@ -10,7 +10,11 @@ public class AudioRegistry extends DefaultComponentRegistry<AudioHandlerConnect> ...@@ -10,7 +10,11 @@ public class AudioRegistry extends DefaultComponentRegistry<AudioHandlerConnect>
super("Audio Handler"); super("Audio Handler");
} }
public AudioHandlerConnect getCurrentAudioHandler() throws NoSuchComponentException { public AudioHandlerConnect getCurrentAudioHandler() {
try {
return getComponent(Profile.currentProfile().getProfileSettings().getAudioClass()); return getComponent(Profile.currentProfile().getProfileSettings().getAudioClass());
} catch (NoSuchComponentException e) {
return getDefault();
}
} }
} }
...@@ -47,8 +47,7 @@ public abstract class PadContent { ...@@ -47,8 +47,7 @@ public abstract class PadContent {
* @param path * @param path
* path * path
* @throws NoSuchComponentException * @throws NoSuchComponentException
* Wird geworfen, wenn ein Pad eine Componenten nicht laden kann. Beispiel bei Audio das richtige * Wird geworfen, wenn ein Pad eine Componenten nicht laden kann. Beispiel bei Audio das richtige Soundsystem
* Soundsystem
* @throws IOException * @throws IOException
* IO Fehler * IO Fehler
*/ */
...@@ -56,12 +55,8 @@ public abstract class PadContent { ...@@ -56,12 +55,8 @@ public abstract class PadContent {
/** /**
* Lädt die Medien, sodass sie auf abruf verfügbar sind. * 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). * Entfernt die Medien aus dem Speicher (lässt diese aber im Pad).
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment