diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-12 11:43:55 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-12 11:43:55 -0700 |
| commit | 4710a1f6c9800dae90f9e2702ba2b5b54c095eae (patch) | |
| tree | 094cd3463052fa129012540ce0073705cc62866f | |
| parent | 2a7d5b3c1a3749db7c4ace34bf1253c44967e843 (diff) | |
| parent | 660951867e959ebe98612742ef1f72d33ea7e9a3 (diff) | |
| download | frameworks_av-4710a1f6c9800dae90f9e2702ba2b5b54c095eae.zip frameworks_av-4710a1f6c9800dae90f9e2702ba2b5b54c095eae.tar.gz frameworks_av-4710a1f6c9800dae90f9e2702ba2b5b54c095eae.tar.bz2 | |
am d670b8c6: Merge change 3981 into donut
Merge commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a'
* commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a':
Removed trailing whitespaces.
| -rw-r--r-- | include/media/IMediaPlayerService.h | 3 | ||||
| -rw-r--r-- | include/media/MediaPlayerInterface.h | 1 | ||||
| -rw-r--r-- | include/media/mediaplayer.h | 2 | ||||
| -rw-r--r-- | media/libmedia/IMediaPlayerService.cpp | 1 | ||||
| -rw-r--r-- | media/libmedia/mediaplayer.cpp | 4 |
5 files changed, 4 insertions, 7 deletions
diff --git a/include/media/IMediaPlayerService.h b/include/media/IMediaPlayerService.h index 469098c..207e4e7 100644 --- a/include/media/IMediaPlayerService.h +++ b/include/media/IMediaPlayerService.h @@ -34,7 +34,7 @@ class IMediaPlayerService: public IInterface public: DECLARE_META_INTERFACE(MediaPlayerService); - virtual sp<IMediaRecorder> createMediaRecorder(pid_t pid) = 0; + virtual sp<IMediaRecorder> createMediaRecorder(pid_t pid) = 0; virtual sp<IMediaMetadataRetriever> createMetadataRetriever(pid_t pid) = 0; virtual sp<IMediaPlayer> create(pid_t pid, const sp<IMediaPlayerClient>& client, const char* url) = 0; @@ -57,4 +57,3 @@ public: }; // namespace android #endif // ANDROID_IMEDIAPLAYERSERVICE_H - diff --git a/include/media/MediaPlayerInterface.h b/include/media/MediaPlayerInterface.h index 7f0e7b3..7bf555a 100644 --- a/include/media/MediaPlayerInterface.h +++ b/include/media/MediaPlayerInterface.h @@ -123,4 +123,3 @@ public: #endif // ANDROID_MEDIAPLAYERINTERFACE_H - diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index 704a8cb..ffb325d 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -82,7 +82,7 @@ enum media_error_type { // 0xx: Reserved // 7xx: Android Player info/warning (e.g player lagging behind.) // 8xx: Media info/warning (e.g media badly interleaved.) -// +// enum media_info_type { // 0xx MEDIA_INFO_UNKNOWN = 1, diff --git a/media/libmedia/IMediaPlayerService.cpp b/media/libmedia/IMediaPlayerService.cpp index 84efc2a..a79d4f7 100644 --- a/media/libmedia/IMediaPlayerService.cpp +++ b/media/libmedia/IMediaPlayerService.cpp @@ -189,4 +189,3 @@ status_t BnMediaPlayerService::onTransact( // ---------------------------------------------------------------------------- }; // namespace android - diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index 0f3eb70..220c998 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -503,7 +503,7 @@ void MediaPlayer::notify(int msg, int ext1, int ext2) // TODO: In the future, we might be on the same thread if the app is // running in the same process as the media server. In that case, // this will deadlock. - // + // // The threadId hack below works around this for the care of prepare // and seekTo within the same process. // FIXME: Remember, this is a hack, it's not even a hack that is applied @@ -511,7 +511,7 @@ void MediaPlayer::notify(int msg, int ext1, int ext2) if (mLockThreadId != getThreadId()) { mLock.lock(); locked = true; - } + } if (mPlayer == 0) { LOGV("notify(%d, %d, %d) callback on disconnected mediaplayer", msg, ext1, ext2); |