eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed remaining references to the GSVideo names which broke the library loading mechanism

Browse Source
This commit is contained in:
codeanticode
2011-08-18 22:31:26 +00:00
parent b37c074a12
commit 88deee7566
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/libraries/video/src/processing/video/LibraryPath.java
+5 -5
View File
@@ -27,7 +27,7 @@ class LibraryPath {
// This method returns the folder inside which the gstreamer library folder
// should be located.
String get() {
URL url = this.getClass().getResource("GSLibraryPath.class");
URL url = this.getClass().getResource("LibraryPath.class");
if (url != null) {
// Convert URL to string, taking care of spaces represented by the "%20"
// string.
@@ -36,19 +36,19 @@ class LibraryPath {
int n1 = -1;
if (Platform.isWindows()) {
n1 = path.indexOf("/lib/GSVideo.jar"); // location of GSVideo.jar in
n1 = path.indexOf("/lib/video.jar"); // location of video.jar in
// exported apps.
if (n1 == -1)
n1 = path.indexOf("/GSVideo.jar"); // location of GSVideo.jar in
n1 = path.indexOf("/video.jar"); // location of video.jar in
// library folder.
// In Windows, path string starts with "jar file/C:/..."
// so the substring up to the first / is removed.
n0++;
} else if (Platform.isMac()) {
// In Mac, getting the index of GSVideo.jar is enough in the case of sketches running from the PDE
// In Mac, getting the index of video.jar is enough in the case of sketches running from the PDE
// as well as exported applications.
n1 = path.indexOf("GSVideo.jar");
n1 = path.indexOf("video.jar");
} else if (Platform.isLinux()) {
// TODO: what's up?
}
java/libraries/video/src/processing/video/Video.java
+2 -2
View File
@@ -76,7 +76,7 @@ public class Video implements PConstants {
public static void init() {
if (INSTANCES_COUNT == 0) {
PApplet.println("GSVideo version: " + VERSION_STRING);
PApplet.println("Video library version: " + VERSION_STRING);
initImpl();
}
INSTANCES_COUNT++;
@@ -121,7 +121,7 @@ public class Video implements PConstants {
String[] args = { "" };
Gst.setUseDefaultContext(defaultGLibContext);
Gst.init("GSVideo", args);
Gst.init("Processing core video", args);
addPlugins();
}