mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-24 02:18:20 -07:00
Code Issues Packages Projects Releases Activity

Textual updates, moved thread.h to win/plat_thread.h (and thread.c to new lnx/ folder) to clean that up.

Browse Source
This commit is contained in:
waltje
2017-06-05 01:20:51 -04:00
parent 584fa078d3
commit 2ed2e09650
18 changed files with 181 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/SOUND/sound.c
View File

@@ -8,27 +8,28 @@
*
* Sound emulation core.
*
* Version: @(#)sound.c 1.0.0 2017/05/30
* Version: @(#)sound.c 1.0.1 2017/06/04
*
* Author: Sarah Walker, <http://pcem-emulator.co.uk/>
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
* Copyright 2008-2017 Sarah Walker.
* Copyright 2016-2017 Miran Grca.
*/
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include "../ibm.h"
#include "../device.h"
#include "../timer.h"
#include "../thread.h"
#include "../cdrom.h"
#include "../win/plat_thread.h"
#include "sound.h"
#include "snd_opl.h"
#include "snd_adlib.h"
#include "snd_adlibgold.h"
/* #include "snd_pas16.h" */
#if 0
#include "snd_pas16.h"
#endif
#include "snd_sb.h"
#include "snd_sb_dsp.h"
#include "snd_wss.h"
@@ -48,26 +49,27 @@ typedef struct
static SOUND_CARD sound_cards[] =
{
{"None", "none", NULL},
{"Adlib", "adlib", &adlib_device},
{"Adlib MCA", "adlib_mca", &adlib_mca_device},
{"Sound Blaster 1.0", "sb", &sb_1_device},
{"Sound Blaster 1.5", "sb1.5", &sb_15_device},
{"Sound Blaster MCV", "sbmcv", &sb_mcv_device},
{"Sound Blaster 2.0", "sb2.0", &sb_2_device},
{"Sound Blaster Pro v1", "sbprov1", &sb_pro_v1_device},
{"Sound Blaster Pro v2", "sbprov2", &sb_pro_v2_device},
{"Sound Blaster Pro MCV", "sbpromcv", &sb_pro_mcv_device},
{"Sound Blaster 16", "sb16", &sb_16_device},
{"Sound Blaster AWE32", "sbawe32", &sb_awe32_device},
{"Adlib Gold", "adlibgold", &adgold_device},
{"Windows Sound System", "wss", &wss_device},
{ "None", "none", NULL },
{ "Adlib", "adlib", &adlib_device },
{ "Adlib MCA", "adlib_mca", &adlib_mca_device },
{ "Sound Blaster 1.0", "sb", &sb_1_device },
{ "Sound Blaster 1.5", "sb1.5", &sb_15_device },
{ "Sound Blaster MCV", "sbmcv", &sb_mcv_device },
{ "Sound Blaster 2.0", "sb2.0", &sb_2_device },
{ "Sound Blaster Pro v1", "sbprov1", &sb_pro_v1_device },
{ "Sound Blaster Pro v2", "sbprov2", &sb_pro_v2_device },
{ "Sound Blaster Pro MCV", "sbpromcv", &sb_pro_mcv_device },
{ "Sound Blaster 16", "sb16", &sb_16_device },
{ "Sound Blaster AWE32", "sbawe32", &sb_awe32_device },
{ "Adlib Gold", "adlibgold", &adgold_device },
{ "Windows Sound System", "wss", &wss_device },
#if 0
{"Pro Audio Spectrum 16", "pas16", &pas16_device},
{ "Pro Audio Spectrum 16", "pas16", &pas16_device },
#endif
{"", "", NULL}
{ "", "", NULL }
};
int sound_card_available(int card)
{
if (sound_cards[card].device)
@@ -112,7 +114,7 @@ int sound_card_get_from_internal_name(char *s)
return 0;
}
void sound_card_init()
void sound_card_init(void)
{
if (sound_cards[sound_card_current].device)
device_add(sound_cards[sound_card_current].device);
@@ -235,7 +237,7 @@ static float *outbuffer_ex;
static int cd_thread_enable = 0;
void sound_init()
void sound_init(void)
{
int i = 0;
int available_cdrom_drives = 0;
@@ -306,12 +308,12 @@ void sound_poll(void *priv)
}
}
void sound_speed_changed()
void sound_speed_changed(void)
{
sound_poll_latch = (int)((double)TIMER_USEC * (1000000.0 / 48000.0));
}
void sound_reset()
void sound_reset(void)
{
int i = 0;
@@ -330,7 +332,7 @@ void sound_reset()
}
}
void sound_cd_thread_reset()
void sound_cd_thread_reset(void)
{
int i = 0;
int available_cdrom_drives = 0;