diff --git a/src/android/i_sound.c b/src/android/i_sound.c
index ecf96f2f053cf2ca8e3cb135b34cfc7e2dccd0c0..2bb304424af8b8dafe3dfc9df46eef877ef4cc89 100644
--- a/src/android/i_sound.c
+++ b/src/android/i_sound.c
@@ -21,13 +21,14 @@ void I_ShutdownSound(void){}
// SFX I/O
//
-INT32 I_StartSound(sfxenum_t id, INT32 vol, INT32 sep, INT32 pitch, INT32 priority)
+INT32 I_StartSound(sfxenum_t id, INT32 vol, INT32 sep, INT32 pitch, INT32 priority, INT32 channel)
{
(void)id;
(void)vol;
(void)sep;
(void)pitch;
(void)priority;
+ (void)channel;
return -1;
}
@@ -55,90 +56,87 @@ void I_SetSfxVolume(INT32 volume)
(void)volume;
}
-//
-// MUSIC I/O
-//
+/// ------------------------
+// MUSIC SYSTEM
+/// ------------------------
+
UINT8 music_started = 0;
+UINT8 digmusic_started = 0;
void I_InitMusic(void){}
void I_ShutdownMusic(void){}
-void I_PauseSong(INT32 handle)
+/// ------------------------
+// MUSIC PROPERTIES
+/// ------------------------
+
+musictype_t I_SongType(void)
{
- (void)handle;
+ return MU_NONE;
}
-void I_ResumeSong(INT32 handle)
+boolean I_SongPlaying(void)
{
- (void)handle;
+ return false;
}
-//
-// MIDI I/O
-//
-
-UINT8 midimusic_started = 0;
-
-void I_InitMIDIMusic(void){}
+boolean I_SongPaused(void)
+{
+ return false;
+}
-void I_ShutdownMIDIMusic(void){}
+/// ------------------------
+// MUSIC EFFECTS
+/// ------------------------
-void I_SetMIDIMusicVolume(INT32 volume)
+boolean I_SetSongSpeed(float speed)
{
- (void)volume;
+ (void)speed;
+ return false;
}
-INT32 I_RegisterSong(void *data, size_t len)
+/// ------------------------
+// MUSIC PLAYBACK
+/// ------------------------
+
+UINT8 midimusic_started = 0;
+
+boolean I_LoadSong(char *data, size_t len)
{
(void)data;
(void)len;
return -1;
}
-boolean I_PlaySong(INT32 handle, INT32 looping)
+void I_UnloadSong()
+{
+
+}
+
+boolean I_PlaySong(boolean looping)
{
(void)handle;
(void)looping;
return false;
}
-void I_StopSong(INT32 handle)
+void I_StopSong(void)
{
(void)handle;
}
-void I_UnRegisterSong(INT32 handle)
+void I_PauseSong(void)
{
(void)handle;
}
-//
-// DIGMUSIC I/O
-//
-
-UINT8 digmusic_started = 0;
-
-void I_InitDigMusic(void){}
-
-void I_ShutdownDigMusic(void){}
-
-boolean I_StartDigSong(const char *musicname, INT32 looping)
+void I_ResumeSong(void)
{
- (void)musicname;
- (void)looping;
- return false;
+ (void)handle;
}
-void I_StopDigSong(void){}
-
-void I_SetDigMusicVolume(INT32 volume)
+void I_SetMusicVolume(INT32 volume)
{
(void)volume;
}
-
-boolean I_SetSongSpeed(float speed)
-{
- (void)speed;
- return false;
-}
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 6e22dde239b1e4e1097119d289a08e4ef422a5a1..950038237c1f118daa87112289d2dad80cfb2ffb 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1568,8 +1568,6 @@ static void CL_LoadReceivedSavegame(void)
automapactive = false;
// load a base level
- playerdeadview = false;
-
if (P_LoadNetGame())
{
const INT32 actnum = mapheaderinfo[gamemap-1]->actnum;
diff --git a/src/d_main.c b/src/d_main.c
index df33987525d1520278c094f717309625c58327f2..1705326751e2bc65b270b8a8b0f153c535d15775 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -121,20 +121,17 @@ INT32 postimgparam;
postimg_t postimgtype2 = postimg_none;
INT32 postimgparam2;
+// These variables are only true if
+// whether the respective sound system is disabled
+// or they're init'ed, but the player just toggled them
#ifdef _XBOX
-boolean nomidimusic = true, nosound = true;
-boolean nodigimusic = true;
+boolean midi_disabled = true, sound_disabled = true;
+boolean digital_disabled = true;
#else
-boolean nomidimusic = false, nosound = false;
-boolean nodigimusic = false; // No fmod-based music
-#endif
-
-// These variables are only true if
-// the respective sound system is initialized
-// and active, but no sounds/music should play.
-boolean music_disabled = false;
+boolean midi_disabled = false;
boolean sound_disabled = false;
boolean digital_disabled = false;
+#endif
boolean advancedemo;
#ifdef DEBUGFILE
@@ -720,7 +717,6 @@ void D_StartTitle(void)
maptol = 0;
gameaction = ga_nothing;
- playerdeadview = false;
displayplayer = consoleplayer = 0;
//demosequence = -1;
gametype = GT_COOP;
@@ -1212,27 +1208,27 @@ void D_SRB2Main(void)
// setting up sound
if (dedicated)
{
- nosound = true;
- nomidimusic = nodigimusic = true;
+ sound_disabled = true;
+ midi_disabled = digital_disabled = true;
}
else
{
- CONS_Printf("S_Init(): Setting up sound.\n");
+ CONS_Printf("S_InitSfxChannels(): Setting up sound channels.\n");
}
if (M_CheckParm("-nosound"))
- nosound = true;
+ sound_disabled = true;
if (M_CheckParm("-nomusic")) // combines -nomidimusic and -nodigmusic
- nomidimusic = nodigimusic = true;
+ midi_disabled = digital_disabled = true;
else
{
if (M_CheckParm("-nomidimusic"))
- nomidimusic = true; ; // WARNING: DOS version initmusic in I_StartupSound
+ midi_disabled = true; ; // WARNING: DOS version initmusic in I_StartupSound
if (M_CheckParm("-nodigmusic"))
- nodigimusic = true; // WARNING: DOS version initmusic in I_StartupSound
+ digital_disabled = true; // WARNING: DOS version initmusic in I_StartupSound
}
I_StartupSound();
I_InitMusic();
- S_Init(cv_soundvolume.value, cv_digmusicvolume.value, cv_midimusicvolume.value);
+ S_InitSfxChannels(cv_soundvolume.value);
CONS_Printf("ST_Init(): Init status bar.\n");
ST_Init();
diff --git a/src/d_main.h b/src/d_main.h
index 6dc273b1558d8ac6329a15100946dc889095eebf..d73b19d1f6e5fd34ab5fd0470a5c762379c6fd8b 100644
--- a/src/d_main.h
+++ b/src/d_main.h
@@ -34,7 +34,7 @@ void D_SRB2Loop(void) FUNCNORETURN;
// D_SRB2Main()
// Not a globally visible function, just included for source reference,
// calls all startup code, parses command line options.
-// If not overrided by user input, calls N_AdvanceDemo.
+// If not overrided by user input, calls D_AdvanceDemo.
//
void D_SRB2Main(void);
@@ -51,9 +51,6 @@ const char *D_Home(void);
//
// BASE LEVEL
//
-void D_PageTicker(void);
-// pagename is lumpname of a 320x200 patch to fill the screen
-void D_PageDrawer(const char *pagename);
void D_AdvanceDemo(void);
void D_StartTitle(void);
diff --git a/src/d_net.c b/src/d_net.c
index 643c41ac921507e6a76613348fa90d859a2e1daa..8de5cf088aaf6b2d6c17d5fc9d9f51ff5c5c0b69 100644
--- a/src/d_net.c
+++ b/src/d_net.c
@@ -49,7 +49,9 @@ doomcom_t *doomcom = NULL;
/// \brief network packet data, points inside doomcom
doomdata_t *netbuffer = NULL;
+#ifdef DEBUGFILE
FILE *debugfile = NULL; // put some net info in a file during the game
+#endif
#define MAXREBOUND 8
static doomdata_t reboundstore[MAXREBOUND];
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index 7427252de92164968a936f07beaaf8de8aea67a5..bce522e4807dcd7be376168987dc6b094c4904cb 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -210,7 +210,6 @@ void Command_ExitGame_f(void);
void Command_Retry_f(void);
void D_GameTypeChanged(INT32 lastgametype); // not a real _OnChange function anymore
void D_MapChange(INT32 pmapnum, INT32 pgametype, boolean pultmode, boolean presetplayers, INT32 pdelay, boolean pskipprecutscene, boolean pfromlevelselect);
-void ObjectPlace_OnChange(void);
void ItemFinder_OnChange(void);
void D_SetPassword(const char *pw);
diff --git a/src/djgppdos/i_sound.c b/src/djgppdos/i_sound.c
index 88fc807f408cb4f285086fdabd854658b83063ad..52c90aac2d2450ede35eb9773e8b9a222e661783 100644
--- a/src/djgppdos/i_sound.c
+++ b/src/djgppdos/i_sound.c
@@ -134,21 +134,12 @@ FUNCINLINE static ATTRINLINE int Volset(int vol)
void I_SetSfxVolume(INT32 volume)
{
- if (nosound)
+ if (sound_disabled)
return;
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
@@ -165,11 +156,13 @@ INT32 I_StartSound ( sfxenum_t id,
INT32 vol,
INT32 sep,
INT32 pitch,
- INT32 priority )
+ INT32 priority,
+ INT32 channel)
{
int voice;
+ (void)channel;
- if (nosound)
+ if (sound_disabled)
return 0;
// UNUSED
@@ -190,7 +183,7 @@ void I_StopSound (INT32 handle)
// an setting the channel to zero.
int voice=handle & (VIRTUAL_VOICES-1);
- if (nosound)
+ if (sound_disabled)
return;
if (voice_check(voice)==S_sfx[handle>>VOICESSHIFT].data)
@@ -199,7 +192,7 @@ void I_StopSound (INT32 handle)
INT32 I_SoundIsPlaying(INT32 handle)
{
- if (nosound)
+ if (sound_disabled)
return FALSE;
if (voice_check(handle & (VIRTUAL_VOICES-1))==S_sfx[handle>>VOICESSHIFT].data)
@@ -229,7 +222,7 @@ void I_UpdateSoundParams( INT32 handle,
int voice=handle & (VIRTUAL_VOICES-1);
int numsfx=handle>>VOICESSHIFT;
- if (nosound)
+ if (sound_disabled)
return;
if (voice_check(voice)==S_sfx[numsfx].data)
@@ -270,17 +263,17 @@ void I_StartupSound(void)
char err[255];
#endif
- if (nosound)
+ if (sound_disabled)
sfxcard=DIGI_NONE;
else
sfxcard=DIGI_AUTODETECT;
- if (nomidimusic)
+ if (midi_disabled)
midicard=MIDI_NONE;
else
midicard=MIDI_AUTODETECT; //DetectMusicCard();
- nodigimusic=true; //Alam: No OGG/MP3/IT/MOD support
+ digital_disabled=true; //Alam: No OGG/MP3/IT/MOD support
// Secure and configure sound device first.
CONS_Printf("I_StartupSound: ");
@@ -293,8 +286,8 @@ void I_StartupSound(void)
{
sprintf (err,"Sound init error : %s\n",allegro_error);
CONS_Error (err);
- nosound=true;
- nomidimusic=true;
+ sound_disabled=true;
+ midi_disabled=true;
}
else
{
@@ -321,7 +314,11 @@ static MIDI* currsong; //im assuming only 1 song will be played at once
static int islooping=0;
static int musicdies=-1;
UINT8 music_started=0;
+boolean songpaused=false;
+/// ------------------------
+// MUSIC SYSTEM
+/// ------------------------
/* load_midi_mem:
* Loads a standard MIDI file from memory, returning a pointer to
@@ -389,163 +386,162 @@ static MIDI *load_midi_mem(char *mempointer,int *e)
return midi;
}
-void I_InitMIDIMusic(void)
+void I_InitMusic(void)
{
- if (nomidimusic)
+ if (midi_disabled)
return;
I_AddExitFunc(I_ShutdownMusic);
music_started = true;
+ songpaused = false;
}
-void I_ShutdownMIDIMusic(void)
+void I_ShutdownMusic(void)
{
if ( !music_started )
return;
- I_StopSong(1);
+ I_StopSong();
music_started=false;
}
-void I_InitDigMusic(void)
+/// ------------------------
+// MUSIC PROPERTIES
+/// ------------------------
+
+musictype_t I_SongType(void)
{
-// CONS_Printf("Digital music not yet supported under DOS.\n");
+ if (currsong)
+ return MU_MID;
+ else
+ return MU_NONE;
}
-void I_ShutdownDigMusic(void)
+boolean I_SongPlaying()
{
-// CONS_Printf("Digital music not yet supported under DOS.\n");
+ return (boolean)currsong;
}
-void I_InitMusic(void)
+boolean I_SongPaused()
{
- if (!nodigimusic)
- I_InitDigMusic();
- if (!nomidimusic)
- I_InitMIDIMusic();
+ return songpaused;
}
-void I_ShutdownMusic(void)
+/// ------------------------
+// MUSIC EFFECTS
+/// ------------------------
+
+boolean I_SetSongSpeed(float speed)
{
- I_ShutdownMIDIMusic();
- I_ShutdownDigMusic();
+ (void)speed;
+ return false;
}
-boolean I_PlaySong(INT32 handle, INT32 looping)
+/// ------------------------
+// MUSIC PLAYBACK
+/// ------------------------
+
+boolean I_LoadSong(char *data, size_t len)
{
- handle = 0;
- if (nomidimusic)
- return false;
+ int e = len; //Alam: For error
+ if (midi_disabled)
+ return 0;
- islooping = looping;
- musicdies = gametic + NEWTICRATE*30;
- if (play_midi(currsong,looping)==0)
- return true;
- return false;
+ if (memcmp(data,"MThd",4)==0) // support mid file in WAD !!!
+ {
+ currsong=load_midi_mem(data,&e);
+ }
+ else
+ {
+ CONS_Printf("Music Lump is not a MIDI lump\n");
+ return 0;
+ }
+
+ if (currsong==NULL)
+ {
+ CONS_Printf("Not a valid mid file : %d\n",e);
+ return 0;
+ }
+
+ return 1;
}
-void I_PauseSong (INT32 handle)
+void I_UnloadSong(void)
{
handle = 0;
- if (nomidimusic)
+ if (midi_disabled)
return;
- midi_pause();
+ //destroy_midi(currsong);
}
-void I_ResumeSong (INT32 handle)
+boolean I_PlaySong(boolean looping)
{
handle = 0;
- if (nomidimusic)
- return;
+ if (midi_disabled)
+ return false;
- midi_resume();
+ islooping = looping;
+ musicdies = gametic + NEWTICRATE*30;
+ if (play_midi(currsong,looping)==0)
+ return true;
+ return false;
}
-void I_StopSong(INT32 handle)
+void I_StopSong(void)
{
handle = 0;
- if (nomidimusic)
+ if (midi_disabled)
return;
islooping = 0;
musicdies = 0;
stop_midi();
+ songpaused = false;
}
-// Is the song playing?
-#if 0
-int I_QrySongPlaying(int handle)
+void I_PauseSong (INT32 handle)
{
- if (nomidimusic)
- return 0;
-
- //return islooping || musicdies > gametic;
- return (midi_pos==-1);
+ handle = 0;
+ if (midi_disabled)
+ return;
+ midi_pause();
+ songpaused = true;
}
-#endif
-void I_UnRegisterSong(INT32 handle)
+void I_ResumeSong (INT32 handle)
{
handle = 0;
- if (nomidimusic)
+ if (midi_disabled)
return;
-
- //destroy_midi(currsong);
+ midi_resume();
+ songpaused = false;
}
-INT32 I_RegisterSong(void *data, size_t len)
+void I_SetMusicVolume(INT32 volume)
{
- int e = len; //Alam: For error
- if (nomidimusic)
- return 0;
-
- if (memcmp(data,"MThd",4)==0) // support mid file in WAD !!!
- {
- currsong=load_midi_mem(data,&e);
- }
- else
- {
- CONS_Printf("Music Lump is not a MIDI lump\n");
- return 0;
- }
-
- if (currsong==NULL)
- {
- CONS_Printf("Not a valid mid file : %d\n",e);
- return 0;
- }
+ if (midi_disabled)
+ return;
- return 1;
+ // Now set volume on output device.
+ set_volume (-1, Volset(volume));
}
-/// \todo Add OGG/MP3 support for dos
-boolean I_StartDigSong(const char *musicname, INT32 looping)
+boolean I_SetSongTrack(INT32 track)
{
- musicname = NULL;
- looping = 0;
- //CONS_Printf("I_StartDigSong: Not yet supported under DOS.\n");
+ (void)track;
return false;
}
-void I_StopDigSong(void)
-{
-// CONS_Printf("I_StopDigSong: Not yet supported under DOS.\n");
-}
-
-void I_SetDigMusicVolume(INT32 volume)
+// Is the song playing?
+#if 0
+int I_QrySongPlaying(int handle)
{
- volume = 0;
- if (nodigimusic)
- return;
-
- // Now set volume on output device.
-// CONS_Printf("Digital music not yet supported under DOS.\n");
-}
+ if (midi_disabled)
+ return 0;
-boolean I_SetSongSpeed(float speed)
-{
- (void)speed;
- return false;
+ //return islooping || musicdies > gametic;
+ return (midi_pos==-1);
}
+#endif
diff --git a/src/doomstat.h b/src/doomstat.h
index 8072a15528f56a23727da9a6d7b32bcf86db4166..53db6eb252817182fc312717800a64f18b836907 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -85,10 +85,7 @@ extern boolean fromlevelselect;
// Internal parameters for sound rendering.
// ========================================
-extern boolean nomidimusic; // defined in d_main.c
-extern boolean nosound;
-extern boolean nodigimusic;
-extern boolean music_disabled;
+extern boolean midi_disabled;
extern boolean sound_disabled;
extern boolean digital_disabled;
@@ -445,19 +442,17 @@ extern mapthing_t *redctfstarts[MAXPLAYERS]; // CTF
#if defined (macintosh)
#define DEBFILE(msg) I_OutputMsg(msg)
-extern FILE *debugfile;
#else
#define DEBUGFILE
#ifdef DEBUGFILE
#define DEBFILE(msg) { if (debugfile) { fputs(msg, debugfile); fflush(debugfile); } }
-extern FILE *debugfile;
#else
#define DEBFILE(msg) {}
-extern FILE *debugfile;
#endif
#endif
#ifdef DEBUGFILE
+extern FILE *debugfile;
extern INT32 debugload;
#endif
diff --git a/src/dummy/i_sound.c b/src/dummy/i_sound.c
index 51dbb610d13657ab567bfd8314ea53dc6ba40350..7275bb1ae5d9345e035aa775b602b5fb3bf4f8a1 100644
--- a/src/dummy/i_sound.c
+++ b/src/dummy/i_sound.c
@@ -23,13 +23,14 @@ void I_UpdateSound(void){};
// SFX I/O
//
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
{
(void)id;
(void)vol;
(void)sep;
(void)pitch;
(void)priority;
+ (void)channel;
return -1;
}
@@ -57,91 +58,88 @@ void I_SetSfxVolume(UINT8 volume)
(void)volume;
}
-//
-// MUSIC I/O
-//
+/// ------------------------
+// MUSIC SYSTEM
+/// ------------------------
void I_InitMusic(void){}
void I_ShutdownMusic(void){}
-void I_PauseSong(INT32 handle)
+/// ------------------------
+// MUSIC PROPERTIES
+/// ------------------------
+
+musictype_t I_SongType(void)
{
- (void)handle;
+ return MU_NONE;
}
-void I_ResumeSong(INT32 handle)
+boolean I_SongPlaying(void)
{
- (void)handle;
+ return false;
}
-//
-// MIDI I/O
-//
-
-void I_InitMIDIMusic(void){}
+boolean I_SongPaused(void)
+{
+ return false;
+}
-void I_ShutdownMIDIMusic(void){}
+/// ------------------------
+// MUSIC EFFECTS
+/// ------------------------
-void I_SetMIDIMusicVolume(UINT8 volume)
+boolean I_SetSongSpeed(float speed)
{
- (void)volume;
+ (void)speed;
+ return false;
}
-INT32 I_RegisterSong(void *data, size_t len)
+/// ------------------------
+// MUSIC PLAYBACK
+/// ------------------------
+
+boolean I_LoadSong(char *data, size_t len)
{
(void)data;
(void)len;
return -1;
}
-boolean I_PlaySong(INT32 handle, boolean looping)
+void I_UnloadSong(void)
{
(void)handle;
- (void)looping;
- return false;
}
-void I_StopSong(INT32 handle)
+boolean I_PlaySong(boolean looping)
{
(void)handle;
+ (void)looping;
+ return false;
}
-void I_UnRegisterSong(INT32 handle)
+void I_StopSong(void)
{
(void)handle;
}
-//
-// DIGMUSIC I/O
-//
-
-void I_InitDigMusic(void){}
-
-void I_ShutdownDigMusic(void){}
-
-boolean I_StartDigSong(const char *musicname, boolean looping)
+void I_PauseSong(void)
{
- (void)musicname;
- (void)looping;
- return false;
+ (void)handle;
}
-void I_StopDigSong(void){}
-
-void I_SetDigMusicVolume(UINT8 volume)
+void I_ResumeSong(void)
{
- (void)volume;
+ (void)handle;
}
-boolean I_SetSongSpeed(float speed)
+void I_SetMusicVolume(UINT8 volume)
{
- (void)speed;
- return false;
+ (void)volume;
}
boolean I_SetSongTrack(int track)
{
(void)track;
return false;
-}
+}
\ No newline at end of file
diff --git a/src/f_finale.c b/src/f_finale.c
index a8b27bb807499f44b2855526f33e119a8cf1db4f..fb1387c11e1a31b147ba93b7b9d3fdfefd126668 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -442,7 +442,6 @@ void F_StartIntro(void)
G_SetGamestate(GS_INTRO);
gameaction = ga_nothing;
- playerdeadview = false;
paused = false;
CON_ToggleOff();
CON_ClearHUD();
@@ -1130,7 +1129,6 @@ void F_StartCredits(void)
}
gameaction = ga_nothing;
- playerdeadview = false;
paused = false;
CON_ToggleOff();
CON_ClearHUD();
@@ -1277,7 +1275,6 @@ void F_StartGameEvaluation(void)
G_SaveGame((UINT32)cursaveslot);
gameaction = ga_nothing;
- playerdeadview = false;
paused = false;
CON_ToggleOff();
CON_ClearHUD();
@@ -1388,7 +1385,6 @@ void F_StartGameEnd(void)
G_SetGamestate(GS_GAMEEND);
gameaction = ga_nothing;
- playerdeadview = false;
paused = false;
CON_ToggleOff();
CON_ClearHUD();
@@ -1591,7 +1587,6 @@ void F_StartContinue(void)
gameaction = ga_nothing;
keypressed = false;
- playerdeadview = false;
paused = false;
CON_ToggleOff();
CON_ClearHUD();
@@ -1760,7 +1755,6 @@ void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean reset
G_SetGamestate(GS_CUTSCENE);
gameaction = ga_nothing;
- playerdeadview = false;
paused = false;
CON_ToggleOff();
diff --git a/src/g_game.c b/src/g_game.c
index 4f1c49b428bdb7165146518e5387f8496b44bfc1..0e8c14f6a86928cd705209016e35751f2eef95da 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -3616,7 +3616,6 @@ void G_InitNew(UINT8 pultmode, const char *mapname, boolean resetplayer, boolean
mapmusflags |= MUSIC_RELOADRESET;
ultimatemode = pultmode;
- playerdeadview = false;
automapactive = false;
imcontinuing = false;
diff --git a/src/hardware/hw3sound.c b/src/hardware/hw3sound.c
index c68430921fa4053b5e3fc96fe23f94804291a0ea..f7c6e1da025e1db33471bd8775bc6a8ff4c826a3 100644
--- a/src/hardware/hw3sound.c
+++ b/src/hardware/hw3sound.c
@@ -361,7 +361,7 @@ INT32 HW3S_I_StartSound(const void *origin_p, source3D_data_t *source_parm, chan
if (splitscreen) listenmobj2 = players[secondarydisplayplayer].mo;
- if (nosound)
+ if (sound_disabled)
return -1;
sfx = &S_sfx[sfx_id];
diff --git a/src/hardware/hw_bsp.c b/src/hardware/hw_bsp.c
index 17eb8761c9650eea7ca4b87d6dc157a3dd078979..a32609fc80ebb1e0316f1c1f6d2dd5897a00c707 100644
--- a/src/hardware/hw_bsp.c
+++ b/src/hardware/hw_bsp.c
@@ -564,8 +564,6 @@ static inline void HWR_SubsecPoly(INT32 num, poly_t *poly)
subsector_t *sub;
seg_t *lseg;
- sscount++;
-
sub = &subsectors[num];
count = sub->numlines;
lseg = &segs[sub->firstline];
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 871a6a493743844946313162170ad78e5fa5a3b7..ecb70a0f9bea7099d6298ea19ac456589d63ce8c 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -3264,7 +3264,6 @@ static void HWR_Subsector(size_t num)
if (num < numsubsectors)
{
- sscount++;
// subsector
sub = &subsectors[num];
// sector
diff --git a/src/hu_stuff.h b/src/hu_stuff.h
index 7b22f33f189b5a602ca043862b21ca2e8cc0d678..5356ba8acd40e3a765b9fc7e099f3f849d73c7df 100644
--- a/src/hu_stuff.h
+++ b/src/hu_stuff.h
@@ -78,9 +78,6 @@ extern boolean chat_on;
// set true whenever the tab rankings are being shown for any reason
extern boolean hu_showscores;
-// P_DeathThink sets this true to show scores while dead, in multiplayer
-extern boolean playerdeadview;
-
// init heads up data at game startup.
void HU_Init(void);
diff --git a/src/i_sound.h b/src/i_sound.h
index 084479ee1860485b23537983653b067e7b2d0094..2f73017ddd94fdb93e08f69fe9b11cee9977060f 100644
--- a/src/i_sound.h
+++ b/src/i_sound.h
@@ -18,6 +18,21 @@
#include "sounds.h"
#include "command.h"
+// copied from SDL mixer, plus GME
+typedef enum {
+ MU_NONE,
+ MU_CMD,
+ MU_WAV,
+ MU_MOD,
+ MU_MID,
+ MU_OGG,
+ MU_MP3,
+ MU_MP3_MAD_UNUSED, // use MU_MP3 instead
+ MU_FLAC,
+ MU_MODPLUG_UNUSED, // use MU_MOD instead
+ MU_GME
+} musictype_t;
+
/** \brief Sound subsystem runing and waiting
*/
extern UINT8 sound_started;
@@ -51,9 +66,9 @@ void I_StartupSound(void);
*/
void I_ShutdownSound(void);
-//
-// SFX I/O
-//
+/// ------------------------
+/// SFX I/O
+/// ------------------------
/** \brief Starts a sound in a particular sound channel.
\param id sfxid
@@ -64,7 +79,7 @@ void I_ShutdownSound(void);
\return sfx handle
*/
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority);
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel);
/** \brief Stops a sound channel.
@@ -105,9 +120,10 @@ void I_UpdateSoundParams(INT32 handle, UINT8 vol, UINT8 sep, UINT8 pitch);
*/
void I_SetSfxVolume(UINT8 volume);
-//
-// MUSIC I/O
-//
+/// ------------------------
+// MUSIC SYSTEM
+/// ------------------------
+
/** \brief Init the music systems
*/
void I_InitMusic(void);
@@ -116,41 +132,23 @@ void I_InitMusic(void);
*/
void I_ShutdownMusic(void);
-/** \brief PAUSE game handling.
+/// ------------------------
+// MUSIC PROPERTIES
+/// ------------------------
- \param handle song handle
+musictype_t I_SongType(void);
+boolean I_SongPlaying(void);
+boolean I_SongPaused(void);
- \return void
-*/
-void I_PauseSong(INT32 handle);
-
-/** \brief RESUME game handling
+/// ------------------------
+// MUSIC EFFECTS
+/// ------------------------
- \param handle song handle
-
- \return void
-*/
-void I_ResumeSong(INT32 handle);
-
-//
-// MIDI I/O
-//
-
-/** \brief Startup the MIDI music system
-*/
-void I_InitMIDIMusic(void);
-
-/** \brief Shutdown the MIDI music system
-*/
-void I_ShutdownMIDIMusic(void);
-
-/** \brief The I_SetMIDIMusicVolume function
-
- \param volume volume to set at
+boolean I_SetSongSpeed(float speed);
- \return void
-*/
-void I_SetMIDIMusicVolume(UINT8 volume);
+/// ------------------------
+// MUSIC PLAYBACK
+/// ------------------------
/** \brief Registers a song handle to song data.
@@ -161,7 +159,16 @@ void I_SetMIDIMusicVolume(UINT8 volume);
\todo Remove this
*/
-INT32 I_RegisterSong(void *data, size_t len);
+boolean I_LoadSong(char *data, size_t len);
+
+/** \brief See ::I_LoadSong, then think backwards
+
+ \param handle song handle
+
+ \sa I_LoadSong
+ \todo remove midi handle
+*/
+void I_UnloadSong(void);
/** \brief Called by anything that wishes to start music
@@ -172,7 +179,7 @@ INT32 I_RegisterSong(void *data, size_t len);
\todo pass music name, not handle
*/
-boolean I_PlaySong(INT32 handle, boolean looping);
+boolean I_PlaySong(boolean looping);
/** \brief Stops a song over 3 seconds
@@ -181,58 +188,37 @@ boolean I_PlaySong(INT32 handle, boolean looping);
/todo drop handle
*/
-void I_StopSong(INT32 handle);
+void I_StopSong(void);
-/** \brief See ::I_RegisterSong, then think backwards
+/** \brief PAUSE game handling.
\param handle song handle
- \sa I_RegisterSong
- \todo remove midi handle
-*/
-void I_UnRegisterSong(INT32 handle);
-
-//
-// DIGMUSIC I/O
-//
-
-/** \brief Startup the music system
-*/
-void I_InitDigMusic(void);
-
-/** \brief Shutdown the music system
+ \return void
*/
-void I_ShutdownDigMusic(void);
-
-boolean I_SetSongSpeed(float speed);
-
-boolean I_SetSongTrack(INT32 track);
-
-/** \brief The I_StartDigSong function
+void I_PauseSong(void);
- \param musicname music lump name
- \param looping if true, loop the song
+/** \brief RESUME game handling
- \return if true, song playing
-*/
-boolean I_StartDigSong(const char *musicname, boolean looping);
+ \param handle song handle
-/** \brief stop non-MIDI song
+ \return void
*/
-void I_StopDigSong(void);
+void I_ResumeSong(void);
-/** \brief The I_SetDigMusicVolume function
+/** \brief The I_SetMusicVolume function
\param volume volume to set at
\return void
*/
-void I_SetDigMusicVolume(UINT8 volume);
+void I_SetMusicVolume(UINT8 volume);
-//
-// CD MUSIC I/O
-//
+boolean I_SetSongTrack(INT32 track);
+/// ------------------------
+// CD MUSIC I/O
+/// ------------------------
/** \brief cd music interface
*/
@@ -279,4 +265,4 @@ void I_PlayCD(UINT8 track, UINT8 looping);
*/
boolean I_SetVolumeCD(INT32 volume);
-#endif
+#endif
\ No newline at end of file
diff --git a/src/m_anigif.c b/src/m_anigif.c
index 2540665ad57e8f901f315238ad74d9c352e01878..e2af700953deabdde06e0419afaa81409c7afdf6 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -492,7 +492,9 @@ static void GIF_framewrite(void)
// screen regions are handled in GIF_lzw
{
- UINT16 delay = 3; // todo
+ int d1 = (int)((100.0/NEWTICRATE)*(gif_frames+1));
+ int d2 = (int)((100.0/NEWTICRATE)*(gif_frames));
+ UINT16 delay = d1-d2;
INT32 startline;
WRITEMEM(p, gifframe_gchead, 4);
diff --git a/src/m_menu.c b/src/m_menu.c
index 79ac6800b7cf18a7fb7df362f37dc5329f150e4a..c9adbfb9c94646c43671f1e78a4a838c283e87d0 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -6950,82 +6950,95 @@ static void M_ChangeControl(INT32 choice)
// Toggles sound systems in-game.
static void M_ToggleSFX(void)
{
- if (nosound)
+ if (sound_disabled)
{
- nosound = false;
- I_StartupSound();
- if (nosound) return;
- S_Init(cv_soundvolume.value, cv_digmusicvolume.value, cv_midimusicvolume.value);
+ sound_disabled = false;
+ S_InitSfxChannels(cv_soundvolume.value);
+ S_StartSound(NULL, sfx_strpst);
M_StartMessage(M_GetText("SFX Enabled\n"), NULL, MM_NOTHING);
}
else
{
- if (sound_disabled)
- {
- sound_disabled = false;
- M_StartMessage(M_GetText("SFX Enabled\n"), NULL, MM_NOTHING);
- }
- else
- {
- sound_disabled = true;
- S_StopSounds();
- M_StartMessage(M_GetText("SFX Disabled\n"), NULL, MM_NOTHING);
- }
+ sound_disabled = true;
+ S_StopSounds();
+ M_StartMessage(M_GetText("SFX Disabled\n"), NULL, MM_NOTHING);
}
}
static void M_ToggleDigital(void)
{
- if (nodigimusic)
+ if (digital_disabled)
{
- nodigimusic = false;
- I_InitDigMusic();
- if (nodigimusic) return;
- S_Init(cv_soundvolume.value, cv_digmusicvolume.value, cv_midimusicvolume.value);
+ digital_disabled = false;
+ I_InitMusic();
S_StopMusic();
- S_ChangeMusicInternal("lclear", false);
+ if (Playing())
+ P_RestoreMusic(&players[consoleplayer]);
+ else
+ S_ChangeMusicInternal("lclear", false);
M_StartMessage(M_GetText("Digital Music Enabled\n"), NULL, MM_NOTHING);
}
else
{
- if (digital_disabled)
+ digital_disabled = true;
+ if (S_MusicType() != MU_MID)
{
- digital_disabled = false;
- M_StartMessage(M_GetText("Digital Music Enabled\n"), NULL, MM_NOTHING);
- }
- else
- {
- digital_disabled = true;
- S_StopMusic();
- M_StartMessage(M_GetText("Digital Music Disabled\n"), NULL, MM_NOTHING);
+ if (midi_disabled)
+ S_StopMusic();
+ else
+ {
+ char mmusic[7];
+ UINT16 mflags;
+ boolean looping;
+
+ if (S_MusicInfo(mmusic, &mflags, &looping) && S_MIDIExists(mmusic))
+ {
+ S_StopMusic();
+ S_ChangeMusic(mmusic, mflags, looping);
+ }
+ else
+ S_StopMusic();
+ }
}
+ M_StartMessage(M_GetText("Digital Music Disabled\n"), NULL, MM_NOTHING);
}
}
static void M_ToggleMIDI(void)
{
- if (nomidimusic)
+ if (midi_disabled)
{
- nomidimusic = false;
- I_InitMIDIMusic();
- if (nomidimusic) return;
- S_Init(cv_soundvolume.value, cv_digmusicvolume.value, cv_midimusicvolume.value);
- S_ChangeMusicInternal("lclear", false);
+ midi_disabled = false;
+ I_InitMusic();
+ if (Playing())
+ P_RestoreMusic(&players[consoleplayer]);
+ else
+ S_ChangeMusicInternal("lclear", false);
M_StartMessage(M_GetText("MIDI Music Enabled\n"), NULL, MM_NOTHING);
}
else
{
- if (music_disabled)
- {
- music_disabled = false;
- M_StartMessage(M_GetText("MIDI Music Enabled\n"), NULL, MM_NOTHING);
- }
- else
+ midi_disabled = true;
+ if (S_MusicType() == MU_MID)
{
- music_disabled = true;
- S_StopMusic();
- M_StartMessage(M_GetText("MIDI Music Disabled\n"), NULL, MM_NOTHING);
+ if (digital_disabled)
+ S_StopMusic();
+ else
+ {
+ char mmusic[7];
+ UINT16 mflags;
+ boolean looping;
+
+ if (S_MusicInfo(mmusic, &mflags, &looping) && S_DigExists(mmusic))
+ {
+ S_StopMusic();
+ S_ChangeMusic(mmusic, mflags, looping);
+ }
+ else
+ S_StopMusic();
+ }
}
+ M_StartMessage(M_GetText("MIDI Music Disabled\n"), NULL, MM_NOTHING);
}
}
diff --git a/src/nds/i_sound.c b/src/nds/i_sound.c
index 8dea4ad7d494ae78eba6eeefd9a6e0a3e5109184..a17c7f66a24a746e68e78147dc943fd0892c093b 100644
--- a/src/nds/i_sound.c
+++ b/src/nds/i_sound.c
@@ -21,13 +21,14 @@ void I_ShutdownSound(void){}
// SFX I/O
//
-INT32 I_StartSound(sfxenum_t id, INT32 vol, INT32 sep, INT32 pitch, INT32 priority)
+INT32 I_StartSound(sfxenum_t id, INT32 vol, INT32 sep, INT32 pitch, INT32 priority, INT32 channel)
{
(void)id;
(void)vol;
(void)sep;
(void)pitch;
(void)priority;
+ (void)channel;
return -1;
}
diff --git a/src/p_local.h b/src/p_local.h
index 1fd7ada04219b928fe1619e2398fb4fef5ba500a..b82bcf0ecfab5c930b7416d6ed92ddca8fe7516a 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -68,7 +68,6 @@
// both the head and tail of the thinker list
extern thinker_t thinkercap;
-extern INT32 runcount;
void P_InitThinkers(void);
void P_AddThinker(thinker_t *thinker);
diff --git a/src/p_mobj.c b/src/p_mobj.c
index bb9483d187c110823f55b2e6ce515738f7249d51..2a29c32ad104ba7644431fea3445d3c21451659a 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -8231,7 +8231,7 @@ void P_PrecipitationEffects(void)
if (!playeringame[displayplayer] || !players[displayplayer].mo)
return;
- if (nosound || sound_disabled)
+ if (sound_disabled)
return; // Sound off? D'aw, no fun.
if (players[displayplayer].mo->subsector->sector->ceilingpic == skyflatnum)
diff --git a/src/p_user.c b/src/p_user.c
index 7abf8534756db744e43c7c3cf9daba07bc98e626..7e206930d2775b4ebdb65c5d515525bbc99aae1c 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8648,8 +8648,6 @@ void P_DoPityCheck(player_t *player)
// P_PlayerThink
//
-boolean playerdeadview; // show match/chaos/tag/capture the flag rankings while in death view
-
void P_PlayerThink(player_t *player)
{
ticcmd_t *cmd;
@@ -8838,10 +8836,6 @@ void P_PlayerThink(player_t *player)
if (player->playerstate == PST_DEAD)
{
player->mo->flags2 &= ~MF2_SHADOW;
- // show the multiplayer rankings while dead
- if (player == &players[displayplayer])
- playerdeadview = true;
-
P_DeathThink(player);
return;
@@ -8862,9 +8856,6 @@ void P_PlayerThink(player_t *player)
player->lives = cv_startinglives.value;
}
- if (player == &players[displayplayer])
- playerdeadview = false;
-
if ((gametype == GT_RACE || gametype == GT_COMPETITION) && leveltime < 4*TICRATE)
{
cmd->buttons &= BT_USE; // Remove all buttons except BT_USE
diff --git a/src/r_main.c b/src/r_main.c
index f2a0c8894223dbda55bc5b69632cf6f694018d7f..d1cd71b3fdc80f7b7eb3a46648010d9287aeabfb 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -60,7 +60,6 @@ fixed_t projectiony; // aspect ratio
// just for profiling purposes
size_t framecount;
-size_t sscount;
size_t loopcount;
fixed_t viewx, viewy, viewz;
@@ -492,9 +491,6 @@ static void R_InitTextureMapping(void)
// Take out the fencepost cases from viewangletox.
for (i = 0; i < FINEANGLES/2; i++)
{
- t = FixedMul(FINETANGENT(i), focallength);
- t = centerx - t;
-
if (viewangletox[i] == -1)
viewangletox[i] = 0;
else if (viewangletox[i] == viewwidth+1)
@@ -964,8 +960,6 @@ void R_SkyboxFrame(player_t *player)
viewsin = FINESINE(viewangle>>ANGLETOFINESHIFT);
viewcos = FINECOSINE(viewangle>>ANGLETOFINESHIFT);
- sscount = 0;
-
// recalc necessary stuff for mouseaiming
// slopes are already calculated for the full possible view (which is 4*viewheight).
@@ -1089,8 +1083,6 @@ void R_SetupFrame(player_t *player, boolean skybox)
viewsin = FINESINE(viewangle>>ANGLETOFINESHIFT);
viewcos = FINECOSINE(viewangle>>ANGLETOFINESHIFT);
- sscount = 0;
-
// recalc necessary stuff for mouseaiming
// slopes are already calculated for the full possible view (which is 4*viewheight).
diff --git a/src/r_state.h b/src/r_state.h
index 49d0457b262c767621dde508f85f3a481a9feb3d..ac3e1fa42576a050c4edfdf177b560defc08eead 100644
--- a/src/r_state.h
+++ b/src/r_state.h
@@ -108,7 +108,4 @@ extern angle_t rw_normalangle;
// angle to line origin
extern angle_t rw_angle1;
-// Segs count?
-extern size_t sscount;
-
#endif
diff --git a/src/s_sound.c b/src/s_sound.c
index a79e56ce53b4a5bb09007338e323b1e84949d71a..c9760b2b1889c3aed29bcc9a02b24d3d22231a00 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -230,7 +230,7 @@ void S_RegisterSoundStuff(void)
{
if (dedicated)
{
- nosound = true;
+ sound_disabled = true;
return;
}
@@ -409,7 +409,7 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
mobj_t *listenmobj = players[displayplayer].mo;
mobj_t *listenmobj2 = NULL;
- if (sound_disabled || !sound_started || nosound)
+ if (sound_disabled || !sound_started)
return;
// Don't want a sound? Okay then...
@@ -538,7 +538,7 @@ void S_StartSoundAtVolume(const void *origin_p, sfxenum_t sfx_id, INT32 volume)
// Assigns the handle to one of the channels in the
// mix/output buffer.
- channels[cnum].handle = I_StartSound(sfx_id, volume, sep, pitch, priority);
+ channels[cnum].handle = I_StartSound(sfx_id, volume, sep, pitch, priority, cnum);
}
dontplay:
@@ -588,7 +588,7 @@ dontplay:
// Assigns the handle to one of the channels in the
// mix/output buffer.
- channels[cnum].handle = I_StartSound(sfx_id, volume, sep, pitch, priority);
+ channels[cnum].handle = I_StartSound(sfx_id, volume, sep, pitch, priority, cnum);
}
void S_StartSound(const void *origin, sfxenum_t sfx_id)
@@ -725,7 +725,7 @@ void S_UpdateSounds(void)
return;
}
- if (dedicated || nosound)
+ if (dedicated || sound_disabled)
return;
if (players[displayplayer].awayviewtics)
@@ -1160,6 +1160,43 @@ void S_StartSoundName(void *mo, const char *soundname)
S_StartSound(mo, soundnum);
}
+//
+// Initializes sound stuff, including volume
+// Sets channels, SFX volume,
+// allocates channel buffer, sets S_sfx lookup.
+//
+void S_InitSfxChannels(INT32 sfxVolume)
+{
+ INT32 i;
+
+ if (dedicated)
+ return;
+
+ S_SetSfxVolume(sfxVolume);
+
+ SetChannelsNum();
+
+ // Note that sounds have not been cached (yet).
+ for (i = 1; i < NUMSFX; i++)
+ {
+ S_sfx[i].usefulness = -1; // for I_GetSfx()
+ S_sfx[i].lumpnum = LUMPERROR;
+ }
+
+ // precache sounds if requested by cmdline, or precachesound var true
+ if (!sound_disabled && (M_CheckParm("-precachesound") || precachesound.value))
+ {
+ // Initialize external data (all sounds) at start, keep static.
+ CONS_Printf(M_GetText("Loading sounds... "));
+
+ for (i = 1; i < NUMSFX; i++)
+ if (S_sfx[i].name)
+ S_sfx[i].data = I_GetSfx(&S_sfx[i]);
+
+ CONS_Printf(M_GetText(" pre-cached all sound data\n"));
+ }
+}
+
/// ------------------------
/// Music
/// ------------------------
@@ -1186,31 +1223,109 @@ const char *compat_special_music_slots[16] =
};
#endif
-#define music_playing (music_name[0]) // String is empty if no music is playing
-
static char music_name[7]; // up to 6-character name
-static lumpnum_t music_lumpnum; // lump number of music (used??)
-static void *music_data; // music raw data
-static INT32 music_handle; // once registered, the handle for the music
+static void *music_data;
+static UINT16 music_flags;
+static boolean music_looping;
-static boolean mus_paused = 0; // whether songs are mus_paused
+/// ------------------------
+/// Music Status
+/// ------------------------
-static boolean S_MIDIMusic(const char *mname, boolean looping)
+boolean S_DigMusicDisabled(void)
+{
+ return digital_disabled;
+}
+
+boolean S_MIDIMusicDisabled(void)
+{
+ return midi_disabled;
+}
+
+boolean S_MusicDisabled(void)
+{
+ return (midi_disabled && digital_disabled);
+}
+
+boolean S_MusicPlaying(void)
+{
+ return I_SongPlaying();
+}
+
+boolean S_MusicPaused(void)
+{
+ return I_SongPaused();
+}
+
+musictype_t S_MusicType(void)
+{
+ return I_SongType();
+}
+
+boolean S_MusicInfo(char *mname, UINT16 *mflags, boolean *looping)
+{
+ if (!I_SongPlaying())
+ return false;
+
+ strncpy(mname, music_name, 7);
+ mname[6] = 0;
+ *mflags = music_flags;
+ *looping = music_looping;
+
+ return (boolean)mname[0];
+}
+
+boolean S_MusicExists(const char *mname, boolean checkMIDI, boolean checkDigi)
+{
+ return (
+ (checkDigi ? W_CheckNumForName(va("O_%s", mname)) != LUMPERROR : false)
+ || (checkMIDI ? W_CheckNumForName(va("D_%s", mname)) != LUMPERROR : false)
+ );
+}
+
+/// ------------------------
+/// Music Effects
+/// ------------------------
+
+boolean S_SpeedMusic(float speed)
+{
+ return I_SetSongSpeed(speed);
+}
+
+/// ------------------------
+/// Music Playback
+/// ------------------------
+
+static boolean S_LoadMusic(const char *mname)
{
lumpnum_t mlumpnum;
void *mdata;
- INT32 mhandle;
- if (nomidimusic || music_disabled)
- return false; // didn't search.
+ if (S_MusicDisabled())
+ return false;
- if (W_CheckNumForName(va("d_%s", mname)) == LUMPERROR)
+ if (!S_DigMusicDisabled() && S_DigExists(mname))
+ mlumpnum = W_GetNumForName(va("o_%s", mname));
+ else if (!S_MIDIMusicDisabled() && S_MIDIExists(mname))
+ mlumpnum = W_GetNumForName(va("d_%s", mname));
+ else if (S_DigMusicDisabled() && S_DigExists(mname))
+ {
+ CONS_Alert(CONS_NOTICE, "Digital music is disabled!\n");
+ return false;
+ }
+ else if (S_MIDIMusicDisabled() && S_MIDIExists(mname))
+ {
+ CONS_Alert(CONS_NOTICE, "MIDI music is disabled!\n");
return false;
- mlumpnum = W_GetNumForName(va("d_%s", mname));
+ }
+ else
+ {
+ CONS_Alert(CONS_ERROR, M_GetText("Music lump %.6s not found!\n"), mname);
+ return false;
+ }
// load & register it
mdata = W_CacheLumpNum(mlumpnum, PU_MUSIC);
- mhandle = I_RegisterSong(mdata, W_LumpLength(mlumpnum));
#ifdef MUSSERV
if (msg_id != -1)
@@ -1224,31 +1339,43 @@ static boolean S_MIDIMusic(const char *mname, boolean looping)
}
#endif
- // play it
- if (!I_PlaySong(mhandle, looping))
+ if (I_LoadSong(mdata, W_LumpLength(mlumpnum)))
+ {
+ strncpy(music_name, mname, 7);
+ music_name[6] = 0;
+ music_data = mdata;
+ return true;
+ }
+ else
return false;
+}
- strncpy(music_name, mname, 7);
- music_name[6] = 0;
- music_lumpnum = mlumpnum;
- music_data = mdata;
- music_handle = mhandle;
- return true;
+static void S_UnloadMusic(void)
+{
+ I_UnloadSong();
+
+#ifndef HAVE_SDL //SDL uses RWOPS
+ Z_ChangeTag(music_data, PU_CACHE);
+#endif
+ music_data = NULL;
+
+ music_name[0] = 0;
+ music_flags = 0;
+ music_looping = false;
}
-static boolean S_DigMusic(const char *mname, boolean looping)
+static boolean S_PlayMusic(boolean looping)
{
- if (nodigimusic || digital_disabled)
- return false; // try midi
+ if (S_MusicDisabled())
+ return false;
- if (!I_StartDigSong(mname, looping))
+ if (!I_PlaySong(looping))
+ {
+ S_UnloadMusic();
return false;
+ }
- strncpy(music_name, mname, 7);
- music_name[6] = 0;
- music_lumpnum = LUMPERROR;
- music_data = NULL;
- music_handle = 0;
+ S_InitMusicVolume(); // switch between digi and sequence volume
return true;
}
@@ -1258,7 +1385,7 @@ void S_ChangeMusic(const char *mmusic, UINT16 mflags, boolean looping)
S_ClearSfx();
#endif
- if ((nomidimusic || music_disabled) && (nodigimusic || digital_disabled))
+ if (S_MusicDisabled())
return;
// No Music (empty string)
@@ -1268,121 +1395,105 @@ void S_ChangeMusic(const char *mmusic, UINT16 mflags, boolean looping)
return;
}
- if (strncmp(music_name, mmusic, 6))
+ if (strnicmp(music_name, mmusic, 6))
{
S_StopMusic(); // shutdown old music
- if (!S_DigMusic(mmusic, looping) && !S_MIDIMusic(mmusic, looping))
+
+ if (!S_LoadMusic(mmusic))
{
- CONS_Alert(CONS_ERROR, M_GetText("Music lump %.6s not found!\n"), mmusic);
+ CONS_Alert(CONS_ERROR, "Music %.6s could not be loaded!\n", mmusic);
+ return;
+ }
+
+ music_flags = mflags;
+ music_looping = looping;
+
+ if (!S_PlayMusic(looping))
+ {
+ CONS_Alert(CONS_ERROR, "Music %.6s could not be played!\n", mmusic);
return;
}
}
I_SetSongTrack(mflags & MUSIC_TRACKMASK);
}
-boolean S_SpeedMusic(float speed)
-{
- return I_SetSongSpeed(speed);
-}
-
void S_StopMusic(void)
{
- if (!music_playing)
+ if (!I_SongPlaying())
return;
- if (mus_paused)
- I_ResumeSong(music_handle);
-
- if (!nodigimusic)
- I_StopDigSong();
+ if (I_SongPaused())
+ I_ResumeSong();
S_SpeedMusic(1.0f);
- I_StopSong(music_handle);
- I_UnRegisterSong(music_handle);
-
-#ifndef HAVE_SDL //SDL uses RWOPS
- Z_ChangeTag(music_data, PU_CACHE);
-#endif
-
- music_data = NULL;
- music_name[0] = 0;
+ I_StopSong();
+ S_UnloadMusic(); // for now, stopping also means you unload the song
}
-void S_SetDigMusicVolume(INT32 volume)
+//
+// Stop and resume music, during game PAUSE.
+//
+void S_PauseAudio(void)
{
- if (volume < 0 || volume > 31)
- CONS_Alert(CONS_WARNING, "musicvolume should be between 0-31\n");
-
- CV_SetValue(&cv_digmusicvolume, volume&31);
- actualdigmusicvolume = cv_digmusicvolume.value; //check for change of var
+ if (I_SongPlaying() && !I_SongPaused())
+ I_PauseSong();
-#ifdef DJGPPDOS
- I_SetDigMusicVolume(31); // Trick for buggy dos drivers. Win32 doesn't need this.
+ // pause cd music
+#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
+ I_PauseCD();
+#else
+ I_StopCD();
#endif
- I_SetDigMusicVolume(volume&31);
}
-void S_SetMIDIMusicVolume(INT32 volume)
+void S_ResumeAudio(void)
{
- if (volume < 0 || volume > 31)
- CONS_Alert(CONS_WARNING, "musicvolume should be between 0-31\n");
-
- CV_SetValue(&cv_midimusicvolume, volume&0x1f);
- actualmidimusicvolume = cv_midimusicvolume.value; //check for change of var
+ if (I_SongPlaying() && I_SongPaused())
+ I_ResumeSong();
-#ifdef DJGPPDOS
- I_SetMIDIMusicVolume(31); // Trick for buggy dos drivers. Win32 doesn't need this.
-#endif
- I_SetMIDIMusicVolume(volume&0x1f);
+ // resume cd music
+ I_ResumeCD();
}
-/// ------------------------
-/// Init & Others
-/// ------------------------
-
-//
-// Initializes sound stuff, including volume
-// Sets channels, SFX and music volume,
-// allocates channel buffer, sets S_sfx lookup.
-//
-void S_Init(INT32 sfxVolume, INT32 digMusicVolume, INT32 midiMusicVolume)
+void S_SetMusicVolume(INT32 digvolume, INT32 seqvolume)
{
- INT32 i;
-
- if (dedicated)
- return;
-
- S_SetSfxVolume(sfxVolume);
- S_SetDigMusicVolume(digMusicVolume);
- S_SetMIDIMusicVolume(midiMusicVolume);
-
- SetChannelsNum();
+ if (digvolume < 0)
+ digvolume = cv_digmusicvolume.value;
+ if (seqvolume < 0)
+ seqvolume = cv_midimusicvolume.value;
+
+ if (digvolume < 0 || digvolume > 31)
+ CONS_Alert(CONS_WARNING, "digmusicvolume should be between 0-31\n");
+ CV_SetValue(&cv_digmusicvolume, digvolume&31);
+ actualdigmusicvolume = cv_digmusicvolume.value; //check for change of var
- // no sounds are playing, and they are not mus_paused
- mus_paused = 0;
+ if (seqvolume < 0 || seqvolume > 31)
+ CONS_Alert(CONS_WARNING, "midimusicvolume should be between 0-31\n");
+ CV_SetValue(&cv_midimusicvolume, seqvolume&31);
+ actualmidimusicvolume = cv_midimusicvolume.value; //check for change of var
- // Note that sounds have not been cached (yet).
- for (i = 1; i < NUMSFX; i++)
- {
- S_sfx[i].usefulness = -1; // for I_GetSfx()
- S_sfx[i].lumpnum = LUMPERROR;
- }
+#ifdef DJGPPDOS
+ digvolume = seqvolume = 31;
+#endif
- // precache sounds if requested by cmdline, or precachesound var true
- if (!nosound && (M_CheckParm("-precachesound") || precachesound.value))
+ switch(I_SongType())
{
- // Initialize external data (all sounds) at start, keep static.
- CONS_Printf(M_GetText("Loading sounds... "));
-
- for (i = 1; i < NUMSFX; i++)
- if (S_sfx[i].name)
- S_sfx[i].data = I_GetSfx(&S_sfx[i]);
-
- CONS_Printf(M_GetText(" pre-cached all sound data\n"));
+ case MU_MID:
+ //case MU_MOD:
+ //case MU_GME:
+ I_SetMusicVolume(seqvolume&31);
+ break;
+ default:
+ I_SetMusicVolume(digvolume&31);
+ break;
}
}
+/// ------------------------
+/// Init & Others
+/// ------------------------
+
//
// Per level startup code.
// Kills playing sounds at start of level,
@@ -1397,50 +1508,11 @@ void S_Start(void)
mapmusflags = (mapheaderinfo[gamemap-1]->mustrack & MUSIC_TRACKMASK);
}
- mus_paused = 0;
-
if (cv_resetmusic.value)
S_StopMusic();
S_ChangeMusic(mapmusname, mapmusflags, true);
}
-//
-// Stop and resume music, during game PAUSE.
-//
-void S_PauseAudio(void)
-{
- if (!nodigimusic)
- I_PauseSong(0);
-
- if (music_playing && !mus_paused)
- {
- I_PauseSong(music_handle);
- mus_paused = true;
- }
-
- // pause cd music
-#if (defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON) || defined (HAVE_SDL)
- I_PauseCD();
-#else
- I_StopCD();
-#endif
-}
-
-void S_ResumeAudio(void)
-{
- if (!nodigimusic)
- I_ResumeSong(0);
- else
- if (music_playing && mus_paused)
- {
- I_ResumeSong(music_handle);
- mus_paused = false;
- }
-
- // resume cd music
- I_ResumeCD();
-}
-
static void Command_Tunes_f(void)
{
const char *tunearg;
@@ -1524,4 +1596,4 @@ static void Command_RestartAudio_f(void)
I_SetMIDIMusicVolume(cv_midimusicvolume.value);
if (Playing()) // Gotta make sure the player is in a level
P_RestoreMusic(&players[consoleplayer]);
-}
\ No newline at end of file
+}
diff --git a/src/s_sound.h b/src/s_sound.h
index 083815e159ee3b1579b9043aa0dab4a06ea1a29a..bb8d199d5055513064d6a07dc131393dad41675b 100644
--- a/src/s_sound.h
+++ b/src/s_sound.h
@@ -14,6 +14,7 @@
#ifndef __S_SOUND__
#define __S_SOUND__
+#include "i_sound.h" // musictype_t
#include "sounds.h"
#include "m_fixed.h"
#include "command.h"
@@ -70,9 +71,9 @@ void S_RegisterSoundStuff(void);
//
// Initializes sound stuff, including volume
-// Sets channels, SFX and music volume, allocates channel buffer, sets S_sfx lookup.
+// Sets channels, SFX, allocates channel buffer, sets S_sfx lookup.
//
-void S_Init(INT32 sfxVolume, INT32 digMusicVolume, INT32 midiMusicVolume);
+void S_InitSfxChannels(INT32 sfxVolume);
//
// Per level startup code.
@@ -98,6 +99,33 @@ void S_StartSoundAtVolume(const void *origin, sfxenum_t sound_id, INT32 volume);
// Stop sound for thing at <origin>
void S_StopSound(void *origin);
+//
+// Music Status
+//
+
+boolean S_DigMusicDisabled(void);
+boolean S_MIDIMusicDisabled(void);
+boolean S_MusicDisabled(void);
+boolean S_MusicPlaying(void);
+boolean S_MusicPaused(void);
+musictype_t S_MusicType(void);
+boolean S_MusicInfo(char *mname, UINT16 *mflags, boolean *looping);
+boolean S_MusicExists(const char *mname, boolean checkMIDI, boolean checkDigi);
+#define S_DigExists(a) S_MusicExists(a, false, true)
+#define S_MIDIExists(a) S_MusicExists(a, true, false)
+
+
+//
+// Music Properties
+//
+
+// Set Speed of Music
+boolean S_SpeedMusic(float speed);
+
+//
+// Music Routines
+//
+
// Start music track, arbitrary, given its name, and set whether looping
// note: music flags 12 bits for tracknum (gme, other formats with more than one track)
// 13-15 aren't used yet
@@ -105,9 +133,6 @@ void S_StopSound(void *origin);
#define S_ChangeMusicInternal(a,b) S_ChangeMusic(a,0,b)
void S_ChangeMusic(const char *mmusic, UINT16 mflags, boolean looping);
-// Set Speed of Music
-boolean S_SpeedMusic(float speed);
-
// Stops the music.
void S_StopMusic(void);
@@ -122,9 +147,11 @@ void S_UpdateSounds(void);
FUNCMATH fixed_t S_CalculateSoundDistance(fixed_t px1, fixed_t py1, fixed_t pz1, fixed_t px2, fixed_t py2, fixed_t pz2);
-void S_SetDigMusicVolume(INT32 volume);
-void S_SetMIDIMusicVolume(INT32 volume);
void S_SetSfxVolume(INT32 volume);
+void S_SetMusicVolume(INT32 digvolume, INT32 seqvolume);
+#define S_SetDigMusicVolume(a) S_SetMusicVolume(a,-1)
+#define S_SetMIDIMusicVolume(a) S_SetMusicVolume(-1,a)
+#define S_InitMusicVolume() S_SetMusicVolume(-1,-1)
INT32 S_OriginPlaying(void *origin);
INT32 S_IdPlaying(sfxenum_t id);
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index ce84e86a6bd282cf6c8559a890d2adb2ecb75b4d..30ef1b27b30b938fd2def893239ce2a8efe204b6 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -566,7 +566,7 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
// Tell game we got focus back, resume music if necessary
window_notinfocus = false;
if (!paused)
- I_ResumeSong(0); //resume it
+ I_ResumeSong(); //resume it
if (!firsttimeonmouse)
{
@@ -578,7 +578,7 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
{
// Tell game we lost focus, pause music
window_notinfocus = true;
- I_PauseSong(0);
+ I_PauseSong();
if (!disable_mouse)
{
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index cfdb32303e9c8e415ba2b523ae9280cb565eda77..4d86d7a3cefb9624a96c5ef76f84bfb546138566 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -34,6 +34,12 @@
(SDL_MIXER_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z))
#endif
+// thanks alam for making the buildbots happy!
+#if SDL_MIXER_VERSION_ATLEAST(2,0,2)
+#define MUS_MP3_MAD MUS_MP3_MAD_UNUSED
+#define MUS_MODPLUG MUS_MODPLUG_UNUSED
+#endif
+
#ifdef HAVE_LIBGME
#include "gme/gme.h"
#define GME_TREBLE 5.0
@@ -60,9 +66,8 @@
UINT8 sound_started = false;
-static boolean midimode;
static Mix_Music *music;
-static UINT8 music_volume, midi_volume, sfx_volume;
+static UINT8 music_volume, sfx_volume;
static float loop_point;
static boolean songpaused;
@@ -71,13 +76,20 @@ static Music_Emu *gme;
static INT32 current_track;
#endif
+/// ------------------------
+/// Audio System
+/// ------------------------
+
void I_StartupSound(void)
{
I_Assert(!sound_started);
// EE inits audio first so we're following along.
if (SDL_WasInit(SDL_INIT_AUDIO) == SDL_INIT_AUDIO)
- CONS_Printf("SDL Audio already started\n");
+ {
+ CONS_Debug(DBG_DETAILED, "SDL Audio already started\n");
+ return;
+ }
else if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0)
{
CONS_Alert(CONS_ERROR, "Error initializing SDL Audio: %s\n", SDL_GetError());
@@ -85,9 +97,8 @@ void I_StartupSound(void)
return;
}
- midimode = false;
music = NULL;
- music_volume = midi_volume = sfx_volume = 0;
+ music_volume = sfx_volume = 0;
#if SDL_MIXER_VERSION_ATLEAST(1,2,11)
Mix_Init(MIX_INIT_FLAC|MIX_INIT_MOD|MIX_INIT_MP3|MIX_INIT_OGG);
@@ -128,6 +139,10 @@ FUNCMATH void I_UpdateSound(void)
{
}
+/// ------------------------
+/// SFX
+/// ------------------------
+
// this is as fast as I can possibly make it.
// sorry. more asm needed.
static Mix_Chunk *ds2chunk(void *stream)
@@ -419,10 +434,10 @@ void I_FreeSfx(sfxinfo_t *sfx)
sfx->lumpnum = LUMPERROR;
}
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
{
UINT8 volume = (((UINT16)vol + 1) * (UINT16)sfx_volume) / 62; // (256 * 31) / 62 == 127
- INT32 handle = Mix_PlayChannel(-1, S_sfx[id].data, 0);
+ INT32 handle = Mix_PlayChannel(channel, S_sfx[id].data, 0);
Mix_Volume(handle, volume);
Mix_SetPanning(handle, min((UINT16)(0xff-sep)<<1, 0xff), min((UINT16)(sep)<<1, 0xff));
(void)pitch; // Mixer can't handle pitch
@@ -453,11 +468,10 @@ void I_SetSfxVolume(UINT8 volume)
sfx_volume = volume;
}
-//
-// Music
-//
+/// ------------------------
+/// Music Hooks
+/// ------------------------
-// Music hooks
static void music_loop(void)
{
Mix_PlayMusic(music, 0);
@@ -485,79 +499,101 @@ static void mix_gme(void *udata, Uint8 *stream, int len)
}
#endif
+
+/// ------------------------
+/// Music System
+/// ------------------------
+
FUNCMATH void I_InitMusic(void)
{
}
void I_ShutdownMusic(void)
{
- I_ShutdownDigMusic();
- I_ShutdownMIDIMusic();
+ I_UnloadSong();
}
-void I_PauseSong(INT32 handle)
-{
- (void)handle;
- Mix_PauseMusic();
- songpaused = true;
-}
+/// ------------------------
+/// Music Properties
+/// ------------------------
-void I_ResumeSong(INT32 handle)
+musictype_t I_SongType(void)
{
- (void)handle;
- Mix_ResumeMusic();
- songpaused = false;
+#ifdef HAVE_LIBGME
+ if (gme)
+ return MU_GME;
+ else
+#endif
+ if (!music)
+ return MU_NONE;
+ else if (Mix_GetMusicType(music) == MUS_MID)
+ return MU_MID;
+ else if (Mix_GetMusicType(music) == MUS_MOD || Mix_GetMusicType(music) == MUS_MODPLUG)
+ return MU_MOD;
+ else if (Mix_GetMusicType(music) == MUS_MP3 || Mix_GetMusicType(music) == MUS_MP3_MAD)
+ return MU_MP3;
+ else
+ return (musictype_t)Mix_GetMusicType(music);
}
-//
-// Digital Music
-//
-
-void I_InitDigMusic(void)
+boolean I_SongPlaying(void)
{
+ return (
#ifdef HAVE_LIBGME
- gme = NULL;
- current_track = -1;
+ (I_SongType() == MU_GME && gme) ||
#endif
+ (boolean)music
+ );
}
-void I_ShutdownDigMusic(void)
+boolean I_SongPaused(void)
{
- if (midimode)
- return;
+ return songpaused;
+}
+
+/// ------------------------
+/// Music Effects
+/// ------------------------
+
+boolean I_SetSongSpeed(float speed)
+{
+ if (speed > 250.0f)
+ speed = 250.0f; //limit speed up to 250x
#ifdef HAVE_LIBGME
if (gme)
{
- Mix_HookMusic(NULL, NULL);
- gme_delete(gme);
- gme = NULL;
+ SDL_LockAudio();
+ gme_set_tempo(gme, speed);
+ SDL_UnlockAudio();
+ return true;
}
+#else
+ (void)speed;
#endif
- if (!music)
- return;
- Mix_HookMusicFinished(NULL);
- Mix_FreeMusic(music);
- music = NULL;
+ return false;
}
-boolean I_StartDigSong(const char *musicname, boolean looping)
+/// ------------------------
+/// Music Playback
+/// ------------------------
+
+boolean I_LoadSong(char *data, size_t len)
{
- char *data;
- size_t len;
- lumpnum_t lumpnum = W_CheckNumForName(va("O_%s",musicname));
+ const char *key1 = "LOOP";
+ const char *key2 = "POINT=";
+ const char *key3 = "MS=";
+ const size_t key1len = strlen(key1);
+ const size_t key2len = strlen(key2);
+ const size_t key3len = strlen(key3);
+ char *p = data;
SDL_RWops *rw;
- I_Assert(!music);
+ if (music
#ifdef HAVE_LIBGME
- I_Assert(!gme);
+ || gme
#endif
-
- if (lumpnum == LUMPERROR)
- return false;
- midimode = false;
-
- data = (char *)W_CacheLumpNum(lumpnum, PU_MUSIC);
- len = W_LumpLength(lumpnum);
+ )
+ I_UnloadSong();
#ifdef HAVE_LIBGME
if ((UINT8)data[0] == 0x1F
@@ -650,10 +686,7 @@ boolean I_StartDigSong(const char *musicname, boolean looping)
else if (!gme_open_data(data, len, &gme, 44100))
{
gme_equalizer_t eq = {GME_TREBLE, GME_BASS, 0,0,0,0,0,0,0,0};
- gme_start_track(gme, 0);
- current_track = 0;
gme_set_equalizer(gme, &eq);
- Mix_HookMusic(mix_gme, gme);
return true;
}
#endif
@@ -666,48 +699,75 @@ boolean I_StartDigSong(const char *musicname, boolean looping)
if (!music)
{
CONS_Alert(CONS_ERROR, "Mix_LoadMUS_RW: %s\n", Mix_GetError());
- return true;
+ return false;
}
// Find the OGG loop point.
loop_point = 0.0f;
- if (looping)
+
+ while ((UINT32)(p - data) < len)
{
- const char *key1 = "LOOP";
- const char *key2 = "POINT=";
- const char *key3 = "MS=";
- const size_t key1len = strlen(key1);
- const size_t key2len = strlen(key2);
- const size_t key3len = strlen(key3);
- char *p = data;
- while ((UINT32)(p - data) < len)
+ if (strncmp(p++, key1, key1len))
+ continue;
+ p += key1len-1; // skip OOP (the L was skipped in strncmp)
+ if (!strncmp(p, key2, key2len)) // is it LOOPPOINT=?
{
- if (strncmp(p++, key1, key1len))
- continue;
- p += key1len-1; // skip OOP (the L was skipped in strncmp)
- if (!strncmp(p, key2, key2len)) // is it LOOPPOINT=?
- {
- p += key2len; // skip POINT=
- loop_point = (float)((44.1L+atoi(p)) / 44100.0L); // LOOPPOINT works by sample count.
- // because SDL_Mixer is USELESS and can't even tell us
- // something simple like the frequency of the streaming music,
- // we are unfortunately forced to assume that ALL MUSIC is 44100hz.
- // This means a lot of tracks that are only 22050hz for a reasonable downloadable file size will loop VERY badly.
- }
- else if (!strncmp(p, key3, key3len)) // is it LOOPMS=?
- {
- p += key3len; // skip MS=
- loop_point = (float)(atoi(p) / 1000.0L); // LOOPMS works by real time, as miliseconds.
- // Everything that uses LOOPMS will work perfectly with SDL_Mixer.
- }
- // Neither?! Continue searching.
+ p += key2len; // skip POINT=
+ loop_point = (float)((44.1L+atoi(p)) / 44100.0L); // LOOPPOINT works by sample count.
+ // because SDL_Mixer is USELESS and can't even tell us
+ // something simple like the frequency of the streaming music,
+ // we are unfortunately forced to assume that ALL MUSIC is 44100hz.
+ // This means a lot of tracks that are only 22050hz for a reasonable downloadable file size will loop VERY badly.
+ }
+ else if (!strncmp(p, key3, key3len)) // is it LOOPMS=?
+ {
+ p += key3len; // skip MS=
+ loop_point = (float)(atoi(p) / 1000.0L); // LOOPMS works by real time, as miliseconds.
+ // Everything that uses LOOPMS will work perfectly with SDL_Mixer.
}
+ // Neither?! Continue searching.
+ }
+
+ return true;
+}
+
+void I_UnloadSong(void)
+{
+ I_StopSong();
+
+#ifdef HAVE_LIBGME
+ if (gme)
+ {
+ gme_delete(gme);
+ gme = NULL;
}
+#endif
+ if (music)
+ {
+ Mix_FreeMusic(music);
+ music = NULL;
+ }
+}
+
+boolean I_PlaySong(boolean looping)
+{
+#ifdef HAVE_LIBGME
+ if (gme)
+ {
+ gme_start_track(gme, 0);
+ current_track = 0;
+ Mix_HookMusic(mix_gme, gme);
+ return true;
+ }
+ else
+#endif
+ if (!music)
+ return false;
if (Mix_PlayMusic(music, looping && loop_point == 0.0f ? -1 : 0) == -1)
{
CONS_Alert(CONS_ERROR, "Mix_PlayMusic: %s\n", Mix_GetError());
- return true;
+ return false;
}
Mix_VolumeMusic((UINT32)music_volume*128/31);
@@ -716,51 +776,49 @@ boolean I_StartDigSong(const char *musicname, boolean looping)
return true;
}
-void I_StopDigSong(void)
+void I_StopSong(void)
{
- if (midimode)
- return;
#ifdef HAVE_LIBGME
if (gme)
{
Mix_HookMusic(NULL, NULL);
- gme_delete(gme);
- gme = NULL;
current_track = -1;
- return;
}
#endif
- if (!music)
- return;
- Mix_HookMusicFinished(NULL);
- Mix_FreeMusic(music);
- music = NULL;
+ if (music)
+ {
+ Mix_HookMusicFinished(NULL);
+ Mix_HaltMusic();
+ }
}
-void I_SetDigMusicVolume(UINT8 volume)
+void I_PauseSong(void)
{
- music_volume = volume;
- if (midimode || !music)
- return;
- Mix_VolumeMusic((UINT32)volume*128/31);
+ Mix_PauseMusic();
+ songpaused = true;
}
-boolean I_SetSongSpeed(float speed)
+void I_ResumeSong(void)
{
- if (speed > 250.0f)
- speed = 250.0f; //limit speed up to 250x
-#ifdef HAVE_LIBGME
- if (gme)
- {
- SDL_LockAudio();
- gme_set_tempo(gme, speed);
- SDL_UnlockAudio();
- return true;
- }
-#else
- (void)speed;
+ Mix_ResumeMusic();
+ songpaused = false;
+}
+
+void I_SetMusicVolume(UINT8 volume)
+{
+ if (!I_SongPlaying())
+ return;
+
+#ifdef _WIN32
+ if (I_SongType() == MU_MID)
+ // HACK: Until we stop using native MIDI,
+ // disable volume changes
+ music_volume = 31;
+ else
#endif
- return false;
+ music_volume = volume;
+
+ Mix_VolumeMusic((UINT32)music_volume*128/31);
}
boolean I_SetSongTrack(int track)
@@ -794,83 +852,4 @@ boolean I_SetSongTrack(int track)
return false;
}
-//
-// MIDI Music
-//
-
-FUNCMATH void I_InitMIDIMusic(void)
-{
-}
-
-void I_ShutdownMIDIMusic(void)
-{
- if (!midimode || !music)
- return;
- Mix_FreeMusic(music);
- music = NULL;
-}
-
-void I_SetMIDIMusicVolume(UINT8 volume)
-{
- // HACK: Until we stop using native MIDI,
- // disable volume changes
- (void)volume;
- midi_volume = 31;
- //midi_volume = volume;
-
- if (!midimode || !music)
- return;
- Mix_VolumeMusic((UINT32)midi_volume*128/31);
-}
-
-INT32 I_RegisterSong(void *data, size_t len)
-{
- SDL_RWops *rw = SDL_RWFromMem(data, len);
- if (rw != NULL)
- {
- music = Mix_LoadMUS_RW(rw, 1);
- }
- if (!music)
- {
- CONS_Alert(CONS_ERROR, "Mix_LoadMUS_RW: %s\n", Mix_GetError());
- return -1;
- }
- return 1337;
-}
-
-boolean I_PlaySong(INT32 handle, boolean looping)
-{
- (void)handle;
-
- midimode = true;
-
- if (Mix_PlayMusic(music, looping ? -1 : 0) == -1)
- {
- CONS_Alert(CONS_ERROR, "Mix_PlayMusic: %s\n", Mix_GetError());
- return false;
- }
-
- Mix_VolumeMusic((UINT32)midi_volume*128/31);
- return true;
-}
-
-void I_StopSong(INT32 handle)
-{
- if (!midimode || !music)
- return;
-
- (void)handle;
- Mix_HaltMusic();
-}
-
-void I_UnRegisterSong(INT32 handle)
-{
- if (!midimode || !music)
- return;
-
- (void)handle;
- Mix_FreeMusic(music);
- music = NULL;
-}
-
#endif
\ No newline at end of file
diff --git a/src/sdl/sdl_sound.c b/src/sdl/sdl_sound.c
index 6c70c163b0c041c8c4dec78656e38ec3126f2176..9f8a3e29d53f59621f3994cca1279f0f475b5103 100644
--- a/src/sdl/sdl_sound.c
+++ b/src/sdl/sdl_sound.c
@@ -194,8 +194,8 @@ static srb2audio_t localdata;
static void Snd_LockAudio(void) //Alam: Lock audio data and uninstall audio callback
{
if (Snd_Mutex) SDL_LockMutex(Snd_Mutex);
- else if (nosound) return;
- else if (nomidimusic && nodigimusic
+ else if (sound_disabled) return;
+ else if (midi_disabled && digital_disabled
#ifdef HW3SOUND
&& hws_mode == HWS_DEFAULT_MODE
#endif
@@ -208,8 +208,8 @@ static void Snd_LockAudio(void) //Alam: Lock audio data and uninstall audio call
static void Snd_UnlockAudio(void) //Alam: Unlock audio data and reinstall audio callback
{
if (Snd_Mutex) SDL_UnlockMutex(Snd_Mutex);
- else if (nosound) return;
- else if (nomidimusic && nodigimusic
+ else if (sound_disabled) return;
+ else if (midi_disabled && digital_disabled
#ifdef HW3SOUND
&& hws_mode == HWS_DEFAULT_MODE
#endif
@@ -493,7 +493,7 @@ static inline void I_SetChannels(void)
INT32 *steptablemid = steptable + 128;
- if (nosound)
+ if (sound_disabled)
return;
// This table provides step widths for pitch parameters.
@@ -604,12 +604,13 @@ void I_FreeSfx(sfxinfo_t * sfx)
// Pitching (that is, increased speed of playback)
// is set, but currently not used by mixing.
//
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
{
(void)priority;
(void)pitch;
+ (void)channel;
- if (nosound)
+ if (sound_disabled)
return 0;
if (S_sfx[id].data == NULL) return -1;
@@ -989,7 +990,7 @@ FUNCINLINE static ATTRINLINE void I_UpdateStream16M(Uint8 *stream, int len)
if (Snd_Mutex) SDL_UnlockMutex(Snd_Mutex);
}
-#ifdef HAVE_LIBGME
+#if 0 //#ifdef HAVE_LIBGME
static void I_UpdateSteamGME(Music_Emu *emu, INT16 *stream, int len, UINT8 looping)
{
#define GME_BUFFER_LEN 44100*2048
@@ -1049,14 +1050,16 @@ static void SDLCALL I_UpdateStream(void *userdata, Uint8 *stream, int len)
else if (audio.channels == 2 && audio.format == AUDIO_S16SYS)
{
I_UpdateStream16S(stream, len);
-#ifdef HAVE_LIBGME
- if (userdata)
- {
- srb2audio_t *sa_userdata = userdata;
- if (!sa_userdata->gme_pause)
- I_UpdateSteamGME(sa_userdata->gme_emu, (INT16 *)stream, len/4, sa_userdata->gme_loop);
- }
-#endif
+
+ // Crashes! But no matter; this build doesn't play music anyway...
+// #ifdef HAVE_LIBGME
+// if (userdata)
+// {
+// srb2audio_t *sa_userdata = userdata;
+// if (!sa_userdata->gme_pause)
+// I_UpdateSteamGME(sa_userdata->gme_emu, (INT16 *)stream, len/4, sa_userdata->gme_loop);
+// }
+// #endif
}
}
@@ -1136,7 +1139,7 @@ static INT32 Init3DSDriver(const char *soName)
void I_ShutdownSound(void)
{
- if (nosound || !sound_started)
+ if (sound_disabled || !sound_started)
return;
CONS_Printf("I_ShutdownSound: ");
@@ -1150,7 +1153,7 @@ void I_ShutdownSound(void)
}
#endif
- if (nomidimusic && nodigimusic)
+ if (midi_disabled && digital_disabled)
SDL_CloseAudio();
CONS_Printf("%s", M_GetText("shut down\n"));
sound_started = false;
@@ -1170,7 +1173,7 @@ void I_StartupSound(void)
const char *sdrv_name = NULL;
#endif
#ifndef HAVE_MIXER
- nomidimusic = nodigimusic = true;
+ midi_disabled = digital_disabled = true;
#endif
memset(channels, 0, sizeof (channels)); //Alam: Clean it
@@ -1213,7 +1216,7 @@ void I_StartupSound(void)
audio.samples /= 2;
}
- if (nosound)
+ if (sound_disabled)
return;
#ifdef HW3SOUND
@@ -1261,7 +1264,7 @@ void I_StartupSound(void)
{
snddev_t snddev;
- //nosound = true;
+ //sound_disabled = true;
//I_AddExitFunc(I_ShutdownSound);
snddev.bps = 16;
snddev.sample_rate = audio.freq;
@@ -1288,7 +1291,7 @@ void I_StartupSound(void)
if (!musicStarted && SDL_OpenAudio(&audio, &audio) < 0)
{
CONS_Printf("%s", M_GetText(" couldn't open audio with desired format\n"));
- nosound = true;
+ sound_disabled = true;
return;
}
else
@@ -1313,13 +1316,11 @@ void I_StartupSound(void)
// MUSIC API.
//
-void I_ShutdownMIDIMusic(void)
-{
- nomidimusic = false;
- if (nodigimusic) I_ShutdownMusic();
-}
+/// ------------------------
+// MUSIC SYSTEM
+/// ------------------------
-#ifdef HAVE_LIBGME
+#if 0 //#ifdef HAVE_LIBGME
static void I_ShutdownGMEMusic(void)
{
Snd_LockAudio();
@@ -1330,391 +1331,127 @@ static void I_ShutdownGMEMusic(void)
}
#endif
-void I_ShutdownDigMusic(void)
-{
- nodigimusic = false;
- if (nomidimusic) I_ShutdownMusic();
-}
-
-#ifdef HAVE_MIXER
-static boolean LoadSong(void *data, size_t lumplength, size_t selectpos)
+void I_InitMusic(void)
{
- FILE *midfile;
- const char *tempname;
-#ifdef USE_RWOPS
- if (canuseRW)
- {
- SDL_RWops *SDLRW;
- void *olddata = Smidi[selectpos]; //quick shortcut to set
-
- Z_Free(olddata); //free old memory
- Smidi[selectpos] = NULL;
-
- if (!data)
- return olddata != NULL; //was there old data?
-
- SDLRW = SDL_RWFromConstMem(data, (int)lumplength); //new RWops from Z_zone
- if (!SDLRW) //ERROR while making RWops!
- {
- CONS_Printf(M_GetText("Couldn't load music lump: %s\n"), SDL_GetError());
- Z_Free(data);
- return false;
- }
-
- music[selectpos] = Mix_LoadMUS_RW(SDLRW); // new Mix_Chuck from RWops
- if (music[selectpos])
- Smidi[selectpos] = data; //all done
- else //ERROR while making Mix_Chuck
- {
- CONS_Printf(M_GetText("Couldn't load music data: %s\n"), Mix_GetError());
- Z_Free(data);
- SDL_RWclose(SDLRW);
- Smidi[selectpos] = NULL;
- }
- return true;
- }
-#endif
- tempname = va("%s/%s", MIDI_PATH, fmidi[selectpos]);
-
- if (!data)
- {
- if (FIL_FileExists(tempname))
- return unlink(tempname)+1;
-#ifdef MIDI_PATH2
- else if (FIL_FileExists(tempname = va("%s/%s", MIDI_PATH2, fmidi[selectpos])))
- return unlink(tempname)+1;
-#endif
- else
- return false;
- }
-
- midfile = fopen(tempname, "wb");
-
-#ifdef MIDI_PATH2
- if (!midfile)
- {
- tempname = va("%s/%s", MIDI_PATH2, fmidi[selectpos]);
- midfile = fopen(tempname, "wb");
- }
+#if 0 //#ifdef HAVE_LIBGME
+ I_AddExitFunc(I_ShutdownGMEMusic);
#endif
+}
- if (!midfile)
- {
- CONS_Printf(M_GetText("Couldn't open file %s to write music in\n"), tempname);
- Z_Free(data);
- return false;
- }
-
- if (fwrite(data, lumplength, 1, midfile) == 0)
- {
- CONS_Printf(M_GetText("Couldn't write music into file %s because %s\n"), tempname, strerror(ferror(midfile)));
- Z_Free(data);
- fclose(midfile);
- return false;
- }
-
- fclose(midfile);
+void I_ShutdownMusic(void) { }
- Z_Free(data);
+/// ------------------------
+// MUSIC PROPERTIES
+/// ------------------------
- music[selectpos] = Mix_LoadMUS(tempname);
- if (!music[selectpos]) //ERROR while making Mix_Chuck
- {
- CONS_Printf(M_GetText("Couldn't load music file %s: %s\n"), tempname, Mix_GetError());
- return false;
- }
- return true;
+musictype_t I_SongType(void)
+{
+ return MU_NONE;
}
-#endif
+boolean I_SongPlaying(void)
+{
+ return false;
+}
-void I_ShutdownMusic(void)
+boolean I_SongPaused(void)
{
-#ifdef HAVE_MIXER
- if ((nomidimusic && nodigimusic) || !musicStarted)
- return;
+ return false;
+}
- CONS_Printf("%s", M_GetText("I_ShutdownMusic: "));
+/// ------------------------
+// MUSIC EFFECTS
+/// ------------------------
- I_UnRegisterSong(0);
- I_StopDigSong();
- Mix_CloseAudio();
-#ifdef MIX_INIT
- Mix_Quit();
-#endif
- CONS_Printf("%s", M_GetText("shut down\n"));
- musicStarted = SDL_FALSE;
- if (Msc_Mutex)
- SDL_DestroyMutex(Msc_Mutex);
- Msc_Mutex = NULL;
-#endif
+boolean I_SetSongSpeed(float speed)
+{
+ (void)speed;
+ return false;
}
-void I_InitMIDIMusic(void)
+/// ------------------------
+// MUSIC PLAYBACK
+/// ------------------------
+
+#if 0 //#ifdef HAVE_LIBGME
+static void I_StopGME(void)
{
- if (nodigimusic) I_InitMusic();
+ Snd_LockAudio();
+ gme_seek(localdata.gme_emu, 0);
+ Snd_UnlockAudio();
}
-void I_InitDigMusic(void)
+static void I_PauseGME(void)
{
- if (nomidimusic) I_InitMusic();
+ localdata.gme_pause = true;
}
-void I_InitMusic(void)
+static void I_ResumeGME(void)
{
-#ifdef HAVE_MIXER
- char ad[100];
- SDL_version MIXcompiled;
- const SDL_version *MIXlinked;
-#ifdef MIXER_INIT
- const int mixstart = MIX_INIT_OGG;
- int mixflags;
-#endif
-#endif
-#ifdef HAVE_LIBGME
- I_AddExitFunc(I_ShutdownGMEMusic);
-#endif
-
-#ifdef HAVE_MIXER
- MIX_VERSION(&MIXcompiled)
- MIXlinked = Mix_Linked_Version();
- I_OutputMsg("Compiled for SDL_mixer version: %d.%d.%d\n",
- MIXcompiled.major, MIXcompiled.minor, MIXcompiled.patch);
-#ifdef MIXER_POS
- if (MIXlinked->major == 1 && MIXlinked->minor == 2 && MIXlinked->patch < 7)
- canlooping = SDL_FALSE;
-#endif
-#ifdef USE_RWOPS
- if (M_CheckParm("-noRW"))
- canuseRW = SDL_FALSE;
-#endif
- I_OutputMsg("Linked with SDL_mixer version: %d.%d.%d\n",
- MIXlinked->major, MIXlinked->minor, MIXlinked->patch);
- if (audio.freq < 44100 && !M_CheckParm ("-freq")) //I want atleast 44Khz
- {
- audio.samples = (Uint16)(audio.samples*(INT32)(44100/audio.freq));
- audio.freq = 44100; //Alam: to keep it around the same XX ms
- }
-
- if (sound_started
-#ifdef HW3SOUND
- && hws_mode == HWS_DEFAULT_MODE
-#endif
- )
- {
- I_OutputMsg("Temp Shutdown of SDL Audio System");
- SDL_CloseAudio();
- I_OutputMsg(" Done\n");
- }
-
- CONS_Printf("%s", M_GetText("I_InitMusic:"));
-
-#ifdef MIXER_INIT
- mixflags = Mix_Init(mixstart);
- if ((mixstart & MIX_INIT_FLAC) != (mixflags & MIX_INIT_FLAC))
- {
- CONS_Printf("%s", M_GetText(" Unable to load FLAC support\n"));
- }
- if ((mixstart & MIX_INIT_MOD ) != (mixflags & MIX_INIT_MOD ))
- {
- CONS_Printf("%s", M_GetText(" Unable to load MOD support\n"));
- }
- if ((mixstart & MIX_INIT_MP3 ) != (mixflags & MIX_INIT_MP3 ))
- {
- CONS_Printf("%s", M_GetText(" Unable to load MP3 support\n"));
- }
- if ((mixstart & MIX_INIT_OGG ) != (mixflags & MIX_INIT_OGG ))
- {
- CONS_Printf("%s", M_GetText(" Unable to load OGG support\n"));
- }
-#endif
-
- if (Mix_OpenAudio(audio.freq, audio.format, audio.channels, audio.samples) < 0) //open_music(&audio)
- {
- CONS_Printf(M_GetText(" Unable to open music: %s\n"), Mix_GetError());
- nomidimusic = nodigimusic = true;
- if (sound_started
-#ifdef HW3SOUND
- && hws_mode == HWS_DEFAULT_MODE
-#endif
- )
- {
- if (SDL_OpenAudio(&audio, NULL) < 0) //retry
- {
- CONS_Printf("%s", M_GetText(" couldn't open audio with desired format\n"));
- nosound = true;
- sound_started = false;
- }
- else
- {
- CONS_Printf(M_GetText(" Starting with audio driver : %s\n"), SDL_AudioDriverName(ad, (int)sizeof ad));
- }
- }
- return;
- }
- else
- CONS_Printf(M_GetText(" Starting up with audio driver : %s with SDL_Mixer\n"), SDL_AudioDriverName(ad, (int)sizeof ad));
-
- samplecount = audio.samples;
- CV_SetValue(&cv_samplerate, audio.freq);
- if (sound_started
-#ifdef HW3SOUND
- && hws_mode == HWS_DEFAULT_MODE
-#endif
- )
- I_OutputMsg(" Reconfigured SDL Audio System");
- else I_OutputMsg(" Configured SDL_Mixer System");
- I_OutputMsg(" with %d samples/slice at %ikhz(%dms buffer)\n", samplecount, audio.freq/1000, (INT32) ((audio.samples * 1000.0f) / audio.freq));
- Mix_SetPostMix(audio.callback, audio.userdata); // after mixing music, add sound effects
- Mix_Resume(-1);
- CONS_Printf("%s", M_GetText("Music initialized\n"));
- musicStarted = SDL_TRUE;
- Msc_Mutex = SDL_CreateMutex();
-#endif
+ localdata.gme_pause = false;
}
+#endif
-boolean I_PlaySong(INT32 handle, boolean looping)
+boolean I_LoadSong(char *data, size_t len)
{
- (void)handle;
-#ifdef HAVE_MIXER
- if (nomidimusic || !musicStarted || !music[handle])
- return false;
+ return false;
+}
-#ifdef MIXER_POS
- if (canlooping)
- Mix_HookMusicFinished(NULL);
-#endif
+void I_UnloadSong(void) { }
- if (Mix_FadeInMusic(music[handle], looping ? -1 : 0, MIDIfade) == -1)
- CONS_Printf(M_GetText("Couldn't play song because %s\n"), Mix_GetError());
- else
- {
- Mix_VolumeMusic(musicvol);
- return true;
- }
-#else
+boolean I_PlaySong(boolean looping)
+{
(void)looping;
-#endif
return false;
}
-static void I_PauseGME(void)
+void I_StopSong(void)
{
-#ifdef HAVE_LIBGME
- localdata.gme_pause = true;
+#if 0 //#ifdef HAVE_LIBGME
+ I_StopGME();
#endif
}
-void I_PauseSong(INT32 handle)
+void I_PauseSong(void)
{
- (void)handle;
+#if 0 //#ifdef HAVE_LIBGME
I_PauseGME();
-#ifdef HAVE_MIXER
- if ((nomidimusic && nodigimusic) || !musicStarted)
- return;
-
- Mix_PauseMusic();
- //I_StopSong(handle);
-#endif
-}
-
-static void I_ResumeGME(void)
-{
-#ifdef HAVE_LIBGME
- localdata.gme_pause = false;
#endif
}
-void I_ResumeSong(INT32 handle)
+void I_ResumeSong(void)
{
- (void)handle;
+#if 0
I_ResumeGME();
-#ifdef HAVE_MIXER
- if ((nomidimusic && nodigimusic) || !musicStarted)
- return;
-
- Mix_VolumeMusic(musicvol);
- Mix_ResumeMusic();
- //I_PlaySong(handle, true);
-#endif
-}
-
-void I_StopSong(INT32 handle)
-{
- (void)handle;
-#ifdef HAVE_MIXER
- if (nomidimusic || !musicStarted)
- return;
- Mix_FadeOutMusic(MIDIfade);
#endif
}
-void I_UnRegisterSong(INT32 handle)
+void I_SetMusicVolume(UINT8 volume)
{
-#ifdef HAVE_MIXER
-
- if (nomidimusic || !musicStarted)
- return;
-
- Mix_HaltMusic();
- while (Mix_PlayingMusic())
- ;
-
- if (music[handle])
- Mix_FreeMusic(music[handle]);
- music[handle] = NULL;
- LoadSong(NULL, 0, handle);
-#else
- (void)handle;
-#endif
+ (void)volume;
}
-INT32 I_RegisterSong(void *data, size_t len)
+boolean I_SetSongTrack(int track)
{
-#ifdef HAVE_MIXER
- if (nomidimusic || !musicStarted)
- return false;
-
- if (!LoadSong(data, len, 0))
- return false;
-
- if (music[0])
- return true;
-
- CONS_Printf(M_GetText("Couldn't load MIDI: %s\n"), Mix_GetError());
-#else
- (void)len;
- (void)data;
-#endif
+ (void)track;
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
-}
+/// ------------------------
+// MUSIC LOADING AND CLEANUP
+// \todo Split logic between loading and playing,
+// then move to Playback section
+/// ------------------------
-#ifdef HAVE_LIBGME
+#if 0 //#ifdef HAVE_LIBGME
static void I_CleanupGME(void *userdata)
{
Z_Free(userdata);
}
-#endif
static boolean I_StartGMESong(const char *musicname, boolean looping)
{
-#ifdef HAVE_LIBGME
- XBOXSTATIC char filename[9];
+ char filename[9];
void *data;
lumpnum_t lumpnum;
size_t lumplength;
@@ -1759,240 +1496,7 @@ static boolean I_StartGMESong(const char *musicname, boolean looping)
Snd_UnlockAudio();
return true;
-#else
- (void)musicname;
- (void)looping;
-#endif
- return false;
}
-
-boolean I_StartDigSong(const char *musicname, boolean looping)
-{
-#ifdef HAVE_MIXER
- XBOXSTATIC char filename[9];
- void *data;
- lumpnum_t lumpnum;
- size_t lumplength;
#endif
- if(I_StartGMESong(musicname, looping))
- return true;
-
-#ifdef HAVE_MIXER
- if (nodigimusic)
- return false;
-
- snprintf(filename, sizeof filename, "o_%s", musicname);
-
- lumpnum = W_CheckNumForName(filename);
-
- I_StopDigSong();
-
- if (lumpnum == LUMPERROR)
- {
- // Alam_GBC: like in win32/win_snd.c: Graue 02-29-2004: don't worry about missing music, there might still be a MIDI
- //I_OutputMsg("Music lump %s not found!\n", filename);
- return false; // No music found. Oh well!
- }
- else
- lumplength = W_LumpLength(lumpnum);
-
- data = W_CacheLumpNum(lumpnum, PU_MUSIC);
-
- if (Msc_Mutex) SDL_LockMutex(Msc_Mutex);
-
-#ifdef MIXER_POS
- if (canlooping && (loopingDig = looping) == SDL_TRUE && strcmp(data, "OggS") == 0)
- looping = false; // Only on looping Ogg files, will we will do our own looping
-
- // Scan the Ogg Vorbis file for the COMMENT= field for a custom
- // loop point
- if (!looping && loopingDig)
- {
- size_t scan;
- const char *dataum = data;
- XBOXSTATIC char looplength[64];
- UINT32 loopstart = 0;
- UINT8 newcount = 0;
-
- Mix_HookMusicFinished(I_FinishMusic);
-
- for (scan = 0; scan < lumplength; scan++)
- {
- if (*dataum++ == 'C'){
- if (*dataum++ == 'O'){
- if (*dataum++ == 'M'){
- if (*dataum++ == 'M'){
- if (*dataum++ == 'E'){
- if (*dataum++ == 'N'){
- if (*dataum++ == 'T'){
- if (*dataum++ == '='){
- if (*dataum++ == 'L'){
- if (*dataum++ == 'O'){
- if (*dataum++ == 'O'){
- if (*dataum++ == 'P'){
- if (*dataum++ == 'P'){
- if (*dataum++ == 'O'){
- if (*dataum++ == 'I'){
- if (*dataum++ == 'N'){
- if (*dataum++ == 'T'){
- if (*dataum++ == '=')
- {
-
- while (*dataum != 1 && newcount != 63)
- looplength[newcount++] = *dataum++;
-
- looplength[newcount] = '\0';
-
- loopstart = atoi(looplength);
-
- }
- else
- dataum--;}
- else
- dataum--;}
- else
- dataum--;}
- else
- dataum--;}
- else
- dataum--;}
- else
- dataum--;}
- else
- dataum--;}
- else
- dataum--;}
- else
- dataum--;}
- else
- dataum--;}
- else
- dataum--;}
- else
- dataum--;}
- else
- dataum--;}
- else
- dataum--;}
- else
- dataum--;}
- else
- dataum--;}
- else
- dataum--;}
- }
-
- if (loopstart > 0)
- {
- loopstartDig = (double)((44.1l+loopstart) / 44100.0l); //8 PCM chucks off and PCM to secs
-//#ifdef PARANOIA
- //I_OutputMsg("I_StartDigSong: setting looping point to %ul PCMs(%f seconds)\n", loopstart, loopstartDig);
-//#endif
- }
- else
- {
- looping = true; // loopingDig true, but couldn't find start loop point
- }
- }
- else
- loopstartDig = 0.0l;
-#else
- if (looping && strcmp(data, "OggS") == 0)
- I_OutputMsg("I_StartDigSong: SRB2 was not compiled with looping music support(no Mix_FadeInMusicPos)\n");
-#endif
-
- if (!LoadSong(data, lumplength, 1))
- {
- if (Msc_Mutex) SDL_UnlockMutex(Msc_Mutex);
- return false;
- }
-
- // Note: LoadSong() frees the data. Let's make sure
- // we don't try to use the data again.
- data = NULL;
-
- if (Mix_FadeInMusic(music[1], looping ? -1 : 0, Digfade) == -1)
- {
- if (Msc_Mutex) SDL_UnlockMutex(Msc_Mutex);
- I_OutputMsg("I_StartDigSong: Couldn't play song %s because %s\n", musicname, Mix_GetError());
- return false;
- }
- Mix_VolumeMusic(musicvol);
-
- if (Msc_Mutex) SDL_UnlockMutex(Msc_Mutex);
- return true;
-#else
- (void)looping;
- (void)musicname;
- return false;
-#endif
-}
-
-static void I_StopGME(void)
-{
-#ifdef HAVE_LIBGME
- Snd_LockAudio();
- gme_seek(localdata.gme_emu, 0);
- Snd_UnlockAudio();
-#endif
-}
-
-void I_StopDigSong(void)
-{
- I_StopGME();
-#ifdef HAVE_MIXER
- if (nodigimusic)
- return;
-
-#ifdef MIXER_POS
- if (canlooping)
- Mix_HookMusicFinished(NULL);
-#endif
-
- Mix_HaltMusic();
- while (Mix_PlayingMusic())
- ;
-
- if (music[1])
- Mix_FreeMusic(music[1]);
- music[1] = NULL;
- LoadSong(NULL, 0, 1);
-#endif
-}
-
-void I_SetDigMusicVolume(UINT8 volume)
-{
- I_SetMIDIMusicVolume(volume);
-}
-
-boolean I_SetSongSpeed(float speed)
-{
-
- (void)speed;
- return false;
-}
-
-boolean I_SetSongTrack(int track)
-{
- (void)track;
- return false;
-}
-
-#ifdef MIXER_POS
-static void SDLCALL I_FinishMusic(void)
-{
- if (!music[1])
- return;
- else if (Msc_Mutex) SDL_LockMutex(Msc_Mutex);
-// I_OutputMsg("I_FinishMusic: Loopping song to %g seconds\n", loopstartDig);
-
- if (Mix_FadeInMusicPos(music[1], loopstartDig ? 0 : -1, Digfade, loopstartDig) == 0)
- Mix_VolumeMusic(musicvol);
- else
- I_OutputMsg("I_FinishMusic: Couldn't loop song because %s\n", Mix_GetError());
-
- if (Msc_Mutex) SDL_UnlockMutex(Msc_Mutex);
-}
-#endif
-#endif //HAVE_SDL
+#endif //HAVE_SDL
\ No newline at end of file
diff --git a/src/sdl12/mixer_sound.c b/src/sdl12/mixer_sound.c
index 542a6716989793b0b3452a9825ef190ea95e585b..daf09ab911eb940208e3ff65655344769c396468 100644
--- a/src/sdl12/mixer_sound.c
+++ b/src/sdl12/mixer_sound.c
@@ -376,10 +376,10 @@ void I_FreeSfx(sfxinfo_t *sfx)
sfx->data = NULL;
}
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
{
UINT8 volume = (((UINT16)vol + 1) * (UINT16)sfx_volume) / 62; // (256 * 31) / 62 == 127
- INT32 handle = Mix_PlayChannel(-1, S_sfx[id].data, 0);
+ INT32 handle = Mix_PlayChannel(channel, S_sfx[id].data, 0);
Mix_Volume(handle, volume);
Mix_SetPanning(handle, min((UINT16)(0xff-sep)<<1, 0xff), min((UINT16)(sep)<<1, 0xff));
(void)pitch; // Mixer can't handle pitch
diff --git a/src/sdl12/sdl_sound.c b/src/sdl12/sdl_sound.c
index 6ba83104ee81033a0f9bb4935ecf25adfda1115e..01a27153e8c2941607ca8b206d2e02023a50119d 100644
--- a/src/sdl12/sdl_sound.c
+++ b/src/sdl12/sdl_sound.c
@@ -621,10 +621,11 @@ void I_FreeSfx(sfxinfo_t * sfx)
// Pitching (that is, increased speed of playback)
// is set, but currently not used by mixing.
//
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
{
(void)priority;
(void)pitch;
+ (void)channel;
if (nosound)
return 0;
diff --git a/src/win32/win_cd.c b/src/win32/win_cd.c
index f6c430748e26e42f1654478e061c00ab8fef5877..2586b84405649d431e673d1f7c8e4bb3a4d27a9c 100644
--- a/src/win32/win_cd.c
+++ b/src/win32/win_cd.c
@@ -471,7 +471,7 @@ 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);
+ I_StopSong();
//faB: I don't use the notify message, I'm trying to minimize the delay
mciPlay.dwCallback = (DWORD)((size_t)hWndMain);
diff --git a/src/win32/win_main.c b/src/win32/win_main.c
index 6c774f5576dad667e64f990b2082df815049b563..bfe620a4343e88a45d8389005ba10df86aa409f3 100644
--- a/src/win32/win_main.c
+++ b/src/win32/win_main.c
@@ -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;
diff --git a/src/win32/win_snd.c b/src/win32/win_snd.c
index 58644457a0b909df3b700e181ef8a4fadff3d111..1e1b062f8a14fd9ad00a87b146d3f1402367575e 100644
--- a/src/win32/win_snd.c
+++ b/src/win32/win_snd.c
@@ -40,7 +40,6 @@
static FMOD_SYSTEM *fsys;
static FMOD_SOUND *music_stream;
static FMOD_CHANNEL *music_channel;
-static boolean midimode;
static UINT8 music_volume, midi_volume, sfx_volume;
static INT32 current_track;
@@ -353,12 +352,13 @@ void I_FreeSfx(sfxinfo_t *sfx)
sfx->data = NULL;
}
-INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority)
+INT32 I_StartSound(sfxenum_t id, UINT8 vol, UINT8 sep, UINT8 pitch, UINT8 priority, INT32 channel)
{
FMOD_SOUND *sound;
FMOD_CHANNEL *chan;
INT32 i;
float frequency;
+ (void)channel;
sound = (FMOD_SOUND *)S_sfx[id].data;
I_Assert(sound != NULL);
@@ -438,9 +438,9 @@ void I_SetSfxVolume(UINT8 volume)
sfx_volume = volume;
}
-//
-// MUSIC
-//
+/// ------------------------
+// MUSIC SYSTEM
+/// ------------------------
void I_InitMusic(void)
{
@@ -448,53 +448,111 @@ void I_InitMusic(void)
void I_ShutdownMusic(void)
{
- I_ShutdownDigMusic();
- I_ShutdownMIDIMusic();
+ I_StopSong();
}
-void I_PauseSong(INT32 handle)
-{
- UNREFERENCED_PARAMETER(handle);
- if (music_stream)
- FMR_MUSIC(FMOD_Channel_SetPaused(music_channel, true));
-}
+/// ------------------------
+// MUSIC PROPERTIES
+/// ------------------------
-void I_ResumeSong(INT32 handle)
+musictype_t I_SongType(void)
{
- UNREFERENCED_PARAMETER(handle);
- if (music_stream)
- FMR_MUSIC(FMOD_Channel_SetPaused(music_channel, false));
+#ifdef HAVE_LIBGME
+ if (gme)
+ return MU_GME;
+#endif
+
+ if (!music_stream)
+ return MU_NONE;
+
+ FMOD_SOUND_TYPE type;
+ if (FMOD_Sound_GetFormat(music_stream, &type, NULL, NULL, NULL) == FMOD_OK)
+ {
+ switch(type)
+ {
+ case FMOD_SOUND_TYPE_WAV:
+ return MU_WAV;
+ case FMOD_SOUND_TYPE_MOD:
+ return MU_MOD;
+ case FMOD_SOUND_TYPE_MIDI:
+ return MU_MID;
+ case FMOD_SOUND_TYPE_OGGVORBIS:
+ return MU_OGG;
+ case FMOD_SOUND_TYPE_MPEG:
+ return MU_MP3;
+ case FMOD_SOUND_TYPE_FLAC:
+ return MU_FLAC;
+ default:
+ return MU_NONE;
+ }
+ }
+ else
+ return MU_NONE;
}
-void I_InitDigMusic(void)
+boolean I_SongPlaying(void)
{
+ return (boolean)music_stream;
}
-void I_ShutdownDigMusic(void)
+boolean I_SongPaused(void)
{
- if (!midimode)
- I_StopDigSong();
+ boolean fmpaused = false;
+ if (music_stream)
+ FMOD_Channel_GetPaused(music_channel, &fmpaused);
+ return fmpaused;
}
-boolean I_StartDigSong(const char *musicname, boolean looping)
+/// ------------------------
+// MUSIC EFFECTS
+/// ------------------------
+
+boolean I_SetSongSpeed(float speed)
{
- char *data;
- size_t len;
- FMOD_CREATESOUNDEXINFO fmt;
- lumpnum_t lumpnum = W_CheckNumForName(va("O_%s",musicname));
+ FMOD_RESULT e;
+ float frequency;
+ if (!music_stream)
+ return false;
+ if (speed > 250.0f)
+ speed = 250.0f; //limit speed up to 250x
- if (lumpnum == LUMPERROR)
+#ifdef HAVE_LIBGME
+ // Try to set GME speed
+ if (gme)
{
- lumpnum = W_CheckNumForName(va("D_%s",musicname));
- if (lumpnum == LUMPERROR)
- return false;
- midimode = true;
+ gme_set_tempo(gme, speed);
+ return true;
+ }
+#endif
+
+ // Try to set Mod/Midi speed
+ e = FMOD_Sound_SetMusicSpeed(music_stream, speed);
+
+ if (e == FMOD_ERR_FORMAT)
+ {
+ // Just change pitch instead for Ogg/etc.
+ FMR(FMOD_Sound_GetDefaults(music_stream, &frequency, NULL, NULL, NULL));
+ FMR_MUSIC(FMOD_Channel_SetFrequency(music_channel, speed*frequency));
}
else
- midimode = false;
+ FMR_MUSIC(e);
+
+ return true;
+}
+
+/// ------------------------
+// MUSIC PLAYBACK
+/// ------------------------
- data = (char *)W_CacheLumpNum(lumpnum, PU_MUSIC);
- len = W_LumpLength(lumpnum);
+boolean I_LoadSong(char *data, size_t len)
+{
+ FMOD_CREATESOUNDEXINFO fmt;
+ FMOD_RESULT e;
+ FMOD_TAG tag;
+ unsigned int loopstart, loopend;
+
+ if (gme || music_stream)
+ I_UnloadSong();
memset(&fmt, 0, sizeof(FMOD_CREATESOUNDEXINFO));
fmt.cbsize = sizeof(FMOD_CREATESOUNDEXINFO);
@@ -529,8 +587,6 @@ boolean I_StartDigSong(const char *musicname, boolean looping)
gme_equalizer_t gmeq = {GME_TREBLE, GME_BASS, 0,0,0,0,0,0,0,0};
Z_Free(inflatedData); // GME supposedly makes a copy for itself, so we don't need this lying around
Z_Free(data); // We don't need this, either.
- gme_start_track(gme, 0);
- current_track = 0;
gme_set_equalizer(gme,&gmeq);
fmt.format = FMOD_SOUND_FORMAT_PCM16;
fmt.defaultfrequency = 44100;
@@ -539,10 +595,7 @@ boolean I_StartDigSong(const char *musicname, boolean looping)
fmt.decodebuffersize = (44100 * 2) / 35;
fmt.pcmreadcallback = GMEReadCallback;
fmt.userdata = gme;
- FMR(FMOD_System_CreateStream(fsys, NULL, FMOD_OPENUSER | (looping ? FMOD_LOOP_NORMAL : 0), &fmt, &music_stream));
- FMR(FMOD_System_PlaySound(fsys, FMOD_CHANNEL_FREE, music_stream, false, &music_channel));
- FMR(FMOD_Channel_SetVolume(music_channel, music_volume / 31.0));
- FMR(FMOD_Channel_SetPriority(music_channel, 0));
+ FMR(FMOD_System_CreateStream(fsys, NULL, FMOD_OPENUSER, &fmt, &music_stream));
return true;
}
}
@@ -601,8 +654,6 @@ boolean I_StartDigSong(const char *musicname, boolean looping)
{
gme_equalizer_t gmeq = {GME_TREBLE, GME_BASS, 0,0,0,0,0,0,0,0};
Z_Free(data); // We don't need this anymore.
- gme_start_track(gme, 0);
- current_track = 0;
gme_set_equalizer(gme,&gmeq);
fmt.format = FMOD_SOUND_FORMAT_PCM16;
fmt.defaultfrequency = 44100;
@@ -611,149 +662,153 @@ boolean I_StartDigSong(const char *musicname, boolean looping)
fmt.decodebuffersize = (44100 * 2) / 35;
fmt.pcmreadcallback = GMEReadCallback;
fmt.userdata = gme;
- FMR(FMOD_System_CreateStream(fsys, NULL, FMOD_OPENUSER | (looping ? FMOD_LOOP_NORMAL : 0), &fmt, &music_stream));
- FMR(FMOD_System_PlaySound(fsys, FMOD_CHANNEL_FREE, music_stream, false, &music_channel));
- FMR(FMOD_Channel_SetVolume(music_channel, music_volume / 31.0));
- FMR(FMOD_Channel_SetPriority(music_channel, 0));
+ FMR(FMOD_System_CreateStream(fsys, NULL, FMOD_OPENUSER, &fmt, &music_stream));
return true;
}
#endif
fmt.length = len;
+
+ e = FMOD_System_CreateStream(fsys, data, FMOD_OPENMEMORY_POINT, &fmt, &music_stream);
+ if (e != FMOD_OK)
{
- FMOD_RESULT e = FMOD_System_CreateStream(fsys, data, FMOD_OPENMEMORY_POINT|(looping ? FMOD_LOOP_NORMAL : 0), &fmt, &music_stream);
- if (e != FMOD_OK)
- {
- if (e == FMOD_ERR_FORMAT)
- CONS_Alert(CONS_WARNING, "Failed to play music lump %s due to invalid format.\n", W_CheckNameForNum(lumpnum));
- else
- FMR(e);
- return false;
- }
+ if (e == FMOD_ERR_FORMAT)
+ CONS_Alert(CONS_WARNING, "Failed to play music lump due to invalid format.\n");
+ else
+ FMR(e);
+ return false;
}
- FMR(FMOD_System_PlaySound(fsys, FMOD_CHANNEL_FREE, music_stream, false, &music_channel));
- if (midimode)
- FMR(FMOD_Channel_SetVolume(music_channel, midi_volume / 31.0));
- else
- FMR(FMOD_Channel_SetVolume(music_channel, music_volume / 31.0));
- FMR(FMOD_Channel_SetPriority(music_channel, 0));
- current_track = 0;
// Try to find a loop point in streaming music formats (ogg, mp3)
- if (looping)
+
+ // A proper LOOPPOINT is its own tag, stupid.
+ e = FMOD_Sound_GetTag(music_stream, "LOOPPOINT", 0, &tag);
+ if (e != FMOD_ERR_TAGNOTFOUND)
{
- FMOD_RESULT e;
- FMOD_TAG tag;
- unsigned int loopstart, loopend;
+ 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;
+ }
+
+ // 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;
+ }
- // A proper LOOPPOINT is its own tag, stupid.
- e = FMOD_Sound_GetTag(music_stream, "LOOPPOINT", 0, &tag);
- if (e != FMOD_ERR_TAGNOTFOUND)
+ // 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;
- }
-
- // 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, but we're playing so it's all good.
+ // No special loop point
return true;
}
-void I_StopDigSong(void)
+void I_UnloadSong(void)
{
- if (music_stream)
- FMR(FMOD_Sound_Release(music_stream));
- music_stream = NULL;
+ I_StopSong();
#ifdef HAVE_LIBGME
if (gme)
+ {
gme_delete(gme);
- gme = NULL;
+ gme = NULL;
+ }
#endif
- current_track = -1;
-}
-
-void I_SetDigMusicVolume(UINT8 volume)
-{
- // volume is 0 to 31.
- music_volume = volume;
- if (!midimode && music_stream)
- FMR_MUSIC(FMOD_Channel_SetVolume(music_channel, volume / 31.0));
+ if (music_stream)
+ {
+ FMR(FMOD_Sound_Release(music_stream));
+ music_stream = NULL;
+ }
}
-boolean I_SetSongSpeed(float speed)
+boolean I_PlaySong(boolean looping)
{
- FMOD_RESULT e;
- float frequency;
- if (!music_stream)
- return false;
- if (speed > 250.0f)
- speed = 250.0f; //limit speed up to 250x
-
#ifdef HAVE_LIBGME
- // Try to set GME speed
if (gme)
{
- gme_set_tempo(gme, speed);
+ gme_start_track(gme, 0);
+ current_track = 0;
+ FMR(FMOD_System_PlaySound(fsys, FMOD_CHANNEL_FREE, music_stream, false, &music_channel));
+ FMR(FMOD_Channel_SetVolume(music_channel, music_volume / 31.0));
+ FMR(FMOD_Channel_SetPriority(music_channel, 0));
return true;
}
#endif
- // Try to set Mod/Midi speed
- e = FMOD_Sound_SetMusicSpeed(music_stream, speed);
-
- if (e == FMOD_ERR_FORMAT)
- {
- // Just change pitch instead for Ogg/etc.
- FMR(FMOD_Sound_GetDefaults(music_stream, &frequency, NULL, NULL, NULL));
- FMR_MUSIC(FMOD_Channel_SetFrequency(music_channel, speed*frequency));
- }
+ FMR(FMOD_Sound_SetMode(music_stream, (looping ? FMOD_LOOP_NORMAL : FMOD_LOOP_OFF)));
+ FMR(FMOD_System_PlaySound(fsys, FMOD_CHANNEL_FREE, music_stream, false, &music_channel));
+ if (I_SongType() != MU_MID)
+ FMR(FMOD_Channel_SetVolume(music_channel, midi_volume / 31.0));
else
- FMR_MUSIC(e);
+ FMR(FMOD_Channel_SetVolume(music_channel, music_volume / 31.0));
+ FMR(FMOD_Channel_SetPriority(music_channel, 0));
+ current_track = 0;
return true;
}
+void I_StopSong(void)
+{
+ if (music_channel)
+ FMR_MUSIC(FMOD_Channel_Stop(music_channel));
+}
+
+void I_PauseSong(void)
+{
+ if (music_channel)
+ FMR_MUSIC(FMOD_Channel_SetPaused(music_channel, true));
+}
+
+void I_ResumeSong(void)
+{
+ if (music_channel)
+ FMR_MUSIC(FMOD_Channel_SetPaused(music_channel, false));
+}
+
+void I_SetMusicVolume(UINT8 volume)
+{
+ if (!music_channel)
+ return;
+
+ // volume is 0 to 31.
+ if (I_SongType() == MU_MID)
+ music_volume = 31; // windows bug hack
+ else
+ music_volume = volume;
+
+ FMR_MUSIC(FMOD_Channel_SetVolume(music_channel, music_volume / 31.0));
+}
+
boolean I_SetSongTrack(INT32 track)
{
if (track != current_track) // If the track's already playing, then why bother?
@@ -798,62 +853,3 @@ boolean I_SetSongTrack(INT32 track)
}
return false;
}
-
-//
-// Fuck MIDI. ... Okay fine, you can have your silly D_-only mode.
-//
-
-void I_InitMIDIMusic(void)
-{
-}
-
-void I_ShutdownMIDIMusic(void)
-{
- if (midimode)
- 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;
- memset(&fmt, 0, sizeof(FMOD_CREATESOUNDEXINFO));
- fmt.cbsize = sizeof(FMOD_CREATESOUNDEXINFO);
- fmt.length = len;
- FMR(FMOD_System_CreateStream(fsys, (char *)data, FMOD_OPENMEMORY_POINT, &fmt, &music_stream));
- return 1337;
-}
-
-boolean I_PlaySong(INT32 handle, boolean looping)
-{
- if (1337 == handle)
- {
- midimode = true;
- if (looping)
- FMR(FMOD_Sound_SetMode(music_stream, FMOD_LOOP_NORMAL));
- FMR(FMOD_System_PlaySound(fsys, FMOD_CHANNEL_FREE, music_stream, false, &music_channel));
- FMR_MUSIC(FMOD_Channel_SetVolume(music_channel, midi_volume / 31.0));
- FMR_MUSIC(FMOD_Channel_SetPriority(music_channel, 0));
- }
- return true;
-}
-
-void I_StopSong(INT32 handle)
-{
- I_UnRegisterSong(handle);
-}
-
-void I_UnRegisterSong(INT32 handle)
-{
- UNREFERENCED_PARAMETER(handle);
- if (music_stream)
- FMR(FMOD_Sound_Release(music_stream));
- music_stream = NULL;
-}
diff --git a/src/win32ce/win_snd.c b/src/win32ce/win_snd.c
index f9c6521786717c45fabd620a54a500295e82a708..14ce4add4dd42f0b42d42d1f82122acbf35cc211 100644
--- a/src/win32ce/win_snd.c
+++ b/src/win32ce/win_snd.c
@@ -538,7 +538,8 @@ INT32 I_StartSound (sfxenum_t id,
INT32 vol,
INT32 sep,
INT32 pitch,
- INT32 priority)
+ INT32 priority,
+ INT32 channel)
{
HRESULT hr;
LPDIRECTSOUNDBUFFER dsbuffer;
@@ -549,6 +550,7 @@ INT32 I_StartSound (sfxenum_t id,
#ifdef SURROUND
LPDIRECTSOUNDBUFFER dssurround;
#endif
+ (void)channel;
if (nosound)
return -1;