luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GB.SDL2.AUDIO]

Browse source 
* BUG: Setting music volume now works even if the music is not playing.
  Workaround an SDL2 deficiency.


git-svn-id: svn://localhost/gambas/trunk@6799 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2015-01-02 20:52:15 +00:00
parent 0e6e531d72
commit 1b67769f30
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gb.sdl2/src/audio/c_music.c
View file

@ -28,6 +28,7 @@
static Mix_Music *_music = NULL;
static double _ref_time = 0;
static double _ref_pos = 0;
static int _volume = MIX_MAX_VOLUME;
//-------------------------------------------------------------------------
@ -60,6 +61,13 @@ void MUSIC_exit(void)
_music = NULL;
}
static void update_volume(void)
{
if (!Mix_PlayingMusic())
return;
Mix_VolumeMusic(_volume);
}
//-------------------------------------------------------------------------
@ -107,6 +115,7 @@ BEGIN_METHOD(Music_Play, GB_INTEGER loops; GB_FLOAT fadein)
fadevalue = 0;
Mix_FadeInMusic(_music, VARGOPT(loops, 1), fadevalue);
update_volume();
END_METHOD
@ -167,9 +176,17 @@ BEGIN_PROPERTY(Music_Volume)
CHECK_AUDIO();
if (READ_PROPERTY)
GB.ReturnFloat(Mix_VolumeMusic(-1));
GB.ReturnInteger(_volume);
else
Mix_VolumeMusic(VPROP(GB_INTEGER));
{
_volume = VPROP(GB_INTEGER);
if (_volume < 0)
_volume = 0;
else if (_volume > MIX_MAX_VOLUME)
_volume = MIX_MAX_VOLUME;
update_volume();
}
END_PROPERTY