Changeset 1609:3c2a3f0fb127 in roaraudio for roard/roard.c

Timestamp:

04/20/09 19:45:27 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

started support for server config including default flags and mixer for individuel stream types/dirs

File:

• roard/roard.c (modified) (4 diffs)

roard/roard.c

@@ -129 +129 @@
 #define R_SETGID 2
 
+int init_config (void) {
+ int i;
+
+ memset(g_config, 0, sizeof(struct roard_config));
+
+ for (i = 0; i < ROAR_DIR_DIRIDS; i++) {
+  g_config->streams[i].mixer_channels = 1;
+  g_config->streams[i].mixer.rpg_mul  = 1;
+  g_config->streams[i].mixer.rpg_div  = 1;
+  g_config->streams[i].mixer.scale    = 65535;
+  g_config->streams[i].mixer.mixer[0] = g_config->streams[i].mixer.scale;
+ }
+
+ return 0;
+}
+
 int add_output (char * drv, char * dev, char * opts, int prim, int count) {
  int stream;
@@ -171 +187 @@
  memcpy(&(s->info), g_sa, sizeof(struct roar_audio_info));
 
- s->dir        = ROAR_DIR_OUTPUT;
+ if ( streams_set_dir(stream, ROAR_DIR_OUTPUT, 1) == -1 ) {
+  streams_delete(stream);
+  return -1;
+ }
  s->pos_rel_id = -1;
 // s->info.codec = codec;
@@ -293 +312 @@
  char user_sock[80]  = {0};
 #endif
- struct roar_audio_info sa;
+ struct roar_audio_info sa, max_sa;
+ struct roard_config config;
 #ifdef ROAR_HAVE_FORK
  int    daemon       = 0;
@@ -363 +383 @@
  sa.codec    = ROAR_CODEC_DEFAULT;
 
- g_sa = &sa;
+ g_sa        = &sa;
+ g_max_sa    = &max_sa;
+
+ memcpy(g_max_sa, g_sa, sizeof(max_sa));
+
+ g_config = &config;
+
+ if ( init_config() == -1 ) {
+  ROAR_ERR("Can not init default config!");
+  return 1;
+ }