stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-19 09:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Loose ends other targets

Browse source
This commit is contained in:
mazmazz 2018-08-23 09:37:02 -04:00
parent e89eccf78e
commit 9a5fc5f66a
6 changed files with 70 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/android/i_sound.c
View file

@ -64,12 +64,12 @@ void I_InitMusic(void){}
void I_ShutdownMusic(void){}
void I_PauseSong(INT32 handle)
void I_PauseSong(void)
{
(void)handle;
}
void I_ResumeSong(INT32 handle)
void I_ResumeSong(void)
{
(void)handle;
}
@ -80,7 +80,7 @@ void I_ResumeSong(INT32 handle)
UINT8 midimusic_started = 0;
boolean I_LoadSong(void *data, size_t len)
boolean I_LoadSong(char *data, size_t len)
{
(void)data;
(void)len;
@ -92,7 +92,7 @@ void I_SetMIDIMusicVolume(INT32 volume)
(void)volume;
}
boolean I_PlaySong(void)
boolean I_PlaySong(boolean looping)
{
(void)handle;
(void)looping;

4
src/djgppdos/i_sound.c
View file

@ -408,7 +408,7 @@ void I_ShutdownMusic(void)
music_started=false;
}
boolean I_PlaySong(void)
boolean I_PlaySong(boolean looping)
{
handle = 0;
if (nomidimusic)
@ -471,7 +471,7 @@ void I_UnloadSong(void)
//destroy_midi(currsong);
}
boolean I_LoadSong(void *data, size_t len)
boolean I_LoadSong(char *data, size_t len)
{
int e = len; //Alam: For error
if (nomidimusic)

8
src/dummy/i_sound.c
View file

@ -70,12 +70,12 @@ void I_SetMIDIMusicVolume(UINT8 volume)
(void)volume;
}
void I_PauseSong(INT32 handle)
void I_PauseSong(void)
{
(void)handle;
}
void I_ResumeSong(INT32 handle)
void I_ResumeSong(void)
{
(void)handle;
}
@ -84,14 +84,14 @@ void I_ResumeSong(INT32 handle)
// MIDI I/O
//
boolean I_LoadSong(void *data, size_t len)
boolean I_LoadSong(char *data, size_t len)
{
(void)data;
(void)len;
return -1;
}
boolean I_PlaySong(void)
boolean I_PlaySong(boolean looping)
{
(void)handle;
(void)looping;

6
src/sdl/sdl_sound.c
View file

@ -1583,7 +1583,7 @@ static void I_PauseGME(void)
#endif
}
void I_PauseSong(INT32 handle)
void I_PauseSong(void)
{
(void)handle;
I_PauseGME();
@ -1603,7 +1603,7 @@ static void I_ResumeGME(void)
#endif
}
void I_ResumeSong(INT32 handle)
void I_ResumeSong(void)
{
(void)handle;
I_ResumeGME();
@ -1659,7 +1659,7 @@ void I_UnloadSong(void)
#endif
}
boolean I_LoadSong(void *data, size_t len)
boolean I_LoadSong(char *data, size_t len)
{
#ifdef HAVE_MIXER
if (nomidimusic || !musicStarted)

4
src/win32/win_main.c
View file

@ -110,9 +110,9 @@ static LRESULT CALLBACK MainWndproc(HWND hWnd, UINT message, WPARAM wParam, LPAR
// pause music when alt-tab
if (appActive && !paused)
I_ResumeSong(0);
I_ResumeSong();
else if (!paused)
I_PauseSong(0);
I_PauseSong();
{
HANDLE ci = GetStdHandle(STD_INPUT_HANDLE);
DWORD mode;

113
src/win32/win_snd.c
View file

@ -453,14 +453,14 @@ void I_ShutdownMusic(void)
I_StopSong();
}
void I_PauseSong(INT32 handle)
void I_PauseSong(void)
{
UNREFERENCED_PARAMETER(handle);
if (music_stream)
FMR_MUSIC(FMOD_Channel_SetPaused(music_channel, true));
}
void I_ResumeSong(INT32 handle)
void I_ResumeSong(void)
{
UNREFERENCED_PARAMETER(handle);
if (music_stream)
@ -618,67 +618,64 @@ boolean I_LoadSong(char *data, size_t len)
}
// Try to find a loop point in streaming music formats (ogg, mp3)
if (looping)
{
FMOD_RESULT e;
FMOD_TAG tag;
unsigned int loopstart, loopend;
FMOD_RESULT e;
FMOD_TAG tag;
unsigned int loopstart, loopend;
// A proper LOOPPOINT is its own tag, stupid.
e = FMOD_Sound_GetTag(music_stream, "LOOPPOINT", 0, &tag);
if (e != FMOD_ERR_TAGNOTFOUND)
// A proper LOOPPOINT is its own tag, stupid.
e = FMOD_Sound_GetTag(music_stream, "LOOPPOINT", 0, &tag);
if (e != FMOD_ERR_TAGNOTFOUND)
{
FMR(e);
loopstart = atoi((char *)tag.data); // assumed to be a string data tag.
FMR(FMOD_Sound_GetLoopPoints(music_stream, NULL, FMOD_TIMEUNIT_PCM, &loopend, FMOD_TIMEUNIT_PCM));
if (loopstart > 0)
FMR(FMOD_Sound_SetLoopPoints(music_stream, loopstart, FMOD_TIMEUNIT_PCM, loopend, FMOD_TIMEUNIT_PCM));
return true;
}
// todo
// if(music type == MIDI)
// {
// FMR(FMOD_Sound_SetMode(music_stream, FMOD_LOOP_NORMAL));
// return true;
// }
// Use LOOPMS for time in miliseconds.
e = FMOD_Sound_GetTag(music_stream, "LOOPMS", 0, &tag);
if (e != FMOD_ERR_TAGNOTFOUND)
{
FMR(e);
loopstart = atoi((char *)tag.data); // assumed to be a string data tag.
FMR(FMOD_Sound_GetLoopPoints(music_stream, NULL, FMOD_TIMEUNIT_MS, &loopend, FMOD_TIMEUNIT_PCM));
if (loopstart > 0)
FMR(FMOD_Sound_SetLoopPoints(music_stream, loopstart, FMOD_TIMEUNIT_MS, loopend, FMOD_TIMEUNIT_PCM));
return true;
}
// Try to fetch it from the COMMENT tag, like A.J. Freda
e = FMOD_Sound_GetTag(music_stream, "COMMENT", 0, &tag);
if (e != FMOD_ERR_TAGNOTFOUND)
{
char *loopText;
// Handle any errors that arose, first
FMR(e);
// Figure out where the number starts
loopText = strstr((char *)tag.data,"LOOPPOINT=");
if (loopText != NULL)
{
FMR(e);
loopstart = atoi((char *)tag.data); // assumed to be a string data tag.
// Skip the "LOOPPOINT=" part.
loopText += 10;
// Convert it to our looppoint
// FMOD seems to ensure the tag is properly NULL-terminated.
// atoi will stop when it reaches anything that's not a number.
loopstart = atoi(loopText);
// Now do the rest like above
FMR(FMOD_Sound_GetLoopPoints(music_stream, NULL, FMOD_TIMEUNIT_PCM, &loopend, FMOD_TIMEUNIT_PCM));
if (loopstart > 0)
FMR(FMOD_Sound_SetLoopPoints(music_stream, loopstart, FMOD_TIMEUNIT_PCM, loopend, FMOD_TIMEUNIT_PCM));
return true;
}
// todo
// if(music type == MIDI)
// {
// FMR(FMOD_Sound_SetMode(music_stream, FMOD_LOOP_NORMAL));
// return true;
// }
// Use LOOPMS for time in miliseconds.
e = FMOD_Sound_GetTag(music_stream, "LOOPMS", 0, &tag);
if (e != FMOD_ERR_TAGNOTFOUND)
{
FMR(e);
loopstart = atoi((char *)tag.data); // assumed to be a string data tag.
FMR(FMOD_Sound_GetLoopPoints(music_stream, NULL, FMOD_TIMEUNIT_MS, &loopend, FMOD_TIMEUNIT_PCM));
if (loopstart > 0)
FMR(FMOD_Sound_SetLoopPoints(music_stream, loopstart, FMOD_TIMEUNIT_MS, loopend, FMOD_TIMEUNIT_PCM));
return true;
}
// Try to fetch it from the COMMENT tag, like A.J. Freda
e = FMOD_Sound_GetTag(music_stream, "COMMENT", 0, &tag);
if (e != FMOD_ERR_TAGNOTFOUND)
{
char *loopText;
// Handle any errors that arose, first
FMR(e);
// Figure out where the number starts
loopText = strstr((char *)tag.data,"LOOPPOINT=");
if (loopText != NULL)
{
// Skip the "LOOPPOINT=" part.
loopText += 10;
// Convert it to our looppoint
// FMOD seems to ensure the tag is properly NULL-terminated.
// atoi will stop when it reaches anything that's not a number.
loopstart = atoi(loopText);
// Now do the rest like above
FMR(FMOD_Sound_GetLoopPoints(music_stream, NULL, FMOD_TIMEUNIT_PCM, &loopend, FMOD_TIMEUNIT_PCM));
if (loopstart > 0)
FMR(FMOD_Sound_SetLoopPoints(music_stream, loopstart, FMOD_TIMEUNIT_PCM, loopend, FMOD_TIMEUNIT_PCM));
}
return true;
}
return true;
}
// No special loop point
@ -783,7 +780,7 @@ void I_SetMIDIMusicVolume(UINT8 volume)
FMR_MUSIC(FMOD_Channel_SetVolume(music_channel, volume / 31.0));
}
boolean I_PlaySong(void)
boolean I_PlaySong(boolean looping)
{
#ifdef HAVE_LIBGME
if (gme)