lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Nix'd midimusicvolume other targets

This commit is contained in:
mazmazz 2018-08-23 07:39:45 -04:00
parent b5c3095820
commit 58fbb4636f
6 changed files with 12 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/android/i_sound.c
View File

@ -84,11 +84,6 @@ void I_InitMIDIMusic(void){}
void I_ShutdownMIDIMusic(void){}
void I_SetMIDIMusicVolume(INT32 volume)
{
(void)volume;
}
INT32 I_RegisterSong(void *data, size_t len)
{
(void)data;

11
src/djgppdos/i_sound.c
View File

@ -140,15 +140,6 @@ void I_SetSfxVolume(INT32 volume)
set_volume (Volset(volume),-1);
}
void I_SetMIDIMusicVolume(INT32 volume)
{
if (nomidimusic)
return;
// Now set volume on output device.
set_volume (-1, Volset(volume));
}
//
// Starting a sound means adding it
// to the current list of active sounds
@ -541,7 +532,7 @@ void I_SetDigMusicVolume(INT32 volume)
return;
// Now set volume on output device.
// CONS_Printf("Digital music not yet supported under DOS.\n");
set_volume (-1, Volset(volume));
}
boolean I_SetSongSpeed(float speed)

5
src/dummy/i_sound.c
View File

@ -83,11 +83,6 @@ void I_InitMIDIMusic(void){}
void I_ShutdownMIDIMusic(void){}
void I_SetMIDIMusicVolume(UINT8 volume)
{
(void)volume;
}
INT32 I_RegisterSong(void *data, size_t len)
{
(void)data;

27
src/sdl/sdl_sound.c
View File

@ -1689,21 +1689,6 @@ INT32 I_RegisterSong(void *data, size_t len)
return false;
}
void I_SetMIDIMusicVolume(UINT8 volume)
{
#ifdef HAVE_MIXER
if ((nomidimusic && nodigimusic) || !musicStarted)
return;
if (Msc_Mutex) SDL_LockMutex(Msc_Mutex);
musicvol = volume * 2;
if (Msc_Mutex) SDL_UnlockMutex(Msc_Mutex);
Mix_VolumeMusic(musicvol);
#else
(void)volume;
#endif
}
#ifdef HAVE_LIBGME
static void I_CleanupGME(void *userdata)
{
@ -1963,7 +1948,17 @@ void I_StopDigSong(void)
void I_SetDigMusicVolume(UINT8 volume)
{
I_SetMIDIMusicVolume(volume);
#ifdef HAVE_MIXER
if ((nomidimusic && nodigimusic) || !musicStarted)
return;
if (Msc_Mutex) SDL_LockMutex(Msc_Mutex);
musicvol = volume * 2;
if (Msc_Mutex) SDL_UnlockMutex(Msc_Mutex);
Mix_VolumeMusic(musicvol);
#else
(void)volume;
#endif
}
boolean I_SetSongSpeed(float speed)

1
src/win32/win_cd.c
View File

@ -470,7 +470,6 @@ void I_PlayCD(UINT8 nTrack, UINT8 bLooping)
//faB: stop MIDI music, MIDI music will restart if volume is upped later
cv_digmusicvolume.value = 0;
cv_midimusicvolume.value = 0;
I_StopSong (0);
//faB: I don't use the notify message, I'm trying to minimize the delay

8
src/win32/win_snd.c
View File

@ -815,14 +815,6 @@ void I_ShutdownMIDIMusic(void)
I_StopSong(0);
}
void I_SetMIDIMusicVolume(UINT8 volume)
{
// volume is 0 to 31.
midi_volume = volume;
if (midimode && music_stream)
FMR_MUSIC(FMOD_Channel_SetVolume(music_channel, volume / 31.0));
}
INT32 I_RegisterSong(void *data, size_t len)
{
FMOD_CREATESOUNDEXINFO fmt;