Changeset 4342:6a1a4274b8ab in roaraudio

Timestamp:

09/13/10 21:53:28 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

small bug fixes

Location:

libroar

Files:

• asyncctl.c (modified) (2 diffs)
• notify.c (modified) (1 diff)

libroar/asyncctl.c

@@ -44 +44 @@
  if ( con == NULL || triggered == NULL )
   return -1;
-
- memset(triggered, 0, sizeof(struct roar_event));
 
  if ( num == 0 )
@@ -99 +97 @@
  len_have = tmp = m.datalen - 4;
 
+ memset(triggered, 0, sizeof(struct roar_event));
+
  if ( roar_event_from_blob(triggered, vp, &tmp) != 0 )
   return -1;

libroar/notify.c

@@ -486 +486 @@
  event->arg2_len    = ROAR_NET2HOST16(u16[3]);
 
+ if ( event->emitter == (uint16_t)-1)
+  event->emitter = -1;
+
+ if ( event->target == (uint16_t)-1)
+  event->target = -1;
+
+ if ( event->target_type == (uint16_t)-1)
+  event->target_type = -1;
+
  if ( event->flags & ROAR_EVENT_FLAG_NETTRANS ) {
   event->arg0 = ROAR_NET2HOST16(u16[4]);
-  event->arg1 = ROAR_NET2HOST16(u16[4]);
+  event->arg1 = ROAR_NET2HOST16(u16[5]);
+
+  if ( event->arg0 == (uint16_t)-1)
+   event->arg0 = -1;
+
+  if ( event->arg1 == (uint16_t)-1)
+   event->arg1 = -1;
+
   event->arg2 = blob + needed_len - event->arg2_len;
  } else {