diff options
| author | Andreas Huber <andih@google.com> | 2009-12-03 11:31:19 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2009-12-03 13:21:54 -0800 |
| commit | bfb9fb143b67c2d0307af2bce9af3c08f362b29a (patch) | |
| tree | 6b22297ab9749e2c86d3ae4844a7bad884027118 /media/jni/android_media_MediaScanner.cpp | |
| parent | d345c6acedb22c9408553ef9f38c196984177e6b (diff) | |
| download | frameworks_base-bfb9fb143b67c2d0307af2bce9af3c08f362b29a.zip frameworks_base-bfb9fb143b67c2d0307af2bce9af3c08f362b29a.tar.gz frameworks_base-bfb9fb143b67c2d0307af2bce9af3c08f362b29a.tar.bz2 | |
Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
Diffstat (limited to 'media/jni/android_media_MediaScanner.cpp')
| -rw-r--r-- | media/jni/android_media_MediaScanner.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaScanner.cpp b/media/jni/android_media_MediaScanner.cpp index 6a5404e..144fba2 100644 --- a/media/jni/android_media_MediaScanner.cpp +++ b/media/jni/android_media_MediaScanner.cpp @@ -30,6 +30,11 @@ #include "JNIHelp.h" #include "android_runtime/AndroidRuntime.h" +#ifndef NO_OPENCORE +#include "pvmediascanner.h" +#else +#include "StagefrightMediaScanner.h" +#endif // ---------------------------------------------------------------------------- @@ -281,7 +286,12 @@ android_media_MediaScanner_native_init(JNIEnv *env) static void android_media_MediaScanner_native_setup(JNIEnv *env, jobject thiz) { - MediaScanner *mp = new MediaScanner(); +#ifndef NO_OPENCORE + MediaScanner *mp = new PVMediaScanner(); +#else + MediaScanner *mp = new StagefrightMediaScanner(); +#endif + if (mp == NULL) { jniThrowException(env, "java/lang/RuntimeException", "Out of memory"); return; |