diff options
| author | Andy Hung <hunga@google.com> | 2014-05-23 23:51:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-23 23:51:17 +0000 |
| commit | c62476f0c0c1cf9283a38852bde0a4c9434df712 (patch) | |
| tree | 6249b263dba1e91017e9debfe4c2e8f79b1be2c7 /services/audioflinger/Threads.h | |
| parent | 7a470c375c2cef8b186fbadd9915b30e5d757453 (diff) | |
| parent | e8a1ced4da17dc6c07803dc2af8060f62a8389c1 (diff) | |
| download | frameworks_av-c62476f0c0c1cf9283a38852bde0a4c9434df712.zip frameworks_av-c62476f0c0c1cf9283a38852bde0a4c9434df712.tar.gz frameworks_av-c62476f0c0c1cf9283a38852bde0a4c9434df712.tar.bz2 | |
Merge "Add format parameter to getTrackName() and track_t"
Diffstat (limited to 'services/audioflinger/Threads.h')
| -rw-r--r-- | services/audioflinger/Threads.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h index 4683a13..44008e5 100644 --- a/services/audioflinger/Threads.h +++ b/services/audioflinger/Threads.h @@ -621,7 +621,8 @@ protected: // Allocate a track name for a given channel mask. // Returns name >= 0 if successful, -1 on failure. - virtual int getTrackName_l(audio_channel_mask_t channelMask, int sessionId) = 0; + virtual int getTrackName_l(audio_channel_mask_t channelMask, + audio_format_t format, int sessionId) = 0; virtual void deleteTrackName_l(int name) = 0; // Time to sleep between cycles when: @@ -774,7 +775,8 @@ public: protected: virtual mixer_state prepareTracks_l(Vector< sp<Track> > *tracksToRemove); - virtual int getTrackName_l(audio_channel_mask_t channelMask, int sessionId); + virtual int getTrackName_l(audio_channel_mask_t channelMask, + audio_format_t format, int sessionId); virtual void deleteTrackName_l(int name); virtual uint32_t idleSleepTimeUs() const; virtual uint32_t suspendSleepTimeUs() const; @@ -827,7 +829,8 @@ public: status_t& status); protected: - virtual int getTrackName_l(audio_channel_mask_t channelMask, int sessionId); + virtual int getTrackName_l(audio_channel_mask_t channelMask, + audio_format_t format, int sessionId); virtual void deleteTrackName_l(int name); virtual uint32_t activeSleepTimeUs() const; virtual uint32_t idleSleepTimeUs() const; |