diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-12 08:32:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-12 08:32:09 -0700 |
| commit | d670b8c61ebd13324ac21bdbc08d8a02fc0a765a (patch) | |
| tree | c24961f49c83ed6db9784ac9972d683f380f4555 /include | |
| parent | 83bb56c389d003162093eef0aaee251cefc1deed (diff) | |
| parent | 32f82774884bdd709789ab9f3ccdf5b972ff7681 (diff) | |
| download | frameworks_base-d670b8c61ebd13324ac21bdbc08d8a02fc0a765a.zip frameworks_base-d670b8c61ebd13324ac21bdbc08d8a02fc0a765a.tar.gz frameworks_base-d670b8c61ebd13324ac21bdbc08d8a02fc0a765a.tar.bz2 | |
Merge change 3981 into donut
* changes:
Removed trailing whitespaces.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/IMediaPlayerService.h | 3 | ||||
| -rw-r--r-- | include/media/MediaPlayerInterface.h | 1 | ||||
| -rw-r--r-- | include/media/mediaplayer.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/include/media/IMediaPlayerService.h b/include/media/IMediaPlayerService.h index 8125cc9..d1d96b1 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 255a67b..513ffe1 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, |