diff options
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 97103c491def..f80750b9fae7 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -564,6 +564,18 @@ private: KeyedVector< int, KeyedVector< int, sp<SuspendedSessionDesc> > > mSuspendedSessions; }; + struct stream_type_t { + stream_type_t() + : volume(1.0f), + mute(false), + valid(true) + { + } + float volume; + bool mute; + bool valid; + }; + // --- PlaybackThread --- class PlaybackThread : public ThreadBase { public: @@ -758,18 +770,6 @@ private: void setStreamValid(audio_stream_type_t streamType, bool valid); - struct stream_type_t { - stream_type_t() - : volume(1.0f), - mute(false), - valid(true) - { - } - float volume; - bool mute; - bool valid; - }; - protected: int16_t* mMixBuffer; int mSuspended; @@ -1412,7 +1412,7 @@ mutable Mutex mLock; // mutex for process, commands and handl DefaultKeyedVector< audio_io_handle_t, sp<PlaybackThread> > mPlaybackThreads; - PlaybackThread::stream_type_t mStreamTypes[AUDIO_STREAM_CNT]; + stream_type_t mStreamTypes[AUDIO_STREAM_CNT]; // both are protected by mLock float mMasterVolume; |