ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/SheepShaver/src/Unix/prefs_unix.cpp

Comparing SheepShaver/src/Unix/prefs_unix.cpp (file contents):
Revision 1.2 by gbeauche, 2003-11-21T17:01:33Z vs.
Revision 1.3 by gbeauche, 2003-12-27T10:02:33Z

#	Line 29 | Line 29
29
30		// Platform-specific preferences items
31		prefs_desc platform_prefs_items[] = {
32	<	{"ether", TYPE_STRING, false, "device name of Mac ethernet adapter"},
33	<	{"keycodes", TYPE_BOOLEAN, false, "use keycodes rather than keysyms to decode keyboard"},
34	<	{"keycodefile", TYPE_STRING, false, "path of keycode translation file"},
32	>	{"ether", TYPE_STRING, false,          "device name of Mac ethernet adapter"},
33	>	{"keycodes", TYPE_BOOLEAN, false,      "use keycodes rather than keysyms to decode keyboard"},
34	>	{"keycodefile", TYPE_STRING, false,    "path of keycode translation file"},
35	>	{"dsp", TYPE_STRING, false,            "audio output (dsp) device name"},
36	>	{"mixer", TYPE_STRING, false,          "audio mixer device name"},
37	>	#ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION
38	>	{"ignoresegv", TYPE_BOOLEAN, false,    "ignore illegal memory accesses"},
39	>	#endif
40		{NULL, TYPE_END, false, NULL} // End of list
41		};
42
#	Line 97 | Line 102 | void AddPlatformPrefsDefaults(void)
102		PrefsReplaceString("extfs", "/");
103		PrefsAddInt32("windowmodes", 3);
104		PrefsAddInt32("screenmodes", 0x3f);
105	+	#ifdef __linux__
106	+	if (access("/dev/.devfsd", F_OK) < 0) {
107	+	PrefsReplaceString("dsp", "/dev/dsp");
108	+	PrefsReplaceString("mixer", "/dev/mixer");
109	+	} else {
110	+	PrefsReplaceString("dsp", "/dev/sound/dsp");
111	+	PrefsReplaceString("mixer", "/dev/sound/mixer");
112	+	}
113	+	#else
114	+	PrefsReplaceString("dsp", "/dev/dsp");
115	+	PrefsReplaceString("mixer", "/dev/mixer");
116	+	#endif
117	+	#ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION
118	+	PrefsAddBool("ignoresegv", false);
119	+	#endif
120		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines