Changeset 5534:ea9da1d777c7 in roaraudio for roarclients
- Timestamp:
- 06/12/12 14:59:42 (12 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roarclients
- Files:
-
- 24 edited
Legend:
- Unmodified
- Added
- Removed
-
roarclients/roarbidir.c
r5533 r5534 46 46 int main (int argc, char * argv[]) { 47 47 struct roar_audio_info info; 48 c har * server = NULL;49 c har * k;48 const char * server = NULL; 49 const char * k; 50 50 int i; 51 51 struct roar_vio_defaults def; -
roarclients/roarcat.c
r5533 r5534 61 61 int rel_id = -1; 62 62 int role = ROAR_ROLE_UNKNOWN; 63 c har * server = NULL;64 c har * k;63 const char * server = NULL; 64 const char * k; 65 65 int i; 66 c har * name = "roarcat";66 const char * name = "roarcat"; 67 67 struct roar_connection con; 68 68 struct roar_stream s; -
roarclients/roarcat2sock.c
r5381 r5534 47 47 int channels = 2; 48 48 int codec = ROAR_CODEC_DEFAULT; 49 c har * server = NULL;50 c har * k;49 const char * server = NULL; 50 const char * k; 51 51 int i; 52 52 int fh; -
roarclients/roarcatad.c
r5381 r5534 47 47 int channels = 2; 48 48 int codec = ROAR_CODEC_DEFAULT; 49 c har * server = NULL;50 c har * k;49 const char * server = NULL; 50 const char * k; 51 51 int i; 52 52 char buf[BUFSIZE]; -
roarclients/roarcatplay.c
r5381 r5534 42 42 43 43 int main (int argc, char * argv[]) { 44 c har * server = NULL;45 c har * k;44 const char * server = NULL; 45 const char * k; 46 46 int i; 47 c har * file = NULL;47 const char * file = NULL; 48 48 int verbose = 0; 49 49 roar_vs_t * vss; -
roarclients/roarcatsendfile.c
r5381 r5534 48 48 int channels = 2; 49 49 int codec = ROAR_CODEC_DEFAULT; 50 c har * server = NULL;51 c har * k;50 const char * server = NULL; 51 const char * k; 52 52 int fh; 53 53 int i; -
roarclients/roarcatvio.c
r5533 r5534 50 50 .codec = ROAR_AUDIO_INFO_INVALID}; 51 51 int auinfo_changed = 0; 52 c har * server = NULL;53 c har * k;52 const char * server = NULL; 53 const char * k; 54 54 int i; 55 c har * name = "roarcatvio";55 const char * name = "roarcatvio"; 56 56 roar_vs_t * vss; 57 c har * filename = NULL;57 const char * filename = NULL; 58 58 int err; 59 59 -
roarclients/roarclientpass.c
r5381 r5534 115 115 struct roar_connection con; 116 116 struct roar_client client; 117 c har * server = NULL;118 c har * k;117 const char * server = NULL; 118 const char * k; 119 119 int i; 120 120 int clientfh = -1; … … 125 125 int mode = ROAR_SOCKET_MODE_NONE; 126 126 int type = ROAR_SOCKET_TYPE_UNKNOWN; 127 c har * host = NULL;127 const char * host = NULL; 128 128 int port = -1; 129 129 enum {PASSFH, EXEC} command = PASSFH; -
roarclients/roarctl.c
r5387 r5534 1195 1195 int main (int argc, char * argv[]) { 1196 1196 struct roar_connection con; 1197 c har * server = NULL;1198 c har * k = NULL;1197 const char * server = NULL; 1198 const char * k = NULL; 1199 1199 int i; 1200 1200 int t = 0; -
roarclients/roardtmf.c
r5533 r5534 122 122 int main (int argc, char * argv[]) { 123 123 int rate = ROAR_RATE_DEFAULT; 124 c har * server = NULL;125 c har * k;124 const char * server = NULL; 125 const char * k; 126 126 int i; 127 c har * name = "roardtmf";127 const char * name = "roardtmf"; 128 128 roar_vs_t * vss = NULL; 129 c har * tones = NULL;129 const char * tones = NULL; 130 130 void * buf; 131 131 size_t samples; -
roarclients/roarfilt.c
r5533 r5534 138 138 int main (int argc, char * argv[]) { 139 139 struct roar_audio_info info; 140 c har * server = NULL;141 c har * k;140 const char * server = NULL; 141 const char * k; 142 142 int i; 143 143 int32_t mul = 1, div = 1; -
roarclients/roarinterconnect.c
r5533 r5534 265 265 int type = parse_type(NULL); 266 266 int tmp; 267 c har * server = NULL;267 const char * server = NULL; 268 268 char * remote = "+slp"; // we hope SLP located server is not local one 269 269 char * k; -
roarclients/roarlight.c
r5381 r5534 97 97 struct roar_connection con; 98 98 int mixer = -1; // -1 = Default 99 c har * server = NULL;100 c har * k;99 const char * server = NULL; 100 const char * k; 101 101 int i; 102 102 -
roarclients/roarmon.c
r5533 r5534 62 62 int dir = ROAR_DIR_MONITOR; 63 63 int rel_id = -1; 64 c har * server = NULL;65 c har * k;64 const char * server = NULL; 65 const char * k; 66 66 int i; 67 67 int prethru = 0; -
roarclients/roarmonhttp.c
r5533 r5534 236 236 int sflags = ROAR_FLAG_NONE; 237 237 // int codec = ROAR_CODEC_DEFAULT; 238 c har * server = NULL;238 const char * server = NULL; 239 239 int i; 240 char * c, * k, * v; 240 const char * k, * v; 241 char * c; 241 242 char * sp0 = NULL, * sp1 = NULL; 242 243 int dir = ROAR_DIR_MONITOR; -
roarclients/roarphone.c
r5533 r5534 156 156 } 157 157 158 int open_stream (struct roar_vio_calls * vio, c har * server, struct roar_audio_info * info) {158 int open_stream (struct roar_vio_calls * vio, const char * server, struct roar_audio_info * info) { 159 159 int fh; 160 160 … … 404 404 struct roar_vio_calls * svio_p; 405 405 struct roardsp_filter * filter; 406 c har * driver = DRIVER;407 c har * device = NULL;408 c har * server = NULL;409 c har * k;406 const char * driver = DRIVER; 407 const char * device = NULL; 408 const char * server = NULL; 409 const char * k; 410 410 int i; 411 411 union { -
roarclients/roarpluginrunner.c
r5518 r5534 420 420 int ret = 0; 421 421 int i; 422 c har * k;422 const char * k; 423 423 424 424 for (i = 1; i < argc; i++) { -
roarclients/roarradio.c
r5533 r5534 53 53 int main (int argc, char * argv[]) { 54 54 struct roar_audio_info info; 55 c har * server = NULL;56 c har * k;55 const char * server = NULL; 56 const char * k; 57 57 int i; 58 58 int in = -1; -
roarclients/roarshout.c
r5533 r5534 93 93 enum { ARG, ASK, DSTR } pw_source = ARG; 94 94 struct roar_audio_info info; 95 c har * server = NULL;96 c har * k;97 c har * s_server = NULL;98 c har * s_mount = NULL;95 const char * server = NULL; 96 const char * k; 97 const char * s_server = NULL; 98 const char * s_mount = NULL; 99 99 char * s_pw = NULL; 100 100 int s_port = -1; 101 c har * s_desc = NULL;102 c har * s_genre = NULL;103 c har * s_name = NULL;104 c har * s_url = NULL;101 const char * s_desc = NULL; 102 const char * s_genre = NULL; 103 const char * s_name = NULL; 104 const char * s_url = NULL; 105 105 int s_public = 0; 106 106 roar_vs_t * vss; … … 159 159 s_port = atoi(k); 160 160 } else if ( s_pw == NULL ) { 161 s_pw = k;161 s_pw = argv[i]; // do not use k here so k can be const. 162 162 } else if ( s_mount == NULL ) { 163 163 s_mount = k; -
roarclients/roarsocktypes.c
r5381 r5534 26 26 #include <roaraudio.h> 27 27 28 static const struct { 29 const char * name; 30 int (*func)(void); 31 } tests[] = { 32 {"TCPv4" , roar_socket_new_tcp }, 33 {"UDPv4" , roar_socket_new_udp }, 34 {"TCPv6" , roar_socket_new_tcp6}, 35 {"UDPv6" , roar_socket_new_udp6}, 36 {"UNIX" , roar_socket_new_unix}, 37 {"DECnet seqpacket", roar_socket_new_decnet_seqpacket}, 38 {"DECnet stream" , roar_socket_new_decnet_stream}, 39 {"IPX" , roar_socket_new_ipx}, 40 {"IPX/SPX" , roar_socket_new_ipxspx}, 41 {NULL, NULL} 42 }; 43 28 44 int main (int argc, char * argv[]) { 29 45 int i, fh; 30 struct {31 char * name;32 int (*func)(void);33 } tests[] = {34 {"TCPv4" , roar_socket_new_tcp },35 {"UDPv4" , roar_socket_new_udp },36 {"TCPv6" , roar_socket_new_tcp6},37 {"UDPv6" , roar_socket_new_udp6},38 {"UNIX" , roar_socket_new_unix},39 {"DECnet seqpacket", roar_socket_new_decnet_seqpacket},40 {"DECnet stream" , roar_socket_new_decnet_stream},41 {"IPX" , roar_socket_new_ipx},42 {"IPX/SPX" , roar_socket_new_ipxspx},43 {NULL, NULL}44 };45 46 46 47 roar_debug_bin_obsolete(argv[0], NULL, NULL); -
roarclients/roartypes.c
r5531 r5534 31 31 32 32 int main (void) { 33 struct { c har * name; int len; } types[] = {33 struct { const char * name; int len; } types[] = { 34 34 // { "roar_buffer", sizeof(struct roar_buffer) }, 35 35 { "roar_stack", sizeof(struct roar_stack) }, -
roarclients/roarvio.c
r5381 r5534 59 59 int level = 0; 60 60 int fh; 61 c har * name;61 const char * name; 62 62 const char * codec; 63 c har * content_type;63 const char * content_type; 64 64 65 65 while (cur != NULL) { … … 163 163 ssize_t written = -1; 164 164 int i; 165 c har * k;166 c har * file0 = NULL;167 c har * file1 = NULL;165 const char * k; 166 const char * file0 = NULL; 167 const char * file1 = NULL; 168 168 int o_flags = -1; 169 169 int ret = 0; -
roarclients/roarvorbis.c
r5381 r5534 97 97 roar_vs_t ** vss, 98 98 OggVorbis_File * vf, 99 c har* file,99 const char * file, 100 100 struct roar_audio_info * info, 101 101 struct roar_vio_calls * vclt) { … … 288 288 struct roar_vio_calls vclt, in; 289 289 struct roar_vio_defaults def; 290 char * server = NULL; 291 char * file = NULL; 292 char * vcltfile = NULL; 293 char * k; 290 const char * file = NULL; 291 const char * vcltfile = NULL; 292 const char * k; 294 293 int i; 295 294 struct roar_connection con; … … 310 309 311 310 if ( strcmp(k, "--server") == 0 ) { 312 server = argv[++i];311 roar_libroar_set_server(argv[++i]); 313 312 } else if ( strcmp(k, "--vclt-out") == 0 ) { 314 313 vcltfile = argv[++i]; … … 325 324 } 326 325 327 roar_libroar_set_server(server);328 329 326 if ( file == NULL ) { 330 327 ROAR_ERR("No filename given."); -
roarclients/roarvumeter.c
r5533 r5534 166 166 struct roar_audio_info info; 167 167 int samples = -1; 168 c har * server = NULL;169 c har * k;168 const char * server = NULL; 169 const char * k; 170 170 struct roar_vio_calls stream, re; 171 171 int i;
Note: See TracChangeset
for help on using the changeset viewer.