summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalin Juravle <calin@google.com>2014-05-22 13:47:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-22 13:47:48 +0000
commit900db52a603397783f41ddfae2e819fbe31ba505 (patch)
tree19150bd9447e331be75b1f60e46b1f5eb8053879
parent0e00cd058fe59b90068fa0888000fec5a99dae30 (diff)
parent6ccaeebd78dcb5e20e2c0e81cdc571fb74f9cfb7 (diff)
downloadandroid_device_generic_goldfish-900db52a603397783f41ddfae2e819fbe31ba505.tar.gz
android_device_generic_goldfish-900db52a603397783f41ddfae2e819fbe31ba505.tar.bz2
android_device_generic_goldfish-900db52a603397783f41ddfae2e819fbe31ba505.zip
am 6ccaeebd: am 2c6c08a2: Merge "Move goldfish from fdprintf to POSIX dprintf."
* commit '6ccaeebd78dcb5e20e2c0e81cdc571fb74f9cfb7': Move goldfish from fdprintf to POSIX dprintf.
-rw-r--r--audio/audio_hw.c70
1 files changed, 35 insertions, 35 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index b7ea353..833583c 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -103,19 +103,19 @@ static int out_dump(const struct audio_stream *stream, int fd)
{
struct generic_stream_out *out = (struct generic_stream_out *)stream;
- fdprintf(fd, "\tout_dump:\n"
- "\t\tsample rate: %u\n"
- "\t\tbuffer size: %u\n"
- "\t\tchannel mask: %08x\n"
- "\t\tformat: %d\n"
- "\t\tdevice: %08x\n"
- "\t\taudio dev: %p\n\n",
- out_get_sample_rate(stream),
- out_get_buffer_size(stream),
- out_get_channels(stream),
- out_get_format(stream),
- out->device,
- out->dev);
+ dprintf(fd, "\tout_dump:\n"
+ "\t\tsample rate: %u\n"
+ "\t\tbuffer size: %u\n"
+ "\t\tchannel mask: %08x\n"
+ "\t\tformat: %d\n"
+ "\t\tdevice: %08x\n"
+ "\t\taudio dev: %p\n\n",
+ out_get_sample_rate(stream),
+ out_get_buffer_size(stream),
+ out_get_channels(stream),
+ out_get_format(stream),
+ out->device,
+ out->dev);
return 0;
}
@@ -259,19 +259,19 @@ static int in_dump(const struct audio_stream *stream, int fd)
{
struct generic_stream_in *in = (struct generic_stream_in *)stream;
- fdprintf(fd, "\tin_dump:\n"
- "\t\tsample rate: %u\n"
- "\t\tbuffer size: %u\n"
- "\t\tchannel mask: %08x\n"
- "\t\tformat: %d\n"
- "\t\tdevice: %08x\n"
- "\t\taudio dev: %p\n\n",
- in_get_sample_rate(stream),
- in_get_buffer_size(stream),
- in_get_channels(stream),
- in_get_format(stream),
- in->device,
- in->dev);
+ dprintf(fd, "\tin_dump:\n"
+ "\t\tsample rate: %u\n"
+ "\t\tbuffer size: %u\n"
+ "\t\tchannel mask: %08x\n"
+ "\t\tformat: %d\n"
+ "\t\tdevice: %08x\n"
+ "\t\taudio dev: %p\n\n",
+ in_get_sample_rate(stream),
+ in_get_buffer_size(stream),
+ in_get_channels(stream),
+ in_get_format(stream),
+ in->device,
+ in->dev);
return 0;
}
@@ -596,15 +596,15 @@ static int adev_dump(const audio_hw_device_t *dev, int fd)
const size_t SIZE = 256;
char buffer[SIZE];
- fdprintf(fd, "\nadev_dump:\n"
- "\tfd: %d\n"
- "\tmic_mute: %s\n"
- "\toutput: %p\n"
- "\tinput: %p\n\n",
- adev->fd,
- adev->mic_mute ? "true": "false",
- adev->output,
- adev->input);
+ dprintf(fd, "\nadev_dump:\n"
+ "\tfd: %d\n"
+ "\tmic_mute: %s\n"
+ "\toutput: %p\n"
+ "\tinput: %p\n\n",
+ adev->fd,
+ adev->mic_mute ? "true": "false",
+ adev->output,
+ adev->input);
if (adev->output != NULL)
out_dump((const struct audio_stream *)adev->output, fd);