Prepare for changing audio_pcm_ops dynamically (partially revert r5422)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5435 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index e8322e584b278f5237f04a5a013ffa89a1208c99..a79cc403cb7662ab9624719c46499a6e3537dca6 100644 (file)
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -917,7 +917,7 @@ static struct audio_option alsa_options[] = {
     {NULL, 0, NULL, NULL, NULL, 0}
 };
 
-static const struct audio_pcm_ops alsa_pcm_ops = {
+static struct audio_pcm_ops alsa_pcm_ops = {
     alsa_init_out,
     alsa_fini_out,
     alsa_run_out,

diff --git a/audio/audio_int.h b/audio/audio_int.h
index d197499e18c863ce74ae95789b1256af481c4c58..d4cefb34a64c70495db063d4cd923b1522bdf526 100644 (file)
--- a/audio/audio_int.h
+++ b/audio/audio_int.h
@@ -81,7 +81,7 @@ typedef struct HWVoiceOut {
     int samples;
     LIST_HEAD (sw_out_listhead, SWVoiceOut) sw_head;
     LIST_HEAD (sw_cap_listhead, SWVoiceCap) cap_head;
-    const struct audio_pcm_ops *pcm_ops;
+    struct audio_pcm_ops *pcm_ops;
     LIST_ENTRY (HWVoiceOut) entries;
 } HWVoiceOut;
 
@@ -99,7 +99,7 @@ typedef struct HWVoiceIn {
 
     int samples;
     LIST_HEAD (sw_in_listhead, SWVoiceIn) sw_head;
-    const struct audio_pcm_ops *pcm_ops;
+    struct audio_pcm_ops *pcm_ops;
     LIST_ENTRY (HWVoiceIn) entries;
 } HWVoiceIn;
 
@@ -140,7 +140,7 @@ struct audio_driver {
     struct audio_option *options;
     void *(*init) (void);
     void (*fini) (void *);
-    const struct audio_pcm_ops *pcm_ops;
+    struct audio_pcm_ops *pcm_ops;
     int can_be_default;
     int max_voices_out;
     int max_voices_in;

diff --git a/audio/coreaudio.c b/audio/coreaudio.c
index 72fcc66f0a1e0044b808a37fb18f2a685d72c017..516bb3fad6a81585012efd06118ecf31b5bb3596 100644 (file)
--- a/audio/coreaudio.c
+++ b/audio/coreaudio.c
@@ -520,7 +520,7 @@ static struct audio_option coreaudio_options[] = {
     {NULL, 0, NULL, NULL, NULL, 0}
 };
 
-static const struct audio_pcm_ops coreaudio_pcm_ops = {
+static struct audio_pcm_ops coreaudio_pcm_ops = {
     coreaudio_init_out,
     coreaudio_fini_out,
     coreaudio_run_out,

diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c
index c8762d050b6ee5ddc4daa0910d42c94597590b18..cba8c800303a36c54fe3a73cadf74bb93c2461a9 100644 (file)
--- a/audio/dsoundaudio.c
+++ b/audio/dsoundaudio.c
@@ -1057,7 +1057,7 @@ static struct audio_option dsound_options[] = {
     {NULL, 0, NULL, NULL, NULL, 0}
 };
 
-static const struct audio_pcm_ops dsound_pcm_ops = {
+static struct audio_pcm_ops dsound_pcm_ops = {
     dsound_init_out,
     dsound_fini_out,
     dsound_run_out,

diff --git a/audio/esdaudio.c b/audio/esdaudio.c
index 6339ddadb0e75b239d71c217ce6d21e39bc6d522..f5dc1be1dc3dfc9e0b37e050cd0798b76f2329cc 100644 (file)
--- a/audio/esdaudio.c
+++ b/audio/esdaudio.c
@@ -566,7 +566,7 @@ struct audio_option qesd_options[] = {
     {NULL, 0, NULL, NULL, NULL, 0}
 };
 
-static const struct audio_pcm_ops qesd_pcm_ops = {
+static struct audio_pcm_ops qesd_pcm_ops = {
     qesd_init_out,
     qesd_fini_out,
     qesd_run_out,

diff --git a/audio/fmodaudio.c b/audio/fmodaudio.c
index 962a25f2d210009da88b4b56fcff059f6507a0ab..04f4e40b3a0fbad8317c2af3284803cf7bd7763f 100644 (file)
--- a/audio/fmodaudio.c
+++ b/audio/fmodaudio.c
@@ -657,7 +657,7 @@ static struct audio_option fmod_options[] = {
     {NULL, 0, NULL, NULL, NULL, 0}
 };
 
-static const struct audio_pcm_ops fmod_pcm_ops = {
+static struct audio_pcm_ops fmod_pcm_ops = {
     fmod_init_out,
     fmod_fini_out,
     fmod_run_out,

diff --git a/audio/noaudio.c b/audio/noaudio.c
index c907aad9488806e690a916d8ac5993f424009c4b..64695e6af9373e34affe736804ccb6a72d49efe2 100644 (file)
--- a/audio/noaudio.c
+++ b/audio/noaudio.c
@@ -145,7 +145,7 @@ static void no_audio_fini (void *opaque)
     (void) opaque;
 }
 
-static const struct audio_pcm_ops no_pcm_ops = {
+static struct audio_pcm_ops no_pcm_ops = {
     no_init_out,
     no_fini_out,
     no_run_out,

diff --git a/audio/ossaudio.c b/audio/ossaudio.c
index a821ccb5f1a126ce4b2de4209fe476db3bd3cf81..613e189db1b6ff8c8aec1f1dd31eb3e2cf43372d 100644 (file)
--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -751,7 +751,7 @@ static struct audio_option oss_options[] = {
     {NULL, 0, NULL, NULL, NULL, 0}
 };
 
-static const struct audio_pcm_ops oss_pcm_ops = {
+static struct audio_pcm_ops oss_pcm_ops = {
     oss_init_out,
     oss_fini_out,
     oss_run_out,

diff --git a/audio/paaudio.c b/audio/paaudio.c
index be9ebaec33da8f6f6fafc0c622ce257290aca2fe..8190cde92f9c50b90b23d51659e371468323e18f 100644 (file)
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -487,7 +487,7 @@ struct audio_option qpa_options[] = {
     {NULL, 0, NULL, NULL, NULL, 0}
 };
 
-static const struct audio_pcm_ops qpa_pcm_ops = {
+static struct audio_pcm_ops qpa_pcm_ops = {
     qpa_init_out,
     qpa_fini_out,
     qpa_run_out,

diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c
index 5df173616dcc340aaba23096abb37973ebdc7451..b6cfad18f5a396387d8a91c8c65f8a67bfe58056 100644 (file)
--- a/audio/sdlaudio.c
+++ b/audio/sdlaudio.c
@@ -423,7 +423,7 @@ static struct audio_option sdl_options[] = {
     {NULL, 0, NULL, NULL, NULL, 0}
 };
 
-static const struct audio_pcm_ops sdl_pcm_ops = {
+static struct audio_pcm_ops sdl_pcm_ops = {
     sdl_init_out,
     sdl_fini_out,
     sdl_run_out,

diff --git a/audio/wavaudio.c b/audio/wavaudio.c
index 85575bd3720f868d3530e16bed9a35fea6bb8725..b7a36f2c785340682ff6072324b0883824f3747e 100644 (file)
--- a/audio/wavaudio.c
+++ b/audio/wavaudio.c
@@ -233,7 +233,7 @@ static struct audio_option wav_options[] = {
     {NULL, 0, NULL, NULL, NULL, 0}
 };
 
-static const struct audio_pcm_ops wav_pcm_ops = {
+static struct audio_pcm_ops wav_pcm_ops = {
     wav_init_out,
     wav_fini_out,
     wav_run_out,