/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2002 Artsoft Entertainment *
+* (c) 1994-2006 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
#include <dirent.h>
#include <signal.h>
#include <math.h>
+#include <errno.h>
#include "platform.h"
#define SOUND_FADING_VOLUME_THRESHOLD (SOUND_FADING_VOLUME_STEP * 2)
#endif
-#if !defined(PLATFORM_HPUX)
-#define SND_BLOCKSIZE 4096
-#else
-#define SND_BLOCKSIZE 32768
-#endif
-
#define SND_TYPE_NONE 0
#define SND_TYPE_WAV 1
#define SAME_SOUND_NR(x,y) ((x).nr == (y).nr)
#define SAME_SOUND_DATA(x,y) ((x).data_ptr == (y).data_ptr)
-#if 0
-struct SoundHeader_SUN
-{
- unsigned long magic;
- unsigned long hdr_size;
- unsigned long data_size;
- unsigned long encoding;
- unsigned long sample_rate;
- unsigned long channels;
-};
+#define SOUND_VOLUME_FROM_PERCENT(v,p) ((p) < 0 ? SOUND_MIN_VOLUME : \
+ (p) > 100 ? (v) : \
+ (p) * (v) / 100)
+
+#define SOUND_VOLUME_SIMPLE(v) SOUND_VOLUME_FROM_PERCENT(v, setup.volume_simple)
+#define SOUND_VOLUME_LOOPS(v) SOUND_VOLUME_FROM_PERCENT(v, setup.volume_loops)
+#define SOUND_VOLUME_MUSIC(v) SOUND_VOLUME_FROM_PERCENT(v, setup.volume_music)
+
+#define SETUP_SOUND_VOLUME(v,s) ((s) == SND_CTRL_PLAY_MUSIC ? \
+ SOUND_VOLUME_MUSIC(v) : \
+ (s) == SND_CTRL_PLAY_LOOP ? \
+ SOUND_VOLUME_LOOPS(v) : \
+ SOUND_VOLUME_SIMPLE(v))
-struct SoundHeader_8SVX
-{
- char magic_FORM[4];
- unsigned long chunk_size;
- char magic_8SVX[4];
-};
-#endif
#if defined(AUDIO_UNIX_NATIVE)
struct SoundHeader_WAV
{
unsigned short compression_code;
unsigned short num_channels;
- unsigned long sample_rate;
- unsigned long bytes_per_second;
+ unsigned int sample_rate;
+ unsigned int bytes_per_second;
unsigned short block_align;
unsigned short bits_per_sample;
};
int type;
int format;
void *data_ptr; /* pointer to first sample (8 or 16 bit) */
- long data_len; /* number of samples, NOT number of bytes */
+ int data_len; /* number of samples, NOT number of bytes */
+ int num_channels; /* mono: 1 channel, stereo: 2 channels */
};
typedef struct SampleInfo SoundInfo;
typedef struct SampleInfo MusicInfo;
int state;
- unsigned long playing_starttime;
- unsigned long playing_pos;
+ unsigned int playing_starttime;
+ unsigned int playing_pos;
int type;
int format;
void *data_ptr; /* pointer to first sample (8 or 16 bit) */
- long data_len; /* number of samples, NOT number of bytes */
+ int data_len; /* number of samples, NOT number of bytes */
+ int num_channels; /* mono: 1 channel, stereo: 2 channels */
#if defined(TARGET_ALLEGRO)
int voice;
typedef struct SoundControl SoundControl;
static struct ArtworkListInfo *sound_info = NULL;
-static SoundInfo **Sound = NULL;
-static MusicInfo **Music = NULL;
-static int num_sounds = 0, num_music = 0;
+static struct ArtworkListInfo *music_info = NULL;
+
+static MusicInfo **Music_NoConf = NULL;
+
+static int num_music_noconf = 0;
static int stereo_volume[SOUND_MAX_LEFT2RIGHT + 1];
static void ReloadCustomSounds();
static void ReloadCustomMusic();
static void FreeSound(void *);
+static void FreeMusic(void *);
+static void FreeAllMusic_NoConf();
+
+static SoundInfo *getSoundInfoEntryFromSoundID(int);
+static MusicInfo *getMusicInfoEntryFromMusicID(int);
/* ------------------------------------------------------------------------- */
int i;
/* look for available audio devices, starting with preferred ones */
- for (i=0; i<sizeof(audio_device_name)/sizeof(char *); i++)
+ for (i = 0; i < sizeof(audio_device_name)/sizeof(char *); i++)
if ((audio_device_fd = OpenAudioDevice(audio_device_name[i])) >= 0)
break;
return FALSE;
}
-#if 0
- printf("PID: %d [%s]\n", getpid(),
- (IS_CHILD_PROCESS(audio.mixer_pid) ? "child" : "parent"));
- Delay(10000 * 0);
-#endif
+ if (audio.mixer_pid == 0) /* we are the child process */
+ audio.mixer_pid = getpid();
- if (IS_CHILD_PROCESS(audio.mixer_pid))
+ if (IS_CHILD_PROCESS())
Mixer_Main(); /* this function never returns */
else
close(audio.mixer_pipe[0]); /* no reading from pipe needed */
if (audio.device_fd)
close(audio.device_fd);
- if (IS_PARENT_PROCESS(audio.mixer_pid))
+ if (IS_PARENT_PROCESS() && HAS_CHILD_PROCESS())
kill(audio.mixer_pid, SIGTERM);
}
/* "ioctl()" expects pointer to 'int' value for stereo flag
(boolean is defined as 'char', which will not work here) */
unsigned int fragment_spec = 0;
- int fragment_size_query;
+ int fragment_size_query = -1;
int stereo = TRUE;
struct
{
static void SendSoundControlToMixerProcess(SoundControl *snd_ctrl)
{
- if (IS_CHILD_PROCESS(audio.mixer_pid))
+ if (IS_CHILD_PROCESS())
return;
if (write(audio.mixer_pipe[1], snd_ctrl, sizeof(SoundControl)) < 0)
static void ReadSoundControlFromMainProcess(SoundControl *snd_ctrl)
{
- if (IS_PARENT_PROCESS(audio.mixer_pid))
+ if (IS_PARENT_PROCESS())
return;
if (read(audio.mixer_pipe[0], snd_ctrl, sizeof(SoundControl))
SoundControl snd_ctrl;
TreeInfo *ti = (type == SND_CTRL_RELOAD_SOUNDS ? artwork.snd_current :
artwork.mus_current);
- unsigned long str_size1 = strlen(leveldir_current->fullpath) + 1;
- unsigned long str_size2 = strlen(leveldir_current->sounds_path) + 1;
- unsigned long str_size3 = strlen(leveldir_current->music_path) + 1;
- unsigned long str_size4 = strlen(ti->basepath) + 1;
- unsigned long str_size5 = strlen(ti->fullpath) + 1;
+ unsigned int str_size1 = strlen(leveldir_current->fullpath) + 1;
+ unsigned int str_size2 = strlen(leveldir_current->sounds_path) + 1;
+ unsigned int str_size3 = strlen(leveldir_current->music_path) + 1;
+ unsigned int str_size4 = strlen(ti->basepath) + 1;
+ unsigned int str_size5 = strlen(ti->fullpath) + 1;
boolean override_level_artwork = (type == SND_CTRL_RELOAD_SOUNDS ?
- setup.override_level_sounds :
- setup.override_level_music);
+ gfx.override_level_sounds :
+ gfx.override_level_music);
- if (IS_CHILD_PROCESS(audio.mixer_pid))
+ if (IS_CHILD_PROCESS())
return;
if (leveldir_current == NULL) /* should never happen */
Error(ERR_EXIT, "leveldir_current == NULL");
+ clear_mem(&snd_ctrl, sizeof(SoundControl)); /* to make valgrind happy */
+
snd_ctrl.active = FALSE;
snd_ctrl.state = type;
snd_ctrl.data_len = strlen(set_identifier) + 1;
write(audio.mixer_pipe[1], ti,
sizeof(TreeInfo)) < 0 ||
write(audio.mixer_pipe[1], &str_size1,
- sizeof(unsigned long)) < 0 ||
+ sizeof(unsigned int)) < 0 ||
write(audio.mixer_pipe[1], &str_size2,
- sizeof(unsigned long)) < 0 ||
+ sizeof(unsigned int)) < 0 ||
write(audio.mixer_pipe[1], &str_size3,
- sizeof(unsigned long)) < 0 ||
+ sizeof(unsigned int)) < 0 ||
write(audio.mixer_pipe[1], &str_size4,
- sizeof(unsigned long)) < 0 ||
+ sizeof(unsigned int)) < 0 ||
write(audio.mixer_pipe[1], &str_size5,
- sizeof(unsigned long)) < 0 ||
+ sizeof(unsigned int)) < 0 ||
write(audio.mixer_pipe[1], leveldir_current->fullpath,
str_size1) < 0 ||
write(audio.mixer_pipe[1], leveldir_current->sounds_path,
TreeInfo **ti_ptr = ((snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS) ?
&artwork.snd_current : &artwork.mus_current);
TreeInfo *ti = *ti_ptr;
- unsigned long str_size1, str_size2, str_size3, str_size4, str_size5;
+ unsigned int str_size1, str_size2, str_size3, str_size4, str_size5;
static char *set_identifier = NULL;
boolean *override_level_artwork = (snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS ?
- &setup.override_level_sounds :
- &setup.override_level_music);
+ &gfx.override_level_sounds :
+ &gfx.override_level_music);
- if (set_identifier)
- free(set_identifier);
+ checked_free(set_identifier);
set_identifier = checked_malloc(snd_ctrl->data_len);
if (ti == NULL)
ti = *ti_ptr = checked_calloc(sizeof(TreeInfo));
- if (leveldir_current->fullpath != NULL)
- free(leveldir_current->fullpath);
- if (leveldir_current->sounds_path != NULL)
- free(leveldir_current->sounds_path);
- if (leveldir_current->music_path != NULL)
- free(leveldir_current->music_path);
- if (ti->basepath != NULL)
- free(ti->basepath);
- if (ti->fullpath != NULL)
- free(ti->fullpath);
+
+ checked_free(leveldir_current->fullpath);
+ checked_free(leveldir_current->sounds_path);
+ checked_free(leveldir_current->music_path);
+ checked_free(ti->basepath);
+ checked_free(ti->fullpath);
if (read(audio.mixer_pipe[0], set_identifier,
snd_ctrl->data_len) != snd_ctrl->data_len ||
read(audio.mixer_pipe[0], ti,
sizeof(TreeInfo)) != sizeof(TreeInfo) ||
read(audio.mixer_pipe[0], &str_size1,
- sizeof(unsigned long)) != sizeof(unsigned long) ||
+ sizeof(unsigned int)) != sizeof(unsigned int) ||
read(audio.mixer_pipe[0], &str_size2,
- sizeof(unsigned long)) != sizeof(unsigned long) ||
+ sizeof(unsigned int)) != sizeof(unsigned int) ||
read(audio.mixer_pipe[0], &str_size3,
- sizeof(unsigned long)) != sizeof(unsigned long) ||
+ sizeof(unsigned int)) != sizeof(unsigned int) ||
read(audio.mixer_pipe[0], &str_size4,
- sizeof(unsigned long)) != sizeof(unsigned long) ||
+ sizeof(unsigned int)) != sizeof(unsigned int) ||
read(audio.mixer_pipe[0], &str_size5,
- sizeof(unsigned long)) != sizeof(unsigned long))
+ sizeof(unsigned int)) != sizeof(unsigned int))
Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
leveldir_current->fullpath = checked_calloc(str_size1);
{
int i;
- for(i=0; i<audio.num_channels; i++)
+ for (i = 0; i < audio.num_channels; i++)
mixer[i].active = FALSE;
mixer_active_channels = 0;
}
/* Mix_VolumeMusic() must be called _after_ Mix_PlayMusic() --
this looks like a bug in the SDL_mixer library */
Mix_PlayMusic(mixer[audio.music_channel].data_ptr, -1);
- Mix_VolumeMusic(SOUND_MAX_VOLUME);
+ Mix_VolumeMusic(mixer[audio.music_channel].volume);
}
#endif
}
{
SoundInfo *snd_info;
int i, k;
-
-#if 0
- printf("NEW SOUND %d ARRIVED [%d] [%d ACTIVE CHANNELS]\n",
- snd_ctrl.nr, num_sounds, mixer_active_channels);
-#endif
+ int num_sounds = getSoundListSize();
+ int num_music = getMusicListSize();
if (IS_MUSIC(snd_ctrl))
{
- if (num_music == 0)
+ if (snd_ctrl.nr >= num_music) /* invalid music */
return;
- snd_ctrl.nr = snd_ctrl.nr % num_music;
+ if (snd_ctrl.nr < 0) /* undefined music */
+ {
+ if (num_music_noconf == 0) /* no fallback music available */
+ return;
+
+ snd_ctrl.nr = UNMAP_NOCONF_MUSIC(snd_ctrl.nr) % num_music_noconf;
+ snd_info = Music_NoConf[snd_ctrl.nr];
+ }
+ else
+ snd_info = getMusicInfoEntryFromMusicID(snd_ctrl.nr);
+ }
+ else
+ {
+ if (snd_ctrl.nr < 0 || snd_ctrl.nr >= num_sounds)
+ return;
+
+ snd_info = getSoundInfoEntryFromSoundID(snd_ctrl.nr);
}
- else if (snd_ctrl.nr >= num_sounds)
- return;
- snd_info = (IS_MUSIC(snd_ctrl) ? Music[snd_ctrl.nr] : Sound[snd_ctrl.nr]);
if (snd_info == NULL)
return;
/* copy sound sample and format information */
- snd_ctrl.type = snd_info->type;
- snd_ctrl.format = snd_info->format;
- snd_ctrl.data_ptr = snd_info->data_ptr;
- snd_ctrl.data_len = snd_info->data_len;
+ snd_ctrl.type = snd_info->type;
+ snd_ctrl.format = snd_info->format;
+ snd_ctrl.data_ptr = snd_info->data_ptr;
+ snd_ctrl.data_len = snd_info->data_len;
+ snd_ctrl.num_channels = snd_info->num_channels;
/* play music samples on a dedicated music channel */
if (IS_MUSIC(snd_ctrl))
}
/* check if (and how often) this sound sample is already playing */
- for (k=0, i=audio.first_sound_channel; i<audio.num_channels; i++)
+ for (k = 0, i = audio.first_sound_channel; i < audio.num_channels; i++)
if (mixer[i].active && SAME_SOUND_DATA(mixer[i], snd_ctrl))
k++;
-#if 0
- printf("SOUND %d [CURRENTLY PLAYING %d TIMES]\n", snd_ctrl.nr, k);
-#endif
-
/* reset expiration delay for already playing loop sounds */
if (k > 0 && IS_LOOP(snd_ctrl))
{
- for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
if (mixer[i].active && SAME_SOUND_DATA(mixer[i], snd_ctrl))
{
-#if 0
- printf("RESETTING EXPIRATION FOR SOUND %d\n", snd_ctrl.nr);
-#endif
-
if (IS_FADING(mixer[i]))
Mixer_UnFadeChannel(i);
Mixer_SetChannelProperties(i);
Mixer_ResetChannelExpiration(i);
-
-#if 0
- printf("RESETTING VOLUME/STEREO FOR SOUND %d TO %d/%d\n",
- snd_ctrl.nr, snd_ctrl.volume, snd_ctrl.stereo_position);
-#endif
}
}
return;
}
-#if 0
- printf("PLAYING NEW SOUND %d\n", snd_ctrl.nr);
-#endif
-
/* don't play sound more than n times simultaneously (with n == 2 for now) */
if (k >= 2)
{
- unsigned long playing_current = Counter();
+ unsigned int playing_current = Counter();
int longest = 0, longest_nr = audio.first_sound_channel;
/* look for oldest equal sound */
- for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
int playing_time = playing_current - mixer[i].playing_starttime;
int actual;
if (mixer_active_channels ==
audio.num_channels - (mixer[audio.music_channel].active ? 0 : 1))
{
- for (i=audio.first_sound_channel; i<audio.num_channels; i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
if (!mixer[i].active)
{
- Error(ERR_RETURN, "Mixer_InsertSound: Channel %d inactive", i);
- Error(ERR_RETURN, "Mixer_InsertSound: This should never happen!");
+ Error(ERR_INFO, "Mixer_InsertSound: Channel %d inactive", i);
+ Error(ERR_INFO, "Mixer_InsertSound: This should never happen!");
mixer_active_channels--;
}
if (mixer_active_channels ==
audio.num_channels - (mixer[audio.music_channel].active ? 0 : 1))
{
- unsigned long playing_current = Counter();
+ unsigned int playing_current = Counter();
int longest = 0, longest_nr = audio.first_sound_channel;
#if 0
#if DEBUG
/* print some debugging information about audio channel usage */
- for (i=audio.first_sound_channel; i<audio.num_channels; i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
- Error(ERR_RETURN, "Mixer_InsertSound: %d [%d]: %ld (%ld)",
- i, mixer[i].active, mixer[i].data_len, (long)mixer[i].data_ptr);
+ Error(ERR_INFO, "Mixer_InsertSound: %d [%d]: %d (%d)",
+ i, mixer[i].active, mixer[i].data_len, (int)mixer[i].data_ptr);
}
#endif
#endif
- for (i=audio.first_sound_channel; i<audio.num_channels; i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
int playing_time = playing_current - mixer[i].playing_starttime;
int actual = 1000 * playing_time / mixer[i].data_len;
}
/* add the new sound to the mixer */
- for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
{
-#if 0
- printf("CHECKING CHANNEL %d FOR SOUND %d ...\n", i, snd_ctrl.nr);
-#endif
-
if (!mixer[i].active)
{
-#if 0
- printf("ADDING NEW SOUND %d TO MIXER\n", snd_ctrl.nr);
-#endif
-
#if defined(AUDIO_UNIX_NATIVE)
if (snd_info->data_len == 0)
{
int i;
#if defined(AUDIO_UNIX_NATIVE)
- if (IS_PARENT_PROCESS(audio.mixer_pid))
+ if (IS_PARENT_PROCESS())
{
SendSoundControlToMixerProcess(&snd_ctrl);
return;
#endif
/* deactivate channels that have expired since the last request */
- for (i=0; i<audio.num_channels; i++)
+ for (i = 0; i < audio.num_channels; i++)
if (mixer[i].active && Mixer_ChannelExpired(i))
Mixer_StopChannel(i);
if (IS_RELOADING(snd_ctrl)) /* load new sound or music files */
{
Mixer_StopMusicChannel();
- for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
Mixer_StopChannel(i);
#if defined(AUDIO_UNIX_NATIVE)
return;
}
- for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
if (SAME_SOUND_NR(mixer[i], snd_ctrl) || ALL_SOUNDS(snd_ctrl))
Mixer_FadeChannel(i);
}
return;
}
- for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+ for (i = audio.first_sound_channel; i < audio.num_channels; i++)
if (SAME_SOUND_NR(mixer[i], snd_ctrl) || ALL_SOUNDS(snd_ctrl))
Mixer_StopChannel(i);
return;
/* initialize stereo position conversion information */
- for(i=0; i<=SOUND_MAX_LEFT2RIGHT; i++)
+ for (i = 0; i <= SOUND_MAX_LEFT2RIGHT; i++)
stereo_volume[i] =
(int)sqrt((float)(SOUND_MAX_LEFT2RIGHT * SOUND_MAX_LEFT2RIGHT - i * i));
static void CopySampleToMixingBuffer(SoundControl *snd_ctrl,
int sample_pos, int sample_size,
- short *buffer_ptr)
+ short *buffer_base_ptr, int buffer_pos,
+ int num_output_channels)
{
- void *sample_ptr = snd_ctrl->data_ptr;
- int i;
+ short *buffer_ptr = buffer_base_ptr + num_output_channels * buffer_pos;
+ int num_channels = snd_ctrl->num_channels;
+ int stepsize = num_channels;
+ int output_stepsize = num_output_channels;
+ int i, j;
if (snd_ctrl->format == AUDIO_FORMAT_U8)
- for (i=0; i<sample_size; i++)
- *buffer_ptr++ =
- ((short)(((byte *)sample_ptr)[sample_pos + i] ^ 0x80)) << 8;
+ {
+ byte *sample_ptr = (byte *)snd_ctrl->data_ptr + num_channels * sample_pos;
+
+ for (i = 0; i < num_output_channels; i++)
+ {
+ int offset = (snd_ctrl->num_channels == 1 ? 0 : i);
+
+ for (j = 0; j < sample_size; j++)
+ buffer_ptr[output_stepsize * j + i] =
+ ((short)(sample_ptr[stepsize * j + offset] ^ 0x80)) << 8;
+ }
+ }
else /* AUDIO_FORMAT_S16 */
- for (i=0; i<sample_size; i++)
- *buffer_ptr++ =
- ((short *)sample_ptr)[sample_pos + i];
+ {
+ short *sample_ptr= (short *)snd_ctrl->data_ptr + num_channels * sample_pos;
+
+ for (i = 0; i < num_output_channels; i++)
+ {
+ int offset = (snd_ctrl->num_channels == 1 ? 0 : i);
+
+ for (j = 0; j < sample_size; j++)
+ buffer_ptr[output_stepsize * j + i] =
+ sample_ptr[stepsize * j + offset];
+ }
+ }
}
#if defined(AUDIO_STREAMING_DSP)
static void Mixer_Main_DSP()
{
- static short premix_first_buffer[SND_BLOCKSIZE];
- static short premix_left_buffer[SND_BLOCKSIZE];
- static short premix_right_buffer[SND_BLOCKSIZE];
- static long premix_last_buffer[SND_BLOCKSIZE];
- static byte playing_buffer[SND_BLOCKSIZE];
+ static short premix_first_buffer[DEFAULT_AUDIO_FRAGMENT_SIZE];
+ static int premix_last_buffer[DEFAULT_AUDIO_FRAGMENT_SIZE];
+ static byte playing_buffer[DEFAULT_AUDIO_FRAGMENT_SIZE];
boolean stereo;
int fragment_size;
int sample_bytes;
int max_sample_size;
+ int num_output_channels;
int i, j;
if (!mixer_active_channels)
stereo = afmt.stereo;
fragment_size = afmt.fragment_size;
sample_bytes = (afmt.format & AUDIO_FORMAT_U8 ? 1 : 2);
- max_sample_size = fragment_size / ((stereo ? 2 : 1) * sample_bytes);
+ num_output_channels = (stereo ? 2 : 1);
+ max_sample_size = fragment_size / (num_output_channels * sample_bytes);
/* first clear the last premixing buffer */
- memset(premix_last_buffer, 0,
- max_sample_size * (stereo ? 2 : 1) * sizeof(long));
+ clear_mem(premix_last_buffer,
+ max_sample_size * num_output_channels * sizeof(int));
- for(i=0; i<audio.num_channels; i++)
+ for (i = 0; i < audio.num_channels; i++)
{
- void *sample_ptr;
+ // void *sample_ptr;
int sample_len;
int sample_pos;
int sample_size;
}
/* pointer, lenght and actual playing position of sound sample */
- sample_ptr = mixer[i].data_ptr;
+ // sample_ptr = mixer[i].data_ptr;
sample_len = mixer[i].data_len;
sample_pos = mixer[i].playing_pos;
sample_size = MIN(max_sample_size, sample_len - sample_pos);
/* copy original sample to first mixing buffer */
CopySampleToMixingBuffer(&mixer[i], sample_pos, sample_size,
- premix_first_buffer);
+ premix_first_buffer, 0, num_output_channels);
/* are we about to restart a looping sound? */
if (IS_LOOP(mixer[i]) && sample_size < max_sample_size)
int restarted_sample_size =
MIN(max_sample_size - sample_size, sample_len);
- if (mixer[i].format == AUDIO_FORMAT_U8)
- for (j=0; j<restarted_sample_size; j++)
- premix_first_buffer[sample_size + j] =
- ((short)(((byte *)sample_ptr)[j] ^ 0x80)) << 8;
- else
- for (j=0; j<restarted_sample_size; j++)
- premix_first_buffer[sample_size + j] =
- ((short *)sample_ptr)[j];
+ CopySampleToMixingBuffer(&mixer[i], 0, restarted_sample_size,
+ premix_first_buffer, sample_size,
+ num_output_channels);
mixer[i].playing_pos = restarted_sample_size;
sample_size += restarted_sample_size;
/* adjust volume of actual sound sample */
if (mixer[i].volume != SOUND_MAX_VOLUME)
- for(j=0; j<sample_size; j++)
+ for (j = 0; j < sample_size * num_output_channels; j++)
premix_first_buffer[j] =
- mixer[i].volume * (long)premix_first_buffer[j] / SOUND_MAX_VOLUME;
+ mixer[i].volume * (int)premix_first_buffer[j] / SOUND_MAX_VOLUME;
- /* fill the last mixing buffer with stereo or mono sound */
+ /* adjust left and right channel volume due to stereo sound position */
if (stereo)
{
int left_volume = SOUND_VOLUME_LEFT(mixer[i].stereo_position);
int right_volume = SOUND_VOLUME_RIGHT(mixer[i].stereo_position);
- for(j=0; j<sample_size; j++)
+ for (j = 0; j < sample_size; j++)
{
- premix_left_buffer[j] =
- left_volume * premix_first_buffer[j] / SOUND_MAX_LEFT2RIGHT;
- premix_right_buffer[j] =
- right_volume * premix_first_buffer[j] / SOUND_MAX_LEFT2RIGHT;
-
- premix_last_buffer[2 * j + 0] += premix_left_buffer[j];
- premix_last_buffer[2 * j + 1] += premix_right_buffer[j];
+ premix_first_buffer[2 * j + 0] =
+ left_volume * premix_first_buffer[2 * j + 0] / SOUND_MAX_LEFT2RIGHT;
+ premix_first_buffer[2 * j + 1] =
+ right_volume * premix_first_buffer[2 * j + 1] / SOUND_MAX_LEFT2RIGHT;
}
}
- else
- {
- for(j=0; j<sample_size; j++)
- premix_last_buffer[j] += premix_first_buffer[j];
- }
+
+ /* fill the last mixing buffer with stereo or mono sound */
+ for (j = 0; j < sample_size * num_output_channels; j++)
+ premix_last_buffer[j] += premix_first_buffer[j];
/* delete completed sound entries from the mixer */
if (mixer[i].playing_pos >= mixer[i].data_len)
}
/* prepare final playing buffer according to system audio format */
- for(i=0; i<max_sample_size * (stereo ? 2 : 1); i++)
+ for (i = 0; i < max_sample_size * num_output_channels; i++)
{
/* cut off at 17 bit value */
if (premix_last_buffer[i] < -65535)
}
/* finally play the sound fragment */
- write(audio.device_fd, playing_buffer, fragment_size);
+ if (write(audio.device_fd, playing_buffer, fragment_size) == -1)
+ Error(ERR_WARN, "write() failed; %s", strerror(errno));
if (!mixer_active_channels)
CloseAudioDevice(&audio.device_fd);
static int Mixer_Main_SimpleAudio(SoundControl snd_ctrl)
{
- static short premix_first_buffer[SND_BLOCKSIZE];
- static byte playing_buffer[SND_BLOCKSIZE];
- int max_sample_size = SND_BLOCKSIZE;
+ static short premix_first_buffer[DEFAULT_AUDIO_FRAGMENT_SIZE];
+ static byte playing_buffer[DEFAULT_AUDIO_FRAGMENT_SIZE];
+ int max_sample_size = DEFAULT_AUDIO_FRAGMENT_SIZE;
+ int num_output_channels = 1;
void *sample_ptr;
int sample_len;
int sample_pos;
/* copy original sample to first mixing buffer */
CopySampleToMixingBuffer(&mixer[i], sample_pos, sample_size,
- premix_first_buffer);
+ premix_first_buffer, 0, num_output_channels);
/* adjust volume of actual sound sample */
if (mixer[i].volume != SOUND_MAX_VOLUME)
- for(j=0; j<sample_size; j++)
+ for (j = 0; j < sample_size; j++)
premix_first_buffer[j] =
- mixer[i].volume * (long)premix_first_buffer[j] / SOUND_MAX_VOLUME;
+ mixer[i].volume * (int)premix_first_buffer[j] / SOUND_MAX_VOLUME;
/* might be needed for u-law /dev/audio */
-#if 1
- for(j=0; j<sample_size; j++)
+ for (j = 0; j < sample_size; j++)
playing_buffer[j] =
linear_to_ulaw(premix_first_buffer[j]);
-#endif
/* delete completed sound entries from the mixer */
if (mixer[i].playing_pos >= mixer[i].data_len)
Mixer_StopChannel(i);
- for(i=0; i<sample_size; i++)
+ for (i = 0; i < sample_size; i++)
playing_buffer[i] = (premix_first_buffer[i] >> 8) ^ 0x80;
/* finally play the sound fragment */
FD_ZERO(&mixer_fdset);
FD_SET(audio.mixer_pipe[0], &mixer_fdset);
- while(1) /* wait for sound playing commands from client */
+ while (1) /* wait for sound playing commands from client */
{
struct timeval delay = { 0, 0 };
#endif
char chunk_name[CHUNK_ID_LEN + 1];
int chunk_size;
+ int data_byte_len;
FILE *file;
#endif
if (!audio.sound_available)
return NULL;
-#if 0
- printf("loading WAV file '%s'\n", filename);
-#endif
-
snd_info = checked_calloc(sizeof(SoundInfo));
#if defined(TARGET_SDL)
#else /* AUDIO_UNIX_NATIVE */
+ clear_mem(&header, sizeof(struct SoundHeader_WAV)); /* to make gcc happy */
+
if ((file = fopen(filename, MODE_READ)) == NULL)
{
Error(ERR_WARN, "cannot open sound file '%s'", filename);
/* read chunk id "RIFF" */
getFileChunkLE(file, chunk_name, &chunk_size);
- if (strcmp(chunk_name, "RIFF") != 0)
+ if (!strEqual(chunk_name, "RIFF"))
{
Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename);
fclose(file);
/* read "RIFF" type id "WAVE" */
getFileChunkLE(file, chunk_name, NULL);
- if (strcmp(chunk_name, "WAVE") != 0)
+ if (!strEqual(chunk_name, "WAVE"))
{
Error(ERR_WARN, "missing 'WAVE' type ID of sound file '%s'", filename);
fclose(file);
while (getFileChunkLE(file, chunk_name, &chunk_size))
{
- if (strcmp(chunk_name, "fmt ") == 0)
+ if (strEqual(chunk_name, "fmt "))
{
if (chunk_size < WAV_HEADER_SIZE)
{
return NULL;
}
- if (header.bits_per_sample != 8 && header.bits_per_sample != 16)
+ if (header.bits_per_sample != 8 &&
+ header.bits_per_sample != 16)
{
Error(ERR_WARN, "sound file '%s': %d bits per sample not supported",
filename, header.bits_per_sample);
printf("WAV file: '%s'\n", filename);
printf(" Compression code: %d'\n", header.compression_code);
printf(" Number of channels: %d'\n", header.num_channels);
- printf(" Sample rate: %ld'\n", header.sample_rate);
- printf(" Average bytes per second: %ld'\n", header.bytes_per_second);
+ printf(" Sample rate: %d'\n", header.sample_rate);
+ printf(" Average bytes per second: %d'\n", header.bytes_per_second);
printf(" Block align: %d'\n", header.block_align);
printf(" Significant bits per sample: %d'\n", header.bits_per_sample);
#endif
}
- else if (strcmp(chunk_name, "data") == 0)
+ else if (strEqual(chunk_name, "data"))
{
- snd_info->data_len = chunk_size;
+ data_byte_len = chunk_size;
+
+ snd_info->data_len = data_byte_len;
snd_info->data_ptr = checked_malloc(snd_info->data_len);
/* read sound data */
return NULL;
}
- /* check for odd number of sample bytes (data chunk is word aligned) */
- if ((chunk_size % 2) == 1)
+ /* check for odd number of data bytes (data chunk is word aligned) */
+ if ((data_byte_len % 2) == 1)
ReadUnusedBytesFromFile(file, 1);
}
else /* unknown chunk -- ignore */
snd_info->data_len /= 2; /* correct number of samples */
}
+ snd_info->num_channels = header.num_channels;
+ if (header.num_channels == 2)
+ snd_info->data_len /= 2; /* correct number of samples */
+
+#if 0
+ if (header.num_channels == 1) /* convert mono sound to stereo */
+ {
+ void *buffer_ptr = checked_malloc(data_byte_len * 2);
+ void *sample_ptr = snd_info->data_ptr;
+ int sample_size = snd_info->data_len;
+ int i;
+
+ if (snd_ctrl->format == AUDIO_FORMAT_U8)
+ for (i = 0; i < sample_size; i++)
+ *buffer_ptr++ =
+ ((short)(((byte *)sample_ptr)[i] ^ 0x80)) << 8;
+ else /* AUDIO_FORMAT_S16 */
+ for (i = 0; i < sample_size; i++)
+ *buffer_ptr++ =
+ ((short *)sample_ptr)[i];
+ }
+#endif
+
#endif /* AUDIO_UNIX_NATIVE */
snd_info->type = SND_TYPE_WAV;
return snd_info;
}
-struct FileInfo *getCurrentSoundList()
-{
- return sound_info->file_list;
-}
-
-void InitSoundList(struct ConfigInfo *config_list,
- struct ConfigInfo *config_suffix_list,
- int num_file_list_entries)
-{
- int i;
-
- sound_info = checked_calloc(sizeof(struct ArtworkListInfo));
-
- sound_info->type = ARTWORK_TYPE_SOUNDS;
-
- sound_info->num_file_list_entries = num_file_list_entries;
- sound_info->num_suffix_list_entries = 0;
- for (i=0; config_suffix_list[i].token != NULL; i++)
- sound_info->num_suffix_list_entries++;
-
- sound_info->file_list =
- getFileListFromConfigList(config_list, config_suffix_list,
- num_file_list_entries);
- sound_info->suffix_list = config_suffix_list;
-
- sound_info->artwork_list =
- checked_calloc(num_file_list_entries * sizeof(SoundInfo *));
-
- sound_info->content_list = NULL;
-
- sound_info->load_artwork = Load_WAV;
- sound_info->free_artwork = FreeSound;
-
- num_sounds = sound_info->num_file_list_entries;
- Sound = (SoundInfo **)sound_info->artwork_list;
-}
-
-static MusicInfo *Load_MOD(char *filename)
+static void *Load_MOD(char *filename)
{
#if defined(TARGET_SDL)
MusicInfo *mod_info;
#endif
}
-void LoadCustomMusic(void)
+static void *Load_WAV_or_MOD(char *filename)
+{
+#if 1
+ if (FileIsMusic(filename))
+ return Load_MOD(filename);
+ else if (FileIsSound(filename))
+ return Load_WAV(filename);
+ else
+ return NULL;
+#else
+ if (FileIsSound(filename))
+ return Load_WAV(filename);
+ else if (FileIsMusic(filename))
+ return Load_MOD(filename);
+ else
+ return NULL;
+#endif
+}
+
+#if 1
+
+void LoadCustomMusic_NoConf(void)
+{
+ static boolean draw_init_text = TRUE; /* only draw at startup */
+ static char *last_music_directory = NULL;
+ char *music_directory = getCustomMusicDirectory();
+ Directory *dir;
+ DirectoryEntry *dir_entry;
+ int num_music = getMusicListSize();
+
+ if (!audio.sound_available)
+ return;
+
+ if (last_music_directory != NULL &&
+ strEqual(last_music_directory, music_directory))
+ return; /* old and new music directory are the same */
+
+ if (last_music_directory != NULL)
+ free(last_music_directory);
+ last_music_directory = getStringCopy(music_directory);
+
+ FreeAllMusic_NoConf();
+
+ if ((dir = openDirectory(music_directory)) == NULL)
+ {
+ Error(ERR_WARN, "cannot read music directory '%s'", music_directory);
+
+ audio.music_available = FALSE;
+
+ return;
+ }
+
+ if (draw_init_text)
+ DrawInitText("Loading music", 120, FC_GREEN);
+
+ while ((dir_entry = readDirectory(dir)) != NULL) /* loop all entries */
+ {
+ char *basename = dir_entry->basename;
+ char *filename = NULL;
+ MusicInfo *mus_info = NULL;
+ boolean music_already_used = FALSE;
+ int i;
+
+ /* skip all music files that are configured in music config file */
+ for (i = 0; i < num_music; i++)
+ {
+ struct FileInfo *music = getMusicListEntry(i);
+
+ if (strEqual(basename, music->filename))
+ {
+ music_already_used = TRUE;
+ break;
+ }
+ }
+
+ if (music_already_used)
+ continue;
+
+ if (draw_init_text)
+ DrawInitText(basename, 150, FC_YELLOW);
+
+ filename = getPath2(music_directory, basename);
+
+ if (FileIsMusic(basename))
+ mus_info = Load_WAV_or_MOD(filename);
+
+ free(filename);
+
+ if (mus_info)
+ {
+ num_music_noconf++;
+ Music_NoConf = checked_realloc(Music_NoConf,
+ num_music_noconf * sizeof(MusicInfo *));
+ Music_NoConf[num_music_noconf - 1] = mus_info;
+ }
+ }
+
+ closeDirectory(dir);
+
+ draw_init_text = FALSE;
+}
+
+#else
+
+void LoadCustomMusic_NoConf(void)
{
static boolean draw_init_text = TRUE; /* only draw at startup */
static char *last_music_directory = NULL;
char *music_directory = getCustomMusicDirectory();
DIR *dir;
struct dirent *dir_entry;
+ int num_music = getMusicListSize();
if (!audio.sound_available)
return;
if (last_music_directory != NULL &&
- strcmp(last_music_directory, music_directory) == 0)
+ strEqual(last_music_directory, music_directory))
return; /* old and new music directory are the same */
if (last_music_directory != NULL)
free(last_music_directory);
last_music_directory = getStringCopy(music_directory);
- FreeAllMusic();
+ FreeAllMusic_NoConf();
if ((dir = opendir(music_directory)) == NULL)
{
Error(ERR_WARN, "cannot read music directory '%s'", music_directory);
+
audio.music_available = FALSE;
+
return;
}
if (draw_init_text)
- DrawInitText("Loading music:", 120, FC_GREEN);
+ DrawInitText("Loading music", 120, FC_GREEN);
while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */
{
char *basename = dir_entry->d_name;
- char *filename = getPath2(music_directory, basename);
+ char *filename = NULL;
MusicInfo *mus_info = NULL;
+ boolean music_already_used = FALSE;
+ int i;
-#if 0
- printf("DEBUG: loading music '%s' ...\n", basename);
-#endif
+ /* skip all music files that are configured in music config file */
+ for (i = 0; i < num_music; i++)
+ {
+ struct FileInfo *music = getMusicListEntry(i);
+
+ if (strEqual(basename, music->filename))
+ {
+ music_already_used = TRUE;
+ break;
+ }
+ }
+
+ if (music_already_used)
+ continue;
if (draw_init_text)
DrawInitText(basename, 150, FC_YELLOW);
- if (FileIsSound(basename))
- mus_info = Load_WAV(filename);
- else if (FileIsMusic(basename))
- mus_info = Load_MOD(filename);
+ filename = getPath2(music_directory, basename);
+
+ if (FileIsMusic(basename))
+ mus_info = Load_WAV_or_MOD(filename);
free(filename);
if (mus_info)
{
- num_music++;
- Music = checked_realloc(Music, num_music * sizeof(MusicInfo *));
- Music[num_music -1] = mus_info;
+ num_music_noconf++;
+ Music_NoConf = checked_realloc(Music_NoConf,
+ num_music_noconf * sizeof(MusicInfo *));
+ Music_NoConf[num_music_noconf - 1] = mus_info;
}
}
closedir(dir);
draw_init_text = FALSE;
+}
+
+#endif
+
+int getSoundListSize()
+{
+ return (sound_info->num_file_list_entries +
+ sound_info->num_dynamic_file_list_entries);
+}
+
+int getMusicListSize()
+{
+ return (music_info->num_file_list_entries +
+ music_info->num_dynamic_file_list_entries);
+}
+
+struct FileInfo *getSoundListEntry(int pos)
+{
+ int num_list_entries = sound_info->num_file_list_entries;
+ int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries);
+
+ return (pos < num_list_entries ? &sound_info->file_list[list_pos] :
+ &sound_info->dynamic_file_list[list_pos]);
+}
+
+struct FileInfo *getMusicListEntry(int pos)
+{
+ int num_list_entries = music_info->num_file_list_entries;
+ int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries);
+
+ return (pos < num_list_entries ? &music_info->file_list[list_pos] :
+ &music_info->dynamic_file_list[list_pos]);
+}
+
+static SoundInfo *getSoundInfoEntryFromSoundID(int pos)
+{
+ int num_list_entries = sound_info->num_file_list_entries;
+ int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries);
+ SoundInfo **snd_info =
+ (SoundInfo **)(pos < num_list_entries ? sound_info->artwork_list :
+ sound_info->dynamic_artwork_list);
+
+ return snd_info[list_pos];
+}
+
+static MusicInfo *getMusicInfoEntryFromMusicID(int pos)
+{
+ int num_list_entries = music_info->num_file_list_entries;
+ int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries);
+ MusicInfo **mus_info =
+ (MusicInfo **)(pos < num_list_entries ? music_info->artwork_list :
+ music_info->dynamic_artwork_list);
+
+ return mus_info[list_pos];
+}
+
+int getSoundListPropertyMappingSize()
+{
+ return sound_info->num_property_mapping_entries;
+}
+
+int getMusicListPropertyMappingSize()
+{
+ return music_info->num_property_mapping_entries;
+}
+
+struct PropertyMapping *getSoundListPropertyMapping()
+{
+ return sound_info->property_mapping;
+}
+
+struct PropertyMapping *getMusicListPropertyMapping()
+{
+ return music_info->property_mapping;
+}
+
+void InitSoundList(struct ConfigInfo *config_list, int num_file_list_entries,
+ struct ConfigTypeInfo *config_suffix_list,
+ char **base_prefixes, char **ext1_suffixes,
+ char **ext2_suffixes, char **ext3_suffixes,
+ char **ignore_tokens)
+{
+ int i;
+
+ sound_info = checked_calloc(sizeof(struct ArtworkListInfo));
+ sound_info->type = ARTWORK_TYPE_SOUNDS;
+
+ /* ---------- initialize file list and suffix lists ---------- */
+
+ sound_info->num_file_list_entries = num_file_list_entries;
+ sound_info->num_dynamic_file_list_entries = 0;
+
+ sound_info->file_list =
+ getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens,
+ num_file_list_entries);
+ sound_info->dynamic_file_list = NULL;
+
+ sound_info->num_suffix_list_entries = 0;
+ for (i = 0; config_suffix_list[i].token != NULL; i++)
+ sound_info->num_suffix_list_entries++;
+
+ sound_info->suffix_list = config_suffix_list;
+
+ /* ---------- initialize base prefix and suffixes lists ---------- */
+
+ sound_info->num_base_prefixes = 0;
+ for (i = 0; base_prefixes[i] != NULL; i++)
+ sound_info->num_base_prefixes++;
+
+ sound_info->num_ext1_suffixes = 0;
+ for (i = 0; ext1_suffixes[i] != NULL; i++)
+ sound_info->num_ext1_suffixes++;
+
+ sound_info->num_ext2_suffixes = 0;
+ for (i = 0; ext2_suffixes[i] != NULL; i++)
+ sound_info->num_ext2_suffixes++;
+
+ sound_info->num_ext3_suffixes = 0;
+ for (i = 0; ext3_suffixes[i] != NULL; i++)
+ sound_info->num_ext3_suffixes++;
+
+ sound_info->num_ignore_tokens = 0;
+ for (i = 0; ignore_tokens[i] != NULL; i++)
+ sound_info->num_ignore_tokens++;
+
+ sound_info->base_prefixes = base_prefixes;
+ sound_info->ext1_suffixes = ext1_suffixes;
+ sound_info->ext2_suffixes = ext2_suffixes;
+ sound_info->ext3_suffixes = ext3_suffixes;
+ sound_info->ignore_tokens = ignore_tokens;
+
+ sound_info->num_property_mapping_entries = 0;
+
+ sound_info->property_mapping = NULL;
+
+ /* ---------- initialize artwork reference and content lists ---------- */
+
+ sound_info->sizeof_artwork_list_entry = sizeof(SoundInfo *);
+
+ sound_info->artwork_list =
+ checked_calloc(num_file_list_entries * sizeof(SoundInfo *));
+ sound_info->dynamic_artwork_list = NULL;
+
+ sound_info->content_list = NULL;
+
+ /* ---------- initialize artwork loading/freeing functions ---------- */
+
+ sound_info->load_artwork = Load_WAV;
+ sound_info->free_artwork = FreeSound;
+}
+
+void InitMusicList(struct ConfigInfo *config_list, int num_file_list_entries,
+ struct ConfigTypeInfo *config_suffix_list,
+ char **base_prefixes, char **ext1_suffixes,
+ char **ext2_suffixes, char **ext3_suffixes,
+ char **ignore_tokens)
+{
+ int i;
+
+ music_info = checked_calloc(sizeof(struct ArtworkListInfo));
+ music_info->type = ARTWORK_TYPE_MUSIC;
+
+ /* ---------- initialize file list and suffix lists ---------- */
+
+ music_info->num_file_list_entries = num_file_list_entries;
+ music_info->num_dynamic_file_list_entries = 0;
+
+ music_info->file_list =
+ getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens,
+ num_file_list_entries);
+ music_info->dynamic_file_list = NULL;
+
+ music_info->num_suffix_list_entries = 0;
+ for (i = 0; config_suffix_list[i].token != NULL; i++)
+ music_info->num_suffix_list_entries++;
+
+ music_info->suffix_list = config_suffix_list;
+
+ /* ---------- initialize base prefix and suffixes lists ---------- */
+
+ music_info->num_base_prefixes = 0;
+ for (i = 0; base_prefixes[i] != NULL; i++)
+ music_info->num_base_prefixes++;
+
+ music_info->num_ext1_suffixes = 0;
+ for (i = 0; ext1_suffixes[i] != NULL; i++)
+ music_info->num_ext1_suffixes++;
+
+ music_info->num_ext2_suffixes = 0;
+ for (i = 0; ext2_suffixes[i] != NULL; i++)
+ music_info->num_ext2_suffixes++;
+
+ music_info->num_ext3_suffixes = 0;
+ for (i = 0; ext3_suffixes[i] != NULL; i++)
+ music_info->num_ext3_suffixes++;
- if (num_music == 0)
- Error(ERR_WARN, "cannot find any valid music files in directory '%s'",
- music_directory);
+ music_info->num_ignore_tokens = 0;
+ for (i = 0; ignore_tokens[i] != NULL; i++)
+ music_info->num_ignore_tokens++;
+
+ music_info->base_prefixes = base_prefixes;
+ music_info->ext1_suffixes = ext1_suffixes;
+ music_info->ext2_suffixes = ext2_suffixes;
+ music_info->ext3_suffixes = ext3_suffixes;
+ music_info->ignore_tokens = ignore_tokens;
+
+ music_info->num_property_mapping_entries = 0;
+
+ music_info->property_mapping = NULL;
+
+ /* ---------- initialize artwork reference and content lists ---------- */
+
+ music_info->sizeof_artwork_list_entry = sizeof(MusicInfo *);
+
+ music_info->artwork_list =
+ checked_calloc(num_file_list_entries * sizeof(MusicInfo *));
+ music_info->dynamic_artwork_list = NULL;
+
+ music_info->content_list = NULL;
+
+ /* ---------- initialize artwork loading/freeing functions ---------- */
+
+ music_info->load_artwork = Load_WAV_or_MOD;
+ music_info->free_artwork = FreeMusic;
}
void PlayMusic(int nr)
void PlaySound(int nr)
{
+ if (!setup.sound_simple)
+ return;
+
PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_SOUND);
}
void PlaySoundStereo(int nr, int stereo_position)
{
+ if (!setup.sound_simple)
+ return;
+
PlaySoundExt(nr, SOUND_MAX_VOLUME, stereo_position, SND_CTRL_PLAY_SOUND);
}
void PlaySoundLoop(int nr)
{
+ if (!setup.sound_loops)
+ return;
+
PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_LOOP);
}
void PlaySoundMusic(int nr)
{
+ if (!setup.sound_music)
+ return;
+
PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_MUSIC);
}
audio.sound_deactivated)
return;
+ volume = SETUP_SOUND_VOLUME(volume, state);
+
if (volume < SOUND_MIN_VOLUME)
volume = SOUND_MIN_VOLUME;
else if (volume > SOUND_MAX_VOLUME)
else if (stereo_position > SOUND_MAX_RIGHT)
stereo_position = SOUND_MAX_RIGHT;
+ clear_mem(&snd_ctrl, sizeof(SoundControl)); /* to make valgrind happy */
+
snd_ctrl.active = TRUE;
snd_ctrl.nr = nr;
snd_ctrl.volume = volume;
void FadeSounds()
{
- FadeMusic();
StopSoundExt(-1, SND_CTRL_FADE_ALL);
}
+void FadeSoundsAndMusic()
+{
+ FadeSounds();
+ FadeMusic();
+}
+
void StopMusic(void)
{
if (!audio.music_available)
if (!audio.sound_available)
return;
+ clear_mem(&snd_ctrl, sizeof(SoundControl)); /* to make valgrind happy */
+
snd_ctrl.active = FALSE;
snd_ctrl.nr = nr;
snd_ctrl.state = state;
static void ReloadCustomSounds()
{
#if 0
- printf("DEBUG: reloading sounds '%s' ...\n", artwork.snd_current_identifier);
+ printf("::: reloading sounds '%s' ...\n", artwork.snd_current_identifier);
#endif
+ LoadArtworkConfig(sound_info);
ReloadCustomArtworkList(sound_info);
}
static void ReloadCustomMusic()
{
#if 0
- printf("DEBUG: reloading music '%s' ...\n", artwork.mus_current_identifier);
+ printf("::: reloading music '%s' ...\n", artwork.mus_current_identifier);
#endif
- LoadCustomMusic();
+ LoadArtworkConfig(music_info);
+ ReloadCustomArtworkList(music_info);
+
+ /* load all music files from directory not defined in "musicinfo.conf" */
+ LoadCustomMusic_NoConf();
}
-void InitReloadSounds(char *set_identifier)
+void InitReloadCustomSounds(char *set_identifier)
{
if (!audio.sound_available)
return;
#if defined(AUDIO_UNIX_NATIVE)
+ LoadArtworkConfig(sound_info); /* also load config on sound client */
WriteReloadInfoToPipe(set_identifier, SND_CTRL_RELOAD_SOUNDS);
#else
ReloadCustomSounds();
#endif
}
-void InitReloadMusic(char *set_identifier)
+void InitReloadCustomMusic(char *set_identifier)
{
if (!audio.music_available)
return;
#if defined(AUDIO_UNIX_NATIVE)
+ LoadArtworkConfig(music_info); /* also load config on sound client */
WriteReloadInfoToPipe(set_identifier, SND_CTRL_RELOAD_MUSIC);
#else
ReloadCustomMusic();
#endif
}
- if (sound->source_filename)
- free(sound->source_filename);
+ checked_free(sound->source_filename);
free(sound);
}
-void FreeMusic(MusicInfo *music)
+void FreeMusic(void *ptr)
{
+ MusicInfo *music = (MusicInfo *)ptr;
+
if (music == NULL)
return;
free(music);
}
-void FreeAllSounds()
-{
- FreeCustomArtworkList(sound_info);
-}
-
-void FreeAllMusic()
+static void FreeAllMusic_NoConf()
{
int i;
- if (Music == NULL)
+ if (Music_NoConf == NULL)
return;
- for(i=0; i<num_music; i++)
- FreeMusic(Music[i]);
+ for (i = 0; i < num_music_noconf; i++)
+ FreeMusic(Music_NoConf[i]);
+
+ free(Music_NoConf);
+
+ Music_NoConf = NULL;
+ num_music_noconf = 0;
+}
- free(Music);
+void FreeAllSounds()
+{
+ FreeCustomArtworkLists(sound_info);
+}
- Music = NULL;
- num_music = 0;
+void FreeAllMusic()
+{
+ FreeCustomArtworkLists(music_info);
+ FreeAllMusic_NoConf();
}
/* THE STUFF ABOVE IS ONLY USED BY THE MAIN PROCESS */