diff options
| -rw-r--r-- | .clang-tidy | 4 | ||||
| -rw-r--r-- | .gitignore | 23 | ||||
| -rw-r--r-- | AUTHORS | 3 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | doc/jalv.1 | 205 | ||||
| -rw-r--r-- | doc/jalv.gtk3.1 | 150 | ||||
| -rw-r--r-- | doc/jalv.qt5.1 | 53 | ||||
| -rw-r--r-- | doc/jalv.qt6.1 | 29 | ||||
| -rw-r--r-- | doc/mandoc.css | 327 | ||||
| -rw-r--r-- | doc/meson.build | 60 | ||||
| -rw-r--r-- | meson.build | 7 | ||||
| -rw-r--r-- | meson_options.txt | 3 | ||||
| -rw-r--r-- | src/backend.h | 3 | ||||
| -rw-r--r-- | src/control.c | 41 | ||||
| -rw-r--r-- | src/control.h | 67 | ||||
| -rw-r--r-- | src/frontend.h | 1 | ||||
| -rw-r--r-- | src/jack.c | 6 | ||||
| -rw-r--r-- | src/jack_impl.h | 4 | ||||
| -rw-r--r-- | src/jalv.c | 11 | ||||
| -rw-r--r-- | src/jalv_console.c | 11 | ||||
| -rw-r--r-- | src/jalv_gtk.c | 47 | ||||
| -rw-r--r-- | src/jalv_qt.cpp | 3 | ||||
| -rw-r--r-- | src/log.h | 1 | ||||
| -rw-r--r-- | src/mapper.h | 2 | ||||
| -rw-r--r-- | src/port.h | 2 | ||||
| -rw-r--r-- | src/process.h | 2 | ||||
| -rw-r--r-- | src/process_setup.c | 1 | ||||
| -rw-r--r-- | src/state.c | 12 | ||||
| -rw-r--r-- | src/worker.c | 2 | ||||
| -rw-r--r-- | subprojects/lilv.wrap | 18 | ||||
| -rw-r--r-- | subprojects/lv2.wrap | 2 | ||||
| -rw-r--r-- | subprojects/serd.wrap | 10 | ||||
| -rw-r--r-- | subprojects/sord.wrap | 18 | ||||
| -rw-r--r-- | subprojects/sratom.wrap | 18 | ||||
| -rw-r--r-- | subprojects/suil.wrap | 18 | ||||
| -rw-r--r-- | subprojects/zix.wrap | 12 |
36 files changed, 863 insertions, 316 deletions
diff --git a/.clang-tidy b/.clang-tidy index 9836acc..dd52ffc 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -6,6 +6,7 @@ Checks: > -*-named-parameter, -*-narrowing-conversions, -altera-*, + -boost-*, -bugprone-assignment-in-if-condition, -bugprone-casting-through-void, -bugprone-easily-swappable-parameters, @@ -17,6 +18,7 @@ Checks: > -clang-analyzer-valist.Uninitialized, -concurrency-mt-unsafe, -cppcoreguidelines-avoid-non-const-global-variables, + -cppcoreguidelines-macro-usage, -cppcoreguidelines-owning-memory, -cppcoreguidelines-pro-bounds-pointer-arithmetic, -cppcoreguidelines-pro-type-reinterpret-cast, @@ -29,6 +31,8 @@ Checks: > -misc-no-recursion, -modernize-use-nodiscard, -modernize-use-trailing-return-type, + -modernize-use-using, + -performance-enum-size, -readability-function-cognitive-complexity, -readability-identifier-length, -readability-implicit-bool-conversion, @@ -1,14 +1,13 @@ -# Copyright 2019-2022 David Robillard <d@drobilla.net> +# Copyright 2019-2025 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR ISC -build/ -subprojects/lilv/ -subprojects/lv2/ -subprojects/packagecache/ -subprojects/serd/ -subprojects/sord/ -subprojects/sphinxygen-1.0.4/ -subprojects/sratom/ -subprojects/suil/ -subprojects/zix-0.4.0/ -subprojects/zix/ +/build/ +/subprojects/lilv-0.24.26/ +/subprojects/lv2/ +/subprojects/packagecache/ +/subprojects/serd/ +/subprojects/sord-0.16.18/ +/subprojects/sphinxygen-1.0.10/ +/subprojects/sratom-0.6.18/ +/subprojects/suil-0.10.22/ +/subprojects/zix-0.6.2/ @@ -15,3 +15,6 @@ Original Qt generic UI: GTK plugin selector UI: Alexandros Theodotou <alex@zrythm.org> + +Original man pages: + Jaromír Mikes <mira.mikes@seznam.cz> @@ -18,12 +18,13 @@ jalv (1.6.9) unstable; urgency=medium * Remove limits on the size of messages sent from plugin to UI * Remove transport position dumping from Jack process callback * Replace use of deprecated Gtk interfaces + * Rewrite man pages in mdoc * Switch to external zix dependency * Use Gtk switches instead of checkboxes for toggle controls * Use fewer platform-specific APIs * Use portable zix filesystem API - -- David Robillard <d@drobilla.net> Mon, 25 Nov 2024 01:29:18 +0000 + -- David Robillard <d@drobilla.net> Fri, 20 Dec 2024 00:45:28 +0000 jalv (1.6.8) stable; urgency=medium @@ -1,84 +1,125 @@ -.TH JALV 1 "18 Feb 2017" - -.SH NAME -.B jalv \- Run an LV2 plugin as a JACK application (console version). - -.SH SYNOPSIS -.B jalv [OPTION]... PLUGIN_URI - -.SH OPTIONS - -.TP -\fB\-b SIZE\fR -Buffer size for plugin <=> UI communication. - -.TP -\fB\-c SYM=VAL\fR -Set control value (e.g. "vol=1.4"). - -.TP -\fB\-d\fR -Dump plugin <=> UI communication. - -.TP -\fB\-U URI\fR -Load the UI with the given URI. - -.TP -\fB\-h\fR -Print the command line options. - -.TP -\fB\-i\fR -Ignore input on stdin (for background use). - -.TP -\fB\-l DIR\fR -Load state from state directory. - -.TP -\fB\-n NAME\fR -Jack client name - -.TP -\fB\-p\fR -Print control output changes to stdout. - -.TP -\fB\-s\fR +.\" # Copyright 2024 David Robillard <d@drobilla.net> +.\" # SPDX-License-Identifier: ISC +.Dd December 20, 2024 +.Dt JALV 1 +.Os +.Sh NAME +.Nm jalv +.Nd run an LV2 plugin with a command-line interface +.Sh SYNOPSIS +.Nm jalv +.Op Fl dhipstx +.Op Fl b Ar size +.Op Fl c Ar symbol=value +.Op Fl U Ar ui_uri +.Op Fl l Ar dir +.Op Fl n Ar name +.Ar plugin_uri +.Sh DESCRIPTION +.Nm +is a simple LV2 host that runs one plugin. +It has several versions, this one has an interactive command-line interface. +.Pp +.Nm +has one positional argument, the URI of an installed LV2 plugin. +.Pp +The options are as follows: +.Bl -tag -width 3n +.It Fl b Ar bytes +Buffer size for communication between plugin and UI. +The default value should be enough, +but if there are overflows, +this option can be used to allocate more space. +.It Fl c Ar symbol=value +Set control value, for example, +.Fl c Ar vol=1.4 +where +.Dq vol +is the symbol of a control port on the plugin. +.It Fl d +Dump communication between plugin and UI to +.Dv stdout . +Note that this may print an extreme amount of text, +piping the output to a pager or file is recommended. +.It Fl h +Print the command line options and exit. +.It Fl i +Ignore input on +.Dv stdin +and run non-interactively. +.It Fl l Ar dir +Load state from the given directory before running the plugin. +.It Fl n Ar name +Use the given JACK client name. +Note that JACK may adjust the name if necessary unless +.Fl x +is also given. +.It Fl p +Print control output changes to +.Dv stdout . +.It Fl s Show plugin UI if possible. - -This option only works when plugins provide a UI that is usable via the non-embeddable showHide interface. For other, embeddable UIs, use jalv.gtk3(1) or jalv.qt5(1). - -.TP -\fB\-t\fR -Print trace messages from plugin - -.TP -\fB\-x\fR -Use only exact Jack client name, and exit if it is taken - -.SH COMMANDS - +This option only works when plugins provide a UI that uses the non-embeddable +.Li showHide +interface. +For embeddable UIs, use +.Xr jalv.gtk3 1 +instead. +.It Fl t +Print trace messages from plugin. +This enables the +.Dq trace +log defined by LV2, which is used by some plugins to print debugging output. +.It Fl U Ar uri +Load the UI with the given URI. +Usually only one suitable UI is available on a given platform, +which is used by default. +If there are several, this option can be used to select which is loaded. +.It Fl V +Print version information and exit. +.It Fl x +Use only the exact JACK client name given by +.Fl n +or exit if it's unavailable. +.El +.Sh COMMANDS The Jalv prompt supports several commands for interactive control: - - \fBhelp\fR Display help message - \fBcontrols\fR Print settable control values - \fBmonitors\fR Print output control values - \fBpresets\fR Print available presets - \fBpreset URI\fR Set preset - \fBset INDEX VALUE\fR Set control value by port index - \fBset SYMBOL VALUE\fR Set control value by symbol - \fBSYMBOL = VALUE\fR Set control value by symbol - -.SH "SEE ALSO" -.BR jalv.gtk3(1), -.BR jalv.qt5(2), -.BR lv2ls(1), -.BR jackd(1) - -.SH AUTHOR -jalv was written by David Robillard <d@drobilla.net> -.PP -This manual page was written by Jaromír Mikes <mira.mikes@seznam.cz> -and David Robillard <d@drobilla.net> +.Pp +.Bl -tag -width 16n -compact +.It Ic help +Display help message. +.It Ic controls +Print settable control values. +.It Ic monitors +Print output control values. +.It Ic presets +Print available presets. +.It Ic preset Ar uri +Set preset. +.It Ic set index value +Set control value by port index. +.It Ic set Ar symbol Ar value +Set control value by symbol. +.It Ar symbol Cm = Ar value +Set control value by symbol. +.El +.Sh ENVIRONMENT +.Bl -tag -width LV2_PATH +.It Ev LV2_PATH +Search path for LV2 bundles, in +.Ev PATH +format. +.El +.Sh SEE ALSO +.Xr jalv.gtk3 1 , +.Xr jalv.qt5 1 , +.Xr lv2ls 1 +.Sh AUTHORS +.Nm +was written by +.An David Robillard +.Aq Mt d@drobilla.net , +with contributions by +Robin Gareus, +Hanspeter Portner, +and others. diff --git a/doc/jalv.gtk3.1 b/doc/jalv.gtk3.1 index 1cb8dc1..953c5b0 100644 --- a/doc/jalv.gtk3.1 +++ b/doc/jalv.gtk3.1 @@ -1,57 +1,101 @@ -.TH JALV.GTK3 1 "27 May 2022" - -.SH NAME -.B jalv.gtk \- Run an LV2 plugin as a JACK application (Gtk3 version). - -.SH SYNOPSIS -.B jalv.gtk [OPTION]... PLUGIN_URI - -.SH OPTIONS - -.TP -\fB\-b SIZE\fR +.\" # Copyright 2024 David Robillard <d@drobilla.net> +.\" # SPDX-License-Identifier: ISC +.Dd December 20, 2024 +.Dt JALV.GTK3 1 +.Os +.Sh NAME +.Nm jalv.gtk3 +.Nd run an LV2 plugin with a GTK3 interface +.Sh SYNOPSIS +.Nm jalv.gtk3 +.Op Fl dghmpstx +.Op Fl b , Fl Fl buffer-size Ns = Ns Ar size +.Op Fl c , Fl Fl control Ns = Ns Ar setting +.Op Fl l , Fl Fl load Ns = Ns Ar dir +.Op Fl n , Fl Fl jack-name Ns = Ns Ar name +.Op Fl P , Fl Fl preset Ns = Ns Ar uri +.Op Fl r , Fl Fl update-frequency Ns = Ns Ar hz +.Op Fl S , Fl Fl scale-factor Ns = Ns Ar scale +.Op Fl U , Fl Fl ui-uri Ns = Ns Ar uri +.Ar plugin_uri +.Sh DESCRIPTION +.Nm +is a simple LV2 host that runs a single plugin. +This version has a GTK3 interface that shows either generic controls or a custom plugin GUI. +.Pp +The options are as follows: +.Bl -tag -width 3n +.It Fl b Ar size Buffer size for plugin <=> UI communication. - -.TP -\fB\-c SYM=VAL\fR -Set control value (e.g. "vol=1.4"). - -.TP -\fB\-d\fR, \fB\-\-dump\fR +.It Fl c Ar symbol=value +Set control value, for example, +.Fl c Ar vol=1.4 +where +.Dq vol +is the symbol of some control port on the plugin. +.It Fl d Dump plugin <=> UI communication. - -.TP -\fB\-U URI\fR -Load the UI with the given URI. - -.TP -\fB\-g\fR, \fB\-\-generic\-ui\fR -Use Jalv generic UI and not the plugin UI. - -.TP -\fB\-h\fR, \fB\-\-help\fR +.It Fl g +Show generic UI instead of custom plugin GUI. +.It Fl h Print the command line options. - -.TP -\fB\-l DIR\fR, \fB\-\-load DIR\fR -Load state from state directory. - -.TP -\fB\-p\fR, \fB\-\-print\-controls\fR -Print control output changes to stdout. - -.TP -\fB\-t\fR, \fB\-\-trace\fR +.It Fl l Ar dir +Load state from the given directory before running the plugin. +.It Fl m +Hide application menu, showing only the plugin interface. +.It Fl n Ar name +Use the given JACK client name. +Note that JACK may adjust the name if necessary unless +.Fl x +is also given. +.It Fl P uri +Load the given preset before running plugin. +.It Fl p +Print control output changes to +.Dv stdout . +.It Fl r Ar hz +Set the UI update frequency. +By default the screen refresh rate is used, typically 30 or 60 Hz. +.It Fl S Ar factor +Override the UI scale factor. +.It Fl s +Show controls that are normally hidden. +.It Fl t Print trace messages from plugin. - -.SH "SEE ALSO" -.BR jalv(1), -.BR jalv.qt5(1), -.BR lv2ls(1), -.BR jackd(1) - -.SH AUTHOR -jalv was written by David Robillard <d@drobilla.net> -.PP -This manual page was written by Jaromír Mikes <mira.mikes@seznam.cz> -and David Robillard <d@drobilla.net> +.It Fl U +URI Load the UI with the given URI. +.It Fl x +Use only the exact JACK client name given by +.Fl n +or exit if it's unavailable. +.El +.Sh COMMANDS +The Jalv prompt supports several commands for interactive control: +.Pp +.Bl -tag -width 16n -compact +.It Ic help +Display help message. +.It Ic controls +Print settable control values. +.It Ic monitors +Print output control values. +.It Ic presets +Print available presets. +.It Ic preset Ar uri +Set preset. +.It Ic set index value +Set control value by port index. +.It Ic set Ar symbol Ar value +Set control value by symbol. +.It Ar SYMBOL Cm = Ar VALUE +Set control value by symbol. +.El +.Sh SEE ALSO +.Xr jalv 1 , +.Xr jalv.qt5 1 +.Sh AUTHORS +jalv was written by +.An David Robillard +.Aq Mt d@drobilla.net +with contributions by others. +Most of the GTK interface was added by Alexandros Theodotou and Nick Lanham. diff --git a/doc/jalv.qt5.1 b/doc/jalv.qt5.1 index 14fa57f..578dab4 100644 --- a/doc/jalv.qt5.1 +++ b/doc/jalv.qt5.1 @@ -1,24 +1,29 @@ -.TH JALV.QT5 1 "19 Apr 2012" - -.SH NAME -.B jalv.qt \- Run an LV2 plugin as a JACK application (Qt version). - -.SH SYNOPSIS -.B jalv.qt PLUGIN_URI - -.SH DESCRIPTION - -This is a version of Jalv with a GUI implemented in Qt. It is mainly for -developer testing purposes, for a production ready program use jalv.gtk. - -.SH "SEE ALSO" -.BR jalv(1), -.BR jalv.gtk3(1), -.BR lv2ls(1), -.BR jackd(1) - -.SH AUTHOR -jalv was written by David Robillard <d@drobilla.net> -.PP -This manual page was written by Jaromír Mikes <mira.mikes@seznam.cz> -and David Robillard <d@drobilla.net> +.\" # Copyright 2024 David Robillard <d@drobilla.net> +.\" # SPDX-License-Identifier: ISC +.Dd December 20, 2024 +.Dt JALV.QT5 1 +.Os +.Sh NAME +.Nm jalv.qt5 +.Nd run an LV2 plugin with a Qt5 interface +.Sh SYNOPSIS +.Nm jalv.qt5 +.Ar plugin_uri +.Sh DESCRIPTION +.Nm +is a simple LV2 host that runs a single plugin. +This version has a Qt5 interface that shows either generic controls or a custom plugin GUI. +.Pp +This version has no options and requires the plugin URI to be given on the command line. +For a fully graphical version with a plugin selector, see +.Xr jalv.gtk3 1 . +.Sh SEE ALSO +.Xr jalv 1 , +.Xr jalv.gtk3 1 , +.Xr lv2ls 1 +.Sh AUTHORS +jalv was written by +.An David Robillard +.Aq Mt d@drobilla.net +with contributions by others. +Most of the Qt interface was added by Amadeus Folego and Timo Westkämper. diff --git a/doc/jalv.qt6.1 b/doc/jalv.qt6.1 new file mode 100644 index 0000000..6b80b2c --- /dev/null +++ b/doc/jalv.qt6.1 @@ -0,0 +1,29 @@ +.\" # Copyright 2024 David Robillard <d@drobilla.net> +.\" # SPDX-License-Identifier: ISC +.Dd December 20, 2024 +.Dt JALV.QT6 1 +.Os +.Sh NAME +.Nm jalv.qt6 +.Nd run an LV2 plugin with a Qt6 interface +.Sh SYNOPSIS +.Nm jalv.qt6 +.Ar plugin_uri +.Sh DESCRIPTION +.Nm +is a simple LV2 host that runs a single plugin. +This version has a Qt6 interface that shows either generic controls or a custom plugin GUI. +.Pp +This version has no options and requires the plugin URI to be given on the command line. +For a fully graphical version with a plugin selector, see +.Xr jalv.gtk3 1 . +.Sh SEE ALSO +.Xr jalv 1 , +.Xr jalv.gtk3 1 , +.Xr lv2ls 1 +.Sh AUTHORS +jalv was written by +.An David Robillard +.Aq Mt d@drobilla.net +with contributions by others. +Most of the Qt interface was added by Amadeus Folego and Timo Westkämper. diff --git a/doc/mandoc.css b/doc/mandoc.css new file mode 100644 index 0000000..aee69e5 --- /dev/null +++ b/doc/mandoc.css @@ -0,0 +1,327 @@ +/* + Copyright 2021-2022 David Robillard <d@drobilla.net> + SPDX-License-Identifier: ISC +*/ + +/* Generic page style */ + +/* + Smaller sizes: 0.236em 0.271em 0.382em 0.438em 0.618em 0.708em + Larger sizes: 1.146em 1.618em 1.854em 2.618em 3em 4.236em +*/ + +html { + margin: 0 1.618em; + background: #fff; + color: #000; +} + +body { + font-style: normal; + line-height: 1.618em; + margin: 0 auto auto; + padding: 0; + max-width: 60em; + font-family: "SF Pro Text", Verdana, "DejaVu Sans", sans-serif; + text-rendering: optimizelegibility; +} + +h1 { + font-family: Helvetica, Arial, "DejaVu Sans Condensed", Verdana, sans-serif; + font-size: 1.854em; + font-weight: 600; + line-height: 114.6%; + margin: 1.146em 0; +} + +a { + text-decoration: none; +} + +h1 a, +h2 a, +h3 a, +h4 a, +h5 a, +h6 a { + color: #222; +} + +a:hover { + text-decoration: underline; +} + +h1 a:link, +h2 a:link, +h3 a:link, +h4 a:link, +h5 a:link, +h6 a:link { + color: #222; +} + +h1 a:visited, +h2 a:visited, +h3 a:visited, +h4 a:visited, +h5 a:visited, +h6 a:visited { + color: #222; +} + +pre, +tt, +code { + overflow: auto; + font-family: "SF Mono", Menlo, Consolas, "DejaVu Sans Mono", monospace, fixed; + hyphens: none; + white-space: nowrap; + + /* stylelint-disable property-no-vendor-prefix */ + -epub-hyphens: none; + -moz-hyphens: none; + -ms-hyphens: none; + -webkit-hyphens: none; + /* stylelint-enable property-no-vendor-prefix */ +} + +ul, +ol, +dl { + margin: 0; + padding: 0; +} + +ul { + padding: 0; + hyphens: auto; +} + +dt { + font-weight: 600; + padding: 0.618em 0 0; +} + +dd { + margin: 0 0 0 2.618em; + hyphens: auto; +} + +dd > ul:only-child, +dd > ol:only-child { + padding-left: 0; +} + +li { + margin-left: 2.618em; +} + +dt:empty { + margin: 0; + display: none; +} + +dd:empty { + margin: 0; + display: none; +} + +dt:blank { + margin: 0; + display: none; +} + +dd:blank { + margin: 0; + display: none; +} + +/* Media-specific style */ + +/* Color links on screens */ +@media screen { + a { + color: #546e00; + } +} + +@media print { + body { + color: #000; + } + + a, + h1 a, + h2 a, + h3 a, + h4 a, + h5 a, + h6 a { + color: #000; + } + + a:link { + color: #000; + } + + a:visited { + color: #000; + } +} + +/* Mandoc specific style */ + +/* stylelint-disable selector-class-pattern */ + +table.head { + font-size: 0.708em; + margin: 0.438em 0 1.854em; + width: 100%; +} + +table.foot { + font-size: 0.708em; + margin: 2.618em 0 0.438em; + width: 100%; +} + +td.head-rtitle, +td.foot-os { + text-align: right; +} + +td.head-vol { + text-align: center; +} + +div.Pp { + margin: 1ex 0; +} + +a.permalink { + color: #222; +} + +div.Nd, +div.Bf, +div.Op { + display: inline; +} + +span.Pa, +span.Ad { + font-style: italic; +} + +span.Ms { + font-weight: bold; +} + +dl.Bl-diag > dt { + font-weight: bold; +} + +table.Nm tbody tr { + vertical-align: baseline; +} + +code.Nm, +code.Fl, +code.Cm, +code.Ic, +code.In, +code.Fd, +code.Fn, +code.Cd { + font-weight: bold; + color: #444; +} + +code.Ev { + font-weight: bold; + color: #444; +} + +code.Li { + color: #333; +} + +var.Ar { + font-style: italic; +} + +/* stylelint-enable selector-class-pattern */ + +/* Dark mode */ +@media (prefers-color-scheme: dark) { + html { + background: #222; + color: #ddd; + } + + a { + color: #b4c342; + } + + a.permalink { + color: #ddd; + } + + h1 a, + h2 a, + h3 a, + h4 a, + h5 a, + h6 a { + color: #ddd; + } + + h1 a:link, + h2 a:link, + h3 a:link, + h4 a:link, + h5 a:link, + h6 a:link { + color: #ddd; + } + + h1 a:visited, + h2 a:visited, + h3 a:visited, + h4 a:visited, + h5 a:visited, + h6 a:visited { + color: #ddd; + } + + /* stylelint-disable selector-class-pattern */ + + code.Nm, + code.Fl, + code.Cm, + code.Ic, + code.In, + code.Fd, + code.Fn, + code.Cd { + color: #aaa; + } + + code.Ev { + color: #aaa; + } + + code.Li { + color: #ccc; + } + + /* stylelint-enable selector-class-pattern */ +} + +/* Hard black for dark mode on mobile (since it's likely to be an OLED screen) */ +@media only screen and (hover: none) and (pointer: coarse) and (prefers-color-scheme: dark) { + html { + background: #000; + color: #ccc; + } +} diff --git a/doc/meson.build b/doc/meson.build index be25581..9a00094 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -1,12 +1,60 @@ -# Copyright 2022-2023 David Robillard <d@drobilla.net> +# Copyright 2022-2024 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR ISC -install_man(files('jalv.1')) +docdir = get_option('datadir') / 'doc' -if not get_option('gtk3').disabled() - install_man(files('jalv.gtk3.1')) +if not get_option('man').disabled() + install_man(files('jalv.1')) + + if not get_option('gtk3').disabled() + install_man(files('jalv.gtk3.1')) + endif + + if not get_option('qt5').disabled() + install_man(files('jalv.qt5.1')) + endif + + if not get_option('qt6').disabled() + install_man(files('jalv.qt6.1')) + endif endif -if not get_option('qt5').disabled() - install_man(files('jalv.qt5.1')) +# Build/install HTML man pages if mandoc is present +mandoc = find_program('mandoc', required: get_option('man_html')) +if mandoc.found() + configure_file( + copy: true, + input: files('mandoc.css'), + output: 'mandoc.css', + install_dir: docdir / meson.project_name() / 'man', + ) + + mandoc_html_command = [ + mandoc, + '-Kutf-8', + '-Ostyle=mandoc.css,man=%N.html', + '-Thtml', + '-Wwarning,stop', '@INPUT@', + ] + + html_mandir = docdir / meson.project_name() / 'man' + foreach name : ['jalv', 'jalv.gtk3', 'jalv.qt5', 'jalv.qt6'] + custom_target( + name + '.html', + capture: true, + command: mandoc_html_command, + input: files(name + '.1'), + install: true, + install_dir: html_mandir, + output: name + '.html', + ) + endforeach + + if not meson.is_subproject() + summary( + 'HTML man pages', + get_option('prefix') / html_mandir, + section: 'Directories', + ) + endif endif diff --git a/meson.build b/meson.build index b92ab64..8b6cf66 100644 --- a/meson.build +++ b/meson.build @@ -223,6 +223,7 @@ zix_dep = dependency( 'tests_cpp=disabled', ], fallback: ['zix', 'zix_dep'], + include_type: 'system', version: '>= 0.4.0', ) @@ -234,6 +235,7 @@ serd_dep = dependency( 'tools=disabled', ], fallback: ['serd', 'serd_dep'], + include_type: 'system', version: '>= 0.32.2', ) @@ -245,6 +247,7 @@ sord_dep = dependency( 'tools=disabled', ], fallback: ['sord', 'sord_dep'], + include_type: 'system', version: '>= 0.16.16', ) @@ -257,6 +260,7 @@ lv2_dep = dependency( 'tests=disabled', ], fallback: ['lv2', 'lv2_dep'], + include_type: 'system', version: '>= 1.18.0', ) @@ -267,6 +271,7 @@ sratom_dep = dependency( 'tests=disabled', ], fallback: ['sratom', 'sratom_dep'], + include_type: 'system', version: '>= 0.6.4', ) @@ -279,6 +284,7 @@ lilv_dep = dependency( 'tools=disabled', ], fallback: ['lilv', 'lilv_dep'], + include_type: 'system', version: '>= 0.24.24', ) @@ -289,6 +295,7 @@ suil_dep = dependency( 'tests=disabled', ], fallback: ['suil', 'suil_dep'], + include_type: 'system', required: get_option('suil'), version: '>= 0.10.0', ) diff --git a/meson_options.txt b/meson_options.txt index abc5409..f0577ef 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -22,6 +22,9 @@ option('lint', type: 'boolean', value: false, yield: true, option('man', type: 'feature', value: 'enabled', yield: true, description: 'Install man pages') +option('man_html', type: 'feature', yield: true, + description: 'Build HTML man pages') + option('posix', type: 'feature', yield: true, description: 'Use POSIX system facilities') diff --git a/src/backend.h b/src/backend.h index facecd1..2f34c58 100644 --- a/src/backend.h +++ b/src/backend.h @@ -10,6 +10,9 @@ #include "types.h" #include "urids.h" +#include <zix/attributes.h> +#include <zix/sem.h> + #include <stdbool.h> #include <stdint.h> diff --git a/src/control.c b/src/control.c index c384165..41a2b70 100644 --- a/src/control.c +++ b/src/control.c @@ -32,22 +32,21 @@ scale_point_cmp(const ScalePoint* a, const ScalePoint* b) } ControlID* -new_port_control(LilvWorld* const world, - const LilvPlugin* const plugin, - const LilvPort* const port, - uint32_t port_index, - const float sample_rate, - const JalvNodes* const nodes, - LV2_Atom_Forge* const forge) +new_port_control(LilvWorld* const world, + const LilvPlugin* const plugin, + const LilvPort* const port, + uint32_t port_index, + const float sample_rate, + const JalvNodes* const nodes, + const LV2_Atom_Forge* const forge) { ControlID* id = (ControlID*)calloc(1, sizeof(ControlID)); id->type = PORT; + id->id.index = port_index; id->node = lilv_node_duplicate(lilv_port_get_node(plugin, port)); id->symbol = lilv_node_duplicate(lilv_port_get_symbol(plugin, port)); id->label = lilv_port_get_name(plugin, port); - id->forge = forge; - id->index = port_index; id->group = lilv_port_get(plugin, port, nodes->pg_group); id->value_type = forge->Float; id->is_writable = lilv_port_is_a(plugin, port, nodes->lv2_InputPort); @@ -122,18 +121,17 @@ has_range(LilvWorld* const world, } ControlID* -new_property_control(LilvWorld* const world, - const LilvNode* property, - const JalvNodes* const nodes, - LV2_URID_Map* const map, - LV2_Atom_Forge* const forge) +new_property_control(LilvWorld* const world, + const LilvNode* property, + const JalvNodes* const nodes, + LV2_URID_Map* const map, + const LV2_Atom_Forge* const forge) { - ControlID* id = (ControlID*)calloc(1, sizeof(ControlID)); - id->type = PROPERTY; - id->node = lilv_node_duplicate(property); - id->symbol = lilv_world_get_symbol(world, property); - id->forge = forge; - id->property = map->map(map->handle, lilv_node_as_uri(property)); + ControlID* id = (ControlID*)calloc(1, sizeof(ControlID)); + id->type = PROPERTY; + id->id.property = map->map(map->handle, lilv_node_as_uri(property)); + id->node = lilv_node_duplicate(property); + id->symbol = lilv_world_get_symbol(world, property); id->label = lilv_world_get(world, property, nodes->rdfs_label, NULL); id->min = lilv_world_get(world, property, nodes->lv2_minimum, NULL); @@ -198,7 +196,8 @@ ControlID* get_property_control(const Controls* controls, LV2_URID property) { for (size_t i = 0; i < controls->n_controls; ++i) { - if (controls->controls[i]->property == property) { + if (controls->controls[i]->type == PROPERTY && + controls->controls[i]->id.property == property) { return controls->controls[i]; } } diff --git a/src/control.h b/src/control.h index 661eb21..0109e60 100644 --- a/src/control.h +++ b/src/control.h @@ -32,27 +32,28 @@ typedef struct { /// Plugin control typedef struct { - ControlType type; ///< Type of control - LilvNode* node; ///< Port or property - LilvNode* symbol; ///< Symbol - LilvNode* label; ///< Human readable label - LV2_Atom_Forge* forge; ///< Forge (for URIDs) - LV2_URID property; ///< Iff type == PROPERTY - uint32_t index; ///< Iff type == PORT - LilvNode* group; ///< Port/control group, or NULL - void* widget; ///< Control Widget - size_t n_points; ///< Number of scale points - ScalePoint* points; ///< Scale points - LV2_URID value_type; ///< Type of control value - LilvNode* min; ///< Minimum value - LilvNode* max; ///< Maximum value - LilvNode* def; ///< Default value - bool is_toggle; ///< Boolean (0 and 1 only) - bool is_integer; ///< Integer values only - bool is_enumeration; ///< Point values only - bool is_logarithmic; ///< Logarithmic scale - bool is_writable; ///< Writable (input) - bool is_readable; ///< Readable (output) + ControlType type; ///< Type of control + union { + LV2_URID property; ///< Iff type == PROPERTY + uint32_t index; ///< Iff type == PORT + } id; + LilvNode* node; ///< Port or property + LilvNode* symbol; ///< Symbol + LilvNode* label; ///< Human readable label + LilvNode* group; ///< Port/control group, or NULL + void* widget; ///< Control Widget + size_t n_points; ///< Number of scale points + ScalePoint* points; ///< Scale points + LV2_URID value_type; ///< Type of control value + LilvNode* min; ///< Minimum value + LilvNode* max; ///< Maximum value + LilvNode* def; ///< Default value + bool is_toggle; ///< Boolean (0 and 1 only) + bool is_integer; ///< Integer values only + bool is_enumeration; ///< Point values only + bool is_logarithmic; ///< Logarithmic scale + bool is_writable; ///< Writable (input) + bool is_readable; ///< Readable (output) } ControlID; /// Set of plugin controls @@ -63,21 +64,21 @@ typedef struct { /// Create a new ID for a control port ControlID* -new_port_control(LilvWorld* world, - const LilvPlugin* plugin, - const LilvPort* port, - uint32_t port_index, - float sample_rate, - const JalvNodes* nodes, - LV2_Atom_Forge* forge); +new_port_control(LilvWorld* world, + const LilvPlugin* plugin, + const LilvPort* port, + uint32_t port_index, + float sample_rate, + const JalvNodes* nodes, + const LV2_Atom_Forge* forge); /// Create a new ID for a property-based parameter ControlID* -new_property_control(LilvWorld* world, - const LilvNode* property, - const JalvNodes* nodes, - LV2_URID_Map* map, - LV2_Atom_Forge* forge); +new_property_control(LilvWorld* world, + const LilvNode* property, + const JalvNodes* nodes, + LV2_URID_Map* map, + const LV2_Atom_Forge* forge); /// Free a control allocated with new_port_control() or new_property_control() void diff --git a/src/frontend.h b/src/frontend.h index f18fb86..e95fa6d 100644 --- a/src/frontend.h +++ b/src/frontend.h @@ -11,6 +11,7 @@ #include <lilv/lilv.h> #include <stdbool.h> +#include <stdint.h> // Interface that must be implemented by UIs JALV_BEGIN_DECLS @@ -102,8 +102,8 @@ static int process_silent(JalvProcess* const proc, const jack_nframes_t nframes) { for (uint32_t p = 0U; p < proc->num_ports; ++p) { - JalvProcessPort* const port = &proc->ports[p]; - jack_port_t* const jport = (jack_port_t*)proc->ports[p].sys_port; + const JalvProcessPort* const port = &proc->ports[p]; + jack_port_t* const jport = (jack_port_t*)proc->ports[p].sys_port; if (jport && port->flow == FLOW_OUTPUT) { void* const buf = jack_port_get_buffer(jport, nframes); if (port->type == TYPE_EVENT) { @@ -264,7 +264,7 @@ latency_cb(const jack_latency_callback_mode_t mode, void* const data) { // Calculate latency assuming all ports depend on each other - JalvBackend* const backend = (JalvBackend*)data; + const JalvBackend* const backend = (JalvBackend*)data; const JalvProcess* const proc = backend->process; const PortFlow flow = ((mode == JackCaptureLatency) ? FLOW_INPUT : FLOW_OUTPUT); diff --git a/src/jack_impl.h b/src/jack_impl.h index cc922a9..241ea85 100644 --- a/src/jack_impl.h +++ b/src/jack_impl.h @@ -5,10 +5,12 @@ #define JALV_JACK_IMPL_H #include "attributes.h" +#include "process.h" #include "settings.h" #include "urids.h" -#include <jack/jack.h> +#include <jack/types.h> +#include <zix/sem.h> #include <stdbool.h> @@ -326,7 +326,8 @@ jalv_set_control(Jalv* jalv, const void* body) { if (control->type == PORT && type == jalv->forge.Float) { - jalv->process.controls_buf[control->index] = *(const float*)body; + const float value = *(const float*)body; + jalv_write_control(jalv->process.ui_to_plugin, control->id.index, value); } else if (control->type == PROPERTY && jalv->process.control_in != UINT32_MAX) { LV2_Atom_Forge_Frame frame; @@ -334,7 +335,7 @@ jalv_set_control(Jalv* jalv, lv2_atom_forge_object(&jalv->forge, &frame, 0, jalv->urids.patch_Set); lv2_atom_forge_key(&jalv->forge, jalv->urids.patch_property); - lv2_atom_forge_urid(&jalv->forge, control->property); + lv2_atom_forge_urid(&jalv->forge, control->id.property); lv2_atom_forge_key(&jalv->forge, jalv->urids.patch_value); lv2_atom_forge_atom(&jalv->forge, size, type); lv2_atom_forge_write(&jalv->forge, body, size); @@ -363,7 +364,7 @@ void jalv_ui_instantiate(Jalv* jalv, const char* native_ui_type, void* parent) { #if USE_SUIL - LilvInstance* const instance = jalv->process.instance; + const LilvInstance* const instance = jalv->process.instance; jalv->ui_host = suil_host_new(jalv_send_to_plugin, jalv_ui_port_index, NULL, NULL); @@ -637,8 +638,8 @@ jalv_init_features(Jalv* const jalv) static void jalv_init_ui_settings(Jalv* const jalv) { - JalvOptions* const opts = &jalv->opts; - JalvSettings* const settings = &jalv->settings; + const JalvOptions* const opts = &jalv->opts; + JalvSettings* const settings = &jalv->settings; if (!settings->ring_size) { /* The UI ring is fed by plugin output ports (usually one), and the UI diff --git a/src/jalv_console.c b/src/jalv_console.c index 1f97572..fe92cd7 100644 --- a/src/jalv_console.c +++ b/src/jalv_console.c @@ -1,6 +1,7 @@ // Copyright 2007-2024 David Robillard <d@drobilla.net> // SPDX-License-Identifier: ISC +#include "comm.h" #include "control.h" #include "frontend.h" #include "jalv.h" @@ -200,7 +201,7 @@ print_controls(const Jalv* const jalv, const bool writable, const bool readable) jalv_log(JALV_LOG_INFO, "%s = %f\n", lilv_node_as_string(control->symbol), - jalv->process.controls_buf[control->index]); + jalv->process.controls_buf[control->id.index]); } } @@ -249,14 +250,14 @@ jalv_process_command(Jalv* jalv, const char* cmd) print_controls(jalv, false, true); } else if (sscanf(cmd, "set %u %f", &index, &value) == 2) { if (index < jalv->num_ports) { - jalv->process.controls_buf[index] = value; + jalv_write_control(jalv->process.ui_to_plugin, index, value); print_control_port(jalv, &jalv->ports[index], value); } else { fprintf(stderr, "error: port index out of range\n"); } } else if (sscanf(cmd, "set %1023[a-zA-Z0-9_] %f", sym, &value) == 2 || sscanf(cmd, "%1023[a-zA-Z0-9_] = %f", sym, &value) == 2) { - JalvPort* const port = jalv_port_by_symbol(jalv, sym); + const JalvPort* const port = jalv_port_by_symbol(jalv, sym); if (port) { jalv->process.controls_buf[port->index] = value; print_control_port(jalv, port, value); @@ -342,9 +343,9 @@ jalv_frontend_open(Jalv* jalv) for (size_t i = 0; i < jalv->controls.n_controls; ++i) { ControlID* control = jalv->controls.controls[i]; if (control->type == PORT && control->is_writable) { - const JalvPort* const port = &jalv->ports[control->index]; + const JalvPort* const port = &jalv->ports[control->id.index]; print_control_port( - jalv, port, jalv->process.controls_buf[control->index]); + jalv, port, jalv->process.controls_buf[control->id.index]); } } diff --git a/src/jalv_gtk.c b/src/jalv_gtk.c index 4a8930d..16cff34 100644 --- a/src/jalv_gtk.c +++ b/src/jalv_gtk.c @@ -48,10 +48,10 @@ static Jalv* s_jalv = NULL; static GtkCheckMenuItem* active_preset_item = NULL; static bool updating = false; -/// Widget for a control +/// Widget(s) for a control port or parameter typedef struct { - GtkSpinButton* spin; - GtkWidget* control; + GtkSpinButton* spin; ///< Spinner for numbers, or null + GtkWidget* control; ///< Primary value control } Controller; static float @@ -586,20 +586,21 @@ differ_enough(float a, float b) static void set_float_control(const ControlID* control, float value) { - if (control->value_type == control->forge->Int) { + const LV2_Atom_Forge* const forge = &s_jalv->forge; + if (control->value_type == forge->Int) { const int32_t ival = lrintf(value); - set_control(control, sizeof(ival), control->forge->Int, &ival); - } else if (control->value_type == control->forge->Long) { + set_control(control, sizeof(ival), forge->Int, &ival); + } else if (control->value_type == forge->Long) { const int64_t lval = lrintf(value); - set_control(control, sizeof(lval), control->forge->Long, &lval); - } else if (control->value_type == control->forge->Float) { - set_control(control, sizeof(value), control->forge->Float, &value); - } else if (control->value_type == control->forge->Double) { + set_control(control, sizeof(lval), forge->Long, &lval); + } else if (control->value_type == forge->Float) { + set_control(control, sizeof(value), forge->Float, &value); + } else if (control->value_type == forge->Double) { const double dval = value; - set_control(control, sizeof(dval), control->forge->Double, &dval); - } else if (control->value_type == control->forge->Bool) { + set_control(control, sizeof(dval), forge->Double, &dval); + } else if (control->value_type == forge->Bool) { const int32_t ival = value; - set_control(control, sizeof(ival), control->forge->Bool, &ival); + set_control(control, sizeof(ival), forge->Bool, &ival); } Controller* controller = (Controller*)control->widget; @@ -789,17 +790,13 @@ jalv_frontend_port_event(Jalv* jalv, return; } - if (protocol == 0 && (Controller*)jalv->ports[port_index].widget) { - control_changed(jalv, - (Controller*)jalv->ports[port_index].widget, - buffer_size, - jalv->forge.Float, - buffer); - return; - } - if (protocol == 0) { - return; // No widget (probably notOnGUI) + Controller* const controller = (Controller*)jalv->ports[port_index].widget; + if (controller) { + control_changed(jalv, controller, buffer_size, jalv->forge.Float, buffer); + } + + return; } if (protocol != jalv->urids.atom_eventTransfer) { @@ -905,7 +902,7 @@ string_changed(GtkEntry* widget, gpointer data) const ControlID* control = (const ControlID*)data; const char* string = gtk_entry_get_text(widget); - set_control(control, strlen(string) + 1, control->forge->String, string); + set_control(control, strlen(string) + 1, s_jalv->forge.String, string); } static void @@ -1211,7 +1208,7 @@ build_control_widget(Jalv* jalv, GtkWidget* window) record->widget = controller; if (record->type == PORT) { - jalv->ports[record->index].widget = controller; + jalv->ports[record->id.index].widget = controller; } if (controller) { // Add row to table for this controller diff --git a/src/jalv_qt.cpp b/src/jalv_qt.cpp index 9b3b145..7d99118 100644 --- a/src/jalv_qt.cpp +++ b/src/jalv_qt.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: ISC #include "jalv_qt.hpp" +#include "comm.h" #include "frontend.h" #include "jalv.h" #include "nodes.h" @@ -499,7 +500,7 @@ Control::dialChanged(int) const float value = getValue(); _label->setText(getValueLabel(value)); - _jalv->process.controls_buf[_port->index] = value; + jalv_write_control(_jalv->process.ui_to_plugin, _port->index, value); } namespace { @@ -10,6 +10,7 @@ #include <lv2/log/log.h> #include <lv2/urid/urid.h> +#include <stdarg.h> #include <stdbool.h> #include <stdio.h> diff --git a/src/mapper.h b/src/mapper.h index 4d541f6..ac4c53e 100644 --- a/src/mapper.h +++ b/src/mapper.h @@ -27,7 +27,7 @@ jalv_mapper_free(JalvMapper* mapper); LV2_URID_Map* jalv_mapper_urid_map(JalvMapper* mapper); -/// Return a poitner to the mapper's LV2 URID unmap +/// Return a pointer to the mapper's LV2 URID unmap LV2_URID_Unmap* jalv_mapper_urid_unmap(JalvMapper* mapper); @@ -5,12 +5,10 @@ #define JALV_PORT_H #include "attributes.h" -#include "lv2_evbuf.h" #include "types.h" #include <lilv/lilv.h> -#include <stddef.h> #include <stdint.h> // Application port state diff --git a/src/process.h b/src/process.h index c5d049b..cb6a122 100644 --- a/src/process.h +++ b/src/process.h @@ -32,7 +32,7 @@ typedef struct { LV2_Evbuf* evbuf; ///< Sequence port event buffer uint32_t buf_size; ///< Custom buffer size, or 0 bool reports_latency; ///< Whether control port reports latency - bool is_primary; ///< True for main control/reponse channel + bool is_primary; ///< True for main control/response channel bool supports_midi; ///< Whether event port supports MIDI } JalvProcessPort; diff --git a/src/process_setup.c b/src/process_setup.c index 66078a9..169ddcd 100644 --- a/src/process_setup.c +++ b/src/process_setup.c @@ -180,6 +180,7 @@ jalv_process_port_init(JalvProcessPort* const port, LilvNode* const name = lilv_port_get_name(lilv_plugin, lilv_port); port->symbol = symbol ? jalv_strdup(lilv_node_as_string(symbol)) : NULL; port->label = name ? jalv_strdup(lilv_node_as_string(name)) : NULL; + lilv_node_free(name); // Set buffer size LilvNode* const min_size = diff --git a/src/state.c b/src/state.c index 1b79b34..472244e 100644 --- a/src/state.c +++ b/src/state.c @@ -26,7 +26,7 @@ #include <stdio.h> #include <stdlib.h> -char* +ZIX_MALLOC_FUNC char* jalv_make_path(LV2_State_Make_Path_Handle handle, const char* path) { Jalv* jalv = (Jalv*)handle; @@ -42,8 +42,8 @@ get_port_value(const char* port_symbol, uint32_t* size, uint32_t* type) { - Jalv* const jalv = (Jalv*)user_data; - JalvPort* const port = jalv_port_by_symbol(jalv, port_symbol); + Jalv* const jalv = (Jalv*)user_data; + const JalvPort* const port = jalv_port_by_symbol(jalv, port_symbol); if (port && port->flow == FLOW_INPUT && port->type == TYPE_CONTROL) { *size = sizeof(float); *type = jalv->forge.Float; @@ -130,9 +130,9 @@ set_port_value(const char* port_symbol, uint32_t ZIX_UNUSED(size), uint32_t type) { - Jalv* const jalv = (Jalv*)user_data; - JalvProcess* const proc = &jalv->process; - JalvPort* const port = jalv_port_by_symbol(jalv, port_symbol); + Jalv* const jalv = (Jalv*)user_data; + JalvProcess* const proc = &jalv->process; + const JalvPort* const port = jalv_port_by_symbol(jalv, port_symbol); if (!port) { jalv_log(JALV_LOG_ERR, "Preset port `%s' is missing\n", port_symbol); return; diff --git a/src/worker.c b/src/worker.c index b131b3e..f03c823 100644 --- a/src/worker.c +++ b/src/worker.c @@ -153,7 +153,7 @@ jalv_worker_launch(JalvWorker* const worker) worker->state = STATE_LAUNCHED; } - return ZIX_STATUS_SUCCESS; + return st; } void diff --git a/subprojects/lilv.wrap b/subprojects/lilv.wrap index ff82752..61b77c5 100644 --- a/subprojects/lilv.wrap +++ b/subprojects/lilv.wrap @@ -1,8 +1,14 @@ -# Copyright 2022 David Robillard <d@drobilla.net> +# Copyright 2022-2025 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR ISC -[wrap-git] -url = https://gitlab.com/lv2/lilv.git -push-url = ssh://git@gitlab.com:lv2/lilv.git -revision = master -depth = 1 +[wrap-file] +directory = lilv-0.24.26 +source_url = https://download.drobilla.net/lilv-0.24.26.tar.xz +source_filename = lilv-0.24.26.tar.xz +source_hash = 22feed30bc0f952384a25c2f6f4b04e6d43836408798ed65a8a934c055d5d8ac + +# [wrap-git] +# url = https://gitlab.com/lv2/lilv.git +# push-url = ssh://git@gitlab.com:lv2/lilv.git +# revision = v0.24.26 +# depth = 1 diff --git a/subprojects/lv2.wrap b/subprojects/lv2.wrap index 7421eb7..ce82cf8 100644 --- a/subprojects/lv2.wrap +++ b/subprojects/lv2.wrap @@ -4,5 +4,5 @@ [wrap-git] url = https://gitlab.com/lv2/lv2.git push-url = ssh://git@gitlab.com:lv2/lv2.git -revision = master +revision = main depth = 1 diff --git a/subprojects/serd.wrap b/subprojects/serd.wrap index 4bd4109..3b84a4c 100644 --- a/subprojects/serd.wrap +++ b/subprojects/serd.wrap @@ -1,8 +1,14 @@ -# Copyright 2022 David Robillard <d@drobilla.net> +# Copyright 2022-2025 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR ISC +# [wrap-file] +# directory = serd-0.32.4 +# source_url = https://download.drobilla.net/serd-0.32.4.tar.xz +# source_filename = serd-0.32.4.tar.xz +# source_hash = cbefb569e8db686be8c69cb3866a9538c7cb055e8f24217dd6a4471effa7d349 + [wrap-git] url = https://gitlab.com/drobilla/serd.git push-url = ssh://git@gitlab.com:drobilla/serd.git -revision = master +revision = main depth = 1 diff --git a/subprojects/sord.wrap b/subprojects/sord.wrap index 7ca49cb..89b2933 100644 --- a/subprojects/sord.wrap +++ b/subprojects/sord.wrap @@ -1,8 +1,14 @@ -# Copyright 2022 David Robillard <d@drobilla.net> +# Copyright 2022-2025 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR ISC -[wrap-git] -url = https://gitlab.com/drobilla/sord.git -push-url = ssh://git@gitlab.com:drobilla/sord.git -revision = master -depth = 1 +[wrap-file] +directory = sord-0.16.18 +source_url = https://download.drobilla.net/sord-0.16.18.tar.xz +source_filename = sord-0.16.18.tar.xz +source_hash = 4f398b635894491a4774b1498959805a08e11734c324f13d572dea695b13d3b3 + +# [wrap-git] +# url = https://gitlab.com/drobilla/sord.git +# push-url = ssh://git@gitlab.com:drobilla/sord.git +# revision = v0.16.18 +# depth = 1 diff --git a/subprojects/sratom.wrap b/subprojects/sratom.wrap index 9bfac61..1524426 100644 --- a/subprojects/sratom.wrap +++ b/subprojects/sratom.wrap @@ -1,8 +1,14 @@ -# Copyright 2022 David Robillard <d@drobilla.net> +# Copyright 2022-2025 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR ISC -[wrap-git] -url = https://gitlab.com/lv2/sratom.git -push-url = ssh://git@gitlab.com:lv2/sratom.git -revision = master -depth = 1 +[wrap-file] +directory = sratom-0.6.18 +source_url = https://download.drobilla.net/sratom-0.6.18.tar.xz +source_filename = sratom-0.6.18.tar.xz +source_hash = 4c6a6d9e0b4d6c01cc06a8849910feceb92e666cb38779c614dd2404a9931e92 + +# [wrap-git] +# url = https://gitlab.com/lv2/sratom.git +# push-url = ssh://git@gitlab.com:lv2/sratom.git +# revision = v0.6.18 +# depth = 1 diff --git a/subprojects/suil.wrap b/subprojects/suil.wrap index dfc1ae8..16e28d4 100644 --- a/subprojects/suil.wrap +++ b/subprojects/suil.wrap @@ -1,8 +1,14 @@ -# Copyright 2022 David Robillard <d@drobilla.net> +# Copyright 2022-2025 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR ISC -[wrap-git] -url = https://gitlab.com/lv2/suil.git -push-url = ssh://git@gitlab.com:lv2/suil.git -revision = master -depth = 1 +[wrap-file] +directory = suil-0.10.22 +source_url = https://download.drobilla.net/suil-0.10.22.tar.xz +source_filename = suil-0.10.22.tar.xz +source_hash = d720969e0f44a99d5fba35c733a43ed63a16b0dab867970777efca4b25387eb7 + +# [wrap-git] +# url = https://gitlab.com/lv2/suil.git +# push-url = ssh://git@gitlab.com:lv2/suil.git +# revision = v0.10.22 +# depth = 1 diff --git a/subprojects/zix.wrap b/subprojects/zix.wrap index 7a50ea2..531d29c 100644 --- a/subprojects/zix.wrap +++ b/subprojects/zix.wrap @@ -1,14 +1,14 @@ -# Copyright 2022-2023 David Robillard <d@drobilla.net> +# Copyright 2022-2025 David Robillard <d@drobilla.net> # SPDX-License-Identifier: 0BSD OR ISC [wrap-file] -directory = zix-0.4.0 -source_url = https://download.drobilla.net/zix-0.4.0.tar.xz -source_filename = zix-0.4.0.tar.xz -source_hash = ac88dbefd9d29bfdce1532165c957d19d474a8367b727edb7be7d524e6cf9a14 +directory = zix-0.6.2 +source_url = https://download.drobilla.net/zix-0.6.2.tar.xz +source_filename = zix-0.6.2.tar.xz +source_hash = 4bc771abf4fcf399ea969a1da6b375f0117784f8fd0e2db356a859f635f616a7 # [wrap-git] # url = https://gitlab.com/drobilla/zix.git # push-url = ssh://git@gitlab.com:drobilla/zix.git -# revision = v0.4.0 +# revision = v0.6.2 # depth = 1 |