diff options
| author | Dusan Durech <dusan.d@Centrum.sk> | 2009-08-16 15:33:47 +0200 |
|---|---|---|
| committer | Dusan Durech <dusan.d@Centrum.sk> | 2009-08-16 15:33:47 +0200 |
| commit | fcafb3fc81d340f939bdde215b813d69c34ac9e0 (patch) | |
| tree | a47062bee471b6a1384002ff2e4e5f4caf89afec /src | |
| parent | b97ea6df3480e023a4e1be76ed6c357c7f06f01e (diff) | |
| parent | 80fa5d597783793afab25d55757254dcf9172716 (diff) | |
Merge branch 'master' of ssh://oroborus@repo.or.cz/srv/git/tuxanci
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio/audio.c | 6 | ||||
| -rw-r--r-- | src/audio/music.c | 26 | ||||
| -rw-r--r-- | src/audio/sound.c | 20 |
3 files changed, 26 insertions, 26 deletions
diff --git a/src/audio/audio.c b/src/audio/audio.c index 6e5c051..9b6d9fc 100644 --- a/src/audio/audio.c +++ b/src/audio/audio.c @@ -8,7 +8,7 @@ static bool_t isAudioInit = FALSE; -/* +/** * Return status of audio */ bool_t audio_is_inicialized() @@ -16,7 +16,7 @@ bool_t audio_is_inicialized() return isAudioInit; } -/* +/** * Initialize audio */ void audio_init() @@ -43,7 +43,7 @@ void audio_init() isAudioInit = TRUE; } -/* +/** * Shutdown audio */ void audio_quit() diff --git a/src/audio/music.c b/src/audio/music.c index 2d2194f..90dd321 100644 --- a/src/audio/music.c +++ b/src/audio/music.c @@ -15,7 +15,7 @@ static bool_t isMusicInit = FALSE; static bool_t var_music_is_active = TRUE; static Mix_Music *currentMusic; -/* +/** * Return status of music */ bool_t music_is_inicialized() @@ -23,7 +23,7 @@ bool_t music_is_inicialized() return isMusicInit; } -/* +/** * Initialize music */ void music_init() @@ -47,7 +47,7 @@ void music_init() } } -/* +/** * Load a file with music and returns it */ static Mix_Music *loadMixMusic(char *file) @@ -75,7 +75,7 @@ static Mix_Music *loadMixMusic(char *file) return mixer; } -/* +/** * Prepare the music mixer */ static void playMixMusic() @@ -85,7 +85,7 @@ static void playMixMusic() } } -/* +/** * Remove music from the memory */ static void destroyMusic(void *p) @@ -93,7 +93,7 @@ static void destroyMusic(void *p) Mix_FreeMusic((Mix_Music *) p); } -/* +/** * Add a file to the music list */ void music_add(char *file, char *name, char *group) @@ -112,7 +112,7 @@ void music_add(char *file, char *name, char *group) storage_add(listStorage, group, name, new); } -/* +/** * Stop playing music */ void music_stop() @@ -129,7 +129,7 @@ void music_stop() } } -/* +/** * Play music playback */ void music_play(char *name, char *group) @@ -169,7 +169,7 @@ void music_play(char *name, char *group) } } -/* +/** * Set music status to active/inactive */ void music_set_active(bool_t n) @@ -187,7 +187,7 @@ void music_set_active(bool_t n) var_music_is_active = n; } -/* +/** * Return the activity status of music */ bool_t music_is_active() @@ -195,7 +195,7 @@ bool_t music_is_active() return var_music_is_active; } -/* +/** * Return the music playing right now */ char *music_get_current() @@ -203,7 +203,7 @@ char *music_get_current() return "unknown"; } -/* +/** * Remove all music files belonging to the certain group */ void music_del_all_in_group(char *group) @@ -215,7 +215,7 @@ void music_del_all_in_group(char *group) storage_del_all(listStorage, group, destroyMusic); } -/* +/** * Shutdown music */ void music_quit() diff --git a/src/audio/sound.c b/src/audio/sound.c index 58a78ba..f45ed80 100644 --- a/src/audio/sound.c +++ b/src/audio/sound.c @@ -13,7 +13,7 @@ static list_t *listStorage; static bool_t isSoundInit = FALSE; static bool_t var_sound_is_active = TRUE; -/* +/** * Return status of sound */ bool_t sound_is_inicialized() @@ -21,7 +21,7 @@ bool_t sound_is_inicialized() return isSoundInit; } -/* +/** * Initialize sound */ void sound_init() @@ -44,7 +44,7 @@ void sound_init() } } -/* +/** * Load sound from file (Null/mixer) */ static Mix_Chunk *loadMixSound(char *file) @@ -66,7 +66,7 @@ static Mix_Chunk *loadMixSound(char *file) return new; } -/* +/** * Play sound with mixer */ static void playMixSound(Mix_Chunk *p) @@ -77,7 +77,7 @@ static void playMixSound(Mix_Chunk *p) } } -/* +/** * Destroy mixer chunk */ static void destroySound(void *p) @@ -85,7 +85,7 @@ static void destroySound(void *p) Mix_FreeChunk((Mix_Chunk *) p); } -/* +/** * Add a sound to list */ void sound_add(char *file, char *name, char *group) @@ -104,7 +104,7 @@ void sound_add(char *file, char *name, char *group) storage_add(listStorage, group, name, new); } -/* +/** * Start playing a sound from a file from the list */ void sound_play(char *name, char *group) @@ -116,7 +116,7 @@ void sound_play(char *name, char *group) playMixSound(storage_get(listStorage, group, name)); } -/* +/** * Set sound status to active/inactive (true/false) */ void sound_set_active(bool_t n) @@ -124,7 +124,7 @@ void sound_set_active(bool_t n) var_sound_is_active = n; } -/* +/** * Return status of sound */ bool_t sound_is_active() @@ -132,7 +132,7 @@ bool_t sound_is_active() return var_sound_is_active; } -/* +/** * Shutdown sound */ void sound_quit() |