Revision 54b02213

View differences:

src/Chunkiser/input-stream-rtp.c
38 38

  
39 39
#include "int_coding.h"
40 40
#include "payload.h"
41
#include "config.h"
41
#include "grapes_config.h"
42 42
#include "chunkiser_iface.h"
43 43
#include "stream-rtp.h"
44 44

  
......
369 369
  }
370 370

  
371 371
  /* Parse options */
372
  cfg_tags = config_parse(config);
372
  cfg_tags = grapes_config_parse(config);
373 373
  if (cfg_tags) {
374
    config_value_int(cfg_tags, "verbosity", &(ctx->verbosity));
374
    grapes_config_value_int(cfg_tags, "verbosity", &(ctx->verbosity));
375 375
    printf_log(ctx, 2, "Verbosity set to %i", ctx->verbosity);
376 376

  
377
    config_value_int(cfg_tags, "rtp_log", &(ctx->rtp_log));
377
    grapes_config_value_int(cfg_tags, "rtp_log", &(ctx->rtp_log));
378 378
    if (ctx->rtp_log) {
379 379
        printf_log(ctx, 2, "Producing parsable rtp log. "
380 380
                   "TimeStamps are expressed in 2^-32 s.");
381 381
    }
382 382

  
383
    config_value_int(cfg_tags, "rfc3551", &(ctx->rfc3551));
383
    grapes_config_value_int(cfg_tags, "rfc3551", &(ctx->rfc3551));
384 384
    printf_log(ctx, 2, "%ssing RFC 3551",
385 385
               (ctx->rfc3551 ? "U" : "Not u"));
386 386

  
387
    if (config_value_int(cfg_tags, "chunk_size", &chunk_size)) {
387
    if (grapes_config_value_int(cfg_tags, "chunk_size", &chunk_size)) {
388 388
      ctx->max_size = chunk_size + UDP_MAX_SIZE;
389 389
    }
390 390
    printf_log(ctx, 2, "Chunk size is %d bytes", chunk_size);
391 391
    printf_log(ctx, 2, "Maximum chunk size is thus %d bytes", ctx->max_size);
392 392

  
393
    if (config_value_int(cfg_tags, "max_delay_ms", &max_delay_input)) {
393
    if (grapes_config_value_int(cfg_tags, "max_delay_ms", &max_delay_input)) {
394 394
      ctx->max_delay = max_delay_input * (1ULL << TS_SHIFT) / 1000;
395 395
    }
396
    else if (config_value_int(cfg_tags, "max_delay_s", &max_delay_input)) {
396
    else if (grapes_config_value_int(cfg_tags, "max_delay_s", &max_delay_input)) {
397 397
      ctx->max_delay = max_delay_input * (1ULL << TS_SHIFT);
398 398
    }
399 399
    printf_log(ctx, 2, "Maximum delay set to %.0f ms.",
src/Chunkiser/output-stream-rtp.c
21 21

  
22 22
#include "int_coding.h"
23 23
#include "payload.h"
24
#include "config.h"
24
#include "grapes_config.h"
25 25
#include "dechunkiser_iface.h"
26 26
#include "stream-rtp.h"
27 27

  
......
93 93
    return 1;
94 94
  }
95 95

  
96
  cfg_tags = config_parse(config);
96
  cfg_tags = grapes_config_parse(config);
97 97
  if (cfg_tags) {
98 98
    const char *addr;
99 99

  
100
    config_value_int(cfg_tags, "verbosity", &(ctx->verbosity));
100
    grapes_config_value_int(cfg_tags, "verbosity", &(ctx->verbosity));
101 101
    printf_log(ctx, 2, "Verbosity set to %i", ctx->verbosity);
102 102

  
103
    addr = config_value_str(cfg_tags, "addr");
103
    addr = grapes_config_value_str(cfg_tags, "addr");
104 104
    if (addr && strlen(addr) < IP_ADDR_LEN) {
105 105
      sprintf(ctx->ip, "%s", addr);
106 106
    }
src/Chunkiser/stream-rtp.h
70 70
    char tag[8];
71 71

  
72 72
    sprintf(tag, "stream%d", j);
73
    val = config_value_str(cfg_tags, tag);
73
    val = grapes_config_value_str(cfg_tags, tag);
74 74
    if (val != NULL) {
75 75
      if (port_pair_parse(val, &ports[i]) != 0) {
76 76
        *error_str = port_pair_failed;
......
84 84
  }
85 85
  /* Ports defined with "audio", "video" */
86 86
  if (i == 0) {
87
    val = config_value_str(cfg_tags, "audio");
87
    val = grapes_config_value_str(cfg_tags, "audio");
88 88
    if (val != NULL) {
89 89
      if (port_pair_parse(val, &ports[i]) != 0) {
90 90
        *error_str = port_pair_failed;
......
92 92
      }
93 93
      i += 2;
94 94
    }
95
    val = config_value_str(cfg_tags, "video");
95
    val = grapes_config_value_str(cfg_tags, "video");
96 96
    if (val != NULL) {
97 97
      if (port_pair_parse(val, &ports[i]) != 0) {
98 98
        *error_str = port_pair_failed;
......
106 106
  }
107 107
  /* Ports defined with "base" */
108 108
  if (i == 0) {
109
    if (config_value_int(cfg_tags, "base", &ports[0])) {
109
    if (grapes_config_value_int(cfg_tags, "base", &ports[0])) {
110 110
      ports[1] = ports[0] + 1;
111 111
      ports[2] = ports[1] + 1;
112 112
      ports[3] = ports[2] + 1;

Also available in: Unified diff