summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/portmidi/pm_java/pmdefaults
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/portmidi/pm_java/pmdefaults')
-rw-r--r--3rdparty/portmidi/pm_java/pmdefaults/PmDefaults.java8
-rw-r--r--3rdparty/portmidi/pm_java/pmdefaults/README.txt19
-rw-r--r--3rdparty/portmidi/pm_java/pmdefaults/pmdefaults9
-rw-r--r--3rdparty/portmidi/pm_java/pmdefaults/pmdefaults-license.txt2
-rw-r--r--3rdparty/portmidi/pm_java/pmdefaults/pmdefaults.bat1
-rw-r--r--3rdparty/portmidi/pm_java/pmdefaults/readme-win32.txt11
6 files changed, 24 insertions, 26 deletions
diff --git a/3rdparty/portmidi/pm_java/pmdefaults/PmDefaults.java b/3rdparty/portmidi/pm_java/pmdefaults/PmDefaults.java
index 20708fc9b66..4cfdb9da96a 100644
--- a/3rdparty/portmidi/pm_java/pmdefaults/PmDefaults.java
+++ b/3rdparty/portmidi/pm_java/pmdefaults/PmDefaults.java
@@ -1,11 +1,15 @@
// PmDefaults -- a small application to set PortMIDI default input/output
package pmdefaults;
+import javax.swing.SwingUtilities;
public class PmDefaults {
public static void main(String[] args) {
System.out.println("starting main");
- new PmDefaultsFrame("PortMIDI Setup");
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ new PmDefaultsFrame("PortMIDI Setup");
+ }
+ });
}
}
-
diff --git a/3rdparty/portmidi/pm_java/pmdefaults/README.txt b/3rdparty/portmidi/pm_java/pmdefaults/README.txt
index e0a4d4b40e8..39fa1fd2c2f 100644
--- a/3rdparty/portmidi/pm_java/pmdefaults/README.txt
+++ b/3rdparty/portmidi/pm_java/pmdefaults/README.txt
@@ -2,20 +2,19 @@ README.txt
Roger B. Dannenberg
2 Jan 2009
-PmDefaults is a program to set default input and output devices for PortMidi
-applications. After running the PmDefaults program and choosing devices,
-identifiers for these devices will be returned by
-Pm_GetDefaultInputDeviceID() and Pm_GetDefaultOutputDeviceID().
+PmDefaults is a program to set default input and output devices for
+PortMidi applications. After running the PmDefaults program and
+choosing devices, identifiers for these devices will be returned by
+calls (within any program) to Pm_GetDefaultInputDeviceID() and
+Pm_GetDefaultOutputDeviceID().
Included in this directory are:
manifest.txt -- used in pmdefaults.jar
-pmdefaults-icon.* -- various icons for applications
-pmdefaults-license.txt -- a version of portmidi/license.txt formatted for
- the windows installer
+pmdefaults-license.txt -- license text
+pmdefaults-icon.{bmp,xcf,png,gif} -- icons
+pmdefaults.{ico,icns} - icons
portmusic_logo.png -- a logo displayed by the pmdefaults application
-readme-win32.txt -- this becomes the readme file for the pmdefaults
- application. It is copied to win32/README.txt by make.bat
-TO BUILD THE APPLICATION: see ../README.txt
+TO BUILD AND RUN THE APPLICATION: see ../README.txt
diff --git a/3rdparty/portmidi/pm_java/pmdefaults/pmdefaults b/3rdparty/portmidi/pm_java/pmdefaults/pmdefaults
index 80162469ae0..fb01fbf0f67 100644
--- a/3rdparty/portmidi/pm_java/pmdefaults/pmdefaults
+++ b/3rdparty/portmidi/pm_java/pmdefaults/pmdefaults
@@ -1 +1,8 @@
-java -jar /usr/share/java/pmdefaults.jar > /dev/null
+#!/bin/sh
+# Run PmDefaults, the GUI to select default MIDI input and output for PortMidi
+# Due to the locations of the .jar file and libpmjni, this script only runs
+# from <portmidi-repo-path>/pm_java/pmdefaults. PmDefaults is minimally
+# supported -- if you would like it to appear as an app on your desktop,
+# contact the developer(s) and let us know it's actually being used.
+# library path here includes directory locations for macOS and Linux.
+java -Djava.library.path=../../Release:../../Debug:../.. -jar pmdefaults.jar > /dev/null
diff --git a/3rdparty/portmidi/pm_java/pmdefaults/pmdefaults-license.txt b/3rdparty/portmidi/pm_java/pmdefaults/pmdefaults-license.txt
index 317f70e0eb6..703923c25b9 100644
--- a/3rdparty/portmidi/pm_java/pmdefaults/pmdefaults-license.txt
+++ b/3rdparty/portmidi/pm_java/pmdefaults/pmdefaults-license.txt
@@ -3,8 +3,6 @@ LICENSE INFORMATION
PmDefaults is a small program to set default MIDI input and output
devices for other programs using the PortMidi library.
-Latest version available at: http://sourceforge.net/projects/portmedia
-
Copyright (c) 1999-2000 Ross Bencina and Phil Burk
Copyright (c) 2001-2009 Roger B. Dannenberg
diff --git a/3rdparty/portmidi/pm_java/pmdefaults/pmdefaults.bat b/3rdparty/portmidi/pm_java/pmdefaults/pmdefaults.bat
new file mode 100644
index 00000000000..7ebfdf75e08
--- /dev/null
+++ b/3rdparty/portmidi/pm_java/pmdefaults/pmdefaults.bat
@@ -0,0 +1 @@
+java -Djava.library.path="../../Release;../../Debug" -jar pmdefaults.jar
diff --git a/3rdparty/portmidi/pm_java/pmdefaults/readme-win32.txt b/3rdparty/portmidi/pm_java/pmdefaults/readme-win32.txt
deleted file mode 100644
index 5ff168bd715..00000000000
--- a/3rdparty/portmidi/pm_java/pmdefaults/readme-win32.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-README.txt
-Roger B. Dannenberg
-1 Jan 2009
-
-This directory contains files that implement:
-
-pmdefaults -- a program to set PortMidi default input/output devices
-
-You can copy and rename this *whole directory* to move the application
-to a convenient place. The application to run is pmdefaults.exe.
-