From: Marc-André Lureau <marcandre.lureau@redhat.com>
Use slightly better types for the job.
Fix some checkpatch issues.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
audio/audio_int.h | 12 ++++++------
audio/audio_template.h | 6 +++---
include/qemu/audio.h | 8 ++++----
audio/audio.c | 30 +++++++++++++++---------------
4 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/audio/audio_int.h b/audio/audio_int.h
index 8d4f4ca8fc..df13a466e4 100644
--- a/audio/audio_int.h
+++ b/audio/audio_int.h
@@ -70,9 +70,9 @@ typedef struct STSampleBuffer {
typedef struct HWVoiceOut {
AudioBackend *s;
- int enabled;
+ bool enabled;
int poll_mode;
- int pending_disable;
+ bool pending_disable;
struct audio_pcm_info info;
f_sample *clip;
@@ -91,7 +91,7 @@ typedef struct HWVoiceOut {
typedef struct HWVoiceIn {
AudioBackend *s;
- int enabled;
+ bool enabled;
int poll_mode;
struct audio_pcm_info info;
@@ -117,8 +117,8 @@ struct SWVoiceOut {
STSampleBuffer resample_buf;
void *rate;
size_t total_hw_samples_mixed;
- int active;
- int empty;
+ bool active;
+ bool empty;
HWVoiceOut *hw;
char *name;
struct mixeng_volume vol;
@@ -128,7 +128,7 @@ struct SWVoiceOut {
struct SWVoiceIn {
AudioBackend *s;
- int active;
+ bool active;
struct audio_pcm_info info;
void *rate;
size_t total_hw_samples_acquired;
diff --git a/audio/audio_template.h b/audio/audio_template.h
index d621008f38..7a8c431f2d 100644
--- a/audio/audio_template.h
+++ b/audio/audio_template.h
@@ -166,10 +166,10 @@ static int glue (audio_pcm_sw_init_, TYPE) (
audio_pcm_init_info (&sw->info, as);
sw->hw = hw;
- sw->active = 0;
+ sw->active = false;
#ifdef DAC
sw->total_hw_samples_mixed = 0;
- sw->empty = 1;
+ sw->empty = true;
#endif
if (sw->info.is_float) {
@@ -564,7 +564,7 @@ SW *glue (AUD_open_, TYPE) (
return NULL;
}
-int glue (AUD_is_active_, TYPE) (SW *sw)
+bool glue(AUD_is_active_, TYPE)(SW *sw)
{
return sw ? sw->active : 0;
}
diff --git a/include/qemu/audio.h b/include/qemu/audio.h
index 78c27462ba..a857955f51 100644
--- a/include/qemu/audio.h
+++ b/include/qemu/audio.h
@@ -98,8 +98,8 @@ SWVoiceOut *AUD_open_out (
void AUD_close_out (AudioBackend *be, SWVoiceOut *sw);
size_t AUD_write (SWVoiceOut *sw, void *pcm_buf, size_t size);
int AUD_get_buffer_size_out (SWVoiceOut *sw);
-void AUD_set_active_out (SWVoiceOut *sw, int on);
-int AUD_is_active_out (SWVoiceOut *sw);
+void AUD_set_active_out(SWVoiceOut *sw, bool on);
+bool AUD_is_active_out(SWVoiceOut *sw);
void AUD_init_time_stamp_out (SWVoiceOut *sw, QEMUAudioTimeStamp *ts);
uint64_t AUD_get_elapsed_usec_out (SWVoiceOut *sw, QEMUAudioTimeStamp *ts);
@@ -139,8 +139,8 @@ SWVoiceIn *AUD_open_in (
void AUD_close_in (AudioBackend *be, SWVoiceIn *sw);
size_t AUD_read (SWVoiceIn *sw, void *pcm_buf, size_t size);
-void AUD_set_active_in (SWVoiceIn *sw, int on);
-int AUD_is_active_in (SWVoiceIn *sw);
+void AUD_set_active_in(SWVoiceIn *sw, bool on);
+bool AUD_is_active_in(SWVoiceIn *sw);
void AUD_init_time_stamp_in (SWVoiceIn *sw, QEMUAudioTimeStamp *ts);
uint64_t AUD_get_elapsed_usec_in (SWVoiceIn *sw, QEMUAudioTimeStamp *ts);
diff --git a/audio/audio.c b/audio/audio.c
index 4bbe6b242f..748dd0da27 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -405,7 +405,7 @@ static void audio_notify_capture (CaptureVoiceOut *cap, audcnotification_e cmd)
}
}
-static void audio_capture_maybe_changed (CaptureVoiceOut *cap, int enabled)
+static void audio_capture_maybe_changed(CaptureVoiceOut *cap, bool enabled)
{
if (cap->hw.enabled != enabled) {
audcnotification_e cmd;
@@ -419,11 +419,11 @@ static void audio_recalc_and_notify_capture (CaptureVoiceOut *cap)
{
HWVoiceOut *hw = &cap->hw;
SWVoiceOut *sw;
- int enabled = 0;
+ bool enabled = false;
for (sw = hw->sw_head.lh_first; sw; sw = sw->entries.le_next) {
if (sw->active) {
- enabled = 1;
+ enabled = true;
break;
}
}
@@ -475,7 +475,7 @@ static int audio_attach_capture (HWVoiceOut *hw)
sw = &sc->sw;
sw->hw = hw_cap;
sw->info = hw->info;
- sw->empty = 1;
+ sw->empty = true;
sw->active = hw->enabled;
sw->vol = nominal_volume;
sw->rate = st_rate_start (sw->info.freq, hw_cap->info.freq);
@@ -911,7 +911,7 @@ int AUD_get_buffer_size_out(SWVoiceOut *sw)
return sw->hw->samples * sw->hw->info.bytes_per_frame;
}
-void AUD_set_active_out (SWVoiceOut *sw, int on)
+void AUD_set_active_out(SWVoiceOut *sw, bool on)
{
HWVoiceOut *hw;
@@ -928,7 +928,7 @@ void AUD_set_active_out (SWVoiceOut *sw, int on)
if (on) {
hw->pending_disable = 0;
if (!hw->enabled) {
- hw->enabled = 1;
+ hw->enabled = true;
if (s->vm_running) {
if (hw->pcm_ops->enable_out) {
hw->pcm_ops->enable_out(hw, true);
@@ -959,7 +959,7 @@ void AUD_set_active_out (SWVoiceOut *sw, int on)
}
}
-void AUD_set_active_in (SWVoiceIn *sw, int on)
+void AUD_set_active_in(SWVoiceIn *sw, bool on)
{
HWVoiceIn *hw;
@@ -974,7 +974,7 @@ void AUD_set_active_in (SWVoiceIn *sw, int on)
if (on) {
if (!hw->enabled) {
- hw->enabled = 1;
+ hw->enabled = true;
if (s->vm_running) {
if (hw->pcm_ops->enable_in) {
hw->pcm_ops->enable_in(hw, true);
@@ -993,7 +993,7 @@ void AUD_set_active_in (SWVoiceIn *sw, int on)
}
if (nb_active == 1) {
- hw->enabled = 0;
+ hw->enabled = false;
if (hw->pcm_ops->enable_in) {
hw->pcm_ops->enable_in(hw, false);
}
@@ -1152,8 +1152,8 @@ static void audio_run_out(AudioBackend *s)
sw = hw->sw_head.lh_first;
if (hw->pending_disable) {
- hw->enabled = 0;
- hw->pending_disable = 0;
+ hw->enabled = false;
+ hw->pending_disable = false;
if (hw->pcm_ops->enable_out) {
hw->pcm_ops->enable_out(hw, false);
}
@@ -1206,13 +1206,13 @@ static void audio_run_out(AudioBackend *s)
#ifdef DEBUG_OUT
dolog ("Disabling voice\n");
#endif
- hw->enabled = 0;
- hw->pending_disable = 0;
+ hw->enabled = false;
+ hw->pending_disable = false;
if (hw->pcm_ops->enable_out) {
hw->pcm_ops->enable_out(hw, false);
}
for (sc = hw->cap_head.lh_first; sc; sc = sc->entries.le_next) {
- sc->sw.active = 0;
+ sc->sw.active = false;
audio_recalc_and_notify_capture (sc->cap);
}
continue;
@@ -1257,7 +1257,7 @@ static void audio_run_out(AudioBackend *s)
sw->total_hw_samples_mixed -= played;
if (!sw->total_hw_samples_mixed) {
- sw->empty = 1;
+ sw->empty = true;
}
}
}
--
2.51.0