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

minor fix in OSC, clearer error message. Dont use sample ID and or entry ID for OSC (always playing current)

Browse Source 
git-svn-id: svn://code.dyne.org/veejay/trunk@461 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
Niels Elburg
2005-10-25 18:54:55 +00:00
parent b444530864
commit a832b0c3fe
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
veejay-current/veejay/vj-event.c
View File

@@ -1187,7 +1187,7 @@ void vj_event_fire_net_event(veejay_t *v, int net_id, char *str_arg, int *args,
}
memset( argument_list, 0, 16 );
memset( vims_arguments__,0, 16 );
memset( vims_arguments__,0, sizeof( vims_arguments__) );
if( vj_event_list[id].num_params <= 0 )
{
@@ -5569,8 +5569,8 @@ void vj_event_chain_entry_set_arg_val(void *ptr, const char format[], va_list ap
}
else
{
veejay_msg(VEEJAY_MSG_ERROR,"Tried to set invalid parameter value/type: %d %d for effect %d on entry %d",
args[2],args[3],effect,args[1]);
veejay_msg(VEEJAY_MSG_ERROR, "Parameter %d with value %d invalid for Chain Entry %d of Sample %d",
args[2], args[3], args[1], args[0] );
}
} else { veejay_msg(VEEJAY_MSG_ERROR, "Sample %d does not exist", args[0]); }
}
@@ -5594,8 +5594,8 @@ void vj_event_chain_entry_set_arg_val(void *ptr, const char format[], va_list ap
}
}
else {
veejay_msg(VEEJAY_MSG_ERROR, "Tried to set invalid parameter value/type : %d %d",
args[2],args[3]);
veejay_msg(VEEJAY_MSG_ERROR, "Parameter %d with value %d for Chain Entry %d invalid for Stream %d",
args[2],args[3], args[1],args[0]);
}
}
else {

4
veejay-current/veejay/vj-osc.c
View File

@@ -263,22 +263,18 @@ static int vj_osc_parse_int_arguments(int arglen, const void *vargs, int *argume
// figure out padding length of typed tag
unsigned int pad = 4 + ( num_args + 1 ) / 4 * 4;
// parse the arguments
veejay_msg(VEEJAY_MSG_DEBUG, "Received typed tag with %d arguments", num_args);
for ( i = 0; i < num_args ; i ++ )
{
arguments[i] = toInt( args + pad + offset );
offset += 4;
veejay_msg(VEEJAY_MSG_DEBUG, "Arg %d = %d", i, arguments[i] );
}
}
else
{
veejay_msg(VEEJAY_MSG_DEBUG, "Received raw packet with %d arguments", num_args);
for(i = 0; i < num_args; i ++)
{
arguments[i] = toInt( args + offset);
offset += 4;
veejay_msg(VEEJAY_MSG_DEBUG, "Arg %d = %d", i, arguments[i]);
}
}