commit c651222238c0b1fa45169405694720e6907a7f89
parent 1a9d7a6738dcf72930da2c3c4735811bcac65546
Author: Alexandre Bique <bique.alexandre@gmail.com>
Date: Thu, 15 Jan 2015 00:11:21 +0100
Fix warnings
Diffstat:
6 files changed, 59 insertions(+), 33 deletions(-)
diff --git a/include/clap/ext/params.c b/include/clap/ext/params.c
@@ -3,7 +3,8 @@ clap_plugin_params_save(struct clap_plugin *plugin,
uint8_t *buffer,
uint32_t *size)
{
- struct clap_plugin_params *params = plugin->extension(plugin, CLAP_EXT_PARAMS);
+ struct clap_plugin_params *params = (struct clap_plugin_params *)
+ plugin->extension(plugin, CLAP_EXT_PARAMS);
if (!params) {
*size = 0;
return true;
@@ -62,7 +63,8 @@ clap_plugin_params_restore(struct clap_plugin *plugin,
uint32_t size,
uint64_t steady_time)
{
- struct clap_plugin_params *params = plugin->extension(plugin, CLAP_EXT_PARAMS);
+ struct clap_plugin_params *params = (struct clap_plugin_params *)
+ plugin->extension(plugin, CLAP_EXT_PARAMS);
if (!params)
return;
diff --git a/include/clap/ext/params.h b/include/clap/ext/params.h
@@ -4,6 +4,10 @@
# include "../clap.h"
# include "../serialize/serialize.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
# define CLAP_EXT_PARAMS "clap/params"
enum clap_param_type
@@ -36,9 +40,12 @@ struct clap_param
bool is_per_note;
bool is_used; // is this parameter used by the patch?
bool is_periodic;
+ bool is_locked; // if true, the parameter can't be changed by
+ // the host
union clap_param_value value;
union clap_param_value min;
union clap_param_value max;
+ union clap_param_value deflt; // default value
enum clap_param_scale scale;
};
@@ -77,4 +84,8 @@ clap_plugin_params_restore(struct clap_plugin *plugin,
# include "params.c"
+#ifdef __cplusplus
+}
+#endif
+
#endif /* !CLAP_EXT_PARAMS_H */
diff --git a/include/clap/serialize/serialize.c b/include/clap/serialize/serialize.c
@@ -103,7 +103,7 @@ clap_deserialize(struct clap_deserializer *d)
return false;
}
- d->type = *d->in;
+ d->type = (enum clap_serialize_type)*d->in;
switch (d->type) {
case CLAP_SERIALIZE_DICT:
++d->in;
diff --git a/include/clap/serialize/serialize.h b/include/clap/serialize/serialize.h
@@ -1,6 +1,10 @@
#ifndef CLAP_SERIALIZE_H
# define CLAP_SERIALIZE_H
+# ifdef __cplusplus
+extern "C" {
+# endif
+
# include <stdint.h>
enum clap_serialize_type
@@ -79,4 +83,8 @@ clap_deserialize(struct clap_deserializer *d);
# include "serialize.c"
+# ifdef __cplusplus
+}
+# endif
+
#endif /* !CLAP_SERIALIZE_H */
diff --git a/spec.html b/spec.html
@@ -1025,11 +1025,6 @@ plugin's parameters and restore them.</p>
<span class="p">{</span>
<span class="p">}</span>
-<span class="k">static</span> <span class="kt">uint64_t</span> <span class="nf">host_steady_time</span><span class="p">(</span><span class="k">struct</span> <span class="n">clap_host</span> <span class="o">*</span><span class="n">host</span><span class="p">)</span>
-<span class="p">{</span>
- <span class="k">return</span> <span class="mi">0</span><span class="p">;</span>
-<span class="p">}</span>
-
<span class="k">static</span> <span class="kt">void</span> <span class="o">*</span><span class="nf">host_extension</span><span class="p">(</span><span class="k">struct</span> <span class="n">clap_host</span> <span class="o">*</span><span class="n">host</span><span class="p">,</span> <span class="k">const</span> <span class="kt">char</span> <span class="o">*</span><span class="n">extension_id</span><span class="p">)</span>
<span class="p">{</span>
<span class="k">return</span> <span class="nb">NULL</span><span class="p">;</span>
@@ -1037,9 +1032,11 @@ plugin's parameters and restore them.</p>
<span class="k">static</span> <span class="kt">void</span> <span class="nf">initialize_host</span><span class="p">(</span><span class="k">struct</span> <span class="n">clap_host</span> <span class="o">*</span><span class="n">host</span><span class="p">)</span>
<span class="p">{</span>
+ <span class="k">static</span> <span class="kt">uint64_t</span> <span class="n">steady_time</span> <span class="o">=</span> <span class="mi">0</span><span class="p">;</span>
+
<span class="n">host</span><span class="o">-></span><span class="n">clap_version</span> <span class="o">=</span> <span class="n">CLAP_VERSION</span><span class="p">;</span>
<span class="n">host</span><span class="o">-></span><span class="n">events</span> <span class="o">=</span> <span class="n">host_events</span><span class="p">;</span>
- <span class="n">host</span><span class="o">-></span><span class="n">steady_time</span> <span class="o">=</span> <span class="n">host_steady_time</span><span class="p">;</span>
+ <span class="n">host</span><span class="o">-></span><span class="n">steady_time</span> <span class="o">=</span> <span class="o">&</span><span class="n">steady_time</span><span class="p">;</span>
<span class="n">host</span><span class="o">-></span><span class="n">extension</span> <span class="o">=</span> <span class="n">host_extension</span><span class="p">;</span>
<span class="p">}</span>
@@ -1101,23 +1098,23 @@ plugin's parameters and restore them.</p>
<span class="k">switch</span> <span class="p">(</span><span class="n">param</span><span class="p">.</span><span class="n">type</span><span class="p">)</span> <span class="p">{</span>
<span class="k">case</span> <span class="nl">CLAP_PARAM_FLOAT</span><span class="p">:</span>
- <span class="n">fprintf</span><span class="p">(</span><span class="n">stdout</span><span class="p">,</span> <span class="s">", type: float, value: %f, min: %f, max: %f"</span><span class="p">,</span>
- <span class="n">param</span><span class="p">.</span><span class="n">value</span><span class="p">.</span><span class="n">f</span><span class="p">,</span> <span class="n">param</span><span class="p">.</span><span class="n">min</span><span class="p">.</span><span class="n">f</span><span class="p">,</span> <span class="n">param</span><span class="p">.</span><span class="n">max</span><span class="p">.</span><span class="n">f</span><span class="p">);</span>
+ <span class="n">fprintf</span><span class="p">(</span><span class="n">stdout</span><span class="p">,</span> <span class="s">", type: float, value: %f, min: %f, max: %f, default: %f"</span><span class="p">,</span>
+ <span class="n">param</span><span class="p">.</span><span class="n">value</span><span class="p">.</span><span class="n">f</span><span class="p">,</span> <span class="n">param</span><span class="p">.</span><span class="n">min</span><span class="p">.</span><span class="n">f</span><span class="p">,</span> <span class="n">param</span><span class="p">.</span><span class="n">max</span><span class="p">.</span><span class="n">f</span><span class="p">,</span> <span class="n">param</span><span class="p">.</span><span class="n">deflt</span><span class="p">.</span><span class="n">f</span><span class="p">);</span>
<span class="k">break</span><span class="p">;</span>
<span class="k">case</span> <span class="nl">CLAP_PARAM_INT</span><span class="p">:</span>
- <span class="n">fprintf</span><span class="p">(</span><span class="n">stdout</span><span class="p">,</span> <span class="s">", type: int, value: %d, min: %d, max: %d"</span><span class="p">,</span>
- <span class="n">param</span><span class="p">.</span><span class="n">value</span><span class="p">.</span><span class="n">i</span><span class="p">,</span> <span class="n">param</span><span class="p">.</span><span class="n">min</span><span class="p">.</span><span class="n">i</span><span class="p">,</span> <span class="n">param</span><span class="p">.</span><span class="n">max</span><span class="p">.</span><span class="n">i</span><span class="p">);</span>
+ <span class="n">fprintf</span><span class="p">(</span><span class="n">stdout</span><span class="p">,</span> <span class="s">", type: int, value: %d, min: %d, max: %d, default: %d"</span><span class="p">,</span>
+ <span class="n">param</span><span class="p">.</span><span class="n">value</span><span class="p">.</span><span class="n">i</span><span class="p">,</span> <span class="n">param</span><span class="p">.</span><span class="n">min</span><span class="p">.</span><span class="n">i</span><span class="p">,</span> <span class="n">param</span><span class="p">.</span><span class="n">max</span><span class="p">.</span><span class="n">i</span><span class="p">,</span> <span class="n">param</span><span class="p">.</span><span class="n">deflt</span><span class="p">.</span><span class="n">i</span><span class="p">);</span>
<span class="k">break</span><span class="p">;</span>
<span class="k">case</span> <span class="nl">CLAP_PARAM_ENUM</span><span class="p">:</span>
- <span class="n">fprintf</span><span class="p">(</span><span class="n">stdout</span><span class="p">,</span> <span class="s">", type: enum, value: %d, min: %d, max: %d"</span><span class="p">,</span>
- <span class="n">param</span><span class="p">.</span><span class="n">value</span><span class="p">.</span><span class="n">i</span><span class="p">,</span> <span class="n">param</span><span class="p">.</span><span class="n">min</span><span class="p">.</span><span class="n">i</span><span class="p">,</span> <span class="n">param</span><span class="p">.</span><span class="n">max</span><span class="p">.</span><span class="n">i</span><span class="p">);</span>
+ <span class="n">fprintf</span><span class="p">(</span><span class="n">stdout</span><span class="p">,</span> <span class="s">", type: enum, value: %d, min: %d, max: %d, default: %d"</span><span class="p">,</span>
+ <span class="n">param</span><span class="p">.</span><span class="n">value</span><span class="p">.</span><span class="n">i</span><span class="p">,</span> <span class="n">param</span><span class="p">.</span><span class="n">min</span><span class="p">.</span><span class="n">i</span><span class="p">,</span> <span class="n">param</span><span class="p">.</span><span class="n">max</span><span class="p">.</span><span class="n">i</span><span class="p">,</span> <span class="n">param</span><span class="p">.</span><span class="n">deflt</span><span class="p">.</span><span class="n">i</span><span class="p">);</span>
<span class="k">break</span><span class="p">;</span>
<span class="k">case</span> <span class="nl">CLAP_PARAM_BOOL</span><span class="p">:</span>
- <span class="n">fprintf</span><span class="p">(</span><span class="n">stdout</span><span class="p">,</span> <span class="s">", type: bool, value: %d, min: %d, max: %d"</span><span class="p">,</span>
- <span class="n">param</span><span class="p">.</span><span class="n">value</span><span class="p">.</span><span class="n">i</span><span class="p">,</span> <span class="n">param</span><span class="p">.</span><span class="n">min</span><span class="p">.</span><span class="n">i</span><span class="p">,</span> <span class="n">param</span><span class="p">.</span><span class="n">max</span><span class="p">.</span><span class="n">i</span><span class="p">);</span>
+ <span class="n">fprintf</span><span class="p">(</span><span class="n">stdout</span><span class="p">,</span> <span class="s">", type: bool, value: %d, min: %d, max: %d, default: %d"</span><span class="p">,</span>
+ <span class="n">param</span><span class="p">.</span><span class="n">value</span><span class="p">.</span><span class="n">i</span><span class="p">,</span> <span class="n">param</span><span class="p">.</span><span class="n">min</span><span class="p">.</span><span class="n">i</span><span class="p">,</span> <span class="n">param</span><span class="p">.</span><span class="n">max</span><span class="p">.</span><span class="n">i</span><span class="p">,</span> <span class="n">param</span><span class="p">.</span><span class="n">deflt</span><span class="p">.</span><span class="n">i</span><span class="p">);</span>
<span class="k">break</span><span class="p">;</span>
<span class="k">case</span> <span class="nl">CLAP_PARAM_GROUP</span><span class="p">:</span>
@@ -1640,6 +1637,10 @@ plugin's parameters and restore them.</p>
<span class="cp"># include "../clap.h"
# include "../serialize/serialize.h"
</span>
+<span class="cp">#ifdef __cplusplus
+</span><span class="k">extern</span> <span class="s">"C"</span> <span class="p">{</span>
+<span class="cp">#endif
+</span>
<span class="cp"># define CLAP_EXT_PARAMS "clap/params"
</span>
<span class="k">enum</span> <span class="n">clap_param_type</span>
@@ -1672,10 +1673,13 @@ plugin's parameters and restore them.</p>
<span class="kt">bool</span> <span class="n">is_per_note</span><span class="p">;</span>
<span class="kt">bool</span> <span class="n">is_used</span><span class="p">;</span> <span class="c1">// is this parameter used by the patch?
</span> <span class="kt">bool</span> <span class="n">is_periodic</span><span class="p">;</span>
- <span class="k">union</span> <span class="n">clap_param_value</span> <span class="n">value</span><span class="p">;</span>
+ <span class="kt">bool</span> <span class="n">is_locked</span><span class="p">;</span> <span class="c1">// if true, the parameter can't be changed by
+</span> <span class="c1">// the host
+</span> <span class="k">union</span> <span class="n">clap_param_value</span> <span class="n">value</span><span class="p">;</span>
<span class="k">union</span> <span class="n">clap_param_value</span> <span class="n">min</span><span class="p">;</span>
<span class="k">union</span> <span class="n">clap_param_value</span> <span class="n">max</span><span class="p">;</span>
- <span class="k">enum</span> <span class="n">clap_param_scale</span> <span class="n">scale</span><span class="p">;</span>
+ <span class="k">union</span> <span class="n">clap_param_value</span> <span class="n">deflt</span><span class="p">;</span> <span class="c1">// default value
+</span> <span class="k">enum</span> <span class="n">clap_param_scale</span> <span class="n">scale</span><span class="p">;</span>
<span class="p">};</span>
<span class="k">struct</span> <span class="n">clap_plugin_params</span>
@@ -1713,6 +1717,10 @@ plugin's parameters and restore them.</p>
<span class="cp"># include "params.c"
</span>
+<span class="cp">#ifdef __cplusplus
+</span><span class="p">}</span>
+<span class="cp">#endif
+</span>
<span class="cp">#endif </span><span class="cm">/* !CLAP_EXT_PARAMS_H */</span>
</pre>
</div>
diff --git a/tools/clap-info/clap-info.c b/tools/clap-info/clap-info.c
@@ -10,11 +10,6 @@ static void host_events(struct clap_host *host,
{
}
-static uint64_t host_steady_time(struct clap_host *host)
-{
- return 0;
-}
-
static void *host_extension(struct clap_host *host, const char *extension_id)
{
return NULL;
@@ -22,9 +17,11 @@ static void *host_extension(struct clap_host *host, const char *extension_id)
static void initialize_host(struct clap_host *host)
{
+ static uint64_t steady_time = 0;
+
host->clap_version = CLAP_VERSION;
host->events = host_events;
- host->steady_time = host_steady_time;
+ host->steady_time = &steady_time;
host->extension = host_extension;
}
@@ -86,23 +83,23 @@ static void print_params(struct clap_plugin *plugin)
switch (param.type) {
case CLAP_PARAM_FLOAT:
- fprintf(stdout, ", type: float, value: %f, min: %f, max: %f",
- param.value.f, param.min.f, param.max.f);
+ fprintf(stdout, ", type: float, value: %f, min: %f, max: %f, default: %f",
+ param.value.f, param.min.f, param.max.f, param.deflt.f);
break;
case CLAP_PARAM_INT:
- fprintf(stdout, ", type: int, value: %d, min: %d, max: %d",
- param.value.i, param.min.i, param.max.i);
+ fprintf(stdout, ", type: int, value: %d, min: %d, max: %d, default: %d",
+ param.value.i, param.min.i, param.max.i, param.deflt.i);
break;
case CLAP_PARAM_ENUM:
- fprintf(stdout, ", type: enum, value: %d, min: %d, max: %d",
- param.value.i, param.min.i, param.max.i);
+ fprintf(stdout, ", type: enum, value: %d, min: %d, max: %d, default: %d",
+ param.value.i, param.min.i, param.max.i, param.deflt.i);
break;
case CLAP_PARAM_BOOL:
- fprintf(stdout, ", type: bool, value: %d, min: %d, max: %d",
- param.value.i, param.min.i, param.max.i);
+ fprintf(stdout, ", type: bool, value: %d, min: %d, max: %d, default: %d",
+ param.value.i, param.min.i, param.max.i, param.deflt.i);
break;
case CLAP_PARAM_GROUP:
