Previous 15994 Revisions Next

r967 Friday 14th September, 2007 at 22:17:41 UTC by R. Belmont
[SDLMESS] Fix multisession audio initialization error.
[src/osd/sdl]sound.c

src/osd/sdl/sound.c
r966r967
3737//============================================================
3838
3939// number of samples per SDL callback
40static int sdl_xfer_samples = 512;
40#define SDL_XFER_SAMPLES   (512)
41
42static int sdl_xfer_samples = SDL_XFER_SAMPLES;
4143static int stream_in_initialized = 0;
4244static int stream_loop = 0;
4345
r966r967
4850//   LOCAL VARIABLES
4951//============================================================
5052
51static int                attenuation = 0;
53static int             attenuation = 0;
5254
53static int            initialized_audio;
55static int            initialized_audio = 0;
5456static int            buf_locked;
5557
5658static INT8            *stream_buffer;
r966r967
7577//   PROTOTYPES
7678//============================================================
7779
78static int         sdl_init(void);
79static void         sdl_kill(void);
80static int         sdl_init(running_machine *machine);
81static void         sdl_kill(running_machine *machine);
8082static int         sdl_create_buffers(void);
8183static void         sdl_destroy_buffers(void);
8284static void         sdl_cleanup_audio(running_machine *machine);
r966r967
9597   if (Machine->sample_rate != 0)
9698   {
9799      // attempt to initialize SDL
98      if (sdl_init())
100      if (sdl_init(machine))
99101         return;
100102
101103      add_exit_callback(machine, sdl_cleanup_audio);
r966r967
114116static void sdl_cleanup_audio(running_machine *machine)
115117{
116118   // if nothing to do, don't do it
117   if (Machine->sample_rate == 0)
119   if (machine->sample_rate == 0)
118120      return;
119121   
120122   // kill the buffers and dsound
121   sdl_kill();
123   sdl_kill(machine);
122124   sdl_destroy_buffers();
123125   
124126   // print out over/underflow stats
r966r967
452454//============================================================
453455//   sdl_init
454456//============================================================
455static int sdl_init(void)
457static int sdl_init(running_machine *machine)
456458{
457459   int         n_channels = 2;
458460   int         audio_latency;
459461   SDL_AudioSpec    aspec, obtained;
460462   char audio_driver[16];
461463
464   if (initialized_audio)
465   {
466      sdl_cleanup_audio(machine);
467   }
468
462469   initialized_audio = 0;
463470
471   sdl_xfer_samples = SDL_XFER_SAMPLES;
472   stream_in_initialized = 0;
473   stream_loop = 0;
474
464475   // set up the audio specs
465   aspec.freq = Machine->sample_rate;
476   aspec.freq = machine->sample_rate;
466477   aspec.format = AUDIO_S16SYS;   // keep endian independant
467478   aspec.channels = n_channels;
468479   aspec.samples = sdl_xfer_samples;
r966r967
518529//   sdl_kill
519530//============================================================
520531
521static void sdl_kill(void)
532static void sdl_kill(running_machine *machine)
522533{
523534   if (initialized_audio)
535   {
536      mame_printf_debug("sdl_kill: closing audio\n");
537
524538      SDL_CloseAudio();
539   }
525540}
526541
527542
r966r967
532547
533548static int sdl_create_buffers(void)
534549{
535#if LOG_SOUND
536   fprintf(sound_log, "sdl_create_buffers: creating stream buffer of %d bytes\n", stream_buffer_size);
537#endif
550   mame_printf_verbose("sdl_create_buffers: creating stream buffer of %d bytes\n", stream_buffer_size);
551
538552   stream_buffer = (INT8 *)malloc(stream_buffer_size);
539553   memset(stream_buffer, 0, stream_buffer_size);
540554   stream_playpos = 0;

Previous 15994 Revisions Next


© 1998-2018 The MESS Team