lv2_pfile => rdff.
authorDavid Robillard <d@drobilla.net>
Tue, 29 Mar 2011 02:10:57 +0000 (02:10 +0000)
committerDavid Robillard <d@drobilla.net>
Tue, 29 Mar 2011 02:10:57 +0000 (02:10 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@9221 d708f5d6-7413-0410-9779-e7cbd77b26cf

libs/ardour/lv2_pfile.c [deleted file]
libs/ardour/lv2_pfile.h [deleted file]
libs/ardour/lv2_plugin.cc
libs/ardour/rdff.c [new file with mode: 0644]
libs/ardour/rdff.h [new file with mode: 0644]
libs/ardour/wscript

diff --git a/libs/ardour/lv2_pfile.c b/libs/ardour/lv2_pfile.c
deleted file mode 100644 (file)
index cdf14b2..0000000
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
-  Portable file-based LV2 Persist implementation.
-  See <http://lv2plug.in/ns/ext/persist> for details.
-
-  Copyright 2011 David Robillard <http://drobilla.net>
-  This is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-  This software 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 GNU General Public License for more details.
-  You should have received a copy of the GNU General Public License
-  along with this sofware; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  02110-1301 USA.
-*/
-
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "lv2_pfile.h"
-
-#define CHUNK_ID_LEN 4
-
-static const char FILE_TYPE[CHUNK_ID_LEN]  = "LV2F";  /* LV2 RIFF File */ 
-static const char CHUNK_KVAL[CHUNK_ID_LEN] = "KVAL";  /* Key/Value Chunk */
-static const char CHUNK_URID[CHUNK_ID_LEN] = "URID";  /* URI ID Chunk */
-
-struct _LV2PFile {
-       FILE*    fd;
-       uint32_t size;
-       bool     write;
-};
-
-LV2PFile
-lv2_pfile_open(const char* path, bool write)
-{
-       FILE* fd = fopen(path, (write ? "w" : "r"));
-       if (!fd) {
-               fprintf(stderr, "%s\n", strerror(errno));
-               return NULL;
-       }
-
-       uint32_t size = 0;
-
-       if (write) {
-               fwrite("RIFF", CHUNK_ID_LEN, 1, fd);    /* RIFF chunk ID */
-               fwrite(&size, sizeof(size), 1, fd);     /* RIFF chunk size */
-               fwrite(FILE_TYPE, CHUNK_ID_LEN, 1, fd); /* LV2 RIFF file type */
-       } else {
-               char magic[CHUNK_ID_LEN];
-               if (fread(magic, CHUNK_ID_LEN, 1, fd) != 1
-                   || strncmp(magic, "RIFF", CHUNK_ID_LEN)) {
-                       fclose(fd);
-                       fprintf(stderr, "%s: error: not a RIFF file\n", path);
-                       return NULL;
-               }
-
-               if (fread(&size, sizeof(size), 1, fd) != 1) {
-                       fclose(fd);
-                       fprintf(stderr, "%s: error: missing RIFF chunk size\n", path);
-                       return NULL;
-               }
-
-               if (fread(magic, CHUNK_ID_LEN, 1, fd) != 1
-                   || strncmp(magic, FILE_TYPE, CHUNK_ID_LEN)) {
-                       fclose(fd);
-                       fprintf(stderr, "%s: error: not an LV2 RIFF file\n", path);
-                       return NULL;
-               }
-       }
-
-       LV2PFile ret = (LV2PFile)malloc(sizeof(struct _LV2PFile));
-       ret->fd    = fd;
-       ret->size  = size;
-       ret->write = write;
-       return ret;
-}
-
-#define WRITE(ptr, size, nmemb, stream) \
-       if (fwrite(ptr, size, nmemb, stream) != nmemb) { \
-               return LV2_PFILE_UNKNOWN_ERROR; \
-       }
-
-LV2PFileStatus
-lv2_pfile_write_uri(LV2PFile    file,
-                    uint32_t    id,
-                    const char* uri,
-                    uint32_t    len)
-{
-       const uint32_t chunk_size = sizeof(id) + len + 1;
-       WRITE(CHUNK_URID,  CHUNK_ID_LEN,       1, file->fd);
-       WRITE(&chunk_size, sizeof(chunk_size), 1, file->fd);
-       WRITE(&id,         sizeof(id),         1, file->fd);
-       WRITE(uri,         len + 1,            1, file->fd);
-       if ((chunk_size % 2)) {
-               WRITE("", 1, 1, file->fd);  /* pad */
-       }
-       file->size += 8 + chunk_size;
-       return LV2_PFILE_OK;
-}
-
-LV2PFileStatus
-lv2_pfile_write_value(LV2PFile    file,
-                      uint32_t    key,
-                      const void* value,
-                      uint32_t    size,
-                      uint32_t    type)
-{
-       const uint32_t chunk_size = sizeof(key) + sizeof(type) + sizeof(size) + size;
-       WRITE(CHUNK_KVAL,  CHUNK_ID_LEN,       1, file->fd);
-       WRITE(&chunk_size, sizeof(chunk_size), 1, file->fd);
-       WRITE(&key,        sizeof(key),        1, file->fd);
-       WRITE(&type,       sizeof(type),       1, file->fd);
-       WRITE(&size,       sizeof(size),       1, file->fd);
-       WRITE(value,       size,               1, file->fd);
-       if ((size % 2)) {
-               WRITE("", 1, 1, file->fd);  /* write pad */
-       }
-       file->size += 8 + chunk_size;
-       return LV2_PFILE_OK;
-}
-
-LV2PFileStatus
-lv2_pfile_read_chunk(LV2PFile              file,
-                     LV2PFileChunkHeader** buf)
-{
-       if (feof(file->fd))
-               return LV2_PFILE_EOF;
-
-#define READ(ptr, size, nmemb, stream) \
-       if (fread(ptr, size, nmemb, stream) != nmemb) { \
-               return LV2_PFILE_CORRUPT; \
-       }
-
-       const uint32_t alloc_size = (*buf)->size;
-
-       READ((*buf)->type,  sizeof((*buf)->type), 1, file->fd);
-       READ(&(*buf)->size, sizeof((*buf)->size), 1, file->fd);
-       if ((*buf)->size > alloc_size) {
-               *buf = realloc(*buf, sizeof(LV2PFileChunkHeader) + (*buf)->size);
-       }
-       READ((*buf)->data, (*buf)->size, 1, file->fd);
-       if (((*buf)->size % 2)) {
-               char pad;
-               READ(&pad, 1, 1, file->fd);  /* skip pad */
-       }
-       return LV2_PFILE_OK;
-}
-
-void
-lv2_pfile_close(LV2PFile file)
-{
-       if (file) {
-               if (file->write) {
-                       fseek(file->fd, 4, SEEK_SET);
-                       if (fwrite(&file->size, sizeof(file->size), 1, file->fd) != 1) {
-                               fprintf(stderr, "failed to write RIFF header size\n");
-                       }
-               }
-               fclose(file->fd);
-       }
-
-       free(file);
-}
-
-#ifdef STANDALONE
-// Test program
-int
-main(int argc, char** argv)
-{
-       if (argc != 2) {
-               fprintf(stderr, "Usage: %s FILENAME\n", argv[0]);
-               return 1;
-       }
-
-       const char* const filename = argv[1];
-
-       LV2PFile file = lv2_pfile_open(filename, true);
-       if (!file)
-               goto fail;
-
-       static const int N_URIS    = 16;
-       static const int N_RECORDS = 16;
-
-       char uri[64];
-       for (int i = 0; i < N_URIS; ++i) {
-               snprintf(uri, sizeof(uri), "http://example.org/uri%02d", i + 1);
-               lv2_pfile_write_uri(file, i + 1, uri, strlen(uri) + 1);
-       }
-       
-       char val[6];
-       for (int i = 0; i < N_RECORDS; ++i) {
-               snprintf(val, sizeof(val), "VAL%02d", i);
-               lv2_pfile_write_value(file,
-                                     rand() % N_URIS,
-                                     val,
-                                     sizeof(val),
-                                     0);
-       }
-
-       lv2_pfile_close(file);
-
-       file = lv2_pfile_open(filename, false);
-       if (!file)
-               goto fail;
-
-       LV2PFileChunkHeader* chunk = malloc(sizeof(LV2PFileChunkHeader));
-       chunk->size = 0;
-       for (int i = 0; i < N_URIS; ++i) {
-               if (lv2_pfile_read_chunk(file, &chunk)
-                   || strncmp(chunk->type, "URID", 4)) {
-                       fprintf(stderr, "error: expected URID chunk\n");
-                       goto fail;
-               }
-               LV2PFileURIChunk* body = (LV2PFileURIChunk*)chunk->data;
-               printf("URI: %s\n", body->uri);
-       }
-
-       for (int i = 0; i < N_RECORDS; ++i) {
-               if (lv2_pfile_read_chunk(file, &chunk)
-                   || strncmp(chunk->type, "KVAL", 4)) {
-                       fprintf(stderr, "error: expected KVAL chunk\n");
-                       goto fail;
-               }
-               LV2PFileValueChunk* body = (LV2PFileValueChunk*)chunk->data;
-               printf("KEY %d = %s\n", body->key, body->value);
-       }
-
-       free(chunk);
-       lv2_pfile_close(file);
-
-       return 0;
-
-fail:
-       lv2_pfile_close(file);
-       fprintf(stderr, "Test failed\n");
-       return 1;
-}
-#endif // STANDALONE
diff --git a/libs/ardour/lv2_pfile.h b/libs/ardour/lv2_pfile.h
deleted file mode 100644 (file)
index 8cc9787..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-  Portable file-based LV2 Persist implementation.
-  See <http://lv2plug.in/ns/ext/persist> for details.
-
-  Copyright 2011 David Robillard <http://drobilla.net>
-  This is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-  This software 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 GNU
-  General Public License for more details.
-  You should have received a copy of the GNU General Public License
-  along with this sofware; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  02110-1301 USA.
-*/
-
-#ifndef LV2PFILE_H
-#define LV2PFILE_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#ifdef __GNUC__
-#    define PACKED __attribute__((__packed__))
-#else
-#    define PACKED
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct _LV2PFile*          LV2PFile;
-typedef struct _LV2PFile_Iterator* LV2PFile_Iterator;
-
-typedef enum {
-       LV2_PFILE_OK            = 0,
-       LV2_PFILE_UNKNOWN_ERROR = 1,
-       LV2_PFILE_EOF           = 2,
-       LV2_PFILE_CORRUPT       = 3
-} LV2PFileStatus;
-
-typedef struct {
-       char     type[4];
-       uint32_t size;
-       char     data[];
-} PACKED LV2PFileChunkHeader;
-
-typedef struct {
-       uint32_t id;
-       char     uri[];
-} PACKED LV2PFileURIChunk;
-
-typedef struct {
-       uint32_t key;
-       uint32_t type;
-       uint32_t size;
-       char     value[];
-} PACKED LV2PFileValueChunk;
-               
-/**
-   Open/Create a new persist file.
-*/
-LV2PFile
-lv2_pfile_open(const char* path, bool write);
-
-/**
-   Write a URI ID to @a file.
-*/
-LV2PFileStatus
-lv2_pfile_write_uri(LV2PFile    file,
-                    uint32_t    id,
-                    const char* uri,
-                    uint32_t    size);
-
-/**
-   Write a key/value record to @a file.
-*/
-LV2PFileStatus
-lv2_pfile_write_value(LV2PFile    file,
-                      uint32_t    key,
-                      const void* value,
-                      uint32_t    size,
-                      uint32_t    type);
-LV2PFileStatus
-lv2_pfile_read_chunk(LV2PFile              file,
-                     LV2PFileChunkHeader** buf);
-
-/**
-   Read a record from a persist file.
-   @a key and @a value are allocated with malloc and must be freed by caller.
-*/
-#if 0
-LV2PFileStatus
-lv2_pfile_read(LV2PFile  file,
-               char**    key,
-               uint32_t* key_len,
-               char**    type,
-               uint32_t* type_len,
-               void**    value,
-               uint64_t* size);
-#endif
-
-/**
-   Close @a file.
-   After this call, @a file is invalid.
-*/
-void
-lv2_pfile_close(LV2PFile file);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* LV2PFILE_H */
index f2016e6340f3b8a42041b5f3282e5e52b93ddead..3832a899e7a8280db40cb22462935f2829e242b2 100644 (file)
@@ -46,7 +46,7 @@
 #include <locale.h>
 
 #include "lv2ext/lv2_persist.h"
-#include "lv2_pfile.h"
+#include "rdff.h"
 
 #define NS_DC   "http://dublincore.org/documents/dcmi-namespace/"
 #define NS_LV2  "http://lv2plug.in/ns/lv2core#"
@@ -442,12 +442,12 @@ LV2Plugin::add_state(XMLNode* root) const
                              &state);
 
                // Open state file
-               LV2PFile file = lv2_pfile_open(state_path.c_str(), true);
+               RDFF file = rdff_open(state_path.c_str(), true);
 
                // Write all referenced URIs to state file
                for (PersistState::URIs::const_iterator i = state.uris.begin();
                     i != state.uris.end(); ++i) {
-                       lv2_pfile_write_uri(file, i->first,
+                       rdff_write_uri(file, i->first,
                                            i->second.c_str(), i->second.length() + 1);
                }
 
@@ -456,7 +456,7 @@ LV2Plugin::add_state(XMLNode* root) const
                     i != state.values.end(); ++i) {
                        const uint32_t      key = i->first;
                        const PersistValue& val = i->second;
-                       lv2_pfile_write_value(file,
+                       rdff_write_value(file,
                                              key,
                                              val.value,
                                              val.size,
@@ -464,7 +464,7 @@ LV2Plugin::add_state(XMLNode* root) const
                }
 
                // Close state file
-               lv2_pfile_close(file);
+               rdff_close(file);
 
                root->add_property("state-file", state_filename);
        }
@@ -631,21 +631,20 @@ LV2Plugin::set_state(const XMLNode& node, int version)
                        _instance, "http://lv2plug.in/ns/ext/persist");
                if (persist) {
                        cout << "Loading LV2 state from " << state_path << endl;
-                       LV2PFile file = lv2_pfile_open(state_path.c_str(), false);
+                       RDFF file = rdff_open(state_path.c_str(), false);
 
                        PersistState state(_uri_map);
 
                        // Load file into state object
-                       LV2PFileChunkHeader* chunk = (LV2PFileChunkHeader*)malloc(
-                               sizeof(LV2PFileChunkHeader));
+                       RDFFChunk* chunk = (RDFFChunk*)malloc(sizeof(RDFFChunk));
                        chunk->size = 0;
-                       while (!lv2_pfile_read_chunk(file, &chunk)) {
+                       while (!rdff_read_chunk(file, &chunk)) {
                                if (!strncmp(chunk->type, "URID", 4)) {
-                                       LV2PFileURIChunk* body = (LV2PFileURIChunk*)chunk->data;
+                                       RDFFURIChunk* body = (RDFFURIChunk*)chunk->data;
                                        printf("READ URI %u: %s\n", body->id, body->uri);
                                        state.add_uri(body->id, body->uri);
                                } else if (!strncmp(chunk->type, "KVAL", 4)) {
-                                       LV2PFileValueChunk* body = (LV2PFileValueChunk*)chunk->data;
+                                       RDFFValueChunk* body = (RDFFValueChunk*)chunk->data;
                                        printf("READ VAL %u = %s (size: %u type: %u)\n",
                                               body->key, body->value, body->size, body->type);
                                        state.add_value(body->key,
@@ -660,7 +659,7 @@ LV2Plugin::set_state(const XMLNode& node, int version)
                        persist->restore(_instance->lv2_handle,
                                         &LV2Plugin::lv2_persist_retrieve_callback,
                                         &state);
-                       lv2_pfile_close(file);
+                       rdff_close(file);
                } else {
                        warning << string_compose(
                            _("Plugin \"%1\% failed to return LV2 persist data"),
diff --git a/libs/ardour/rdff.c b/libs/ardour/rdff.c
new file mode 100644 (file)
index 0000000..28fd63c
--- /dev/null
@@ -0,0 +1,246 @@
+/*
+  RDFF - RDF in RIFF
+  Copyright 2011 David Robillard <http://drobilla.net>
+  This is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+  This software 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 GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this sofware; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  02110-1301 USA.
+*/
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "rdff.h"
+
+#define CHUNK_ID_LEN 4
+
+static const char FILE_TYPE[CHUNK_ID_LEN]  = "RDFF";  /* RDFF File ID */
+static const char CHUNK_KVAL[CHUNK_ID_LEN] = "KVAL";  /* Key/Value Chunk ID */
+static const char CHUNK_URID[CHUNK_ID_LEN] = "URID";  /* URI-ID Chunk ID*/
+
+struct _RDFF {
+       FILE*    fd;
+       uint32_t size;
+       bool     write;
+};
+
+RDFF
+rdff_open(const char* path, bool write)
+{
+       FILE* fd = fopen(path, (write ? "w" : "r"));
+       if (!fd) {
+               fprintf(stderr, "%s\n", strerror(errno));
+               return NULL;
+       }
+
+       uint32_t size = 0;
+
+       if (write) {
+               fwrite("RIFF", CHUNK_ID_LEN, 1, fd);    /* RIFF chunk ID */
+               fwrite(&size, sizeof(size), 1, fd);     /* RIFF chunk size */
+               fwrite(FILE_TYPE, CHUNK_ID_LEN, 1, fd); /* LV2 RIFF file type */
+       } else {
+               char magic[CHUNK_ID_LEN];
+               if (fread(magic, CHUNK_ID_LEN, 1, fd) != 1
+                   || strncmp(magic, "RIFF", CHUNK_ID_LEN)) {
+                       fclose(fd);
+                       fprintf(stderr, "%s: error: not a RIFF file\n", path);
+                       return NULL;
+               }
+
+               if (fread(&size, sizeof(size), 1, fd) != 1) {
+                       fclose(fd);
+                       fprintf(stderr, "%s: error: missing RIFF chunk size\n", path);
+                       return NULL;
+               }
+
+               if (fread(magic, CHUNK_ID_LEN, 1, fd) != 1
+                   || strncmp(magic, FILE_TYPE, CHUNK_ID_LEN)) {
+                       fclose(fd);
+                       fprintf(stderr, "%s: error: not an LV2 RIFF file\n", path);
+                       return NULL;
+               }
+       }
+
+       RDFF ret = (RDFF)malloc(sizeof(struct _RDFF));
+       ret->fd    = fd;
+       ret->size  = size;
+       ret->write = write;
+       return ret;
+}
+
+#define WRITE(ptr, size, nmemb, stream) \
+       if (fwrite(ptr, size, nmemb, stream) != nmemb) { \
+               return RDFF_STATUS_UNKNOWN_ERROR; \
+       }
+
+RDFFStatus
+rdff_write_uri(RDFF        file,
+               uint32_t    id,
+               const char* uri,
+               uint32_t    len)
+{
+       const uint32_t chunk_size = sizeof(id) + len + 1;
+       WRITE(CHUNK_URID,  CHUNK_ID_LEN,       1, file->fd);
+       WRITE(&chunk_size, sizeof(chunk_size), 1, file->fd);
+       WRITE(&id,         sizeof(id),         1, file->fd);
+       WRITE(uri,         len + 1,            1, file->fd);
+       if ((chunk_size % 2)) {
+               WRITE("", 1, 1, file->fd);  /* pad */
+       }
+       file->size += 8 + chunk_size;
+       return RDFF_STATUS_OK;
+}
+
+RDFFStatus
+rdff_write_value(RDFF        file,
+                 uint32_t    key,
+                 const void* value,
+                 uint32_t    size,
+                 uint32_t    type)
+{
+       const uint32_t chunk_size = sizeof(key) + sizeof(type) + sizeof(size) + size;
+       WRITE(CHUNK_KVAL,  CHUNK_ID_LEN,       1, file->fd);
+       WRITE(&chunk_size, sizeof(chunk_size), 1, file->fd);
+       WRITE(&key,        sizeof(key),        1, file->fd);
+       WRITE(&type,       sizeof(type),       1, file->fd);
+       WRITE(&size,       sizeof(size),       1, file->fd);
+       WRITE(value,       size,               1, file->fd);
+       if ((size % 2)) {
+               WRITE("", 1, 1, file->fd);  /* write pad */
+       }
+       file->size += 8 + chunk_size;
+       return RDFF_STATUS_OK;
+}
+
+RDFFStatus
+rdff_read_chunk(RDFF        file,
+                RDFFChunk** buf)
+{
+       if (feof(file->fd))
+               return RDFF_STATUS_EOF;
+
+#define READ(ptr, size, nmemb, stream) \
+       if (fread(ptr, size, nmemb, stream) != nmemb) { \
+               return RDFF_STATUS_CORRUPT; \
+       }
+
+       const uint32_t alloc_size = (*buf)->size;
+
+       READ((*buf)->type,  sizeof((*buf)->type), 1, file->fd);
+       READ(&(*buf)->size, sizeof((*buf)->size), 1, file->fd);
+       if ((*buf)->size > alloc_size) {
+               *buf = realloc(*buf, sizeof(RDFFChunk) + (*buf)->size);
+       }
+       READ((*buf)->data, (*buf)->size, 1, file->fd);
+       if (((*buf)->size % 2)) {
+               char pad;
+               READ(&pad, 1, 1, file->fd);  /* skip pad */
+       }
+       return RDFF_STATUS_OK;
+}
+
+void
+rdff_close(RDFF file)
+{
+       if (file) {
+               if (file->write) {
+                       fseek(file->fd, 4, SEEK_SET);
+                       if (fwrite(&file->size, sizeof(file->size), 1, file->fd) != 1) {
+                               fprintf(stderr, "failed to write RIFF header size\n");
+                       }
+               }
+               fclose(file->fd);
+       }
+
+       free(file);
+}
+
+#ifdef STANDALONE
+// Test program
+int
+main(int argc, char** argv)
+{
+       if (argc != 2) {
+               fprintf(stderr, "Usage: %s FILENAME\n", argv[0]);
+               return 1;
+       }
+
+       const char* const filename = argv[1];
+
+       RDFF file = rdff_open(filename, true);
+       if (!file)
+               goto fail;
+
+       static const int N_URIS    = 16;
+       static const int N_RECORDS = 16;
+
+       char uri[64];
+       for (int i = 0; i < N_URIS; ++i) {
+               snprintf(uri, sizeof(uri), "http://example.org/uri%02d", i + 1);
+               rdff_write_uri(file, i + 1, uri, strlen(uri) + 1);
+       }
+       
+       char val[6];
+       for (int i = 0; i < N_RECORDS; ++i) {
+               snprintf(val, sizeof(val), "VAL%02d", i);
+               rdff_write_value(file,
+                                     rand() % N_URIS,
+                                     val,
+                                     sizeof(val),
+                                     0);
+       }
+
+       rdff_close(file);
+
+       file = rdff_open(filename, false);
+       if (!file)
+               goto fail;
+
+       RDFFChunk* chunk = malloc(sizeof(RDFFChunk));
+       chunk->size = 0;
+       for (int i = 0; i < N_URIS; ++i) {
+               if (rdff_read_chunk(file, &chunk)
+                   || strncmp(chunk->type, "URID", 4)) {
+                       fprintf(stderr, "error: expected URID chunk\n");
+                       goto fail;
+               }
+               RDFFURIChunk* body = (RDFFURIChunk*)chunk->data;
+               printf("URI: %s\n", body->uri);
+       }
+
+       for (int i = 0; i < N_RECORDS; ++i) {
+               if (rdff_read_chunk(file, &chunk)
+                   || strncmp(chunk->type, "KVAL", 4)) {
+                       fprintf(stderr, "error: expected KVAL chunk\n");
+                       goto fail;
+               }
+               RDFFValueChunk* body = (RDFFValueChunk*)chunk->data;
+               printf("KEY %d = %s\n", body->key, body->value);
+       }
+
+       free(chunk);
+       rdff_close(file);
+
+       return 0;
+
+fail:
+       rdff_close(file);
+       fprintf(stderr, "Test failed\n");
+       return 1;
+}
+#endif // STANDALONE
diff --git a/libs/ardour/rdff.h b/libs/ardour/rdff.h
new file mode 100644 (file)
index 0000000..6e9d197
--- /dev/null
@@ -0,0 +1,121 @@
+/*
+  RDFF - RDF in RIFF
+  Copyright 2011 David Robillard <http://drobilla.net>
+  This is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+  This software 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 GNU
+  General Public License for more details.
+  You should have received a copy of the GNU General Public License
+  along with this sofware; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  02110-1301 USA.
+*/
+
+#ifndef RDFF_RDFF_H
+#define RDFF_RDFF_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifdef __GNUC__
+#    define PACKED __attribute__((__packed__))
+#else
+#    define PACKED
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _RDFF* RDFF;
+
+typedef enum {
+       RDFF_STATUS_OK            = 0,
+       RDFF_STATUS_UNKNOWN_ERROR = 1,
+       RDFF_STATUS_EOF           = 2,
+       RDFF_STATUS_CORRUPT       = 3
+} RDFFStatus;
+
+/**
+   Generic RIFF chunk header.
+*/
+typedef struct {
+       char     type[4];
+       uint32_t size;
+       char     data[];
+} PACKED RDFFChunk;
+
+/**
+   Body of a URID chunk.
+*/
+typedef struct {
+       uint32_t id;
+       char     uri[];
+} PACKED RDFFURIChunk;
+
+/**
+   Body of a KVAL chunk.
+*/
+typedef struct {
+       uint32_t key;
+       uint32_t type;
+       uint32_t size;
+       char     value[];
+} PACKED RDFFValueChunk;
+               
+/**
+   Open/Create a new RDFF file.
+*/
+RDFF
+rdff_open(const char* path, bool write);
+
+/**
+   Write a URI ID to @a file.
+*/
+RDFFStatus
+rdff_write_uri(RDFF        file,
+               uint32_t    id,
+               const char* uri,
+               uint32_t    len);
+
+/**
+   Write a key/value record to @a file.
+*/
+RDFFStatus
+rdff_write_value(RDFF        file,
+                 uint32_t    key,
+                 const void* value,
+                 uint32_t    size,
+                 uint32_t    type);
+
+/**
+   Read a chunk from @a file.
+
+   @param buf MUST point to an RDFFChunk dynamically allocated with malloc.
+   The @a size field (i.e. (*buf)->size) MUST be set to the amount of available
+   memory in the chunk (not including the header). If this is insufficient,
+   *buf will be resized using realloc.
+*/
+RDFFStatus
+rdff_read_chunk(RDFF        file,
+                RDFFChunk** buf);
+
+/**
+   Close @a file.
+   After this call, @a file is invalid.
+*/
+void
+rdff_close(RDFF file);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* RDFF_RDFF_H */
index 0532619c81835c8e7aec65f9b9884dc6f8fe62d7..4b2fd546bb20b61b24eccbecbdcfa68c7550ade8 100644 (file)
@@ -327,7 +327,7 @@ def build(bld):
         #obj.add_objects = 'default/libs/surfaces/control_protocol/smpte_1.o'
         
         if bld.env['HAVE_SLV2']:
-               obj.source += [ 'lv2_plugin.cc', 'lv2_event_buffer.cc', 'uri_map.cc', 'lv2_pfile.c' ]
+               obj.source += [ 'lv2_plugin.cc', 'lv2_event_buffer.cc', 'uri_map.cc', 'rdff.c' ]
                obj.uselib += ' SLV2 ' + ' RASQAL '
                
         if bld.env['VST_SUPPORT']: