commit bfb9fb143b67c2d0307af2bce9af3c08f362b29a
author Andreas Huber <andih@google.com> Thu Dec 03 11:31:19 2009 -0800
committer Andreas Huber <andih@google.com> Thu Dec 03 13:21:54 2009 -0800
tree 6b22297ab9749e2c86d3ae4844a7bad884027118
parent d345c6acedb22c9408553ef9f38c196984177e6b

Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.

media/jni/android_media_MediaScanner.cpp

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 @@
 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;