Changeset 5463:f11febcac1de in roaraudio

Timestamp:

03/31/12 00:26:21 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

corrected handling of pos in v2 messages

Location:

libroar

Files:

• proto.c (modified) (3 diffs)
• stream.c (modified) (2 diffs)

libroar/proto.c

@@ -96 +96 @@
     *(uint32_t*)(buf+4) = ROAR_HOST2NET32(mes->flags);
     if ( mes->flags & ROAR_MF_LSPOS ) {
-     *(uint64_t*)(buf+8) = ROAR_HOST2NET16(mes->pos64);
+     *(uint64_t*)(buf+8) = ROAR_HOST2NET64(mes->pos64);
      bufptr = buf+16;
      headerlen          += 4;
     } else {
-     *(uint32_t*)(buf+8) = ROAR_HOST2NET16(mes->pos);
+     *(uint32_t*)(buf+8) = ROAR_HOST2NET32(mes->pos);
      bufptr = buf+12;
     }
@@ -192 +192 @@
     mes->stream  = ROAR_NET2HOST16(*(uint16_t*)(buf+2));
     mes->pos     = ROAR_NET2HOST32(*(uint32_t*)(buf+4));
+    mes->pos64   = mes->pos;
     mes->datalen = ROAR_NET2HOST16(*(uint16_t*)(buf+8));
    break;
@@ -224 +225 @@
     if ( mes->flags & ROAR_MF_LSPOS ) {
      mes->pos64   = ROAR_NET2HOST32(*(uint64_t*)(buf+8));
+     mes->pos     = mes->pos64 & (uint64_t)0x0FFFFFFFFLLU;
      bufptr       = buf+16;
     } else {
      mes->pos     = ROAR_NET2HOST32(*(uint32_t*)(buf+8));
+     mes->pos64   = mes->pos;
      bufptr       = buf+12;
     }

libroar/stream.c

@@ -765 +765 @@
 #endif
 
- m->pos = s->pos;
+ m->pos   = s->pos;
+ m->pos64 = s->pos;
 
  return 0;
@@ -783 +784 @@
  }
 
- s->pos = m->pos;
+ if ( m->flags & ROAR_MF_LSPOS ) {
+  s->pos = m->pos64;
+ } else {
+  s->pos = m->pos;
+ }
 
  data = (uint32_t*) m->data;