commit a86570c0c021fd7d898dfe7c3e26240feec5b6e7
parent d0020ba148c60deed6fd368508cd7aa32f2d14d2
Author: Alexandre Bique <bique.alexandre@gmail.com>
Date: Tue, 18 Nov 2014 13:02:23 +0100
Update thyns to match the current headers
Diffstat:
4 files changed, 19 insertions(+), 194 deletions(-)
diff --git a/examples/thyns/plugin.c b/examples/thyns/plugin.c
@@ -1,15 +1,16 @@
#include <stdlib.h>
#include <stdio.h>
#include <clap/clap.h>
-#include <clap/clap-plugin-helper.h>
+#include <clap/clap-ports.h>
#include "thyns.h"
struct thyns_plugin
{
- struct thyns thyns;
- struct clap_plugin plugin;
- struct clap_host *host;
+ struct thyns thyns;
+ struct clap_plugin plugin;
+ struct clap_plugin_ports ports;
+ struct clap_host *host;
};
void
@@ -92,7 +93,6 @@ thyns_plugin_get_port_info(struct clap_plugin *plugin,
snprintf(port->name, sizeof (port->name), "out");
port->type = CLAP_PORT_MONO;
port->role = CLAP_PORT_INOUT;
- port->stream_id = 0;
port->is_repeatable = false;
return true;;
}
@@ -117,11 +117,11 @@ thyns_plugin_set_ports_config(struct clap_plugin *plugin,
}
}
-void
+enum clap_process_status
thyns_plugin_process(struct clap_plugin *plugin,
struct clap_process *process)
{
- thyns_process(plugin->plugin_data, process);
+ return thyns_process(plugin->plugin_data, process);
}
struct thyns_plugin *
@@ -139,15 +139,17 @@ thyns_plugin_create(struct clap_host *host,
p->host = host;
// initialize plugin
- clap_plugin_default(&p->plugin);
+ p->plugin.clap_version = CLAP_VERSION;
p->plugin.destroy = thyns_plugin_destroy;
p->plugin.plugin_data = p;
p->plugin.get_attribute = thyns_plugin_get_attribute;
- p->plugin.get_ports_configs_count = thyns_plugin_get_ports_configs_count;
- p->plugin.get_ports_config = thyns_plugin_get_ports_config;
- p->plugin.get_port_info = thyns_plugin_get_port_info;
- p->plugin.set_ports_config = thyns_plugin_set_ports_config;
p->plugin.process = thyns_plugin_process;
+
+ // initialize ports extension
+ p->ports.get_ports_configs_count = thyns_plugin_get_ports_configs_count;
+ p->ports.get_ports_config = thyns_plugin_get_ports_config;
+ p->ports.get_port_info = thyns_plugin_get_port_info;
+ p->ports.set_ports_config = thyns_plugin_set_ports_config;
return p;
}
diff --git a/examples/thyns/thyns.h b/examples/thyns/thyns.h
@@ -116,8 +116,8 @@ thyns_handle_event(struct thyns *thyns,
}
}
-static inline void thyns_process(struct thyns *thyns,
- struct clap_process *process)
+static inline enum clap_process_status
+thyns_process(struct thyns *thyns, struct clap_process *process)
{
struct clap_event *ev = process->events;
@@ -137,7 +137,9 @@ static inline void thyns_process(struct thyns *thyns,
process->output[0][i] = thyns_step(thyns, process);
}
- process->need_processing = thyns->singing;
+ if (thyns->singing)
+ return CLAP_PROCESS_CONTINUE;
+ return CLAP_PROCESS_STOP;
}
#endif /* !THYNS_H */
diff --git a/include/clap/clap-plugin-helper.c b/include/clap/clap-plugin-helper.c
@@ -1,167 +0,0 @@
-#include <assert.h>
-
-void
-clap_default_plugin_destroy(struct clap_plugin *plugin)
-{
- assert(false && "this function must be implemented");
-}
-
-uint32_t
-clap_default_plugin_get_attribute(struct clap_plugin *plugin,
- const char *attr,
- char *buffer,
- uint32_t size)
-{
- *buffer = '\0';
- return 0;
-}
-
-uint32_t
-clap_default_plugin_get_ports_configs_count(struct clap_plugin *plugin)
-{
- return 0;
-}
-
-bool
-clap_default_plugin_get_ports_config(struct clap_plugin *plugin,
- uint32_t config_index,
- struct clap_ports_config *config)
-{
- return false;
-}
-
-bool
-clap_default_plugin_get_port_info(struct clap_plugin *plugin,
- uint32_t config_index,
- uint32_t port_index,
- struct clap_port_info *port)
-{
- return false;
-}
-
-bool
-clap_default_plugin_set_ports_config(struct clap_plugin *plugin,
- uint32_t config_index)
-{
- return false;
-}
-
-bool
-clap_default_plugin_set_port_repeat(struct clap_plugin *plugin,
- uint32_t port_index,
- uint32_t count)
-{
- return false;
-}
-
-uint32_t
-clap_default_plugin_get_params_count(struct clap_plugin *plugin)
-{
- return 0;
-}
-
-bool
-clap_default_plugin_get_param(struct clap_plugin *plugin,
- uint32_t index,
- struct clap_param *param)
-{
- return false;
-}
-
-uint32_t
-clap_default_plugin_get_presets_count(struct clap_plugin *plugin)
-{
- return 0;
-}
-
-bool
-clap_default_plugin_get_preset(struct clap_plugin *plugin,
- uint32_t index,
- struct clap_preset *preset)
-{
- return false;
-}
-
-bool
-clap_default_plugin_activate(struct clap_plugin *plugin)
-{
- return true;
-}
-
-void
-clap_default_plugin_deactivate(struct clap_plugin *plugin)
-{
-}
-
-void
-clap_default_plugin_process(struct clap_plugin *plugin,
- struct clap_process *process)
-{
-}
-
-bool
-clap_default_plugin_open_gui(struct clap_plugin *plugin)
-{
- return false;
-}
-
-void
-clap_default_plugin_close_gui(struct clap_plugin *plugin)
-{
-}
-
-bool
-clap_default_plugin_save(struct clap_plugin *plugin,
- void **buffer,
- uint32_t *size)
-{
- return false;
-}
-
-bool
-clap_default_plugin_restore(struct clap_plugin *plugin,
- const void *buffer,
- uint32_t size)
-{
- return false;
-}
-
-bool
-clap_default_plugin_set_locale(struct clap_plugin *plugin, const char *locale)
-{
- return false;
-}
-
-void *
-clap_default_plugin_extension(struct clap_plugin *plugin, const char *id)
-{
- return NULL;
-}
-
-static inline void
-clap_plugin_default(struct clap_plugin *plugin)
-{
- // initialize plugin
- plugin->clap_version = CLAP_VERSION;
- plugin->destroy = clap_default_plugin_destroy;
- plugin->plugin_data = NULL;
- plugin->get_attribute = clap_default_plugin_get_attribute;
- plugin->get_ports_configs_count = clap_default_plugin_get_ports_configs_count;
- plugin->get_ports_config = clap_default_plugin_get_ports_config;
- plugin->get_port_info = clap_default_plugin_get_port_info;
- plugin->set_ports_config = clap_default_plugin_set_ports_config;
- plugin->set_port_repeat = clap_default_plugin_set_port_repeat;
- plugin->get_params_count = clap_default_plugin_get_params_count;
- plugin->get_param = clap_default_plugin_get_param;
- plugin->get_presets_count = clap_default_plugin_get_presets_count;
- plugin->get_preset = clap_default_plugin_get_preset;
- plugin->activate = clap_default_plugin_activate;
- plugin->deactivate = clap_default_plugin_deactivate;
- plugin->process = clap_default_plugin_process;
- plugin->open_gui = clap_default_plugin_open_gui;
- plugin->close_gui = clap_default_plugin_close_gui;
- plugin->save = clap_default_plugin_save;
- plugin->restore = clap_default_plugin_restore;
- plugin->set_locale = clap_default_plugin_set_locale;
- plugin->extension = clap_default_plugin_extension;
-}
diff --git a/include/clap/clap-plugin-helper.h b/include/clap/clap-plugin-helper.h
@@ -1,12 +0,0 @@
-#ifndef CLAP_PLUGIN_HELPER_H
-# define CLAP_PLUGIN_HELPER_H
-
-# include "clap.h"
-
-/* populate plugin with the default methods */
-static inline void
-clap_plugin_default(struct clap_plugin *plugin);
-
-# include "clap-plugin-helper.c"
-
-#endif /* !CLAP_PLUGIN_HELPER_H */
