Changeset 2681:359a85bcf5e9 in roaraudio
- Timestamp:
- 09/13/09 00:43:35 (15 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
include/roaraudio/audio.h
r2398 r2681 62 62 0101 0x15 -> Ogg General 63 63 0110 0x16 -> Ogg CELT 64 0111 0x17 -> Ogg 64 65 [...] 65 66 **** 0x1a -> ROAR CELT … … 158 159 #define ROAR_CODEC_OGG_FLAC 0x14 159 160 #define ROAR_CODEC_OGG_GENERAL 0x15 161 #define ROAR_CODEC_OGG_CELT 0x16 162 #define ROAR_CODEC_OGG 0x17 160 163 161 164 #define ROAR_CODEC_ROAR_CELT 0x1a -
include/roaraudio/misc.h
r2419 r2681 29 29 #define _ROARAUDIO_MISC_H_ 30 30 31 #define ROAR_LIGHT_BITS 8 31 // light: 32 #define ROAR_LIGHT_BITS 8 33 34 // complex: 35 #define ROAR_COMPLEX_RATE 0 36 #define ROAR_COMPLEX_BITS 0 37 #define ROAR_COMPLEX_CHANNELS 0 38 #define ROAR_COMPLEX_CODEC ROAR_CODEC_RAUM 32 39 33 40 #endif -
include/roaraudio/stream.h
r2231 r2681 57 57 #define ROAR_DIR_RAW_OUT 17 58 58 59 #define ROAR_DIR_DIRIDS 18 59 #define ROAR_DIR_COMPLEX_IN 18 60 #define ROAR_DIR_COMPLEX_OUT 19 61 62 #define ROAR_DIR_DIRIDS 20 60 63 61 64 -
libroar/stream.c
r2633 r2681 554 554 char * name; 555 555 } _libroar_dir[] = { 556 {ROAR_DIR_PLAY, "play" }, 557 {ROAR_DIR_RECORD, "record" }, 558 {ROAR_DIR_MONITOR, "monitor" }, 559 {ROAR_DIR_FILTER, "filter" }, 560 {ROAR_DIR_OUTPUT, "output" }, 561 {ROAR_DIR_MIXING, "mixing" }, 562 {ROAR_DIR_META, "meta" }, 563 {ROAR_DIR_BIDIR, "bidir" }, 564 {ROAR_DIR_THRU, "thru" }, 565 {ROAR_DIR_BRIDGE, "bridge" }, 566 {ROAR_DIR_MIDI_IN, "midi_in" }, 567 {ROAR_DIR_MIDI_OUT, "midi_out" }, 568 {ROAR_DIR_LIGHT_IN, "light_in" }, 569 {ROAR_DIR_LIGHT_OUT, "light_out"}, 570 {ROAR_DIR_RAW_IN, "raw_in" }, 571 {ROAR_DIR_RAW_OUT, "raw_out" }, 572 {-1, "unknown" } 556 {ROAR_DIR_PLAY, "play" }, 557 {ROAR_DIR_RECORD, "record" }, 558 {ROAR_DIR_MONITOR, "monitor" }, 559 {ROAR_DIR_FILTER, "filter" }, 560 {ROAR_DIR_OUTPUT, "output" }, 561 {ROAR_DIR_MIXING, "mixing" }, 562 {ROAR_DIR_META, "meta" }, 563 {ROAR_DIR_BIDIR, "bidir" }, 564 {ROAR_DIR_THRU, "thru" }, 565 {ROAR_DIR_BRIDGE, "bridge" }, 566 {ROAR_DIR_MIDI_IN, "midi_in" }, 567 {ROAR_DIR_MIDI_OUT, "midi_out" }, 568 {ROAR_DIR_LIGHT_IN, "light_in" }, 569 {ROAR_DIR_LIGHT_OUT, "light_out" }, 570 {ROAR_DIR_RAW_IN, "raw_in" }, 571 {ROAR_DIR_RAW_OUT, "raw_out" }, 572 {ROAR_DIR_COMPLEX_IN, "complex_in" }, 573 {ROAR_DIR_COMPLEX_OUT, "complex_out"}, 574 {-1, "unknown" } 573 575 }; 574 576 … … 628 630 {ROAR_CODEC_OGG_FLAC, "ogg_flac" }, 629 631 {ROAR_CODEC_OGG_GENERAL, "ogg_general"}, 632 {ROAR_CODEC_OGG_CELT, "ogg_celt" }, 633 {ROAR_CODEC_OGG, "ogg" }, 630 634 {ROAR_CODEC_ROAR_CELT, "roar_celt" }, 631 635 {ROAR_CODEC_ROAR_SPEEX, "roar_speex" }, -
roarclients/roarcat.c
r2646 r2681 41 41 " --light - Use light control input\n" 42 42 " --raw - Use raw input\n" 43 " --complex - Use complex input\n" 43 44 " --rel-id ID - Set ID of relative stream\n" 44 45 " --help - Show this help\n" … … 101 102 } else if ( !strcmp(k, "--raw") ) { 102 103 dir = ROAR_DIR_RAW_IN; 104 } else if ( !strcmp(k, "--complex") ) { 105 dir = ROAR_DIR_COMPLEX_IN; 103 106 104 107 } else if ( !strcmp(k, "--rel-id") ) { … … 140 143 if ( codec == -1 ) codec = ROAR_CODEC_DMX512; 141 144 break; 145 case ROAR_DIR_COMPLEX_IN: 146 if ( rate == -1 ) rate = ROAR_COMPLEX_RATE; 147 if ( bits == -1 ) bits = ROAR_COMPLEX_BITS; 148 if ( channels == -1 ) channels = ROAR_COMPLEX_CHANNELS; 149 if ( codec == -1 ) codec = ROAR_COMPLEX_CODEC; 150 break; 142 151 case ROAR_DIR_RAW_IN: 143 152 default: -
roarclients/roarmon.c
r2420 r2681 41 41 " --light - Output light control\n" 42 42 " --raw - Output raw data\n" 43 " --complex - Output complex data\n" 43 44 " --thru - Output copy of other stream\n" 44 45 " --rel-id ID - Set ID of relative stream\n" … … 101 102 } else if ( !strcmp(k, "--raw") ) { 102 103 dir = ROAR_DIR_RAW_OUT; 104 } else if ( !strcmp(k, "--complex") ) { 105 dir = ROAR_DIR_COMPLEX_OUT; 103 106 } else if ( !strcmp(k, "--thru") ) { 104 107 dir = ROAR_DIR_THRU; … … 141 144 if ( codec == -1 ) codec = ROAR_CODEC_DMX512; 142 145 break; 146 case ROAR_DIR_COMPLEX_IN: 147 if ( rate == -1 ) rate = ROAR_COMPLEX_RATE; 148 if ( bits == -1 ) bits = ROAR_COMPLEX_BITS; 149 if ( channels == -1 ) channels = ROAR_COMPLEX_CHANNELS; 150 if ( codec == -1 ) codec = ROAR_COMPLEX_CODEC; 151 break; 143 152 case ROAR_DIR_RAW_OUT: 144 153 case ROAR_DIR_THRU: -
roard/codecfilter.c
r2680 r2681 184 184 if ( g_codecfilter[i].subsystems & ROAR_SUBSYS_RAW ) 185 185 subsys[4] = 'R'; 186 if ( g_codecfilter[i].subsystems & ROAR_SUBSYS_COMPLEX ) 187 subsys[5] = 'X'; 186 188 187 189 flags = g_codecfilter[i].flags; -
roard/driver.c
r2508 r2681 33 33 #endif 34 34 { "roar", "RoarAudio driver", "localhost, remote.host.dom", DRV_FLAG_NONE, 35 ROAR_SUBSYS_WAVEFORM|ROAR_SUBSYS_MIDI|ROAR_SUBSYS_LIGHT ,35 ROAR_SUBSYS_WAVEFORM|ROAR_SUBSYS_MIDI|ROAR_SUBSYS_LIGHT|ROAR_SUBSYS_COMPLEX, 36 36 NULL, driver_roar_close, driver_roar_open_vio}, 37 37 #ifdef ROAR_HAVE_IO_POSIX 38 38 { "raw", "RAW PCM driver", "/some/file", DRV_FLAG_FHSEC, 39 ROAR_SUBSYS_WAVEFORM|ROAR_SUBSYS_MIDI|ROAR_SUBSYS_LIGHT|ROAR_SUBSYS_RAW ,39 ROAR_SUBSYS_WAVEFORM|ROAR_SUBSYS_MIDI|ROAR_SUBSYS_LIGHT|ROAR_SUBSYS_RAW|ROAR_SUBSYS_COMPLEX, 40 40 NULL, NULL, driver_raw_open_vio}, 41 41 #endif … … 98 98 if ( g_driver[i].subsystems & ROAR_SUBSYS_RAW ) 99 99 subsys[4] = 'R'; 100 if ( g_driver[i].subsystems & ROAR_SUBSYS_COMPLEX ) 101 subsys[5] = 'X'; 100 102 101 103 printf(" %-9s %c%c%c %6s - %s (devices: %s)\n", g_driver[i].name, -
roard/driver_roar.c
r2508 r2681 34 34 if ( sstream != NULL ) { 35 35 switch (ROAR_STREAM(sstream)->dir) { 36 case ROAR_DIR_OUTPUT: dir = ROAR_DIR_PLAY;break;37 case ROAR_DIR_MIDI_OUT: dir = ROAR_DIR_MIDI_IN;break;38 case ROAR_DIR_LIGHT_OUT: dir = ROAR_DIR_LIGHT_IN;break;36 case ROAR_DIR_OUTPUT: dir = ROAR_DIR_PLAY; break; 37 case ROAR_DIR_MIDI_OUT: dir = ROAR_DIR_MIDI_IN; break; 38 case ROAR_DIR_LIGHT_OUT: dir = ROAR_DIR_LIGHT_IN; break; 39 39 // TODO: we need to know a real pos id for raw streams... 40 40 // case ROAR_DIR_RAW_OUT: dir = ROAR_DIR_RAW_IN; break; 41 case ROAR_DIR_COMPLEX_OUT: dir = ROAR_DIR_COMPLEX_IN; break; 41 42 default: 42 43 return -1; -
roard/include/roard.h
r2674 r2681 70 70 #define ROAR_SUBSYS_LIGHT 0x08 71 71 #define ROAR_SUBSYS_RAW 0x10 72 #define ROAR_SUBSYS_COMPLEX 0x20 72 73 73 74 // some usefull macros: -
roard/req.c
r2630 r2681 23 23 */ 24 24 25 #define DEBUG 25 26 #include "roard.h" 26 27 -
roard/roard.c
r2584 r2681 501 501 dir = ROAR_DIR_RAW_OUT; 502 502 #endif 503 } else if ( !strcasecmp(v, "complex") ) { 504 dir = ROAR_DIR_COMPLEX_OUT; 503 505 } else { 504 506 ROAR_ERR("add_output(*): unknown/unsupported subsystem '%s'", k); -
roard/sources.c
r2507 r2681 65 65 if ( g_source[i].subsystems & ROAR_SUBSYS_RAW ) 66 66 subsys[4] = 'R'; 67 if ( g_source[i].subsystems & ROAR_SUBSYS_COMPLEX ) 68 subsys[5] = 'X'; 67 69 68 70 printf(" %-9s %c%c%c %6s - %s (devices: %s)\n", g_source[i].name, -
roard/streams.c
r2635 r2681 340 340 return ROAR_SUBSYS_RAW; 341 341 break; 342 case ROAR_DIR_COMPLEX_IN: 343 case ROAR_DIR_COMPLEX_OUT: 344 return ROAR_SUBSYS_COMPLEX; 345 break; 342 346 case ROAR_DIR_THRU: 343 347 return streams_get_subsys(ROAR_STREAM(ss)->pos_rel_id);
Note: See TracChangeset
for help on using the changeset viewer.