From d1e7b4e38136f9342aad76c685a13adf0e69f869 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 3 Aug 2013 21:00:50 +0200 Subject: audio_format: convert to C++ --- src/output/HttpdOutputPlugin.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/output/HttpdOutputPlugin.cxx') diff --git a/src/output/HttpdOutputPlugin.cxx b/src/output/HttpdOutputPlugin.cxx index 36bd1aee1..462dd3429 100644 --- a/src/output/HttpdOutputPlugin.cxx +++ b/src/output/HttpdOutputPlugin.cxx @@ -291,7 +291,7 @@ httpd_output_disable(struct audio_output *ao) } inline bool -HttpdOutput::OpenEncoder(struct audio_format *audio_format, GError **error) +HttpdOutput::OpenEncoder(AudioFormat &audio_format, GError **error) { if (!encoder_open(encoder, audio_format, error)) return false; @@ -307,7 +307,7 @@ HttpdOutput::OpenEncoder(struct audio_format *audio_format, GError **error) } inline bool -HttpdOutput::Open(struct audio_format *audio_format, GError **error_r) +HttpdOutput::Open(AudioFormat &audio_format, GError **error_r) { assert(!open); assert(clients.empty()); @@ -320,7 +320,7 @@ HttpdOutput::Open(struct audio_format *audio_format, GError **error_r) /* initialize other attributes */ clients_cnt = 0; - timer = new Timer(*audio_format); + timer = new Timer(audio_format); open = true; @@ -328,7 +328,7 @@ HttpdOutput::Open(struct audio_format *audio_format, GError **error_r) } static bool -httpd_output_open(struct audio_output *ao, struct audio_format *audio_format, +httpd_output_open(struct audio_output *ao, AudioFormat &audio_format, GError **error) { HttpdOutput *httpd = Cast(ao); -- cgit v1.2.3