From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Volker Rümelin" <vr_qemu@t-online.de>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Kővágó Zoltán" <DirtY.iCE.hu@gmail.com>
Subject: [PATCH 3/7] audio: Move advance() helper to 'audio_int.h'
Date: Tue, 5 May 2020 15:25:59 +0200 [thread overview]
Message-ID: <20200505132603.8575-4-f4bug@amsat.org> (raw)
In-Reply-To: <20200505132603.8575-1-f4bug@amsat.org>
The advance() helper is only used by the audio backends.
Restrict its use by moving it to the "audio_int.h" header.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
audio/audio.h | 6 ------
audio/audio_int.h | 6 ++++++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/audio/audio.h b/audio/audio.h
index b883ebfb1f..9d759d644b 100644
--- a/audio/audio.h
+++ b/audio/audio.h
@@ -151,12 +151,6 @@ int 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);
-static inline void *advance (void *p, int incr)
-{
- uint8_t *d = p;
- return (d + incr);
-}
-
int wav_start_capture(AudioState *state, CaptureState *s, const char *path,
int freq, int bits, int nchannels);
diff --git a/audio/audio_int.h b/audio/audio_int.h
index 4775857bf2..fb6947c435 100644
--- a/audio/audio_int.h
+++ b/audio/audio_int.h
@@ -255,6 +255,12 @@ static inline size_t audio_ring_dist(size_t dst, size_t src, size_t len)
return (dst >= src) ? (dst - src) : (len - src + dst);
}
+static inline void *advance(void *p, int incr)
+{
+ uint8_t *d = p;
+ return d + incr;
+}
+
#define dolog(fmt, ...) AUD_log(AUDIO_CAP, fmt, ## __VA_ARGS__)
#ifdef DEBUG
--
2.21.3
next prev parent reply other threads:[~2020-05-05 13:27 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-05 13:25 [PATCH 0/7] audio: Spring cleaning Philippe Mathieu-Daudé
2020-05-05 13:25 ` [PATCH 1/7] audio: Let audio_sample_to_uint64() use const samples argument Philippe Mathieu-Daudé
2020-05-05 13:25 ` [PATCH 2/7] audio: Let capture_callback handler use const buffer argument Philippe Mathieu-Daudé
2020-05-05 13:25 ` Philippe Mathieu-Daudé [this message]
2020-05-05 13:26 ` [PATCH 4/7] audio: Split advance() helper as in() and out() Philippe Mathieu-Daudé
2020-05-05 13:26 ` [PATCH 5/7] audio: Let HWVoice write() handlers take a const buffer Philippe Mathieu-Daudé
2020-05-06 6:22 ` Volker Rümelin
2020-05-11 21:36 ` Philippe Mathieu-Daudé
2020-05-05 13:26 ` [PATCH 6/7] audio: Let AUD_write() use a const buffer argument Philippe Mathieu-Daudé
2020-05-05 13:26 ` [PATCH 7/7] audio: Expose 'audio/audio.h' under the include/ directory Philippe Mathieu-Daudé
2020-05-26 6:04 ` [PATCH 0/7] audio: Spring cleaning Philippe Mathieu-Daudé
2020-07-06 18:09 ` Philippe Mathieu-Daudé
2020-07-06 18:46 ` Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200505132603.8575-4-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=DirtY.iCE.hu@gmail.com \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=vr_qemu@t-online.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).