Manual merge with John's updates.

diff --git a/band.h b/band.h
index 4163ce5b940fa2e082d859aea128fd2b1c036f37..b312440eb2a3d52af42dee0a60274fcd34135c9e 100644 (file)
--- a/band.h
+++ b/band.h
@@ -87,8 +87,8 @@ typedef struct _CHANNEL CHANNEL;
 
 
 
-int band;
-gboolean displayHF;
+extern int band;
+extern gboolean displayHF;
 
 #define UK_CHANNEL_ENTRIES 11
 #define OTHER_CHANNEL_ENTRIES 5

diff --git a/midi.h b/midi.h
index 55ed5335aec5ab31cd70c62698806c7f91373929..bfe6230682c038d19724e7f356762e2ba4cb9f9b 100644 (file)
--- a/midi.h
+++ b/midi.h
@@ -199,10 +199,10 @@ struct desc {
    struct desc       *next;       // Next defined action for a controller/key with that note value (NULL for end of list)
 };
 
-struct {
+struct cmdtable{
    struct desc *desc[128];    // description for Note On/Off and ControllerChange
    struct desc *pitch;        // description for PitchChanges
-} MidiCommandsTable;
+};
 
 //
 // Layer-1 entry point, called once for all the MIDI devices

diff --git a/midi2.c b/midi2.c
index 871559c6e598be21e808af2e26a71ab6bce762a2..5bbc4ec9e9e3cd00d8169857374f4ee56ac43948 100644 (file)
--- a/midi2.c
+++ b/midi2.c
@@ -7,6 +7,7 @@
  * MIDI events into MIDI actions in the SDR console.
  */
 
+#include <gtk/gtk.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -17,6 +18,8 @@
 
 #include "midi.h"
 
+struct cmdtable MidiCommandsTable;
+
 void NewMidiEvent(enum MIDIevent event, int channel, int note, int val) {
 
     struct desc *desc;
@@ -25,7 +28,7 @@ void NewMidiEvent(enum MIDIevent event, int channel, int note, int val) {
     static struct timespec tp, last_wheel_tp={0,0};
     long delta;
 
-//fprintf(stderr,"MIDI:EVENT=%d CHAN=%d NOTE=%d VAL=%d\n",event,channel,note,val);
+//g_print("%s:EVENT=%d CHAN=%d NOTE=%d VAL=%d\n",__FUNCTION__,event,channel,note,val);
     if (event == MIDI_PITCH) {
        desc=MidiCommandsTable.pitch;
     } else {

diff --git a/mode.h b/mode.h
index e566eee5638f23f99e801e8f94dfb617fe53c945..41ce9fec7dfad9045bc6013e675149f4c0ce5d43 100644 (file)
--- a/mode.h
+++ b/mode.h
@@ -34,6 +34,6 @@
 #define modeDRM 11
 #define MODES 12
 
-char *mode_string[MODES];
+extern char *mode_string[MODES];
 
 #endif

diff --git a/new_menu.h b/new_menu.h
index 78699d2c612a4dcfdd5f4660f57d6a81040e186a..977c564e34596dfa96b6689ab0e3adfb0fab509b 100644 (file)
--- a/new_menu.h
+++ b/new_menu.h
@@ -1,4 +1,4 @@
-GtkWidget *sub_menu;
+extern GtkWidget *sub_menu;
 
 extern void new_menu();
 

diff --git a/vfo.c b/vfo.c
index 47b22fd220a33d6cff527a6e0b447e4e8d26e4aa..b5e500e69accdb6d73768eee1e2ac1b40cfab554 100644 (file)
--- a/vfo.c
+++ b/vfo.c
@@ -70,6 +70,8 @@ char *step_labels[]={"1Hz","10Hz","25Hz","50Hz","100Hz","250Hz","500Hz","1kHz","
 static GtkWidget* menu=NULL;
 static GtkWidget* band_menu=NULL;
 
+struct _vfo vfo[MAX_VFOS];
+struct _mode_settings mode_settings[MODES];
 
 static void vfo_save_bandstack() {
   BANDSTACK *bandstack=bandstack_get_bandstack(vfo[0].band);

diff --git a/vfo.h b/vfo.h
index 4204c3a34a90fe67275609812852f978c11f5170..55e0562087e306cd905cb4ffc21b2626f87f12ca 100644 (file)
--- a/vfo.h
+++ b/vfo.h
@@ -44,7 +44,9 @@ struct _vfo {
   long long lo;
   long long offset;
 
-} vfo[MAX_VFOS];
+};
+
+extern struct _vfo vfo[MAX_VFOS];
 
 //
 // Store filter and NR settings on a per-mode basis
@@ -57,8 +59,9 @@ struct _mode_settings {
   int nr2;
   int anf;
   int snb;
-} mode_settings[MODES];
+};
 
+extern struct _mode_settings mode_settings[];
 
 typedef struct _set_frequency {
   int vfo;