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

resolve warnings

Browse Source
This commit is contained in:
niels
2025-11-02 15:11:32 +01:00
parent bb366e6537
commit d940ad59fc
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
veejay-current/veejay-server/libstream/vj-tag.c
View File

@@ -189,15 +189,15 @@ static hash_val_t int_tag_hash(const void *key)
static int int_tag_compare(const void *key1, const void *key2) static int int_tag_compare(const void *key1, const void *key2)
{ {
#ifdef ARCH_X86_64 uintptr_t k1 = (uintptr_t)key1;
return ((uint64_t)key1 < (uint64_t) key2 ? -1 : uintptr_t k2 = (uintptr_t)key2;
((uint64_t)key1 < (uint64_t) key2 ? 1 : 0 )
); if (k1 < k2)
#else return -1;
return ((uint32_t) key1 < (uint32_t) key2 ? -1 : else if (k1 > k2)
((uint32_t) key1 > (uint32_t) key2 ? 1 : 0) return 1;
); else
#endif return 0;
} }
vj_tag *vj_tag_get(int id) vj_tag *vj_tag_get(int id)
@@ -275,10 +275,9 @@ char *vj_tag_scan_devices( void )
sprintf(n, "%06d", len ); sprintf(n, "%06d", len );
for( i = 0; device_list[i] != NULL ;i++ ) for( i = 0; device_list[i] != NULL ;i++ )
{ {
char tmp[1024]; char *tmp = device_list[i];
snprintf( tmp, sizeof(tmp)-1, "%s", device_list[i] );
int str_len = strlen(tmp); int str_len = strlen(tmp);
strncpy( p, tmp, str_len ); memcpy(p, tmp, str_len);
p += str_len; p += str_len;
free(device_list[i]); free(device_list[i]);
} }
@@ -4008,13 +4007,14 @@ void tagParseStreamFX(char *sampleFile, xmlDocPtr doc, xmlNodePtr cur, void *fon
if (!xmlStrcmp(cur->name, (const xmlChar*) "calibration" )) if (!xmlStrcmp(cur->name, (const xmlChar*) "calibration" ))
cali = cur->xmlChildrenNode; cali = cur->xmlChildrenNode;
if (!xmlStrcmp(cur->name, (const xmlChar*) XMLTAG_MACRO )) if (!xmlStrcmp(cur->name, (const xmlChar*) XMLTAG_MACRO ))
macro = cur->xmlChildrenNode; macro = cur->xmlChildrenNode;
if (!xmlStrcmp(cur->name, (const xmlChar*) "subrender" )) if (!xmlStrcmp(cur->name, (const xmlChar*) "subrender" ))
subrender = get_xml_int(doc,cur); subrender = get_xml_int(doc,cur);
if( !xmlStrcmp(cur->name, (const xmlChar*) "loop_stat_stop"))
loop_stat_stop = get_xml_int(doc,cur); if( !xmlStrcmp(cur->name, (const xmlChar*) "loop_stat_stop"))
loop_stat_stop = get_xml_int(doc,cur);
if (!xmlStrcmp(cur->name, (const xmlChar *) XMLTAG_EFFECTS)) { if (!xmlStrcmp(cur->name, (const xmlChar *) XMLTAG_EFFECTS)) {
fx[k] = cur->xmlChildrenNode; fx[k] = cur->xmlChildrenNode;