Changeset 3630:89a9079f8e3f in roaraudio

Timestamp:

03/08/10 02:23:23 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

implemented roles, still need some support to set them

Files:

• include/libroar/stream.h (modified) (3 diffs)
• libroar/stream.c (modified) (3 diffs)
• roarclients/roarctl.c (modified) (1 diff)
• roard/beep.c (modified) (1 diff)
• roard/include/streams.h (modified) (2 diffs)
• roard/req.c (modified) (2 diffs)
• roard/streams.c (modified) (2 diffs)

include/libroar/stream.h

@@ -76 +76 @@
 #define ROAR_STREAMSTATE_CLOSING    4
 
+// PA currently defines: video, music, game, event, phone, animation, production, a11y
+// RA includes         : YES    YES    YES   YES    YES    NO         NO          NO
+
+#define ROAR_ROLE_UNKNOWN          -1
+#define ROAR_ROLE_NONE              0
+#define ROAR_ROLE_MUSIC             1
+#define ROAR_ROLE_VIDEO             2
+#define ROAR_ROLE_GAME              3
+#define ROAR_ROLE_EVENT             4
+#define ROAR_ROLE_BEEP              5
+#define ROAR_ROLE_PHONE             6
+#define ROAR_ROLE_BACKGROUND_MUSIC  7
+
 struct roar_stream_info {
  int block_size;
@@ -86 +99 @@
  int state;
  int mixer;
+ int role;
 };
 
@@ -134 +148 @@
 char * roar_streamstate2str(int streamstate);
 
+int    roar_str2role  (char * role);
+char * roar_role2str  (int    role);
+
 #endif
 

libroar/stream.c

@@ -394 +394 @@
  memset(info, 0, sizeof(struct roar_stream_info));
  info->mixer = -1;
+ info->role  = ROAR_ROLE_UNKNOWN;
 
  info->block_size     = data[2];
@@ -419 +420 @@
  } else {
   info->mixer         = data[10];
+ }
+
+ if ( m.datalen < 12*2 ) {
+  return 0;
+ } else {
+  info->role          = data[11];
  }
 
@@ -858 +865 @@
 }
 
+struct {
+ int    role;
+ char * name;
+} _libroar_role[] = {
+ {ROAR_ROLE_UNKNOWN,          "unknown"         },
+ {ROAR_ROLE_NONE,             "none"            },
+ {ROAR_ROLE_MUSIC,            "music"           },
+ {ROAR_ROLE_VIDEO,            "video"           },
+ {ROAR_ROLE_GAME,             "game"            },
+ {ROAR_ROLE_EVENT,            "event"           },
+ {ROAR_ROLE_BEEP,             "beep"            },
+ {ROAR_ROLE_PHONE,            "phone"           },
+ {ROAR_ROLE_BACKGROUND_MUSIC, "background music"},
+ {ROAR_ROLE_BACKGROUND_MUSIC, "background_music"}, // alias
+ {-1, NULL}
+};
+
+int    roar_str2role  (char * role) {
+ int i;
+
+ for (i = 0; _libroar_role[i].name != NULL; i++)
+  if ( !strcasecmp(_libroar_role[i].name, role) )
+   return _libroar_role[i].role;
+
+ return ROAR_ROLE_UNKNOWN;
+}
+
+char * roar_role2str  (int    role) {
+ int i;
+
+ for (i = 0; _libroar_role[i].name != NULL; i++)
+  if ( _libroar_role[i].role == role )
+   return _libroar_role[i].name;
+
+ return "unknown";
+}
+
 //ll

roarclients/roarctl.c

@@ -384 +384 @@
      printf("Stream state          : %s\n",   roar_streamstate2str(info.state));
 
+    if ( g_verbose > 1 )
+     printf("Stream role           : %s\n",   roar_role2str(info.role));
+
     *flags = 0;
     if ( info.flags & ROAR_FLAG_PRIMARY )

roard/beep.c

@@ -165 +165 @@
  }
 
+ if ( streams_set_role(stream, ROAR_ROLE_BEEP) == -1 ) {
+  streams_delete(stream);
+  return -1;
+ }
+
  if ( (buf = beep_fill_buffer(beep, &(s->info))) == NULL ) {
   streams_delete(stream);

roard/include/streams.h

@@ -91 +91 @@
  int mixer_stream;
  struct roardsp_chanmap chanmap;
+ int role;
 } * g_streams[ROAR_STREAMS_MAX];
 
@@ -110 +111 @@
 int streams_set_mixer_stream(int id, int mixer);
 int streams_get_mixer_stream(int id, int mixer);
+
+int streams_set_role   (int id, int role);
 
 int streams_get_subsys (int id);

roard/req.c

@@ -596 +596 @@
     audio_info = &(s->info);
 
-    mes->datalen = 2*11;
+    mes->datalen = 2*12;
 
     d[ 2] = ROAR_OUTPUT_CALC_OUTBUFSIZE(audio_info);
@@ -607 +607 @@
     d[ 9] = (ss->flags & 0xFFFF0000) >> 16;
     d[10] = ss->mixer_stream;
+    d[11] = ss->role;
 
     ROAR_DBG("req_on_get_stream_para(*): ss->driver_id=%i", ss->driver_id);

roard/streams.c

@@ -107 +107 @@
    s->prethru         = NULL;
    s->mixer_stream    = -1;
+   s->role            = ROAR_ROLE_UNKNOWN;
 
    s->mixer.scale     = 65535;
@@ -376 +377 @@
 }
 
+int streams_set_role   (int id, int role) {
+ struct roar_stream_server * ss;
+
+ _CHECK_SID(id);
+
+ if ( (ss = g_streams[id]) == NULL )
+  return -1;
+
+ ss->role = role;
+
+ return 0;
+}
+
 int streams_get_subsys (int id) {
  struct roar_stream_server * ss;