Changeset 4097:7517aa33cf65 in roaraudio

Timestamp:

07/25/10 15:33:12 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

moved #defines to where they should be

Location:

include

Files:

• libroar/beep.h (modified) (1 diff)
• libroar/socket.h (modified) (1 diff)
• libroar/stream.h (modified) (1 diff)
• roaraudio.h (modified) (2 diffs)
• roaraudio/beep.h (added)
• roaraudio/socket.h (added)
• roaraudio/stream.h (modified) (2 diffs)

include/libroar/beep.h

@@ -39 +39 @@
 #include "libroar.h"
 
-#define ROAR_BEEP_MAX_VOL  65535
-#define ROAR_BEEP_MAX_TIME 65535 /* ms */
-#define ROAR_BEEP_MAX_FREQ 65535 /* Hz */
-#define ROAR_BEEP_MAX_POS  32767
-
-#define ROAR_BEEP_DEFAULT_VOL  (ROAR_BEEP_MAX_VOL/4)
-#define ROAR_BEEP_DEFAULT_TIME 256 /* ms */
-#define ROAR_BEEP_DEFAULT_FREQ 440 /* Hz */
-#define ROAR_BEEP_DEFAULT_TYPE ROAR_BEEP_TYPE_DEFAULT
-
-#define ROAR_BEEP_TYPE_DEFAULT            0
-#define ROAR_BEEP_TYPE_CBELL              1
-#define ROAR_BEEP_TYPE_XBELL              2
-#define ROAR_BEEP_TYPE_ERROR              3
-
 struct roar_beep {
  uint16_t vol;

include/libroar/socket.h

@@ -42 +42 @@
 #define ROAR_SOCKET_MODE_LISTEN  1
 #define ROAR_SOCKET_MODE_CONNECT 2
-
-#define ROAR_SOCKET_TYPE_NONE    0
-#define ROAR_SOCKET_TYPE_UNKNOWN ROAR_SOCKET_TYPE_NONE
-#define ROAR_SOCKET_TYPE_INET    1
-#define ROAR_SOCKET_TYPE_TCP     ROAR_SOCKET_TYPE_INET
-#define ROAR_SOCKET_TYPE_UNIX    2
-#define ROAR_SOCKET_TYPE_FORK    3
-#define ROAR_SOCKET_TYPE_PIPE    ROAR_SOCKET_TYPE_FORK
-#define ROAR_SOCKET_TYPE_FILE    4
-#define ROAR_SOCKET_TYPE_UDP     5
-#define ROAR_SOCKET_TYPE_GENSTR  6 /* generic stream: TCP or UNIX */
-#define ROAR_SOCKET_TYPE_DECNET  7 /* DECnet */
-#define ROAR_SOCKET_TYPE_TCP6    8
-#define ROAR_SOCKET_TYPE_UDP6    9
-#define ROAR_SOCKET_TYPE_INET6   ROAR_SOCKET_TYPE_TCP6
-#define ROAR_SOCKET_TYPE_IPXSPX  10
-#define ROAR_SOCKET_TYPE_IPX     11
-
-#define ROAR_SOCKET_TYPE_MAX  11
 
 #define ROAR_SOCKET_QUEUE_LEN 8

include/libroar/stream.h

@@ -41 +41 @@
 char * roar_dir2str (int dir);
 int    roar_str2dir (char * name);
-
-#define ROAR_FLAG_NONE           0x0000
-#define ROAR_FLAG_PRIMARY        0x0001
-#define ROAR_FLAG_OUTPUT         0x0002
-#define ROAR_FLAG_DRIVER         ROAR_FLAG_OUTPUT
-#define ROAR_FLAG_SOURCE         0x0004
-#define ROAR_FLAG_SYNC           0x0008
-#define ROAR_FLAG_META           0x0010
-#define ROAR_FLAG_AUTOCONF       0x0020
-#define ROAR_FLAG_CLEANMETA      0x0040
-#define ROAR_FLAG_HWMIXER        0x0080
-#define ROAR_FLAG_PAUSE          0x0100
-#define ROAR_FLAG_MUTE           0x0200
-#define ROAR_FLAG_MMAP           0x0400
-#define ROAR_FLAG_ANTIECHO       0x0800
-#define ROAR_FLAG_VIRTUAL        0x1000
-#define ROAR_FLAG_RECSOURCE      0x2000
-#define ROAR_FLAG_PASSMIXER      0x4000
-#define ROAR_FLAG_PRETHRU        0x8000
-// next are the exteded flags (> 16 bits)
-//#define ROAR_FLAG_SYNC           0x08
-#define ROAR_FLAG_IMMUTABLE      0x00010000
-#define ROAR_FLAG_ENHANCE        0x00020000
-
-#define ROAR_SET_FLAG            0
-#define ROAR_RESET_FLAG          1
-
-#define ROAR_STREAMSTATE_UNKNOWN   -1
-#define ROAR_STREAMSTATE_NULL       0
-#define ROAR_STREAMSTATE_UNUSED     ROAR_STREAMSTATE_NULL
-#define ROAR_STREAMSTATE_INITING    1
-#define ROAR_STREAMSTATE_NEW        2
-#define ROAR_STREAMSTATE_OLD        3
-#define ROAR_STREAMSTATE_CLOSING    4
-
-// PA currently defines: video, music, game, event, phone, animation, production, a11y
-// RA includes         : YES    YES    YES   YES    YES    NO         NO          NO
-
-#define ROAR_ROLE_UNKNOWN          -1
-#define ROAR_ROLE_NONE              0
-#define ROAR_ROLE_MUSIC             1
-#define ROAR_ROLE_VIDEO             2
-#define ROAR_ROLE_GAME              3
-#define ROAR_ROLE_EVENT             4
-#define ROAR_ROLE_BEEP              5
-#define ROAR_ROLE_PHONE             6
-#define ROAR_ROLE_BACKGROUND_MUSIC  7
-#define ROAR_ROLE_VOICE             8
-#define ROAR_ROLE_INSTRUMENT        9
-#define ROAR_ROLE_RHYTHM           10
-#define ROAR_ROLE_CLICK            11
-#define ROAR_ROLE_MIXED            12
 
 struct roar_stream_info {

include/roaraudio.h

@@ -140 +140 @@
 #include <roaraudio/client.h>
 #include <roaraudio/sample.h>
+#include <roaraudio/beep.h>
 #include <roaraudio/meta.h>
 #include <roaraudio/genre.h>
@@ -145 +146 @@
 #include <roaraudio/misc.h>
 #include <roaraudio/byteorder.h>
+#include <roaraudio/socket.h>
 
 #include <libroar/libroar.h>

include/roaraudio/stream.h

@@ -72 +72 @@
 #define ROAR_DIR_DIRIDS     22
 
+// Stream flags:
+#define ROAR_FLAG_NONE           0x0000
+#define ROAR_FLAG_PRIMARY        0x0001
+#define ROAR_FLAG_OUTPUT         0x0002
+#define ROAR_FLAG_DRIVER         ROAR_FLAG_OUTPUT
+#define ROAR_FLAG_SOURCE         0x0004
+#define ROAR_FLAG_SYNC           0x0008
+#define ROAR_FLAG_META           0x0010
+#define ROAR_FLAG_AUTOCONF       0x0020
+#define ROAR_FLAG_CLEANMETA      0x0040
+#define ROAR_FLAG_HWMIXER        0x0080
+#define ROAR_FLAG_PAUSE          0x0100
+#define ROAR_FLAG_MUTE           0x0200
+#define ROAR_FLAG_MMAP           0x0400
+#define ROAR_FLAG_ANTIECHO       0x0800
+#define ROAR_FLAG_VIRTUAL        0x1000
+#define ROAR_FLAG_RECSOURCE      0x2000
+#define ROAR_FLAG_PASSMIXER      0x4000
+#define ROAR_FLAG_PRETHRU        0x8000
+// next are the exteded flags (> 16 bits)
+//#define ROAR_FLAG_SYNC           0x08
+#define ROAR_FLAG_IMMUTABLE      0x00010000
+#define ROAR_FLAG_ENHANCE        0x00020000
+
+#define ROAR_SET_FLAG            0
+#define ROAR_RESET_FLAG          1
+
+// Stream states:
+#define ROAR_STREAMSTATE_UNKNOWN   -1
+#define ROAR_STREAMSTATE_NULL       0
+#define ROAR_STREAMSTATE_UNUSED     ROAR_STREAMSTATE_NULL
+#define ROAR_STREAMSTATE_INITING    1
+#define ROAR_STREAMSTATE_NEW        2
+#define ROAR_STREAMSTATE_OLD        3
+#define ROAR_STREAMSTATE_CLOSING    4
+
+// Stream roles:
+// PA currently defines: video, music, game, event, phone, animation, production, a11y
+// RA includes         : YES    YES    YES   YES    YES    NO         NO          NO
+
+#define ROAR_ROLE_UNKNOWN          -1
+#define ROAR_ROLE_NONE              0
+#define ROAR_ROLE_MUSIC             1
+#define ROAR_ROLE_VIDEO             2
+#define ROAR_ROLE_GAME              3
+#define ROAR_ROLE_EVENT             4
+#define ROAR_ROLE_BEEP              5
+#define ROAR_ROLE_PHONE             6
+#define ROAR_ROLE_BACKGROUND_MUSIC  7
+#define ROAR_ROLE_VOICE             8
+#define ROAR_ROLE_INSTRUMENT        9
+#define ROAR_ROLE_RHYTHM           10
+#define ROAR_ROLE_CLICK            11
+#define ROAR_ROLE_MIXED            12
+
 
 #define ROAR_CARE_NOPOS  0
@@ -79 +134 @@
 
 #define ROAR_STREAMS_MAX  64
+
 
 struct roar_stream {