diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2009-03-21 11:40:18 -0700 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2009-03-23 12:00:23 -0700 |
commit | 6c5b21025f746fcb838499ae01b4d384ab1d2f66 (patch) | |
tree | c6ace6199ce9135a0fa71eb8158f6d3d03edbe8b /media | |
parent | 8374f8fce997c0e1df39f0b515ca494b0a15dbdc (diff) | |
download | frameworks_av-6c5b21025f746fcb838499ae01b4d384ab1d2f66.zip frameworks_av-6c5b21025f746fcb838499ae01b4d384ab1d2f66.tar.gz frameworks_av-6c5b21025f746fcb838499ae01b4d384ab1d2f66.tar.bz2 |
Deal better with situations where OpenCORE is disabled.
Diffstat (limited to 'media')
-rw-r--r-- | media/libmediaplayerservice/Android.mk | 18 | ||||
-rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 6 | ||||
-rw-r--r-- | media/libmediaplayerservice/MetadataRetrieverClient.cpp | 4 |
3 files changed, 25 insertions, 3 deletions
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index 922df43..c45eb3d 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -7,12 +7,16 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ - MediaRecorderClient.cpp \ MediaPlayerService.cpp \ MetadataRetrieverClient.cpp \ VorbisPlayer.cpp \ MidiFile.cpp +ifneq ($(BUILD_WITHOUT_PV),true) +LOCAL_SRC_FILES+= \ + MediaRecorderClient.cpp +endif + ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) LOCAL_LDLIBS += -ldl -lpthread endif @@ -22,14 +26,22 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libvorbisidec \ libsonivox \ - libopencore_player \ - libopencore_author \ libmedia \ libandroid_runtime +ifneq ($(BUILD_WITHOUT_PV),true) +LOCAL_SHARED_LIBRARIES += \ + libopencore_player \ + libopencore_author +endif + LOCAL_C_INCLUDES := external/tremor/Tremor \ $(call include-path-for, graphics corecg) +ifeq ($(BUILD_WITHOUT_PV),true) +LOCAL_CFLAGS := -DNO_OPENCORE +endif + LOCAL_MODULE:= libmediaplayerservice include $(BUILD_SHARED_LIBRARY) diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 40705c6..95001c6 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -105,7 +105,11 @@ MediaPlayerService::~MediaPlayerService() sp<IMediaRecorder> MediaPlayerService::createMediaRecorder(pid_t pid) { +#ifndef NO_OPENCORE sp<MediaRecorderClient> recorder = new MediaRecorderClient(pid); +#else + sp<MediaRecorderClient> recorder = NULL; +#endif LOGV("Create new media recorder client from pid %d", pid); return recorder; } @@ -531,10 +535,12 @@ static sp<MediaPlayerBase> createPlayer(player_type playerType, void* cookie, { sp<MediaPlayerBase> p; switch (playerType) { +#ifndef NO_OPENCORE case PV_PLAYER: LOGV(" create PVPlayer"); p = new PVPlayer(); break; +#endif case SONIVOX_PLAYER: LOGV(" create MidiFile"); p = new MidiFile(); diff --git a/media/libmediaplayerservice/MetadataRetrieverClient.cpp b/media/libmediaplayerservice/MetadataRetrieverClient.cpp index a320bd5..6cb4a34 100644 --- a/media/libmediaplayerservice/MetadataRetrieverClient.cpp +++ b/media/libmediaplayerservice/MetadataRetrieverClient.cpp @@ -49,7 +49,11 @@ MetadataRetrieverClient::MetadataRetrieverClient(pid_t pid) mThumbnail = NULL; mAlbumArt = NULL; +#ifndef NO_OPENCORE mRetriever = new PVMetadataRetriever(); +#else + mRetriever = NULL; +#endif if (mRetriever == NULL) { LOGE("failed to initialize the retriever"); } |