Changeset 5547:3f5d08ba722e in roaraudio for roarclients/roardtmf.c

Timestamp:

06/17/12 16:17:06 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added an extended DTMF mode

File:

• roarclients/roardtmf.c (modified) (6 diffs)

roarclients/roardtmf.c

@@ -48 +48 @@
         "  --rate  -R RATE    - Set sample rate\n"
         "  --help             - Show this help\n"
+        "  --mode-dtmf        - Use standard DTMF (default)\n"
+        "  --mode-roar        - Use RoarAudio extended DTMF\n"
        );
 
@@ -53 +55 @@
 
 int main (int argc, char * argv[]) {
+ enum {
+  MODE_DTMF,
+  MODE_ROAR
+ } mode = MODE_DTMF;
  int    rate     = ROAR_RATE_DEFAULT;
  const char * server   = NULL;
@@ -65 +71 @@
  size_t samples;
  size_t len;
- char   c;
+ uint16_t c;
  int err;
 
@@ -75 +81 @@
   } else if ( !strcmp(k, "--rate") || !strcmp(k, "-r") || !strcmp(k, "-R") ) {
    rate = roar_str2rate(argv[++i]);
+  } else if ( !strcmp(k, "--mode-dtmf") ) {
+   mode = MODE_DTMF;
+  } else if ( !strcmp(k, "--mode-roar") ) {
+   mode = MODE_ROAR;
   } else if ( !strcmp(k, "--help") ) {
    usage();
@@ -95 +105 @@
  samples = len_break + len_tone;
 
+/*
  printf("samples=%llu\n", (long long unsigned int)samples);
-/*
  return 0;
 */
@@ -112 +122 @@
   tones++;
 
-  if ( c == '+' || c == '.' || c == '_' )
-   continue;
+  if ( mode == MODE_DTMF ) {
+   if ( c == '+' || c == '.' || c == '_' )
+    continue;
+  } else if ( mode == MODE_ROAR ) {
+   c = ROAR_DTMF_CHAR_ROAR(c);
+  }
 
-  if ( c == ' ' ) {
+  if ( mode == MODE_DTMF && c == ' ' ) {
    roar_dtmf_break(buf, len_tone, rate, ROAR_DTMF_OPTIONS_NONE);
   } else {