Changeset 87:3bc590ae9419 in roaraudio

Timestamp:

07/13/08 00:33:53 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

started with meta data support

Files:

• include/roaraudio.h (modified) (1 diff)
• include/roaraudio/meta.h (modified) (1 diff)
• roarclients/roartypes.c (modified) (1 diff)
• roard/include/streams.h (modified) (1 diff)
• roard/streams.c (modified) (1 diff)

include/roaraudio.h

@@ -43 +43 @@
 #include <roaraudio/client.h>
 #include <roaraudio/sample.h>
+#include <roaraudio/meta.h>
 
 #include <libroar/libroar.h>

include/roaraudio/meta.h

@@ -22 +22 @@
 #define ROAR_META_TYPE_THUMBNAIL     15
 #define ROAR_META_TYPE_LENGTH        16
+#define ROAR_META_TYPE_COMMENT       17
+#define ROAR_META_TYPE_OTHER         18
 
 
 #define ROAR_META_MAX_NAMELEN 32
+
+#define ROAR_META_MAX_PER_STREAM 16
 
 struct roar_meta {

roarclients/roartypes.c

@@ -13 +13 @@
   { "roar_connection",    sizeof(struct roar_connection)    },
   { "roar_audio_info",    sizeof(struct roar_audio_info)    },
+  { "roar_meta",          sizeof(struct roar_meta)          },
   { NULL, 0 }
  }, * c = types - 1;

roard/include/streams.h

@@ -23 +23 @@
  void  * output;
  struct roar_mixer_settings mixer;
+ struct roar_meta meta[ROAR_META_MAX_PER_STREAM];
 } * g_streams[ROAR_STREAMS_MAX];
 

roard/streams.c

@@ -53 +53 @@
    for (j = 0; j < ROAR_MAX_CHANNELS; j++)
     ((struct roar_stream_server*)n)->mixer.mixer[j] = 65535;
+   for (j = 0; j < ROAR_META_MAX_PER_STREAM; j++)
+    ((struct roar_stream_server*)n)->meta[j].type = ROAR_META_TYPE_NONE;
 
    g_streams[i] = (struct roar_stream_server*)n;