From c60898f79b85b0e96dedff9a57964739b0c1b830 Mon Sep 17 00:00:00 2001 From: sezero Date: Wed, 16 Feb 2011 15:20:20 +0000 Subject: [PATCH] bgmusic.c, bgmusic.h: small updates and tidy-ups from uHexen2. git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@417 af15c1b1-3010-417e-b628-4374ebc0bcbd --- quakespasm/Quake/bgmusic.c | 6 +++--- quakespasm/Quake/bgmusic.h | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/quakespasm/Quake/bgmusic.c b/quakespasm/Quake/bgmusic.c index 6a01fec4..e5f630af 100644 --- a/quakespasm/Quake/bgmusic.c +++ b/quakespasm/Quake/bgmusic.c @@ -1,5 +1,5 @@ /* - * Background music handling for Quakespasm + * Background music handling for Quakespasm (adapted from uHexen2) * Handles streaming music as raw sound samples and runs the midi driver * * Copyright (C) 1999-2005 Id Software, Inc. @@ -37,8 +37,8 @@ static float old_volume = -1.0f; typedef enum _bgm_player { BGM_NONE = -1, - BGM_MIDIDRV, - BGM_STREAMER, + BGM_MIDIDRV = 1, + BGM_STREAMER } bgm_player_t; typedef struct music_handler_s diff --git a/quakespasm/Quake/bgmusic.h b/quakespasm/Quake/bgmusic.h index e6cd69d9..b3f98934 100644 --- a/quakespasm/Quake/bgmusic.h +++ b/quakespasm/Quake/bgmusic.h @@ -1,12 +1,10 @@ /* - * Background music handling for Quakespasm + * Background music handling for Quakespasm (adapted from uHexen2) * Handles streaming music as raw sound samples and runs the midi driver * * Copyright (C) 1999-2005 Id Software, Inc. * Copyright (C) 2010-2011 O.Sezer * - * $Id: bgmusic.h 3818 2010-12-19 09:04:17Z sezero $ - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or (at