diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-06-14 08:43:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-14 08:43:56 -0700 |
| commit | 48a0bfa6f731386f2794ff36d6677d56e98fc6ea (patch) | |
| tree | 36deb7b4e31a25a8a4b313de8ffdecd1d8ae9aaa /include | |
| parent | cc0df657cdc8316c2b816c562f269be1706f00ea (diff) | |
| parent | 49dd5cf3469cd755321f8ec10013ad4fcfaf723d (diff) | |
| download | frameworks_av-48a0bfa6f731386f2794ff36d6677d56e98fc6ea.zip frameworks_av-48a0bfa6f731386f2794ff36d6677d56e98fc6ea.tar.gz frameworks_av-48a0bfa6f731386f2794ff36d6677d56e98fc6ea.tar.bz2 | |
am 49dd5cf3: Merge "Log track name on obtain/releaseBuffer warnings" into jb-dev
* commit '49dd5cf3469cd755321f8ec10013ad4fcfaf723d':
Log track name on obtain/releaseBuffer warnings
Diffstat (limited to 'include')
| -rw-r--r-- | include/private/media/AudioTrackShared.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/private/media/AudioTrackShared.h b/include/private/media/AudioTrackShared.h index 469f5ff..5b133f3 100644 --- a/include/private/media/AudioTrackShared.h +++ b/include/private/media/AudioTrackShared.h @@ -97,9 +97,7 @@ public: // read-only for client, server writes once at initialization and is then read-only uint8_t frameSize; // would normally be size_t, but 8 bits is plenty - - // never used - uint8_t pad1; + uint8_t mName; // normal tracks: track name, fast tracks: track index // used by client only uint16_t bufferTimeoutMs; // Maximum cumulated timeout before restarting audioflinger |