5 files changed, 194 insertions, 243 deletions

diff --git a/plugins/eg-fifths.lv2/fifths.c b/plugins/eg-fifths.lv2/fifths.c
index 5782417..22d5f8a 100644
--- a/plugins/eg-fifths.lv2/fifths.c
+++ b/plugins/eg-fifths.lv2/fifths.c
@@ -1,70 +1,51 @@
-/*
-  LV2 Fifths Example Plugin
-  Copyright 2014-2016 David Robillard <d@drobilla.net>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-#include "./uris.h"
-
-#include "lv2/atom/atom.h"
-#include "lv2/atom/util.h"
-#include "lv2/core/lv2.h"
-#include "lv2/core/lv2_util.h"
-#include "lv2/log/log.h"
-#include "lv2/log/logger.h"
-#include "lv2/midi/midi.h"
-#include "lv2/urid/urid.h"
+// Copyright 2014-2016 David Robillard <d@drobilla.net>
+// SPDX-License-Identifier: ISC
+
+#include "uris.h"
+
+#include <lv2/atom/atom.h>
+#include <lv2/atom/util.h>
+#include <lv2/core/lv2.h>
+#include <lv2/core/lv2_util.h>
+#include <lv2/log/log.h>
+#include <lv2/log/logger.h>
+#include <lv2/midi/midi.h>
+#include <lv2/urid/urid.h>
 
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-enum {
-	FIFTHS_IN  = 0,
-	FIFTHS_OUT = 1
-};
+enum { FIFTHS_IN = 0, FIFTHS_OUT = 1 };
 
 typedef struct {
-	// Features
-	LV2_URID_Map*  map;
-	LV2_Log_Logger logger;
+  // Features
+  LV2_URID_Map*  map;
+  LV2_Log_Logger logger;
 
-	// Ports
-	const LV2_Atom_Sequence* in_port;
-	LV2_Atom_Sequence*       out_port;
+  // Ports
+  const LV2_Atom_Sequence* in_port;
+  LV2_Atom_Sequence*       out_port;
 
-	// URIs
-	FifthsURIs uris;
+  // URIs
+  FifthsURIs uris;
 } Fifths;
 
 static void
-connect_port(LV2_Handle instance,
-             uint32_t   port,
-             void*      data)
+connect_port(LV2_Handle instance, uint32_t port, void* data)
 {
-	Fifths* self = (Fifths*)instance;
-	switch (port) {
-	case FIFTHS_IN:
-		self->in_port = (const LV2_Atom_Sequence*)data;
-		break;
-	case FIFTHS_OUT:
-		self->out_port = (LV2_Atom_Sequence*)data;
-		break;
-	default:
-		break;
-	}
+  Fifths* self = (Fifths*)instance;
+  switch (port) {
+  case FIFTHS_IN:
+    self->in_port = (const LV2_Atom_Sequence*)data;
+    break;
+  case FIFTHS_OUT:
+    self->out_port = (LV2_Atom_Sequence*)data;
+    break;
+  default:
+    break;
+  }
 }
 
 static LV2_Handle
@@ -73,121 +54,114 @@ instantiate(const LV2_Descriptor*     descriptor,
             const char*               path,
             const LV2_Feature* const* features)
 {
-	// Allocate and initialise instance structure.
-	Fifths* self = (Fifths*)calloc(1, sizeof(Fifths));
-	if (!self) {
-		return NULL;
-	}
-
-	// Scan host features for URID map
-	const char*  missing = lv2_features_query(
-		features,
-		LV2_LOG__log,  &self->logger.log, false,
-		LV2_URID__map, &self->map,        true,
-		NULL);
-	lv2_log_logger_set_map(&self->logger, self->map);
-	if (missing) {
-		lv2_log_error(&self->logger, "Missing feature <%s>\n", missing);
-		free(self);
-		return NULL;
-	}
-
-	map_fifths_uris(self->map, &self->uris);
-
-	return (LV2_Handle)self;
+  // Allocate and initialise instance structure.
+  Fifths* self = (Fifths*)calloc(1, sizeof(Fifths));
+  if (!self) {
+    return NULL;
+  }
+
+  // Scan host features for URID map
+  // clang-format off
+  const char*  missing = lv2_features_query(
+    features,
+    LV2_LOG__log,  &self->logger.log, false,
+    LV2_URID__map, &self->map,        true,
+    NULL);
+  // clang-format on
+
+  lv2_log_logger_set_map(&self->logger, self->map);
+  if (missing) {
+    lv2_log_error(&self->logger, "Missing feature <%s>\n", missing);
+    free(self);
+    return NULL;
+  }
+
+  map_fifths_uris(self->map, &self->uris);
+
+  return (LV2_Handle)self;
 }
 
 static void
 cleanup(LV2_Handle instance)
 {
-	free(instance);
+  free(instance);
 }
 
 static void
-run(LV2_Handle instance,
-    uint32_t   sample_count)
+run(LV2_Handle instance, uint32_t sample_count)
 {
-	Fifths*     self = (Fifths*)instance;
-	FifthsURIs* uris = &self->uris;
-
-	// Struct for a 3 byte MIDI event, used for writing notes
-	typedef struct {
-		LV2_Atom_Event event;
-		uint8_t        msg[3];
-	} MIDINoteEvent;
-
-	// Initially self->out_port contains a Chunk with size set to capacity
-
-	// Get the capacity
-	const uint32_t out_capacity = self->out_port->atom.size;
-
-	// Write an empty Sequence header to the output
-	lv2_atom_sequence_clear(self->out_port);
-	self->out_port->atom.type = self->in_port->atom.type;
-
-	// Read incoming events
-	LV2_ATOM_SEQUENCE_FOREACH(self->in_port, ev) {
-		if (ev->body.type == uris->midi_Event) {
-			const uint8_t* const msg = (const uint8_t*)LV2_ATOM_BODY_CONST(ev);
-			switch (lv2_midi_message_type(msg)) {
-			case LV2_MIDI_MSG_NOTE_ON:
-			case LV2_MIDI_MSG_NOTE_OFF:
-				// Forward note to output
-				lv2_atom_sequence_append_event(
-					self->out_port, out_capacity, ev);
-
-				if (msg[1] <= 127 - 7) {
-					// Make a note one 5th (7 semitones) higher than input
-					MIDINoteEvent fifth;
-
-					// Could simply do fifth.event = *ev here instead...
-					fifth.event.time.frames = ev->time.frames;  // Same time
-					fifth.event.body.type   = ev->body.type;    // Same type
-					fifth.event.body.size   = ev->body.size;    // Same size
-
-					fifth.msg[0] = msg[0];      // Same status
-					fifth.msg[1] = msg[1] + 7;  // Pitch up 7 semitones
-					fifth.msg[2] = msg[2];      // Same velocity
-
-					// Write 5th event
-					lv2_atom_sequence_append_event(
-						self->out_port, out_capacity, &fifth.event);
-				}
-				break;
-			default:
-				// Forward all other MIDI events directly
-				lv2_atom_sequence_append_event(
-					self->out_port, out_capacity, ev);
-				break;
-			}
-		}
-	}
+  Fifths*           self = (Fifths*)instance;
+  const FifthsURIs* uris = &self->uris;
+
+  // Struct for a 3 byte MIDI event, used for writing notes
+  typedef struct {
+    LV2_Atom_Event event;
+    uint8_t        msg[3];
+  } MIDINoteEvent;
+
+  // Initially self->out_port contains a Chunk with size set to capacity
+
+  // Get the capacity
+  const uint32_t out_capacity = self->out_port->atom.size;
+
+  // Write an empty Sequence header to the output
+  lv2_atom_sequence_clear(self->out_port);
+  self->out_port->atom.type = self->in_port->atom.type;
+
+  // Read incoming events
+  LV2_ATOM_SEQUENCE_FOREACH (self->in_port, ev) {
+    if (ev->body.type == uris->midi_Event) {
+      const uint8_t* const msg = (const uint8_t*)(ev + 1);
+      switch (lv2_midi_message_type(msg)) {
+      case LV2_MIDI_MSG_NOTE_ON:
+      case LV2_MIDI_MSG_NOTE_OFF:
+        // Forward note to output
+        lv2_atom_sequence_append_event(self->out_port, out_capacity, ev);
+
+        if (msg[1] <= 127 - 7) {
+          // Make a note one 5th (7 semitones) higher than input
+          MIDINoteEvent fifth;
+
+          // Could simply do fifth.event = *ev here instead...
+          fifth.event.time.frames = ev->time.frames; // Same time
+          fifth.event.body.type   = ev->body.type;   // Same type
+          fifth.event.body.size   = ev->body.size;   // Same size
+
+          fifth.msg[0] = msg[0];     // Same status
+          fifth.msg[1] = msg[1] + 7; // Pitch up 7 semitones
+          fifth.msg[2] = msg[2];     // Same velocity
+
+          // Write 5th event
+          lv2_atom_sequence_append_event(
+            self->out_port, out_capacity, &fifth.event);
+        }
+        break;
+      default:
+        // Forward all other MIDI events directly
+        lv2_atom_sequence_append_event(self->out_port, out_capacity, ev);
+        break;
+      }
+    }
+  }
 }
 
 static const void*
 extension_data(const char* uri)
 {
-	return NULL;
+  return NULL;
 }
 
-static const LV2_Descriptor descriptor = {
-	EG_FIFTHS_URI,
-	instantiate,
-	connect_port,
-	NULL,  // activate,
-	run,
-	NULL,  // deactivate,
-	cleanup,
-	extension_data
-};
-
-LV2_SYMBOL_EXPORT
-const LV2_Descriptor* lv2_descriptor(uint32_t index)
+static const LV2_Descriptor descriptor = {EG_FIFTHS_URI,
+                                          instantiate,
+                                          connect_port,
+                                          NULL, // activate,
+                                          run,
+                                          NULL, // deactivate,
+                                          cleanup,
+                                          extension_data};
+
+LV2_SYMBOL_EXPORT const LV2_Descriptor*
+lv2_descriptor(uint32_t index)
 {
-	switch (index) {
-	case 0:
-		return &descriptor;
-	default:
-		return NULL;
-	}
+  return index == 0 ? &descriptor : NULL;
 }
diff --git a/plugins/eg-fifths.lv2/meson.build b/plugins/eg-fifths.lv2/meson.build
new file mode 100644
index 0000000..d0cbc6a
--- /dev/null
+++ b/plugins/eg-fifths.lv2/meson.build
@@ -0,0 +1,42 @@
+# Copyright 2022 David Robillard <d@drobilla.net>
+# SPDX-License-Identifier: 0BSD OR ISC
+
+plugin_sources = files('fifths.c')
+bundle_name = 'eg-fifths.lv2'
+data_filenames = ['manifest.ttl.in', 'fifths.ttl']
+
+module = shared_library(
+  'fifths',
+  plugin_sources,
+  c_args: c_suppressions,
+  dependencies: [lv2_dep, m_dep],
+  gnu_symbol_visibility: 'hidden',
+  implicit_include_directories: false,
+  install: true,
+  install_dir: lv2dir / bundle_name,
+  name_prefix: '',
+)
+
+config = configuration_data(
+  {
+    'LIB_EXT': '.' + module.full_path().split('.')[-1],
+  },
+)
+
+foreach filename : data_filenames
+  if filename.endswith('.in')
+    configure_file(
+      configuration: config,
+      input: files(filename),
+      install_dir: lv2dir / bundle_name,
+      output: filename.substring(0, -3),
+    )
+  else
+    configure_file(
+      copy: true,
+      input: files(filename),
+      install_dir: lv2dir / bundle_name,
+      output: filename,
+    )
+  endif
+endforeach
diff --git a/plugins/eg-fifths.lv2/uris.h b/plugins/eg-fifths.lv2/uris.h
index 04b09f6..f32a6bd 100644
--- a/plugins/eg-fifths.lv2/uris.h
+++ b/plugins/eg-fifths.lv2/uris.h
@@ -1,55 +1,40 @@
-/*
-  LV2 Fifths Example Plugin
-  Copyright 2014-2015 David Robillard <d@drobilla.net>
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted, provided that the above
-  copyright notice and this permission notice appear in all copies.
-
-  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
+// Copyright 2014-2015 David Robillard <d@drobilla.net>
+// SPDX-License-Identifier: ISC
 
 #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"
-#include "lv2/state/state.h"
+#include <lv2/atom/atom.h>
+#include <lv2/midi/midi.h>
+#include <lv2/patch/patch.h>
+#include <lv2/urid/urid.h>
 
 #define EG_FIFTHS_URI "http://lv2plug.in/plugins/eg-fifths"
 
 typedef struct {
-	LV2_URID atom_Path;
-	LV2_URID atom_Resource;
-	LV2_URID atom_Sequence;
-	LV2_URID atom_URID;
-	LV2_URID atom_eventTransfer;
-	LV2_URID midi_Event;
-	LV2_URID patch_Set;
-	LV2_URID patch_property;
-	LV2_URID patch_value;
+  LV2_URID atom_Path;
+  LV2_URID atom_Resource;
+  LV2_URID atom_Sequence;
+  LV2_URID atom_URID;
+  LV2_URID atom_eventTransfer;
+  LV2_URID midi_Event;
+  LV2_URID patch_Set;
+  LV2_URID patch_property;
+  LV2_URID patch_value;
 } FifthsURIs;
 
 static inline void
 map_fifths_uris(LV2_URID_Map* map, FifthsURIs* uris)
 {
-	uris->atom_Path          = map->map(map->handle, LV2_ATOM__Path);
-	uris->atom_Resource      = map->map(map->handle, LV2_ATOM__Resource);
-	uris->atom_Sequence      = map->map(map->handle, LV2_ATOM__Sequence);
-	uris->atom_URID          = map->map(map->handle, LV2_ATOM__URID);
-	uris->atom_eventTransfer = map->map(map->handle, LV2_ATOM__eventTransfer);
-	uris->midi_Event         = map->map(map->handle, LV2_MIDI__MidiEvent);
-	uris->patch_Set          = map->map(map->handle, LV2_PATCH__Set);
-	uris->patch_property     = map->map(map->handle, LV2_PATCH__property);
-	uris->patch_value        = map->map(map->handle, LV2_PATCH__value);
+  uris->atom_Path          = map->map(map->handle, LV2_ATOM__Path);
+  uris->atom_Resource      = map->map(map->handle, LV2_ATOM__Resource);
+  uris->atom_Sequence      = map->map(map->handle, LV2_ATOM__Sequence);
+  uris->atom_URID          = map->map(map->handle, LV2_ATOM__URID);
+  uris->atom_eventTransfer = map->map(map->handle, LV2_ATOM__eventTransfer);
+  uris->midi_Event         = map->map(map->handle, LV2_MIDI__MidiEvent);
+  uris->patch_Set          = map->map(map->handle, LV2_PATCH__Set);
+  uris->patch_property     = map->map(map->handle, LV2_PATCH__property);
+  uris->patch_value        = map->map(map->handle, LV2_PATCH__value);
 }
 
-#endif  /* FIFTHS_URIS_H */
+#endif // FIFTHS_URIS_H
diff --git a/plugins/eg-fifths.lv2/waf b/plugins/eg-fifths.lv2/waf
deleted file mode 120000
index 59a1ac9..0000000
--- a/plugins/eg-fifths.lv2/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../waf
\ No newline at end of file
diff --git a/plugins/eg-fifths.lv2/wscript b/plugins/eg-fifths.lv2/wscript
deleted file mode 100644
index 8b2991b..0000000
--- a/plugins/eg-fifths.lv2/wscript
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env python
-from waflib.extras import autowaf as autowaf
-import re
-
-# Variables for 'waf dist'
-APPNAME = 'eg-fifths.lv2'
-VERSION = '1.0.0'
-
-# Mandatory variables
-top = '.'
-out = 'build'
-
-def options(opt):
-    opt.load('compiler_c')
-    opt.load('lv2')
-    autowaf.set_options(opt)
-
-def configure(conf):
-    conf.load('compiler_c', cache=True)
-    conf.load('lv2', cache=True)
-    conf.load('autowaf', cache=True)
-
-    conf.check_pkg('lv2 >= 1.2.1', uselib_store='LV2')
-
-def build(bld):
-    bundle = 'eg-fifths.lv2'
-
-    # Build manifest.ttl by substitution (for portable lib extension)
-    bld(features     = 'subst',
-        source       = 'manifest.ttl.in',
-        target       = 'lv2/%s/%s' % (bundle, 'manifest.ttl'),
-        install_path = '${LV2DIR}/%s' % bundle,
-        LIB_EXT      = bld.env.LV2_LIB_EXT)
-
-    # Copy other data files to build bundle (build/eg-fifths.lv2)
-    for i in ['fifths.ttl']:
-        bld(features     = 'subst',
-            is_copy      = True,
-            source       = i,
-            target       = 'lv2/%s/%s' % (bundle, i),
-            install_path = '${LV2DIR}/%s' % bundle)
-
-    # Build plugin library
-    obj = bld(features     = 'c cshlib lv2lib',
-              source       = 'fifths.c',
-              name         = 'fifths',
-              target       = 'lv2/%s/fifths' % bundle,
-              install_path = '${LV2DIR}/%s' % bundle,
-              use          = 'LV2')