commit 68ae975237b615832301a9971aed67e1cf131bc2
parent 914cbc8a3f695eb0281aaec78f89268631b89543
Author: Heiko Wundram <modelnine@ceosg.de>
Date: Sat, 7 May 2005 18:40:15 +0000
Commit rest of changes.
Diffstat:
4 files changed, 6 insertions(+), 83 deletions(-)
diff --git a/src/include/extractor.h b/src/include/extractor.h
@@ -149,7 +149,8 @@ typedef struct EXTRACTOR_Keywords {
typedef EXTRACTOR_KeywordList * (*ExtractMethod)(const char * filename,
char * data,
size_t filesize,
- EXTRACTOR_KeywordList * next);
+ EXTRACTOR_KeywordList * next,
+ const char * options);
/**
* Linked list of extractor helper-libraries. An application
@@ -165,6 +166,7 @@ typedef struct EXTRACTOR_Extractor {
char * libname;
ExtractMethod extractMethod;
struct EXTRACTOR_Extractor * next;
+ char * options;
} EXTRACTOR_ExtractorList;
/**
@@ -188,7 +190,8 @@ EXTRACTOR_KeywordType EXTRACTOR_getHighestKeywordTypeNumber();
* Load multiple libraries as specified by the user.
* @param config a string given by the user that defines which
* libraries should be loaded. Has the format
- * "[[-]LIBRARYNAME[:[-]LIBRARYNAME]]*". For example,
+ * "[[-]LIBRARYNAME[(options)][:[-]LIBRARYNAME[(options)]]]*".
+ * For example,
* libextractor_mp3.so:libextractor_ogg.so loads the
* mp3 and the ogg library. The '-' before the LIBRARYNAME
* indicates that the library should be added to the end
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
@@ -54,8 +54,6 @@ extract_SOURCES = \
getopt.h \
getopt1.c
-
-all-local:
- python libextractor_python_setup.py build
install-exec-local:
+ python libextractor_python_setup.py build
python libextractor_python_setup.py install --prefix=$(PYTHON_PREFIX)
diff --git a/src/main/extract.c b/src/main/extract.c
@@ -575,7 +575,6 @@ main (int argc, char *argv[])
extractors = EXTRACTOR_addLibraryLast(extractors,
"libextractor_split");
-
if (verbose == YES)
{
/* print list of all used extractors */
diff --git a/src/main/org_ovmj_libextractor_Extractor.h b/src/main/org_ovmj_libextractor_Extractor.h
@@ -1,77 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class org_ovmj_libextractor_Extractor */
-
-#ifndef _Included_org_ovmj_libextractor_Extractor
-#define _Included_org_ovmj_libextractor_Extractor
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: org_ovmj_libextractor_Extractor
- * Method: loadDefaultInternal
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_ovmj_libextractor_Extractor_loadDefaultInternal
- (JNIEnv *, jclass);
-
-/*
- * Class: org_ovmj_libextractor_Extractor
- * Method: unloadInternal
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_org_ovmj_libextractor_Extractor_unloadInternal
- (JNIEnv *, jclass, jlong);
-
-/*
- * Class: org_ovmj_libextractor_Extractor
- * Method: extractInternal
- * Signature: (JLjava/lang/String;)J
- */
-JNIEXPORT jlong JNICALL Java_org_ovmj_libextractor_Extractor_extractInternal
- (JNIEnv *, jclass, jlong, jstring);
-
-/*
- * Class: org_ovmj_libextractor_Extractor
- * Method: freeInternal
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_org_ovmj_libextractor_Extractor_freeInternal
- (JNIEnv *, jclass, jlong);
-
-/*
- * Class: org_ovmj_libextractor_Extractor
- * Method: typeInternal
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL Java_org_ovmj_libextractor_Extractor_typeInternal
- (JNIEnv *, jclass, jlong);
-
-/*
- * Class: org_ovmj_libextractor_Extractor
- * Method: keywordInternal
- * Signature: (J)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_ovmj_libextractor_Extractor_keywordInternal
- (JNIEnv *, jclass, jlong);
-
-/*
- * Class: org_ovmj_libextractor_Extractor
- * Method: nextInternal
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_org_ovmj_libextractor_Extractor_nextInternal
- (JNIEnv *, jclass, jlong);
-
-/*
- * Class: org_ovmj_libextractor_Extractor
- * Method: getTypeAsStringInternal
- * Signature: (I)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_ovmj_libextractor_Extractor_getTypeAsStringInternal
- (JNIEnv *, jclass, jint);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
