eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-22 15:50:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix fx chain loading

Browse Source
This commit is contained in:
c0ntrol
2017-01-02 16:25:10 +01:00
parent 79779f73ba
commit fb02d37748
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
veejay-current/veejay-client/src/vj-api.c
View File

@@ -4091,13 +4091,17 @@ static void load_effectchain_info()
while( offset < fxlen ) while( offset < fxlen )
{ {
char line[VIMS_CHAIN_LIST_ENTRY_LENGHT]; char line[VIMS_CHAIN_LIST_ENTRY_LENGTH+1];
veejay_memset(arr,0,sizeof(arr)); veejay_memset(arr,0,sizeof(arr));
veejay_memset(line,0,sizeof(line)); veejay_memset(line,0,sizeof(line));
strncpy( line, fxtext + offset, VIMS_CHAIN_LIST_ENTRY_LENGHT ); strncpy( line, fxtext + offset, VIMS_CHAIN_LIST_ENTRY_LENGTH );
sscanf( line, VIMS_CHAIN_LIST_ENTRY_FORMAT, int n_tokens = sscanf( line, VIMS_CHAIN_LIST_ENTRY_FORMAT,
&arr[0],&arr[1],&arr[2],&arr[3],&arr[4],&arr[5],&arr[6], &arr[7]); // FIXME How to use of VIMS_CHAIN_LIST_ENTRY_VALUES ? &arr[0],&arr[1],&arr[2],&arr[3],&arr[4],&arr[5],&arr[6], &arr[7]);
if( n_tokens != VIMS_CHAIN_LIST_ENTRY_VALUES ) {
veejay_msg(0,"Error parsing FX chain response");
break;
}
char *name = _effect_get_description( arr[1] ); char *name = _effect_get_description( arr[1] );
snprintf(toggle,sizeof(toggle),"%s",arr[3] == 1 ? "on" : "off" ); snprintf(toggle,sizeof(toggle),"%s",arr[3] == 1 ? "on" : "off" );
@@ -4139,7 +4143,7 @@ static void load_effectchain_info()
g_object_unref( toggle ); g_object_unref( toggle );
g_object_unref( kf_togglepf ); g_object_unref( kf_togglepf );
} }
offset += VIMS_CHAIN_LIST_ENTRY_LENGHT; offset += VIMS_CHAIN_LIST_ENTRY_LENGTH;
} }
// finally clean list end // finally clean list end

2
veejay-current/veejay-server/veejay/vims.h
View File

@@ -281,7 +281,7 @@ enum {
}; };
#define VIMS_CHAIN_LIST_ENTRY_FORMAT "%02d%03d%1d%1d%1d%1d%03d%1d" #define VIMS_CHAIN_LIST_ENTRY_FORMAT "%02d%03d%1d%1d%1d%1d%03d%1d"
#define VIMS_CHAIN_LIST_ENTRY_LENGHT sizeof(VIMS_CHAIN_LIST_ENTRY_FORMAT) // Size of sub message anwser (real size if SAMPLE_MAX_EFFECTS * VIMS_CHAIN_LIST_ENTRY_LENGHT) #define VIMS_CHAIN_LIST_ENTRY_LENGTH (2+3+1+1+1+1+3+1) // String length of entry format
#define VIMS_CHAIN_LIST_ENTRY_VALUES 8 // Number of values of the message #define VIMS_CHAIN_LIST_ENTRY_VALUES 8 // Number of values of the message
enum { enum {

6
veejay-current/veejay-server/veejay/vj-event.c
View File

@@ -8902,7 +8902,7 @@ void vj_event_send_chain_entry_parameters ( void *ptr, const char format[], va_
void vj_event_send_chain_list ( void *ptr, const char format[], va_list ap ) void vj_event_send_chain_list ( void *ptr, const char format[], va_list ap )
{ {
int i; int i;
char line[VIMS_CHAIN_LIST_ENTRY_LENGHT]; char line[VIMS_CHAIN_LIST_ENTRY_LENGTH+1]; // null terminated buffer
int args[1]; int args[1];
char *str = NULL; char *str = NULL;
veejay_t *v = (veejay_t*)ptr; veejay_t *v = (veejay_t*)ptr;
@@ -8914,7 +8914,7 @@ void vj_event_send_chain_list ( void *ptr, const char format[], va_list ap )
if(SAMPLE_PLAYING(v)) if(SAMPLE_PLAYING(v))
{ {
SAMPLE_DEFAULTS(args[0]); SAMPLE_DEFAULTS(args[0]);
char *print_buf = get_print_buf(VIMS_CHAIN_LIST_ENTRY_LENGHT * SAMPLE_MAX_EFFECTS); char *print_buf = get_print_buf( 1 + (VIMS_CHAIN_LIST_ENTRY_LENGTH * SAMPLE_MAX_EFFECTS ));
for(i=0; i < SAMPLE_MAX_EFFECTS; i++) for(i=0; i < SAMPLE_MAX_EFFECTS; i++)
{ {
int effect_id = sample_get_effect_any(args[0], i); int effect_id = sample_get_effect_any(args[0], i);
@@ -8950,7 +8950,7 @@ void vj_event_send_chain_list ( void *ptr, const char format[], va_list ap )
else if(STREAM_PLAYING(v)) else if(STREAM_PLAYING(v))
{ {
STREAM_DEFAULTS(args[0]); STREAM_DEFAULTS(args[0]);
char *print_buf = get_print_buf(VIMS_CHAIN_LIST_ENTRY_LENGHT * SAMPLE_MAX_EFFECTS); char *print_buf = get_print_buf(1 + (VIMS_CHAIN_LIST_ENTRY_LENGTH * SAMPLE_MAX_EFFECTS));
for(i=0; i < SAMPLE_MAX_EFFECTS; i++) for(i=0; i < SAMPLE_MAX_EFFECTS; i++)
{ {