qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 7/7] audio: Expose 'audio/audio.h' under the include/ directory
Date: Tue,  5 May 2020 15:26:03 +0200	[thread overview]
Message-ID: <20200505132603.8575-8-f4bug@amsat.org> (raw)
In-Reply-To: <20200505132603.8575-1-f4bug@amsat.org>

The 'audio/audio.h' header is consumed by the hardware models:

  $ git grep -l audio/audio.h hw/
  hw/arm/omap2.c
  hw/arm/palm.c
  hw/arm/spitz.c
  hw/arm/z2.c
  hw/audio/ac97.c
  hw/audio/adlib.c
  hw/audio/cs4231a.c
  hw/audio/es1370.c
  hw/audio/gus.c
  hw/audio/hda-codec.c
  hw/audio/lm4549.c
  hw/audio/lm4549.h
  hw/audio/marvell_88w8618.c
  hw/audio/milkymist-ac97.c
  hw/audio/pcspk.c
  hw/audio/sb16.c
  hw/audio/wm8750.c
  hw/core/qdev-properties-system.c
  hw/input/tsc210x.c
  hw/mips/mips_fulong2e.c
  hw/usb/dev-audio.c

Move it to the public include/ directory.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 {audio => include/audio}/audio.h | 2 +-
 audio/alsaaudio.c                | 2 +-
 audio/audio.c                    | 2 +-
 audio/audio_legacy.c             | 2 +-
 audio/audio_win_int.c            | 2 +-
 audio/coreaudio.c                | 2 +-
 audio/dsoundaudio.c              | 2 +-
 audio/mixeng.c                   | 2 +-
 audio/noaudio.c                  | 2 +-
 audio/ossaudio.c                 | 2 +-
 audio/paaudio.c                  | 2 +-
 audio/sdlaudio.c                 | 2 +-
 audio/spiceaudio.c               | 2 +-
 audio/wavaudio.c                 | 2 +-
 audio/wavcapture.c               | 2 +-
 MAINTAINERS                      | 1 +
 16 files changed, 16 insertions(+), 15 deletions(-)
 rename {audio => include/audio}/audio.h (100%)

diff --git a/audio/audio.h b/include/audio/audio.h
similarity index 100%
rename from audio/audio.h
rename to include/audio/audio.h
index 7956b32d0a..b5c51d87b6 100644
--- a/audio/audio.h
+++ b/include/audio/audio.h
@@ -95,6 +95,7 @@ void AUD_log (const char *cap, const char *fmt, ...) GCC_FMT_ATTR(2, 3);
 
 void AUD_register_card (const char *name, QEMUSoundCard *card);
 void AUD_remove_card (QEMUSoundCard *card);
+
 CaptureVoiceOut *AUD_add_capture(
     AudioState *s,
     struct audsettings *as,
@@ -111,7 +112,6 @@ SWVoiceOut *AUD_open_out (
     audio_callback_fn callback_fn,
     struct audsettings *settings
     );
-
 void AUD_close_out (QEMUSoundCard *card, SWVoiceOut *sw);
 size_t AUD_write (SWVoiceOut *sw, const void *pcm_buf, size_t size);
 int  AUD_get_buffer_size_out (SWVoiceOut *sw);
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index 7692ee5524..72b0a37dad 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -26,7 +26,7 @@
 #include <alsa/asoundlib.h>
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
-#include "audio.h"
+#include "audio/audio.h"
 #include "trace.h"
 
 #pragma GCC diagnostic ignored "-Waddress"
diff --git a/audio/audio.c b/audio/audio.c
index 2672cf0885..d0fb794378 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "audio.h"
+#include "audio/audio.h"
 #include "migration/vmstate.h"
 #include "monitor/monitor.h"
 #include "qemu/timer.h"
diff --git a/audio/audio_legacy.c b/audio/audio_legacy.c
index ebd7d9fa0d..4321a84b47 100644
--- a/audio/audio_legacy.c
+++ b/audio/audio_legacy.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include "audio.h"
+#include "audio/audio.h"
 #include "audio_int.h"
 #include "qemu/cutils.h"
 #include "qemu/timer.h"
diff --git a/audio/audio_win_int.c b/audio/audio_win_int.c
index b938fd667b..cd8cde527b 100644
--- a/audio/audio_win_int.c
+++ b/audio/audio_win_int.c
@@ -7,7 +7,7 @@
 #include <windows.h>
 #include <mmsystem.h>
 
-#include "audio.h"
+#include "audio/audio.h"
 #include "audio_int.h"
 #include "audio_win_int.h"
 
diff --git a/audio/coreaudio.c b/audio/coreaudio.c
index 5258871c9c..f1656bb98b 100644
--- a/audio/coreaudio.c
+++ b/audio/coreaudio.c
@@ -27,7 +27,7 @@
 #include <pthread.h>            /* pthread_X */
 
 #include "qemu/module.h"
-#include "audio.h"
+#include "audio/audio.h"
 
 #define AUDIO_CAP "coreaudio"
 #include "audio_int.h"
diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c
index bba6bafda4..3c0b4f0f9b 100644
--- a/audio/dsoundaudio.c
+++ b/audio/dsoundaudio.c
@@ -27,7 +27,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "audio.h"
+#include "audio/audio.h"
 
 #define AUDIO_CAP "dsound"
 #include "audio_int.h"
diff --git a/audio/mixeng.c b/audio/mixeng.c
index 75f000e49f..5a47594fa0 100644
--- a/audio/mixeng.c
+++ b/audio/mixeng.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu/bswap.h"
 #include "qemu/error-report.h"
-#include "audio.h"
+#include "audio/audio.h"
 
 #define AUDIO_CAP "mixeng"
 #include "audio_int.h"
diff --git a/audio/noaudio.c b/audio/noaudio.c
index 21995c7d9b..e6a5e35060 100644
--- a/audio/noaudio.c
+++ b/audio/noaudio.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu/host-utils.h"
 #include "qemu/module.h"
-#include "audio.h"
+#include "audio/audio.h"
 #include "qemu/timer.h"
 
 #define AUDIO_CAP "noaudio"
diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index 97bde0256e..7dddbd11d1 100644
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -28,7 +28,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
 #include "qemu/host-utils.h"
-#include "audio.h"
+#include "audio/audio.h"
 #include "trace.h"
 
 #define AUDIO_CAP "oss"
diff --git a/audio/paaudio.c b/audio/paaudio.c
index b50df15ea7..63b97c93df 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -3,7 +3,7 @@
 #include "qemu/osdep.h"
 #include "qemu/module.h"
 #include "qemu-common.h"
-#include "audio.h"
+#include "audio/audio.h"
 #include "qapi/opts-visitor.h"
 
 #include <pulse/pulseaudio.h>
diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c
index 9d740186cc..4c4d58457d 100644
--- a/audio/sdlaudio.c
+++ b/audio/sdlaudio.c
@@ -26,7 +26,7 @@
 #include <SDL.h>
 #include <SDL_thread.h>
 #include "qemu/module.h"
-#include "audio.h"
+#include "audio/audio.h"
 
 #ifndef _WIN32
 #ifdef __sun__
diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c
index 0aa6a0a671..5802f60d1d 100644
--- a/audio/spiceaudio.c
+++ b/audio/spiceaudio.c
@@ -25,7 +25,7 @@
 #include "ui/qemu-spice.h"
 
 #define AUDIO_CAP "spice"
-#include "audio.h"
+#include "audio/audio.h"
 #include "audio_int.h"
 
 #if SPICE_INTERFACE_PLAYBACK_MAJOR > 1 || SPICE_INTERFACE_PLAYBACK_MINOR >= 3
diff --git a/audio/wavaudio.c b/audio/wavaudio.c
index 64d7142a97..4241f1ad96 100644
--- a/audio/wavaudio.c
+++ b/audio/wavaudio.c
@@ -27,7 +27,7 @@
 #include "qemu/module.h"
 #include "qemu/timer.h"
 #include "qapi/opts-visitor.h"
-#include "audio.h"
+#include "audio/audio.h"
 
 #define AUDIO_CAP "wav"
 #include "audio_int.h"
diff --git a/audio/wavcapture.c b/audio/wavcapture.c
index 17e87ed6f4..c0ad928e80 100644
--- a/audio/wavcapture.c
+++ b/audio/wavcapture.c
@@ -2,7 +2,7 @@
 #include "monitor/monitor.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-#include "audio.h"
+#include "audio/audio.h"
 
 typedef struct {
     FILE *f;
diff --git a/MAINTAINERS b/MAINTAINERS
index 8aa8efaf1d..b332611717 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1927,6 +1927,7 @@ M: Gerd Hoffmann <kraxel@redhat.com>
 S: Maintained
 F: audio/
 F: hw/audio/
+F: include/audio/
 F: include/hw/audio/
 F: tests/qtest/ac97-test.c
 F: tests/qtest/es1370-test.c
-- 
2.21.3



  parent reply	other threads:[~2020-05-05 13:29 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 ` [PATCH 3/7] audio: Move advance() helper to 'audio_int.h' Philippe Mathieu-Daudé
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 ` Philippe Mathieu-Daudé [this message]
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-8-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).