Changeset 4969:d0b8acb5121f in roaraudio
- Timestamp:
- 05/16/11 12:11:55 (13 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
ChangeLog
r4962 r4969 12 12 * Added simple memmgr (memory Manager) code. 13 13 * Updated libroarpulse, includes converting libroarpulse-simple to VS API. 14 * Added support for OpenBSD sndio's new TCP connection syntax. 14 15 15 16 v. 0.4beta5 - Tue Apr 26 2011 08:42 CEST -
libroar.ckport
r4906 r4969 7 7 roar_cdrom_run_cdparanoia unknown 8 8 roar_vio_open_get_cookie unknown 9 _ROAR_MLOCK internal 10 _roardl2ldl internal 9 roar_reset wip Do not use yet 11 10 12 11 # VIO: 12 roar_vio_clear_calls ok 13 13 14 roar_vio_close ok 14 15 … … 154 155 roar_vio_cmd_ctl internal 155 156 156 roar_vio_open_gzip wip Currently requires cmd vio 157 roar_vio_open_gzip legacy Use roar_vio_open_zlib 158 157 159 roar_vio_open_gpg wip Currently requires cmd vio 158 160 roar_vio_open_pgp_decrypt wip Currently requires cmd vio … … 297 299 roar_vio_open_misc ok 298 300 roar_vio_open_misc_by_name ok 301 302 # VIO zlib: 303 roar_vio_open_zlib ok 304 305 roar_vio_zlib_close internal 306 roar_vio_zlib_ctl internal 307 roar_vio_zlib_lseek internal 308 roar_vio_zlib_nonblock internal 309 roar_vio_zlib_read internal 310 roar_vio_zlib_sync internal 311 roar_vio_zlib_write internal 312 313 _set_error internal 314 _zalloc internal 315 _zfree internal 299 316 300 317 # Buffer: … … 364 381 roar_client_set_proto ok 365 382 roar_client_pass ok 383 roar_client_exec ok 366 384 367 385 # Streams: … … 578 596 579 597 # MemMgr: 580 roar_mm_calloc wip 581 roar_mm_malloc wip 582 roar_mm_free wip 583 roar_mm_realloc wip 584 roar_mm_strdup wip 598 roar_mm_calloc ok 599 roar_mm_malloc ok 600 roar_mm_free ok 601 roar_mm_realloc ok 585 602 roar_mm_memdup ok 603 roar_mm_strdup ok 604 roar_mm_strndup ok 605 roar_mm_strlen ok 606 roar_mm_strnlen ok 607 608 roar_mm_mlock ok 609 roar_mm_munlock ok 610 611 _ROAR_MLOCK legacy Use roar_mm_mlock 586 612 587 613 # Meta Data: … … 631 657 roar_dl_ra_init ok 632 658 roar_dl_errstr ok 659 660 _roardl2ldl internal 633 661 634 662 # RoarSLP: … … 889 917 # Timing stuff: 890 918 roar_usleep ok 919 roar_sleep ok 891 920 892 921 !TARGET: libroardsp0 -
libroarsndio/libroarsndio.c
r4708 r4969 71 71 } 72 72 73 if ( (optsoffset = strstr(unitoffset, ".")) != NULL ) { 73 if ( (optsoffset = strstr(unitoffset, "/")) != NULL ) { 74 *optsoffset = 0; 75 return unitoffset; 76 } else if ( (optsoffset = strstr(unitoffset, ".")) != NULL ) { 74 77 // TODO: add some code to strip the options of the end 75 78 return name; … … 103 106 struct sio_hdl * hdl = NULL; 104 107 int is_midi = 0; 108 char * tmp; 105 109 106 110 if ( (hdl = roar_mm_malloc(sizeof(struct sio_hdl))) == NULL ) … … 108 112 109 113 memset(hdl, 0, sizeof(struct sio_hdl)); 114 hdl->device = NULL; 110 115 111 116 switch (mode) { … … 113 118 hdl->dir = ROAR_DIR_PLAY; 114 119 break; 120 case SIO_REC: 121 hdl->dir = ROAR_DIR_PLAY; 122 break; 115 123 case MIO_OUT: 116 124 is_midi = 1; … … 123 131 124 132 // unsupported: 125 case SIO_REC:126 133 case SIO_PLAY|SIO_REC: 127 134 case MIO_OUT|MIO_IN: … … 141 148 } 142 149 143 name = sndio_to_roar_names((char*) name); 144 145 if ( roar_simple_connect(&(hdl->con), (char*) name, "libroarsndio") == -1 ) { 150 if ( name != NULL ) { 151 tmp = roar_mm_strdup(name); 152 name = sndio_to_roar_names(tmp); 153 154 if ( name != NULL ) 155 hdl->device = roar_mm_strdup(name); 156 157 roar_mm_free(tmp); 158 } 159 160 if ( roar_simple_connect(&(hdl->con), hdl->device, "libroarsndio") == -1 ) { 161 roar_mm_free(hdl->device); 146 162 roar_mm_free(hdl); 147 163 return NULL; … … 151 167 152 168 hdl->stream_opened = 0; 153 154 if ( name != NULL )155 hdl->device = strdup(name);156 169 157 170 if ( is_midi ) { … … 179 192 roar_disconnect(&(hdl->con)); 180 193 194 if ( hdl->device != NULL ) 195 roar_mm_free(hdl->device); 181 196 roar_mm_free(hdl); 182 197 }
Note: See TracChangeset
for help on using the changeset viewer.