From 84597399525d99fe036ea93feedb7993f326de50 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 9 Jan 2019 20:30:51 +0100
Subject: Sort includes from local to standard and fix exposed issues

This order is better because it ensures that headers can stand alone and
include everything they need.  Several missing includes were exposed by this,
and are also fixed in this commit.
---
 plugins/eg-amp.lv2/amp.c               | 10 +++++-----
 plugins/eg-fifths.lv2/fifths.c         | 10 +++++-----
 plugins/eg-fifths.lv2/uris.h           |  1 +
 plugins/eg-metro.lv2/metro.c           | 14 +++++++-------
 plugins/eg-midigate.lv2/midigate.c     | 12 ++++++------
 plugins/eg-params.lv2/params.c         | 12 ++++++------
 plugins/eg-params.lv2/state_map.h      |  4 ++++
 plugins/eg-sampler.lv2/atom_sink.h     |  2 ++
 plugins/eg-sampler.lv2/peaks.h         |  5 +++--
 plugins/eg-sampler.lv2/sampler.c       | 22 +++++++++++-----------
 plugins/eg-sampler.lv2/sampler_ui.c    | 26 +++++++++++++-------------
 plugins/eg-sampler.lv2/uris.h          |  2 ++
 plugins/eg-scope.lv2/examploscope.c    | 12 ++++++------
 plugins/eg-scope.lv2/examploscope_ui.c | 28 ++++++++++++++--------------
 14 files changed, 85 insertions(+), 75 deletions(-)

(limited to 'plugins')

diff --git a/plugins/eg-amp.lv2/amp.c b/plugins/eg-amp.lv2/amp.c
index 2c65cc4..c3ba279 100644
--- a/plugins/eg-amp.lv2/amp.c
+++ b/plugins/eg-amp.lv2/amp.c
@@ -15,11 +15,6 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-/** Include standard C headers */
-#include <math.h>
-#include <stdint.h>
-#include <stdlib.h>
-
 /**
    LV2 headers are based on the URI of the specification they come from, so a
    consistent convention can be used even for unofficial extensions.  The URI
@@ -29,6 +24,11 @@
 */
 #include "lv2/core/lv2.h"
 
+/** Include standard C headers */
+#include <math.h>
+#include <stdint.h>
+#include <stdlib.h>
+
 /**
    The URI is the identifier for a plugin, and how the host associates this
    implementation in code with its description in data.  In this plugin it is
diff --git a/plugins/eg-fifths.lv2/fifths.c b/plugins/eg-fifths.lv2/fifths.c
index 9e6df7a..0abcfbd 100644
--- a/plugins/eg-fifths.lv2/fifths.c
+++ b/plugins/eg-fifths.lv2/fifths.c
@@ -15,10 +15,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include "./uris.h"
 
 #include "lv2/atom/atom.h"
 #include "lv2/atom/util.h"
@@ -29,7 +26,10 @@
 #include "lv2/midi/midi.h"
 #include "lv2/urid/urid.h"
 
-#include "./uris.h"
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 enum {
 	FIFTHS_IN  = 0,
diff --git a/plugins/eg-fifths.lv2/uris.h b/plugins/eg-fifths.lv2/uris.h
index de297dc..04b09f6 100644
--- a/plugins/eg-fifths.lv2/uris.h
+++ b/plugins/eg-fifths.lv2/uris.h
@@ -18,6 +18,7 @@
 #ifndef FIFTHS_URIS_H
 #define FIFTHS_URIS_H
 
+#include "lv2/atom/atom.h"
 #include "lv2/log/log.h"
 #include "lv2/midi/midi.h"
 #include "lv2/patch/patch.h"
diff --git a/plugins/eg-metro.lv2/metro.c b/plugins/eg-metro.lv2/metro.c
index a948d28..a7231d2 100644
--- a/plugins/eg-metro.lv2/metro.c
+++ b/plugins/eg-metro.lv2/metro.c
@@ -15,13 +15,6 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <math.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "lv2/atom/atom.h"
 #include "lv2/atom/util.h"
 #include "lv2/core/lv2.h"
@@ -31,6 +24,13 @@
 #include "lv2/time/time.h"
 #include "lv2/urid/urid.h"
 
+#include <math.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #ifndef M_PI
 #    define M_PI 3.14159265
 #endif
diff --git a/plugins/eg-midigate.lv2/midigate.c b/plugins/eg-midigate.lv2/midigate.c
index 8ec5721..70901f6 100644
--- a/plugins/eg-midigate.lv2/midigate.c
+++ b/plugins/eg-midigate.lv2/midigate.c
@@ -14,12 +14,6 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "lv2/atom/atom.h"
 #include "lv2/atom/util.h"
 #include "lv2/core/lv2.h"
@@ -29,6 +23,12 @@
 #include "lv2/midi/midi.h"
 #include "lv2/urid/urid.h"
 
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #define MIDIGATE_URI "http://lv2plug.in/plugins/eg-midigate"
 
 typedef enum {
diff --git a/plugins/eg-params.lv2/params.c b/plugins/eg-params.lv2/params.c
index b2a79d3..94d34a5 100644
--- a/plugins/eg-params.lv2/params.c
+++ b/plugins/eg-params.lv2/params.c
@@ -15,11 +15,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "state_map.h"
 
 #include "lv2/atom/atom.h"
 #include "lv2/atom/forge.h"
@@ -33,7 +29,11 @@
 #include "lv2/state/state.h"
 #include "lv2/urid/urid.h"
 
-#include "state_map.h"
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define MAX_STRING 1024
 
diff --git a/plugins/eg-params.lv2/state_map.h b/plugins/eg-params.lv2/state_map.h
index cd97a80..c80d4a2 100644
--- a/plugins/eg-params.lv2/state_map.h
+++ b/plugins/eg-params.lv2/state_map.h
@@ -15,6 +15,10 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include "lv2/atom/atom.h"
+#include "lv2/urid/urid.h"
+
+#include <stdarg.h>
 #include <stdlib.h>
 
 /** Entry in an array that serves as a dictionary of properties. */
diff --git a/plugins/eg-sampler.lv2/atom_sink.h b/plugins/eg-sampler.lv2/atom_sink.h
index ae3df30..b84ca55 100644
--- a/plugins/eg-sampler.lv2/atom_sink.h
+++ b/plugins/eg-sampler.lv2/atom_sink.h
@@ -14,6 +14,8 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include "lv2/atom/forge.h"
+
 /**
    A forge sink that writes to an atom buffer.
 
diff --git a/plugins/eg-sampler.lv2/peaks.h b/plugins/eg-sampler.lv2/peaks.h
index e3002c2..a5bd267 100644
--- a/plugins/eg-sampler.lv2/peaks.h
+++ b/plugins/eg-sampler.lv2/peaks.h
@@ -28,10 +28,11 @@
 #ifndef PEAKS_H_INCLUDED
 #define PEAKS_H_INCLUDED
 
-#include <math.h>
-
 #include "lv2/atom/forge.h"
 
+#include <math.h>
+#include <stdlib.h>
+
 #define PEAKS_URI          "http://lv2plug.in/ns/peaks#"
 #define PEAKS__PeakUpdate  PEAKS_URI "PeakUpdate"
 #define PEAKS__magnitudes  PEAKS_URI "magnitudes"
diff --git a/plugins/eg-sampler.lv2/sampler.c b/plugins/eg-sampler.lv2/sampler.c
index 369fc1e..4e6afdf 100644
--- a/plugins/eg-sampler.lv2/sampler.c
+++ b/plugins/eg-sampler.lv2/sampler.c
@@ -17,14 +17,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <math.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <sndfile.h>
+#include "atom_sink.h"
+#include "peaks.h"
+#include "uris.h"
 
 #include "lv2/atom/atom.h"
 #include "lv2/atom/forge.h"
@@ -38,9 +33,14 @@
 #include "lv2/urid/urid.h"
 #include "lv2/worker/worker.h"
 
-#include "atom_sink.h"
-#include "peaks.h"
-#include "uris.h"
+#include <sndfile.h>
+
+#include <math.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 enum {
 	SAMPLER_CONTROL = 0,
diff --git a/plugins/eg-sampler.lv2/sampler_ui.c b/plugins/eg-sampler.lv2/sampler_ui.c
index e52d679..89bca2f 100644
--- a/plugins/eg-sampler.lv2/sampler_ui.c
+++ b/plugins/eg-sampler.lv2/sampler_ui.c
@@ -15,17 +15,8 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <cairo.h>
-#include <gdk/gdk.h>
-#include <glib-object.h>
-#include <glib.h>
-#include <gobject/gclosure.h>
-#include <gtk/gtk.h>
+#include "peaks.h"
+#include "uris.h"
 
 #include "lv2/atom/atom.h"
 #include "lv2/atom/forge.h"
@@ -38,8 +29,17 @@
 #include "lv2/ui/ui.h"
 #include "lv2/urid/urid.h"
 
-#include "peaks.h"
-#include "uris.h"
+#include <cairo.h>
+#include <gdk/gdk.h>
+#include <glib-object.h>
+#include <glib.h>
+#include <gobject/gclosure.h>
+#include <gtk/gtk.h>
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define SAMPLER_UI_URI "http://lv2plug.in/plugins/eg-sampler#ui"
 
diff --git a/plugins/eg-sampler.lv2/uris.h b/plugins/eg-sampler.lv2/uris.h
index 659d400..b3639bc 100644
--- a/plugins/eg-sampler.lv2/uris.h
+++ b/plugins/eg-sampler.lv2/uris.h
@@ -24,6 +24,8 @@
 #include "lv2/patch/patch.h"
 #include "lv2/state/state.h"
 
+#include <stdio.h>
+
 #define EG_SAMPLER_URI          "http://lv2plug.in/plugins/eg-sampler"
 #define EG_SAMPLER__applySample EG_SAMPLER_URI "#applySample"
 #define EG_SAMPLER__freeSample  EG_SAMPLER_URI "#freeSample"
diff --git a/plugins/eg-scope.lv2/examploscope.c b/plugins/eg-scope.lv2/examploscope.c
index d675cb2..aa542c8 100644
--- a/plugins/eg-scope.lv2/examploscope.c
+++ b/plugins/eg-scope.lv2/examploscope.c
@@ -15,11 +15,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "./uris.h"
 
 #include "lv2/atom/atom.h"
 #include "lv2/atom/forge.h"
@@ -31,7 +27,11 @@
 #include "lv2/state/state.h"
 #include "lv2/urid/urid.h"
 
-#include "./uris.h"
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 /**
    ==== Private Plugin Instance Structure ====
diff --git a/plugins/eg-scope.lv2/examploscope_ui.c b/plugins/eg-scope.lv2/examploscope_ui.c
index 1639ae9..ce0000c 100644
--- a/plugins/eg-scope.lv2/examploscope_ui.c
+++ b/plugins/eg-scope.lv2/examploscope_ui.c
@@ -14,19 +14,7 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <assert.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <cairo.h>
-#include <gdk/gdk.h>
-#include <glib-object.h>
-#include <glib.h>
-#include <gobject/gclosure.h>
-#include <gtk/gtk.h>
+#include "./uris.h"
 
 #include "lv2/atom/atom.h"
 #include "lv2/atom/forge.h"
@@ -35,7 +23,19 @@
 #include "lv2/ui/ui.h"
 #include "lv2/urid/urid.h"
 
-#include "./uris.h"
+#include <cairo.h>
+#include <gdk/gdk.h>
+#include <glib-object.h>
+#include <glib.h>
+#include <gobject/gclosure.h>
+#include <gtk/gtk.h>
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 // Drawing area size
 #define DAWIDTH  (640)
-- 
cgit v1.2.1