Changeset 4221:a8c72bc698c6 in roaraudio for libroarrsound


Ignore:
Timestamp:
08/23/10 14:48:06 (14 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

fixed FTBFS with newer versions of RSound

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libroarrsound/libroarrsound.c

    r3945 r4221  
    3030 */ 
    3131 
     32#define RSD_EXPOSE_STRUCT 
    3233#include "libroarrsound.h" 
    3334 
     
    208209  case RSD_FORMAT: 
    209210    self->rsound.format = *(int*)param; 
     211#ifdef ROAR_HAVE_RSOUND_SAMPLESIZE 
     212    self->rsound.samplesize = libroarrsound_fmt2fs(self->rsound.format); 
     213#else 
    210214    self->rsound.framesize = libroarrsound_fmt2fs(self->rsound.format); 
     215#endif 
    211216   break; 
    212217  default: 
     
    441446  return -1; 
    442447 
     448#ifdef ROAR_HAVE_RSOUND_SAMPLESIZE 
     449 return (rsd_delay(rd) * 1000) / (rd->rate * rd->channels * rd->samplesize); 
     450#else 
    443451 return (rsd_delay(rd) * 1000) / (rd->rate * rd->channels * rd->framesize); 
     452#endif 
    444453} 
    445454 
     
    449458  return -1; 
    450459 
     460#ifdef ROAR_HAVE_RSOUND_SAMPLESIZE 
     461 return rd->samplesize; 
     462#else 
    451463 return rd->framesize; 
     464#endif 
    452465} 
    453466 
Note: See TracChangeset for help on using the changeset viewer.