diff options
| author | Glenn Kasten <gkasten@google.com> | 2015-03-23 16:36:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-23 16:36:53 +0000 |
| commit | 8681bd84965606a4540226b76ea1db1a2198809d (patch) | |
| tree | 1e3705a0de3de367bafe6a5854bf31f167227057 /include | |
| parent | 32db812d43fc17a8c24f3ff5ac81e5002f3ce126 (diff) | |
| parent | 32860f77787f41abac08afdfc2592272ccc31bcb (diff) | |
| download | frameworks_av-8681bd84965606a4540226b76ea1db1a2198809d.zip frameworks_av-8681bd84965606a4540226b76ea1db1a2198809d.tar.gz frameworks_av-8681bd84965606a4540226b76ea1db1a2198809d.tar.bz2 | |
Merge "Deprecate AudioRecord::getInput() and AudioTrack::getOutput()"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioRecord.h | 7 | ||||
| -rw-r--r-- | include/media/AudioTrack.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h index 52d798e..e4c98fb 100644 --- a/include/media/AudioRecord.h +++ b/include/media/AudioRecord.h @@ -315,7 +315,12 @@ public: * Returned value: * handle on audio hardware input */ - audio_io_handle_t getInput() const; +// FIXME The only known public caller is frameworks/opt/net/voip/src/jni/rtp/AudioGroup.cpp + audio_io_handle_t getInput() const __attribute__((__deprecated__)) + { return getInputPrivate(); } +private: + audio_io_handle_t getInputPrivate() const; +public: /* Returns the audio session ID associated with this AudioRecord. * diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index fd9200a..2b605cc 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -465,7 +465,9 @@ public: * handle on audio hardware output, or AUDIO_IO_HANDLE_NONE if the * track needed to be re-created but that failed */ +private: audio_io_handle_t getOutput() const; +public: /* Returns the unique session ID associated with this track. * |