ppc/mmu-hash64: Remove duplicated #include statement

[qemu.git] / audio / wavaudio.c

diff --git a/audio/wavaudio.c b/audio/wavaudio.c
index c4aa60ea88c70944052deee42944f4126e62a9fc..341eec3121d8952db2de4cfc0da7501d36507347 100644 (file)
--- a/audio/wavaudio.c
+++ b/audio/wavaudio.c
@@ -21,8 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */

-#include "hw/hw.h"
-#include "qemu-timer.h"
+#include "qemu/osdep.h"
+#include "qemu/host-utils.h"
+#include "qemu/timer.h"

 #include "audio.h"
 
 #define AUDIO_CAP "wav"
 #include "audio.h"
 
 #define AUDIO_CAP "wav"


@@ -30,31 +31,27 @@
 
 typedef struct WAVVoiceOut {
     HWVoiceOut hw;
 
 typedef struct WAVVoiceOut {
     HWVoiceOut hw;

-    QEMUFile *f;
+    FILE *f;

     int64_t old_ticks;
     void *pcm_buf;
     int total_samples;
 } WAVVoiceOut;
 
     int64_t old_ticks;
     void *pcm_buf;
     int total_samples;
 } WAVVoiceOut;
 

-static struct {
+typedef struct {

     struct audsettings settings;
     const char *wav_path;
     struct audsettings settings;
     const char *wav_path;

-} conf = {
-    .settings.freq      = 44100,
-    .settings.nchannels = 2,
-    .settings.fmt       = AUD_FMT_S16,
-    .wav_path           = "qemu.wav"
-};
+} WAVConf;

 
 

-static int wav_run_out (HWVoiceOut *hw)
+static int wav_run_out (HWVoiceOut *hw, int live)

 {
     WAVVoiceOut *wav = (WAVVoiceOut *) hw;
 {
     WAVVoiceOut *wav = (WAVVoiceOut *) hw;

-    int rpos, live, decr, samples;
+    int rpos, decr, samples;

     uint8_t *dst;
     struct st_sample *src;
     uint8_t *dst;
     struct st_sample *src;

-    int64_t now = qemu_get_clock (vm_clock);
+    int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);

     int64_t ticks = now - wav->old_ticks;
     int64_t ticks = now - wav->old_ticks;

-    int64_t bytes = (ticks * hw->info.bytes_per_second) / ticks_per_sec;
+    int64_t bytes =
+        muldiv64(ticks, hw->info.bytes_per_second, NANOSECONDS_PER_SECOND);

 
     if (bytes > INT_MAX) {
         samples = INT_MAX >> hw->info.shift;
 
     if (bytes > INT_MAX) {
         samples = INT_MAX >> hw->info.shift;


@@ -63,11 +60,6 @@ static int wav_run_out (HWVoiceOut *hw)
         samples = bytes >> hw->info.shift;
     }
 
         samples = bytes >> hw->info.shift;
     }
 

-    live = audio_pcm_hw_get_live_out (hw);
-    if (!live) {
-        return 0;
-    }
-

     wav->old_ticks = now;
     decr = audio_MIN (live, samples);
     samples = decr;
     wav->old_ticks = now;
     decr = audio_MIN (live, samples);
     samples = decr;


@@ -80,7 +72,10 @@ static int wav_run_out (HWVoiceOut *hw)
         dst = advance (wav->pcm_buf, rpos << hw->info.shift);
 
         hw->clip (dst, src, convert_samples);
         dst = advance (wav->pcm_buf, rpos << hw->info.shift);
 
         hw->clip (dst, src, convert_samples);

-        qemu_put_buffer (wav->f, dst, convert_samples << hw->info.shift);
+        if (fwrite (dst, convert_samples << hw->info.shift, 1, wav->f) != 1) {
+            dolog ("wav_run_out: fwrite of %d bytes failed\nReaons: %s\n",
+                   convert_samples << hw->info.shift, strerror (errno));
+        }

 
         rpos = (rpos + convert_samples) % hw->samples;
         samples -= convert_samples;
 
         rpos = (rpos + convert_samples) % hw->samples;
         samples -= convert_samples;


@@ -106,7 +101,8 @@ static void le_store (uint8_t *buf, uint32_t val, int len)
     }
 }
 
     }
 }
 

-static int wav_init_out (HWVoiceOut *hw, struct audsettings *as)
+static int wav_init_out(HWVoiceOut *hw, struct audsettings *as,
+                        void *drv_opaque)

 {
     WAVVoiceOut *wav = (WAVVoiceOut *) hw;
     int bits16 = 0, stereo = 0;
 {
     WAVVoiceOut *wav = (WAVVoiceOut *) hw;
     int bits16 = 0, stereo = 0;


@@ -116,9 +112,8 @@ static int wav_init_out (HWVoiceOut *hw, struct audsettings *as)
         0x02, 0x00, 0x44, 0xac, 0x00, 0x00, 0x10, 0xb1, 0x02, 0x00, 0x04,
         0x00, 0x10, 0x00, 0x64, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00, 0x00
     };
         0x02, 0x00, 0x44, 0xac, 0x00, 0x00, 0x10, 0xb1, 0x02, 0x00, 0x04,
         0x00, 0x10, 0x00, 0x64, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00, 0x00
     };

-    struct audsettings wav_as = conf.settings;
-
-    (void) as;
+    WAVConf *conf = drv_opaque;
+    struct audsettings wav_as = conf->settings;

 
     stereo = wav_as.nchannels == 2;
     switch (wav_as.fmt) {
 
     stereo = wav_as.nchannels == 2;
     switch (wav_as.fmt) {


@@ -156,16 +151,20 @@ static int wav_init_out (HWVoiceOut *hw, struct audsettings *as)
     le_store (hdr + 28, hw->info.freq << (bits16 + stereo), 4);
     le_store (hdr + 32, 1 << (bits16 + stereo), 2);
 
     le_store (hdr + 28, hw->info.freq << (bits16 + stereo), 4);
     le_store (hdr + 32, 1 << (bits16 + stereo), 2);
 

-    wav->f = qemu_fopen (conf.wav_path, "wb");
+    wav->f = fopen (conf->wav_path, "wb");

     if (!wav->f) {
         dolog ("Failed to open wave file `%s'\nReason: %s\n",
     if (!wav->f) {
         dolog ("Failed to open wave file `%s'\nReason: %s\n",

-               conf.wav_path, strerror (errno));
-        qemu_free (wav->pcm_buf);
+               conf->wav_path, strerror (errno));
+        g_free (wav->pcm_buf);

         wav->pcm_buf = NULL;
         return -1;
     }
 
         wav->pcm_buf = NULL;
         return -1;
     }
 

-    qemu_put_buffer (wav->f, hdr, sizeof (hdr));
+    if (fwrite (hdr, sizeof (hdr), 1, wav->f) != 1) {
+        dolog ("wav_init_out: failed to write header\nReason: %s\n",
+               strerror(errno));
+        return -1;
+    }

     return 0;
 }
 
     return 0;
 }
 


@@ -184,16 +183,35 @@ static void wav_fini_out (HWVoiceOut *hw)
     le_store (rlen, rifflen, 4);
     le_store (dlen, datalen, 4);
 
     le_store (rlen, rifflen, 4);
     le_store (dlen, datalen, 4);
 

-    qemu_fseek (wav->f, 4, SEEK_SET);
-    qemu_put_buffer (wav->f, rlen, 4);
-
-    qemu_fseek (wav->f, 32, SEEK_CUR);
-    qemu_put_buffer (wav->f, dlen, 4);
+    if (fseek (wav->f, 4, SEEK_SET)) {
+        dolog ("wav_fini_out: fseek to rlen failed\nReason: %s\n",
+               strerror(errno));
+        goto doclose;
+    }
+    if (fwrite (rlen, 4, 1, wav->f) != 1) {
+        dolog ("wav_fini_out: failed to write rlen\nReason: %s\n",
+               strerror (errno));
+        goto doclose;
+    }
+    if (fseek (wav->f, 32, SEEK_CUR)) {
+        dolog ("wav_fini_out: fseek to dlen failed\nReason: %s\n",
+               strerror (errno));
+        goto doclose;
+    }
+    if (fwrite (dlen, 4, 1, wav->f) != 1) {
+        dolog ("wav_fini_out: failed to write dlen\nReaons: %s\n",
+               strerror (errno));
+        goto doclose;
+    }

 
 

-    qemu_fclose (wav->f);
+ doclose:
+    if (fclose (wav->f))  {
+        dolog ("wav_fini_out: fclose %p failed\nReason: %s\n",
+               wav->f, strerror (errno));
+    }

     wav->f = NULL;
 
     wav->f = NULL;
 

-    qemu_free (wav->pcm_buf);
+    g_free (wav->pcm_buf);

     wav->pcm_buf = NULL;
 }
 
     wav->pcm_buf = NULL;
 }
 


@@ -204,40 +222,49 @@ static int wav_ctl_out (HWVoiceOut *hw, int cmd, ...)
     return 0;
 }
 
     return 0;
 }
 

+static WAVConf glob_conf = {
+    .settings.freq      = 44100,
+    .settings.nchannels = 2,
+    .settings.fmt       = AUD_FMT_S16,
+    .wav_path           = "qemu.wav"
+};
+

 static void *wav_audio_init (void)
 {
 static void *wav_audio_init (void)
 {

-    return &conf;
+    WAVConf *conf = g_malloc(sizeof(WAVConf));
+    *conf = glob_conf;
+    return conf;

 }
 
 static void wav_audio_fini (void *opaque)
 {
 }
 
 static void wav_audio_fini (void *opaque)
 {

-    (void) opaque;

     ldebug ("wav_fini");
     ldebug ("wav_fini");

+    g_free(opaque);

 }
 
 static struct audio_option wav_options[] = {
     {
         .name  = "FREQUENCY",
         .tag   = AUD_OPT_INT,
 }
 
 static struct audio_option wav_options[] = {
     {
         .name  = "FREQUENCY",
         .tag   = AUD_OPT_INT,

-        .valp  = &conf.settings.freq,
+        .valp  = &glob_conf.settings.freq,

         .descr = "Frequency"
     },
     {
         .name  = "FORMAT",
         .tag   = AUD_OPT_FMT,
         .descr = "Frequency"
     },
     {
         .name  = "FORMAT",
         .tag   = AUD_OPT_FMT,

-        .valp  = &conf.settings.fmt,
+        .valp  = &glob_conf.settings.fmt,

         .descr = "Format"
     },
     {
         .name  = "DAC_FIXED_CHANNELS",
         .tag   = AUD_OPT_INT,
         .descr = "Format"
     },
     {
         .name  = "DAC_FIXED_CHANNELS",
         .tag   = AUD_OPT_INT,

-        .valp  = &conf.settings.nchannels,
+        .valp  = &glob_conf.settings.nchannels,

         .descr = "Number of channels (1 - mono, 2 - stereo)"
     },
     {
         .name  = "PATH",
         .tag   = AUD_OPT_STR,
         .descr = "Number of channels (1 - mono, 2 - stereo)"
     },
     {
         .name  = "PATH",
         .tag   = AUD_OPT_STR,

-        .valp  = &conf.wav_path,
+        .valp  = &glob_conf.wav_path,

         .descr = "Path to wave file"
     },
     { /* End of list */ }
         .descr = "Path to wave file"
     },
     { /* End of list */ }