Mercurial > hg > jvamp

changeset 1:ed1972408c28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename some files
author Chris Cannam
date Fri, 13 Jan 2012 17:36:22 +0000
parents f718b0961713
children d0ecf12b9d7b
files Makefile src/Plugin.cpp src/PluginLoader.cpp src/org_vamp_plugins_Plugin.cpp src/org_vamp_plugins_PluginLoader.cpp src/sample.h
diffstat 6 files changed, 67 insertions(+), 141 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Fri Jan 13 14:08:01 2012 +0000
+++ b/Makefile	Fri Jan 13 17:36:22 2012 +0000
@@ -1,10 +1,8 @@
 
 LIBRARY := libvamp-jni.so
-OBJFILES := src/org_vamp_plugins_PluginLoader.o src/org_vamp_plugins_Plugin.o
+OBJFILES := src/PluginLoader.o src/Plugin.o
 INCLUDES := -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
 CXXFLAGS := $(INCLUDES)
 
-all:	$(LIBRARY)
-
 $(LIBRARY): $(OBJFILES)
 	$(CXX) -shared -o $@ $^ -lvamp-hostsdk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/Plugin.cpp	Fri Jan 13 17:36:22 2012 +0000
@@ -0,0 +1,37 @@
+#include "org_vamp_plugins_Plugin.h"
+
+#include <vamp-hostsdk/Plugin.h>
+
+#include "handle.h"
+
+using Vamp::Plugin;
+using std::string;
+
+jstring
+Java_org_vamp_1plugins_Plugin_getIdentifier(JNIEnv *env, jobject obj)
+{
+    Plugin *p = getHandle<Plugin>(env, obj);
+    return env->NewStringUTF(p->getIdentifier().c_str());
+}
+
+jstring
+Java_org_vamp_1plugins_Plugin_getName(JNIEnv *env, jobject obj)
+{
+    Plugin *p = getHandle<Plugin>(env, obj);
+    return env->NewStringUTF(p->getName().c_str());
+}
+
+jstring
+Java_org_vamp_1plugins_Plugin_getDescription(JNIEnv *env, jobject obj)
+{
+    Plugin *p = getHandle<Plugin>(env, obj);
+    return env->NewStringUTF(p->getDescription().c_str());
+}
+
+jint
+Java_org_vamp_1plugins_Plugin_getPluginVersion(JNIEnv *env, jobject obj)
+{
+    Plugin *p = getHandle<Plugin>(env, obj);
+    return p->getPluginVersion();
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/PluginLoader.cpp	Fri Jan 13 17:36:22 2012 +0000
@@ -0,0 +1,29 @@
+#include "org_vamp_plugins_PluginLoader.h"
+
+#include <vamp-hostsdk/PluginLoader.h>
+
+#include "handle.h"
+
+using Vamp::Plugin;
+using Vamp::HostExt::PluginLoader;
+
+void
+Java_org_vamp_1plugins_PluginLoader_initialise(JNIEnv *env, jobject obj)
+{
+    PluginLoader *inst = PluginLoader::getInstance();
+    setHandle(env, obj, inst);
+}
+
+jlong
+Java_org_vamp_1plugins_PluginLoader_loadPluginNative(JNIEnv *env, jobject obj,
+						     jstring key, jfloat rate)
+{
+    PluginLoader *inst = getHandle<PluginLoader>(env, obj);
+    const char *kstr = env->GetStringUTFChars(key, 0);
+    Plugin *p = inst->loadPlugin(kstr, rate);
+    env->ReleaseStringUTFChars(key, kstr);
+    return (jlong)p;
+}
+
+
+    
--- a/src/org_vamp_plugins_Plugin.cpp	Fri Jan 13 14:08:01 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#include "org_vamp_plugins_Plugin.h"
-
-#include <vamp-hostsdk/Plugin.h>
-
-#include "handle.h"
-
-using Vamp::Plugin;
-using std::string;
-
-jstring
-Java_org_vamp_1plugins_Plugin_getIdentifier(JNIEnv *env, jobject obj)
-{
-    Plugin *p = getHandle<Plugin>(env, obj);
-    return env->NewStringUTF(p->getIdentifier().c_str());
-}
-
-jstring
-Java_org_vamp_1plugins_Plugin_getName(JNIEnv *env, jobject obj)
-{
-    Plugin *p = getHandle<Plugin>(env, obj);
-    return env->NewStringUTF(p->getName().c_str());
-}
-
-jstring
-Java_org_vamp_1plugins_Plugin_getDescription(JNIEnv *env, jobject obj)
-{
-    Plugin *p = getHandle<Plugin>(env, obj);
-    return env->NewStringUTF(p->getDescription().c_str());
-}
-
-jint
-Java_org_vamp_1plugins_Plugin_getPluginVersion(JNIEnv *env, jobject obj)
-{
-    Plugin *p = getHandle<Plugin>(env, obj);
-    return p->getPluginVersion();
-}
-
--- a/src/org_vamp_plugins_PluginLoader.cpp	Fri Jan 13 14:08:01 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#include "org_vamp_plugins_PluginLoader.h"
-
-#include <vamp-hostsdk/PluginLoader.h>
-
-#include "handle.h"
-
-using Vamp::Plugin;
-using Vamp::HostExt::PluginLoader;
-
-void
-Java_org_vamp_1plugins_PluginLoader_initialise(JNIEnv *env, jobject obj)
-{
-    PluginLoader *inst = PluginLoader::getInstance();
-    setHandle(env, obj, inst);
-}
-
-jlong
-Java_org_vamp_1plugins_PluginLoader_loadPluginNative(JNIEnv *env, jobject obj,
-						     jstring key, jfloat rate)
-{
-    PluginLoader *inst = getHandle<PluginLoader>(env, obj);
-    const char *kstr = env->GetStringUTFChars(key, 0);
-    Plugin *p = inst->loadPlugin(kstr, rate);
-    env->ReleaseStringUTFChars(key, kstr);
-    return (jlong)p;
-}
-
-
-    
--- a/src/sample.h	Fri Jan 13 14:08:01 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class org_vamp_plugins_Plugin */
-
-#ifndef _Included_org_vamp_plugins_Plugin
-#define _Included_org_vamp_plugins_Plugin
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     org_vamp_plugins_Plugin
- * Method:    getIdentifier
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_vamp_1plugins_Plugin_getIdentifier
-  (JNIEnv *, jobject);
-
-/*
- * Class:     org_vamp_plugins_Plugin
- * Method:    getName
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_vamp_1plugins_Plugin_getName
-  (JNIEnv *, jobject);
-
-/*
- * Class:     org_vamp_plugins_Plugin
- * Method:    getDescription
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_vamp_1plugins_Plugin_getDescription
-  (JNIEnv *, jobject);
-
-/*
- * Class:     org_vamp_plugins_Plugin
- * Method:    getPluginVersion
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_vamp_1plugins_Plugin_getPluginVersion
-  (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-/* Header for class org_vamp_plugins_PluginLoader */
-
-#ifndef _Included_org_vamp_plugins_PluginLoader
-#define _Included_org_vamp_plugins_PluginLoader
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     org_vamp_plugins_PluginLoader
- * Method:    loadPlugin
- * Signature: (Ljava/lang/String;F)Lorg/vamp_plugins/Plugin;
- */
-JNIEXPORT jobject JNICALL Java_org_vamp_1plugins_PluginLoader_loadPlugin
-  (JNIEnv *, jobject, jstring, jfloat);
-
-/*
- * Class:     org_vamp_plugins_PluginLoader
- * Method:    initialise
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_vamp_1plugins_PluginLoader_initialise
-  (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif