80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Conflict resolution.

Browse Source
This commit is contained in:
OBattler
2023-09-21 20:45:09 +02:00
parent 1fa5f7c406 2b4f773381
commit 66466c1f57
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/86box/snd_opl.h
View File

@@ -38,7 +38,11 @@ typedef struct fm_drv_t {
void (*reset_buffer)(void *priv);
void (*set_do_cycles)(void *priv, int8_t do_cycles);
void *priv;
<<<<<<< HEAD
void (*generate)(void *priv, int32_t *data, uint32_t num_samples); /* daughterboard only. */
=======
void (*generate)(void *priv, int32_t *data, uint32_t num_samples); /* daughterboard only. */
>>>>>>> 2b4f7733811f8b79197d2b44a0ff7ba2553d68c9
} fm_drv_t;
extern uint8_t fm_driver_get(int chip_id, fm_drv_t *drv);