diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-07-21 11:16:54 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-07-21 11:16:54 -0700 |
| commit | 4d3b5c1e36f2a3746a1c87f8af97d4fe97e8f49e (patch) | |
| tree | 253e04766c56308bdea922e22a75acafa43b666f /libs/audioflinger/AudioFlinger.h | |
| parent | 512837cef2b7203123d0b8df7ad49454ce932a75 (diff) | |
| download | frameworks_native-4d3b5c1e36f2a3746a1c87f8af97d4fe97e8f49e.zip frameworks_native-4d3b5c1e36f2a3746a1c87f8af97d4fe97e8f49e.tar.gz frameworks_native-4d3b5c1e36f2a3746a1c87f8af97d4fe97e8f49e.tar.bz2 | |
donut snapshot
Diffstat (limited to 'libs/audioflinger/AudioFlinger.h')
| -rw-r--r-- | libs/audioflinger/AudioFlinger.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/libs/audioflinger/AudioFlinger.h b/libs/audioflinger/AudioFlinger.h index c7ca9ec..8e47b29 100644 --- a/libs/audioflinger/AudioFlinger.h +++ b/libs/audioflinger/AudioFlinger.h @@ -139,7 +139,7 @@ public: // record interface virtual sp<IAudioRecord> openRecord( pid_t pid, - int streamType, + int inputSource, uint32_t sampleRate, int format, int channelCount, @@ -232,7 +232,6 @@ private: TrackBase(const sp<MixerThread>& mixerThread, const sp<Client>& client, - int streamType, uint32_t sampleRate, int format, int channelCount, @@ -260,10 +259,6 @@ private: return mCblk; } - int type() const { - return mStreamType; - } - int format() const { return mFormat; } @@ -293,7 +288,6 @@ private: sp<Client> mClient; sp<IMemory> mCblkMemory; audio_track_cblk_t* mCblk; - int mStreamType; void* mBuffer; void* mBufferEnd; uint32_t mFrameCount; @@ -328,6 +322,11 @@ private: void mute(bool); void setVolume(float left, float right); + int type() const { + return mStreamType; + } + + protected: friend class MixerThread; friend class AudioFlinger; @@ -364,6 +363,7 @@ private: int8_t mRetryCount; sp<IMemory> mSharedBuffer; bool mResetDone; + int mStreamType; }; // end of Track // record track @@ -371,7 +371,7 @@ private: public: RecordTrack(const sp<MixerThread>& mixerThread, const sp<Client>& client, - int streamType, + int inputSource, uint32_t sampleRate, int format, int channelCount, @@ -385,6 +385,8 @@ private: bool overflow() { bool tmp = mOverflow; mOverflow = false; return tmp; } bool setOverflow() { bool tmp = mOverflow; mOverflow = true; return tmp; } + int inputSource() const { return mInputSource; } + private: friend class AudioFlinger; friend class AudioFlinger::RecordHandle; @@ -397,6 +399,7 @@ private: virtual status_t getNextBuffer(AudioBufferProvider::Buffer* buffer); bool mOverflow; + int mInputSource; }; // playback track |