diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-26 23:23:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-26 23:23:09 +0000 |
| commit | c9b8d90dabdf1234be0117c592f635a92c4eb0d9 (patch) | |
| tree | 8bbeb033b0eb0bcbbfb12faaa6f2133d3cd093ea /include | |
| parent | 5c4fa907328c8ee586367272c7525cb87742f14d (diff) | |
| parent | 142f519aa1acd5804d111e60d100f170fed28405 (diff) | |
| download | frameworks_av-c9b8d90dabdf1234be0117c592f635a92c4eb0d9.zip frameworks_av-c9b8d90dabdf1234be0117c592f635a92c4eb0d9.tar.gz frameworks_av-c9b8d90dabdf1234be0117c592f635a92c4eb0d9.tar.bz2 | |
Merge "Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioEffect.h | 6 | ||||
| -rw-r--r-- | include/media/AudioTrack.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/media/AudioEffect.h b/include/media/AudioEffect.h index 01dcbb2..f98002d 100644 --- a/include/media/AudioEffect.h +++ b/include/media/AudioEffect.h @@ -231,7 +231,7 @@ public: effect_callback_t cbf = NULL, void* user = NULL, int sessionId = AUDIO_SESSION_OUTPUT_MIX, - audio_io_handle_t io = 0 + audio_io_handle_t io = AUDIO_IO_HANDLE_NONE ); /* Constructor. @@ -243,7 +243,7 @@ public: effect_callback_t cbf = NULL, void* user = NULL, int sessionId = AUDIO_SESSION_OUTPUT_MIX, - audio_io_handle_t io = 0 + audio_io_handle_t io = AUDIO_IO_HANDLE_NONE ); /* Terminates the AudioEffect and unregisters it from AudioFlinger. @@ -265,7 +265,7 @@ public: effect_callback_t cbf = NULL, void* user = NULL, int sessionId = AUDIO_SESSION_OUTPUT_MIX, - audio_io_handle_t io = 0 + audio_io_handle_t io = AUDIO_IO_HANDLE_NONE ); /* Result of constructing the AudioEffect. This must be checked diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index e162b36..2c48bbf 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -451,7 +451,8 @@ public: * none. * * Returned value: - * handle on audio hardware output + * handle on audio hardware output, or AUDIO_IO_HANDLE_NONE if the + * track needed to be re-created but that failed */ audio_io_handle_t getOutput() const; |