Changeset 1517:ec7f4b1f07a1 in roaraudio

Timestamp:

04/11/09 18:15:48 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Changed VIO CTLs in a binary inkompatible way

Files:

• ChangeLog (modified) (1 diff)
• include/libroar/vio.h (modified) (1 diff)

ChangeLog

@@ -4 +4 @@
         * updated manpages
         * also build libroar{,dsp}.a
+        * Changed VIO CTLs in a binary inkompatible way
 
 v. 0.2beta2 - Fri Mar 27 2009 21:20

include/libroar/vio.h

@@ -50 +50 @@
  */
 
+#define ROAR_VIO_CTL_GET                  0x1
+#define ROAR_VIO_CTL_SET                  0x2
+#define ROAR_VIO_CTL_CLIENT            0x0000
+#define ROAR_VIO_CTL_SERVER            0x1000
+#define ROAR_VIO_CTL_GENERIC     (0x0000<<16)
+#define ROAR_VIO_CTL_STREAM      (0x0001<<16)
+#define ROAR_VIO_CTL_DRIVER      (0x0002<<16)
+
 // basic calls:
-#define ROAR_VIO_CTL_GET_NEXT          0x0101
-#define ROAR_VIO_CTL_SET_NEXT          0x0102
-#define ROAR_VIO_CTL_GET_FH            0x0110
-#define ROAR_VIO_CTL_GET_READ_FH       0x0111
-#define ROAR_VIO_CTL_GET_WRITE_FH      0x0112
-#define ROAR_VIO_CTL_SELECT            0x0120
+#define ROAR_VIO_CTL_GET_NEXT          (ROAR_VIO_CTL_GENERIC|ROAR_VIO_CTL_GET|0x0100)
+#define ROAR_VIO_CTL_SET_NEXT          (ROAR_VIO_CTL_GENERIC|ROAR_VIO_CTL_SET|0x0100)
+#define ROAR_VIO_CTL_GET_FH            (ROAR_VIO_CTL_GENERIC|0x0110)
+#define ROAR_VIO_CTL_GET_READ_FH       (ROAR_VIO_CTL_GENERIC|0x0111)
+#define ROAR_VIO_CTL_GET_WRITE_FH      (ROAR_VIO_CTL_GENERIC|0x0112)
+#define ROAR_VIO_CTL_SELECT            (ROAR_VIO_CTL_GENERIC|0x0120)
 
 // stream:
-#define ROAR_VIO_CTL_SET_STREAM    0x00010001 /* normal streams */
-#define ROAR_VIO_CTL_GET_STREAM    0x00010002
+#define ROAR_VIO_CTL_SET_STREAM    (ROAR_VIO_CTL_STREAM|ROAR_VIO_CTL_CLIENT|ROAR_VIO_CTL_SET) /* normal streams */
+#define ROAR_VIO_CTL_GET_STREAM    (ROAR_VIO_CTL_STREAM|ROAR_VIO_CTL_CLIENT|ROAR_VIO_CTL_GET)
 
-#define ROAR_VIO_CTL_SET_SSTREAM   0x00011001 /* server streams */
-#define ROAR_VIO_CTL_GET_SSTREAM   0x00011002
+#define ROAR_VIO_CTL_SET_SSTREAM   (ROAR_VIO_CTL_STREAM|ROAR_VIO_CTL_SERVER|ROAR_VIO_CTL_SET) /* server streams */
+#define ROAR_VIO_CTL_GET_SSTREAM   (ROAR_VIO_CTL_STREAM|ROAR_VIO_CTL_SERVER|ROAR_VIO_CTL_GET)
 
-#define ROAR_VIO_CTL_GET_DELAY     0x00010011 /* return in bytes as the vio interface */
+#define ROAR_VIO_CTL_SET_AUINFO    (ROAR_VIO_CTL_STREAM|ROAR_VIO_CTL_SET|0x2000) /* set a struct roar_audio_info */
+#define ROAR_VIO_CTL_GET_AUINFO    (ROAR_VIO_CTL_STREAM|ROAR_VIO_CTL_GET|0x2000) /* get a struct roar_audio_info */
+
+#define ROAR_VIO_CTL_GET_DELAY     (ROAR_VIO_CTL_STREAM|ROAR_VIO_CTL_GET|0x010) /* return in bytes as the vio interface */
                                               /* does not know anything about streams */
 
-#define ROAR_VIO_CTL_GET_DBLOCKS   0x00020001 /* get Driver Blocks */
-#define ROAR_VIO_CTL_SET_DBLOCKS   0x00020002 /* set Driver Blocks */
-#define ROAR_VIO_CTL_GET_DBLKSIZE  0x00020003 /* get Driver Blocks size (in byte) */
+#define ROAR_VIO_CTL_GET_DBLOCKS   (ROAR_VIO_CTL_DRIVER|0x0001) /* get Driver Blocks */
+#define ROAR_VIO_CTL_SET_DBLOCKS   (ROAR_VIO_CTL_DRIVER|0x0002) /* set Driver Blocks */
+#define ROAR_VIO_CTL_GET_DBLKSIZE  (ROAR_VIO_CTL_DRIVER|0x0003) /* get Driver Blocks size (in byte) */
 
 // sys io: