From 15da0022bb4d89b4a57ab5f5d6e485fcc64b51a0 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sat, 7 Oct 2017 16:45:54 +0200
Subject: [PATCH] Fixed a few warnings and the FluidSynth device stuff.

---
 src/floppy/floppy_json.c     | 4 ++--
 src/sound/midi_fluidsynth.c  | 4 +++-
 src/video/vid_incolor.c      | 1 -
 src/video/vid_olivetti_m24.c | 3 +--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/floppy/floppy_json.c b/src/floppy/floppy_json.c
index 659e82776..562a305a0 100644
--- a/src/floppy/floppy_json.c
+++ b/src/floppy/floppy_json.c
@@ -8,7 +8,7 @@
  *
  *		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>
  *		Copyright 2017 Fred N. van Kempen.
@@ -28,7 +28,7 @@
 
 #define NTRACKS			256
 #define NSIDES			2
-#define NSECTORS		128
+#define NSECTORS		256
 
 
 typedef struct {
diff --git a/src/sound/midi_fluidsynth.c b/src/sound/midi_fluidsynth.c
index fa83d3d45..69bf21b17 100644
--- a/src/sound/midi_fluidsynth.c
+++ b/src/sound/midi_fluidsynth.c
@@ -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);
 }
 
-void* fluidsynth_init(void)
+void* fluidsynth_init(device_t *info)
 {
         fluidsynth_t* data = &fsdev;
         memset(data, 0, sizeof(fluidsynth_t));
@@ -536,8 +536,10 @@ device_t fluidsynth_device =
 {
         "FluidSynth",
         0,
+        0,
         fluidsynth_init,
         fluidsynth_close,
+        NULL,
         fluidsynth_available,
         NULL,
         NULL,
diff --git a/src/video/vid_incolor.c b/src/video/vid_incolor.c
index 3aca991f7..2d3df7514 100644
--- a/src/video/vid_incolor.c
+++ b/src/video/vid_incolor.c
@@ -1067,7 +1067,6 @@ device_t incolor_device =
 	NULL,
         NULL,
         incolor_speed_changed,
-        NULL,
 	NULL,
 	NULL,
         NULL
diff --git a/src/video/vid_olivetti_m24.c b/src/video/vid_olivetti_m24.c
index e26fe499c..a0bee6c2e 100644
--- a/src/video/vid_olivetti_m24.c
+++ b/src/video/vid_olivetti_m24.c
@@ -492,6 +492,5 @@ device_t m24_device =
         m24_init,
         m24_close,
 	NULL, NULL, m24_speed_changed,
-        NULL, NULL, NULL, NULL,
-        NULL
+        NULL, NULL, NULL
 };