diff --git a/daemon/src/audio/pulseaudio/pulselayer.cpp b/daemon/src/audio/pulseaudio/pulselayer.cpp index d2536bfa124900e06ba531b7d102a8e826b3cc36..bc27043a39e075e5d8a79c01ac06db4e66126a87 100644 --- a/daemon/src/audio/pulseaudio/pulselayer.cpp +++ b/daemon/src/audio/pulseaudio/pulselayer.cpp @@ -126,17 +126,15 @@ PulseLayer::~PulseLayer() delete[] mic_buffer_; } -void PulseLayer::context_state_callback(pa_context* c, void* user_data) +void PulseLayer::context_state_callback(pa_context* c, void *user_data) { - PulseLayer* pulse = (PulseLayer*) user_data; + PulseLayer *pulse = static_cast<PulseLayer*>(user_data); assert(c && pulse->mainloop_); switch (pa_context_get_state(c)) { case PA_CONTEXT_CONNECTING: - case PA_CONTEXT_AUTHORIZING: - case PA_CONTEXT_SETTING_NAME: DEBUG("Audio: Waiting...."); break; @@ -155,7 +153,6 @@ void PulseLayer::context_state_callback(pa_context* c, void* user_data) break; case PA_CONTEXT_FAILED: - default: ERROR("Pulse: %s" , pa_strerror(pa_context_errno(c))); pa_threaded_mainloop_signal(pulse->mainloop_, 0); @@ -471,19 +468,19 @@ void PulseLayer::ringtoneToSpeaker() pa_stream_write(s, data, bytes, NULL, 0, PA_SEEK_RELATIVE); } -void PulseLayer::context_changed_callback(pa_context* c, pa_subscription_event_type_t t, uint32_t idx UNUSED, void* userdata) +void PulseLayer::context_changed_callback(pa_context* c, pa_subscription_event_type_t t, uint32_t idx UNUSED, void *userdata) { - + PulseLayer *context = static_cast<PulseLayer*>(userdata); switch (t) { case PA_SUBSCRIPTION_EVENT_SINK: DEBUG("Audio: PA_SUBSCRIPTION_EVENT_SINK"); - ((PulseLayer *) userdata)->sinkList_.clear(); + context->sinkList_.clear(); pa_context_get_sink_info_list(c, sink_input_info_callback, userdata); break; case PA_SUBSCRIPTION_EVENT_SOURCE: DEBUG("Audio: PA_SUBSCRIPTION_EVENT_SOURCE"); - ((PulseLayer *) userdata)->sourceList_.clear(); - pa_context_get_source_info_list(c, source_input_info_callback, userdata); + context->sourceList_.clear(); + pa_context_get_source_info_list(c, source_input_info_callback, userdata); break; case PA_SUBSCRIPTION_EVENT_SINK_INPUT: DEBUG("Audio: PA_SUBSCRIPTION_EVENT_SINK_INPUT"); @@ -514,10 +511,10 @@ void PulseLayer::context_changed_callback(pa_context* c, pa_subscription_event_t break; case PA_SUBSCRIPTION_EVENT_REMOVE: DEBUG("Audio: PA_SUBSCRIPTION_EVENT_REMOVE"); - ((PulseLayer *) userdata)->sinkList_.clear(); - ((PulseLayer *) userdata)->sourceList_.clear(); - pa_context_get_sink_info_list(c, sink_input_info_callback, userdata); - pa_context_get_source_info_list(c, source_input_info_callback, userdata); + context->sinkList_.clear(); + context->sourceList_.clear(); + pa_context_get_sink_info_list(c, sink_input_info_callback, userdata); + pa_context_get_source_info_list(c, source_input_info_callback, userdata); break; case PA_SUBSCRIPTION_EVENT_TYPE_MASK: DEBUG("Audio: PA_SUBSCRIPTION_EVENT_TYPE_MASK"); @@ -560,7 +557,7 @@ void PulseLayer::source_input_info_callback(pa_context *c UNUSED, const pa_sourc i->flags & PA_SOURCE_LATENCY ? "LATENCY " : "", i->flags & PA_SOURCE_HARDWARE ? "HARDWARE" : ""); - ((PulseLayer *)userdata)->sourceList_.push_back(i->name); + static_cast<PulseLayer *>(userdata)->sourceList_.push_back(i->name); } void PulseLayer::sink_input_info_callback(pa_context *c UNUSED, const pa_sink_info *i, int eol, void *userdata)