From 7221e74b5352d903842f5e73ca353fdfcf8769b8 Mon Sep 17 00:00:00 2001 From: Hanspeter Portner Date: Fri, 24 Nov 2023 20:10:37 +0100 Subject: [PATCH] Make reuse compliant, migrate to subtree module --- .gitignore | 5 + .gitlab-ci.yml | 2 - COPYING | 201 ---- LICENSES/Artistic-2.0.txt | 85 ++ LICENSES/CC0-1.0.txt | 121 ++ README.md | 4 + VERSION | 1 - gitlab-ci/generic.yml | 106 -- manifest.ttl | 23 - meson.build | 81 +- meson_options.txt | 9 + osc.lv2/endian.h | 120 -- osc.lv2/forge.h | 430 +------ osc.lv2/osc.h | 62 +- osc.lv2/reader.h | 568 ++------- osc.lv2/stream.h | 1363 +--------------------- osc.lv2/util.h | 679 ++--------- osc.lv2/writer.h | 638 ++-------- src/forge.c | 418 +++++++ src/osc.c | 43 + src/reader.c | 516 ++++++++ src/stream.c | 1336 +++++++++++++++++++++ src/util.c | 541 +++++++++ src/writer.c | 536 +++++++++ test/{osc_test.c => osc.c} | 29 +- lv2-osc.doap.ttl => ttl/lv2-osc.doap.ttl | 16 +- ttl/manifest.ttl | 11 + osc.ttl => ttl/osc.ttl | 16 +- 28 files changed, 4006 insertions(+), 3954 deletions(-) create mode 100644 .gitignore delete mode 100644 .gitlab-ci.yml delete mode 100644 COPYING create mode 100644 LICENSES/Artistic-2.0.txt create mode 100644 LICENSES/CC0-1.0.txt delete mode 100644 VERSION delete mode 100644 gitlab-ci/generic.yml delete mode 100644 manifest.ttl create mode 100644 meson_options.txt delete mode 100644 osc.lv2/endian.h create mode 100644 src/forge.c create mode 100644 src/osc.c create mode 100644 src/reader.c create mode 100644 src/stream.c create mode 100644 src/util.c create mode 100644 src/writer.c rename test/{osc_test.c => osc.c} (98%) rename lv2-osc.doap.ttl => ttl/lv2-osc.doap.ttl (52%) create mode 100644 ttl/manifest.ttl rename osc.ttl => ttl/osc.ttl (58%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cfb9f13 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +# SPDX-FileCopyrightText: Hanspeter Portner +# SPDX-License-Identifier: CC0-1.0 + +tags +*.taghl diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 979769c..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,2 +0,0 @@ -include: - - local: 'gitlab-ci/generic.yml' diff --git a/COPYING b/COPYING deleted file mode 100644 index ddb9a46..0000000 --- a/COPYING +++ /dev/null @@ -1,201 +0,0 @@ - The Artistic License 2.0 - - Copyright (c) 2000-2006, The Perl Foundation. - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -Preamble - -This license establishes the terms under which a given free software -Package may be copied, modified, distributed, and/or redistributed. -The intent is that the Copyright Holder maintains some artistic -control over the development of that Package while still keeping the -Package available as open source and free software. - -You are always permitted to make arrangements wholly outside of this -license directly with the Copyright Holder of a given Package. If the -terms of this license do not permit the full use that you propose to -make of the Package, you should contact the Copyright Holder and seek -a different licensing arrangement. - -Definitions - - "Copyright Holder" means the individual(s) or organization(s) - named in the copyright notice for the entire Package. - - "Contributor" means any party that has contributed code or other - material to the Package, in accordance with the Copyright Holder's - procedures. - - "You" and "your" means any person who would like to copy, - distribute, or modify the Package. - - "Package" means the collection of files distributed by the - Copyright Holder, and derivatives of that collection and/or of - those files. A given Package may consist of either the Standard - Version, or a Modified Version. - - "Distribute" means providing a copy of the Package or making it - accessible to anyone else, or in the case of a company or - organization, to others outside of your company or organization. - - "Distributor Fee" means any fee that you charge for Distributing - this Package or providing support for this Package to another - party. It does not mean licensing fees. - - "Standard Version" refers to the Package if it has not been - modified, or has been modified only in ways explicitly requested - by the Copyright Holder. - - "Modified Version" means the Package, if it has been changed, and - such changes were not explicitly requested by the Copyright - Holder. - - "Original License" means this Artistic License as Distributed with - the Standard Version of the Package, in its current version or as - it may be modified by The Perl Foundation in the future. - - "Source" form means the source code, documentation source, and - configuration files for the Package. - - "Compiled" form means the compiled bytecode, object code, binary, - or any other form resulting from mechanical transformation or - translation of the Source form. - - -Permission for Use and Modification Without Distribution - -(1) You are permitted to use the Standard Version and create and use -Modified Versions for any purpose without restriction, provided that -you do not Distribute the Modified Version. - - -Permissions for Redistribution of the Standard Version - -(2) You may Distribute verbatim copies of the Source form of the -Standard Version of this Package in any medium without restriction, -either gratis or for a Distributor Fee, provided that you duplicate -all of the original copyright notices and associated disclaimers. At -your discretion, such verbatim copies may or may not include a -Compiled form of the Package. - -(3) You may apply any bug fixes, portability changes, and other -modifications made available from the Copyright Holder. The resulting -Package will still be considered the Standard Version, and as such -will be subject to the Original License. - - -Distribution of Modified Versions of the Package as Source - -(4) You may Distribute your Modified Version as Source (either gratis -or for a Distributor Fee, and with or without a Compiled form of the -Modified Version) provided that you clearly document how it differs -from the Standard Version, including, but not limited to, documenting -any non-standard features, executables, or modules, and provided that -you do at least ONE of the following: - - (a) make the Modified Version available to the Copyright Holder - of the Standard Version, under the Original License, so that the - Copyright Holder may include your modifications in the Standard - Version. - - (b) ensure that installation of your Modified Version does not - prevent the user installing or running the Standard Version. In - addition, the Modified Version must bear a name that is different - from the name of the Standard Version. - - (c) allow anyone who receives a copy of the Modified Version to - make the Source form of the Modified Version available to others - under - - (i) the Original License or - - (ii) a license that permits the licensee to freely copy, - modify and redistribute the Modified Version using the same - licensing terms that apply to the copy that the licensee - received, and requires that the Source form of the Modified - Version, and of any works derived from it, be made freely - available in that license fees are prohibited but Distributor - Fees are allowed. - - -Distribution of Compiled Forms of the Standard Version -or Modified Versions without the Source - -(5) You may Distribute Compiled forms of the Standard Version without -the Source, provided that you include complete instructions on how to -get the Source of the Standard Version. Such instructions must be -valid at the time of your distribution. If these instructions, at any -time while you are carrying out such distribution, become invalid, you -must provide new instructions on demand or cease further distribution. -If you provide valid instructions or cease distribution within thirty -days after you become aware that the instructions are invalid, then -you do not forfeit any of your rights under this license. - -(6) You may Distribute a Modified Version in Compiled form without -the Source, provided that you comply with Section 4 with respect to -the Source of the Modified Version. - - -Aggregating or Linking the Package - -(7) You may aggregate the Package (either the Standard Version or -Modified Version) with other packages and Distribute the resulting -aggregation provided that you do not charge a licensing fee for the -Package. Distributor Fees are permitted, and licensing fees for other -components in the aggregation are permitted. The terms of this license -apply to the use and Distribution of the Standard or Modified Versions -as included in the aggregation. - -(8) You are permitted to link Modified and Standard Versions with -other works, to embed the Package in a larger work of your own, or to -build stand-alone binary or bytecode versions of applications that -include the Package, and Distribute the result without restriction, -provided the result does not expose a direct interface to the Package. - - -Items That are Not Considered Part of a Modified Version - -(9) Works (including, but not limited to, modules and scripts) that -merely extend or make use of the Package, do not, by themselves, cause -the Package to be a Modified Version. In addition, such works are not -considered parts of the Package itself, and are not subject to the -terms of this license. - - -General Provisions - -(10) Any use, modification, and distribution of the Standard or -Modified Versions is governed by this Artistic License. By using, -modifying or distributing the Package, you accept this license. Do not -use, modify, or distribute the Package, if you do not accept this -license. - -(11) If your Modified Version has been derived from a Modified -Version made by someone other than you, you are nevertheless required -to ensure that your Modified Version complies with the requirements of -this license. - -(12) This license does not grant you the right to use any trademark, -service mark, tradename, or logo of the Copyright Holder. - -(13) This license includes the non-exclusive, worldwide, -free-of-charge patent license to make, have made, use, offer to sell, -sell, import and otherwise transfer the Package with respect to any -patent claims licensable by the Copyright Holder that are necessarily -infringed by the Package. If you institute patent litigation -(including a cross-claim or counterclaim) against any party alleging -that the Package constitutes direct or contributory patent -infringement, then this Artistic License to you shall terminate on the -date that such litigation is filed. - -(14) Disclaimer of Warranty: -THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS -IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR -NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL -LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL -BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF -ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/LICENSES/Artistic-2.0.txt b/LICENSES/Artistic-2.0.txt new file mode 100644 index 0000000..eb2e968 --- /dev/null +++ b/LICENSES/Artistic-2.0.txt @@ -0,0 +1,85 @@ +The Artistic License 2.0 + +Copyright (c) 2000-2006, The Perl Foundation. + +Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + +Preamble + +This license establishes the terms under which a given free software Package may be copied, modified, distributed, and/or redistributed. The intent is that the Copyright Holder maintains some artistic control over the development of that Package while still keeping the Package available as open source and free software. + +You are always permitted to make arrangements wholly outside of this license directly with the Copyright Holder of a given Package. If the terms of this license do not permit the full use that you propose to make of the Package, you should contact the Copyright Holder and seek a different licensing arrangement. + +Definitions + + "Copyright Holder" means the individual(s) or organization(s) named in the copyright notice for the entire Package. + + "Contributor" means any party that has contributed code or other material to the Package, in accordance with the Copyright Holder's procedures. + + "You" and "your" means any person who would like to copy, distribute, or modify the Package. + + "Package" means the collection of files distributed by the Copyright Holder, and derivatives of that collection and/or of those files. A given Package may consist of either the Standard Version, or a Modified Version. + + "Distribute" means providing a copy of the Package or making it accessible to anyone else, or in the case of a company or organization, to others outside of your company or organization. + + "Distributor Fee" means any fee that you charge for Distributing this Package or providing support for this Package to another party. It does not mean licensing fees. + + "Standard Version" refers to the Package if it has not been modified, or has been modified only in ways explicitly requested by the Copyright Holder. + + "Modified Version" means the Package, if it has been changed, and such changes were not explicitly requested by the Copyright Holder. + + "Original License" means this Artistic License as Distributed with the Standard Version of the Package, in its current version or as it may be modified by The Perl Foundation in the future. + + "Source" form means the source code, documentation source, and configuration files for the Package. + + "Compiled" form means the compiled bytecode, object code, binary, or any other form resulting from mechanical transformation or translation of the Source form. + +Permission for Use and Modification Without Distribution + +(1) You are permitted to use the Standard Version and create and use Modified Versions for any purpose without restriction, provided that you do not Distribute the Modified Version. + +Permissions for Redistribution of the Standard Version + +(2) You may Distribute verbatim copies of the Source form of the Standard Version of this Package in any medium without restriction, either gratis or for a Distributor Fee, provided that you duplicate all of the original copyright notices and associated disclaimers. At your discretion, such verbatim copies may or may not include a Compiled form of the Package. + +(3) You may apply any bug fixes, portability changes, and other modifications made available from the Copyright Holder. The resulting Package will still be considered the Standard Version, and as such will be subject to the Original License. + +Distribution of Modified Versions of the Package as Source + +(4) You may Distribute your Modified Version as Source (either gratis or for a Distributor Fee, and with or without a Compiled form of the Modified Version) provided that you clearly document how it differs from the Standard Version, including, but not limited to, documenting any non-standard features, executables, or modules, and provided that you do at least ONE of the following: + + (a) make the Modified Version available to the Copyright Holder of the Standard Version, under the Original License, so that the Copyright Holder may include your modifications in the Standard Version. + (b) ensure that installation of your Modified Version does not prevent the user installing or running the Standard Version. In addition, the Modified Version must bear a name that is different from the name of the Standard Version. + (c) allow anyone who receives a copy of the Modified Version to make the Source form of the Modified Version available to others under + + (i) the Original License or + (ii) a license that permits the licensee to freely copy, modify and redistribute the Modified Version using the same licensing terms that apply to the copy that the licensee received, and requires that the Source form of the Modified Version, and of any works derived from it, be made freely available in that license fees are prohibited but Distributor Fees are allowed. + +Distribution of Compiled Forms of the Standard Version or Modified Versions without the Source + +(5) You may Distribute Compiled forms of the Standard Version without the Source, provided that you include complete instructions on how to get the Source of the Standard Version. Such instructions must be valid at the time of your distribution. If these instructions, at any time while you are carrying out such distribution, become invalid, you must provide new instructions on demand or cease further distribution. If you provide valid instructions or cease distribution within thirty days after you become aware that the instructions are invalid, then you do not forfeit any of your rights under this license. + +(6) You may Distribute a Modified Version in Compiled form without the Source, provided that you comply with Section 4 with respect to the Source of the Modified Version. + +Aggregating or Linking the Package + +(7) You may aggregate the Package (either the Standard Version or Modified Version) with other packages and Distribute the resulting aggregation provided that you do not charge a licensing fee for the Package. Distributor Fees are permitted, and licensing fees for other components in the aggregation are permitted. The terms of this license apply to the use and Distribution of the Standard or Modified Versions as included in the aggregation. + +(8) You are permitted to link Modified and Standard Versions with other works, to embed the Package in a larger work of your own, or to build stand-alone binary or bytecode versions of applications that include the Package, and Distribute the result without restriction, provided the result does not expose a direct interface to the Package. + +Items That are Not Considered Part of a Modified Version + +(9) Works (including, but not limited to, modules and scripts) that merely extend or make use of the Package, do not, by themselves, cause the Package to be a Modified Version. In addition, such works are not considered parts of the Package itself, and are not subject to the terms of this license. + +General Provisions + +(10) Any use, modification, and distribution of the Standard or Modified Versions is governed by this Artistic License. By using, modifying or distributing the Package, you accept this license. Do not use, modify, or distribute the Package, if you do not accept this license. + +(11) If your Modified Version has been derived from a Modified Version made by someone other than you, you are nevertheless required to ensure that your Modified Version complies with the requirements of this license. + +(12) This license does not grant you the right to use any trademark, service mark, tradename, or logo of the Copyright Holder. + +(13) This license includes the non-exclusive, worldwide, free-of-charge patent license to make, have made, use, offer to sell, sell, import and otherwise transfer the Package with respect to any patent claims licensable by the Copyright Holder that are necessarily infringed by the Package. If you institute patent litigation (including a cross-claim or counterclaim) against any party alleging that the Package constitutes direct or contributory patent infringement, then this Artistic License to you shall terminate on the date that such litigation is filed. + +(14) Disclaimer of Warranty: +THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/LICENSES/CC0-1.0.txt b/LICENSES/CC0-1.0.txt new file mode 100644 index 0000000..0e259d4 --- /dev/null +++ b/LICENSES/CC0-1.0.txt @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/README.md b/README.md index 48a597c..99a5cba 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ + # osc.lv2 ## Open Sound Control Extension for the LV2 Plugin Specification diff --git a/VERSION b/VERSION deleted file mode 100644 index 8ca4b71..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.1.171 diff --git a/gitlab-ci/generic.yml b/gitlab-ci/generic.yml deleted file mode 100644 index 5cd2abc..0000000 --- a/gitlab-ci/generic.yml +++ /dev/null @@ -1,106 +0,0 @@ -stages: - - build - - deploy - -variables: - PKG_CONFIG_PATH: "/opt/lv2/lib/pkgconfig:/opt/${CI_BUILD_NAME}/lib/pkgconfig:/usr/lib/${CI_BUILD_NAME}/pkgconfig" - BUILD_OPTS : "" - -.native_template: &native_definition - stage: build - script: - - meson --prefix="${CI_PROJECT_DIR}/${CI_PROJECT_NAME}-$(cat VERSION)/${CI_BUILD_NAME}" -Dlv2libdir="" --cross-file "${CI_BUILD_NAME}" ${BUILD_OPTS} build - - ninja -C build - - ninja -C build test - - ninja -C build install - - - scan-build --status-bugs meson --prefix="${CI_PROJECT_DIR}/${CI_PROJECT_NAME}-$(cat VERSION)/${CI_BUILD_NAME}" -Dlv2libdir="" --cross-file "${CI_BUILD_NAME}" ${BUILD_OPTS} scanbuild - - scan-build --status-bugs ninja -C scanbuild - - scan-build --status-bugs ninja -C scanbuild test - artifacts: - name: "${CI_PROJECT_NAME}-$(cat VERSION)-${CI_BUILD_NAME}" - paths: - - "${CI_PROJECT_NAME}-$(cat VERSION)/${CI_BUILD_NAME}/" - -.cross_template: &cross_definition - stage: build - script: - - meson --prefix="${CI_PROJECT_DIR}/${CI_PROJECT_NAME}-$(cat VERSION)/${CI_BUILD_NAME}" -Dlv2libdir="" --cross-file "${CI_BUILD_NAME}" ${BUILD_OPTS} build - - ninja -C build - - ninja -C build test - - ninja -C build install - artifacts: - name: "${CI_PROJECT_NAME}-$(cat VERSION)-${CI_BUILD_NAME}" - paths: - - "${CI_PROJECT_NAME}-$(cat VERSION)/${CI_BUILD_NAME}/" - -# build -.universal_linux_template_stretch: &universal_linux_definition_stretch - image: ventosus/universal-linux-gnu:stretch - <<: *cross_definition - -.universal_linux_template_buster: &universal_linux_definition_buster - image: ventosus/universal-linux-gnu:buster - <<: *native_definition - -.universal_linux_template_bullseye: &universal_linux_definition_bullseye - image: ventosus/universal-linux-gnu:bullseye - <<: *native_definition - -.arm_linux_template_stretch: &arm_linux_definition_stretch - image: ventosus/arm-linux-gnueabihf:stretch - <<: *cross_definition - -.arm_linux_template_buster: &arm_linux_definition_buster - image: ventosus/arm-linux-gnueabihf:buster - <<: *cross_definition - -.arm_linux_template_bullseye: &arm_linux_definition_bullseye - image: ventosus/arm-linux-gnueabihf:bullseye - <<: *cross_definition - -# build -x86_64-linux-gnu-stretch: - <<: *universal_linux_definition_stretch - -x86_64-linux-gnu-buster: - <<: *universal_linux_definition_buster - -x86_64-linux-gnu-bullseye: - <<: *universal_linux_definition_bullseye - -i686-linux-gnu-stretch: - <<: *universal_linux_definition_stretch - -i686-linux-gnu-buster: - <<: *universal_linux_definition_buster - -i686-linux-gnu-bullseye: - <<: *universal_linux_definition_bullseye - -arm-linux-gnueabihf-stretch: - <<: *arm_linux_definition_stretch - -arm-linux-gnueabihf-buster: - <<: *arm_linux_definition_buster - -arm-linux-gnueabihf-bullseye: - <<: *arm_linux_definition_bullseye - -aarch64-linux-gnu-stretch: - <<: *arm_linux_definition_stretch - -aarch64-linux-gnu-buster: - <<: *arm_linux_definition_buster - -aarch64-linux-gnu-bullseye: - <<: *arm_linux_definition_bullseye - -pack: - stage: deploy - script: - - echo 'packing up' - artifacts: - name: "${CI_PROJECT_NAME}-$(cat VERSION)" - paths: - - "${CI_PROJECT_NAME}-$(cat VERSION)/" diff --git a/manifest.ttl b/manifest.ttl deleted file mode 100644 index a2bbaf8..0000000 --- a/manifest.ttl +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2015-2016 Hanspeter Portner (dev@open-music-kontrollers.ch) -# -# This is free software: you can redistribute it and/or modify -# it under the terms of the Artistic License 2.0 as published by -# The Perl Foundation. -# -# This source is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# Artistic License 2.0 for more details. -# -# You should have received a copy of the Artistic License 2.0 -# along the source as a COPYING file. If not, obtain it from -# http://www.perlfoundation.org/artistic_license_2_0. - -@prefix lv2: . -@prefix rdfs: . - - - a lv2:Specification ; - lv2:minorVersion 1 ; - lv2:microVersion 0 ; - rdfs:seeAlso . diff --git a/meson.build b/meson.build index 750f0dc..8d9962f 100644 --- a/meson.build +++ b/meson.build @@ -1,36 +1,75 @@ +# SPDX-FileCopyrightText: Hanspeter Portner +# SPDX-License-Identifier: CC0-1.0 + project('osc.lv2', 'c', default_options : [ 'buildtype=release', 'warning_level=3', - 'werror=true', - 'b_lto=false', + 'werror=false', + 'b_lto=true', 'c_std=c11']) -version = run_command('cat', 'VERSION').stdout().strip() +build_tests = get_option('build-tests') + +reuse = find_program('reuse', required : false) add_project_arguments('-D_GNU_SOURCE', language : 'c') -conf_data = configuration_data() cc = meson.get_compiler('c') lv2_dep = dependency('lv2') -thread_dep = dependency('threads') -deps = [lv2_dep, thread_dep] -c_args = [] +lib_deps = [ + lv2_dep +] -if host_machine.system() == 'windows' - deps += cc.find_library('ws2_32') - c_args += '-Wno-error=format' - c_args += '-Wno-error=format-extra-args' -endif +lib_incs = [ + include_directories('') +] + +lib_srcs = [ + join_paths('src', 'forge.c'), + join_paths('src', 'osc.c'), + join_paths('src', 'reader.c'), + join_paths('src', 'stream.c'), + join_paths('src', 'util.c'), + join_paths('src', 'writer.c') +] + +lib_args = [ +] + +osc_lv2 = declare_dependency( + compile_args : lib_args, + include_directories : lib_incs, + dependencies : lib_deps, + sources : lib_srcs) -osc_test = executable('osc_test', - join_paths('test', 'osc_test.c'), - c_args : c_args, - dependencies : deps, - install : false) +if build_tests + thread_dep = dependency('threads') -# FIXME start virautl serial pair before test -# socat -d -d pty,raw,echo=0 pty,raw,echo=0 -test('Test', osc_test, - timeout : 240) + test_deps = [ + thread_dep, + osc_lv2 + ] + + test_srcs = [ + join_paths('test', 'osc.c') + ] + + test_osc = executable('Test', test_srcs, + dependencies : test_deps, + install : false) + + # FIXME start virautl serial pair before test + # socat -d -d pty,raw,echo=0 pty,raw,echo=0 + test('Test', test_osc, + timeout : 240, + suite : ['memcheck']) + + if reuse.found() + test('REUSE', reuse, args : [ + '--root', meson.current_source_dir(), + 'lint' + ]) + endif +endif diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 0000000..9dbeb77 --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,9 @@ +# SPDX-FileCopyrightText: Hanspeter Portner +# SPDX-License-Identifier: CC0-1.0 + +option('build-tests', + type : 'boolean', + value : true, + yield : true) + +option('version', type : 'string', value : '0.1.171') diff --git a/osc.lv2/endian.h b/osc.lv2/endian.h deleted file mode 100644 index f310c51..0000000 --- a/osc.lv2/endian.h +++ /dev/null @@ -1,120 +0,0 @@ -// "License": Public Domain -// I, Mathias Panzenböck, place this file hereby into the public domain. Use it at your own risk for whatever you like. -// In case there are jurisdictions that don't support putting things in the public domain you can also consider it to -// be "dual licensed" under the BSD, MIT and Apache licenses, if you want to. This code is trivial anyway. Consider it -// an example on how to get the endian conversion functions on different platforms. - -#ifndef PORTABLE_ENDIAN_H__ -#define PORTABLE_ENDIAN_H__ - -#if (defined(_WIN16) || defined(_WIN32) || defined(_WIN64)) && !defined(__WINDOWS__) - -# define __WINDOWS__ - -#endif - -#if defined(__linux__) || defined(__CYGWIN__) - -# include - -#elif defined(__APPLE__) - -# include - -# define htobe16(x) OSSwapHostToBigInt16(x) -# define htole16(x) OSSwapHostToLittleInt16(x) -# define be16toh(x) OSSwapBigToHostInt16(x) -# define le16toh(x) OSSwapLittleToHostInt16(x) - -# define htobe32(x) OSSwapHostToBigInt32(x) -# define htole32(x) OSSwapHostToLittleInt32(x) -# define be32toh(x) OSSwapBigToHostInt32(x) -# define le32toh(x) OSSwapLittleToHostInt32(x) - -# define htobe64(x) OSSwapHostToBigInt64(x) -# define htole64(x) OSSwapHostToLittleInt64(x) -# define be64toh(x) OSSwapBigToHostInt64(x) -# define le64toh(x) OSSwapLittleToHostInt64(x) - -# define __BYTE_ORDER BYTE_ORDER -# define __BIG_ENDIAN BIG_ENDIAN -# define __LITTLE_ENDIAN LITTLE_ENDIAN -# define __PDP_ENDIAN PDP_ENDIAN - -#elif defined(__OpenBSD__) - -# include - -#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) - -# include - -#elif defined(__WINDOWS__) - -# include -# include - -# if BYTE_ORDER == LITTLE_ENDIAN - -# define htobe16(x) htons(x) -# define htole16(x) (x) -# define be16toh(x) ntohs(x) -# define le16toh(x) (x) - -# define htobe32(x) htonl(x) -# define htole32(x) (x) -# define be32toh(x) ntohl(x) -# define le32toh(x) (x) - -# ifndef htonll -static inline uint64_t htonll(uint64_t n) -{ - return (((uint64_t)htonl(n)) << 32) + htonl(n >> 32); -} -# endif - -# ifndef ntohll -# define ntohll htonll -# endif - -# define htobe64(x) htonll(x) -# define htole64(x) (x) -# define be64toh(x) ntohll(x) -# define le64toh(x) (x) - -# elif BYTE_ORDER == BIG_ENDIAN - - /* that would be xbox 360 */ -# define htobe16(x) (x) -# define htole16(x) __builtin_bswap16(x) -# define be16toh(x) (x) -# define le16toh(x) __builtin_bswap16(x) - -# define htobe32(x) (x) -# define htole32(x) __builtin_bswap32(x) -# define be32toh(x) (x) -# define le32toh(x) __builtin_bswap32(x) - -# define htobe64(x) (x) -# define htole64(x) __builtin_bswap64(x) -# define be64toh(x) (x) -# define le64toh(x) __builtin_bswap64(x) - -# else - -# error byte order not supported - -# endif - -# define __BYTE_ORDER BYTE_ORDER -# define __BIG_ENDIAN BIG_ENDIAN -# define __LITTLE_ENDIAN LITTLE_ENDIAN -# define __PDP_ENDIAN PDP_ENDIAN - -#else - -# error platform not supported - -#endif - -#endif diff --git a/osc.lv2/forge.h b/osc.lv2/forge.h index 6dc5fe7..c3860e1 100644 --- a/osc.lv2/forge.h +++ b/osc.lv2/forge.h @@ -1,30 +1,14 @@ /* - * Copyright (c) 2015-2016 Hanspeter Portner (dev@open-music-kontrollers.ch) - * - * This is free software: you can redistribute it and/or modify - * it under the terms of the Artistic License 2.0 as published by - * The Perl Foundation. - * - * This source is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * Artistic License 2.0 for more details. - * - * You should have received a copy of the Artistic License 2.0 - * along the source as a COPYING file. If not, obtain it from - * http://www.perlfoundation.org/artistic_license_2_0. + * SPDX-FileCopyrightText: Hanspeter Portner + * SPDX-License-Identifier: Artistic-2.0 */ #ifndef LV2_OSC_FORGE_H #define LV2_OSC_FORGE_H -#include - #include -#include -#include -#include +#include #ifdef __cplusplus extern "C" { @@ -60,412 +44,52 @@ extern "C" { #define lv2_osc_forge_symbol(forge, osc_urid, val) \ lv2_atom_forge_urid((forge), (val)) -static inline LV2_Atom_Forge_Ref +LV2_Atom_Forge_Ref lv2_osc_forge_chunk(LV2_Atom_Forge *forge, LV2_URID type, - const uint8_t *buf, uint32_t size) -{ - LV2_Atom_Forge_Ref ref; - - if( (ref = lv2_atom_forge_atom(forge, size, type)) - && (ref = lv2_atom_forge_raw(forge, buf, size)) ) - { - lv2_atom_forge_pad(forge, size); - return ref; - } + const uint8_t *buf, uint32_t size); - return 0; -} - -static inline LV2_Atom_Forge_Ref +LV2_Atom_Forge_Ref lv2_osc_forge_midi(LV2_Atom_Forge *forge, LV2_OSC_URID *osc_urid, - const uint8_t *buf, uint32_t size) -{ - assert(size <= 3); - return lv2_osc_forge_chunk(forge, osc_urid->MIDI_MidiEvent, buf, size); -} + const uint8_t *buf, uint32_t size); -static inline LV2_Atom_Forge_Ref +LV2_Atom_Forge_Ref lv2_osc_forge_blob(LV2_Atom_Forge* forge, LV2_OSC_URID *osc_urid, - const uint8_t *buf, uint32_t size) -{ - return lv2_osc_forge_chunk(forge, osc_urid->ATOM_Chunk, buf, size); -} + const uint8_t *buf, uint32_t size); -static inline LV2_Atom_Forge_Ref +LV2_Atom_Forge_Ref lv2_osc_forge_char(LV2_Atom_Forge* forge, LV2_OSC_URID *osc_urid, - char val) -{ - return lv2_atom_forge_literal(forge, &val, 1, osc_urid->OSC_Char, 0); -} + char val); -static inline LV2_Atom_Forge_Ref +LV2_Atom_Forge_Ref lv2_osc_forge_rgba(LV2_Atom_Forge* forge, LV2_OSC_URID *osc_urid, - uint8_t r, uint8_t g, uint8_t b, uint8_t a) -{ - char val [9]; - sprintf(val, "%02"PRIx8"%02"PRIx8"%02"PRIx8"%02"PRIx8, r, g, b, a); - return lv2_atom_forge_literal(forge, val, 8, osc_urid->OSC_RGBA, 0); -} + uint8_t r, uint8_t g, uint8_t b, uint8_t a); -static inline LV2_Atom_Forge_Ref +LV2_Atom_Forge_Ref lv2_osc_forge_timetag(LV2_Atom_Forge *forge, LV2_OSC_URID *osc_urid, - const LV2_OSC_Timetag *timetag) -{ - LV2_Atom_Forge_Frame frame; - LV2_Atom_Forge_Ref ref; - - if( (ref = lv2_atom_forge_object(forge, &frame, 0, osc_urid->OSC_Timetag)) - && (ref = lv2_atom_forge_key(forge, osc_urid->OSC_timetagIntegral)) - && (ref = lv2_atom_forge_long(forge, timetag->integral)) - && (ref = lv2_atom_forge_key(forge, osc_urid->OSC_timetagFraction)) - && (ref = lv2_atom_forge_long(forge, timetag->fraction)) ) - { - lv2_atom_forge_pop(forge, &frame); - return ref; - } + const LV2_OSC_Timetag *timetag); - return 0; -} - -static inline LV2_Atom_Forge_Ref +LV2_Atom_Forge_Ref lv2_osc_forge_bundle_head(LV2_Atom_Forge* forge, LV2_OSC_URID *osc_urid, - LV2_Atom_Forge_Frame frame [2], const LV2_OSC_Timetag *timetag) -{ - LV2_Atom_Forge_Ref ref; - - if( (ref = lv2_atom_forge_object(forge, &frame[0], 0, osc_urid->OSC_Bundle)) - && (ref = lv2_atom_forge_key(forge, osc_urid->OSC_bundleTimetag)) - && (ref = lv2_osc_forge_timetag(forge, osc_urid, timetag)) - && (ref = lv2_atom_forge_key(forge, osc_urid->OSC_bundleItems)) - && (ref = lv2_atom_forge_tuple(forge, &frame[1])) ) - { - return ref; - } + LV2_Atom_Forge_Frame frame [2], const LV2_OSC_Timetag *timetag); - return 0; -} - -/** - TODO -*/ -static inline LV2_Atom_Forge_Ref +LV2_Atom_Forge_Ref lv2_osc_forge_message_head(LV2_Atom_Forge *forge, LV2_OSC_URID *osc_urid, - LV2_Atom_Forge_Frame frame [2], const char *path) -{ - assert(path); - - LV2_Atom_Forge_Ref ref; - if( (ref = lv2_atom_forge_object(forge, &frame[0], 0, osc_urid->OSC_Message)) - && (ref = lv2_atom_forge_key(forge, osc_urid->OSC_messagePath)) - && (ref = lv2_atom_forge_string(forge, path, strlen(path))) - && (ref = lv2_atom_forge_key(forge, osc_urid->OSC_messageArguments)) - && (ref = lv2_atom_forge_tuple(forge, &frame[1])) ) - { - return ref; - } + LV2_Atom_Forge_Frame frame [2], const char *path); - return 0; -} +void +lv2_osc_forge_pop(LV2_Atom_Forge *forge, LV2_Atom_Forge_Frame frame [2]); -/** - TODO -*/ -static inline void -lv2_osc_forge_pop(LV2_Atom_Forge *forge, LV2_Atom_Forge_Frame frame [2]) -{ - lv2_atom_forge_pop(forge, &frame[1]); // a LV2_Atom_Tuple - lv2_atom_forge_pop(forge, &frame[0]); // a LV2_Atom_Object -} - -static inline LV2_Atom_Forge_Ref +LV2_Atom_Forge_Ref lv2_osc_forge_message_varlist(LV2_Atom_Forge *forge, LV2_OSC_URID *osc_urid, - const char *path, const char *fmt, va_list args) -{ - LV2_Atom_Forge_Frame frame [2]; - LV2_Atom_Forge_Ref ref; - - if(!lv2_osc_check_path(path) || !lv2_osc_check_fmt(fmt, 0)) - return 0; - if(!(ref = lv2_osc_forge_message_head(forge, osc_urid, frame, path))) - return 0; - - for(const char *type = fmt; *type; type++) - { - switch( (LV2_OSC_Type)*type) - { - case LV2_OSC_INT32: - { - if(!(ref = lv2_osc_forge_int(forge, osc_urid, va_arg(args, int32_t)))) - return 0; - break; - } - case LV2_OSC_FLOAT: - { - if(!(ref = lv2_osc_forge_float(forge, osc_urid, (float)va_arg(args, double)))) - return 0; - break; - } - case LV2_OSC_STRING: - { - const char *s = va_arg(args, const char *); - if(!s || !(ref = lv2_osc_forge_string(forge, osc_urid, s, strlen(s)))) - return 0; - break; - } - case LV2_OSC_BLOB: - { - const int32_t size = va_arg(args, int32_t); - const uint8_t *b = va_arg(args, const uint8_t *); - if(!b || !(ref = lv2_osc_forge_blob(forge, osc_urid, b, size))) - return 0; - break; - } - - case LV2_OSC_INT64: - { - if(!(ref = lv2_osc_forge_long(forge, osc_urid, va_arg(args, int64_t)))) - return 0; - break; - } - case LV2_OSC_DOUBLE: - { - if(!(ref = lv2_osc_forge_double(forge, osc_urid, va_arg(args, double)))) - return 0; - break; - } - case LV2_OSC_TIMETAG: - { - const LV2_OSC_Timetag timetag = { - .integral = va_arg(args, uint32_t), - .fraction = va_arg(args, uint32_t) - }; - if(!(ref = lv2_osc_forge_timetag(forge, osc_urid, &timetag))) - return 0; - break; - } - - case LV2_OSC_TRUE: - { - if(!(ref = lv2_osc_forge_true(forge, osc_urid))) - return 0; - break; - } - case LV2_OSC_FALSE: - { - if(!(ref = lv2_osc_forge_false(forge, osc_urid))) - return 0; - break; - } - case LV2_OSC_NIL: - { - if(!(ref = lv2_osc_forge_nil(forge, osc_urid))) - return 0; - break; - } - case LV2_OSC_IMPULSE: - { - if(!(ref = lv2_osc_forge_impulse(forge, osc_urid))) - return 0; - break; - } - - case LV2_OSC_SYMBOL: - { - if(!(ref = lv2_osc_forge_symbol(forge, osc_urid, va_arg(args, uint32_t)))) - return 0; - break; - } - case LV2_OSC_MIDI: - { - const int32_t size = va_arg(args, int32_t); - const uint8_t *m = va_arg(args, const uint8_t *); - if(!m || !(ref = lv2_osc_forge_midi(forge, osc_urid, m, size))) - return 0; - break; - } - case LV2_OSC_CHAR: - { - if(!(ref = lv2_osc_forge_char(forge, osc_urid, (char)va_arg(args, int)))) - return 0; - break; - } - case LV2_OSC_RGBA: - { - if(!(ref = lv2_osc_forge_rgba(forge, osc_urid, - (uint8_t)va_arg(args, unsigned), - (uint8_t)va_arg(args, unsigned), - (uint8_t)va_arg(args, unsigned), - (uint8_t)va_arg(args, unsigned)))) - return 0; - break; - } - } - } + const char *path, const char *fmt, va_list args); - lv2_osc_forge_pop(forge, frame); - - return ref; -} - -static inline LV2_Atom_Forge_Ref +LV2_Atom_Forge_Ref lv2_osc_forge_message_vararg(LV2_Atom_Forge *forge, LV2_OSC_URID *osc_urid, - const char *path, const char *fmt, ...) -{ - LV2_Atom_Forge_Ref ref; - va_list args; - - va_start(args, fmt); + const char *path, const char *fmt, ...); - ref = lv2_osc_forge_message_varlist(forge, osc_urid, path, fmt, args); - - va_end(args); - - return ref; -} - -static inline LV2_Atom_Forge_Ref +LV2_Atom_Forge_Ref lv2_osc_forge_packet(LV2_Atom_Forge *forge, LV2_OSC_URID *osc_urid, - LV2_URID_Map *map, const uint8_t *buf, size_t size) -{ - LV2_OSC_Reader reader; - LV2_Atom_Forge_Frame frame [2]; - LV2_Atom_Forge_Ref ref; - - lv2_osc_reader_initialize(&reader, buf, size); - - if(lv2_osc_reader_is_bundle(&reader)) - { - LV2_OSC_Item *itm = OSC_READER_BUNDLE_BEGIN(&reader, size); - - if(itm && (ref = lv2_osc_forge_bundle_head(forge, osc_urid, frame, - LV2_OSC_TIMETAG_CREATE(itm->timetag)))) - { - OSC_READER_BUNDLE_ITERATE(&reader, itm) - { - if(!(ref = lv2_osc_forge_packet(forge, osc_urid, map, itm->body, itm->size))) - return 0; - } - - lv2_osc_forge_pop(forge, frame); - - return ref; - } - } - else if(lv2_osc_reader_is_message(&reader)) - { - LV2_OSC_Arg *arg = OSC_READER_MESSAGE_BEGIN(&reader, size); - - if(arg && (ref = lv2_osc_forge_message_head(forge, osc_urid, frame, arg->path))) - { - OSC_READER_MESSAGE_ITERATE(&reader, arg) - { - switch( (LV2_OSC_Type)*arg->type) - { - case LV2_OSC_INT32: - { - if(!(ref = lv2_osc_forge_int(forge, osc_urid, arg->i))) - return 0; - break; - } - case LV2_OSC_FLOAT: - { - if(!(ref = lv2_osc_forge_float(forge, osc_urid, arg->f))) - return 0; - break; - } - case LV2_OSC_STRING: - { - if(!(ref = lv2_osc_forge_string(forge, osc_urid, arg->s, arg->size - 1))) - return 0; - break; - } - case LV2_OSC_BLOB: - { - if(!(ref = lv2_osc_forge_blob(forge, osc_urid, arg->b, arg->size))) - return 0; - break; - } - - case LV2_OSC_INT64: - { - if(!(ref = lv2_osc_forge_long(forge, osc_urid, arg->h))) - return 0; - break; - } - case LV2_OSC_DOUBLE: - { - if(!(ref = lv2_osc_forge_double(forge, osc_urid, arg->d))) - return 0; - break; - } - case LV2_OSC_TIMETAG: - { - if(!(ref = lv2_osc_forge_timetag(forge, osc_urid, LV2_OSC_TIMETAG_CREATE(arg->t)))) - return 0; - break; - } - - case LV2_OSC_TRUE: - { - if(!(ref = lv2_osc_forge_true(forge, osc_urid))) - return 0; - break; - } - case LV2_OSC_FALSE: - { - if(!(ref = lv2_osc_forge_false(forge, osc_urid))) - return 0; - break; - } - case LV2_OSC_NIL: - { - if(!(ref = lv2_osc_forge_nil(forge, osc_urid))) - return 0; - break; - } - case LV2_OSC_IMPULSE: - { - if(!(ref = lv2_osc_forge_impulse(forge, osc_urid))) - return 0; - break; - } - - case LV2_OSC_SYMBOL: - { - if(!(ref = lv2_osc_forge_symbol(forge, osc_urid, - map->map(map->handle, arg->S)))) - return 0; - break; - } - case LV2_OSC_MIDI: - { - if(!(ref = lv2_osc_forge_midi(forge, osc_urid, &arg->b[1], arg->size - 1))) - return 0; - break; - } - case LV2_OSC_CHAR: - { - if(!(ref = lv2_osc_forge_char(forge, osc_urid, arg->c))) - return 0; - break; - } - case LV2_OSC_RGBA: - { - if(!(ref = lv2_osc_forge_rgba(forge, osc_urid, arg->R, arg->G, arg->B, arg->A))) - return 0; - break; - } - } - } - - lv2_osc_forge_pop(forge, frame); - - return ref; - } - } - - return 0; -} + LV2_URID_Map *map, const uint8_t *buf, size_t size); #ifdef __cplusplus } // extern "C" diff --git a/osc.lv2/osc.h b/osc.lv2/osc.h index 1ada68c..124fb41 100644 --- a/osc.lv2/osc.h +++ b/osc.lv2/osc.h @@ -1,28 +1,14 @@ /* - * Copyright (c) 2015-2016 Hanspeter Portner (dev@open-music-kontrollers.ch) - * - * This is free software: you can redistribute it and/or modify - * it under the terms of the Artistic License 2.0 as published by - * The Perl Foundation. - * - * This source is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * Artistic License 2.0 for more details. - * - * You should have received a copy of the Artistic License 2.0 - * along the source as a COPYING file. If not, obtain it from - * http://www.perlfoundation.org/artistic_license_2_0. + * SPDX-FileCopyrightText: Hanspeter Portner + * SPDX-License-Identifier: Artistic-2.0 */ #ifndef LV2_OSC_H #define LV2_OSC_H -#include - -#include -#include -#include +#include +#include +#include #define LV2_OSC_URI "http://open-music-kontrollers.ch/lv2/osc" #define LV2_OSC_PREFIX LV2_OSC_URI "#" @@ -148,42 +134,8 @@ typedef struct _LV2_OSC_URID { LV2_URID ATOM_Chunk; } LV2_OSC_URID; -static inline void -lv2_osc_urid_init(LV2_OSC_URID *osc_urid, LV2_URID_Map *map) -{ - osc_urid->OSC_Packet = map->map(map->handle, LV2_OSC__Packet); - - osc_urid->OSC_Bundle = map->map(map->handle, LV2_OSC__Bundle); - osc_urid->OSC_bundleTimetag = map->map(map->handle, LV2_OSC__bundleTimetag); - osc_urid->OSC_bundleItems = map->map(map->handle, LV2_OSC__bundleItems); - - osc_urid->OSC_Message = map->map(map->handle, LV2_OSC__Message); - osc_urid->OSC_messagePath = map->map(map->handle, LV2_OSC__messagePath); - osc_urid->OSC_messageArguments = map->map(map->handle, LV2_OSC__messageArguments); - - osc_urid->OSC_Timetag = map->map(map->handle, LV2_OSC__Timetag); - osc_urid->OSC_timetagIntegral = map->map(map->handle, LV2_OSC__timetagIntegral); - osc_urid->OSC_timetagFraction = map->map(map->handle, LV2_OSC__timetagFraction); - - osc_urid->OSC_Nil = map->map(map->handle, LV2_OSC__Nil); - osc_urid->OSC_Impulse = map->map(map->handle, LV2_OSC__Impulse); - osc_urid->OSC_Char = map->map(map->handle, LV2_OSC__Char); - osc_urid->OSC_RGBA = map->map(map->handle, LV2_OSC__RGBA); - - osc_urid->MIDI_MidiEvent = map->map(map->handle, LV2_MIDI__MidiEvent); - - osc_urid->ATOM_Int = map->map(map->handle, LV2_ATOM__Int); - osc_urid->ATOM_Long = map->map(map->handle, LV2_ATOM__Long); - osc_urid->ATOM_String = map->map(map->handle, LV2_ATOM__String); - osc_urid->ATOM_Literal = map->map(map->handle, LV2_ATOM__Literal); - osc_urid->ATOM_Float = map->map(map->handle, LV2_ATOM__Float); - osc_urid->ATOM_Double = map->map(map->handle, LV2_ATOM__Double); - osc_urid->ATOM_URID = map->map(map->handle, LV2_ATOM__URID); - osc_urid->ATOM_Bool = map->map(map->handle, LV2_ATOM__Bool); - osc_urid->ATOM_Tuple = map->map(map->handle, LV2_ATOM__Tuple); - osc_urid->ATOM_Object = map->map(map->handle, LV2_ATOM__Object); - osc_urid->ATOM_Chunk = map->map(map->handle, LV2_ATOM__Chunk); -} +void +lv2_osc_urid_init(LV2_OSC_URID *osc_urid, LV2_URID_Map *map); #ifdef __cplusplus } // extern "C" diff --git a/osc.lv2/reader.h b/osc.lv2/reader.h index ae46dfa..d102c0f 100644 --- a/osc.lv2/reader.h +++ b/osc.lv2/reader.h @@ -1,36 +1,17 @@ /* - * Copyright (c) 2015-2016 Hanspeter Portner (dev@open-music-kontrollers.ch) - * - * This is free software: you can redistribute it and/or modify - * it under the terms of the Artistic License 2.0 as published by - * The Perl Foundation. - * - * This source is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * Artistic License 2.0 for more details. - * - * You should have received a copy of the Artistic License 2.0 - * along the source as a COPYING file. If not, obtain it from - * http://www.perlfoundation.org/artistic_license_2_0. + * SPDX-FileCopyrightText: Hanspeter Portner + * SPDX-License-Identifier: Artistic-2.0 */ #ifndef LV2_OSC_READER_H #define LV2_OSC_READER_H -#include -#include -#include - #include -#include -#include #ifdef __cplusplus extern "C" { #endif - typedef struct _LV2_OSC_Tree LV2_OSC_Tree; typedef struct _LV2_OSC_Reader LV2_OSC_Reader; typedef struct _LV2_OSC_Item LV2_OSC_Item; @@ -86,229 +67,62 @@ struct _LV2_OSC_Arg { const uint8_t *end; }; -static inline void -lv2_osc_reader_initialize(LV2_OSC_Reader *reader, const uint8_t *buf, size_t size) -{ - reader->buf = buf; - reader->ptr = buf; - reader->end = buf + size; -} - -static inline bool -lv2_osc_reader_overflow(LV2_OSC_Reader *reader, size_t size) -{ - return reader->ptr + size > reader->end; -} - -static inline bool -lv2_osc_reader_be32toh(LV2_OSC_Reader *reader, union swap32_t *s32) -{ - if(lv2_osc_reader_overflow(reader, 4)) - return false; - - s32->u = *(const uint32_t *)reader->ptr; - s32->u = be32toh(s32->u); - reader->ptr += 4; - - return true; -} - -static inline bool -lv2_osc_reader_be64toh(LV2_OSC_Reader *reader, union swap64_t *s64) -{ - if(lv2_osc_reader_overflow(reader, 8)) - return false; - - s64->u = *(const uint64_t *)reader->ptr; - s64->u = be64toh(s64->u); - reader->ptr += 8; - - return true; -} - -static inline bool -lv2_osc_reader_get_int32(LV2_OSC_Reader *reader, int32_t *i) -{ - union swap32_t s32; - if(!lv2_osc_reader_be32toh(reader, &s32)) - return false; - - *i = s32.i; - - return true; -} - -static inline bool -lv2_osc_reader_get_float(LV2_OSC_Reader *reader, float *f) -{ - union swap32_t s32; - if(!lv2_osc_reader_be32toh(reader, &s32)) - return false; - - *f = s32.f; - - return true; -} - -static inline bool -lv2_osc_reader_get_int64(LV2_OSC_Reader *reader, int64_t *h) -{ - union swap64_t s64; - if(!lv2_osc_reader_be64toh(reader, &s64)) - return false; - - *h = s64.h; - - return true; -} - -static inline bool -lv2_osc_reader_get_timetag(LV2_OSC_Reader *reader, uint64_t *t) -{ - union swap64_t s64; - if(!lv2_osc_reader_be64toh(reader, &s64)) - return false; - - *t = s64.u; - - return true; -} - -static inline bool -lv2_osc_reader_get_double(LV2_OSC_Reader *reader, double *d) -{ - union swap64_t s64; - if(!lv2_osc_reader_be64toh(reader, &s64)) - return false; - - *d = s64.d; - - return true; -} - -static inline bool -lv2_osc_reader_get_string(LV2_OSC_Reader *reader, const char **s) -{ - const char *str = (const char *)reader->ptr; - const size_t padded = LV2_OSC_PADDED_SIZE(strlen(str) + 1); - if(lv2_osc_reader_overflow(reader, padded )) - return false; - - *s = str; - reader->ptr += padded; - - return true; -} - -static inline bool -lv2_osc_reader_get_symbol(LV2_OSC_Reader *reader, const char **S) -{ - return lv2_osc_reader_get_string(reader, S); -} - -static inline bool -lv2_osc_reader_get_midi(LV2_OSC_Reader *reader, const uint8_t **m) -{ - if(lv2_osc_reader_overflow(reader, 4)) - return false; - - *m = reader->ptr; - reader->ptr += 4; - - return true; -} - -static inline bool -lv2_osc_reader_get_blob(LV2_OSC_Reader *reader, int32_t *len, const uint8_t **body) -{ - if(!lv2_osc_reader_get_int32(reader, len)) - return false; - - const size_t padded = LV2_OSC_PADDED_SIZE(*len); - if(lv2_osc_reader_overflow(reader, padded)) - return false; - - *body = reader->ptr; - reader->ptr += padded; - - return true; -} +void +lv2_osc_reader_initialize(LV2_OSC_Reader *reader, const uint8_t *buf, size_t size); -static inline bool -lv2_osc_reader_get_rgba(LV2_OSC_Reader *reader, uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *a) -{ - if(lv2_osc_reader_overflow(reader, 4)) - return false; +bool +lv2_osc_reader_overflow(LV2_OSC_Reader *reader, size_t size); - *r = reader->ptr[0]; - *g = reader->ptr[1]; - *b = reader->ptr[2]; - *a = reader->ptr[3]; - reader->ptr += 4; +bool +lv2_osc_reader_be32toh(LV2_OSC_Reader *reader, union swap32_t *s32); - return true; -} +bool +lv2_osc_reader_be64toh(LV2_OSC_Reader *reader, union swap64_t *s64); -static inline bool -lv2_osc_reader_get_char(LV2_OSC_Reader *reader, char *c) -{ - int32_t i; - if(!lv2_osc_reader_get_int32(reader, &i)) - return false; +bool +lv2_osc_reader_get_int32(LV2_OSC_Reader *reader, int32_t *i); - *c = i; +bool +lv2_osc_reader_get_float(LV2_OSC_Reader *reader, float *f); - return true; -} +bool +lv2_osc_reader_get_int64(LV2_OSC_Reader *reader, int64_t *h); -static inline LV2_OSC_Item * -lv2_osc_reader_item_raw(LV2_OSC_Reader *reader, LV2_OSC_Item *itm) -{ - if(!lv2_osc_reader_get_int32(reader, &itm->size)) - return NULL; +bool +lv2_osc_reader_get_timetag(LV2_OSC_Reader *reader, uint64_t *t); - if(lv2_osc_reader_overflow(reader, itm->size)) - return NULL; +bool +lv2_osc_reader_get_double(LV2_OSC_Reader *reader, double *d); - itm->body = reader->ptr; +bool +lv2_osc_reader_get_string(LV2_OSC_Reader *reader, const char **s); - return itm; -} - -static inline LV2_OSC_Item * -lv2_osc_reader_item_begin(LV2_OSC_Reader *reader, LV2_OSC_Item *itm, size_t len) -{ - if(lv2_osc_reader_overflow(reader, len)) - return NULL; +bool +lv2_osc_reader_get_symbol(LV2_OSC_Reader *reader, const char **S); - itm->end = reader->ptr + len; +bool +lv2_osc_reader_get_midi(LV2_OSC_Reader *reader, const uint8_t **m); - if(lv2_osc_reader_overflow(reader, 16)) - return NULL; +bool +lv2_osc_reader_get_blob(LV2_OSC_Reader *reader, int32_t *len, const uint8_t **body); - if(strncmp((const char *)reader->ptr, "#bundle", 8)) - return NULL; - reader->ptr += 8; +bool +lv2_osc_reader_get_rgba(LV2_OSC_Reader *reader, uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *a); - if(!lv2_osc_reader_get_timetag(reader, &itm->timetag)) - return NULL; +bool +lv2_osc_reader_get_char(LV2_OSC_Reader *reader, char *c); - return lv2_osc_reader_item_raw(reader, itm); -} +LV2_OSC_Item * +lv2_osc_reader_item_raw(LV2_OSC_Reader *reader, LV2_OSC_Item *itm); -static inline bool -lv2_osc_reader_item_is_end(LV2_OSC_Reader *reader, LV2_OSC_Item *itm) -{ - return reader->ptr > itm->end; -} +LV2_OSC_Item * +lv2_osc_reader_item_begin(LV2_OSC_Reader *reader, LV2_OSC_Item *itm, size_t len); -static inline LV2_OSC_Item * -lv2_osc_reader_item_next(LV2_OSC_Reader *reader, LV2_OSC_Item *itm) -{ - reader->ptr += itm->size; +bool +lv2_osc_reader_item_is_end(LV2_OSC_Reader *reader, LV2_OSC_Item *itm); - return lv2_osc_reader_item_raw(reader, itm); -} +LV2_OSC_Item * +lv2_osc_reader_item_next(LV2_OSC_Reader *reader, LV2_OSC_Item *itm); #define OSC_READER_BUNDLE_BEGIN(reader, len) \ lv2_osc_reader_item_begin( \ @@ -326,147 +140,17 @@ lv2_osc_reader_item_next(LV2_OSC_Reader *reader, LV2_OSC_Item *itm) itm && !lv2_osc_reader_item_is_end((reader), (itm)); \ itm = lv2_osc_reader_item_next((reader), (itm))) -static inline LV2_OSC_Arg * -lv2_osc_reader_arg_raw(LV2_OSC_Reader *reader, LV2_OSC_Arg *arg) -{ - switch( (LV2_OSC_Type)*arg->type) - { - case LV2_OSC_INT32: - { - if(!lv2_osc_reader_get_int32(reader, &arg->i)) - return NULL; - arg->size = 4; - - break; - } - case LV2_OSC_FLOAT: - { - if(!lv2_osc_reader_get_float(reader, &arg->f)) - return NULL; - arg->size = 4; - - break; - } - case LV2_OSC_STRING: - { - if(!lv2_osc_reader_get_string(reader, &arg->s)) - return NULL; - arg->size = strlen(arg->s) + 1; - - break; - } - case LV2_OSC_BLOB: - { - if(!lv2_osc_reader_get_blob(reader, &arg->size, &arg->b)) - return NULL; - //arg->size = arg->size; - - break; - } - - case LV2_OSC_TRUE: - case LV2_OSC_FALSE: - case LV2_OSC_NIL: - case LV2_OSC_IMPULSE: - break; - - case LV2_OSC_INT64: - { - if(!lv2_osc_reader_get_int64(reader, &arg->h)) - return NULL; - arg->size = 8; - - break; - } - case LV2_OSC_DOUBLE: - { - if(!lv2_osc_reader_get_double(reader, &arg->d)) - return NULL; - arg->size = 8; - - break; - } - case LV2_OSC_TIMETAG: - { - if(!lv2_osc_reader_get_timetag(reader, &arg->t)) - return NULL; - arg->size = 8; - - break; - } - - case LV2_OSC_MIDI: - { - if(!lv2_osc_reader_get_midi(reader, &arg->m)) - return NULL; - arg->size = 4; - - break; - } - case LV2_OSC_SYMBOL: - { - if(!lv2_osc_reader_get_symbol(reader, &arg->S)) - return NULL; - arg->size = strlen(arg->S) + 1; - - break; - } - case LV2_OSC_CHAR: - { - if(!lv2_osc_reader_get_char(reader, &arg->c)) - return NULL; - arg->size = 4; - - break; - } - case LV2_OSC_RGBA: - { - if(!lv2_osc_reader_get_rgba(reader, &arg->R, &arg->G, &arg->B, &arg->A)) - return NULL; - arg->size = 4; - - break; - } - } - - return arg; -} - -static inline LV2_OSC_Arg * -lv2_osc_reader_arg_begin(LV2_OSC_Reader *reader, LV2_OSC_Arg *arg, size_t len) -{ - if(lv2_osc_reader_overflow(reader, len)) - return NULL; - - arg->end = reader->ptr + len; - - if(!lv2_osc_reader_get_string(reader, &arg->path)) //TODO check for validity - return NULL; - - if(!lv2_osc_reader_get_string(reader, &arg->type)) //TODO check for validity - return NULL; - - if(*arg->type != ',') - return NULL; - - arg->type++; // skip ',' - - return lv2_osc_reader_arg_raw(reader, arg); -} - -static inline bool -lv2_osc_reader_arg_is_end(LV2_OSC_Reader *reader, LV2_OSC_Arg *arg) -{ - return (*arg->type == '\0') || (reader->ptr > arg->end); -} - -static inline LV2_OSC_Arg * -lv2_osc_reader_arg_next(LV2_OSC_Reader *reader, LV2_OSC_Arg *arg) -{ - arg->type++; - - return lv2_osc_reader_arg_raw(reader, arg); -} +LV2_OSC_Arg * +lv2_osc_reader_arg_raw(LV2_OSC_Reader *reader, LV2_OSC_Arg *arg); + +LV2_OSC_Arg * +lv2_osc_reader_arg_begin(LV2_OSC_Reader *reader, LV2_OSC_Arg *arg, size_t len); + +bool +lv2_osc_reader_arg_is_end(LV2_OSC_Reader *reader, LV2_OSC_Arg *arg); + +LV2_OSC_Arg * +lv2_osc_reader_arg_next(LV2_OSC_Reader *reader, LV2_OSC_Arg *arg); #define OSC_READER_MESSAGE_BEGIN(reader, len) \ lv2_osc_reader_arg_begin( \ @@ -484,143 +168,21 @@ lv2_osc_reader_arg_next(LV2_OSC_Reader *reader, LV2_OSC_Arg *arg) arg && !lv2_osc_reader_arg_is_end((reader), (arg)); \ arg = lv2_osc_reader_arg_next((reader), (arg))) -static inline bool -lv2_osc_reader_arg_varlist(LV2_OSC_Reader *reader, const char *fmt, va_list args) -{ - for(const char *type = fmt; *type; type++) - { - switch( (LV2_OSC_Type)*type) - { - case LV2_OSC_INT32: - if(!lv2_osc_reader_get_int32(reader, va_arg(args, int32_t *))) - return false; - break; - case LV2_OSC_FLOAT: - if(!lv2_osc_reader_get_float(reader, va_arg(args, float *))) - return false; - break; - case LV2_OSC_STRING: - if(!lv2_osc_reader_get_string(reader, va_arg(args, const char **))) - return false; - break; - case LV2_OSC_BLOB: - if(!lv2_osc_reader_get_blob(reader, va_arg(args, int32_t *), va_arg(args, const uint8_t **))) - return false; - break; - - case LV2_OSC_TRUE: - case LV2_OSC_FALSE: - case LV2_OSC_NIL: - case LV2_OSC_IMPULSE: - break; - - case LV2_OSC_INT64: - if(!lv2_osc_reader_get_int64(reader, va_arg(args, int64_t *))) - return false; - break; - case LV2_OSC_DOUBLE: - if(!lv2_osc_reader_get_double(reader, va_arg(args, double *))) - return false; - break; - case LV2_OSC_TIMETAG: - if(!lv2_osc_reader_get_timetag(reader, va_arg(args, uint64_t *))) - return false; - break; - - case LV2_OSC_MIDI: - if(!lv2_osc_reader_get_midi(reader, va_arg(args, const uint8_t **))) - return false; - break; - case LV2_OSC_SYMBOL: - if(!lv2_osc_reader_get_symbol(reader, va_arg(args, const char **))) - return false; - break; - case LV2_OSC_CHAR: - if(!lv2_osc_reader_get_char(reader, va_arg(args, char *))) - return false; - break; - case LV2_OSC_RGBA: - if(!lv2_osc_reader_get_rgba(reader, va_arg(args, uint8_t *), va_arg(args, uint8_t *), - va_arg(args, uint8_t *), va_arg(args, uint8_t *))) - return false; - break; - } - } - - return true; -} - -static inline bool -lv2_osc_reader_arg_vararg(LV2_OSC_Reader *reader, const char *fmt, ...) -{ - va_list args; - va_start(args, fmt); - - const bool res = lv2_osc_reader_arg_varlist(reader, fmt, args); - - va_end(args); - - return res; -} - -static inline bool -lv2_osc_reader_is_bundle(LV2_OSC_Reader *reader) -{ - return strncmp((const char *)reader->ptr, "#bundle", 8) == 0; -} - -static inline bool -lv2_osc_reader_is_message(LV2_OSC_Reader *reader) -{ - return reader->ptr[0] == '/'; //FIXME check path -} - -static inline void -_lv2_osc_trees_internal(LV2_OSC_Reader *reader, const char *path, const char *from, - LV2_OSC_Arg *arg, const LV2_OSC_Tree *trees, void *data) -{ - const char *ptr = strchr(from, '/'); - const char *pattern = strpbrk(from, "*?[]{}/"); - const bool has_pattern = pattern && (pattern[0] != '/'); - (void)has_pattern; //FIXME - - const size_t len = ptr - ? (size_t)(ptr - from) - : strlen(from); - - for(const LV2_OSC_Tree *tree = trees; tree && tree->name; tree++) - { - if(lv2_osc_pattern_match(from, tree->name, len)) - { - if(tree->trees && ptr) - { - if(tree->branch) - { - LV2_OSC_Reader reader_clone = *reader; - tree->branch(&reader_clone, arg, tree, data); - } - - _lv2_osc_trees_internal(reader, path, &ptr[1], arg, tree->trees, data); - } - else if(tree->branch && !ptr) - { - LV2_OSC_Reader reader_clone = *reader; - tree->branch(&reader_clone, arg, tree, data); - } - } - } -} - -static inline void +bool +lv2_osc_reader_arg_varlist(LV2_OSC_Reader *reader, const char *fmt, va_list args); + +bool +lv2_osc_reader_arg_vararg(LV2_OSC_Reader *reader, const char *fmt, ...); + +bool +lv2_osc_reader_is_bundle(LV2_OSC_Reader *reader); + +bool +lv2_osc_reader_is_message(LV2_OSC_Reader *reader); + +void lv2_osc_reader_match(LV2_OSC_Reader *reader, size_t len, - const LV2_OSC_Tree *trees, void *data) -{ - LV2_OSC_Arg *arg = OSC_READER_MESSAGE_BEGIN(reader, len); - const char *path = arg->path; - const char *from = &path[1]; - - _lv2_osc_trees_internal(reader, path, from, arg, trees, data); -} + const LV2_OSC_Tree *trees, void *data); #ifdef __cplusplus } // extern "C" diff --git a/osc.lv2/stream.h b/osc.lv2/stream.h index 55c94d2..4dcbcd8 100644 --- a/osc.lv2/stream.h +++ b/osc.lv2/stream.h @@ -1,56 +1,17 @@ /* - * Copyright (c) 2015-2016 Hanspeter Portner (dev@open-music-kontrollers.ch) - * - * This is free software: you can redistribute it and/or modify - * it under the terms of the Artistic License 2.0 as published by - * The Perl Foundation. - * - * This source is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * Artistic License 2.0 for more details. - * - * You should have received a copy of the Artistic License 2.0 - * along the source as a COPYING file. If not, obtain it from - * http://www.perlfoundation.org/artistic_license_2_0. + * SPDX-FileCopyrightText: Hanspeter Portner + * SPDX-License-Identifier: Artistic-2.0 */ #ifndef LV2_OSC_STREAM_H #define LV2_OSC_STREAM_H -#include -#include -#include -#if !defined(_WIN32) -# include -# include -# include -# include -# include -# include -# include -# include -#endif -#include -#include -#include -#include -#include +#include +#include +#include #include -#if !defined(LV2_OSC_STREAM_SNDBUF) -# define LV2_OSC_STREAM_SNDBUF 0x100000 // 1 M -#endif - -#if !defined(LV2_OSC_STREAM_RCVBUF) -# define LV2_OSC_STREAM_RCVBUF 0x100000 // 1 M -#endif - -#if !defined(LV2_OSC_STREAM_REQBUF) -# define LV2_OSC_STREAM_REQBUF 1024 -#endif - #ifdef __cplusplus extern "C" { #endif @@ -116,1315 +77,29 @@ typedef enum _LV2_OSC_Enum { LV2_OSC_ERR = 0x00ffff } LV2_OSC_Enum; -static const char *udp_prefix = "osc.udp://"; -static const char *tcp_prefix = "osc.tcp://"; -static const char *tcp_slip_prefix = "osc.slip.tcp://"; -static const char *tcp_prefix_prefix = "osc.prefix.tcp://"; -static const char *ser_prefix = "osc.serial://"; -//FIXME serial - - -static inline int -_lv2_osc_stream_interface_attribs(int fd, int speed) -{ - struct termios tty; - - if(tcgetattr(fd, &tty) < 0) - { - return -1; - } - - cfsetospeed(&tty, (speed_t)speed); - cfsetispeed(&tty, (speed_t)speed); - - tty.c_cflag |= (CLOCAL | CREAD); /* ignore modem controls */ - tty.c_cflag &= ~CSIZE; - tty.c_cflag |= CS8; /* 8-bit characters */ - tty.c_cflag &= ~PARENB; /* no parity bit */ - tty.c_cflag &= ~CSTOPB; /* only need 1 stop bit */ - tty.c_cflag &= ~CRTSCTS; /* no hardware flowcontrol */ - - /* setup for non-canonical mode */ - tty.c_iflag &= ~(IGNCR | ONLCR | IXON); - tty.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); - tty.c_oflag &= ~OPOST; - - /* fetch bytes as they become available */ - tty.c_cc[VMIN] = 0; - tty.c_cc[VTIME] = 0; - - if(tcsetattr(fd, TCSANOW, &tty) != 0) - { - return -1; - } - - return 0; -} - #define LV2_OSC_STREAM_ERRNO(EV, ERRNO) ( (EV & (~LV2_OSC_ERR)) | (ERRNO) ) -static inline void -_close_socket(int *fd) -{ - if(fd) - { - if(*fd >= 0) - { - close(*fd); - } - - *fd = -1; - } -} - -static inline int -lv2_osc_stream_deinit(LV2_OSC_Stream *stream) -{ - _close_socket(&stream->fd); - _close_socket(&stream->sock); - - return 0; -} - -static inline int -_lv2_osc_stream_reinit(LV2_OSC_Stream *stream) -{ - LV2_OSC_Enum ev = LV2_OSC_NONE; - lv2_osc_stream_deinit(stream); - - char *dup = strdup(stream->url); - if(!dup) - { - ev = LV2_OSC_STREAM_ERRNO(ev, ENOMEM); - goto fail; - } - - char *ptr = dup; - char *tmp; - - if(strncmp(ptr, udp_prefix, strlen(udp_prefix)) == 0) - { - stream->slip = false; - stream->socket_family = AF_INET; - stream->socket_type = SOCK_DGRAM; - stream->protocol = IPPROTO_UDP; - ptr += strlen(udp_prefix); - } - else if(strncmp(ptr, tcp_prefix, strlen(tcp_prefix)) == 0) - { - stream->slip = true; - stream->socket_family = AF_INET; - stream->socket_type = SOCK_STREAM; - stream->protocol = IPPROTO_TCP; - ptr += strlen(tcp_prefix); - } - else if(strncmp(ptr, tcp_slip_prefix, strlen(tcp_slip_prefix)) == 0) - { - stream->slip = true; - stream->socket_family = AF_INET; - stream->socket_type = SOCK_STREAM; - stream->protocol = IPPROTO_TCP; - ptr += strlen(tcp_slip_prefix); - } - else if(strncmp(ptr, tcp_prefix_prefix, strlen(tcp_prefix_prefix)) == 0) - { - stream->slip = false; - stream->socket_family = AF_INET; - stream->socket_type = SOCK_STREAM; - stream->protocol = IPPROTO_TCP; - ptr += strlen(tcp_prefix_prefix); - } - else if(strncmp(ptr, ser_prefix, strlen(ser_prefix)) == 0) - { - stream->slip = true; - stream->serial = true; - ptr += strlen(ser_prefix); - } - else - { - ev = LV2_OSC_STREAM_ERRNO(ev, ENOPROTOOPT); - goto fail; - } - - if(ptr[0] == '\0') - { - ev = LV2_OSC_STREAM_ERRNO(ev, EDESTADDRREQ); - goto fail; - } - - if(stream->serial) - { - stream->sock = open(ptr, O_RDWR | O_NOCTTY | O_NDELAY); - if(stream->sock < 0) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - - if(fcntl(stream->sock, F_SETFL, FNDELAY) == -1) //FIXME - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - - if(_lv2_osc_stream_interface_attribs(stream->sock, B115200) == -1) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - - stream->connected = true; - } - else // !stream->serial - { - const char *node = NULL; - const char *iface = NULL; - const char *service = NULL; - - // optional IPv6 - if(ptr[0] == '[') - { - stream->socket_family = AF_INET6; - ++ptr; - } - - node = ptr; - - // optional IPv6 - if( (tmp = strchr(ptr, '%')) ) - { - if(stream->socket_family != AF_INET6) - { - ev = LV2_OSC_STREAM_ERRNO(ev, EPROTOTYPE); - goto fail; - } - - ptr = tmp; - ptr[0] = '\0'; - iface = ++ptr; - } - - // optional IPv6 - if( (tmp = strchr(ptr, ']')) ) - if(ptr) - { - if(stream->socket_family != AF_INET6) - { - ev = LV2_OSC_STREAM_ERRNO(ev, EDESTADDRREQ); - goto fail; - } - - ptr = tmp; - ptr[0] = '\0'; - ++ptr; - } - - // mandatory IPv4/6 - ptr = strchr(ptr, ':'); - if(!ptr) - { - ev = LV2_OSC_STREAM_ERRNO(ev, EDESTADDRREQ); - goto fail; - } - - ptr[0] = '\0'; - - service = ++ptr; - - if(strlen(node) == 0) - { - node = NULL; - stream->server = true; - } - - stream->sock = socket(stream->socket_family, stream->socket_type, - stream->protocol); - - if(stream->sock < 0) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - - if(fcntl(stream->sock, F_SETFL, O_NONBLOCK) == -1) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - - const int sendbuff = LV2_OSC_STREAM_SNDBUF; - const int recvbuff = LV2_OSC_STREAM_RCVBUF; - const int reuseaddr = 1; - - if(setsockopt(stream->sock, SOL_SOCKET, - SO_SNDBUF, &sendbuff, sizeof(sendbuff)) == -1) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - - if(setsockopt(stream->sock, SOL_SOCKET, - SO_RCVBUF, &recvbuff, sizeof(recvbuff)) == -1) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - - if(setsockopt(stream->sock, SOL_SOCKET, - SO_REUSEADDR, &reuseaddr, sizeof(reuseaddr)) == -1) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - - if(stream->socket_family == AF_INET) // IPv4 - { - if(stream->server) - { - // resolve self address - struct addrinfo hints; - memset(&hints, 0x0, sizeof(struct addrinfo)); - hints.ai_family = stream->socket_family; - hints.ai_socktype = stream->socket_type; - hints.ai_protocol = stream->protocol; +int +lv2_osc_stream_deinit(LV2_OSC_Stream *stream); - struct addrinfo *res; - if(getaddrinfo(node, service, &hints, &res) != 0) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - if(res->ai_addrlen != sizeof(stream->peer.in4)) - { - ev = LV2_OSC_STREAM_ERRNO(ev, EPROTOTYPE); - goto fail; - } - - stream->self.len = res->ai_addrlen; - memcpy(&stream->self.in4, res->ai_addr, res->ai_addrlen); - stream->self.in4.sin_addr.s_addr = htonl(INADDR_ANY); - - freeaddrinfo(res); - - if(bind(stream->sock, (struct sockaddr *)&stream->self.in4, - stream->self.len) != 0) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - } - else // client - { - stream->self.len = sizeof(stream->self.in4); - stream->self.in4.sin_family = stream->socket_family; - stream->self.in4.sin_port = htons(0); - stream->self.in4.sin_addr.s_addr = htonl(INADDR_ANY); - - if(bind(stream->sock, (struct sockaddr *)&stream->self.in4, - stream->self.len) != 0) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - - // resolve peer address - struct addrinfo hints; - memset(&hints, 0x0, sizeof(struct addrinfo)); - hints.ai_family = stream->socket_family; - hints.ai_socktype = stream->socket_type; - hints.ai_protocol = stream->protocol; - - struct addrinfo *res; - if(getaddrinfo(node, service, &hints, &res) != 0) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - if(res->ai_addrlen != sizeof(stream->peer.in4)) - { - ev = LV2_OSC_STREAM_ERRNO(ev, EPROTOTYPE); - goto fail; - } - - stream->peer.len = res->ai_addrlen; - memcpy(&stream->peer.in4, res->ai_addr, res->ai_addrlen); - - freeaddrinfo(res); - } - - if(stream->socket_type == SOCK_DGRAM) - { - const int broadcast = 1; - - if(setsockopt(stream->sock, SOL_SOCKET, SO_BROADCAST, - &broadcast, sizeof(broadcast)) != 0) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - - //FIXME handle multicast - } - else if(stream->socket_type == SOCK_STREAM) - { - const int flag = 1; - - if(setsockopt(stream->sock, stream->protocol, - TCP_NODELAY, &flag, sizeof(flag)) != 0) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - - if(setsockopt(stream->sock, SOL_SOCKET, - SO_KEEPALIVE, &flag, sizeof(flag)) != 0) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - - if(stream->server) - { - if(listen(stream->sock, 1) != 0) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - } - else // client - { - if(connect(stream->sock, (struct sockaddr *)&stream->peer.in4, - stream->peer.len) == 0) - { - stream->connected = true; - } - } - } - else - { - ev = LV2_OSC_STREAM_ERRNO(ev, EPROTOTYPE); - goto fail; - } - } - else if(stream->socket_family == AF_INET6) // IPv6 - { - if(stream->server) - { - // resolve self address - struct addrinfo hints; - memset(&hints, 0x0, sizeof(struct addrinfo)); - hints.ai_family = stream->socket_family; - hints.ai_socktype = stream->socket_type; - hints.ai_protocol = stream->protocol; - - struct addrinfo *res; - if(getaddrinfo(node, service, &hints, &res) != 0) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - if(res->ai_addrlen != sizeof(stream->peer.in6)) - { - ev = LV2_OSC_STREAM_ERRNO(ev, EPROTOTYPE); - goto fail; - } - - stream->self.len = res->ai_addrlen; - memcpy(&stream->self.in6, res->ai_addr, res->ai_addrlen); - stream->self.in6.sin6_addr = in6addr_any; - if(iface) - { - stream->self.in6.sin6_scope_id = if_nametoindex(iface); - } - - freeaddrinfo(res); - - if(bind(stream->sock, (struct sockaddr *)&stream->self.in6, - stream->self.len) != 0) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - } - else // client - { - stream->self.len = sizeof(stream->self.in6); - stream->self.in6.sin6_family = stream->socket_family; - stream->self.in6.sin6_port = htons(0); - stream->self.in6.sin6_addr = in6addr_any; - if(iface) - { - stream->self.in6.sin6_scope_id = if_nametoindex(iface); - } - - if(bind(stream->sock, (struct sockaddr *)&stream->self.in6, - stream->self.len) != 0) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - - // resolve peer address - struct addrinfo hints; - memset(&hints, 0x0, sizeof(struct addrinfo)); - hints.ai_family = stream->socket_family; - hints.ai_socktype = stream->socket_type; - hints.ai_protocol = stream->protocol; - - struct addrinfo *res; - if(getaddrinfo(node, service, &hints, &res) != 0) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - if(res->ai_addrlen != sizeof(stream->peer.in6)) - { - ev = LV2_OSC_STREAM_ERRNO(ev, EPROTOTYPE); - goto fail; - } - - stream->peer.len = res->ai_addrlen; - memcpy(&stream->peer.in6, res->ai_addr, res->ai_addrlen); - - if(iface) - { - stream->peer.in6.sin6_scope_id = if_nametoindex(iface); - } - - freeaddrinfo(res); - } - - if(stream->socket_type == SOCK_DGRAM) - { - // nothing to do - } - else if(stream->socket_type == SOCK_STREAM) - { - const int flag = 1; - - if(setsockopt(stream->sock, stream->protocol, - TCP_NODELAY, &flag, sizeof(flag)) != 0) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - - if(setsockopt(stream->sock, SOL_SOCKET, - SO_KEEPALIVE, &flag, sizeof(flag)) != 0) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - - if(stream->server) - { - if(listen(stream->sock, 1) != 0) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - goto fail; - } - } - else // client - { - if(connect(stream->sock, (struct sockaddr *)&stream->peer.in6, - stream->peer.len) == 0) - { - stream->connected = true; - } - } - } - else - { - ev = LV2_OSC_STREAM_ERRNO(ev, EPROTOTYPE); - goto fail; - } - } - else - { - ev = LV2_OSC_STREAM_ERRNO(ev, EPROTOTYPE); - goto fail; - } - } - - free(dup); - - return ev; - -fail: - if(dup) - { - free(dup); - } - - _close_socket(&stream->sock); - - return ev; -} - -static inline int +int lv2_osc_stream_init(LV2_OSC_Stream *stream, const char *url, - const LV2_OSC_Driver *driv, void *data) -{ - memset(stream, 0x0, sizeof(LV2_OSC_Stream)); - - strncpy(stream->url, url, sizeof(stream->url) - 1); - stream->driv = driv; - stream->data = data; - stream->sock = -1; - stream->fd = -1; - - return _lv2_osc_stream_reinit(stream); -} - -#define SLIP_END 0300 // 0xC0, 192, indicates end of packet -#define SLIP_ESC 0333 // 0xDB, 219, indicates byte stuffing -#define SLIP_END_REPLACE 0334 // 0xDC, 220, ESC ESC_END means END data byte -#define SLIP_ESC_REPLACE 0335 // 0xDD, 221, ESC ESC_ESC means ESC data byte - -// SLIP encoding -static inline size_t -lv2_osc_slip_encode_inline(uint8_t *dst, size_t len) -{ - if(len == 0) - return 0; - - const uint8_t *end = dst + len; - - // estimate new size - size_t size = 2; // double ended SLIP - for(const uint8_t *from=dst; from=dst; from--) - { - if(*from == SLIP_END) - { - *to-- = SLIP_END_REPLACE; - *to-- = SLIP_ESC; - } - else if(*from == SLIP_ESC) - { - *to-- = SLIP_ESC_REPLACE; - *to-- = SLIP_ESC; - } - else - *to-- = *from; - } - *to-- = SLIP_END; - - return size; -} - -// SLIP decoding -static inline size_t -lv2_osc_slip_decode_inline(uint8_t *dst, size_t len, size_t *size) -{ - const uint8_t *src = dst; - const uint8_t *end = dst + len; - uint8_t *ptr = dst; - - bool whole = false; + const LV2_OSC_Driver *driv, void *data); - if( (src < end) && (*src == SLIP_END) ) - { - whole = true; - src++; - } +size_t +lv2_osc_slip_encode_inline(uint8_t *dst, size_t len); - while(src < end) - { - if(*src == SLIP_ESC) - { - if(src == end-1) - break; +size_t +lv2_osc_slip_decode_inline(uint8_t *dst, size_t len, size_t *size); - src++; - if(*src == SLIP_END_REPLACE) - *ptr++ = SLIP_END; - else if(*src == SLIP_ESC_REPLACE) - *ptr++ = SLIP_ESC; - src++; - } - else if(*src == SLIP_END) - { - src++; +LV2_OSC_Enum +lv2_osc_stream_run(LV2_OSC_Stream *stream); - *size = whole ? ptr - dst : 0; - return src - dst; - } - else - { - *ptr++ = *src++; - } - } - - *size = 0; - return 0; -} - -static inline LV2_OSC_Enum -_lv2_osc_stream_run_udp(LV2_OSC_Stream *stream) -{ - LV2_OSC_Enum ev = LV2_OSC_NONE; - - // send everything - if(stream->peer.len) // has a peer - { - const uint8_t *buf; - size_t tosend; - - while( (buf = stream->driv->read_req(stream->data, &tosend)) ) - { - const ssize_t sent = sendto(stream->sock, buf, tosend, 0, - (struct sockaddr *)&stream->peer.in6, stream->peer.len); - - if(sent == -1) - { - if( (errno == EAGAIN) || (errno == EWOULDBLOCK) ) - { - // full queue - break; - } - - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - break; - } - else if(sent != (ssize_t)tosend) - { - ev = LV2_OSC_STREAM_ERRNO(ev, EIO); - break; - } - - stream->driv->read_adv(stream->data); - ev |= LV2_OSC_SEND; - } - } - - // recv everything - { - uint8_t *buf; - size_t max_len; - - while( (buf = stream->driv->write_req(stream->data, - LV2_OSC_STREAM_REQBUF, &max_len)) ) - { - struct sockaddr_in6 in; - socklen_t in_len = sizeof(in); - - memset(&in, 0, in_len); - const ssize_t recvd = recvfrom(stream->sock, buf, max_len, 0, - (struct sockaddr *)&in, &in_len); - - if(recvd == -1) - { - if( (errno == EAGAIN) || (errno == EWOULDBLOCK) ) - { - // empty queue - break; - } - - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - break; - } - else if(recvd == 0) - { - // peer has shut down - break; - } - - stream->peer.len = in_len; - memcpy(&stream->peer.in6, &in, in_len); - - stream->driv->write_adv(stream->data, recvd); - ev |= LV2_OSC_RECV; - } - } - - return ev; -} - -static inline LV2_OSC_Enum -_lv2_osc_stream_run_tcp(LV2_OSC_Stream *stream) -{ - LV2_OSC_Enum ev = LV2_OSC_NONE; - - // handle connections - if(!stream->connected) // no peer - { - if(stream->server) - { - stream->peer.len = sizeof(stream->peer.in6); - stream->fd = accept(stream->sock, (struct sockaddr *)&stream->peer.in6, - &stream->peer.len); - - if(stream->fd >= 0) - { - const int flag = 1; - const int sendbuff = LV2_OSC_STREAM_SNDBUF; - const int recvbuff = LV2_OSC_STREAM_RCVBUF; - - if(fcntl(stream->fd, F_SETFL, O_NONBLOCK) == -1) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - } - - if(setsockopt(stream->fd, stream->protocol, - TCP_NODELAY, &flag, sizeof(flag)) != 0) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - } - - if(setsockopt(stream->sock, SOL_SOCKET, - SO_KEEPALIVE, &flag, sizeof(flag)) != 0) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - } - - if(setsockopt(stream->fd, SOL_SOCKET, - SO_SNDBUF, &sendbuff, sizeof(sendbuff)) == -1) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - } - - if(setsockopt(stream->fd, SOL_SOCKET, - SO_RCVBUF, &recvbuff, sizeof(recvbuff)) == -1) - { - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - } - - stream->connected = true; // orderly accept - } - else - { - //ev = LV2_OSC_STREAM_ERRNO(ev, errno); - } - } - else - { - if(stream->sock < 0) - { - ev = _lv2_osc_stream_reinit(stream); - } - - if(connect(stream->sock, (struct sockaddr *)&stream->peer.in6, - stream->peer.len) == 0) - { - stream->connected = true; // orderly (re)connect - } - else - { - //if(errno == EISCONN) - //{ - // _close_socket(&stream->sock); - //} - - //ev = LV2_OSC_STREAM_ERRNO(ev, errno); - } - } - } - - // send everything - if(stream->connected) - { - int *fd = stream->server - ? &stream->fd - : &stream->sock; - - if(*fd >= 0) - { - const uint8_t *buf; - size_t tosend; - - while( (buf = stream->driv->read_req(stream->data, &tosend)) ) - { - if(stream->slip) // SLIP framed - { - if(tosend <= sizeof(stream->tx_buf)) // check if there is enough memory - { - memcpy(stream->tx_buf, buf, tosend); - tosend = lv2_osc_slip_encode_inline(stream->tx_buf, tosend); - } - else - { - tosend = 0; - } - } - else // uint32_t prefix frames - { - const size_t nsize = tosend + sizeof(uint32_t); - - if(nsize <= sizeof(stream->tx_buf)) // check if there is enough memory - { - const uint32_t prefix = htonl(tosend); - - memcpy(stream->tx_buf, &prefix, sizeof(uint32_t)); - memcpy(stream->tx_buf + sizeof(uint32_t), buf, tosend); - tosend = nsize; - } - else - { - tosend = 0; - } - } - - const ssize_t sent = tosend - ? send(*fd, stream->tx_buf, tosend, 0) - : 0; - - if(sent == -1) - { - if( (errno == EAGAIN) || (errno == EWOULDBLOCK) ) - { - // empty queue - break; - } - - _close_socket(fd); - stream->connected = false; - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - break; - } - else if(sent != (ssize_t)tosend) - { - ev = LV2_OSC_STREAM_ERRNO(ev, EIO); - break; - } - - stream->driv->read_adv(stream->data); - ev |= LV2_OSC_SEND; - } - } - } - - // recv everything - if(stream->connected) - { - int *fd = stream->server - ? &stream->fd - : &stream->sock; - - if(*fd >= 0) - { - if(stream->slip) // SLIP framed - { - while(true) - { - ssize_t recvd = recv(*fd, stream->rx_buf + stream->rx_off, - sizeof(stream->rx_buf) - stream->rx_off, 0); - - if(recvd == -1) - { - if( (errno == EAGAIN) || (errno == EWOULDBLOCK) ) - { - // empty queue - break; - } - - _close_socket(fd); - stream->connected = false; - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - break; - } - else if(recvd == 0) - { - _close_socket(fd); - stream->connected = false; // orderly shutdown - break; - } - - uint8_t *ptr = stream->rx_buf; - recvd += stream->rx_off; - - while(recvd > 0) - { - size_t size; - size_t parsed = lv2_osc_slip_decode_inline(ptr, recvd, &size); - - if(size) // dispatch - { - uint8_t *buf; - - if( (buf = stream->driv->write_req(stream->data, size, NULL)) ) - { - memcpy(buf, ptr, size); - - stream->driv->write_adv(stream->data, size); - ev |= LV2_OSC_RECV; - } - else - { - parsed = 0; - ev = LV2_OSC_STREAM_ERRNO(ev, ENOMEM); - } - } - - if(parsed) - { - ptr += parsed; - recvd -= parsed; - } - else - { - break; - } - } - - if(recvd > 0) // is there remaining chunk for next call? - { - memmove(stream->rx_buf, ptr, recvd); - stream->rx_off = recvd; - } - else - { - stream->rx_off = 0; - } - - break; - } - } - else // uint32_t prefix frames - { - uint8_t *buf; - - while( (buf = stream->driv->write_req(stream->data, - LV2_OSC_STREAM_REQBUF, NULL)) ) - { - uint32_t prefix; - - ssize_t recvd = recv(*fd, &prefix, sizeof(uint32_t), 0); - if(recvd == sizeof(uint32_t)) - { - prefix = ntohl(prefix); //FIXME check prefix <= max_len - recvd = recv(*fd, buf, prefix, 0); - } - else if(recvd == -1) - { - if( (errno == EAGAIN) || (errno == EWOULDBLOCK) ) - { - // empty queue - break; - } - - _close_socket(fd); - stream->connected = false; - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - break; - } - else if(recvd == 0) - { - _close_socket(fd); - stream->connected = false; // orderly shutdown - break; - } - - stream->driv->write_adv(stream->data, recvd); - ev |= LV2_OSC_RECV; - } - } - } - } - - if(stream->connected) - { - ev |= LV2_OSC_CONN; - } - - return ev; -} - -static inline LV2_OSC_Enum -_lv2_osc_stream_run_ser(LV2_OSC_Stream *stream) -{ - LV2_OSC_Enum ev = LV2_OSC_NONE; - - // send everything - { - const int fd = stream->sock; - - if(fd >= 0) - { - const uint8_t *buf; - size_t tosend; - - while( (buf = stream->driv->read_req(stream->data, &tosend)) ) - { - if(stream->slip) // SLIP framed - { - if(tosend <= sizeof(stream->tx_buf)) // check if there is enough memory - { - memcpy(stream->tx_buf, buf, tosend); - tosend = lv2_osc_slip_encode_inline(stream->tx_buf, tosend); - } - else - { - tosend = 0; - } - } - else // uint32_t prefix frames - { - const size_t nsize = tosend + sizeof(uint32_t); - - if(nsize <= sizeof(stream->tx_buf)) // check if there is enough memory - { - const uint32_t prefix = htonl(tosend); - - memcpy(stream->tx_buf, &prefix, sizeof(uint32_t)); - memcpy(stream->tx_buf + sizeof(uint32_t), buf, tosend); - tosend = nsize; - } - else - { - tosend = 0; - } - } - - const ssize_t sent = tosend - ? write(fd, stream->tx_buf, tosend) - : 0; - - if(sent == -1) - { - if( (errno == EAGAIN) || (errno == EWOULDBLOCK) ) - { - // empty queue - break; - } - - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - break; - } - else if(sent != (ssize_t)tosend) - { - ev = LV2_OSC_STREAM_ERRNO(ev, EIO); - break; - } - - stream->driv->read_adv(stream->data); - ev |= LV2_OSC_SEND; - } - } - } - - // recv everything - { - const int fd = stream->sock; - - if(fd >= 0) - { - if(stream->slip) // SLIP framed - { - while(true) - { - ssize_t recvd = read(fd, stream->rx_buf + stream->rx_off, - sizeof(stream->rx_buf) - stream->rx_off); - - if(recvd == -1) - { - if( (errno == EAGAIN) || (errno == EWOULDBLOCK) ) - { - // empty queue - break; - } - - stream->connected = false; - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - break; - } - else if(recvd == 0) - { - // orderly shutdown - break; - } - - uint8_t *ptr = stream->rx_buf; - recvd += stream->rx_off; - - while(recvd > 0) - { - size_t size; - size_t parsed = lv2_osc_slip_decode_inline(ptr, recvd, &size); - - if(size) // dispatch - { - uint8_t *buf; - - if( (buf = stream->driv->write_req(stream->data, size, NULL)) ) - { - memcpy(buf, ptr, size); - - stream->driv->write_adv(stream->data, size); - ev |= LV2_OSC_RECV; - } - else - { - parsed = 0; - ev = LV2_OSC_STREAM_ERRNO(ev, ENOMEM); - } - } - - if(parsed) - { - ptr += parsed; - recvd -= parsed; - } - else - { - break; - } - } - - if(recvd > 0) // is there remaining chunk for next call? - { - memmove(stream->rx_buf, ptr, recvd); - stream->rx_off = recvd; - } - else - { - stream->rx_off = 0; - } - - break; - } - } - else // uint32_t prefix frames - { - uint8_t *buf; - - while( (buf = stream->driv->write_req(stream->data, - LV2_OSC_STREAM_REQBUF, NULL)) ) - { - uint32_t prefix; - - ssize_t recvd = read(fd, &prefix, sizeof(uint32_t)); - if(recvd == sizeof(uint32_t)) - { - prefix = ntohl(prefix); //FIXME check prefix <= max_len - recvd = read(fd, buf, prefix); - } - else if(recvd == -1) - { - if( (errno == EAGAIN) || (errno == EWOULDBLOCK) ) - { - // empty queue - break; - } - - stream->connected = false; - ev = LV2_OSC_STREAM_ERRNO(ev, errno); - break; - } - else if(recvd == 0) - { - // orderly shutdown - break; - } - - stream->driv->write_adv(stream->data, recvd); - ev |= LV2_OSC_RECV; - } - } - } - } - - if(stream->connected) - { - ev |= LV2_OSC_CONN; - } - - return ev; -} - -static inline LV2_OSC_Enum -lv2_osc_stream_run(LV2_OSC_Stream *stream) -{ - LV2_OSC_Enum ev = LV2_OSC_NONE; - - switch(stream->socket_type) - { - case SOCK_DGRAM: - { - ev |= _lv2_osc_stream_run_udp(stream); - } break; - case SOCK_STREAM: - { - ev |= _lv2_osc_stream_run_tcp(stream); - } break; - default: - { - ev |= _lv2_osc_stream_run_ser(stream); - } break; - } - - return ev; -} - -static inline int -lv2_osc_stream_get_file_descriptors(LV2_OSC_Stream *stream, int fds [2]) -{ - if(!fds) - { - return 1; - } - - fds[0] = stream->sock; - fds[1] = stream->fd; - - return 0; -} - -static inline LV2_OSC_Enum -lv2_osc_stream_pollin(LV2_OSC_Stream *stream, int timeout_ms) -{ - int fd [2]; - - if(lv2_osc_stream_get_file_descriptors(stream, fd) != 0) - { - return LV2_OSC_STREAM_ERRNO(LV2_OSC_NONE, EBADF); - } - - struct pollfd fds [2] = { - [0] = { - .fd = fd[0], - .events = POLLIN, - .revents = 0 - }, - [1] = { - .fd = fd[1], - .events = POLLIN, - .revents = 0 - } - }; - - const int res = poll(fds, 2, timeout_ms); - if(res < 0) - { - return LV2_OSC_STREAM_ERRNO(LV2_OSC_NONE, errno); - } - -#if 0 - fprintf(stderr, "++ %i: %i %i %i %i\n", res, - fds[0].fd, (int)fds[0].revents, - fds[1].fd, (int)fds[1].revents); -#endif +int +lv2_osc_stream_get_file_descriptors(LV2_OSC_Stream *stream, int fds [2]); - return lv2_osc_stream_run(stream); -} +LV2_OSC_Enum +lv2_osc_stream_pollin(LV2_OSC_Stream *stream, int timeout_ms); #ifdef __cplusplus } // extern "C" diff --git a/osc.lv2/util.h b/osc.lv2/util.h index fdf2da3..559046b 100644 --- a/osc.lv2/util.h +++ b/osc.lv2/util.h @@ -1,50 +1,17 @@ /* - * Copyright (c) 2015-2016 Hanspeter Portner (dev@open-music-kontrollers.ch) - * - * This is free software: you can redistribute it and/or modify - * it under the terms of the Artistic License 2.0 as published by - * The Perl Foundation. - * - * This source is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * Artistic License 2.0 for more details. - * - * You should have received a copy of the Artistic License 2.0 - * along the source as a COPYING file. If not, obtain it from - * http://www.perlfoundation.org/artistic_license_2_0. + * SPDX-FileCopyrightText: Hanspeter Portner + * SPDX-License-Identifier: Artistic-2.0 */ #ifndef LV2_OSC_UTIL_H #define LV2_OSC_UTIL_H -#include -#include -#include -#include -#include -#if !defined(_WIN32) -# include -#endif - #include -#include - #ifdef __cplusplus extern "C" { #endif -#ifndef __unused -# define __unused __attribute__((unused)) -#endif - -#undef LV2_ATOM_TUPLE_FOREACH // there is a bug in LV2 1.10.0 -#define LV2_ATOM_TUPLE_FOREACH(tuple, iter) \ - for (LV2_Atom* (iter) = lv2_atom_tuple_begin(tuple); \ - !lv2_atom_tuple_is_end(LV2_ATOM_BODY(tuple), (tuple)->atom.size, (iter)); \ - (iter) = lv2_atom_tuple_next(iter)) - typedef void (*LV2_OSC_Method)(const char *path, const LV2_Atom_Tuple *arguments, void *data); @@ -57,572 +24,120 @@ struct _LV2_OSC_Hook { void *data; }; -// characters not allowed in OSC path string -static const char invalid_path_chars [] = { - ' ', '#', - '\0' -}; +bool +lv2_osc_pattern_match(const char *from, const char *name, size_t len); -// allowed characters in OSC format string -static const char valid_format_chars [] = { - LV2_OSC_INT32, LV2_OSC_FLOAT, LV2_OSC_STRING, LV2_OSC_BLOB, - LV2_OSC_TRUE, LV2_OSC_FALSE, LV2_OSC_NIL, LV2_OSC_IMPULSE, - LV2_OSC_INT64, LV2_OSC_DOUBLE, LV2_OSC_TIMETAG, - LV2_OSC_SYMBOL, LV2_OSC_MIDI, - '\0' -}; +void +lv2_osc_hooks(const char *path, const LV2_Atom_Tuple *arguments, void *data); -static inline bool -lv2_osc_pattern_match(const char *from, const char *name, size_t len) -{ -#if !defined(_WIN32) - size_t nbrace = 0; - -# if defined(FNM_EXTMATCH) - // count opening curly braces - for(size_t i = 0; i < len; i++) - { - if(from[i] == '{') - { - nbrace++; - } - } -# endif - - // allocate temporary pattern buffer - char *pattern = alloca(len + nbrace + 1); - - if(!pattern) - { - return false; - } - -# if defined(FNM_EXTMATCH) - // convert {x,y} to @(x|y) for extended fnmatch - if(nbrace) - { - char *ptr = pattern; - - for(size_t i = 0; i < len; i++) - { - switch(from[i]) - { - case '{': - { - *ptr++ = '@'; - *ptr++ = '('; - } break; - case ',': - { - *ptr++ = '|'; - } break; - case '}': - { - *ptr++ = ')'; - } break; - default: - { - *ptr++ = from[i]; - } break; - } - } - } - else -# endif - { - memcpy(pattern, from, len); - } - - // terminate pattern string with null terminator - pattern[len + nbrace] = '\0'; - -# if defined(FNM_EXTMATCH) - return fnmatch(pattern, name, FNM_NOESCAPE | FNM_EXTMATCH) == 0 ? true : false; -# else - return fnmatch(pattern, name, FNM_NOESCAPE) == 0 ? true : false; -# endif -#else - return strncmp(from, name, len) == 0 ? true : false; -#endif -} - -static inline void -_lv2_osc_hooks_internal(const char *path, const char *from, - const LV2_Atom_Tuple *arguments, const LV2_OSC_Hook *hooks) -{ - const char *ptr = strchr(from, '/'); - - const size_t len = ptr - ? (size_t)(ptr - from) - : strlen(from); - - for(const LV2_OSC_Hook *hook = hooks; hook && hook->name; hook++) - { - if(lv2_osc_pattern_match(from, hook->name, len)) - { - if(hook->hooks && ptr) - { - from = &ptr[1]; - - _lv2_osc_hooks_internal(path, from, arguments, hook->hooks); - } - else if(hook->method && !ptr) - { - hook->method(path, arguments, hook->data); - } - } - } -} - -/** - TODO -*/ -static inline void -lv2_osc_hooks(const char *path, const LV2_Atom_Tuple *arguments, void *data) -{ - const LV2_OSC_Hook *hooks = data; - const char *from = &path[1]; - - _lv2_osc_hooks_internal(path, from, arguments, hooks); -} - -/** - TODO -*/ -static inline bool -lv2_osc_check_path(const char *path) -{ - assert(path); - - if(path[0] != '/') - return false; - - for(const char *ptr=path+1; *ptr!='\0'; ptr++) - if( (isprint(*ptr) == 0) || (strchr(invalid_path_chars, *ptr) != NULL) ) - return false; - - return true; -} - -/** - TODO -*/ -static inline bool -lv2_osc_check_fmt(const char *format, int offset) -{ - assert(format); - - if(offset && (format[0] != ',') ) - return false; - - for(const char *ptr=format+offset; *ptr!='\0'; ptr++) - if(strchr(valid_format_chars, *ptr) == NULL) - return false; - - return true; -} - -/** - TODO -*/ -static inline uint64_t -lv2_osc_timetag_parse(const LV2_OSC_Timetag *timetag) -{ - return ((uint64_t)timetag->integral << 32) | timetag->fraction; -} - -/** - TODO -*/ -static inline LV2_OSC_Timetag * -lv2_osc_timetag_create(LV2_OSC_Timetag *timetag, uint64_t tt) -{ - timetag->integral = tt >> 32; - timetag->fraction = tt & 0xffffffff; - - return timetag; -} +bool +lv2_osc_check_path(const char *path); + +bool +lv2_osc_check_fmt(const char *format, int offset); + +uint64_t +lv2_osc_timetag_parse(const LV2_OSC_Timetag *timetag); + +LV2_OSC_Timetag * +lv2_osc_timetag_create(LV2_OSC_Timetag *timetag, uint64_t tt); #define LV2_OSC_TIMETAG_CREATE(tt) \ lv2_osc_timetag_create(&(LV2_OSC_Timetag){.integral = 0, .fraction = 0}, (tt)) -/** - TODO -*/ -static inline bool -lv2_osc_is_packet_type(LV2_OSC_URID *osc_urid, LV2_URID type) -{ - return type == osc_urid->OSC_Packet; -} - -/** - TODO -*/ -static inline bool -lv2_osc_is_bundle_type(LV2_OSC_URID *osc_urid, LV2_URID type) -{ - return type == osc_urid->OSC_Bundle; -} - -/** - TODO -*/ -static inline bool -lv2_osc_is_message_type(LV2_OSC_URID *osc_urid, LV2_URID type) -{ - return type == osc_urid->OSC_Message; -} - -/** - TODO -*/ -static inline bool -lv2_osc_is_message_or_bundle_type(LV2_OSC_URID *osc_urid, LV2_URID type) -{ - return lv2_osc_is_message_type(osc_urid, type) - || lv2_osc_is_bundle_type(osc_urid, type); -} - -static inline LV2_OSC_Type -lv2_osc_argument_type(LV2_OSC_URID *osc_urid, const LV2_Atom *atom) -{ - const LV2_Atom_Object *obj = (const LV2_Atom_Object *)atom; - - if(atom->type == osc_urid->ATOM_Int) - return LV2_OSC_INT32; - else if(atom->type == osc_urid->ATOM_Float) - return LV2_OSC_FLOAT; - else if(atom->type == osc_urid->ATOM_String) - return LV2_OSC_STRING; - else if(atom->type == osc_urid->ATOM_Chunk) - return LV2_OSC_BLOB; - - else if(atom->type == osc_urid->ATOM_Long) - return LV2_OSC_INT64; - else if(atom->type == osc_urid->ATOM_Double) - return LV2_OSC_DOUBLE; - else if( (atom->type == osc_urid->ATOM_Object) && (obj->body.otype == osc_urid->OSC_Timetag) ) - return LV2_OSC_TIMETAG; - - else if(atom->type == osc_urid->ATOM_Bool) - { - if(((const LV2_Atom_Bool *)atom)->body) - return LV2_OSC_TRUE; - else - return LV2_OSC_FALSE; - } - else if(atom->type == osc_urid->ATOM_Literal) - { - const LV2_Atom_Literal *lit = (const LV2_Atom_Literal *)atom; - if(lit->body.datatype == osc_urid->OSC_Nil) - return LV2_OSC_NIL; - else if(lit->body.datatype == osc_urid->OSC_Impulse) - return LV2_OSC_IMPULSE; - else if(lit->body.datatype == osc_urid->OSC_Char) - return LV2_OSC_CHAR; - else if(lit->body.datatype == osc_urid->OSC_RGBA) - return LV2_OSC_RGBA; - } - - else if(atom->type == osc_urid->ATOM_URID) - return LV2_OSC_SYMBOL; - else if(atom->type == osc_urid->MIDI_MidiEvent) - return LV2_OSC_MIDI; - - return '\0'; -} - -static inline const LV2_Atom * -lv2_osc_int32_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom, - int32_t *i) -{ - assert(i); - *i = ((const LV2_Atom_Int *)atom)->body; - - return lv2_atom_tuple_next(atom); -} - -static inline const LV2_Atom * -lv2_osc_float_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom, - float *f) -{ - assert(f); - *f = ((const LV2_Atom_Float *)atom)->body; - - return lv2_atom_tuple_next(atom); -} - -static inline const LV2_Atom * -lv2_osc_string_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom, - const char **s) -{ - assert(s); - *s = LV2_ATOM_BODY_CONST(atom); - - return lv2_atom_tuple_next(atom); -} - -static inline const LV2_Atom * -lv2_osc_blob_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom, - uint32_t *size, const uint8_t **b) -{ - assert(size && b); - *size = atom->size; - *b = LV2_ATOM_BODY_CONST(atom); - - return lv2_atom_tuple_next(atom); -} - -static inline const LV2_Atom * -lv2_osc_int64_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom, - int64_t *h) -{ - assert(h); - *h = ((const LV2_Atom_Long *)atom)->body; - - return lv2_atom_tuple_next(atom); -} - -static inline const LV2_Atom * -lv2_osc_double_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom, - double *d) -{ - assert(d); - *d = ((const LV2_Atom_Double *)atom)->body; - - return lv2_atom_tuple_next(atom); -} - -static inline const LV2_Atom * +bool +lv2_osc_is_packet_type(LV2_OSC_URID *osc_urid, LV2_URID type); + +bool +lv2_osc_is_bundle_type(LV2_OSC_URID *osc_urid, LV2_URID type); + +bool +lv2_osc_is_message_type(LV2_OSC_URID *osc_urid, LV2_URID type); + +bool +lv2_osc_is_message_or_bundle_type(LV2_OSC_URID *osc_urid, LV2_URID type); + +LV2_OSC_Type +lv2_osc_argument_type(LV2_OSC_URID *osc_urid, const LV2_Atom *atom); + +const LV2_Atom * +lv2_osc_int32_get(LV2_OSC_URID *osc_urid, const LV2_Atom *atom, + int32_t *i); + +const LV2_Atom * +lv2_osc_float_get(LV2_OSC_URID *osc_urid, const LV2_Atom *atom, + float *f); + +const LV2_Atom * +lv2_osc_string_get(LV2_OSC_URID *osc_urid, const LV2_Atom *atom, + const char **s); + +const LV2_Atom * +lv2_osc_blob_get(LV2_OSC_URID *osc_urid, const LV2_Atom *atom, + uint32_t *size, const uint8_t **b); + +const LV2_Atom * +lv2_osc_int64_get(LV2_OSC_URID *osc_urid, const LV2_Atom *atom, + int64_t *h); + +const LV2_Atom * +lv2_osc_double_get(LV2_OSC_URID *osc_urid, const LV2_Atom *atom, + double *d); + +const LV2_Atom * lv2_osc_timetag_get(LV2_OSC_URID *osc_urid, const LV2_Atom *atom, - LV2_OSC_Timetag *timetag) -{ - assert(timetag); - - const LV2_Atom_Long *integral = NULL; - const LV2_Atom_Long *fraction = NULL; - - lv2_atom_object_get((const LV2_Atom_Object *)atom, - osc_urid->OSC_timetagIntegral, &integral, - osc_urid->OSC_timetagFraction, &fraction, - 0); - - if( integral && (integral->atom.type == osc_urid->ATOM_Long) - && fraction && (fraction->atom.type == osc_urid->ATOM_Long) ) - { - timetag->integral = integral->body; - timetag->fraction = fraction->body; - } - else - { - // set to immediate - timetag->integral = 0; - timetag->fraction = 1; - } - - return lv2_atom_tuple_next(atom); -} - -static inline const LV2_Atom * -lv2_osc_true_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom) -{ - return lv2_atom_tuple_next(atom); -} - -static inline const LV2_Atom * -lv2_osc_false_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom) -{ - return lv2_atom_tuple_next(atom); -} - -static inline const LV2_Atom * -lv2_osc_nil_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom) -{ - return lv2_atom_tuple_next(atom); -} - -static inline const LV2_Atom * -lv2_osc_impulse_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom) -{ - return lv2_atom_tuple_next(atom); -} - -static inline const LV2_Atom * -lv2_osc_symbol_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom, - LV2_URID *S) -{ - assert(S); - *S = ((const LV2_Atom_URID *)atom)->body; - - return lv2_atom_tuple_next(atom); -} - -static inline const LV2_Atom * -lv2_osc_midi_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom, - uint32_t *size, const uint8_t **m) -{ - assert(size && m); - *size = atom->size; - *m = LV2_ATOM_BODY_CONST(atom); - - return lv2_atom_tuple_next(atom); -} - -static inline const LV2_Atom * -lv2_osc_char_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom, char *c) -{ - assert(c); - const char *str = LV2_ATOM_CONTENTS_CONST(LV2_Atom_Literal, atom); - *c = str[0]; - - return lv2_atom_tuple_next(atom); -} - -static inline const LV2_Atom * -lv2_osc_rgba_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom, - uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *a) -{ - assert(r && g && b && a); - const char *str = LV2_ATOM_CONTENTS_CONST(LV2_Atom_Literal, atom); - - uint8_t *key [4] = { - r, g, b, a - }; - - const char *pos = str; - char *endptr; - - for(unsigned count = 0; count < 4; count++, pos += 2) - { - char buf [5] = {'0', 'x', pos[0], pos[1], '\0'}; - - *key[count] = strtol(buf, &endptr, 16); - } - - return lv2_atom_tuple_next(atom); -} - -/** - TODO -*/ -static inline bool -lv2_osc_bundle_body_get(LV2_OSC_URID *osc_urid, uint32_t size, const LV2_Atom_Object_Body *body, - const LV2_Atom_Object **timetag, const LV2_Atom_Tuple **items) -{ - assert(timetag && items); - - *timetag = NULL; - *items = NULL; - - lv2_atom_object_body_get(size, body, - osc_urid->OSC_bundleTimetag, timetag, - osc_urid->OSC_bundleItems, items, - 0); - - if(!*timetag || ((*timetag)->atom.type != osc_urid->ATOM_Object) || ((*timetag)->body.otype != osc_urid->OSC_Timetag)) - return false; - if(!*items || ((*items)->atom.type != osc_urid->ATOM_Tuple)) - return false; - - return true; -} - -/** - TODO -*/ -static inline bool -lv2_osc_bundle_get(LV2_OSC_URID *osc_urid, const LV2_Atom_Object *obj, - const LV2_Atom_Object **timetag, const LV2_Atom_Tuple **items) -{ - return lv2_osc_bundle_body_get(osc_urid, obj->atom.size, &obj->body, - timetag, items); -} - -/** - TODO -*/ -static inline bool -lv2_osc_message_body_get(LV2_OSC_URID *osc_urid, uint32_t size, const LV2_Atom_Object_Body *body, - const LV2_Atom_String **path, const LV2_Atom_Tuple **arguments) -{ - assert(path && arguments); - - *path = NULL; - *arguments = NULL; - - lv2_atom_object_body_get(size, body, - osc_urid->OSC_messagePath, path, - osc_urid->OSC_messageArguments, arguments, - 0); - - if(!*path || ((*path)->atom.type != osc_urid->ATOM_String)) - return false; - // message without arguments is valid - if( *arguments && ((*arguments)->atom.type != osc_urid->ATOM_Tuple)) - return false; - - return true; -} - -/** - TODO -*/ -static inline bool -lv2_osc_message_get(LV2_OSC_URID *osc_urid, const LV2_Atom_Object *obj, - const LV2_Atom_String **path, const LV2_Atom_Tuple **arguments) -{ - return lv2_osc_message_body_get(osc_urid, obj->atom.size, &obj->body, - path, arguments); -} + LV2_OSC_Timetag *timetag); -static inline bool -lv2_osc_body_unroll(LV2_OSC_URID *osc_urid, uint32_t size, const LV2_Atom_Object_Body *body, - LV2_OSC_Method method, void *data) -{ - if(body->otype == osc_urid->OSC_Bundle) - { - const LV2_Atom_Object *timetag = NULL; - const LV2_Atom_Tuple *items = NULL; +const LV2_Atom * +lv2_osc_true_get(LV2_OSC_URID *osc_urid, const LV2_Atom *atom); - if(!lv2_osc_bundle_body_get(osc_urid, size, body, &timetag, &items)) - return false; +const LV2_Atom * +lv2_osc_false_get(LV2_OSC_URID *osc_urid, const LV2_Atom *atom); - LV2_OSC_Timetag tt; - lv2_osc_timetag_get(osc_urid, &timetag->atom, &tt); +const LV2_Atom * +lv2_osc_nil_get(LV2_OSC_URID *osc_urid, const LV2_Atom *atom); - LV2_ATOM_TUPLE_FOREACH(items, atom) - { - const LV2_Atom_Object *obj= (const LV2_Atom_Object *)atom; +const LV2_Atom * +lv2_osc_impulse_get(LV2_OSC_URID *osc_urid, const LV2_Atom *atom); - if(!lv2_osc_body_unroll(osc_urid, obj->atom.size, &obj->body, method, data)) - return false; - } +const LV2_Atom * +lv2_osc_symbol_get(LV2_OSC_URID *osc_urid, const LV2_Atom *atom, + LV2_URID *S); - return true; - } - else if(body->otype == osc_urid->OSC_Message) - { - const LV2_Atom_String *path = NULL; - const LV2_Atom_Tuple *arguments = NULL; +const LV2_Atom * +lv2_osc_midi_get(LV2_OSC_URID *osc_urid, const LV2_Atom *atom, + uint32_t *size, const uint8_t **m); - if(!lv2_osc_message_body_get(osc_urid, size, body, &path, &arguments)) - return false; +const LV2_Atom * +lv2_osc_char_get(LV2_OSC_URID *osc_urid, const LV2_Atom *atom, char *c); - if(method) - method(LV2_ATOM_BODY_CONST(path), arguments, data); +const LV2_Atom * +lv2_osc_rgba_get(LV2_OSC_URID *osc_urid, const LV2_Atom *atom, + uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *a); - return true; - } +bool +lv2_osc_bundle_body_get(LV2_OSC_URID *osc_urid, uint32_t size, const LV2_Atom_Object_Body *body, + const LV2_Atom_Object **timetag, const LV2_Atom_Tuple **items); - return false; -} +bool +lv2_osc_bundle_get(LV2_OSC_URID *osc_urid, const LV2_Atom_Object *obj, + const LV2_Atom_Object **timetag, const LV2_Atom_Tuple **items); + +bool +lv2_osc_message_body_get(LV2_OSC_URID *osc_urid, uint32_t size, const LV2_Atom_Object_Body *body, + const LV2_Atom_String **path, const LV2_Atom_Tuple **arguments); + +bool +lv2_osc_message_get(LV2_OSC_URID *osc_urid, const LV2_Atom_Object *obj, + const LV2_Atom_String **path, const LV2_Atom_Tuple **arguments); + +bool +lv2_osc_body_unroll(LV2_OSC_URID *osc_urid, uint32_t size, const LV2_Atom_Object_Body *body, + LV2_OSC_Method method, void *data); -static inline bool +bool lv2_osc_unroll(LV2_OSC_URID *osc_urid, const LV2_Atom_Object *obj, - LV2_OSC_Method method, void *data) -{ - return lv2_osc_body_unroll(osc_urid, obj->atom.size, &obj->body, method, data); -} + LV2_OSC_Method method, void *data); #ifdef __cplusplus } // extern "C" diff --git a/osc.lv2/writer.h b/osc.lv2/writer.h index 037d44c..9c0f0ef 100644 --- a/osc.lv2/writer.h +++ b/osc.lv2/writer.h @@ -1,42 +1,17 @@ /* - * Copyright (c) 2015-2016 Hanspeter Portner (dev@open-music-kontrollers.ch) - * - * This is free software: you can redistribute it and/or modify - * it under the terms of the Artistic License 2.0 as published by - * The Perl Foundation. - * - * This source is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * Artistic License 2.0 for more details. - * - * You should have received a copy of the Artistic License 2.0 - * along the source as a COPYING file. If not, obtain it from - * http://www.perlfoundation.org/artistic_license_2_0. + * SPDX-FileCopyrightText: Hanspeter Portner + * SPDX-License-Identifier: Artistic-2.0 */ #ifndef LV2_OSC_WRITER_H #define LV2_OSC_WRITER_H -#include -#include - -#include #include -#include - -#include #ifdef __cplusplus extern "C" { #endif -#undef LV2_ATOM_TUPLE_FOREACH // there is a bug in LV2 1.10.0 -#define LV2_ATOM_TUPLE_FOREACH(tuple, iter) \ - for (LV2_Atom* (iter) = lv2_atom_tuple_begin(tuple); \ - !lv2_atom_tuple_is_end(LV2_ATOM_BODY(tuple), (tuple)->atom.size, (iter)); \ - (iter) = lv2_atom_tuple_next(iter)) - typedef struct _LV2_OSC_Writer LV2_OSC_Writer; typedef struct _LV2_OSC_Writer_Frame LV2_OSC_Writer_Frame; @@ -50,527 +25,96 @@ struct _LV2_OSC_Writer_Frame { uint8_t *ref; }; -static inline void -lv2_osc_writer_initialize(LV2_OSC_Writer *writer, uint8_t *buf, size_t size) -{ - writer->buf = buf; - writer->ptr = buf; - writer->end = buf + size; -} - -static inline size_t -lv2_osc_writer_get_size(LV2_OSC_Writer *writer) -{ - if(writer->ptr > writer->buf) - return writer->ptr - writer->buf; - - return 0; -} - -static inline uint8_t * -lv2_osc_writer_finalize(LV2_OSC_Writer *writer, size_t *size) -{ - *size = lv2_osc_writer_get_size(writer); - - if(*size) - return writer->buf; - - return NULL; -} - -static inline bool -lv2_osc_writer_overflow(LV2_OSC_Writer *writer, size_t size) -{ - return writer->ptr + size >= writer->end; -} - -static inline bool -lv2_osc_writer_htobe32(LV2_OSC_Writer *writer, union swap32_t *s32) -{ - if(lv2_osc_writer_overflow(writer, 4)) - return false; - - s32->u = htobe32(s32->u); - *(uint32_t *)writer->ptr = s32->u; - writer->ptr += 4; - - return true; -} - -static inline bool -lv2_osc_writer_htobe64(LV2_OSC_Writer *writer, union swap64_t *s64) -{ - if(lv2_osc_writer_overflow(writer, 8)) - return false; - - s64->u = htobe64(s64->u); - *(uint64_t *)writer->ptr = s64->u; - writer->ptr += 8; - - return true; -} - -static inline bool -lv2_osc_writer_add_int32(LV2_OSC_Writer *writer, int32_t i) -{ - return lv2_osc_writer_htobe32(writer, &(union swap32_t){ .i = i }); -} - -static inline bool -lv2_osc_writer_add_float(LV2_OSC_Writer *writer, float f) -{ - return lv2_osc_writer_htobe32(writer, &(union swap32_t){ .f = f }); -} - -static inline bool -lv2_osc_writer_add_string(LV2_OSC_Writer *writer, const char *s) -{ - const size_t rawlen = strlen(s) + 1; - const size_t padded = LV2_OSC_PADDED_SIZE(rawlen); - if(lv2_osc_writer_overflow(writer, padded)) - return false; - - const uint32_t blank = 0; - memcpy(writer->ptr + padded - sizeof(uint32_t), &blank, sizeof(uint32_t)); - memcpy(writer->ptr, s, rawlen); - writer->ptr += padded; - - return true; -} - -static inline bool -lv2_osc_writer_add_symbol(LV2_OSC_Writer *writer, const char *S) -{ - return lv2_osc_writer_add_string(writer, S); -} - -static inline bool -lv2_osc_writer_add_int64(LV2_OSC_Writer *writer, int64_t h) -{ - return lv2_osc_writer_htobe64(writer, &(union swap64_t){ .h = h }); -} - -static inline bool -lv2_osc_writer_add_double(LV2_OSC_Writer *writer, double d) -{ - return lv2_osc_writer_htobe64(writer, &(union swap64_t){ .d = d }); -} - -static inline bool -lv2_osc_writer_add_timetag(LV2_OSC_Writer *writer, uint64_t u) -{ - return lv2_osc_writer_htobe64(writer, &(union swap64_t){ .u = u }); -} - -static inline bool -lv2_osc_writer_add_blob_inline(LV2_OSC_Writer *writer, int32_t len, uint8_t **body) -{ - const size_t len_padded = LV2_OSC_PADDED_SIZE(len); - const size_t size = 4 + len_padded; - if(lv2_osc_writer_overflow(writer, size)) - return false; - - if(!lv2_osc_writer_add_int32(writer, len)) - return false; - - *body = writer->ptr; - //memset(&writer->ptr[len], 0x0, len_padded - len); - writer->ptr += len_padded; - - return true; -} - -static inline bool -lv2_osc_writer_add_blob(LV2_OSC_Writer *writer, int32_t len, const uint8_t *body) -{ - uint8_t *dst; - if(!lv2_osc_writer_add_blob_inline(writer, len, &dst)) - return false; - - memcpy(dst, body, len); - - return true; -} - -static inline bool -lv2_osc_writer_add_midi_inline(LV2_OSC_Writer *writer, int32_t len, uint8_t **m) -{ - if( (len > 4) || lv2_osc_writer_overflow(writer, 4)) - return false; - - *m = writer->ptr; - //memset(&writer->ptr[len], 0x0, 4 - len); - writer->ptr += 4; - - return true; -} - -static inline bool -lv2_osc_writer_add_midi(LV2_OSC_Writer *writer, int32_t len, const uint8_t *m) -{ - uint8_t *dst; - if(!lv2_osc_writer_add_midi_inline(writer, len, &dst)) - return false; - - memcpy(dst, m, len); - - return true; -} - -static inline bool -lv2_osc_writer_add_rgba(LV2_OSC_Writer *writer, uint8_t r, uint8_t g, uint8_t b, uint8_t a) -{ - if(lv2_osc_writer_overflow(writer, 4)) - return false; - - writer->ptr[0] = r; - writer->ptr[1] = g; - writer->ptr[2] = b; - writer->ptr[3] = a; - writer->ptr += 4; - - return true; -} - -static inline bool -lv2_osc_writer_add_char(LV2_OSC_Writer *writer, char c) -{ - return lv2_osc_writer_add_int32(writer, (int32_t)c); -} - -static inline bool -lv2_osc_writer_push_bundle(LV2_OSC_Writer *writer, LV2_OSC_Writer_Frame *frame, uint64_t t) -{ - if(lv2_osc_writer_overflow(writer, 16)) - return false; - - frame->ref = writer->ptr; - - strncpy((char *)writer->ptr, "#bundle", 8); - writer->ptr += 8; - - return lv2_osc_writer_add_timetag(writer, t); -} - -static inline bool -lv2_osc_writer_pop_bundle(LV2_OSC_Writer *writer, LV2_OSC_Writer_Frame *frame) -{ - union swap32_t s32 = { .i = writer->ptr - frame->ref - 16}; - - if(s32.i <= 0) - { - writer->ptr = frame->ref; - return false; - } - - return true; -} - -static inline bool -lv2_osc_writer_push_item(LV2_OSC_Writer *writer, LV2_OSC_Writer_Frame *frame) -{ - if(lv2_osc_writer_overflow(writer, 4)) - return false; - - frame->ref = writer->ptr; - writer->ptr += 4; - - return true; -} - -static inline bool -lv2_osc_writer_pop_item(LV2_OSC_Writer *writer, LV2_OSC_Writer_Frame *frame) -{ - union swap32_t s32 = { .i = writer->ptr - frame->ref - 4}; - - if(s32.i <= 0) - { - writer->ptr = frame->ref; - return false; - } - - s32.u = htobe32(s32.u); - *(uint32_t *)frame->ref = s32.u; - - return true; -} - -static inline bool -lv2_osc_writer_add_path(LV2_OSC_Writer *writer, const char *path) -{ - return lv2_osc_writer_add_string(writer, path); -} - -static inline bool -lv2_osc_writer_add_format(LV2_OSC_Writer *writer, const char *fmt) -{ - const size_t rawlen = strlen(fmt) + 1; - const size_t padded = LV2_OSC_PADDED_SIZE(rawlen + 1); - if(lv2_osc_writer_overflow(writer, padded)) - return false; - - const uint32_t blank = 0; - memcpy(writer->ptr + padded - sizeof(uint32_t), &blank, sizeof(uint32_t)); - *writer->ptr++ = ','; - memcpy(writer->ptr, fmt, rawlen); - writer->ptr += padded - 1; - - return true; -} - -static inline bool -lv2_osc_writer_arg_varlist(LV2_OSC_Writer *writer, const char *fmt, va_list args) -{ - for(const char *type = fmt; *type; type++) - { - switch( (LV2_OSC_Type)*type) - { - case LV2_OSC_INT32: - if(!lv2_osc_writer_add_int32(writer, va_arg(args, int32_t))) - return false; - break; - case LV2_OSC_FLOAT: - if(!lv2_osc_writer_add_float(writer, (float)va_arg(args, double))) - return false; - break; - case LV2_OSC_STRING: - if(!lv2_osc_writer_add_string(writer, va_arg(args, const char *))) - return false; - break; - case LV2_OSC_BLOB: - { - const int32_t len = va_arg(args, int32_t); - if(!lv2_osc_writer_add_blob(writer, len, va_arg(args, const uint8_t *))) - return false; - } break; - - case LV2_OSC_TRUE: - case LV2_OSC_FALSE: - case LV2_OSC_NIL: - case LV2_OSC_IMPULSE: - break; - - case LV2_OSC_INT64: - if(!lv2_osc_writer_add_int64(writer, va_arg(args, int64_t))) - return false; - break; - case LV2_OSC_DOUBLE: - if(!lv2_osc_writer_add_double(writer, va_arg(args, double))) - return false; - break; - case LV2_OSC_TIMETAG: - if(!lv2_osc_writer_add_timetag(writer, va_arg(args, uint64_t))) - return false; - break; - - case LV2_OSC_MIDI: - { - const int32_t len = va_arg(args, int32_t); - if(!lv2_osc_writer_add_midi(writer, len, va_arg(args, const uint8_t *))) - return false; - } break; - case LV2_OSC_SYMBOL: - if(!lv2_osc_writer_add_symbol(writer, va_arg(args, const char *))) - return false; - break; - case LV2_OSC_CHAR: - if(!lv2_osc_writer_add_char(writer, va_arg(args, int))) - return false; - break; - case LV2_OSC_RGBA: - { - const uint8_t r = va_arg(args, unsigned); - const uint8_t g = va_arg(args, unsigned); - const uint8_t b = va_arg(args, unsigned); - const uint8_t a = va_arg(args, unsigned); - if(!lv2_osc_writer_add_rgba(writer, r, g, b, a)) - return false; - } break; - } - } - - return true; -} - -static inline bool -lv2_osc_writer_arg_vararg(LV2_OSC_Writer *writer, const char *fmt, ...) -{ - va_list args; - va_start(args, fmt); - - const bool res = lv2_osc_writer_arg_varlist(writer, fmt, args); - - va_end(args); - - return res; -} - -static inline bool -lv2_osc_writer_message_varlist(LV2_OSC_Writer *writer, const char *path, const char *fmt, va_list args) -{ - if(!lv2_osc_writer_add_path(writer, path)) - return false; - - if(!lv2_osc_writer_add_format(writer, fmt)) - return false; - - return lv2_osc_writer_arg_varlist(writer, fmt, args); -} - -static inline bool -lv2_osc_writer_message_vararg(LV2_OSC_Writer *writer, const char *path, const char *fmt, ...) -{ - va_list args; - va_start(args, fmt); - - const bool res = lv2_osc_writer_message_varlist(writer, path, fmt, args); - - va_end(args); - - return res; -} - -static inline bool +void +lv2_osc_writer_initialize(LV2_OSC_Writer *writer, uint8_t *buf, size_t size); + +size_t +lv2_osc_writer_get_size(LV2_OSC_Writer *writer); + +uint8_t * +lv2_osc_writer_finalize(LV2_OSC_Writer *writer, size_t *size); + +bool +lv2_osc_writer_overflow(LV2_OSC_Writer *writer, size_t size); + +bool +lv2_osc_writer_htobe32(LV2_OSC_Writer *writer, union swap32_t *s32); + +bool +lv2_osc_writer_htobe64(LV2_OSC_Writer *writer, union swap64_t *s64); + +bool +lv2_osc_writer_add_int32(LV2_OSC_Writer *writer, int32_t i); + +bool +lv2_osc_writer_add_float(LV2_OSC_Writer *writer, float f); + +bool +lv2_osc_writer_add_string(LV2_OSC_Writer *writer, const char *s); + +bool +lv2_osc_writer_add_symbol(LV2_OSC_Writer *writer, const char *S); + +bool +lv2_osc_writer_add_int64(LV2_OSC_Writer *writer, int64_t h); + +bool +lv2_osc_writer_add_double(LV2_OSC_Writer *writer, double d); + +bool +lv2_osc_writer_add_timetag(LV2_OSC_Writer *writer, uint64_t u); + +bool +lv2_osc_writer_add_blob_inline(LV2_OSC_Writer *writer, int32_t len, uint8_t **body); + +bool +lv2_osc_writer_add_blob(LV2_OSC_Writer *writer, int32_t len, const uint8_t *body); + +bool +lv2_osc_writer_add_midi_inline(LV2_OSC_Writer *writer, int32_t len, uint8_t **m); + +bool +lv2_osc_writer_add_midi(LV2_OSC_Writer *writer, int32_t len, const uint8_t *m); + +bool +lv2_osc_writer_add_rgba(LV2_OSC_Writer *writer, uint8_t r, uint8_t g, uint8_t b, uint8_t a); + +bool +lv2_osc_writer_add_char(LV2_OSC_Writer *writer, char c); + +bool +lv2_osc_writer_push_bundle(LV2_OSC_Writer *writer, LV2_OSC_Writer_Frame *frame, uint64_t t); + +bool +lv2_osc_writer_pop_bundle(LV2_OSC_Writer *writer, LV2_OSC_Writer_Frame *frame); + +bool +lv2_osc_writer_push_item(LV2_OSC_Writer *writer, LV2_OSC_Writer_Frame *frame); + +bool +lv2_osc_writer_pop_item(LV2_OSC_Writer *writer, LV2_OSC_Writer_Frame *frame); + +bool +lv2_osc_writer_add_path(LV2_OSC_Writer *writer, const char *path); + +bool +lv2_osc_writer_add_format(LV2_OSC_Writer *writer, const char *fmt); + +bool +lv2_osc_writer_arg_varlist(LV2_OSC_Writer *writer, const char *fmt, va_list args); + +bool +lv2_osc_writer_arg_vararg(LV2_OSC_Writer *writer, const char *fmt, ...); + +bool +lv2_osc_writer_message_varlist(LV2_OSC_Writer *writer, const char *path, const char *fmt, va_list args); + +bool +lv2_osc_writer_message_vararg(LV2_OSC_Writer *writer, const char *path, const char *fmt, ...); + +bool lv2_osc_writer_packet(LV2_OSC_Writer *writer, LV2_OSC_URID *osc_urid, - LV2_URID_Unmap *unmap, uint32_t size, const LV2_Atom_Object_Body *body) -{ - if(body->otype == osc_urid->OSC_Bundle) - { - const LV2_Atom_Object *timetag = NULL; - const LV2_Atom_Tuple *items = NULL; - - if(!lv2_osc_bundle_body_get(osc_urid, size, body, &timetag, &items)) - return false; - - LV2_OSC_Timetag tt; - LV2_OSC_Writer_Frame bndl = { .ref = 0 }; - - lv2_osc_timetag_get(osc_urid, &timetag->atom, &tt); - if(!lv2_osc_writer_push_bundle(writer, &bndl, lv2_osc_timetag_parse(&tt))) - return false; - - LV2_ATOM_TUPLE_FOREACH(items, atom) - { - const LV2_Atom_Object *obj= (const LV2_Atom_Object *)atom; - LV2_OSC_Writer_Frame itm = { .ref = 0 }; - - if( !lv2_osc_writer_push_item(writer, &itm) - || !lv2_osc_writer_packet(writer, osc_urid, unmap, obj->atom.size, &obj->body) - || !lv2_osc_writer_pop_item(writer, &itm) ) - { - return false; - } - } - - return lv2_osc_writer_pop_bundle(writer, &bndl); - } - else if(body->otype == osc_urid->OSC_Message) - { - const LV2_Atom_String *path = NULL; - const LV2_Atom_Tuple *arguments = NULL; - - if(lv2_osc_message_body_get(osc_urid, size, body, &path, &arguments)) - { - if(!lv2_osc_writer_add_path(writer, LV2_ATOM_BODY_CONST(path))) - return false; - - char fmt [128]; //TODO how big? - char *ptr = fmt; - LV2_ATOM_TUPLE_FOREACH(arguments, atom) - { - *ptr++ = lv2_osc_argument_type(osc_urid, atom); - } - *ptr = '\0'; - if(!lv2_osc_writer_add_format(writer, fmt)) - return false; - - LV2_ATOM_TUPLE_FOREACH(arguments, atom) - { - const LV2_Atom_Object *obj= (const LV2_Atom_Object *)atom; - - if(atom->type == osc_urid->ATOM_Int) - { - if(!lv2_osc_writer_add_int32(writer, ((const LV2_Atom_Int *)atom)->body)) - return false; - } - else if(atom->type == osc_urid->ATOM_Float) - { - if(!lv2_osc_writer_add_float(writer, ((const LV2_Atom_Float *)atom)->body)) - return false; - } - else if(atom->type == osc_urid->ATOM_String) - { - if(!lv2_osc_writer_add_string(writer, LV2_ATOM_BODY_CONST(atom))) - return false; - } - else if(atom->type == osc_urid->ATOM_Chunk) - { - if(!lv2_osc_writer_add_blob(writer, atom->size, LV2_ATOM_BODY_CONST(atom))) - return false; - } - - else if(atom->type == osc_urid->ATOM_Long) - { - if(!lv2_osc_writer_add_int64(writer, ((const LV2_Atom_Long *)atom)->body)) - return false; - } - else if(atom->type == osc_urid->ATOM_Double) - { - if(!lv2_osc_writer_add_double(writer, ((const LV2_Atom_Double *)atom)->body)) - return false; - } - else if( (atom->type == osc_urid->ATOM_Object) && (obj->body.otype == osc_urid->OSC_Timetag) ) - { - LV2_OSC_Timetag tt; - lv2_osc_timetag_get(osc_urid, &obj->atom, &tt); - if(!lv2_osc_writer_add_timetag(writer, lv2_osc_timetag_parse(&tt))) - return false; - } - - // there is nothing to do for: true, false, nil, impulse - - else if(atom->type == osc_urid->ATOM_URID) - { - const char *symbol = unmap->unmap(unmap->handle, ((const LV2_Atom_URID *)atom)->body); - if(!symbol || !lv2_osc_writer_add_symbol(writer, symbol)) - return false; - } - else if(atom->type == osc_urid->MIDI_MidiEvent) - { - uint8_t *m = NULL; - if(!lv2_osc_writer_add_midi_inline(writer, atom->size + 1, &m)) - return false; - m[0] = 0x0; // port - memcpy(&m[1], LV2_ATOM_BODY_CONST(atom), atom->size); - } - else if(atom->type == osc_urid->ATOM_Literal) - { - const LV2_Atom_Literal *lit = (LV2_Atom_Literal *)atom; - - if(lit->body.datatype == osc_urid->OSC_Char) - { - const char c = *(const char *)LV2_ATOM_CONTENTS_CONST(LV2_Atom_Literal, lit); - if(!lv2_osc_writer_add_char(writer, c)) - return false; - } - else if(lit->body.datatype == osc_urid->OSC_RGBA) - { - const char *rgba = LV2_ATOM_CONTENTS_CONST(LV2_Atom_Literal, atom); - uint8_t r, g, b, a; - if(sscanf(rgba, "%02"SCNx8"%02"SCNx8"%02"SCNx8"%02"SCNx8, &r, &g, &b, &a) != 4) - return false; - if(!lv2_osc_writer_add_rgba(writer, r, g, b, a)) - return false; - } - } - } - } - - return true; - } - - return false; -} + LV2_URID_Unmap *unmap, uint32_t size, const LV2_Atom_Object_Body *body); #ifdef __cplusplus } // extern "C" diff --git a/src/forge.c b/src/forge.c new file mode 100644 index 0000000..4fdd270 --- /dev/null +++ b/src/forge.c @@ -0,0 +1,418 @@ +/* + * SPDX-FileCopyrightText: Hanspeter Portner + * SPDX-License-Identifier: Artistic-2.0 + */ + +#include +#include + +#include +#include +#include + +LV2_Atom_Forge_Ref +lv2_osc_forge_chunk(LV2_Atom_Forge *forge, LV2_URID type, + const uint8_t *buf, uint32_t size) +{ + LV2_Atom_Forge_Ref ref; + + if( (ref = lv2_atom_forge_atom(forge, size, type)) + && (ref = lv2_atom_forge_raw(forge, buf, size)) ) + { + lv2_atom_forge_pad(forge, size); + return ref; + } + + return 0; +} + +LV2_Atom_Forge_Ref +lv2_osc_forge_midi(LV2_Atom_Forge *forge, LV2_OSC_URID *osc_urid, + const uint8_t *buf, uint32_t size) +{ + assert(size <= 3); + return lv2_osc_forge_chunk(forge, osc_urid->MIDI_MidiEvent, buf, size); +} + +LV2_Atom_Forge_Ref +lv2_osc_forge_blob(LV2_Atom_Forge* forge, LV2_OSC_URID *osc_urid, + const uint8_t *buf, uint32_t size) +{ + return lv2_osc_forge_chunk(forge, osc_urid->ATOM_Chunk, buf, size); +} + +LV2_Atom_Forge_Ref +lv2_osc_forge_char(LV2_Atom_Forge* forge, LV2_OSC_URID *osc_urid, + char val) +{ + return lv2_atom_forge_literal(forge, &val, 1, osc_urid->OSC_Char, 0); +} + +LV2_Atom_Forge_Ref +lv2_osc_forge_rgba(LV2_Atom_Forge* forge, LV2_OSC_URID *osc_urid, + uint8_t r, uint8_t g, uint8_t b, uint8_t a) +{ + char val [9]; + sprintf(val, "%02"PRIx8"%02"PRIx8"%02"PRIx8"%02"PRIx8, r, g, b, a); + return lv2_atom_forge_literal(forge, val, 8, osc_urid->OSC_RGBA, 0); +} + +LV2_Atom_Forge_Ref +lv2_osc_forge_timetag(LV2_Atom_Forge *forge, LV2_OSC_URID *osc_urid, + const LV2_OSC_Timetag *timetag) +{ + LV2_Atom_Forge_Frame frame; + LV2_Atom_Forge_Ref ref; + + if( (ref = lv2_atom_forge_object(forge, &frame, 0, osc_urid->OSC_Timetag)) + && (ref = lv2_atom_forge_key(forge, osc_urid->OSC_timetagIntegral)) + && (ref = lv2_atom_forge_long(forge, timetag->integral)) + && (ref = lv2_atom_forge_key(forge, osc_urid->OSC_timetagFraction)) + && (ref = lv2_atom_forge_long(forge, timetag->fraction)) ) + { + lv2_atom_forge_pop(forge, &frame); + return ref; + } + + return 0; +} + +LV2_Atom_Forge_Ref +lv2_osc_forge_bundle_head(LV2_Atom_Forge* forge, LV2_OSC_URID *osc_urid, + LV2_Atom_Forge_Frame frame [2], const LV2_OSC_Timetag *timetag) +{ + LV2_Atom_Forge_Ref ref; + + if( (ref = lv2_atom_forge_object(forge, &frame[0], 0, osc_urid->OSC_Bundle)) + && (ref = lv2_atom_forge_key(forge, osc_urid->OSC_bundleTimetag)) + && (ref = lv2_osc_forge_timetag(forge, osc_urid, timetag)) + && (ref = lv2_atom_forge_key(forge, osc_urid->OSC_bundleItems)) + && (ref = lv2_atom_forge_tuple(forge, &frame[1])) ) + { + return ref; + } + + return 0; +} + +/** + TODO +*/ +LV2_Atom_Forge_Ref +lv2_osc_forge_message_head(LV2_Atom_Forge *forge, LV2_OSC_URID *osc_urid, + LV2_Atom_Forge_Frame frame [2], const char *path) +{ + assert(path); + + LV2_Atom_Forge_Ref ref; + if( (ref = lv2_atom_forge_object(forge, &frame[0], 0, osc_urid->OSC_Message)) + && (ref = lv2_atom_forge_key(forge, osc_urid->OSC_messagePath)) + && (ref = lv2_atom_forge_string(forge, path, strlen(path))) + && (ref = lv2_atom_forge_key(forge, osc_urid->OSC_messageArguments)) + && (ref = lv2_atom_forge_tuple(forge, &frame[1])) ) + { + return ref; + } + + return 0; +} + +/** + TODO +*/ +void +lv2_osc_forge_pop(LV2_Atom_Forge *forge, LV2_Atom_Forge_Frame frame [2]) +{ + lv2_atom_forge_pop(forge, &frame[1]); // a LV2_Atom_Tuple + lv2_atom_forge_pop(forge, &frame[0]); // a LV2_Atom_Object +} + +LV2_Atom_Forge_Ref +lv2_osc_forge_message_varlist(LV2_Atom_Forge *forge, LV2_OSC_URID *osc_urid, + const char *path, const char *fmt, va_list args) +{ + LV2_Atom_Forge_Frame frame [2]; + LV2_Atom_Forge_Ref ref; + + if(!lv2_osc_check_path(path) || !lv2_osc_check_fmt(fmt, 0)) + return 0; + if(!(ref = lv2_osc_forge_message_head(forge, osc_urid, frame, path))) + return 0; + + for(const char *type = fmt; *type; type++) + { + switch( (LV2_OSC_Type)*type) + { + case LV2_OSC_INT32: + { + if(!(ref = lv2_osc_forge_int(forge, osc_urid, va_arg(args, int32_t)))) + return 0; + break; + } + case LV2_OSC_FLOAT: + { + if(!(ref = lv2_osc_forge_float(forge, osc_urid, (float)va_arg(args, double)))) + return 0; + break; + } + case LV2_OSC_STRING: + { + const char *s = va_arg(args, const char *); + if(!s || !(ref = lv2_osc_forge_string(forge, osc_urid, s, strlen(s)))) + return 0; + break; + } + case LV2_OSC_BLOB: + { + const int32_t size = va_arg(args, int32_t); + const uint8_t *b = va_arg(args, const uint8_t *); + if(!b || !(ref = lv2_osc_forge_blob(forge, osc_urid, b, size))) + return 0; + break; + } + + case LV2_OSC_INT64: + { + if(!(ref = lv2_osc_forge_long(forge, osc_urid, va_arg(args, int64_t)))) + return 0; + break; + } + case LV2_OSC_DOUBLE: + { + if(!(ref = lv2_osc_forge_double(forge, osc_urid, va_arg(args, double)))) + return 0; + break; + } + case LV2_OSC_TIMETAG: + { + const LV2_OSC_Timetag timetag = { + .integral = va_arg(args, uint32_t), + .fraction = va_arg(args, uint32_t) + }; + if(!(ref = lv2_osc_forge_timetag(forge, osc_urid, &timetag))) + return 0; + break; + } + + case LV2_OSC_TRUE: + { + if(!(ref = lv2_osc_forge_true(forge, osc_urid))) + return 0; + break; + } + case LV2_OSC_FALSE: + { + if(!(ref = lv2_osc_forge_false(forge, osc_urid))) + return 0; + break; + } + case LV2_OSC_NIL: + { + if(!(ref = lv2_osc_forge_nil(forge, osc_urid))) + return 0; + break; + } + case LV2_OSC_IMPULSE: + { + if(!(ref = lv2_osc_forge_impulse(forge, osc_urid))) + return 0; + break; + } + + case LV2_OSC_SYMBOL: + { + if(!(ref = lv2_osc_forge_symbol(forge, osc_urid, va_arg(args, uint32_t)))) + return 0; + break; + } + case LV2_OSC_MIDI: + { + const int32_t size = va_arg(args, int32_t); + const uint8_t *m = va_arg(args, const uint8_t *); + if(!m || !(ref = lv2_osc_forge_midi(forge, osc_urid, m, size))) + return 0; + break; + } + case LV2_OSC_CHAR: + { + if(!(ref = lv2_osc_forge_char(forge, osc_urid, (char)va_arg(args, int)))) + return 0; + break; + } + case LV2_OSC_RGBA: + { + if(!(ref = lv2_osc_forge_rgba(forge, osc_urid, + (uint8_t)va_arg(args, unsigned), + (uint8_t)va_arg(args, unsigned), + (uint8_t)va_arg(args, unsigned), + (uint8_t)va_arg(args, unsigned)))) + return 0; + break; + } + } + } + + lv2_osc_forge_pop(forge, frame); + + return ref; +} + +LV2_Atom_Forge_Ref +lv2_osc_forge_message_vararg(LV2_Atom_Forge *forge, LV2_OSC_URID *osc_urid, + const char *path, const char *fmt, ...) +{ + LV2_Atom_Forge_Ref ref; + va_list args; + + va_start(args, fmt); + + ref = lv2_osc_forge_message_varlist(forge, osc_urid, path, fmt, args); + + va_end(args); + + return ref; +} + +LV2_Atom_Forge_Ref +lv2_osc_forge_packet(LV2_Atom_Forge *forge, LV2_OSC_URID *osc_urid, + LV2_URID_Map *map, const uint8_t *buf, size_t size) +{ + LV2_OSC_Reader reader; + LV2_Atom_Forge_Frame frame [2]; + LV2_Atom_Forge_Ref ref; + + lv2_osc_reader_initialize(&reader, buf, size); + + if(lv2_osc_reader_is_bundle(&reader)) + { + LV2_OSC_Item *itm = OSC_READER_BUNDLE_BEGIN(&reader, size); + + if(itm && (ref = lv2_osc_forge_bundle_head(forge, osc_urid, frame, + LV2_OSC_TIMETAG_CREATE(itm->timetag)))) + { + OSC_READER_BUNDLE_ITERATE(&reader, itm) + { + if(!(ref = lv2_osc_forge_packet(forge, osc_urid, map, itm->body, itm->size))) + return 0; + } + + lv2_osc_forge_pop(forge, frame); + + return ref; + } + } + else if(lv2_osc_reader_is_message(&reader)) + { + LV2_OSC_Arg *arg = OSC_READER_MESSAGE_BEGIN(&reader, size); + + if(arg && (ref = lv2_osc_forge_message_head(forge, osc_urid, frame, arg->path))) + { + OSC_READER_MESSAGE_ITERATE(&reader, arg) + { + switch( (LV2_OSC_Type)*arg->type) + { + case LV2_OSC_INT32: + { + if(!(ref = lv2_osc_forge_int(forge, osc_urid, arg->i))) + return 0; + break; + } + case LV2_OSC_FLOAT: + { + if(!(ref = lv2_osc_forge_float(forge, osc_urid, arg->f))) + return 0; + break; + } + case LV2_OSC_STRING: + { + if(!(ref = lv2_osc_forge_string(forge, osc_urid, arg->s, arg->size - 1))) + return 0; + break; + } + case LV2_OSC_BLOB: + { + if(!(ref = lv2_osc_forge_blob(forge, osc_urid, arg->b, arg->size))) + return 0; + break; + } + + case LV2_OSC_INT64: + { + if(!(ref = lv2_osc_forge_long(forge, osc_urid, arg->h))) + return 0; + break; + } + case LV2_OSC_DOUBLE: + { + if(!(ref = lv2_osc_forge_double(forge, osc_urid, arg->d))) + return 0; + break; + } + case LV2_OSC_TIMETAG: + { + if(!(ref = lv2_osc_forge_timetag(forge, osc_urid, LV2_OSC_TIMETAG_CREATE(arg->t)))) + return 0; + break; + } + + case LV2_OSC_TRUE: + { + if(!(ref = lv2_osc_forge_true(forge, osc_urid))) + return 0; + break; + } + case LV2_OSC_FALSE: + { + if(!(ref = lv2_osc_forge_false(forge, osc_urid))) + return 0; + break; + } + case LV2_OSC_NIL: + { + if(!(ref = lv2_osc_forge_nil(forge, osc_urid))) + return 0; + break; + } + case LV2_OSC_IMPULSE: + { + if(!(ref = lv2_osc_forge_impulse(forge, osc_urid))) + return 0; + break; + } + + case LV2_OSC_SYMBOL: + { + if(!(ref = lv2_osc_forge_symbol(forge, osc_urid, + map->map(map->handle, arg->S)))) + return 0; + break; + } + case LV2_OSC_MIDI: + { + if(!(ref = lv2_osc_forge_midi(forge, osc_urid, &arg->b[1], arg->size - 1))) + return 0; + break; + } + case LV2_OSC_CHAR: + { + if(!(ref = lv2_osc_forge_char(forge, osc_urid, arg->c))) + return 0; + break; + } + case LV2_OSC_RGBA: + { + if(!(ref = lv2_osc_forge_rgba(forge, osc_urid, arg->R, arg->G, arg->B, arg->A))) + return 0; + break; + } + } + } + + lv2_osc_forge_pop(forge, frame); + + return ref; + } + } + + return 0; +} diff --git a/src/osc.c b/src/osc.c new file mode 100644 index 0000000..374fe56 --- /dev/null +++ b/src/osc.c @@ -0,0 +1,43 @@ +/* + * SPDX-FileCopyrightText: Hanspeter Portner + * SPDX-License-Identifier: Artistic-2.0 + */ + +#include + +void +lv2_osc_urid_init(LV2_OSC_URID *osc_urid, LV2_URID_Map *map) +{ + osc_urid->OSC_Packet = map->map(map->handle, LV2_OSC__Packet); + + osc_urid->OSC_Bundle = map->map(map->handle, LV2_OSC__Bundle); + osc_urid->OSC_bundleTimetag = map->map(map->handle, LV2_OSC__bundleTimetag); + osc_urid->OSC_bundleItems = map->map(map->handle, LV2_OSC__bundleItems); + + osc_urid->OSC_Message = map->map(map->handle, LV2_OSC__Message); + osc_urid->OSC_messagePath = map->map(map->handle, LV2_OSC__messagePath); + osc_urid->OSC_messageArguments = map->map(map->handle, LV2_OSC__messageArguments); + + osc_urid->OSC_Timetag = map->map(map->handle, LV2_OSC__Timetag); + osc_urid->OSC_timetagIntegral = map->map(map->handle, LV2_OSC__timetagIntegral); + osc_urid->OSC_timetagFraction = map->map(map->handle, LV2_OSC__timetagFraction); + + osc_urid->OSC_Nil = map->map(map->handle, LV2_OSC__Nil); + osc_urid->OSC_Impulse = map->map(map->handle, LV2_OSC__Impulse); + osc_urid->OSC_Char = map->map(map->handle, LV2_OSC__Char); + osc_urid->OSC_RGBA = map->map(map->handle, LV2_OSC__RGBA); + + osc_urid->MIDI_MidiEvent = map->map(map->handle, LV2_MIDI__MidiEvent); + + osc_urid->ATOM_Int = map->map(map->handle, LV2_ATOM__Int); + osc_urid->ATOM_Long = map->map(map->handle, LV2_ATOM__Long); + osc_urid->ATOM_String = map->map(map->handle, LV2_ATOM__String); + osc_urid->ATOM_Literal = map->map(map->handle, LV2_ATOM__Literal); + osc_urid->ATOM_Float = map->map(map->handle, LV2_ATOM__Float); + osc_urid->ATOM_Double = map->map(map->handle, LV2_ATOM__Double); + osc_urid->ATOM_URID = map->map(map->handle, LV2_ATOM__URID); + osc_urid->ATOM_Bool = map->map(map->handle, LV2_ATOM__Bool); + osc_urid->ATOM_Tuple = map->map(map->handle, LV2_ATOM__Tuple); + osc_urid->ATOM_Object = map->map(map->handle, LV2_ATOM__Object); + osc_urid->ATOM_Chunk = map->map(map->handle, LV2_ATOM__Chunk); +} diff --git a/src/reader.c b/src/reader.c new file mode 100644 index 0000000..e8e1ec4 --- /dev/null +++ b/src/reader.c @@ -0,0 +1,516 @@ +/* + * SPDX-FileCopyrightText: Hanspeter Portner + * SPDX-License-Identifier: Artistic-2.0 + */ + +#include +#include +#include +#include + +#include +#include + +void +lv2_osc_reader_initialize(LV2_OSC_Reader *reader, const uint8_t *buf, size_t size) +{ + reader->buf = buf; + reader->ptr = buf; + reader->end = buf + size; +} + +bool +lv2_osc_reader_overflow(LV2_OSC_Reader *reader, size_t size) +{ + return reader->ptr + size > reader->end; +} + +bool +lv2_osc_reader_be32toh(LV2_OSC_Reader *reader, union swap32_t *s32) +{ + if(lv2_osc_reader_overflow(reader, 4)) + return false; + + s32->u = *(const uint32_t *)reader->ptr; + s32->u = be32toh(s32->u); + reader->ptr += 4; + + return true; +} + +bool +lv2_osc_reader_be64toh(LV2_OSC_Reader *reader, union swap64_t *s64) +{ + if(lv2_osc_reader_overflow(reader, 8)) + return false; + + s64->u = *(const uint64_t *)reader->ptr; + s64->u = be64toh(s64->u); + reader->ptr += 8; + + return true; +} + +bool +lv2_osc_reader_get_int32(LV2_OSC_Reader *reader, int32_t *i) +{ + union swap32_t s32; + if(!lv2_osc_reader_be32toh(reader, &s32)) + return false; + + *i = s32.i; + + return true; +} + +bool +lv2_osc_reader_get_float(LV2_OSC_Reader *reader, float *f) +{ + union swap32_t s32; + if(!lv2_osc_reader_be32toh(reader, &s32)) + return false; + + *f = s32.f; + + return true; +} + +bool +lv2_osc_reader_get_int64(LV2_OSC_Reader *reader, int64_t *h) +{ + union swap64_t s64; + if(!lv2_osc_reader_be64toh(reader, &s64)) + return false; + + *h = s64.h; + + return true; +} + +bool +lv2_osc_reader_get_timetag(LV2_OSC_Reader *reader, uint64_t *t) +{ + union swap64_t s64; + if(!lv2_osc_reader_be64toh(reader, &s64)) + return false; + + *t = s64.u; + + return true; +} + +bool +lv2_osc_reader_get_double(LV2_OSC_Reader *reader, double *d) +{ + union swap64_t s64; + if(!lv2_osc_reader_be64toh(reader, &s64)) + return false; + + *d = s64.d; + + return true; +} + +bool +lv2_osc_reader_get_string(LV2_OSC_Reader *reader, const char **s) +{ + const char *str = (const char *)reader->ptr; + const size_t padded = LV2_OSC_PADDED_SIZE(strlen(str) + 1); + if(lv2_osc_reader_overflow(reader, padded )) + return false; + + *s = str; + reader->ptr += padded; + + return true; +} + +bool +lv2_osc_reader_get_symbol(LV2_OSC_Reader *reader, const char **S) +{ + return lv2_osc_reader_get_string(reader, S); +} + +bool +lv2_osc_reader_get_midi(LV2_OSC_Reader *reader, const uint8_t **m) +{ + if(lv2_osc_reader_overflow(reader, 4)) + return false; + + *m = reader->ptr; + reader->ptr += 4; + + return true; +} + +bool +lv2_osc_reader_get_blob(LV2_OSC_Reader *reader, int32_t *len, const uint8_t **body) +{ + if(!lv2_osc_reader_get_int32(reader, len)) + return false; + + const size_t padded = LV2_OSC_PADDED_SIZE(*len); + if(lv2_osc_reader_overflow(reader, padded)) + return false; + + *body = reader->ptr; + reader->ptr += padded; + + return true; +} + +bool +lv2_osc_reader_get_rgba(LV2_OSC_Reader *reader, uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *a) +{ + if(lv2_osc_reader_overflow(reader, 4)) + return false; + + *r = reader->ptr[0]; + *g = reader->ptr[1]; + *b = reader->ptr[2]; + *a = reader->ptr[3]; + reader->ptr += 4; + + return true; +} + +bool +lv2_osc_reader_get_char(LV2_OSC_Reader *reader, char *c) +{ + int32_t i; + if(!lv2_osc_reader_get_int32(reader, &i)) + return false; + + *c = i; + + return true; +} + +LV2_OSC_Item * +lv2_osc_reader_item_raw(LV2_OSC_Reader *reader, LV2_OSC_Item *itm) +{ + if(!lv2_osc_reader_get_int32(reader, &itm->size)) + return NULL; + + if(lv2_osc_reader_overflow(reader, itm->size)) + return NULL; + + itm->body = reader->ptr; + + return itm; +} + +LV2_OSC_Item * +lv2_osc_reader_item_begin(LV2_OSC_Reader *reader, LV2_OSC_Item *itm, size_t len) +{ + if(lv2_osc_reader_overflow(reader, len)) + return NULL; + + itm->end = reader->ptr + len; + + if(lv2_osc_reader_overflow(reader, 16)) + return NULL; + + if(strncmp((const char *)reader->ptr, "#bundle", 8)) + return NULL; + reader->ptr += 8; + + if(!lv2_osc_reader_get_timetag(reader, &itm->timetag)) + return NULL; + + return lv2_osc_reader_item_raw(reader, itm); +} + +bool +lv2_osc_reader_item_is_end(LV2_OSC_Reader *reader, LV2_OSC_Item *itm) +{ + return reader->ptr > itm->end; +} + +LV2_OSC_Item * +lv2_osc_reader_item_next(LV2_OSC_Reader *reader, LV2_OSC_Item *itm) +{ + reader->ptr += itm->size; + + return lv2_osc_reader_item_raw(reader, itm); +} + +LV2_OSC_Arg * +lv2_osc_reader_arg_raw(LV2_OSC_Reader *reader, LV2_OSC_Arg *arg) +{ + switch( (LV2_OSC_Type)*arg->type) + { + case LV2_OSC_INT32: + { + if(!lv2_osc_reader_get_int32(reader, &arg->i)) + return NULL; + arg->size = 4; + + break; + } + case LV2_OSC_FLOAT: + { + if(!lv2_osc_reader_get_float(reader, &arg->f)) + return NULL; + arg->size = 4; + + break; + } + case LV2_OSC_STRING: + { + if(!lv2_osc_reader_get_string(reader, &arg->s)) + return NULL; + arg->size = strlen(arg->s) + 1; + + break; + } + case LV2_OSC_BLOB: + { + if(!lv2_osc_reader_get_blob(reader, &arg->size, &arg->b)) + return NULL; + //arg->size = arg->size; + + break; + } + + case LV2_OSC_TRUE: + case LV2_OSC_FALSE: + case LV2_OSC_NIL: + case LV2_OSC_IMPULSE: + break; + + case LV2_OSC_INT64: + { + if(!lv2_osc_reader_get_int64(reader, &arg->h)) + return NULL; + arg->size = 8; + + break; + } + case LV2_OSC_DOUBLE: + { + if(!lv2_osc_reader_get_double(reader, &arg->d)) + return NULL; + arg->size = 8; + + break; + } + case LV2_OSC_TIMETAG: + { + if(!lv2_osc_reader_get_timetag(reader, &arg->t)) + return NULL; + arg->size = 8; + + break; + } + + case LV2_OSC_MIDI: + { + if(!lv2_osc_reader_get_midi(reader, &arg->m)) + return NULL; + arg->size = 4; + + break; + } + case LV2_OSC_SYMBOL: + { + if(!lv2_osc_reader_get_symbol(reader, &arg->S)) + return NULL; + arg->size = strlen(arg->S) + 1; + + break; + } + case LV2_OSC_CHAR: + { + if(!lv2_osc_reader_get_char(reader, &arg->c)) + return NULL; + arg->size = 4; + + break; + } + case LV2_OSC_RGBA: + { + if(!lv2_osc_reader_get_rgba(reader, &arg->R, &arg->G, &arg->B, &arg->A)) + return NULL; + arg->size = 4; + + break; + } + } + + return arg; +} + +LV2_OSC_Arg * +lv2_osc_reader_arg_begin(LV2_OSC_Reader *reader, LV2_OSC_Arg *arg, size_t len) +{ + if(lv2_osc_reader_overflow(reader, len)) + return NULL; + + arg->end = reader->ptr + len; + + if(!lv2_osc_reader_get_string(reader, &arg->path)) //TODO check for validity + return NULL; + + if(!lv2_osc_reader_get_string(reader, &arg->type)) //TODO check for validity + return NULL; + + if(*arg->type != ',') + return NULL; + + arg->type++; // skip ',' + + return lv2_osc_reader_arg_raw(reader, arg); +} + +bool +lv2_osc_reader_arg_is_end(LV2_OSC_Reader *reader, LV2_OSC_Arg *arg) +{ + return (*arg->type == '\0') || (reader->ptr > arg->end); +} + +LV2_OSC_Arg * +lv2_osc_reader_arg_next(LV2_OSC_Reader *reader, LV2_OSC_Arg *arg) +{ + arg->type++; + + return lv2_osc_reader_arg_raw(reader, arg); +} + +bool +lv2_osc_reader_arg_varlist(LV2_OSC_Reader *reader, const char *fmt, va_list args) +{ + for(const char *type = fmt; *type; type++) + { + switch( (LV2_OSC_Type)*type) + { + case LV2_OSC_INT32: + if(!lv2_osc_reader_get_int32(reader, va_arg(args, int32_t *))) + return false; + break; + case LV2_OSC_FLOAT: + if(!lv2_osc_reader_get_float(reader, va_arg(args, float *))) + return false; + break; + case LV2_OSC_STRING: + if(!lv2_osc_reader_get_string(reader, va_arg(args, const char **))) + return false; + break; + case LV2_OSC_BLOB: + if(!lv2_osc_reader_get_blob(reader, va_arg(args, int32_t *), va_arg(args, const uint8_t **))) + return false; + break; + + case LV2_OSC_TRUE: + case LV2_OSC_FALSE: + case LV2_OSC_NIL: + case LV2_OSC_IMPULSE: + break; + + case LV2_OSC_INT64: + if(!lv2_osc_reader_get_int64(reader, va_arg(args, int64_t *))) + return false; + break; + case LV2_OSC_DOUBLE: + if(!lv2_osc_reader_get_double(reader, va_arg(args, double *))) + return false; + break; + case LV2_OSC_TIMETAG: + if(!lv2_osc_reader_get_timetag(reader, va_arg(args, uint64_t *))) + return false; + break; + + case LV2_OSC_MIDI: + if(!lv2_osc_reader_get_midi(reader, va_arg(args, const uint8_t **))) + return false; + break; + case LV2_OSC_SYMBOL: + if(!lv2_osc_reader_get_symbol(reader, va_arg(args, const char **))) + return false; + break; + case LV2_OSC_CHAR: + if(!lv2_osc_reader_get_char(reader, va_arg(args, char *))) + return false; + break; + case LV2_OSC_RGBA: + if(!lv2_osc_reader_get_rgba(reader, va_arg(args, uint8_t *), va_arg(args, uint8_t *), + va_arg(args, uint8_t *), va_arg(args, uint8_t *))) + return false; + break; + } + } + + return true; +} + +bool +lv2_osc_reader_arg_vararg(LV2_OSC_Reader *reader, const char *fmt, ...) +{ + va_list args; + va_start(args, fmt); + + const bool res = lv2_osc_reader_arg_varlist(reader, fmt, args); + + va_end(args); + + return res; +} + +bool +lv2_osc_reader_is_bundle(LV2_OSC_Reader *reader) +{ + return strncmp((const char *)reader->ptr, "#bundle", 8) == 0; +} + +bool +lv2_osc_reader_is_message(LV2_OSC_Reader *reader) +{ + return reader->ptr[0] == '/'; //FIXME check path +} + +static void +_lv2_osc_trees_internal(LV2_OSC_Reader *reader, const char *path, const char *from, + LV2_OSC_Arg *arg, const LV2_OSC_Tree *trees, void *data) +{ + const char *ptr = strchr(from, '/'); + const char *pattern = strpbrk(from, "*?[]{}/"); + const bool has_pattern = pattern && (pattern[0] != '/'); + (void)has_pattern; //FIXME + + const size_t len = ptr + ? (size_t)(ptr - from) + : strlen(from); + + for(const LV2_OSC_Tree *tree = trees; tree && tree->name; tree++) + { + if(lv2_osc_pattern_match(from, tree->name, len)) + { + if(tree->trees && ptr) + { + if(tree->branch) + { + LV2_OSC_Reader reader_clone = *reader; + tree->branch(&reader_clone, arg, tree, data); + } + + _lv2_osc_trees_internal(reader, path, &ptr[1], arg, tree->trees, data); + } + else if(tree->branch && !ptr) + { + LV2_OSC_Reader reader_clone = *reader; + tree->branch(&reader_clone, arg, tree, data); + } + } + } +} + +void +lv2_osc_reader_match(LV2_OSC_Reader *reader, size_t len, + const LV2_OSC_Tree *trees, void *data) +{ + LV2_OSC_Arg *arg = OSC_READER_MESSAGE_BEGIN(reader, len); + const char *path = arg->path; + const char *from = &path[1]; + + _lv2_osc_trees_internal(reader, path, from, arg, trees, data); +} diff --git a/src/stream.c b/src/stream.c new file mode 100644 index 0000000..523b3a9 --- /dev/null +++ b/src/stream.c @@ -0,0 +1,1336 @@ +/* + * SPDX-FileCopyrightText: Hanspeter Portner + * SPDX-License-Identifier: Artistic-2.0 + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#if !defined(LV2_OSC_STREAM_SNDBUF) +# define LV2_OSC_STREAM_SNDBUF 0x100000 // 1 M +#endif + +#if !defined(LV2_OSC_STREAM_RCVBUF) +# define LV2_OSC_STREAM_RCVBUF 0x100000 // 1 M +#endif + +#if !defined(LV2_OSC_STREAM_REQBUF) +# define LV2_OSC_STREAM_REQBUF 1024 +#endif + +static const char *udp_prefix = "osc.udp://"; +static const char *tcp_prefix = "osc.tcp://"; +static const char *tcp_slip_prefix = "osc.slip.tcp://"; +static const char *tcp_prefix_prefix = "osc.prefix.tcp://"; +static const char *ser_prefix = "osc.serial://"; +//FIXME serial + +static int +_lv2_osc_stream_interface_attribs(int fd, int speed) +{ + struct termios tty; + + if(tcgetattr(fd, &tty) < 0) + { + return -1; + } + + cfsetospeed(&tty, (speed_t)speed); + cfsetispeed(&tty, (speed_t)speed); + + tty.c_cflag |= (CLOCAL | CREAD); /* ignore modem controls */ + tty.c_cflag &= ~CSIZE; + tty.c_cflag |= CS8; /* 8-bit characters */ + tty.c_cflag &= ~PARENB; /* no parity bit */ + tty.c_cflag &= ~CSTOPB; /* only need 1 stop bit */ + tty.c_cflag &= ~CRTSCTS; /* no hardware flowcontrol */ + + /* setup for non-canonical mode */ + tty.c_iflag &= ~(IGNCR | ONLCR | IXON); + tty.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); + tty.c_oflag &= ~OPOST; + + /* fetch bytes as they become available */ + tty.c_cc[VMIN] = 0; + tty.c_cc[VTIME] = 0; + + if(tcsetattr(fd, TCSANOW, &tty) != 0) + { + return -1; + } + + return 0; +} + +static void +_close_socket(int *fd) +{ + if(fd) + { + if(*fd >= 0) + { + close(*fd); + } + + *fd = -1; + } +} + +int +lv2_osc_stream_deinit(LV2_OSC_Stream *stream) +{ + _close_socket(&stream->fd); + _close_socket(&stream->sock); + + return 0; +} + +static int +_lv2_osc_stream_reinit(LV2_OSC_Stream *stream) +{ + LV2_OSC_Enum ev = LV2_OSC_NONE; + lv2_osc_stream_deinit(stream); + + char *dup = strdup(stream->url); + if(!dup) + { + ev = LV2_OSC_STREAM_ERRNO(ev, ENOMEM); + goto fail; + } + + char *ptr = dup; + char *tmp; + + if(strncmp(ptr, udp_prefix, strlen(udp_prefix)) == 0) + { + stream->slip = false; + stream->socket_family = AF_INET; + stream->socket_type = SOCK_DGRAM; + stream->protocol = IPPROTO_UDP; + ptr += strlen(udp_prefix); + } + else if(strncmp(ptr, tcp_prefix, strlen(tcp_prefix)) == 0) + { + stream->slip = true; + stream->socket_family = AF_INET; + stream->socket_type = SOCK_STREAM; + stream->protocol = IPPROTO_TCP; + ptr += strlen(tcp_prefix); + } + else if(strncmp(ptr, tcp_slip_prefix, strlen(tcp_slip_prefix)) == 0) + { + stream->slip = true; + stream->socket_family = AF_INET; + stream->socket_type = SOCK_STREAM; + stream->protocol = IPPROTO_TCP; + ptr += strlen(tcp_slip_prefix); + } + else if(strncmp(ptr, tcp_prefix_prefix, strlen(tcp_prefix_prefix)) == 0) + { + stream->slip = false; + stream->socket_family = AF_INET; + stream->socket_type = SOCK_STREAM; + stream->protocol = IPPROTO_TCP; + ptr += strlen(tcp_prefix_prefix); + } + else if(strncmp(ptr, ser_prefix, strlen(ser_prefix)) == 0) + { + stream->slip = true; + stream->serial = true; + ptr += strlen(ser_prefix); + } + else + { + ev = LV2_OSC_STREAM_ERRNO(ev, ENOPROTOOPT); + goto fail; + } + + if(ptr[0] == '\0') + { + ev = LV2_OSC_STREAM_ERRNO(ev, EDESTADDRREQ); + goto fail; + } + + if(stream->serial) + { + stream->sock = open(ptr, O_RDWR | O_NOCTTY | O_NDELAY); + if(stream->sock < 0) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + + if(fcntl(stream->sock, F_SETFL, FNDELAY) == -1) //FIXME + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + + if(_lv2_osc_stream_interface_attribs(stream->sock, B115200) == -1) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + + stream->connected = true; + } + else // !stream->serial + { + const char *node = NULL; + const char *iface = NULL; + const char *service = NULL; + + // optional IPv6 + if(ptr[0] == '[') + { + stream->socket_family = AF_INET6; + ++ptr; + } + + node = ptr; + + // optional IPv6 + if( (tmp = strchr(ptr, '%')) ) + { + if(stream->socket_family != AF_INET6) + { + ev = LV2_OSC_STREAM_ERRNO(ev, EPROTOTYPE); + goto fail; + } + + ptr = tmp; + ptr[0] = '\0'; + iface = ++ptr; + } + + // optional IPv6 + if( (tmp = strchr(ptr, ']')) ) + if(ptr) + { + if(stream->socket_family != AF_INET6) + { + ev = LV2_OSC_STREAM_ERRNO(ev, EDESTADDRREQ); + goto fail; + } + + ptr = tmp; + ptr[0] = '\0'; + ++ptr; + } + + // mandatory IPv4/6 + ptr = strchr(ptr, ':'); + if(!ptr) + { + ev = LV2_OSC_STREAM_ERRNO(ev, EDESTADDRREQ); + goto fail; + } + + ptr[0] = '\0'; + + service = ++ptr; + + if(strlen(node) == 0) + { + node = NULL; + stream->server = true; + } + + stream->sock = socket(stream->socket_family, stream->socket_type, + stream->protocol); + + if(stream->sock < 0) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + + if(fcntl(stream->sock, F_SETFL, O_NONBLOCK) == -1) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + + const int sendbuff = LV2_OSC_STREAM_SNDBUF; + const int recvbuff = LV2_OSC_STREAM_RCVBUF; + const int reuseaddr = 1; + + if(setsockopt(stream->sock, SOL_SOCKET, + SO_SNDBUF, &sendbuff, sizeof(sendbuff)) == -1) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + + if(setsockopt(stream->sock, SOL_SOCKET, + SO_RCVBUF, &recvbuff, sizeof(recvbuff)) == -1) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + + if(setsockopt(stream->sock, SOL_SOCKET, + SO_REUSEADDR, &reuseaddr, sizeof(reuseaddr)) == -1) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + + if(stream->socket_family == AF_INET) // IPv4 + { + if(stream->server) + { + // resolve self address + struct addrinfo hints; + memset(&hints, 0x0, sizeof(struct addrinfo)); + hints.ai_family = stream->socket_family; + hints.ai_socktype = stream->socket_type; + hints.ai_protocol = stream->protocol; + + struct addrinfo *res; + if(getaddrinfo(node, service, &hints, &res) != 0) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + if(res->ai_addrlen != sizeof(stream->peer.in4)) + { + ev = LV2_OSC_STREAM_ERRNO(ev, EPROTOTYPE); + goto fail; + } + + stream->self.len = res->ai_addrlen; + memcpy(&stream->self.in4, res->ai_addr, res->ai_addrlen); + stream->self.in4.sin_addr.s_addr = htonl(INADDR_ANY); + + freeaddrinfo(res); + + if(bind(stream->sock, (struct sockaddr *)&stream->self.in4, + stream->self.len) != 0) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + } + else // client + { + stream->self.len = sizeof(stream->self.in4); + stream->self.in4.sin_family = stream->socket_family; + stream->self.in4.sin_port = htons(0); + stream->self.in4.sin_addr.s_addr = htonl(INADDR_ANY); + + if(bind(stream->sock, (struct sockaddr *)&stream->self.in4, + stream->self.len) != 0) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + + // resolve peer address + struct addrinfo hints; + memset(&hints, 0x0, sizeof(struct addrinfo)); + hints.ai_family = stream->socket_family; + hints.ai_socktype = stream->socket_type; + hints.ai_protocol = stream->protocol; + + struct addrinfo *res; + if(getaddrinfo(node, service, &hints, &res) != 0) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + if(res->ai_addrlen != sizeof(stream->peer.in4)) + { + ev = LV2_OSC_STREAM_ERRNO(ev, EPROTOTYPE); + goto fail; + } + + stream->peer.len = res->ai_addrlen; + memcpy(&stream->peer.in4, res->ai_addr, res->ai_addrlen); + + freeaddrinfo(res); + } + + if(stream->socket_type == SOCK_DGRAM) + { + const int broadcast = 1; + + if(setsockopt(stream->sock, SOL_SOCKET, SO_BROADCAST, + &broadcast, sizeof(broadcast)) != 0) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + + //FIXME handle multicast + } + else if(stream->socket_type == SOCK_STREAM) + { + const int flag = 1; + + if(setsockopt(stream->sock, stream->protocol, + TCP_NODELAY, &flag, sizeof(flag)) != 0) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + + if(setsockopt(stream->sock, SOL_SOCKET, + SO_KEEPALIVE, &flag, sizeof(flag)) != 0) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + + if(stream->server) + { + if(listen(stream->sock, 1) != 0) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + } + else // client + { + if(connect(stream->sock, (struct sockaddr *)&stream->peer.in4, + stream->peer.len) == 0) + { + stream->connected = true; + } + } + } + else + { + ev = LV2_OSC_STREAM_ERRNO(ev, EPROTOTYPE); + goto fail; + } + } + else if(stream->socket_family == AF_INET6) // IPv6 + { + if(stream->server) + { + // resolve self address + struct addrinfo hints; + memset(&hints, 0x0, sizeof(struct addrinfo)); + hints.ai_family = stream->socket_family; + hints.ai_socktype = stream->socket_type; + hints.ai_protocol = stream->protocol; + + struct addrinfo *res; + if(getaddrinfo(node, service, &hints, &res) != 0) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + if(res->ai_addrlen != sizeof(stream->peer.in6)) + { + ev = LV2_OSC_STREAM_ERRNO(ev, EPROTOTYPE); + goto fail; + } + + stream->self.len = res->ai_addrlen; + memcpy(&stream->self.in6, res->ai_addr, res->ai_addrlen); + stream->self.in6.sin6_addr = in6addr_any; + if(iface) + { + stream->self.in6.sin6_scope_id = if_nametoindex(iface); + } + + freeaddrinfo(res); + + if(bind(stream->sock, (struct sockaddr *)&stream->self.in6, + stream->self.len) != 0) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + } + else // client + { + stream->self.len = sizeof(stream->self.in6); + stream->self.in6.sin6_family = stream->socket_family; + stream->self.in6.sin6_port = htons(0); + stream->self.in6.sin6_addr = in6addr_any; + if(iface) + { + stream->self.in6.sin6_scope_id = if_nametoindex(iface); + } + + if(bind(stream->sock, (struct sockaddr *)&stream->self.in6, + stream->self.len) != 0) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + + // resolve peer address + struct addrinfo hints; + memset(&hints, 0x0, sizeof(struct addrinfo)); + hints.ai_family = stream->socket_family; + hints.ai_socktype = stream->socket_type; + hints.ai_protocol = stream->protocol; + + struct addrinfo *res; + if(getaddrinfo(node, service, &hints, &res) != 0) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + if(res->ai_addrlen != sizeof(stream->peer.in6)) + { + ev = LV2_OSC_STREAM_ERRNO(ev, EPROTOTYPE); + goto fail; + } + + stream->peer.len = res->ai_addrlen; + memcpy(&stream->peer.in6, res->ai_addr, res->ai_addrlen); + + if(iface) + { + stream->peer.in6.sin6_scope_id = if_nametoindex(iface); + } + + freeaddrinfo(res); + } + + if(stream->socket_type == SOCK_DGRAM) + { + // nothing to do + } + else if(stream->socket_type == SOCK_STREAM) + { + const int flag = 1; + + if(setsockopt(stream->sock, stream->protocol, + TCP_NODELAY, &flag, sizeof(flag)) != 0) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + + if(setsockopt(stream->sock, SOL_SOCKET, + SO_KEEPALIVE, &flag, sizeof(flag)) != 0) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + + if(stream->server) + { + if(listen(stream->sock, 1) != 0) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + goto fail; + } + } + else // client + { + if(connect(stream->sock, (struct sockaddr *)&stream->peer.in6, + stream->peer.len) == 0) + { + stream->connected = true; + } + } + } + else + { + ev = LV2_OSC_STREAM_ERRNO(ev, EPROTOTYPE); + goto fail; + } + } + else + { + ev = LV2_OSC_STREAM_ERRNO(ev, EPROTOTYPE); + goto fail; + } + } + + free(dup); + + return ev; + +fail: + if(dup) + { + free(dup); + } + + _close_socket(&stream->sock); + + return ev; +} + +int +lv2_osc_stream_init(LV2_OSC_Stream *stream, const char *url, + const LV2_OSC_Driver *driv, void *data) +{ + memset(stream, 0x0, sizeof(LV2_OSC_Stream)); + + strncpy(stream->url, url, sizeof(stream->url) - 1); + stream->driv = driv; + stream->data = data; + stream->sock = -1; + stream->fd = -1; + + return _lv2_osc_stream_reinit(stream); +} + +#define SLIP_END 0300 // 0xC0, 192, indicates end of packet +#define SLIP_ESC 0333 // 0xDB, 219, indicates byte stuffing +#define SLIP_END_REPLACE 0334 // 0xDC, 220, ESC ESC_END means END data byte +#define SLIP_ESC_REPLACE 0335 // 0xDD, 221, ESC ESC_ESC means ESC data byte + +// SLIP encoding +size_t +lv2_osc_slip_encode_inline(uint8_t *dst, size_t len) +{ + if(len == 0) + return 0; + + const uint8_t *end = dst + len; + + // estimate new size + size_t size = 2; // double ended SLIP + for(const uint8_t *from=dst; from=dst; from--) + { + if(*from == SLIP_END) + { + *to-- = SLIP_END_REPLACE; + *to-- = SLIP_ESC; + } + else if(*from == SLIP_ESC) + { + *to-- = SLIP_ESC_REPLACE; + *to-- = SLIP_ESC; + } + else + *to-- = *from; + } + *to-- = SLIP_END; + + return size; +} + +// SLIP decoding +size_t +lv2_osc_slip_decode_inline(uint8_t *dst, size_t len, size_t *size) +{ + const uint8_t *src = dst; + const uint8_t *end = dst + len; + uint8_t *ptr = dst; + + bool whole = false; + + if( (src < end) && (*src == SLIP_END) ) + { + whole = true; + src++; + } + + while(src < end) + { + if(*src == SLIP_ESC) + { + if(src == end-1) + break; + + src++; + if(*src == SLIP_END_REPLACE) + *ptr++ = SLIP_END; + else if(*src == SLIP_ESC_REPLACE) + *ptr++ = SLIP_ESC; + src++; + } + else if(*src == SLIP_END) + { + src++; + + *size = whole ? ptr - dst : 0; + return src - dst; + } + else + { + *ptr++ = *src++; + } + } + + *size = 0; + return 0; +} + +static LV2_OSC_Enum +_lv2_osc_stream_run_udp(LV2_OSC_Stream *stream) +{ + LV2_OSC_Enum ev = LV2_OSC_NONE; + + // send everything + if(stream->peer.len) // has a peer + { + const uint8_t *buf; + size_t tosend; + + while( (buf = stream->driv->read_req(stream->data, &tosend)) ) + { + const ssize_t sent = sendto(stream->sock, buf, tosend, 0, + (struct sockaddr *)&stream->peer.in6, stream->peer.len); + + if(sent == -1) + { + if( (errno == EAGAIN) || (errno == EWOULDBLOCK) ) + { + // full queue + break; + } + + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + break; + } + else if(sent != (ssize_t)tosend) + { + ev = LV2_OSC_STREAM_ERRNO(ev, EIO); + break; + } + + stream->driv->read_adv(stream->data); + ev |= LV2_OSC_SEND; + } + } + + // recv everything + { + uint8_t *buf; + size_t max_len; + + while( (buf = stream->driv->write_req(stream->data, + LV2_OSC_STREAM_REQBUF, &max_len)) ) + { + struct sockaddr_in6 in; + socklen_t in_len = sizeof(in); + + memset(&in, 0, in_len); + const ssize_t recvd = recvfrom(stream->sock, buf, max_len, 0, + (struct sockaddr *)&in, &in_len); + + if(recvd == -1) + { + if( (errno == EAGAIN) || (errno == EWOULDBLOCK) ) + { + // empty queue + break; + } + + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + break; + } + else if(recvd == 0) + { + // peer has shut down + break; + } + + stream->peer.len = in_len; + memcpy(&stream->peer.in6, &in, in_len); + + stream->driv->write_adv(stream->data, recvd); + ev |= LV2_OSC_RECV; + } + } + + return ev; +} + +static LV2_OSC_Enum +_lv2_osc_stream_run_tcp(LV2_OSC_Stream *stream) +{ + LV2_OSC_Enum ev = LV2_OSC_NONE; + + // handle connections + if(!stream->connected) // no peer + { + if(stream->server) + { + stream->peer.len = sizeof(stream->peer.in6); + stream->fd = accept(stream->sock, (struct sockaddr *)&stream->peer.in6, + &stream->peer.len); + + if(stream->fd >= 0) + { + const int flag = 1; + const int sendbuff = LV2_OSC_STREAM_SNDBUF; + const int recvbuff = LV2_OSC_STREAM_RCVBUF; + + if(fcntl(stream->fd, F_SETFL, O_NONBLOCK) == -1) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + } + + if(setsockopt(stream->fd, stream->protocol, + TCP_NODELAY, &flag, sizeof(flag)) != 0) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + } + + if(setsockopt(stream->sock, SOL_SOCKET, + SO_KEEPALIVE, &flag, sizeof(flag)) != 0) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + } + + if(setsockopt(stream->fd, SOL_SOCKET, + SO_SNDBUF, &sendbuff, sizeof(sendbuff)) == -1) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + } + + if(setsockopt(stream->fd, SOL_SOCKET, + SO_RCVBUF, &recvbuff, sizeof(recvbuff)) == -1) + { + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + } + + stream->connected = true; // orderly accept + } + else + { + //ev = LV2_OSC_STREAM_ERRNO(ev, errno); + } + } + else + { + if(stream->sock < 0) + { + ev = _lv2_osc_stream_reinit(stream); + } + + if(connect(stream->sock, (struct sockaddr *)&stream->peer.in6, + stream->peer.len) == 0) + { + stream->connected = true; // orderly (re)connect + } + else + { + //if(errno == EISCONN) + //{ + // _close_socket(&stream->sock); + //} + + //ev = LV2_OSC_STREAM_ERRNO(ev, errno); + } + } + } + + // send everything + if(stream->connected) + { + int *fd = stream->server + ? &stream->fd + : &stream->sock; + + if(*fd >= 0) + { + const uint8_t *buf; + size_t tosend; + + while( (buf = stream->driv->read_req(stream->data, &tosend)) ) + { + if(stream->slip) // SLIP framed + { + if(tosend <= sizeof(stream->tx_buf)) // check if there is enough memory + { + memcpy(stream->tx_buf, buf, tosend); + tosend = lv2_osc_slip_encode_inline(stream->tx_buf, tosend); + } + else + { + tosend = 0; + } + } + else // uint32_t prefix frames + { + const size_t nsize = tosend + sizeof(uint32_t); + + if(nsize <= sizeof(stream->tx_buf)) // check if there is enough memory + { + const uint32_t prefix = htonl(tosend); + + memcpy(stream->tx_buf, &prefix, sizeof(uint32_t)); + memcpy(stream->tx_buf + sizeof(uint32_t), buf, tosend); + tosend = nsize; + } + else + { + tosend = 0; + } + } + + const ssize_t sent = tosend + ? send(*fd, stream->tx_buf, tosend, 0) + : 0; + + if(sent == -1) + { + if( (errno == EAGAIN) || (errno == EWOULDBLOCK) ) + { + // empty queue + break; + } + + _close_socket(fd); + stream->connected = false; + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + break; + } + else if(sent != (ssize_t)tosend) + { + ev = LV2_OSC_STREAM_ERRNO(ev, EIO); + break; + } + + stream->driv->read_adv(stream->data); + ev |= LV2_OSC_SEND; + } + } + } + + // recv everything + if(stream->connected) + { + int *fd = stream->server + ? &stream->fd + : &stream->sock; + + if(*fd >= 0) + { + if(stream->slip) // SLIP framed + { + while(true) + { + ssize_t recvd = recv(*fd, stream->rx_buf + stream->rx_off, + sizeof(stream->rx_buf) - stream->rx_off, 0); + + if(recvd == -1) + { + if( (errno == EAGAIN) || (errno == EWOULDBLOCK) ) + { + // empty queue + break; + } + + _close_socket(fd); + stream->connected = false; + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + break; + } + else if(recvd == 0) + { + _close_socket(fd); + stream->connected = false; // orderly shutdown + break; + } + + uint8_t *ptr = stream->rx_buf; + recvd += stream->rx_off; + + while(recvd > 0) + { + size_t size; + size_t parsed = lv2_osc_slip_decode_inline(ptr, recvd, &size); + + if(size) // dispatch + { + uint8_t *buf; + + if( (buf = stream->driv->write_req(stream->data, size, NULL)) ) + { + memcpy(buf, ptr, size); + + stream->driv->write_adv(stream->data, size); + ev |= LV2_OSC_RECV; + } + else + { + parsed = 0; + ev = LV2_OSC_STREAM_ERRNO(ev, ENOMEM); + } + } + + if(parsed) + { + ptr += parsed; + recvd -= parsed; + } + else + { + break; + } + } + + if(recvd > 0) // is there remaining chunk for next call? + { + memmove(stream->rx_buf, ptr, recvd); + stream->rx_off = recvd; + } + else + { + stream->rx_off = 0; + } + + break; + } + } + else // uint32_t prefix frames + { + uint8_t *buf; + + while( (buf = stream->driv->write_req(stream->data, + LV2_OSC_STREAM_REQBUF, NULL)) ) + { + uint32_t prefix; + + ssize_t recvd = recv(*fd, &prefix, sizeof(uint32_t), 0); + if(recvd == sizeof(uint32_t)) + { + prefix = ntohl(prefix); //FIXME check prefix <= max_len + recvd = recv(*fd, buf, prefix, 0); + } + else if(recvd == -1) + { + if( (errno == EAGAIN) || (errno == EWOULDBLOCK) ) + { + // empty queue + break; + } + + _close_socket(fd); + stream->connected = false; + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + break; + } + else if(recvd == 0) + { + _close_socket(fd); + stream->connected = false; // orderly shutdown + break; + } + + stream->driv->write_adv(stream->data, recvd); + ev |= LV2_OSC_RECV; + } + } + } + } + + if(stream->connected) + { + ev |= LV2_OSC_CONN; + } + + return ev; +} + +static LV2_OSC_Enum +_lv2_osc_stream_run_ser(LV2_OSC_Stream *stream) +{ + LV2_OSC_Enum ev = LV2_OSC_NONE; + + // send everything + { + const int fd = stream->sock; + + if(fd >= 0) + { + const uint8_t *buf; + size_t tosend; + + while( (buf = stream->driv->read_req(stream->data, &tosend)) ) + { + if(stream->slip) // SLIP framed + { + if(tosend <= sizeof(stream->tx_buf)) // check if there is enough memory + { + memcpy(stream->tx_buf, buf, tosend); + tosend = lv2_osc_slip_encode_inline(stream->tx_buf, tosend); + } + else + { + tosend = 0; + } + } + else // uint32_t prefix frames + { + const size_t nsize = tosend + sizeof(uint32_t); + + if(nsize <= sizeof(stream->tx_buf)) // check if there is enough memory + { + const uint32_t prefix = htonl(tosend); + + memcpy(stream->tx_buf, &prefix, sizeof(uint32_t)); + memcpy(stream->tx_buf + sizeof(uint32_t), buf, tosend); + tosend = nsize; + } + else + { + tosend = 0; + } + } + + const ssize_t sent = tosend + ? write(fd, stream->tx_buf, tosend) + : 0; + + if(sent == -1) + { + if( (errno == EAGAIN) || (errno == EWOULDBLOCK) ) + { + // empty queue + break; + } + + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + break; + } + else if(sent != (ssize_t)tosend) + { + ev = LV2_OSC_STREAM_ERRNO(ev, EIO); + break; + } + + stream->driv->read_adv(stream->data); + ev |= LV2_OSC_SEND; + } + } + } + + // recv everything + { + const int fd = stream->sock; + + if(fd >= 0) + { + if(stream->slip) // SLIP framed + { + while(true) + { + ssize_t recvd = read(fd, stream->rx_buf + stream->rx_off, + sizeof(stream->rx_buf) - stream->rx_off); + + if(recvd == -1) + { + if( (errno == EAGAIN) || (errno == EWOULDBLOCK) ) + { + // empty queue + break; + } + + stream->connected = false; + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + break; + } + else if(recvd == 0) + { + // orderly shutdown + break; + } + + uint8_t *ptr = stream->rx_buf; + recvd += stream->rx_off; + + while(recvd > 0) + { + size_t size; + size_t parsed = lv2_osc_slip_decode_inline(ptr, recvd, &size); + + if(size) // dispatch + { + uint8_t *buf; + + if( (buf = stream->driv->write_req(stream->data, size, NULL)) ) + { + memcpy(buf, ptr, size); + + stream->driv->write_adv(stream->data, size); + ev |= LV2_OSC_RECV; + } + else + { + parsed = 0; + ev = LV2_OSC_STREAM_ERRNO(ev, ENOMEM); + } + } + + if(parsed) + { + ptr += parsed; + recvd -= parsed; + } + else + { + break; + } + } + + if(recvd > 0) // is there remaining chunk for next call? + { + memmove(stream->rx_buf, ptr, recvd); + stream->rx_off = recvd; + } + else + { + stream->rx_off = 0; + } + + break; + } + } + else // uint32_t prefix frames + { + uint8_t *buf; + + while( (buf = stream->driv->write_req(stream->data, + LV2_OSC_STREAM_REQBUF, NULL)) ) + { + uint32_t prefix; + + ssize_t recvd = read(fd, &prefix, sizeof(uint32_t)); + if(recvd == sizeof(uint32_t)) + { + prefix = ntohl(prefix); //FIXME check prefix <= max_len + recvd = read(fd, buf, prefix); + } + else if(recvd == -1) + { + if( (errno == EAGAIN) || (errno == EWOULDBLOCK) ) + { + // empty queue + break; + } + + stream->connected = false; + ev = LV2_OSC_STREAM_ERRNO(ev, errno); + break; + } + else if(recvd == 0) + { + // orderly shutdown + break; + } + + stream->driv->write_adv(stream->data, recvd); + ev |= LV2_OSC_RECV; + } + } + } + } + + if(stream->connected) + { + ev |= LV2_OSC_CONN; + } + + return ev; +} + +LV2_OSC_Enum +lv2_osc_stream_run(LV2_OSC_Stream *stream) +{ + LV2_OSC_Enum ev = LV2_OSC_NONE; + + switch(stream->socket_type) + { + case SOCK_DGRAM: + { + ev |= _lv2_osc_stream_run_udp(stream); + } break; + case SOCK_STREAM: + { + ev |= _lv2_osc_stream_run_tcp(stream); + } break; + default: + { + ev |= _lv2_osc_stream_run_ser(stream); + } break; + } + + return ev; +} + +int +lv2_osc_stream_get_file_descriptors(LV2_OSC_Stream *stream, int fds [2]) +{ + if(!fds) + { + return 1; + } + + fds[0] = stream->sock; + fds[1] = stream->fd; + + return 0; +} + +LV2_OSC_Enum +lv2_osc_stream_pollin(LV2_OSC_Stream *stream, int timeout_ms) +{ + int fd [2]; + + if(lv2_osc_stream_get_file_descriptors(stream, fd) != 0) + { + return LV2_OSC_STREAM_ERRNO(LV2_OSC_NONE, EBADF); + } + + struct pollfd fds [2] = { + [0] = { + .fd = fd[0], + .events = POLLIN, + .revents = 0 + }, + [1] = { + .fd = fd[1], + .events = POLLIN, + .revents = 0 + } + }; + + const int res = poll(fds, 2, timeout_ms); + if(res < 0) + { + return LV2_OSC_STREAM_ERRNO(LV2_OSC_NONE, errno); + } + +#if 0 + fprintf(stderr, "++ %i: %i %i %i %i\n", res, + fds[0].fd, (int)fds[0].revents, + fds[1].fd, (int)fds[1].revents); +#endif + + return lv2_osc_stream_run(stream); +} diff --git a/src/util.c b/src/util.c new file mode 100644 index 0000000..787d61f --- /dev/null +++ b/src/util.c @@ -0,0 +1,541 @@ +/* + * SPDX-FileCopyrightText: Hanspeter Portner + * SPDX-License-Identifier: Artistic-2.0 + */ + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include + +#ifndef __unused +# define __unused __attribute__((unused)) +#endif + +// characters not allowed in OSC path string +static const char invalid_path_chars [] = { + ' ', '#', + '\0' +}; + +// allowed characters in OSC format string +static const char valid_format_chars [] = { + LV2_OSC_INT32, LV2_OSC_FLOAT, LV2_OSC_STRING, LV2_OSC_BLOB, + LV2_OSC_TRUE, LV2_OSC_FALSE, LV2_OSC_NIL, LV2_OSC_IMPULSE, + LV2_OSC_INT64, LV2_OSC_DOUBLE, LV2_OSC_TIMETAG, + LV2_OSC_SYMBOL, LV2_OSC_MIDI, + '\0' +}; + +bool +lv2_osc_pattern_match(const char *from, const char *name, size_t len) +{ + size_t nbrace = 0; + +#if defined(FNM_EXTMATCH) + // count opening curly braces + for(size_t i = 0; i < len; i++) + { + if(from[i] == '{') + { + nbrace++; + } + } +#endif + + // allocate temporary pattern buffer + char *pattern = alloca(len + nbrace + 1); + + if(!pattern) + { + return false; + } + +#if defined(FNM_EXTMATCH) + // convert {x,y} to @(x|y) for extended fnmatch + if(nbrace) + { + char *ptr = pattern; + + for(size_t i = 0; i < len; i++) + { + switch(from[i]) + { + case '{': + { + *ptr++ = '@'; + *ptr++ = '('; + } break; + case ',': + { + *ptr++ = '|'; + } break; + case '}': + { + *ptr++ = ')'; + } break; + default: + { + *ptr++ = from[i]; + } break; + } + } + } + else +#endif + { + memcpy(pattern, from, len); + } + + // terminate pattern string with null terminator + pattern[len + nbrace] = '\0'; + +#if defined(FNM_EXTMATCH) + return fnmatch(pattern, name, FNM_NOESCAPE | FNM_EXTMATCH) == 0 ? true : false; +#else + return fnmatch(pattern, name, FNM_NOESCAPE) == 0 ? true : false; +#endif +} + +void +_lv2_osc_hooks_internal(const char *path, const char *from, + const LV2_Atom_Tuple *arguments, const LV2_OSC_Hook *hooks) +{ + const char *ptr = strchr(from, '/'); + + const size_t len = ptr + ? (size_t)(ptr - from) + : strlen(from); + + for(const LV2_OSC_Hook *hook = hooks; hook && hook->name; hook++) + { + if(lv2_osc_pattern_match(from, hook->name, len)) + { + if(hook->hooks && ptr) + { + from = &ptr[1]; + + _lv2_osc_hooks_internal(path, from, arguments, hook->hooks); + } + else if(hook->method && !ptr) + { + hook->method(path, arguments, hook->data); + } + } + } +} + +void +lv2_osc_hooks(const char *path, const LV2_Atom_Tuple *arguments, void *data) +{ + const LV2_OSC_Hook *hooks = data; + const char *from = &path[1]; + + _lv2_osc_hooks_internal(path, from, arguments, hooks); +} + +bool +lv2_osc_check_path(const char *path) +{ + assert(path); + + if(path[0] != '/') + return false; + + for(const char *ptr=path+1; *ptr!='\0'; ptr++) + if( (isprint(*ptr) == 0) || (strchr(invalid_path_chars, *ptr) != NULL) ) + return false; + + return true; +} + +bool +lv2_osc_check_fmt(const char *format, int offset) +{ + assert(format); + + if(offset && (format[0] != ',') ) + return false; + + for(const char *ptr=format+offset; *ptr!='\0'; ptr++) + if(strchr(valid_format_chars, *ptr) == NULL) + return false; + + return true; +} + +uint64_t +lv2_osc_timetag_parse(const LV2_OSC_Timetag *timetag) +{ + return ((uint64_t)timetag->integral << 32) | timetag->fraction; +} + +LV2_OSC_Timetag * +lv2_osc_timetag_create(LV2_OSC_Timetag *timetag, uint64_t tt) +{ + timetag->integral = tt >> 32; + timetag->fraction = tt & 0xffffffff; + + return timetag; +} + +bool +lv2_osc_is_packet_type(LV2_OSC_URID *osc_urid, LV2_URID type) +{ + return type == osc_urid->OSC_Packet; +} + +bool +lv2_osc_is_bundle_type(LV2_OSC_URID *osc_urid, LV2_URID type) +{ + return type == osc_urid->OSC_Bundle; +} + +bool +lv2_osc_is_message_type(LV2_OSC_URID *osc_urid, LV2_URID type) +{ + return type == osc_urid->OSC_Message; +} + +bool +lv2_osc_is_message_or_bundle_type(LV2_OSC_URID *osc_urid, LV2_URID type) +{ + return lv2_osc_is_message_type(osc_urid, type) + || lv2_osc_is_bundle_type(osc_urid, type); +} + +LV2_OSC_Type +lv2_osc_argument_type(LV2_OSC_URID *osc_urid, const LV2_Atom *atom) +{ + const LV2_Atom_Object *obj = (const LV2_Atom_Object *)atom; + + if(atom->type == osc_urid->ATOM_Int) + return LV2_OSC_INT32; + else if(atom->type == osc_urid->ATOM_Float) + return LV2_OSC_FLOAT; + else if(atom->type == osc_urid->ATOM_String) + return LV2_OSC_STRING; + else if(atom->type == osc_urid->ATOM_Chunk) + return LV2_OSC_BLOB; + + else if(atom->type == osc_urid->ATOM_Long) + return LV2_OSC_INT64; + else if(atom->type == osc_urid->ATOM_Double) + return LV2_OSC_DOUBLE; + else if( (atom->type == osc_urid->ATOM_Object) && (obj->body.otype == osc_urid->OSC_Timetag) ) + return LV2_OSC_TIMETAG; + + else if(atom->type == osc_urid->ATOM_Bool) + { + if(((const LV2_Atom_Bool *)atom)->body) + return LV2_OSC_TRUE; + else + return LV2_OSC_FALSE; + } + else if(atom->type == osc_urid->ATOM_Literal) + { + const LV2_Atom_Literal *lit = (const LV2_Atom_Literal *)atom; + if(lit->body.datatype == osc_urid->OSC_Nil) + return LV2_OSC_NIL; + else if(lit->body.datatype == osc_urid->OSC_Impulse) + return LV2_OSC_IMPULSE; + else if(lit->body.datatype == osc_urid->OSC_Char) + return LV2_OSC_CHAR; + else if(lit->body.datatype == osc_urid->OSC_RGBA) + return LV2_OSC_RGBA; + } + + else if(atom->type == osc_urid->ATOM_URID) + return LV2_OSC_SYMBOL; + else if(atom->type == osc_urid->MIDI_MidiEvent) + return LV2_OSC_MIDI; + + return '\0'; +} + +const LV2_Atom * +lv2_osc_int32_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom, + int32_t *i) +{ + assert(i); + *i = ((const LV2_Atom_Int *)atom)->body; + + return lv2_atom_tuple_next(atom); +} + +const LV2_Atom * +lv2_osc_float_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom, + float *f) +{ + assert(f); + *f = ((const LV2_Atom_Float *)atom)->body; + + return lv2_atom_tuple_next(atom); +} + +const LV2_Atom * +lv2_osc_string_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom, + const char **s) +{ + assert(s); + *s = LV2_ATOM_BODY_CONST(atom); + + return lv2_atom_tuple_next(atom); +} + +const LV2_Atom * +lv2_osc_blob_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom, + uint32_t *size, const uint8_t **b) +{ + assert(size && b); + *size = atom->size; + *b = LV2_ATOM_BODY_CONST(atom); + + return lv2_atom_tuple_next(atom); +} + +const LV2_Atom * +lv2_osc_int64_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom, + int64_t *h) +{ + assert(h); + *h = ((const LV2_Atom_Long *)atom)->body; + + return lv2_atom_tuple_next(atom); +} + +const LV2_Atom * +lv2_osc_double_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom, + double *d) +{ + assert(d); + *d = ((const LV2_Atom_Double *)atom)->body; + + return lv2_atom_tuple_next(atom); +} + +const LV2_Atom * +lv2_osc_timetag_get(LV2_OSC_URID *osc_urid, const LV2_Atom *atom, + LV2_OSC_Timetag *timetag) +{ + assert(timetag); + + const LV2_Atom_Long *integral = NULL; + const LV2_Atom_Long *fraction = NULL; + + lv2_atom_object_get((const LV2_Atom_Object *)atom, + osc_urid->OSC_timetagIntegral, &integral, + osc_urid->OSC_timetagFraction, &fraction, + 0); + + if( integral && (integral->atom.type == osc_urid->ATOM_Long) + && fraction && (fraction->atom.type == osc_urid->ATOM_Long) ) + { + timetag->integral = integral->body; + timetag->fraction = fraction->body; + } + else + { + // set to immediate + timetag->integral = 0; + timetag->fraction = 1; + } + + return lv2_atom_tuple_next(atom); +} + +const LV2_Atom * +lv2_osc_true_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom) +{ + return lv2_atom_tuple_next(atom); +} + +const LV2_Atom * +lv2_osc_false_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom) +{ + return lv2_atom_tuple_next(atom); +} + +const LV2_Atom * +lv2_osc_nil_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom) +{ + return lv2_atom_tuple_next(atom); +} + +const LV2_Atom * +lv2_osc_impulse_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom) +{ + return lv2_atom_tuple_next(atom); +} + +const LV2_Atom * +lv2_osc_symbol_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom, + LV2_URID *S) +{ + assert(S); + *S = ((const LV2_Atom_URID *)atom)->body; + + return lv2_atom_tuple_next(atom); +} + +const LV2_Atom * +lv2_osc_midi_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom, + uint32_t *size, const uint8_t **m) +{ + assert(size && m); + *size = atom->size; + *m = LV2_ATOM_BODY_CONST(atom); + + return lv2_atom_tuple_next(atom); +} + +const LV2_Atom * +lv2_osc_char_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom, char *c) +{ + assert(c); + const char *str = LV2_ATOM_CONTENTS_CONST(LV2_Atom_Literal, atom); + *c = str[0]; + + return lv2_atom_tuple_next(atom); +} + +const LV2_Atom * +lv2_osc_rgba_get(LV2_OSC_URID *osc_urid __unused, const LV2_Atom *atom, + uint8_t *r, uint8_t *g, uint8_t *b, uint8_t *a) +{ + assert(r && g && b && a); + const char *str = LV2_ATOM_CONTENTS_CONST(LV2_Atom_Literal, atom); + + uint8_t *key [4] = { + r, g, b, a + }; + + const char *pos = str; + char *endptr; + + for(unsigned count = 0; count < 4; count++, pos += 2) + { + char buf [5] = {'0', 'x', pos[0], pos[1], '\0'}; + + *key[count] = strtol(buf, &endptr, 16); + } + + return lv2_atom_tuple_next(atom); +} + +bool +lv2_osc_bundle_body_get(LV2_OSC_URID *osc_urid, uint32_t size, const LV2_Atom_Object_Body *body, + const LV2_Atom_Object **timetag, const LV2_Atom_Tuple **items) +{ + assert(timetag && items); + + *timetag = NULL; + *items = NULL; + + lv2_atom_object_body_get(size, body, + osc_urid->OSC_bundleTimetag, timetag, + osc_urid->OSC_bundleItems, items, + 0); + + if(!*timetag || ((*timetag)->atom.type != osc_urid->ATOM_Object) || ((*timetag)->body.otype != osc_urid->OSC_Timetag)) + return false; + if(!*items || ((*items)->atom.type != osc_urid->ATOM_Tuple)) + return false; + + return true; +} + +bool +lv2_osc_bundle_get(LV2_OSC_URID *osc_urid, const LV2_Atom_Object *obj, + const LV2_Atom_Object **timetag, const LV2_Atom_Tuple **items) +{ + return lv2_osc_bundle_body_get(osc_urid, obj->atom.size, &obj->body, + timetag, items); +} + +bool +lv2_osc_message_body_get(LV2_OSC_URID *osc_urid, uint32_t size, const LV2_Atom_Object_Body *body, + const LV2_Atom_String **path, const LV2_Atom_Tuple **arguments) +{ + assert(path && arguments); + + *path = NULL; + *arguments = NULL; + + lv2_atom_object_body_get(size, body, + osc_urid->OSC_messagePath, path, + osc_urid->OSC_messageArguments, arguments, + 0); + + if(!*path || ((*path)->atom.type != osc_urid->ATOM_String)) + return false; + // message without arguments is valid + if( *arguments && ((*arguments)->atom.type != osc_urid->ATOM_Tuple)) + return false; + + return true; +} + +bool +lv2_osc_message_get(LV2_OSC_URID *osc_urid, const LV2_Atom_Object *obj, + const LV2_Atom_String **path, const LV2_Atom_Tuple **arguments) +{ + return lv2_osc_message_body_get(osc_urid, obj->atom.size, &obj->body, + path, arguments); +} + +bool +lv2_osc_body_unroll(LV2_OSC_URID *osc_urid, uint32_t size, const LV2_Atom_Object_Body *body, + LV2_OSC_Method method, void *data) +{ + if(body->otype == osc_urid->OSC_Bundle) + { + const LV2_Atom_Object *timetag = NULL; + const LV2_Atom_Tuple *items = NULL; + + if(!lv2_osc_bundle_body_get(osc_urid, size, body, &timetag, &items)) + return false; + + LV2_OSC_Timetag tt; + lv2_osc_timetag_get(osc_urid, &timetag->atom, &tt); + + LV2_ATOM_TUPLE_FOREACH(items, atom) + { + const LV2_Atom_Object *obj= (const LV2_Atom_Object *)atom; + + if(!lv2_osc_body_unroll(osc_urid, obj->atom.size, &obj->body, method, data)) + return false; + } + + return true; + } + else if(body->otype == osc_urid->OSC_Message) + { + const LV2_Atom_String *path = NULL; + const LV2_Atom_Tuple *arguments = NULL; + + if(!lv2_osc_message_body_get(osc_urid, size, body, &path, &arguments)) + return false; + + if(method) + method(LV2_ATOM_BODY_CONST(path), arguments, data); + + return true; + } + + return false; +} + +bool +lv2_osc_unroll(LV2_OSC_URID *osc_urid, const LV2_Atom_Object *obj, + LV2_OSC_Method method, void *data) +{ + return lv2_osc_body_unroll(osc_urid, obj->atom.size, &obj->body, method, data); +} diff --git a/src/writer.c b/src/writer.c new file mode 100644 index 0000000..fbba4b3 --- /dev/null +++ b/src/writer.c @@ -0,0 +1,536 @@ +/* + * SPDX-FileCopyrightText: Hanspeter Portner + * SPDX-License-Identifier: Artistic-2.0 + */ + +#include +#include +#include +#include +#include + +#include + +#include + +void +lv2_osc_writer_initialize(LV2_OSC_Writer *writer, uint8_t *buf, size_t size) +{ + writer->buf = buf; + writer->ptr = buf; + writer->end = buf + size; +} + +size_t +lv2_osc_writer_get_size(LV2_OSC_Writer *writer) +{ + if(writer->ptr > writer->buf) + return writer->ptr - writer->buf; + + return 0; +} + +uint8_t * +lv2_osc_writer_finalize(LV2_OSC_Writer *writer, size_t *size) +{ + *size = lv2_osc_writer_get_size(writer); + + if(*size) + return writer->buf; + + return NULL; +} + +bool +lv2_osc_writer_overflow(LV2_OSC_Writer *writer, size_t size) +{ + return writer->ptr + size >= writer->end; +} + +bool +lv2_osc_writer_htobe32(LV2_OSC_Writer *writer, union swap32_t *s32) +{ + if(lv2_osc_writer_overflow(writer, 4)) + return false; + + s32->u = htobe32(s32->u); + *(uint32_t *)writer->ptr = s32->u; + writer->ptr += 4; + + return true; +} + +bool +lv2_osc_writer_htobe64(LV2_OSC_Writer *writer, union swap64_t *s64) +{ + if(lv2_osc_writer_overflow(writer, 8)) + return false; + + s64->u = htobe64(s64->u); + *(uint64_t *)writer->ptr = s64->u; + writer->ptr += 8; + + return true; +} + +bool +lv2_osc_writer_add_int32(LV2_OSC_Writer *writer, int32_t i) +{ + return lv2_osc_writer_htobe32(writer, &(union swap32_t){ .i = i }); +} + +bool +lv2_osc_writer_add_float(LV2_OSC_Writer *writer, float f) +{ + return lv2_osc_writer_htobe32(writer, &(union swap32_t){ .f = f }); +} + +bool +lv2_osc_writer_add_string(LV2_OSC_Writer *writer, const char *s) +{ + const size_t rawlen = strlen(s) + 1; + const size_t padded = LV2_OSC_PADDED_SIZE(rawlen); + if(lv2_osc_writer_overflow(writer, padded)) + return false; + + const uint32_t blank = 0; + memcpy(writer->ptr + padded - sizeof(uint32_t), &blank, sizeof(uint32_t)); + memcpy(writer->ptr, s, rawlen); + writer->ptr += padded; + + return true; +} + +bool +lv2_osc_writer_add_symbol(LV2_OSC_Writer *writer, const char *S) +{ + return lv2_osc_writer_add_string(writer, S); +} + +bool +lv2_osc_writer_add_int64(LV2_OSC_Writer *writer, int64_t h) +{ + return lv2_osc_writer_htobe64(writer, &(union swap64_t){ .h = h }); +} + +bool +lv2_osc_writer_add_double(LV2_OSC_Writer *writer, double d) +{ + return lv2_osc_writer_htobe64(writer, &(union swap64_t){ .d = d }); +} + +bool +lv2_osc_writer_add_timetag(LV2_OSC_Writer *writer, uint64_t u) +{ + return lv2_osc_writer_htobe64(writer, &(union swap64_t){ .u = u }); +} + +bool +lv2_osc_writer_add_blob_inline(LV2_OSC_Writer *writer, int32_t len, uint8_t **body) +{ + const size_t len_padded = LV2_OSC_PADDED_SIZE(len); + const size_t size = 4 + len_padded; + if(lv2_osc_writer_overflow(writer, size)) + return false; + + if(!lv2_osc_writer_add_int32(writer, len)) + return false; + + *body = writer->ptr; + //memset(&writer->ptr[len], 0x0, len_padded - len); + writer->ptr += len_padded; + + return true; +} + +bool +lv2_osc_writer_add_blob(LV2_OSC_Writer *writer, int32_t len, const uint8_t *body) +{ + uint8_t *dst; + if(!lv2_osc_writer_add_blob_inline(writer, len, &dst)) + return false; + + memcpy(dst, body, len); + + return true; +} + +bool +lv2_osc_writer_add_midi_inline(LV2_OSC_Writer *writer, int32_t len, uint8_t **m) +{ + if( (len > 4) || lv2_osc_writer_overflow(writer, 4)) + return false; + + *m = writer->ptr; + //memset(&writer->ptr[len], 0x0, 4 - len); + writer->ptr += 4; + + return true; +} + +bool +lv2_osc_writer_add_midi(LV2_OSC_Writer *writer, int32_t len, const uint8_t *m) +{ + uint8_t *dst; + if(!lv2_osc_writer_add_midi_inline(writer, len, &dst)) + return false; + + memcpy(dst, m, len); + + return true; +} + +bool +lv2_osc_writer_add_rgba(LV2_OSC_Writer *writer, uint8_t r, uint8_t g, uint8_t b, uint8_t a) +{ + if(lv2_osc_writer_overflow(writer, 4)) + return false; + + writer->ptr[0] = r; + writer->ptr[1] = g; + writer->ptr[2] = b; + writer->ptr[3] = a; + writer->ptr += 4; + + return true; +} + +bool +lv2_osc_writer_add_char(LV2_OSC_Writer *writer, char c) +{ + return lv2_osc_writer_add_int32(writer, (int32_t)c); +} + +bool +lv2_osc_writer_push_bundle(LV2_OSC_Writer *writer, LV2_OSC_Writer_Frame *frame, uint64_t t) +{ + if(lv2_osc_writer_overflow(writer, 16)) + return false; + + frame->ref = writer->ptr; + + strncpy((char *)writer->ptr, "#bundle", 8); + writer->ptr += 8; + + return lv2_osc_writer_add_timetag(writer, t); +} + +bool +lv2_osc_writer_pop_bundle(LV2_OSC_Writer *writer, LV2_OSC_Writer_Frame *frame) +{ + union swap32_t s32 = { .i = writer->ptr - frame->ref - 16}; + + if(s32.i <= 0) + { + writer->ptr = frame->ref; + return false; + } + + return true; +} + + bool +lv2_osc_writer_push_item(LV2_OSC_Writer *writer, LV2_OSC_Writer_Frame *frame) +{ + if(lv2_osc_writer_overflow(writer, 4)) + return false; + + frame->ref = writer->ptr; + writer->ptr += 4; + + return true; +} + +bool +lv2_osc_writer_pop_item(LV2_OSC_Writer *writer, LV2_OSC_Writer_Frame *frame) +{ + union swap32_t s32 = { .i = writer->ptr - frame->ref - 4}; + + if(s32.i <= 0) + { + writer->ptr = frame->ref; + return false; + } + + s32.u = htobe32(s32.u); + *(uint32_t *)frame->ref = s32.u; + + return true; +} + +bool +lv2_osc_writer_add_path(LV2_OSC_Writer *writer, const char *path) +{ + return lv2_osc_writer_add_string(writer, path); +} + +bool +lv2_osc_writer_add_format(LV2_OSC_Writer *writer, const char *fmt) +{ + const size_t rawlen = strlen(fmt) + 1; + const size_t padded = LV2_OSC_PADDED_SIZE(rawlen + 1); + if(lv2_osc_writer_overflow(writer, padded)) + return false; + + const uint32_t blank = 0; + memcpy(writer->ptr + padded - sizeof(uint32_t), &blank, sizeof(uint32_t)); + *writer->ptr++ = ','; + memcpy(writer->ptr, fmt, rawlen); + writer->ptr += padded - 1; + + return true; +} + +bool +lv2_osc_writer_arg_varlist(LV2_OSC_Writer *writer, const char *fmt, va_list args) +{ + for(const char *type = fmt; *type; type++) + { + switch( (LV2_OSC_Type)*type) + { + case LV2_OSC_INT32: + if(!lv2_osc_writer_add_int32(writer, va_arg(args, int32_t))) + return false; + break; + case LV2_OSC_FLOAT: + if(!lv2_osc_writer_add_float(writer, (float)va_arg(args, double))) + return false; + break; + case LV2_OSC_STRING: + if(!lv2_osc_writer_add_string(writer, va_arg(args, const char *))) + return false; + break; + case LV2_OSC_BLOB: + { + const int32_t len = va_arg(args, int32_t); + if(!lv2_osc_writer_add_blob(writer, len, va_arg(args, const uint8_t *))) + return false; + } break; + + case LV2_OSC_TRUE: + case LV2_OSC_FALSE: + case LV2_OSC_NIL: + case LV2_OSC_IMPULSE: + break; + + case LV2_OSC_INT64: + if(!lv2_osc_writer_add_int64(writer, va_arg(args, int64_t))) + return false; + break; + case LV2_OSC_DOUBLE: + if(!lv2_osc_writer_add_double(writer, va_arg(args, double))) + return false; + break; + case LV2_OSC_TIMETAG: + if(!lv2_osc_writer_add_timetag(writer, va_arg(args, uint64_t))) + return false; + break; + + case LV2_OSC_MIDI: + { + const int32_t len = va_arg(args, int32_t); + if(!lv2_osc_writer_add_midi(writer, len, va_arg(args, const uint8_t *))) + return false; + } break; + case LV2_OSC_SYMBOL: + if(!lv2_osc_writer_add_symbol(writer, va_arg(args, const char *))) + return false; + break; + case LV2_OSC_CHAR: + if(!lv2_osc_writer_add_char(writer, va_arg(args, int))) + return false; + break; + case LV2_OSC_RGBA: + { + const uint8_t r = va_arg(args, unsigned); + const uint8_t g = va_arg(args, unsigned); + const uint8_t b = va_arg(args, unsigned); + const uint8_t a = va_arg(args, unsigned); + if(!lv2_osc_writer_add_rgba(writer, r, g, b, a)) + return false; + } break; + } + } + + return true; +} + +bool +lv2_osc_writer_arg_vararg(LV2_OSC_Writer *writer, const char *fmt, ...) +{ + va_list args; + va_start(args, fmt); + + const bool res = lv2_osc_writer_arg_varlist(writer, fmt, args); + + va_end(args); + + return res; +} + +bool +lv2_osc_writer_message_varlist(LV2_OSC_Writer *writer, const char *path, const char *fmt, va_list args) +{ + if(!lv2_osc_writer_add_path(writer, path)) + return false; + + if(!lv2_osc_writer_add_format(writer, fmt)) + return false; + + return lv2_osc_writer_arg_varlist(writer, fmt, args); +} + +bool +lv2_osc_writer_message_vararg(LV2_OSC_Writer *writer, const char *path, const char *fmt, ...) +{ + va_list args; + va_start(args, fmt); + + const bool res = lv2_osc_writer_message_varlist(writer, path, fmt, args); + + va_end(args); + + return res; +} + +bool +lv2_osc_writer_packet(LV2_OSC_Writer *writer, LV2_OSC_URID *osc_urid, + LV2_URID_Unmap *unmap, uint32_t size, const LV2_Atom_Object_Body *body) +{ + if(body->otype == osc_urid->OSC_Bundle) + { + const LV2_Atom_Object *timetag = NULL; + const LV2_Atom_Tuple *items = NULL; + + if(!lv2_osc_bundle_body_get(osc_urid, size, body, &timetag, &items)) + return false; + + LV2_OSC_Timetag tt; + LV2_OSC_Writer_Frame bndl = { .ref = 0 }; + + lv2_osc_timetag_get(osc_urid, &timetag->atom, &tt); + if(!lv2_osc_writer_push_bundle(writer, &bndl, lv2_osc_timetag_parse(&tt))) + return false; + + LV2_ATOM_TUPLE_FOREACH(items, atom) + { + const LV2_Atom_Object *obj= (const LV2_Atom_Object *)atom; + LV2_OSC_Writer_Frame itm = { .ref = 0 }; + + if( !lv2_osc_writer_push_item(writer, &itm) + || !lv2_osc_writer_packet(writer, osc_urid, unmap, obj->atom.size, &obj->body) + || !lv2_osc_writer_pop_item(writer, &itm) ) + { + return false; + } + } + + return lv2_osc_writer_pop_bundle(writer, &bndl); + } + else if(body->otype == osc_urid->OSC_Message) + { + const LV2_Atom_String *path = NULL; + const LV2_Atom_Tuple *arguments = NULL; + + if(lv2_osc_message_body_get(osc_urid, size, body, &path, &arguments)) + { + if(!lv2_osc_writer_add_path(writer, LV2_ATOM_BODY_CONST(path))) + return false; + + char fmt [128]; //TODO how big? + char *ptr = fmt; + LV2_ATOM_TUPLE_FOREACH(arguments, atom) + { + *ptr++ = lv2_osc_argument_type(osc_urid, atom); + } + *ptr = '\0'; + if(!lv2_osc_writer_add_format(writer, fmt)) + return false; + + LV2_ATOM_TUPLE_FOREACH(arguments, atom) + { + const LV2_Atom_Object *obj= (const LV2_Atom_Object *)atom; + + if(atom->type == osc_urid->ATOM_Int) + { + if(!lv2_osc_writer_add_int32(writer, ((const LV2_Atom_Int *)atom)->body)) + return false; + } + else if(atom->type == osc_urid->ATOM_Float) + { + if(!lv2_osc_writer_add_float(writer, ((const LV2_Atom_Float *)atom)->body)) + return false; + } + else if(atom->type == osc_urid->ATOM_String) + { + if(!lv2_osc_writer_add_string(writer, LV2_ATOM_BODY_CONST(atom))) + return false; + } + else if(atom->type == osc_urid->ATOM_Chunk) + { + if(!lv2_osc_writer_add_blob(writer, atom->size, LV2_ATOM_BODY_CONST(atom))) + return false; + } + + else if(atom->type == osc_urid->ATOM_Long) + { + if(!lv2_osc_writer_add_int64(writer, ((const LV2_Atom_Long *)atom)->body)) + return false; + } + else if(atom->type == osc_urid->ATOM_Double) + { + if(!lv2_osc_writer_add_double(writer, ((const LV2_Atom_Double *)atom)->body)) + return false; + } + else if( (atom->type == osc_urid->ATOM_Object) && (obj->body.otype == osc_urid->OSC_Timetag) ) + { + LV2_OSC_Timetag tt; + lv2_osc_timetag_get(osc_urid, &obj->atom, &tt); + if(!lv2_osc_writer_add_timetag(writer, lv2_osc_timetag_parse(&tt))) + return false; + } + + // there is nothing to do for: true, false, nil, impulse + + else if(atom->type == osc_urid->ATOM_URID) + { + const char *symbol = unmap->unmap(unmap->handle, ((const LV2_Atom_URID *)atom)->body); + if(!symbol || !lv2_osc_writer_add_symbol(writer, symbol)) + return false; + } + else if(atom->type == osc_urid->MIDI_MidiEvent) + { + uint8_t *m = NULL; + if(!lv2_osc_writer_add_midi_inline(writer, atom->size + 1, &m)) + return false; + m[0] = 0x0; // port + memcpy(&m[1], LV2_ATOM_BODY_CONST(atom), atom->size); + } + else if(atom->type == osc_urid->ATOM_Literal) + { + const LV2_Atom_Literal *lit = (LV2_Atom_Literal *)atom; + + if(lit->body.datatype == osc_urid->OSC_Char) + { + const char c = *(const char *)LV2_ATOM_CONTENTS_CONST(LV2_Atom_Literal, lit); + if(!lv2_osc_writer_add_char(writer, c)) + return false; + } + else if(lit->body.datatype == osc_urid->OSC_RGBA) + { + const char *rgba = LV2_ATOM_CONTENTS_CONST(LV2_Atom_Literal, atom); + uint8_t r, g, b, a; + if(sscanf(rgba, "%02"SCNx8"%02"SCNx8"%02"SCNx8"%02"SCNx8, &r, &g, &b, &a) != 4) + return false; + if(!lv2_osc_writer_add_rgba(writer, r, g, b, a)) + return false; + } + } + } + } + + return true; + } + + return false; +} diff --git a/test/osc_test.c b/test/osc.c similarity index 98% rename from test/osc_test.c rename to test/osc.c index 2c6a710..ec16890 100644 --- a/test/osc_test.c +++ b/test/osc.c @@ -1,16 +1,18 @@ +/* + * SPDX-FileCopyrightText: Hanspeter Portner + * SPDX-License-Identifier: Artistic-2.0 + */ + #include -#include #include +#include #include -#include #include #include #include #include -#if !defined(_WIN32) -# include -#endif +#include #define BUF_SIZE 0x100000 #define MAX_URIDS 512 @@ -470,7 +472,6 @@ _run_tests() return 0; } -#if !defined(_WIN32) typedef struct _item_t item_t; typedef struct _stash_t stash_t; @@ -552,7 +553,10 @@ _stash_read_adv(stash_t *stash) stash->items[i] = stash->items[i+1]; } - stash->items = realloc(stash->items, sizeof(item_t *) * stash->size); + if(stash->size) + { + stash->items = realloc(stash->items, sizeof(item_t *) * stash->size); + } } static void * @@ -929,9 +933,7 @@ static const pair_t pairs [] = { .lossy = false } }; -#endif -#if !defined(_WIN32) static unsigned foo_sub_one = 0; static unsigned foo_sub_two [2] = { 0, 0 }; static unsigned foo = 0; @@ -1326,26 +1328,18 @@ _run_test_hooks() return 0; } -#endif int main(int argc __attribute__((unused)), char **argv __attribute__((unused))) { -#if !defined(_WIN32) (void)lv2_osc_stream_pollin; //FIXME -#endif fprintf(stdout, "running main tests:\n"); assert(_run_tests() == 0); -#if !defined(_WIN32) fprintf(stdout, "running hook tests:\n"); assert(_run_test_hooks() == 0); -#else - (void)lv2_osc_hooks; //FIXME -#endif -#if !defined(_WIN32) for(const pair_t *pair = pairs; pair->server; pair++) { pthread_t thread_1; @@ -1360,7 +1354,6 @@ main(int argc __attribute__((unused)), char **argv __attribute__((unused))) assert(pthread_join(thread_1, NULL) == 0); assert(pthread_join(thread_2, NULL) == 0); } -#endif for(unsigned i=0; i<__app.urid; i++) { diff --git a/lv2-osc.doap.ttl b/ttl/lv2-osc.doap.ttl similarity index 52% rename from lv2-osc.doap.ttl rename to ttl/lv2-osc.doap.ttl index 53fbebe..cb735f0 100644 --- a/lv2-osc.doap.ttl +++ b/ttl/lv2-osc.doap.ttl @@ -1,17 +1,5 @@ -# Copyright (c) 2015-2016 Hanspeter Portner (dev@open-music-kontrollers.ch) -# -# This is free software: you can redistribute it and/or modify -# it under the terms of the Artistic License 2.0 as published by -# The Perl Foundation. -# -# This source is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# Artistic License 2.0 for more details. -# -# You should have received a copy of the Artistic License 2.0 -# along the source as a COPYING file. If not, obtain it from -# http://www.perlfoundation.org/artistic_license_2_0. +# SPDX-FileCopyrightText: Hanspeter Portner +# SPDX-License-Identifier: CC0-1.0 @prefix dcs: . @prefix doap: . diff --git a/ttl/manifest.ttl b/ttl/manifest.ttl new file mode 100644 index 0000000..541d540 --- /dev/null +++ b/ttl/manifest.ttl @@ -0,0 +1,11 @@ +# SPDX-FileCopyrightText: Hanspeter Portner +# SPDX-License-Identifier: CC0-1.0 + +@prefix lv2: . +@prefix rdfs: . + + + a lv2:Specification ; + lv2:minorVersion 1 ; + lv2:microVersion 0 ; + rdfs:seeAlso . diff --git a/osc.ttl b/ttl/osc.ttl similarity index 58% rename from osc.ttl rename to ttl/osc.ttl index db4a048..167636b 100644 --- a/osc.ttl +++ b/ttl/osc.ttl @@ -1,17 +1,5 @@ -# Copyright (c) 2015-2016 Hanspeter Portner (dev@open-music-kontrollers.ch) -# -# This is free software: you can redistribute it and/or modify -# it under the terms of the Artistic License 2.0 as published by -# The Perl Foundation. -# -# This source is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# Artistic License 2.0 for more details. -# -# You should have received a copy of the Artistic License 2.0 -# along the source as a COPYING file. If not, obtain it from -# http://www.perlfoundation.org/artistic_license_2_0. +# SPDX-FileCopyrightText: Hanspeter Portner +# SPDX-License-Identifier: CC0-1.0 @prefix owl: . @prefix rdfs: . -- 2.38.5