diff options
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/IAudioRecord.h | 6 | ||||
-rw-r--r-- | include/media/IAudioTrack.h | 8 | ||||
-rw-r--r-- | include/media/IMediaMetadataRetriever.h | 1 | ||||
-rw-r--r-- | include/media/IMediaPlayerClient.h | 1 | ||||
-rw-r--r-- | include/media/IMediaRecorderClient.h | 1 | ||||
-rw-r--r-- | include/media/JetPlayer.h | 10 | ||||
-rw-r--r-- | include/media/MediaMetadataRetrieverInterface.h | 3 | ||||
-rw-r--r-- | include/media/MediaProfiles.h | 1 | ||||
-rw-r--r-- | include/media/MemoryLeakTrackUtil.h | 1 |
9 files changed, 13 insertions, 19 deletions
diff --git a/include/media/IAudioRecord.h b/include/media/IAudioRecord.h index 7869020..089be3b 100644 --- a/include/media/IAudioRecord.h +++ b/include/media/IAudioRecord.h @@ -32,7 +32,7 @@ namespace android { class IAudioRecord : public IInterface { -public: +public: DECLARE_META_INTERFACE(AudioRecord); /* After it's created the track is not active. Call start() to @@ -42,13 +42,13 @@ public: virtual status_t start(pid_t tid) = 0; /* Stop a track. If set, the callback will cease being called and - * obtainBuffer will return an error. Buffers that are already released + * obtainBuffer will return an error. Buffers that are already released * will be processed, unless flush() is called. */ virtual void stop() = 0; /* get this tracks control block */ - virtual sp<IMemory> getCblk() const = 0; + virtual sp<IMemory> getCblk() const = 0; }; // ---------------------------------------------------------------------------- diff --git a/include/media/IAudioTrack.h b/include/media/IAudioTrack.h index 77f3e21..577b095 100644 --- a/include/media/IAudioTrack.h +++ b/include/media/IAudioTrack.h @@ -32,7 +32,7 @@ namespace android { class IAudioTrack : public IInterface { -public: +public: DECLARE_META_INTERFACE(AudioTrack); /* Get this track's control block */ @@ -45,7 +45,7 @@ public: virtual status_t start(pid_t tid) = 0; /* Stop a track. If set, the callback will cease being called and - * obtainBuffer will return an error. Buffers that are already released + * obtainBuffer will return an error. Buffers that are already released * will continue to be processed, unless/until flush() is called. */ virtual void stop() = 0; @@ -59,9 +59,9 @@ public: * While muted, the callback, if set, is still called. */ virtual void mute(bool) = 0; - + /* Pause a track. If set, the callback will cease being called and - * obtainBuffer will return an error. Buffers that are already released + * obtainBuffer will return an error. Buffers that are already released * will continue to be processed, unless/until flush() is called. */ virtual void pause() = 0; diff --git a/include/media/IMediaMetadataRetriever.h b/include/media/IMediaMetadataRetriever.h index 1c1c268..6dbb2d7 100644 --- a/include/media/IMediaMetadataRetriever.h +++ b/include/media/IMediaMetadataRetriever.h @@ -56,4 +56,3 @@ public: }; // namespace android #endif // ANDROID_IMEDIAMETADATARETRIEVER_H - diff --git a/include/media/IMediaPlayerClient.h b/include/media/IMediaPlayerClient.h index daec1c7..8f1843e 100644 --- a/include/media/IMediaPlayerClient.h +++ b/include/media/IMediaPlayerClient.h @@ -45,4 +45,3 @@ public: }; // namespace android #endif // ANDROID_IMEDIAPLAYERCLIENT_H - diff --git a/include/media/IMediaRecorderClient.h b/include/media/IMediaRecorderClient.h index 0058ef2..e7d0229 100644 --- a/include/media/IMediaRecorderClient.h +++ b/include/media/IMediaRecorderClient.h @@ -45,4 +45,3 @@ public: }; // namespace android #endif // ANDROID_IMEDIARECORDERCLIENT_H - diff --git a/include/media/JetPlayer.h b/include/media/JetPlayer.h index 491a950..9f6ff4c 100644 --- a/include/media/JetPlayer.h +++ b/include/media/JetPlayer.h @@ -40,13 +40,13 @@ public: static const int JET_NUMQUEUEDSEGMENT_UPDATE = 3; static const int JET_PAUSE_UPDATE = 4; - JetPlayer(jobject javaJetPlayer, - int maxTracks = 32, + JetPlayer(jobject javaJetPlayer, + int maxTracks = 32, int trackBufferSize = 1200); ~JetPlayer(); int init(); int release(); - + int loadFromFile(const char* url); int loadFromFD(const int fd, const long long offset, const long long length); int closeFile(); @@ -60,7 +60,7 @@ public: int clearQueue(); void setEventCallback(jetevent_callback callback); - + int getMaxTracks() { return mMaxTracks; }; @@ -88,7 +88,7 @@ private: int mMaxTracks; // max number of MIDI tracks, usually 32 EAS_DATA_HANDLE mEasData; EAS_FILE_LOCATOR mEasJetFileLoc; - EAS_PCM* mAudioBuffer;// EAS renders the MIDI data into this buffer, + EAS_PCM* mAudioBuffer;// EAS renders the MIDI data into this buffer, AudioTrack* mAudioTrack; // and we play it in this audio track int mTrackBufferSize; S_JET_STATUS mJetStatus; diff --git a/include/media/MediaMetadataRetrieverInterface.h b/include/media/MediaMetadataRetrieverInterface.h index 27b7e4d..ecc3b65 100644 --- a/include/media/MediaMetadataRetrieverInterface.h +++ b/include/media/MediaMetadataRetrieverInterface.h @@ -1,6 +1,6 @@ /* ** -** Copyright (C) 2008 The Android Open Source Project +** Copyright (C) 2008 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. @@ -56,4 +56,3 @@ public: }; // namespace android #endif // ANDROID_MEDIAMETADATARETRIEVERINTERFACE_H - diff --git a/include/media/MediaProfiles.h b/include/media/MediaProfiles.h index 250f267..9fc962c 100644 --- a/include/media/MediaProfiles.h +++ b/include/media/MediaProfiles.h @@ -516,4 +516,3 @@ private: }; // namespace android #endif // ANDROID_MEDIAPROFILES_H - diff --git a/include/media/MemoryLeakTrackUtil.h b/include/media/MemoryLeakTrackUtil.h index ac0f6b2..d2618aa 100644 --- a/include/media/MemoryLeakTrackUtil.h +++ b/include/media/MemoryLeakTrackUtil.h @@ -1,4 +1,3 @@ - /* * Copyright 2011, The Android Open Source Project * |