From de18276b2486b61f58eed5fe57ba8011080f68b0 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Tue, 16 Jan 2007 02:19:25 +0000
Subject: [PATCH] - Changed the default snd_output under Linux to OSS. - Fixed
 the behavior of the "Don't ask" checkbox for the GTK+ version of   the IWAD
 dialog.

SVN r452 (trunk)
---
 docs/rh-log.txt         | 1 +
 src/sdl/i_system.cpp    | 6 +++---
 src/sound/fmodsound.cpp | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 114d2daf14..82b5bae71b 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,5 @@
 January 15, 2007
+- Changed the default snd_output under Linux to OSS.
 - Added a GTK+ version of the IWAD selection dialog box. That brings the
   Linux port one step closer to feature parity with the Windows version.
 
diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp
index a82c6d6d26..c70c56eca9 100644
--- a/src/sdl/i_system.cpp
+++ b/src/sdl/i_system.cpp
@@ -460,7 +460,7 @@ int I_PickIWad_Gtk (WadStuff *wads, int numwads, bool showwin, int defaultiwad)
 	// Create the "Don't ask" checkbox.
 	check = gtk_check_button_new_with_label ("Don't ask me this again");
 	gtk_box_pack_start (GTK_BOX(hbox), check, false, false, 0);
-	gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON(check), showwin);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(check), !showwin);
 
 	// Create the OK/Cancel button box.
 	bbox = gtk_hbutton_box_new ();
@@ -498,7 +498,7 @@ int I_PickIWad_Gtk (WadStuff *wads, int numwads, bool showwin, int defaultiwad)
 		g_value_unset (&value);
 		
 		// Set state of queryiwad based on the checkbox.
-		queryiwad = !gtk_toggle_button_get_mode (GTK_TOGGLE_BUTTON(check));
+		queryiwad = !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(check));
 	}
 	else
 	{
@@ -631,4 +631,4 @@ void I_PutInClipboard (const char *str)
 char *I_GetFromClipboard ()
 {
 	return NULL;
-}
+}
diff --git a/src/sound/fmodsound.cpp b/src/sound/fmodsound.cpp
index 356a9052dc..656ea1b5d8 100644
--- a/src/sound/fmodsound.cpp
+++ b/src/sound/fmodsound.cpp
@@ -312,9 +312,9 @@ bool FMODSoundRenderer::Init ()
 #endif
 	}
 #else
-	if (stricmp (snd_output, "oss") == 0)
+	if (stricmp (snd_output, "alsa") == 0)
 	{
-		outindex = 0;
+		outindex = 1;
 	}
 	else if (stricmp (snd_output, "esd") == 0 ||
 			 stricmp (snd_output, "esound") == 0)
@@ -323,7 +323,7 @@ bool FMODSoundRenderer::Init ()
 	}
 	else
 	{
-		outindex = 1;
+		outindex = 0;
 	}
 #endif