diff options
author | Glenn Kasten <gkasten@google.com> | 2014-01-08 00:21:03 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-08 00:21:03 +0000 |
commit | 4d973f3894a50413f21e7db284e96afc87f57698 (patch) | |
tree | b78b0b2a741527513258ff0cbc991c11d6b21d2a | |
parent | c475546b6df3b8febc0191e5895f4546a0abd52f (diff) | |
parent | 6a5e79733c760d7555aacec53c8bd21e8516c0a1 (diff) | |
download | frameworks_av-4d973f3894a50413f21e7db284e96afc87f57698.zip frameworks_av-4d973f3894a50413f21e7db284e96afc87f57698.tar.gz frameworks_av-4d973f3894a50413f21e7db284e96afc87f57698.tar.bz2 |
Merge "Remove unnecessary defaults for parameters in AudioSystem"
-rw-r--r-- | include/media/AudioSystem.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index ba29e26..cd855da 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -67,12 +67,12 @@ public: // returns true in *state if tracks are active on the specified stream or have been active // in the past inPastMs milliseconds - static status_t isStreamActive(audio_stream_type_t stream, bool *state, uint32_t inPastMs = 0); + static status_t isStreamActive(audio_stream_type_t stream, bool *state, uint32_t inPastMs); // returns true in *state if tracks are active for what qualifies as remote playback // on the specified stream or have been active in the past inPastMs milliseconds. Remote // playback isn't mutually exclusive with local playback. static status_t isStreamActiveRemotely(audio_stream_type_t stream, bool *state, - uint32_t inPastMs = 0); + uint32_t inPastMs); // returns true in *state if a recorder is currently recording with the specified source static status_t isSourceActive(audio_source_t source, bool *state); @@ -95,11 +95,11 @@ public: static int logToLinear(float volume); static status_t getOutputSamplingRate(uint32_t* samplingRate, - audio_stream_type_t stream = AUDIO_STREAM_DEFAULT); + audio_stream_type_t stream); static status_t getOutputFrameCount(size_t* frameCount, - audio_stream_type_t stream = AUDIO_STREAM_DEFAULT); + audio_stream_type_t stream); static status_t getOutputLatency(uint32_t* latency, - audio_stream_type_t stream = AUDIO_STREAM_DEFAULT); + audio_stream_type_t stream); static status_t getSamplingRate(audio_io_handle_t output, audio_stream_type_t streamType, uint32_t* samplingRate); @@ -206,16 +206,16 @@ public: const audio_offload_info_t *offloadInfo = NULL); static status_t startOutput(audio_io_handle_t output, audio_stream_type_t stream, - int session = 0); + int session); static status_t stopOutput(audio_io_handle_t output, audio_stream_type_t stream, - int session = 0); + int session); static void releaseOutput(audio_io_handle_t output); static audio_io_handle_t getInput(audio_source_t inputSource, - uint32_t samplingRate = 0, - audio_format_t format = AUDIO_FORMAT_DEFAULT, - audio_channel_mask_t channelMask = AUDIO_CHANNEL_IN_MONO, - int sessionId = 0); + uint32_t samplingRate, + audio_format_t format, + audio_channel_mask_t channelMask, + int sessionId); static status_t startInput(audio_io_handle_t input); static status_t stopInput(audio_io_handle_t input); static void releaseInput(audio_io_handle_t input); |