commit 27f2691ac932f2848b7b844d5ad453c3923e8116
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Thu Sep 21 21:49:26 2006 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Thu Sep 21 21:49:26 2006 +0000

    Set default sound devices to SNDDEVICE_SB, so that sfx and music are on by
    default.

    Subversion-branch: /trunk/chocolate-doom
    Subversion-revision: 649
---
 src/i_sound.c | 6 ++++--
 src/m_misc.c  | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/i_sound.c b/src/i_sound.c
index 2bbf9bba..61ec13c5 100644
--- a/src/i_sound.c
+++ b/src/i_sound.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
-// $Id: i_sound.c 606 2006-09-15 23:47:12Z fraggle $
+// $Id: i_sound.c 649 2006-09-21 21:49:26Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -128,7 +128,7 @@
 //-----------------------------------------------------------------------------

 static const char
-rcsid[] = "$Id: i_sound.c 606 2006-09-15 23:47:12Z fraggle $";
+rcsid[] = "$Id: i_sound.c 649 2006-09-21 21:49:26Z fraggle $";

 #include <stdio.h>
 #include <stdlib.h>
@@ -183,6 +183,8 @@ static boolean music_initialised = false;
 static Mix_Chunk sound_chunks[NUMSFX];
 static int channels_playing[NUM_CHANNELS];

+int snd_musicdevice = SNDDEVICE_SB;
+int snd_sfxdevice = SNDDEVICE_SB;

 // When a sound stops, check if it is still playing.  If it is not,
 // we can mark the sound data as CACHE to be freed back for other
diff --git a/src/m_misc.c b/src/m_misc.c
index 6625c9c9..5b79925a 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -1,7 +1,7 @@
 // Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
-// $Id: m_misc.c 643 2006-09-21 11:48:38Z fraggle $
+// $Id: m_misc.c 649 2006-09-21 21:49:26Z fraggle $
 //
 // Copyright(C) 1993-1996 Id Software, Inc.
 // Copyright(C) 2005 Simon Howard
@@ -106,7 +106,7 @@
 //-----------------------------------------------------------------------------

 static const char
-rcsid[] = "$Id: m_misc.c 643 2006-09-21 11:48:38Z fraggle $";
+rcsid[] = "$Id: m_misc.c 649 2006-09-21 21:49:26Z fraggle $";

 #include <stdio.h>
 #include <stdlib.h>
@@ -293,8 +293,8 @@ extern int      show_endoom;
 extern int      vanilla_savegame_limit;
 extern int      vanilla_demo_limit;

-int snd_musicdevice = 0;
-int snd_sfxdevice = 0;
+extern int snd_musicdevice;
+extern int snd_sfxdevice;

 // dos specific options: these are unused but should be maintained
 // so that the config file can be shared between chocolate