zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-13 07:57:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Changed the default snd_output under Linux to OSS.

Browse source 
- Fixed the behavior of the "Don't ask" checkbox for the GTK+ version of
  the IWAD dialog.



SVN r452 (trunk)
This commit is contained in:
Randy Heit 2007-01-16 02:19:25 +00:00
parent c196880ee5
commit de18276b24
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/rh-log.txt
View file

@ -1,4 +1,5 @@
January 15, 2007 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 - 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. Linux port one step closer to feature parity with the Windows version.

6
src/sdl/i_system.cpp
View file

@ -460,7 +460,7 @@ int I_PickIWad_Gtk (WadStuff *wads, int numwads, bool showwin, int defaultiwad)
// Create the "Don't ask" checkbox. // Create the "Don't ask" checkbox.
check = gtk_check_button_new_with_label ("Don't ask me this again"); 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_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. // Create the OK/Cancel button box.
bbox = gtk_hbutton_box_new (); 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); g_value_unset (&value);
// Set state of queryiwad based on the checkbox. // 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 else
{ {
@ -631,4 +631,4 @@ void I_PutInClipboard (const char *str)
char *I_GetFromClipboard () char *I_GetFromClipboard ()
{ {
return NULL; return NULL;
} }

6
src/sound/fmodsound.cpp
View file

@ -312,9 +312,9 @@ bool FMODSoundRenderer::Init ()
#endif #endif
} }
#else #else
if (stricmp (snd_output, "oss") == 0) if (stricmp (snd_output, "alsa") == 0)
{ {
outindex = 0; outindex = 1;
} }
else if (stricmp (snd_output, "esd") == 0 || else if (stricmp (snd_output, "esd") == 0 ||
stricmp (snd_output, "esound") == 0) stricmp (snd_output, "esound") == 0)
@ -323,7 +323,7 @@ bool FMODSoundRenderer::Init ()
} }
else else
{ {
outindex = 1; outindex = 0;
} }
#endif #endif