A .builds/alpine-latest.yml => .builds/alpine-latest.yml +36 -0
@@ 0,0 1,36 @@
+# SPDX-FileCopyrightText: Hanspeter Portner <dev@open-music-kontrollers.ch>
+# SPDX-License-Identifier: CC0-1.0
+
+---
+
+image: alpine/latest
+
+packages:
+ - reuse
+ - meson
+ - lv2-dev
+ - serd
+ - sord
+ - sratom
+
+environment:
+ project: netatom.lv2
+
+tasks:
+ - setup: |
+ cd "${project}"
+ meson setup build \
+ -Dbuildtype=release \
+ -Dbuild-tests=true
+ - build: |
+ cd "${project}"
+ ninja -C build install
+ - test: |
+ cd "${project}"
+ ninja -C build test
+
+triggers:
+ - action: email
+ condition: failure
+ to: "<dev@open-music-kontrollers.ch>"
+...
A .gitignore => .gitignore +5 -0
@@ 0,0 1,5 @@
+# SPDX-FileCopyrightText: Hanspeter Portner <dev@open-music-kontrollers.ch>
+# SPDX-License-Identifier: CC0-1.0
+
+tags
+*.taghl
D .gitlab-ci.yml => .gitlab-ci.yml +0 -2
@@ 1,2 0,0 @@
-include:
- - local: 'gitlab-ci/generic.yml'
A LICENSES/Artistic-2.0.txt => LICENSES/Artistic-2.0.txt +85 -0
@@ 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.
A LICENSES/CC0-1.0.txt => LICENSES/CC0-1.0.txt +121 -0
@@ 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.
M README.md => README.md +4 -0
@@ 1,3 1,7 @@
+<!--
+ -- SPDX-FileCopyrightText: Hanspeter Portner <dev@open-music-kontrollers.ch>
+ -- SPDX-License-Identifier: CC0-1.0
+ -->
# netatom.lv2
## Utility header for (de)serializing LV2 atoms in binary form
D VERSION => VERSION +0 -1
D gitlab-ci/generic.yml => gitlab-ci/generic.yml +0 -106
@@ 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)/"
M meson.build => meson.build +42 -22
@@ 1,38 1,58 @@
+# SPDX-FileCopyrightText: Hanspeter Portner <dev@open-music-kontrollers.ch>
+# SPDX-License-Identifier: CC0-1.0
+
project('netatom.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')
-sratom_dep = dependency('sratom-0',
- static : meson.is_cross_build() and false) #FIXME
-deps = [lv2_dep, sratom_dep]
+serd_dep = dependency('serd-0', version : '>= 0.30.0', required : build_tests)
+sord_dep = dependency('sord-0', version : '>= 0.16.0', required : build_tests)
+sratom_dep = dependency('sratom-0', version : '>= 0.6.0', required : build_tests)
-if host_machine.system() == 'windows'
- deps += cc.find_library('ws2_32')
-endif
+lib_deps = [lv2_dep]
-c_args = []
+lib_incs = []
+lib_incs += include_directories('')
-if cc.has_argument('-Wno-error=format=')
- c_args += '-Wno-error=format='
-endif
+lib_srcs = []
+lib_srcs += join_paths('src', 'netatom.c')
+
+netatom = declare_dependency(
+ include_directories : lib_incs,
+ dependencies : lib_deps,
+ sources : lib_srcs)
-netatom_test = executable('netatom_test',
- join_paths('test', 'netatom_test.c'),
- c_args : c_args,
- dependencies : deps,
- install : false)
+if build_tests
+ test_deps = [serd_dep, sord_dep, sratom_dep]
+ test_deps += netatom
-test('Test', netatom_test,
- args : ['1000'],
- timeout : 240)
+ test_srcs = []
+ test_srcs += join_paths('test', 'test.c')
+
+ test_netatom = executable('Test', test_srcs,
+ dependencies : test_deps,
+ install : false)
+
+ test('Test', test_netatom,
+ args : ['128'],
+ timeout : 360) # seconds
+
+ if reuse.found()
+ test('REUSE', reuse, args : [
+ '--root', meson.current_source_dir(),
+ 'lint'
+ ])
+ endif
+endif
A meson_options.txt => meson_options.txt +8 -0
@@ 0,0 1,8 @@
+# SPDX-FileCopyrightText: Hanspeter Portner <dev@open-music-kontrollers.ch>
+# SPDX-License-Identifier: CC0-1.0
+
+option('build-tests',
+ type : 'boolean',
+ value : false)
+
+option('version', type : 'string', value : '0.1.69')
D netatom.lv2/endian.h => netatom.lv2/endian.h +0 -120
@@ 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 <endian.h>
-
-#elif defined(__APPLE__)
-
-# include <libkern/OSByteOrder.h>
-
-# 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 <sys/endian.h>
-
-#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
-
-# include <sys/endian.h>
-
-#elif defined(__WINDOWS__)
-
-# include <winsock2.h>
-# include <sys/param.h>
-
-# 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
M netatom.lv2/netatom.h => netatom.lv2/netatom.h +9 -507
@@ 1,533 1,35 @@
/*
- * Copyright (c) 2017 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 <dev@open-music-kontrollers.ch>
+ * SPDX-License-Identifier: Artistic-2.0
*/
#ifndef _NETATOM_H
#define _NETATOM_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <netatom.lv2/endian.h>
+#include <stdbool.h>
#include <lv2/lv2plug.in/ns/ext/atom/atom.h>
-#include <lv2/lv2plug.in/ns/ext/atom/forge.h>
#include <lv2/lv2plug.in/ns/ext/urid/urid.h>
-#include <lv2/lv2plug.in/ns/ext/midi/midi.h>
-#ifndef NETATOM_API
-# define NETATOM_API static
+#ifdef __cplusplus
+extern "C" {
#endif
typedef struct _netatom_t netatom_t;
-NETATOM_API uint8_t *
+uint8_t *
netatom_serialize(netatom_t *netatom, LV2_Atom *atom, size_t size_rx,
size_t *size_tx);
-NETATOM_API const LV2_Atom *
+const LV2_Atom *
netatom_deserialize(netatom_t *netatom, uint8_t *buf_tx, size_t size_tx);
-NETATOM_API netatom_t *
+netatom_t *
netatom_new(LV2_URID_Map *map, LV2_URID_Unmap *unmap, bool swap);
-NETATOM_API void
+void
netatom_free(netatom_t *netatom);
-#ifdef NETATOM_IMPLEMENTATION
-
-typedef union _netatom_union_t netatom_union_t;
-
-union _netatom_union_t {
- LV2_Atom *atom;
- uint8_t *buf;
-};
-
-struct _netatom_t {
- bool swap;
- LV2_URID_Unmap *unmap;
- LV2_URID_Map *map;
- LV2_Atom_Forge forge;
- struct {
- uint8_t *buf;
- const uint8_t *cur;
- const uint8_t *end;
- } dict;
- uint32_t MIDI_MidiEvent;
- bool overflow;
-};
-
-static inline void
-_netatom_ser_uri(netatom_t *netatom, uint32_t *urid, const char *uri)
-{
- if(*urid == 0)
- return; // ignore untyped atoms
-
- // look for matching URID in dictionary
- uint32_t match = 0;
-
- for(netatom_union_t ptr = { .buf = netatom->dict.buf };
- ptr.buf < netatom->dict.cur;
- ptr.buf += lv2_atom_pad_size(lv2_atom_total_size(ptr.atom)))
- {
- if(ptr.atom->type == *urid)
- {
- match = ptr.buf - netatom->dict.buf + 1;
- break;
- }
- }
-
- if(match) // use already matched URI in dictionary
- {
- *urid = match;
- }
- else // add new URI to dictionary
- {
- if(!uri)
- uri = netatom->unmap->unmap(netatom->unmap->handle, *urid);
-
- if(!uri) // invalid urid
- {
- *urid = 0;
- }
- else
- {
- const uint32_t size = strlen(uri) + 1;
- const uint32_t tot_size = sizeof(LV2_Atom) + lv2_atom_pad_size(size);
- const uint32_t ref = netatom->dict.cur - netatom->dict.buf + 1;
-
- if(netatom->dict.cur + tot_size <= netatom->dict.end)
- {
- LV2_Atom *atom = (LV2_Atom *)netatom->dict.cur;
- atom->size = size;
- atom->type = *urid;
- strncpy(LV2_ATOM_BODY(atom), uri, tot_size); // automatic padding
-
- *urid = ref;
- netatom->dict.cur += tot_size;
- }
- else // dict buffer overflow
- {
- *urid = 0;
- netatom->overflow = true;
- }
- }
- }
-
- if(netatom->swap)
- *urid = htobe32(*urid);
-}
-
-static inline void
-_netatom_ser_dict(netatom_t *netatom)
-{
- LV2_Atom *body = NULL;
- for(netatom_union_t ptr = { .buf = netatom->dict.buf };
- ptr.buf < netatom->dict.cur;
- ptr.buf += lv2_atom_pad_size(lv2_atom_total_size(ptr.atom)))
- {
- if( netatom->swap && body)
- body->size = htobe32(body->size);
- body = ptr.atom;
- ptr.atom->type = 0; // clear key
- }
- if(netatom->swap && body)
- body->size = htobe32(body->size);
-}
-
-static inline void
-_netatom_deser_uri(netatom_t *netatom, uint32_t *urid)
-{
- if(*urid == 0)
- return; // ignore untyped atoms
-
- const uint32_t ref = netatom->swap
- ? be32toh(*urid)
- : *urid;
-
- const LV2_Atom *atom = (const LV2_Atom *)&netatom->dict.buf[ref - 1];
- *urid = atom->type;
-}
-
-static inline void
-_netatom_deser_dict(netatom_t *netatom)
-{
- for(netatom_union_t ptr = { .buf = netatom->dict.buf};
- ptr.buf < netatom->dict.cur;
- ptr.buf += lv2_atom_pad_size(lv2_atom_total_size(ptr.atom)))
- {
- if(netatom->swap)
- ptr.atom->size = be32toh(ptr.atom->size);
- const char *uri = LV2_ATOM_BODY_CONST(ptr.atom);
- ptr.atom->type = netatom->map->map(netatom->map->handle, uri);
- }
-}
-
-static void
-_netatom_ser_atom(netatom_t *netatom, LV2_Atom *atom)
-{
- LV2_Atom_Forge *forge = &netatom->forge;
- const char *uri = NULL;
-
- if(atom->type == forge->Bool)
- {
- if(netatom->swap)
- {
- uint32_t *u = LV2_ATOM_BODY(atom);
- *u = htobe32(*u);
- }
- uri = LV2_ATOM__Bool;
- }
- else if(atom->type == forge->Int)
- {
- if(netatom->swap)
- {
- uint32_t *u = LV2_ATOM_BODY(atom);
- *u = htobe32(*u);
- }
- uri = LV2_ATOM__Int;
- }
- else if(atom->type == forge->Float)
- {
- if(netatom->swap)
- {
- uint32_t *u = LV2_ATOM_BODY(atom);
- *u = htobe32(*u);
- }
- uri = LV2_ATOM__Float;
- }
- else if(atom->type == forge->Long)
- {
- if(netatom->swap)
- {
- uint64_t *u = LV2_ATOM_BODY(atom);
- *u = htobe64(*u);
- }
- uri = LV2_ATOM__Long;
- }
- else if(atom->type == forge->Double)
- {
- if(netatom->swap)
- {
- uint64_t *u = LV2_ATOM_BODY(atom);
- *u = htobe64(*u);
- }
- uri = LV2_ATOM__Double;
- }
- else if(atom->type == forge->URID)
- {
- uint32_t *u = LV2_ATOM_BODY(atom);
- _netatom_ser_uri(netatom, u, NULL);
- uri = LV2_ATOM__URID;
- }
- else if(atom->type == forge->String)
- {
- uri = LV2_ATOM__String;
- }
- else if(atom->type == forge->Chunk)
- {
- uri = LV2_ATOM__Chunk;
- }
- else if(atom->type == netatom->MIDI_MidiEvent)
- {
- uri = LV2_MIDI__MidiEvent;
- }
- else if(atom->type == forge->Literal)
- {
- LV2_Atom_Literal *lit = (LV2_Atom_Literal *)atom;
- _netatom_ser_uri(netatom, &lit->body.datatype, NULL);
- _netatom_ser_uri(netatom, &lit->body.lang, NULL);
- uri = LV2_ATOM__Literal;
- }
- else if(atom->type == forge->Object)
- {
- LV2_Atom_Object *obj = (LV2_Atom_Object *)atom;
- LV2_Atom *body = NULL;
- LV2_ATOM_OBJECT_FOREACH(obj, prop)
- {
- if(body)
- _netatom_ser_atom(netatom, body);
- body = &prop->value;
- _netatom_ser_uri(netatom, &prop->key, NULL);
- _netatom_ser_uri(netatom, &prop->context, NULL);
- }
- if(body)
- _netatom_ser_atom(netatom, body);
- _netatom_ser_uri(netatom, &obj->body.id, NULL);
- _netatom_ser_uri(netatom, &obj->body.otype, NULL);
- uri = LV2_ATOM__Object;
- }
- else if(atom->type == forge->Tuple)
- {
- LV2_Atom_Tuple *tup = (LV2_Atom_Tuple *)atom;
- LV2_Atom *body = NULL;
- LV2_ATOM_TUPLE_FOREACH(tup, item)
- {
- if(body)
- _netatom_ser_atom(netatom, body);
- body = item;
- }
- if(body)
- _netatom_ser_atom(netatom, body);
- uri = LV2_ATOM__Tuple;
- }
- else if(atom->type == forge->Sequence)
- {
- LV2_Atom_Sequence *seq = (LV2_Atom_Sequence *)atom;
- LV2_Atom *body = NULL;
- LV2_ATOM_SEQUENCE_FOREACH(seq, ev)
- {
- if(body)
- _netatom_ser_atom(netatom, body);
- body = &ev->body;
- if(netatom->swap)
- ev->time.frames = htobe64(ev->time.frames);
- }
- if(body)
- _netatom_ser_atom(netatom, body);
- _netatom_ser_uri(netatom, &seq->body.unit, NULL);
- if(netatom->swap)
- seq->body.pad = htobe32(seq->body.pad);
- uri = LV2_ATOM__Sequence;
- }
- else if(atom->type == forge->Vector)
- {
- LV2_Atom_Vector *vec = (LV2_Atom_Vector *)atom;
- if(netatom->swap)
- {
- if(vec->body.child_size == 4)
- {
- const unsigned n = (vec->atom.size - sizeof(LV2_Atom_Vector_Body)) / 4;
- uint32_t *u = LV2_ATOM_CONTENTS(LV2_Atom_Vector, atom);
- for(unsigned i = 0; i < n; i++)
- u[i] = htobe32(u[i]);
- }
- else if(vec->body.child_size == 8)
- {
- const unsigned n = (vec->atom.size - sizeof(LV2_Atom_Vector_Body)) / 8;
- uint64_t *u = LV2_ATOM_CONTENTS(LV2_Atom_Vector, atom);
- for(unsigned i = 0; i < n; i++)
- u[i] = htobe64(u[i]);
- }
- vec->body.child_size = htobe32(vec->body.child_size);
- }
- _netatom_ser_uri(netatom, &vec->body.child_type, NULL); //TODO set uri
- uri = LV2_ATOM__Vector;
- }
- else if(atom->type == forge->Path)
- {
- uri = LV2_ATOM__Path;
- }
- else if(atom->type == forge->URI)
- {
- uri = LV2_ATOM__URI;
- }
-
- if(netatom->swap)
- atom->size = htobe32(atom->size);
- _netatom_ser_uri(netatom, &atom->type, uri);
-}
-
-static void
-_netatom_deser_atom(netatom_t *netatom, LV2_Atom *atom)
-{
- LV2_Atom_Forge *forge = &netatom->forge;
-
- if(netatom->swap)
- atom->size = be32toh(atom->size);
- _netatom_deser_uri(netatom, &atom->type);
-
- if( (atom->type == forge->Bool)
- || (atom->type == forge->Int)
- || (atom->type == forge->Float) )
- {
- if(netatom->swap)
- {
- uint32_t *u = LV2_ATOM_BODY(atom);
- *u = be32toh(*u);
- }
- }
- else if( (atom->type == forge->Long)
- || (atom->type == forge->Double) )
- {
- if(netatom->swap)
- {
- uint64_t *u = LV2_ATOM_BODY(atom);
- *u = be64toh(*u);
- }
- }
- else if(atom->type == forge->URID)
- {
- uint32_t *u = LV2_ATOM_BODY(atom);
- _netatom_deser_uri(netatom, u);
- }
- else if(atom->type == forge->Literal)
- {
- LV2_Atom_Literal *lit = (LV2_Atom_Literal *)atom;
- _netatom_deser_uri(netatom, &lit->body.datatype);
- _netatom_deser_uri(netatom, &lit->body.lang);
- }
- else if(atom->type == forge->Object)
- {
- LV2_Atom_Object *obj = (LV2_Atom_Object *)atom;
- _netatom_deser_uri(netatom, &obj->body.id);
- _netatom_deser_uri(netatom, &obj->body.otype);
- LV2_ATOM_OBJECT_FOREACH(obj, prop)
- {
- _netatom_deser_uri(netatom, &prop->key);
- _netatom_deser_uri(netatom, &prop->context);
- _netatom_deser_atom(netatom, &prop->value);
- }
- }
- else if(atom->type == forge->Tuple)
- {
- LV2_Atom_Tuple *tup = (LV2_Atom_Tuple *)atom;
- LV2_ATOM_TUPLE_FOREACH(tup, item)
- {
- _netatom_deser_atom(netatom, item);
- }
- }
- else if(atom->type == forge->Sequence)
- {
- LV2_Atom_Sequence *seq = (LV2_Atom_Sequence *)atom;
- _netatom_deser_uri(netatom, &seq->body.unit);
- if(netatom->swap)
- seq->body.pad = be32toh(seq->body.pad);
- LV2_ATOM_SEQUENCE_FOREACH(seq, ev)
- {
- _netatom_deser_atom(netatom, &ev->body);
- if(netatom->swap)
- ev->time.frames = be64toh(ev->time.frames);
- }
- }
- else if(atom->type == forge->Vector)
- {
- LV2_Atom_Vector *vec = (LV2_Atom_Vector *)atom;
- _netatom_deser_uri(netatom, &vec->body.child_type);
- if(netatom->swap)
- {
- vec->body.child_size = be32toh(vec->body.child_size);
- if(vec->body.child_size == 4)
- {
- const unsigned n = (vec->atom.size - sizeof(LV2_Atom_Vector_Body)) / 4;
- uint32_t *u = LV2_ATOM_CONTENTS(LV2_Atom_Vector, atom);
- for(unsigned i = 0; i < n; i++)
- u[i] = be32toh(u[i]);
- }
- else if(vec->body.child_size == 8)
- {
- const unsigned n = (vec->atom.size - sizeof(LV2_Atom_Vector_Body)) / 8;
- uint64_t *u = LV2_ATOM_CONTENTS(LV2_Atom_Vector, atom);
- for(unsigned i = 0; i < n; i++)
- u[i] = be64toh(u[i]);
- }
- }
- }
-}
-
-NETATOM_API uint8_t *
-netatom_serialize(netatom_t *netatom, LV2_Atom *atom, size_t size_rx,
- size_t *size_tx)
-{
- if(!netatom || !atom)
- return NULL;
-
- uint8_t *buf_rx = (uint8_t *)atom;
- const uint32_t tot_size = lv2_atom_pad_size(lv2_atom_total_size(atom));
-
- netatom->dict.buf = buf_rx + tot_size;
- netatom->dict.cur = netatom->dict.buf;
- netatom->dict.end = buf_rx + size_rx;
-
- netatom->overflow = false;
-
- _netatom_ser_atom(netatom, atom);
- _netatom_ser_dict(netatom);
-
- if(netatom->overflow)
- return NULL;
-
- const size_t size_dict = netatom->dict.cur - netatom->dict.buf;
- const size_t written = tot_size + size_dict;
-
- if(size_tx)
- *size_tx = written;
-
- return buf_rx;
-}
-
-NETATOM_API const LV2_Atom *
-netatom_deserialize(netatom_t *netatom, uint8_t *buf_tx, size_t size_tx)
-{
- if(!netatom || !buf_tx)
- return NULL;
-
- LV2_Atom *atom = (LV2_Atom *)buf_tx;
- const uint32_t size = netatom->swap
- ? be32toh(atom->size)
- : atom->size;
-
- const uint32_t tot_size = lv2_atom_pad_size(sizeof(LV2_Atom) + size);
-
- const uint32_t dict_size = size_tx - tot_size;
- netatom->dict.buf = buf_tx + tot_size;
- netatom->dict.cur = netatom->dict.buf + dict_size;
- netatom->dict.end = buf_tx + size_tx;
-
- netatom->overflow = false;
-
- _netatom_deser_dict(netatom);
- _netatom_deser_atom(netatom, atom);
-
- return atom;
-}
-
-NETATOM_API netatom_t *
-netatom_new(LV2_URID_Map *map, LV2_URID_Unmap *unmap, bool swap)
-{
- netatom_t *netatom = calloc(1, sizeof(netatom_t));
- if(!netatom)
- return NULL;
-
- netatom->swap = swap;
- netatom->map = map;
- netatom->unmap = unmap;
-
- lv2_atom_forge_init(&netatom->forge, map);
-
- netatom->MIDI_MidiEvent = map->map(map->handle, LV2_MIDI__MidiEvent);
-
- return netatom;
-}
-
-NETATOM_API void
-netatom_free(netatom_t *netatom)
-{
- if(!netatom)
- return;
-
- free(netatom);
-}
-
-#endif // NETATOM_IMPLEMENTATION
-
#ifdef __cplusplus
}
#endif
A src/netatom.c => src/netatom.c +484 -0
@@ 0,0 1,484 @@
+/*
+ * SPDX-FileCopyrightText: Hanspeter Portner <dev@open-music-kontrollers.ch>
+ * SPDX-License-Identifier: Artistic-2.0
+ */
+
+#include <stdlib.h>
+
+#include <netatom.lv2/netatom.h>
+
+#include <lv2/lv2plug.in/ns/ext/atom/forge.h>
+#include <lv2/lv2plug.in/ns/ext/midi/midi.h>
+
+typedef union _netatom_union_t netatom_union_t;
+
+union _netatom_union_t {
+ LV2_Atom *atom;
+ uint8_t *buf;
+};
+
+struct _netatom_t {
+ bool swap;
+ LV2_URID_Unmap *unmap;
+ LV2_URID_Map *map;
+ LV2_Atom_Forge forge;
+ struct {
+ uint8_t *buf;
+ const uint8_t *cur;
+ const uint8_t *end;
+ } dict;
+ uint32_t MIDI_MidiEvent;
+ bool overflow;
+};
+
+static inline void
+_netatom_ser_uri(netatom_t *netatom, uint32_t *urid, const char *uri)
+{
+ if(*urid == 0)
+ return; // ignore untyped atoms
+
+ // look for matching URID in dictionary
+ uint32_t match = 0;
+
+ for(netatom_union_t ptr = { .buf = netatom->dict.buf };
+ ptr.buf < netatom->dict.cur;
+ ptr.buf += lv2_atom_pad_size(lv2_atom_total_size(ptr.atom)))
+ {
+ if(ptr.atom->type == *urid)
+ {
+ match = ptr.buf - netatom->dict.buf + 1;
+ break;
+ }
+ }
+
+ if(match) // use already matched URI in dictionary
+ {
+ *urid = match;
+ }
+ else // add new URI to dictionary
+ {
+ if(!uri)
+ uri = netatom->unmap->unmap(netatom->unmap->handle, *urid);
+
+ if(!uri) // invalid urid
+ {
+ *urid = 0;
+ }
+ else
+ {
+ const uint32_t size = strlen(uri) + 1;
+ const uint32_t tot_size = sizeof(LV2_Atom) + lv2_atom_pad_size(size);
+ const uint32_t ref = netatom->dict.cur - netatom->dict.buf + 1;
+
+ if(netatom->dict.cur + tot_size <= netatom->dict.end)
+ {
+ LV2_Atom *atom = (LV2_Atom *)netatom->dict.cur;
+ atom->size = size;
+ atom->type = *urid;
+ strncpy(LV2_ATOM_BODY(atom), uri, tot_size); // automatic padding
+
+ *urid = ref;
+ netatom->dict.cur += tot_size;
+ }
+ else // dict buffer overflow
+ {
+ *urid = 0;
+ netatom->overflow = true;
+ }
+ }
+ }
+
+ if(netatom->swap)
+ *urid = htobe32(*urid);
+}
+
+static inline void
+_netatom_ser_dict(netatom_t *netatom)
+{
+ LV2_Atom *body = NULL;
+ for(netatom_union_t ptr = { .buf = netatom->dict.buf };
+ ptr.buf < netatom->dict.cur;
+ ptr.buf += lv2_atom_pad_size(lv2_atom_total_size(ptr.atom)))
+ {
+ if( netatom->swap && body)
+ body->size = htobe32(body->size);
+ body = ptr.atom;
+ ptr.atom->type = 0; // clear key
+ }
+ if(netatom->swap && body)
+ body->size = htobe32(body->size);
+}
+
+static inline void
+_netatom_deser_uri(netatom_t *netatom, uint32_t *urid)
+{
+ if(*urid == 0)
+ return; // ignore untyped atoms
+
+ const uint32_t ref = netatom->swap
+ ? be32toh(*urid)
+ : *urid;
+
+ const LV2_Atom *atom = (const LV2_Atom *)&netatom->dict.buf[ref - 1];
+ *urid = atom->type;
+}
+
+static inline void
+_netatom_deser_dict(netatom_t *netatom)
+{
+ for(netatom_union_t ptr = { .buf = netatom->dict.buf};
+ ptr.buf < netatom->dict.cur;
+ ptr.buf += lv2_atom_pad_size(lv2_atom_total_size(ptr.atom)))
+ {
+ if(netatom->swap)
+ ptr.atom->size = be32toh(ptr.atom->size);
+ const char *uri = LV2_ATOM_BODY_CONST(ptr.atom);
+ ptr.atom->type = netatom->map->map(netatom->map->handle, uri);
+ }
+}
+
+static void
+_netatom_ser_atom(netatom_t *netatom, LV2_Atom *atom)
+{
+ LV2_Atom_Forge *forge = &netatom->forge;
+ const char *uri = NULL;
+
+ if(atom->type == forge->Bool)
+ {
+ if(netatom->swap)
+ {
+ uint32_t *u = LV2_ATOM_BODY(atom);
+ *u = htobe32(*u);
+ }
+ uri = LV2_ATOM__Bool;
+ }
+ else if(atom->type == forge->Int)
+ {
+ if(netatom->swap)
+ {
+ uint32_t *u = LV2_ATOM_BODY(atom);
+ *u = htobe32(*u);
+ }
+ uri = LV2_ATOM__Int;
+ }
+ else if(atom->type == forge->Float)
+ {
+ if(netatom->swap)
+ {
+ uint32_t *u = LV2_ATOM_BODY(atom);
+ *u = htobe32(*u);
+ }
+ uri = LV2_ATOM__Float;
+ }
+ else if(atom->type == forge->Long)
+ {
+ if(netatom->swap)
+ {
+ uint64_t *u = LV2_ATOM_BODY(atom);
+ *u = htobe64(*u);
+ }
+ uri = LV2_ATOM__Long;
+ }
+ else if(atom->type == forge->Double)
+ {
+ if(netatom->swap)
+ {
+ uint64_t *u = LV2_ATOM_BODY(atom);
+ *u = htobe64(*u);
+ }
+ uri = LV2_ATOM__Double;
+ }
+ else if(atom->type == forge->URID)
+ {
+ uint32_t *u = LV2_ATOM_BODY(atom);
+ _netatom_ser_uri(netatom, u, NULL);
+ uri = LV2_ATOM__URID;
+ }
+ else if(atom->type == forge->String)
+ {
+ uri = LV2_ATOM__String;
+ }
+ else if(atom->type == forge->Chunk)
+ {
+ uri = LV2_ATOM__Chunk;
+ }
+ else if(atom->type == netatom->MIDI_MidiEvent)
+ {
+ uri = LV2_MIDI__MidiEvent;
+ }
+ else if(atom->type == forge->Literal)
+ {
+ LV2_Atom_Literal *lit = (LV2_Atom_Literal *)atom;
+ _netatom_ser_uri(netatom, &lit->body.datatype, NULL);
+ _netatom_ser_uri(netatom, &lit->body.lang, NULL);
+ uri = LV2_ATOM__Literal;
+ }
+ else if(atom->type == forge->Object)
+ {
+ LV2_Atom_Object *obj = (LV2_Atom_Object *)atom;
+ LV2_Atom *body = NULL;
+ LV2_ATOM_OBJECT_FOREACH(obj, prop)
+ {
+ if(body)
+ _netatom_ser_atom(netatom, body);
+ body = &prop->value;
+ _netatom_ser_uri(netatom, &prop->key, NULL);
+ _netatom_ser_uri(netatom, &prop->context, NULL);
+ }
+ if(body)
+ _netatom_ser_atom(netatom, body);
+ _netatom_ser_uri(netatom, &obj->body.id, NULL);
+ _netatom_ser_uri(netatom, &obj->body.otype, NULL);
+ uri = LV2_ATOM__Object;
+ }
+ else if(atom->type == forge->Tuple)
+ {
+ LV2_Atom_Tuple *tup = (LV2_Atom_Tuple *)atom;
+ LV2_Atom *body = NULL;
+ LV2_ATOM_TUPLE_FOREACH(tup, item)
+ {
+ if(body)
+ _netatom_ser_atom(netatom, body);
+ body = item;
+ }
+ if(body)
+ _netatom_ser_atom(netatom, body);
+ uri = LV2_ATOM__Tuple;
+ }
+ else if(atom->type == forge->Sequence)
+ {
+ LV2_Atom_Sequence *seq = (LV2_Atom_Sequence *)atom;
+ LV2_Atom *body = NULL;
+ LV2_ATOM_SEQUENCE_FOREACH(seq, ev)
+ {
+ if(body)
+ _netatom_ser_atom(netatom, body);
+ body = &ev->body;
+ if(netatom->swap)
+ ev->time.frames = htobe64(ev->time.frames);
+ }
+ if(body)
+ _netatom_ser_atom(netatom, body);
+ _netatom_ser_uri(netatom, &seq->body.unit, NULL);
+ if(netatom->swap)
+ seq->body.pad = htobe32(seq->body.pad);
+ uri = LV2_ATOM__Sequence;
+ }
+ else if(atom->type == forge->Vector)
+ {
+ LV2_Atom_Vector *vec = (LV2_Atom_Vector *)atom;
+ if(netatom->swap)
+ {
+ if(vec->body.child_size == 4)
+ {
+ const unsigned n = (vec->atom.size - sizeof(LV2_Atom_Vector_Body)) / 4;
+ uint32_t *u = LV2_ATOM_CONTENTS(LV2_Atom_Vector, atom);
+ for(unsigned i = 0; i < n; i++)
+ u[i] = htobe32(u[i]);
+ }
+ else if(vec->body.child_size == 8)
+ {
+ const unsigned n = (vec->atom.size - sizeof(LV2_Atom_Vector_Body)) / 8;
+ uint64_t *u = LV2_ATOM_CONTENTS(LV2_Atom_Vector, atom);
+ for(unsigned i = 0; i < n; i++)
+ u[i] = htobe64(u[i]);
+ }
+ vec->body.child_size = htobe32(vec->body.child_size);
+ }
+ _netatom_ser_uri(netatom, &vec->body.child_type, NULL); //TODO set uri
+ uri = LV2_ATOM__Vector;
+ }
+ else if(atom->type == forge->Path)
+ {
+ uri = LV2_ATOM__Path;
+ }
+ else if(atom->type == forge->URI)
+ {
+ uri = LV2_ATOM__URI;
+ }
+
+ if(netatom->swap)
+ atom->size = htobe32(atom->size);
+ _netatom_ser_uri(netatom, &atom->type, uri);
+}
+
+static void
+_netatom_deser_atom(netatom_t *netatom, LV2_Atom *atom)
+{
+ LV2_Atom_Forge *forge = &netatom->forge;
+
+ if(netatom->swap)
+ atom->size = be32toh(atom->size);
+ _netatom_deser_uri(netatom, &atom->type);
+
+ if( (atom->type == forge->Bool)
+ || (atom->type == forge->Int)
+ || (atom->type == forge->Float) )
+ {
+ if(netatom->swap)
+ {
+ uint32_t *u = LV2_ATOM_BODY(atom);
+ *u = be32toh(*u);
+ }
+ }
+ else if( (atom->type == forge->Long)
+ || (atom->type == forge->Double) )
+ {
+ if(netatom->swap)
+ {
+ uint64_t *u = LV2_ATOM_BODY(atom);
+ *u = be64toh(*u);
+ }
+ }
+ else if(atom->type == forge->URID)
+ {
+ uint32_t *u = LV2_ATOM_BODY(atom);
+ _netatom_deser_uri(netatom, u);
+ }
+ else if(atom->type == forge->Literal)
+ {
+ LV2_Atom_Literal *lit = (LV2_Atom_Literal *)atom;
+ _netatom_deser_uri(netatom, &lit->body.datatype);
+ _netatom_deser_uri(netatom, &lit->body.lang);
+ }
+ else if(atom->type == forge->Object)
+ {
+ LV2_Atom_Object *obj = (LV2_Atom_Object *)atom;
+ _netatom_deser_uri(netatom, &obj->body.id);
+ _netatom_deser_uri(netatom, &obj->body.otype);
+ LV2_ATOM_OBJECT_FOREACH(obj, prop)
+ {
+ _netatom_deser_uri(netatom, &prop->key);
+ _netatom_deser_uri(netatom, &prop->context);
+ _netatom_deser_atom(netatom, &prop->value);
+ }
+ }
+ else if(atom->type == forge->Tuple)
+ {
+ LV2_Atom_Tuple *tup = (LV2_Atom_Tuple *)atom;
+ LV2_ATOM_TUPLE_FOREACH(tup, item)
+ {
+ _netatom_deser_atom(netatom, item);
+ }
+ }
+ else if(atom->type == forge->Sequence)
+ {
+ LV2_Atom_Sequence *seq = (LV2_Atom_Sequence *)atom;
+ _netatom_deser_uri(netatom, &seq->body.unit);
+ if(netatom->swap)
+ seq->body.pad = be32toh(seq->body.pad);
+ LV2_ATOM_SEQUENCE_FOREACH(seq, ev)
+ {
+ _netatom_deser_atom(netatom, &ev->body);
+ if(netatom->swap)
+ ev->time.frames = be64toh(ev->time.frames);
+ }
+ }
+ else if(atom->type == forge->Vector)
+ {
+ LV2_Atom_Vector *vec = (LV2_Atom_Vector *)atom;
+ _netatom_deser_uri(netatom, &vec->body.child_type);
+ if(netatom->swap)
+ {
+ vec->body.child_size = be32toh(vec->body.child_size);
+ if(vec->body.child_size == 4)
+ {
+ const unsigned n = (vec->atom.size - sizeof(LV2_Atom_Vector_Body)) / 4;
+ uint32_t *u = LV2_ATOM_CONTENTS(LV2_Atom_Vector, atom);
+ for(unsigned i = 0; i < n; i++)
+ u[i] = be32toh(u[i]);
+ }
+ else if(vec->body.child_size == 8)
+ {
+ const unsigned n = (vec->atom.size - sizeof(LV2_Atom_Vector_Body)) / 8;
+ uint64_t *u = LV2_ATOM_CONTENTS(LV2_Atom_Vector, atom);
+ for(unsigned i = 0; i < n; i++)
+ u[i] = be64toh(u[i]);
+ }
+ }
+ }
+}
+
+uint8_t *
+netatom_serialize(netatom_t *netatom, LV2_Atom *atom, size_t size_rx,
+ size_t *size_tx)
+{
+ if(!netatom || !atom)
+ return NULL;
+
+ uint8_t *buf_rx = (uint8_t *)atom;
+ const uint32_t tot_size = lv2_atom_pad_size(lv2_atom_total_size(atom));
+
+ netatom->dict.buf = buf_rx + tot_size;
+ netatom->dict.cur = netatom->dict.buf;
+ netatom->dict.end = buf_rx + size_rx;
+
+ netatom->overflow = false;
+
+ _netatom_ser_atom(netatom, atom);
+ _netatom_ser_dict(netatom);
+
+ if(netatom->overflow)
+ return NULL;
+
+ const size_t size_dict = netatom->dict.cur - netatom->dict.buf;
+ const size_t written = tot_size + size_dict;
+
+ if(size_tx)
+ *size_tx = written;
+
+ return buf_rx;
+}
+
+const LV2_Atom *
+netatom_deserialize(netatom_t *netatom, uint8_t *buf_tx, size_t size_tx)
+{
+ if(!netatom || !buf_tx)
+ return NULL;
+
+ LV2_Atom *atom = (LV2_Atom *)buf_tx;
+ const uint32_t size = netatom->swap
+ ? be32toh(atom->size)
+ : atom->size;
+
+ const uint32_t tot_size = lv2_atom_pad_size(sizeof(LV2_Atom) + size);
+
+ const uint32_t dict_size = size_tx - tot_size;
+ netatom->dict.buf = buf_tx + tot_size;
+ netatom->dict.cur = netatom->dict.buf + dict_size;
+ netatom->dict.end = buf_tx + size_tx;
+
+ netatom->overflow = false;
+
+ _netatom_deser_dict(netatom);
+ _netatom_deser_atom(netatom, atom);
+
+ return atom;
+}
+
+netatom_t *
+netatom_new(LV2_URID_Map *map, LV2_URID_Unmap *unmap, bool swap)
+{
+ netatom_t *netatom = calloc(1, sizeof(netatom_t));
+ if(!netatom)
+ return NULL;
+
+ netatom->swap = swap;
+ netatom->map = map;
+ netatom->unmap = unmap;
+
+ lv2_atom_forge_init(&netatom->forge, map);
+
+ netatom->MIDI_MidiEvent = map->map(map->handle, LV2_MIDI__MidiEvent);
+
+ return netatom;
+}
+
+void
+netatom_free(netatom_t *netatom)
+{
+ if(!netatom)
+ return;
+
+ free(netatom);
+}
R test/netatom_test.c => test/test.c +6 -21
@@ 1,26 1,17 @@
/*
- * Copyright (c) 2017 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 <dev@open-music-kontrollers.ch>
+ * SPDX-License-Identifier: Artistic-2.0
*/
#include <time.h>
+#include <stdlib.h>
+
#include <sratom/sratom.h>
-#define NETATOM_IMPLEMENTATION
#include <netatom.lv2/netatom.h>
+#include <lv2/lv2plug.in/ns/ext/midi/midi.h>
+
#define MAX_URIDS 2048
#define MAX_BUF 4092
@@ 266,22 257,16 @@ main(int argc, char **argv)
map.map(map.handle, tmp);
}
-#if !defined(__APPLE__) && !defined(_WIN32)
struct timespec t0, t1, t2;
clock_gettime(CLOCK_MONOTONIC, &t0);
-#endif
_netatom_test(&map, &unmap, true, &un.atom, iterations);
-#if !defined(__APPLE__) && !defined(_WIN32)
clock_gettime(CLOCK_MONOTONIC, &t1);
-#endif
_sratom_test(&map, &unmap, false, &un.atom, iterations);
-#if !defined(__APPLE__) && !defined(_WIN32)
clock_gettime(CLOCK_MONOTONIC, &t2);
const double d1 = (t1.tv_sec - t0.tv_sec) + (t1.tv_nsec - t0.tv_nsec) * 1e-9;
const double d2 = (t2.tv_sec - t1.tv_sec) + (t2.tv_nsec - t1.tv_nsec) * 1e-9;
fprintf(stderr, "%lf s, %lf s, x %lf\n", d1, d2, d2/d1);
-#endif
_freemap(&handle);