r2902 - in trunk/data/qcsrc/menu-div0test: . nexuiz

[DONOTREPLY at icculus.org]

Author: esteel
Date: 2007-11-04 13:51:33 -0500 (Sun, 04 Nov 2007)
New Revision: 2902

Added:
   trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_audio.c
Modified:
   trunk/data/qcsrc/menu-div0test/classes.c
   trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings.c
Log:
added basic options to the audio tab


Modified: trunk/data/qcsrc/menu-div0test/classes.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/classes.c	2007-11-04 17:19:41 UTC (rev 2901)
+++ trunk/data/qcsrc/menu-div0test/classes.c	2007-11-04 18:51:33 UTC (rev 2902)
@@ -22,6 +22,7 @@
 #include "nexuiz/dialog_settings.c"
 #include "nexuiz/dialog_settings_video.c"
 #include "nexuiz/dialog_settings_effects.c"
+#include "nexuiz/dialog_settings_audio.c"
 #include "nexuiz/dialog_multiplayer.c"
 #include "nexuiz/dialog_settings_player.c"
 #include "nexuiz/tabcontroller.c"

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings.c	2007-11-04 17:19:41 UTC (rev 2901)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings.c	2007-11-04 18:51:33 UTC (rev 2902)
@@ -18,7 +18,7 @@
 		me.TD(me, 1, 1, mc.makeTabButton(mc, "Input",   makeNexuizVideoSettingsTab()));
 		me.TD(me, 1, 1, mc.makeTabButton(mc, "Video",   makeNexuizVideoSettingsTab()));
 		me.TD(me, 1, 1, mc.makeTabButton(mc, "Effects", makeNexuizEffectsSettingsTab()));
-		me.TD(me, 1, 1, mc.makeTabButton(mc, "Audio",   makeNexuizVideoSettingsTab()));
+		me.TD(me, 1, 1, mc.makeTabButton(mc, "Audio",   makeNexuizAudioSettingsTab()));
 	me.TR(me);
 	me.TR(me);
 		me.TD(me, me.rows - 2, me.columns, mc);

Added: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_audio.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_audio.c	                        (rev 0)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_audio.c	2007-11-04 18:51:33 UTC (rev 2902)
@@ -0,0 +1,59 @@
+#ifdef INTERFACE
+CLASS(NexuizAudioSettingsTab) EXTENDS(NexuizTab)
+	METHOD(NexuizAudioSettingsTab, fill, void(entity))
+	ATTRIB(NexuizAudioSettingsTab, title, string, "Settings")
+	ATTRIB(NexuizAudioSettingsTab, intendedWidth, float, 0.9)
+	ATTRIB(NexuizAudioSettingsTab, rows, float, 15)
+	ATTRIB(NexuizAudioSettingsTab, columns, float, 6.5)
+ENDCLASS(NexuizAudioSettingsTab)
+entity makeNexuizAudioSettingsTab();
+#endif
+
+#ifdef IMPLEMENTATION
+entity makeNexuizAudioSettingsTab()
+{
+	entity me;
+	me = spawnNexuizAudioSettingsTab();
+	me.configureDialog(me);
+	return me;
+}
+void fillNexuizAudioSettingsTab(entity me)
+{
+	entity e;
+	float i;
+
+	me.TR(me);
+		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Music Volume:"));
+		me.TD(me, 1, 2, e = makeNexuizSlider(0, 255, 1, "bgmvolume"));
+	me.TR(me);
+		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Game Volume:"));
+		me.TD(me, 1, 2, e = makeNexuizSlider(0, 255, 1, "volume"));
+	me.TR(me);
+		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Ambient Volume:"));
+		me.TD(me, 1, 2, e = makeNexuizSlider(0, 255, 1, "snd_staticvolume"));
+	me.TR(me);
+
+	me.gotoXY(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);
+		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Frequency:"));
+		me.TD(me, 1, 2, e = makeNexuizTextSlider("snd_speed"));
+			e.addValue(e, "8 kHz", "8000");
+			e.addValue(e, "11.025 kHz", "11025");
+			e.addValue(e, "16 kHz", "16000");
+			e.addValue(e, "22.05 kHz", "22050");
+			e.addValue(e, "24 kHz", "24000");
+			e.addValue(e, "32 kHz", "32000");
+			e.addValue(e, "44.1 kHz", "44100");
+			e.addValue(e, "48 kHz", "48000");
+			e.configureNexuizTextSliderValues(e);
+	me.TR(me);
+		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Channels:"));
+		me.TD(me, 1, 2, e = makeNexuizSlider(1, 8, 1, "snd_channels"));
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 2.8, e = makeNexuizCheckBox(1, "snd_swapstereo", "Swap Stereo"));
+	me.TR(me);
+
+	me.gotoXY(me, me.rows - 1, 0);
+		me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "snd_restart", COMMANDBUTTON_APPLY));
+}
+#endif