Reorganize some of the stagefright implementation related to metadata.

3 files changed, 0 insertions, 86 deletions

diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk
index 088ad6d..fc234ee 100644
--- a/media/libmedia/Android.mk
+++ b/media/libmedia/Android.mk
@@ -26,11 +26,6 @@ LOCAL_SRC_FILES:= \
     MediaScannerClient.cpp \
     autodetect.cpp
 
-ifneq ($(BUILD_WITHOUT_PV),true)
-else
-LOCAL_SRC_FILES += StagefrightMediaScanner.cpp
-endif
-
 LOCAL_SHARED_LIBRARIES := \
 	libui libcutils libutils libbinder libsonivox libicuuc
 
diff --git a/media/libmedia/StagefrightMediaScanner.cpp b/media/libmedia/StagefrightMediaScanner.cpp
deleted file mode 100644
index 522ab5a..0000000
--- a/media/libmedia/StagefrightMediaScanner.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "StagefrightMediaScanner.h"
-
-namespace android {
-
-StagefrightMediaScanner::StagefrightMediaScanner() {}
-
-StagefrightMediaScanner::~StagefrightMediaScanner() {}
-
-status_t StagefrightMediaScanner::processFile(
-        const char *path, const char *mimeType,
-        MediaScannerClient &client) {
-    client.setLocale(locale());
-    client.beginFile();
-    client.endFile();
-
-    return OK;
-}
-
-char *StagefrightMediaScanner::extractAlbumArt(int fd) {
-    return NULL;
-}
-
-}  // namespace android
diff --git a/media/libmedia/StagefrightMediaScanner.h b/media/libmedia/StagefrightMediaScanner.h
deleted file mode 100644
index 108acb4..0000000
--- a/media/libmedia/StagefrightMediaScanner.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef STAGEFRIGHT_MEDIA_SCANNER_H_
-
-#define STAGEFRIGHT_MEDIA_SCANNER_H_
-
-#include <media/mediascanner.h>
-
-namespace android {
-
-struct StagefrightMediaScanner : public MediaScanner {
-    StagefrightMediaScanner();
-    virtual ~StagefrightMediaScanner();
-
-    virtual status_t processFile(
-            const char *path, const char *mimeType,
-            MediaScannerClient &client);
-
-    virtual char *extractAlbumArt(int fd);
-
-private:
-    StagefrightMediaScanner(const StagefrightMediaScanner &);
-    StagefrightMediaScanner &operator=(const StagefrightMediaScanner &);
-};
-
-}  // namespace android
-
-#endif  // STAGEFRIGHT_MEDIA_SCANNER_H_