Fixed a few warnings and the FluidSynth device stuff.

This commit is contained in:
OBattler
2017-10-07 16:45:54 +02:00
parent 97ab6234d4
commit 15da0022bb
4 changed files with 6 additions and 6 deletions

View File

@@ -8,7 +8,7 @@
* *
* Implementation of the PCjs JSON floppy image format. * Implementation of the PCjs JSON floppy image format.
* *
* Version: @(#)floppy_json.c 1.0.3 2017/09/24 * Version: @(#)floppy_json.c 1.0.4 2017/10/07
* *
* Author: Fred N. van Kempen, <decwiz@yahoo.com> * Author: Fred N. van Kempen, <decwiz@yahoo.com>
* Copyright 2017 Fred N. van Kempen. * Copyright 2017 Fred N. van Kempen.
@@ -28,7 +28,7 @@
#define NTRACKS 256 #define NTRACKS 256
#define NSIDES 2 #define NSIDES 2
#define NSECTORS 128 #define NSECTORS 256
typedef struct { typedef struct {

View File

@@ -216,7 +216,7 @@ void fluidsynth_sysex(uint8_t* data, unsigned int len)
f_fluid_synth_sysex(d->synth, (const char *) data, len, 0, 0, 0, 0); f_fluid_synth_sysex(d->synth, (const char *) data, len, 0, 0, 0, 0);
} }
void* fluidsynth_init(void) void* fluidsynth_init(device_t *info)
{ {
fluidsynth_t* data = &fsdev; fluidsynth_t* data = &fsdev;
memset(data, 0, sizeof(fluidsynth_t)); memset(data, 0, sizeof(fluidsynth_t));
@@ -536,8 +536,10 @@ device_t fluidsynth_device =
{ {
"FluidSynth", "FluidSynth",
0, 0,
0,
fluidsynth_init, fluidsynth_init,
fluidsynth_close, fluidsynth_close,
NULL,
fluidsynth_available, fluidsynth_available,
NULL, NULL,
NULL, NULL,

View File

@@ -1069,6 +1069,5 @@ device_t incolor_device =
incolor_speed_changed, incolor_speed_changed,
NULL, NULL,
NULL, NULL,
NULL,
NULL NULL
}; };

View File

@@ -492,6 +492,5 @@ device_t m24_device =
m24_init, m24_init,
m24_close, m24_close,
NULL, NULL, m24_speed_changed, NULL, NULL, m24_speed_changed,
NULL, NULL, NULL, NULL, NULL, NULL, NULL
NULL
}; };