aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanspeter Portner <dev@open-music-kontrollers.ch>2019-10-13 14:06:52 +0200
committerHanspeter Portner <dev@open-music-kontrollers.ch>2019-10-13 14:06:52 +0200
commit37f037ccb06b101aa5290d2b83804587188f38d6 (patch)
tree9f326932b75e589e88f4600471623e7c2807d90f
parent565ee9b9d04ddfc67b7d814f4953bbf955c1655d (diff)
downloadmoony.lv2-37f037ccb06b101aa5290d2b83804587188f38d6.tar.xz
disable showUI by default, fix manual Canvas:graph.
-rw-r--r--README.md2
-rw-r--r--VERSION2
-rw-r--r--manual/manual.html.in27
-rw-r--r--meson.build23
-rw-r--r--meson_options.txt3
-rw-r--r--plugin/manifest.ttl.in45
-rw-r--r--plugin/moony_ui.ttl3
7 files changed, 31 insertions, 74 deletions
diff --git a/README.md b/README.md
index 12f269d..b5d04e4 100644
--- a/README.md
+++ b/README.md
@@ -190,7 +190,7 @@ is this here:
#### Compile options
* build-opengl-ui (build OpenGl UI, default=on)
-* build-zimple-ui (build external UI, default=off)
+* build-simple-ui (build external UI, default=off)
* build-inline-disp (build inline display, default=off)
### GUI
diff --git a/VERSION b/VERSION
index ee39cbb..db54aac 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.29.23
+0.29.25
diff --git a/manual/manual.html.in b/manual/manual.html.in
index 82fb2aa..12d09d2 100644
--- a/manual/manual.html.in
+++ b/manual/manual.html.in
@@ -2099,34 +2099,9 @@ end</code></pre>
<h2 id="forge-canvas">Canvas</h2>
<p>Atom types that contain Canvas messages as part of their body.
Modeled after the <a href="https://developer.mozilla.org/en-US/docs/Web/API/Canvas_API">HTML5 Canvas API</a>.
- Needs the author's <a href="https://gitlab.com/OpenMusicKontrollers/canvas.lv2">Canvas</a> LV2 plugin for rendering.</p>
+ But the vector drawing instructions into an atom:Tuple and store it as property Canvas:graph.
</div>
- <!-- Forge Graph -->
- <div class="api-section">
- <h3 id="forge-graph">Graph</h3>
- <p>Forge an atom object of type Patch.Set with an atom tuple as patch.property Canvas.graph.
- Use this to start create a vector image.</p>
-
- <dl>
- <dt class="func">forge:graph(subject=0, sequenceNumber=0)</dt>
- <dt>subject (integer)</dt>
- <dd>patch subject as integer URID, defaults to 0</dd>
- <dt>sequenceNumber (integer)</dt>
- <dd>patch sequence number as integer, defaults to 0</dd>
- <dt class="ret">(userdata)</dt>
- <dd>derived container forge object, needs to be finalized with <a href="#forge-pop">Pop</a></dd>
- </dl>
-
- <pre><code data-ref="forge-graph">-- Forge Graph
-
-function stash(forge)
- for ctx in forge:tuple():autopop() do
- ctx:rectangle(0.1, 0.1, 0.8, 0.8):style(0xff000000):fill()
- end
-end</code></pre>
- </div>
-
<!-- Forge BeginPath -->
<div class="api-section">
<h3 id="forge-beginPath">BeginPath</h3>
diff --git a/meson.build b/meson.build
index 31fa868..501035d 100644
--- a/meson.build
+++ b/meson.build
@@ -6,8 +6,7 @@ project('moony.lv2', 'c', default_options : [
'c_std=c11'])
build_opengl_ui = get_option('build-opengl-ui')
-build_zimple_ui = get_option('build-zimple-ui')
-build_canvas_ui = get_option('build-canvas-ui')
+build_simple_ui = get_option('build-simple-ui')
build_inline_disp = get_option('build-inline-disp')
static_link = meson.is_cross_build()
@@ -227,23 +226,15 @@ else
conf_data.set('UI_OPENGL', '#')
endif
-if build_zimple_ui
- message('building Zimple UI')
+if build_simple_ui
+ message('building Simple UI')
conf_data.set('UI', '')
- conf_data.set('UI_ZIMPLE', '')
+ conf_data.set('UI_SIMPLE', '')
else
- conf_data.set('UI_ZIMPLE', '#')
+ conf_data.set('UI_SIMPLE', '#')
endif
-if build_canvas_ui
- message('building Canvas UI')
- conf_data.set('UI', '')
- conf_data.set('UI_CANVAS', '')
-else
- conf_data.set('UI_CANVAS', '#')
-endif
-
-if build_opengl_ui or build_zimple_ui
+if build_opengl_ui or build_simple_ui
ui_srcs = [
join_paths('plugin', 'moony_ui.c'),
join_paths('plugin', 'simple_ui.c'),
@@ -524,7 +515,7 @@ endif
if lv2lint.found()
test('LV2 lint', lv2lint,
- args : ['-Ewarn',
+ args : [
'http://open-music-kontrollers.ch/lv2/moony#a1xa1',
'http://open-music-kontrollers.ch/lv2/moony#a2xa2',
'http://open-music-kontrollers.ch/lv2/moony#a4xa4',
diff --git a/meson_options.txt b/meson_options.txt
index c841187..5f633f0 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,3 @@
option('build-opengl-ui', type : 'boolean', value : true)
-option('build-zimple-ui', type : 'boolean', value : false)
-option('build-canvas-ui', type : 'boolean', value : false)
+option('build-simple-ui', type : 'boolean', value : false)
option('build-inline-disp', type : 'boolean', value : false)
diff --git a/plugin/manifest.ttl.in b/plugin/manifest.ttl.in
index 4c4bdc2..407c23e 100644
--- a/plugin/manifest.ttl.in
+++ b/plugin/manifest.ttl.in
@@ -37,9 +37,8 @@ moony:c1xc1
lv2:microVersion @MICRO_VERSION@ ;
lv2:binary <moony@MODULE_SUFFIX@> ;
@UI_OPENGL@ui:ui moony:moony_ui ;
- @UI_ZIMPLE@ui:ui moony:moony_zimple_ui ;
- @UI_ZIMPLE@ui:ui moony:moony_zimple_kx ;
- @UI_CANVAS@ui:ui canvas:display_ui ;
+ #@UI_SIMPLE@ui:ui moony:moony_zimple_ui ;
+ @UI_SIMPLE@ui:ui moony:moony_zimple_kx ;
rdfs:seeAlso <moony.ttl> .
moony:c2xc2
@@ -48,9 +47,8 @@ moony:c2xc2
lv2:microVersion @MICRO_VERSION@ ;
lv2:binary <moony@MODULE_SUFFIX@> ;
@UI_OPENGL@ui:ui moony:moony_ui ;
- @UI_ZIMPLE@ui:ui moony:moony_zimple_ui ;
- @UI_ZIMPLE@ui:ui moony:moony_zimple_kx ;
- @UI_CANVAS@ui:ui canvas:display_ui ;
+ #@UI_SIMPLE@ui:ui moony:moony_zimple_ui ;
+ @UI_SIMPLE@ui:ui moony:moony_zimple_kx ;
rdfs:seeAlso <moony.ttl> .
moony:c4xc4
@@ -59,9 +57,8 @@ moony:c4xc4
lv2:microVersion @MICRO_VERSION@ ;
lv2:binary <moony@MODULE_SUFFIX@> ;
@UI_OPENGL@ui:ui moony:moony_ui ;
- @UI_ZIMPLE@ui:ui moony:moony_zimple_ui ;
- @UI_ZIMPLE@ui:ui moony:moony_zimple_kx ;
- @UI_CANVAS@ui:ui canvas:display_ui ;
+ #@UI_SIMPLE@ui:ui moony:moony_zimple_ui ;
+ @UI_SIMPLE@ui:ui moony:moony_zimple_kx ;
rdfs:seeAlso <moony.ttl> .
# atom in, atom out
@@ -71,9 +68,8 @@ moony:a1xa1
lv2:microVersion @MICRO_VERSION@ ;
lv2:binary <moony@MODULE_SUFFIX@> ;
@UI_OPENGL@ui:ui moony:moony_ui ;
- @UI_ZIMPLE@ui:ui moony:moony_zimple_ui ;
- @UI_ZIMPLE@ui:ui moony:moony_zimple_kx ;
- @UI_CANVAS@ui:ui canvas:display_ui ;
+ #@UI_SIMPLE@ui:ui moony:moony_zimple_ui ;
+ @UI_SIMPLE@ui:ui moony:moony_zimple_kx ;
rdfs:seeAlso <moony.ttl> .
moony:a2xa2
@@ -82,9 +78,8 @@ moony:a2xa2
lv2:microVersion @MICRO_VERSION@ ;
lv2:binary <moony@MODULE_SUFFIX@> ;
@UI_OPENGL@ui:ui moony:moony_ui ;
- @UI_ZIMPLE@ui:ui moony:moony_zimple_ui ;
- @UI_ZIMPLE@ui:ui moony:moony_zimple_kx ;
- @UI_CANVAS@ui:ui canvas:display_ui ;
+ #@UI_SIMPLE@ui:ui moony:moony_zimple_ui ;
+ @UI_SIMPLE@ui:ui moony:moony_zimple_kx ;
rdfs:seeAlso <moony.ttl> .
moony:a4xa4
@@ -93,9 +88,8 @@ moony:a4xa4
lv2:microVersion @MICRO_VERSION@ ;
lv2:binary <moony@MODULE_SUFFIX@> ;
@UI_OPENGL@ui:ui moony:moony_ui ;
- @UI_ZIMPLE@ui:ui moony:moony_zimple_ui ;
- @UI_ZIMPLE@ui:ui moony:moony_zimple_kx ;
- @UI_CANVAS@ui:ui canvas:display_ui ;
+ #@UI_SIMPLE@ui:ui moony:moony_zimple_ui ;
+ @UI_SIMPLE@ui:ui moony:moony_zimple_kx ;
rdfs:seeAlso <moony.ttl> .
# control/atom in, control/atom out
@@ -105,9 +99,8 @@ moony:c1a1xc1a1
lv2:microVersion @MICRO_VERSION@ ;
lv2:binary <moony@MODULE_SUFFIX@> ;
@UI_OPENGL@ui:ui moony:moony_ui ;
- @UI_ZIMPLE@ui:ui moony:moony_zimple_ui ;
- @UI_ZIMPLE@ui:ui moony:moony_zimple_kx ;
- @UI_CANVAS@ui:ui canvas:display_ui ;
+ #@UI_SIMPLE@ui:ui moony:moony_zimple_ui ;
+ @UI_SIMPLE@ui:ui moony:moony_zimple_kx ;
rdfs:seeAlso <moony.ttl> .
moony:c2a1xc2a1
@@ -116,9 +109,8 @@ moony:c2a1xc2a1
lv2:microVersion @MICRO_VERSION@ ;
lv2:binary <moony@MODULE_SUFFIX@> ;
@UI_OPENGL@ui:ui moony:moony_ui ;
- @UI_ZIMPLE@ui:ui moony:moony_zimple_ui ;
- @UI_ZIMPLE@ui:ui moony:moony_zimple_kx ;
- @UI_CANVAS@ui:ui canvas:display_ui ;
+ #@UI_SIMPLE@ui:ui moony:moony_zimple_ui ;
+ @UI_SIMPLE@ui:ui moony:moony_zimple_kx ;
rdfs:seeAlso <moony.ttl> .
moony:c4a1xc4a1
@@ -127,9 +119,8 @@ moony:c4a1xc4a1
lv2:microVersion @MICRO_VERSION@ ;
lv2:binary <moony@MODULE_SUFFIX@> ;
@UI_OPENGL@ui:ui moony:moony_ui ;
- @UI_ZIMPLE@ui:ui moony:moony_zimple_ui ;
- @UI_ZIMPLE@ui:ui moony:moony_zimple_kx ;
- @UI_CANVAS@ui:ui canvas:display_ui ;
+ #@UI_SIMPLE@ui:ui moony:moony_zimple_ui ;
+ @UI_SIMPLE@ui:ui moony:moony_zimple_kx ;
rdfs:seeAlso <moony.ttl> .
# UI
diff --git a/plugin/moony_ui.ttl b/plugin/moony_ui.ttl
index 20908dd..3a96ead 100644
--- a/plugin/moony_ui.ttl
+++ b/plugin/moony_ui.ttl
@@ -143,4 +143,5 @@ moony:moony_zimple_kx
lv2:symbol "notify" ;
ui:protocol atom:eventTransfer ;
] ;
- lv2:requiredFeature kx:Host , ui:portMap, urid:map, urid:unmap .
+ lv2:optionalFeature kx:Host ;
+ lv2:requiredFeature ui:portMap, urid:map, urid:unmap .