Changeset 4221:a8c72bc698c6 in roaraudio

Timestamp:

08/23/10 14:48:06 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed FTBFS with newer versions of RSound

Files:

• ChangeLog (modified) (1 diff)
• configure (modified) (1 diff)
• libroarrsound/libroarrsound.c (modified) (4 diffs)

ChangeLog

@@ -1 +1 @@
 v. 0.4beta0 - ?
+        * fixed FTBFS with newer versions of RSound
 
 v. 0.3 - Sun Aug 22 2010 26:14 CEST

configure

@@ -1605 +1605 @@
 
 
+echo -n 'checking for struct rsound'\''s sample size member... '
+
+cat > $TF_C << EOF
+#define RSD_EXPOSE_STRUCT
+#include <rsound.h>
+
+int main (void) {
+ rsound_t var;
+
+ var.samplesize = 0;
+
+ return 0;
+}
+EOF
+if $CCTF 2> /dev/null;
+then
+ echo '#define ROAR_HAVE_RSOUND_SAMPLESIZE'     >&3
+ echo '#define ROAR_HAVE_RSOUND_SAMPLESIZE_MEMBER samplesize'   >&3
+ echo samplesize
+else
+ echo '#define ROAR_HAVE_RSOUND_SAMPLESIZE_MEMBER framesize'   >&3
+ echo framesize
+fi
+
 echo -n 'checking for safe 32 bit integer overflow... '
 

libroarrsound/libroarrsound.c

@@ -30 +30 @@
  */
 
+#define RSD_EXPOSE_STRUCT
 #include "libroarrsound.h"
 
@@ -208 +209 @@
   case RSD_FORMAT:
     self->rsound.format = *(int*)param;
+#ifdef ROAR_HAVE_RSOUND_SAMPLESIZE
+    self->rsound.samplesize = libroarrsound_fmt2fs(self->rsound.format);
+#else
     self->rsound.framesize = libroarrsound_fmt2fs(self->rsound.format);
+#endif
    break;
   default:
@@ -441 +446 @@
   return -1;
 
+#ifdef ROAR_HAVE_RSOUND_SAMPLESIZE
+ return (rsd_delay(rd) * 1000) / (rd->rate * rd->channels * rd->samplesize);
+#else
  return (rsd_delay(rd) * 1000) / (rd->rate * rd->channels * rd->framesize);
+#endif
 }
 
@@ -449 +458 @@
   return -1;
 
+#ifdef ROAR_HAVE_RSOUND_SAMPLESIZE
+ return rd->samplesize;
+#else
  return rd->framesize;
+#endif
 }