commit 2766c3fe7b9061ffa601759ed292090db3766e82
parent 8538c23e52a28954bbdf520cba4cfe6c150b65ed
Author: Alexandre Bique <bique.alexandre@gmail.com>
Date: Mon, 29 Dec 2014 12:56:37 +0100
Merge tempo changed and jump
Diffstat:
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/include/clap/clap.h b/include/clap/clap.h
@@ -124,8 +124,7 @@ enum clap_event_type
CLAP_EVENT_PAUSE = 13, // no attribute
CLAP_EVENT_STOP = 14, // no attribute
- CLAP_EVENT_TEMPO_CHANGED = 15, // attribute tempo
- CLAP_EVENT_JUMP = 16, // attribute jump
+ CLAP_EVENT_JUMP = 15, // attribute jump
};
struct clap_event_note
@@ -183,15 +182,12 @@ struct clap_event_latency
uint32_t latency;
};
-struct clap_event_tempo
-{
- uint32_t tempo; // tempo in samples
- uint32_t phase; // the phase in samples
-};
-
struct clap_event_jump
{
- uint32_t song_time; // song time in samples
+ uint32_t song_time; // song time in samples
+ uint32_t tempo; // tempo in samples
+ uint32_t tsig_num; // time signature numerator
+ uint32_t tsig_denom; // time signature denominator
};
struct clap_event