projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020511-1-src
[rocksndiamonds.git]
/
src
/
libgame
/
sound.h
diff --git
a/src/libgame/sound.h
b/src/libgame/sound.h
index 4e26eba1aaebc8b55e41d847dfea6960fb838495..13d0b356f91b83290b7b0c197bc09b730f7b3c61 100644
(file)
--- a/
src/libgame/sound.h
+++ b/
src/libgame/sound.h
@@
-36,6
+36,10
@@
#include "system.h"
#include "system.h"
+#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
+#define AUDIO_UNIX_NATIVE
+#endif
+
#if defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) || defined(VOXWARE)
#define AUDIO_LINUX_IOCTL
#endif
#if defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) || defined(VOXWARE)
#define AUDIO_LINUX_IOCTL
#endif
@@
-55,6
+59,7
@@
#define AUDIO_NUM_CHANNELS_MONO 1
#define AUDIO_NUM_CHANNELS_STEREO 2
#define AUDIO_NUM_CHANNELS_MONO 1
#define AUDIO_NUM_CHANNELS_STEREO 2
+#define AUDIO_FORMAT_UNKNOWN (0)
#define AUDIO_FORMAT_U8 (1 << 0)
#define AUDIO_FORMAT_S16 (1 << 1)
#define AUDIO_FORMAT_LE (1 << 2)
#define AUDIO_FORMAT_U8 (1 << 0)
#define AUDIO_FORMAT_S16 (1 << 1)
#define AUDIO_FORMAT_LE (1 << 2)
@@
-71,7
+76,12
@@
#define SOUND_FADING_VOLUME_THRESHOLD (SOUND_FADING_VOLUME_STEP * 2)
#endif
#define SOUND_FADING_VOLUME_THRESHOLD (SOUND_FADING_VOLUME_STEP * 2)
#endif
+#if defined(AUDIO_STREAMING_DSP)
#define DEFAULT_AUDIO_SAMPLE_RATE AUDIO_SAMPLE_RATE_22050
#define DEFAULT_AUDIO_SAMPLE_RATE AUDIO_SAMPLE_RATE_22050
+#else
+#define DEFAULT_AUDIO_SAMPLE_RATE AUDIO_SAMPLE_RATE_8000
+#endif
+
#define DEFAULT_AUDIO_FRAGMENT_SIZE_UNIX AUDIO_FRAGMENT_SIZE_512
#define DEFAULT_AUDIO_FRAGMENT_SIZE_WIN32 AUDIO_FRAGMENT_SIZE_2048
#define DEFAULT_AUDIO_FRAGMENT_SIZE_UNIX AUDIO_FRAGMENT_SIZE_512
#define DEFAULT_AUDIO_FRAGMENT_SIZE_WIN32 AUDIO_FRAGMENT_SIZE_2048
@@
-209,14
+219,14
@@
struct SoundEffectInfo
};
struct SampleInfo
};
struct SampleInfo
-{
- int type;
+{
char *source_filename;
int num_references;
char *source_filename;
int num_references;
+ int type;
+ int format;
long data_len;
void *data_ptr;
long data_len;
void *data_ptr;
- int format;
};
typedef struct SampleInfo SoundInfo;
};
typedef struct SampleInfo SoundInfo;
@@
-259,38
+269,30
@@
struct SoundControl
int volume;
int stereo;
int volume;
int stereo;
-#if 1
int state;
int state;
-#else
- boolean loop;
- boolean music;
- boolean fade_sound;
- boolean stop_sound;
- boolean stop_all_sounds;
- boolean reload_sounds;
- boolean reload_music;
-#endif
int playingtime;
long playingpos;
int playingtime;
long playingpos;
+ int type;
+ int format;
long data_len;
void *data_ptr;
long data_len;
void *data_ptr;
- int format;
#if defined(PLATFORM_MSDOS)
int voice;
#endif
};
#if defined(PLATFORM_MSDOS)
int voice;
#endif
};
+typedef struct SoundControl SoundControl;
+
/* general sound functions */
void UnixOpenAudio(void);
void UnixCloseAudio(void);
/* general sound functions */
void UnixOpenAudio(void);
void UnixCloseAudio(void);
-/* sound server functions */
-void InitPlaylist(void);
-void StartSoundserver(void);
-void SoundServer(void);
+/* mixer functions */
+void Mixer_InitChannels(void);
+void StartMixer(void);
/* sound client functions */
void PlayMusic(int);
/* sound client functions */
void PlayMusic(int);