Changeset 4221:a8c72bc698c6 in roaraudio
Legend:
- Unmodified
- Added
- Removed
-
ChangeLog
r4220 r4221 1 1 v. 0.4beta0 - ? 2 * fixed FTBFS with newer versions of RSound 2 3 3 4 v. 0.3 - Sun Aug 22 2010 26:14 CEST -
configure
r4198 r4221 1605 1605 1606 1606 1607 echo -n 'checking for struct rsound'\''s sample size member... ' 1608 1609 cat > $TF_C << EOF 1610 #define RSD_EXPOSE_STRUCT 1611 #include <rsound.h> 1612 1613 int main (void) { 1614 rsound_t var; 1615 1616 var.samplesize = 0; 1617 1618 return 0; 1619 } 1620 EOF 1621 if $CCTF 2> /dev/null; 1622 then 1623 echo '#define ROAR_HAVE_RSOUND_SAMPLESIZE' >&3 1624 echo '#define ROAR_HAVE_RSOUND_SAMPLESIZE_MEMBER samplesize' >&3 1625 echo samplesize 1626 else 1627 echo '#define ROAR_HAVE_RSOUND_SAMPLESIZE_MEMBER framesize' >&3 1628 echo framesize 1629 fi 1630 1607 1631 echo -n 'checking for safe 32 bit integer overflow... ' 1608 1632 -
libroarrsound/libroarrsound.c
r3945 r4221 30 30 */ 31 31 32 #define RSD_EXPOSE_STRUCT 32 33 #include "libroarrsound.h" 33 34 … … 208 209 case RSD_FORMAT: 209 210 self->rsound.format = *(int*)param; 211 #ifdef ROAR_HAVE_RSOUND_SAMPLESIZE 212 self->rsound.samplesize = libroarrsound_fmt2fs(self->rsound.format); 213 #else 210 214 self->rsound.framesize = libroarrsound_fmt2fs(self->rsound.format); 215 #endif 211 216 break; 212 217 default: … … 441 446 return -1; 442 447 448 #ifdef ROAR_HAVE_RSOUND_SAMPLESIZE 449 return (rsd_delay(rd) * 1000) / (rd->rate * rd->channels * rd->samplesize); 450 #else 443 451 return (rsd_delay(rd) * 1000) / (rd->rate * rd->channels * rd->framesize); 452 #endif 444 453 } 445 454 … … 449 458 return -1; 450 459 460 #ifdef ROAR_HAVE_RSOUND_SAMPLESIZE 461 return rd->samplesize; 462 #else 451 463 return rd->framesize; 464 #endif 452 465 } 453 466
Note: See TracChangeset
for help on using the changeset viewer.