Loose ends other targets
This commit is contained in:
parent
e89eccf78e
commit
9a5fc5f66a
|
@ -64,12 +64,12 @@ void I_InitMusic(void){}
|
||||||
|
|
||||||
void I_ShutdownMusic(void){}
|
void I_ShutdownMusic(void){}
|
||||||
|
|
||||||
void I_PauseSong(INT32 handle)
|
void I_PauseSong(void)
|
||||||
{
|
{
|
||||||
(void)handle;
|
(void)handle;
|
||||||
}
|
}
|
||||||
|
|
||||||
void I_ResumeSong(INT32 handle)
|
void I_ResumeSong(void)
|
||||||
{
|
{
|
||||||
(void)handle;
|
(void)handle;
|
||||||
}
|
}
|
||||||
|
@ -80,7 +80,7 @@ void I_ResumeSong(INT32 handle)
|
||||||
|
|
||||||
UINT8 midimusic_started = 0;
|
UINT8 midimusic_started = 0;
|
||||||
|
|
||||||
boolean I_LoadSong(void *data, size_t len)
|
boolean I_LoadSong(char *data, size_t len)
|
||||||
{
|
{
|
||||||
(void)data;
|
(void)data;
|
||||||
(void)len;
|
(void)len;
|
||||||
|
@ -92,7 +92,7 @@ void I_SetMIDIMusicVolume(INT32 volume)
|
||||||
(void)volume;
|
(void)volume;
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean I_PlaySong(void)
|
boolean I_PlaySong(boolean looping)
|
||||||
{
|
{
|
||||||
(void)handle;
|
(void)handle;
|
||||||
(void)looping;
|
(void)looping;
|
||||||
|
|
|
@ -408,7 +408,7 @@ void I_ShutdownMusic(void)
|
||||||
music_started=false;
|
music_started=false;
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean I_PlaySong(void)
|
boolean I_PlaySong(boolean looping)
|
||||||
{
|
{
|
||||||
handle = 0;
|
handle = 0;
|
||||||
if (nomidimusic)
|
if (nomidimusic)
|
||||||
|
@ -471,7 +471,7 @@ void I_UnloadSong(void)
|
||||||
//destroy_midi(currsong);
|
//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
|
int e = len; //Alam: For error
|
||||||
if (nomidimusic)
|
if (nomidimusic)
|
||||||
|
|
|
@ -70,12 +70,12 @@ void I_SetMIDIMusicVolume(UINT8 volume)
|
||||||
(void)volume;
|
(void)volume;
|
||||||
}
|
}
|
||||||
|
|
||||||
void I_PauseSong(INT32 handle)
|
void I_PauseSong(void)
|
||||||
{
|
{
|
||||||
(void)handle;
|
(void)handle;
|
||||||
}
|
}
|
||||||
|
|
||||||
void I_ResumeSong(INT32 handle)
|
void I_ResumeSong(void)
|
||||||
{
|
{
|
||||||
(void)handle;
|
(void)handle;
|
||||||
}
|
}
|
||||||
|
@ -84,14 +84,14 @@ void I_ResumeSong(INT32 handle)
|
||||||
// MIDI I/O
|
// MIDI I/O
|
||||||
//
|
//
|
||||||
|
|
||||||
boolean I_LoadSong(void *data, size_t len)
|
boolean I_LoadSong(char *data, size_t len)
|
||||||
{
|
{
|
||||||
(void)data;
|
(void)data;
|
||||||
(void)len;
|
(void)len;
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean I_PlaySong(void)
|
boolean I_PlaySong(boolean looping)
|
||||||
{
|
{
|
||||||
(void)handle;
|
(void)handle;
|
||||||
(void)looping;
|
(void)looping;
|
||||||
|
|
|
@ -1583,7 +1583,7 @@ static void I_PauseGME(void)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void I_PauseSong(INT32 handle)
|
void I_PauseSong(void)
|
||||||
{
|
{
|
||||||
(void)handle;
|
(void)handle;
|
||||||
I_PauseGME();
|
I_PauseGME();
|
||||||
|
@ -1603,7 +1603,7 @@ static void I_ResumeGME(void)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void I_ResumeSong(INT32 handle)
|
void I_ResumeSong(void)
|
||||||
{
|
{
|
||||||
(void)handle;
|
(void)handle;
|
||||||
I_ResumeGME();
|
I_ResumeGME();
|
||||||
|
@ -1659,7 +1659,7 @@ void I_UnloadSong(void)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean I_LoadSong(void *data, size_t len)
|
boolean I_LoadSong(char *data, size_t len)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_MIXER
|
#ifdef HAVE_MIXER
|
||||||
if (nomidimusic || !musicStarted)
|
if (nomidimusic || !musicStarted)
|
||||||
|
|
|
@ -110,9 +110,9 @@ static LRESULT CALLBACK MainWndproc(HWND hWnd, UINT message, WPARAM wParam, LPAR
|
||||||
|
|
||||||
// pause music when alt-tab
|
// pause music when alt-tab
|
||||||
if (appActive && !paused)
|
if (appActive && !paused)
|
||||||
I_ResumeSong(0);
|
I_ResumeSong();
|
||||||
else if (!paused)
|
else if (!paused)
|
||||||
I_PauseSong(0);
|
I_PauseSong();
|
||||||
{
|
{
|
||||||
HANDLE ci = GetStdHandle(STD_INPUT_HANDLE);
|
HANDLE ci = GetStdHandle(STD_INPUT_HANDLE);
|
||||||
DWORD mode;
|
DWORD mode;
|
||||||
|
|
|
@ -453,14 +453,14 @@ void I_ShutdownMusic(void)
|
||||||
I_StopSong();
|
I_StopSong();
|
||||||
}
|
}
|
||||||
|
|
||||||
void I_PauseSong(INT32 handle)
|
void I_PauseSong(void)
|
||||||
{
|
{
|
||||||
UNREFERENCED_PARAMETER(handle);
|
UNREFERENCED_PARAMETER(handle);
|
||||||
if (music_stream)
|
if (music_stream)
|
||||||
FMR_MUSIC(FMOD_Channel_SetPaused(music_channel, true));
|
FMR_MUSIC(FMOD_Channel_SetPaused(music_channel, true));
|
||||||
}
|
}
|
||||||
|
|
||||||
void I_ResumeSong(INT32 handle)
|
void I_ResumeSong(void)
|
||||||
{
|
{
|
||||||
UNREFERENCED_PARAMETER(handle);
|
UNREFERENCED_PARAMETER(handle);
|
||||||
if (music_stream)
|
if (music_stream)
|
||||||
|
@ -618,8 +618,6 @@ boolean I_LoadSong(char *data, size_t len)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try to find a loop point in streaming music formats (ogg, mp3)
|
// Try to find a loop point in streaming music formats (ogg, mp3)
|
||||||
if (looping)
|
|
||||||
{
|
|
||||||
FMOD_RESULT e;
|
FMOD_RESULT e;
|
||||||
FMOD_TAG tag;
|
FMOD_TAG tag;
|
||||||
unsigned int loopstart, loopend;
|
unsigned int loopstart, loopend;
|
||||||
|
@ -679,7 +677,6 @@ boolean I_LoadSong(char *data, size_t len)
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// No special loop point
|
// No special loop point
|
||||||
return true;
|
return true;
|
||||||
|
@ -783,7 +780,7 @@ void I_SetMIDIMusicVolume(UINT8 volume)
|
||||||
FMR_MUSIC(FMOD_Channel_SetVolume(music_channel, volume / 31.0));
|
FMR_MUSIC(FMOD_Channel_SetVolume(music_channel, volume / 31.0));
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean I_PlaySong(void)
|
boolean I_PlaySong(boolean looping)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_LIBGME
|
#ifdef HAVE_LIBGME
|
||||||
if (gme)
|
if (gme)
|
||||||
|
|
Loading…
Reference in New Issue