summaryrefslogtreecommitdiff
path: root/src/s_sound.c
diff options
context:
space:
mode:
authorSimon Howard2006-01-08 17:51:53 +0000
committerSimon Howard2006-01-08 17:51:53 +0000
commit96495a0ac6e1663ef0a6b137a24f73d46a039e52 (patch)
tree7255c684f315e42ed15778aaebae0ab80744ff1e /src/s_sound.c
parentd5794db799a0aa47c227bf4e12b4ddaf2b4415ec (diff)
downloadchocolate-doom-96495a0ac6e1663ef0a6b137a24f73d46a039e52.tar.gz
chocolate-doom-96495a0ac6e1663ef0a6b137a24f73d46a039e52.tar.bz2
chocolate-doom-96495a0ac6e1663ef0a6b137a24f73d46a039e52.zip
Add S_MusicPlaying function to query if music is still playing.
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 271
Diffstat (limited to 'src/s_sound.c')
-rw-r--r--src/s_sound.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/s_sound.c b/src/s_sound.c
index d6e6dfdf..7e95cb44 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
-// $Id: s_sound.c 203 2005-10-16 16:16:03Z fraggle $
+// $Id: s_sound.c 271 2006-01-08 17:51:53Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@@ -22,6 +22,9 @@
// 02111-1307, USA.
//
// $Log$
+// Revision 1.10 2006/01/08 17:51:53 fraggle
+// Add S_MusicPlaying function to query if music is still playing.
+//
// Revision 1.9 2005/10/16 16:16:03 fraggle
// Set the default number of channels to a more sensible 8
//
@@ -61,7 +64,7 @@
static const char
-rcsid[] = "$Id: s_sound.c 203 2005-10-16 16:16:03Z fraggle $";
+rcsid[] = "$Id: s_sound.c 271 2006-01-08 17:51:53Z fraggle $";
@@ -709,6 +712,11 @@ S_ChangeMusic
mus_playing = music;
}
+boolean S_MusicPlaying(void)
+{
+ return I_QrySongPlaying(NULL);
+}
+
void S_StopMusic(void)
{
@@ -726,9 +734,6 @@ void S_StopMusic(void)
}
}
-
-
-
void S_StopChannel(int cnum)
{