Changeset 2329:e99a7b90dc2b in roaraudio
- Timestamp:
- 08/06/09 15:12:29 (15 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roarclients/roarphone.c
r2322 r2329 48 48 49 49 #define DTX_F 25 50 51 #define CON_NONE 0x00 52 #define CON_CON 0x01 53 #define CON_STREAM 0x02 50 54 51 55 struct { … … 57 61 58 62 int dtx_counter = 0; 63 64 struct { 65 int state; 66 struct roar_connection con; 67 struct roar_stream stream; 68 struct roar_vio_calls * svio; 69 } g_cons; 59 70 60 71 struct roar_bixcoder transcoder[1]; … … 81 92 82 93 int open_stream (struct roar_vio_calls * vio, char * server, struct roar_audio_info * info) { 83 return roar_vio_simple_stream(vio, 84 info->rate, info->channels, info->bits, info->codec, 85 server, 86 ROAR_DIR_BIDIR, 87 "roarphone"); 94 int fh; 95 96 g_cons.svio = vio; 97 98 if ( !(g_cons.state & CON_CON) ) 99 if ( roar_simple_connect(&(g_cons.con), server, "roarphone") == -1 ) 100 return -1; 101 102 g_cons.state |= CON_CON; 103 104 // TODO: find out if this can be done more nicely by using VIOs 105 106 if ( (fh = roar_simple_new_stream_obj(&(g_cons.con), &(g_cons.stream), 107 info->rate, info->channels, info->bits, info->codec, 108 ROAR_DIR_BIDIR 109 )) == -1 ) 110 return -1; 111 112 roar_vio_open_fh_socket(vio, fh); 113 114 g_cons.state |= CON_STREAM; 115 116 return 0; 88 117 } 89 118 … … 247 276 g_conf.antiecho = AE_ROARD; 248 277 g_conf.dtx_threshold = -1; 278 279 memset(&g_cons, 0, sizeof(g_cons)); 280 g_cons.state = CON_NONE; 249 281 250 282 for (i = 1; i < argc; i++) { … … 355 387 roar_vio_close(&dvio); 356 388 389 roar_disconnect(&(g_cons.con)); 390 357 391 return 0; 358 392 }
Note: See TracChangeset
for help on using the changeset viewer.