diff options
| author | Benny Prijono <bennylp@teluu.com> | 2006-04-03 09:43:36 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2006-04-03 09:43:36 +0000 |
| commit | 36172a516bdefa411c3cb77dfb6d44e07e3383f3 (patch) | |
| tree | f53d2e1d1035b5c916b66cc104ad5b14dac63046 /pjmedia/include | |
| parent | bcd6ef00a511ababa0917773628c490a592ef088 (diff) | |
Added DirectSound sound implementation
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@371 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/include')
| -rw-r--r-- | pjmedia/include/pjmedia/config.h | 19 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia/errno.h | 1 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pjmedia/include/pjmedia/config.h b/pjmedia/include/pjmedia/config.h index 8e111045..a0c8bcf2 100644 --- a/pjmedia/include/pjmedia/config.h +++ b/pjmedia/include/pjmedia/config.h @@ -21,21 +21,20 @@ #include <pj/config.h> -/** - * Unless specified otherwise, PortAudio is enabled by default. +/* + * Types of sound stream backends. */ -#ifndef PJMEDIA_HAS_PORTAUDIO_SOUND -# define PJMEDIA_HAS_PORTAUDIO_SOUND 1 -#endif +#define PJMEDIA_SOUND_NULL_SOUND 0 +#define PJMEDIA_SOUND_PORTAUDIO_SOUND 1 +#define PJMEDIA_SOUND_WIN32_DIRECT_SOUND 2 /** - * Unless specified otherwise, Null sound is disabled. - * This option is mutually exclusive with PortAudio sound, or otherwise - * duplicate symbols error will occur. + * Unless specified otherwise, sound device uses PortAudio implementation + * by default. */ -#ifndef PJMEDIA_HAS_NULL_SOUND -# define PJMEDIA_HAS_NULL_SOUND 0 +#ifndef PJMEDIA_SOUND_IMPLEMENTATION +# define PJMEDIA_SOUND_IMPLEMENTATION PJMEDIA_SOUND_PORTAUDIO_SOUND #endif diff --git a/pjmedia/include/pjmedia/errno.h b/pjmedia/include/pjmedia/errno.h index 59e665d8..213b90a9 100644 --- a/pjmedia/include/pjmedia/errno.h +++ b/pjmedia/include/pjmedia/errno.h @@ -19,6 +19,7 @@ #ifndef __PJMEDIA_ERRNO_H__ #define __PJMEDIA_ERRNO_H__ +#include <pjmedia/types.h> #include <pj/errno.h> PJ_BEGIN_DECL |