From 7ffa2d6378feb7436db3f3588ab9fbf17180c7d3 Mon Sep 17 00:00:00 2001 From: niels Date: Sun, 15 Nov 2015 13:28:28 +0100 Subject: [PATCH] add symbol for subrender --- veejay-current/veejay-client/src/common.h | 1 + veejay-current/veejay-client/src/utils.c | 5 +++-- veejay-current/veejay-server/libsample/sampleadm.c | 3 ++- veejay-current/veejay-server/libstream/vj-tag.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/veejay-current/veejay-client/src/common.h b/veejay-current/veejay-client/src/common.h index 43127fa0..7a889d8a 100644 --- a/veejay-current/veejay-client/src/common.h +++ b/veejay-current/veejay-client/src/common.h @@ -46,6 +46,7 @@ #define CHAIN_FADE 23 #define FRAME_DUP 24 #define MACRO 25 +#define SUBRENDER 26 #define CURRENT_ENTRY 15 #define MODE_PLAIN 2 #define MODE_SAMPLE 0 diff --git a/veejay-current/veejay-client/src/utils.c b/veejay-current/veejay-client/src/utils.c index 35817645..a719581a 100644 --- a/veejay-current/veejay-client/src/utils.c +++ b/veejay-current/veejay-client/src/utils.c @@ -28,7 +28,7 @@ int status_to_arr( char *status, int *array ) { - int n = sscanf(status, "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d", + int n = sscanf(status, "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d", array + 0, array + 1, array + 2, @@ -54,7 +54,8 @@ int status_to_arr( char *status, int *array ) array + 22, array + 23, array + 24, - array + 25 ); + array + 25, + array + 26 ); return n; } diff --git a/veejay-current/veejay-server/libsample/sampleadm.c b/veejay-current/veejay-server/libsample/sampleadm.c index ba4e01c7..a8014854 100644 --- a/veejay-current/veejay-server/libsample/sampleadm.c +++ b/veejay-current/veejay-server/libsample/sampleadm.c @@ -2539,7 +2539,8 @@ int sample_chain_sprint_status( int s1,int cache,int sa,int ca, int pfps, int fr ptr = vj_sprintf( ptr, ca ); *ptr++ = ' '; ptr = vj_sprintf( ptr, (int) sample->fader_val ); *ptr++ = ' '; ptr = vj_sprintf( ptr, sample->dup ); *ptr++ = ' '; - ptr = vj_sprintf( ptr, macro ); + ptr = vj_sprintf( ptr, macro ); *ptr++ = ' '; + ptr = vj_sprintf( ptr, sample->subrender ); return 0; } diff --git a/veejay-current/veejay-server/libstream/vj-tag.c b/veejay-current/veejay-server/libstream/vj-tag.c index 075d58c0..bd26902d 100644 --- a/veejay-current/veejay-server/libstream/vj-tag.c +++ b/veejay-current/veejay-server/libstream/vj-tag.c @@ -3591,7 +3591,8 @@ int vj_tag_sprint_status( int tag_id,int cache,int sa, int ca, int pfps,int fram ptr = vj_sprintf( ptr, ca ); *ptr++ = ' '; ptr = vj_sprintf( ptr, (int) tag->fader_val ); *ptr++ = ' '; *ptr++ = '0'; *ptr++ = ' '; - ptr = vj_sprintf( ptr, macro ); + ptr = vj_sprintf( ptr, macro ); *ptr++ = ' '; + ptr = vj_sprintf( ptr, tag->subrender); return 0; }