Skip to content
Snippets Groups Projects
Commit b7e4e3f6 authored by Tobias Ullerich's avatar Tobias Ullerich
Browse files

Extract Audio and Midi Device into separate project

parent 64bd7fdd
Branches
Tags
No related merge requests found
Showing
with 38 additions and 4 deletions
......@@ -4,6 +4,7 @@
<file url="file://$PROJECT_DIR$/PlayWall" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/PlayWall/PlayWallComponents" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/PlayWall/PlayWallComponents" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/PlayWallComponents" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/PlayWallCore" charset="UTF-8" />
<file url="PROJECT" charset="UTF-8" />
</component>
......
......@@ -51,6 +51,7 @@
<orderEntry type="library" name="Maven: com.neovisionaries:nv-websocket-client:2.5" level="project" />
<orderEntry type="library" name="Maven: javazoom:jlayer:1.0.1" level="project" />
<orderEntry type="library" name="Maven: net.minidev:json-smart:1.2" level="project" />
<orderEntry type="module" module-name="PlayWallComponents" />
<orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.5.0" level="project" />
<orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.5.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.13" level="project" />
......
......@@ -170,6 +170,11 @@
<artifactId>PlayWallCore</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>de.tobias</groupId>
<artifactId>PlayWallCompoents</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
......
......@@ -243,4 +243,9 @@ public class PlayPadImpl implements PlayPad {
public Session getSession() {
return session;
}
@Override
public ResourceBundle getUIResourceBundle() {
return PlayPadMain.getUiResourceBundle();
}
}
......@@ -8,5 +8,24 @@
<artifactId>PlayWallCompoents</artifactId>
<version>1.0.0</version>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>de.tobias</groupId>
<artifactId>PlayWallCore</artifactId>
<version>1.0.1</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
package de.tobias.playpad.audio;
import de.tobias.playpad.audio.viewcontroller.TinySoundSettingsViewController;
import de.tobias.playpad.pad.content.PadContent;
import de.tobias.playpad.viewcontroller.AudioHandlerViewController;
import de.tobias.playpad.viewcontroller.audio.TinySoundSettingsViewController;
public class TinyAudioHandlerFactory extends AudioHandlerFactory implements AutoCloseable {
......
package de.tobias.playpad.viewcontroller.audio;
package de.tobias.playpad.audio.viewcontroller;
import de.tobias.playpad.PlayPadMain;
import de.tobias.playpad.PlayPadPlugin;
import de.tobias.playpad.audio.TinyAudioHandler;
import de.tobias.playpad.profile.Profile;
import de.tobias.playpad.viewcontroller.AudioHandlerViewController;
......@@ -35,7 +35,7 @@ public class TinySoundSettingsViewController extends AudioHandlerViewController
private Clip clip;
public TinySoundSettingsViewController() {
super("tinySoundSettings", "de/tobias/playpad/assets/view/audio/", PlayPadMain.getUiResourceBundle());
super("tinySoundSettings", "de/tobias/playpad/assets/view/audio/", PlayPadPlugin.getImplementation().getUIResourceBundle());
// Mixer (ohne Port)
List<Info> infos = Arrays.stream(AudioSystem.getMixerInfo()).filter(info -> !info.getName().startsWith("Port"))
......
......@@ -10,6 +10,7 @@ import javafx.scene.image.Image;
import java.util.List;
import java.util.Optional;
import java.util.ResourceBundle;
/**
* Hauptfunktionen für Listener und zur Programmsteuerung für Plugins.
......@@ -19,6 +20,8 @@ import java.util.Optional;
*/
public interface PlayPad {
ResourceBundle getUIResourceBundle();
/**
* Fügt einen Listener für das Hauptfenster hinzu.
*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment