diff options
author | Marco Nelissen <marcone@google.com> | 2014-05-15 15:26:14 -0700 |
---|---|---|
committer | Marco Nelissen <marcone@google.com> | 2014-05-15 15:26:14 -0700 |
commit | 7c96d53a65085f42ac2b6d416cbc16fd36ed72ff (patch) | |
tree | 892a5dee6e6c62dd923aa817bafa6b3fe4a951cd | |
parent | 5362ba070797c52a18d3cb5558cd41d1a72c74c5 (diff) | |
download | frameworks_av-7c96d53a65085f42ac2b6d416cbc16fd36ed72ff.zip frameworks_av-7c96d53a65085f42ac2b6d416cbc16fd36ed72ff.tar.gz frameworks_av-7c96d53a65085f42ac2b6d416cbc16fd36ed72ff.tar.bz2 |
Fix build.
Change-Id: I2b0a3049c81b99ba233d5945e16dcddd975aa4f9
-rw-r--r-- | include/ndk/NdkMediaDrm.h | 2 | ||||
-rw-r--r-- | media/ndk/NdkMediaDrm.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/ndk/NdkMediaDrm.h b/include/ndk/NdkMediaDrm.h index e1f15f4..04c371c 100644 --- a/include/ndk/NdkMediaDrm.h +++ b/include/ndk/NdkMediaDrm.h @@ -107,7 +107,7 @@ void AMediaDrm_release(AMediaDrm *); * * listener is the callback that will be invoked on event */ -mediadrm_status_t AMediaDrm_setOnEventListener(AMediaDrm *, AMediaDrmEventListener listener); +media_status_t AMediaDrm_setOnEventListener(AMediaDrm *, AMediaDrmEventListener listener); /** * Open a new session with the MediaDrm object. A session ID is returned. diff --git a/media/ndk/NdkMediaDrm.cpp b/media/ndk/NdkMediaDrm.cpp index 3638613..f982275 100644 --- a/media/ndk/NdkMediaDrm.cpp +++ b/media/ndk/NdkMediaDrm.cpp @@ -215,13 +215,13 @@ void AMediaDrm_release(AMediaDrm *mObj) { } EXPORT -mediadrm_status_t AMediaDrm_setOnEventListener(AMediaDrm *mObj, AMediaDrmEventListener listener) { +media_status_t AMediaDrm_setOnEventListener(AMediaDrm *mObj, AMediaDrmEventListener listener) { if (!mObj || mObj->mDrm == NULL) { - return MEDIADRM_INVALID_OBJECT_ERROR; + return AMEDIA_ERROR_INVALID_OBJECT; } mObj->mListener = new DrmListener(mObj, listener); mObj->mDrm->setListener(mObj->mListener); - return MEDIADRM_OK; + return AMEDIA_OK; } |