zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-27 09:20:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- something can be heard, but it's crap.

Browse source 
This sound code is really strange.
This commit is contained in:
Christoph Oelckers 2019-11-11 19:53:06 +01:00
parent 9782b8180a
commit 51a5fecc02
6 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/common/music/i_music.cpp
View file

@ -51,6 +51,7 @@
#include "i_soundfont.h" #include "i_soundfont.h"
#include "s_music.h" #include "s_music.h"
#include "printf.h" #include "printf.h"
#include "timer.h"
#include "zmusic/zmusic.h" #include "zmusic/zmusic.h"
#include "streamsources/streamsource.h" #include "streamsources/streamsource.h"
#include "filereadermusicinterface.h" #include "filereadermusicinterface.h"
@ -255,6 +256,7 @@ void Mus_Init(void)
ZMusic_SetCallbacks(&callbacks); ZMusic_SetCallbacks(&callbacks);
SetupGenMidi(); SetupGenMidi();
timerSetCallback(S_UpdateMusic);
} }

1
source/common/music/i_music.h
View file

@ -39,7 +39,6 @@ class FileReader;
// //
// MUSIC I/O // MUSIC I/O
// //
void I_InitMusic ();
// Volume. // Volume.
void I_SetRelativeVolume(float); void I_SetRelativeVolume(float);

1
source/common/music/music.cpp
View file

@ -208,6 +208,7 @@ bool S_ChangeMusic(const char* musicname, int order, bool looping, bool force)
mus_playing.LastSong = ""; mus_playing.LastSong = "";
return true; return true;
} }
if (*musicname == '/') musicname++;
FString DEH_Music; FString DEH_Music;

2
source/common/music/musicstream.cpp
View file

@ -48,7 +48,7 @@ static playbackstatus MV_GetNextZMusicBlock(VoiceNode *voice)
} }
voice->sound = (const char*)buffer[whichbuffer]; voice->sound = (const char*)buffer[whichbuffer];
voice->length = 8192; voice->length = 8192 << 16;
voice->position = 0; voice->position = 0;
voice->BlockLength = 0; voice->BlockLength = 0;
whichbuffer ^= 1; whichbuffer ^= 1;

4
source/duke3d/src/sounds.cpp
View file

@ -380,7 +380,7 @@ void S_PlayLevelMusicOrNothing(unsigned int m)
{ {
if (S_TryPlayLevelMusic(m)) if (S_TryPlayLevelMusic(m))
{ {
S_StopMusic(); //S_StopMusic();
S_SetMusicIndex(m); S_SetMusicIndex(m);
} }
} }
@ -404,7 +404,7 @@ void S_PlaySpecialMusicOrNothing(unsigned int m)
{ {
if (S_TryPlaySpecialMusic(m)) if (S_TryPlaySpecialMusic(m))
{ {
S_StopMusic(); //S_StopMusic();
S_SetMusicIndex(m); S_SetMusicIndex(m);
} }
} }

4
source/rr/src/sounds.cpp
View file

@ -340,7 +340,7 @@ void S_PlayLevelMusicOrNothing(unsigned int m)
{ {
if (S_TryPlayLevelMusic(m)) if (S_TryPlayLevelMusic(m))
{ {
S_StopMusic(); //S_StopMusic();
S_SetMusicIndex(m); S_SetMusicIndex(m);
} }
} }
@ -380,7 +380,7 @@ void S_PlaySpecialMusicOrNothing(unsigned int m)
{ {
if (S_TryPlaySpecialMusic(m)) if (S_TryPlaySpecialMusic(m))
{ {
S_StopMusic(); //S_StopMusic();
S_SetMusicIndex(m); S_SetMusicIndex(m);
} }
} }