ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/Unix/prefs_unix.cpp
(Generate patch)

Comparing SheepShaver/src/Unix/prefs_unix.cpp (file contents):
Revision 1.6 by gbeauche, 2004-05-09T17:44:17Z vs.
Revision 1.10 by cebix, 2005-11-24T17:26:00Z

# Line 1 | Line 1
1   /*
2   *  prefs_unix.cpp - Preferences handling, Unix specific things
3   *
4 < *  SheepShaver (C) 1997-2004 Christian Bauer and Marc Hellwig
4 > *  SheepShaver (C) 1997-2005 Christian Bauer and Marc Hellwig
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 40 | Line 40 | prefs_desc platform_prefs_items[] = {
40   #ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION
41          {"ignoresegv", TYPE_BOOLEAN, false,    "ignore illegal memory accesses"},
42   #endif
43 +        {"idlewait", TYPE_BOOLEAN, false,      "sleep when idle"},
44          {NULL, TYPE_END, false, NULL} // End of list
45   };
46  
# Line 105 | Line 106 | void AddPlatformPrefsDefaults(void)
106          PrefsReplaceString("extfs", "/");
107          PrefsReplaceInt32("mousewheelmode", 1);
108          PrefsReplaceInt32("mousewheellines", 3);
108 –        PrefsAddInt32("windowmodes", 3);
109 –        PrefsAddInt32("screenmodes", 0x3f);
109   #ifdef __linux__
110 <        if (access("/dev/.devfsd", F_OK) < 0) {
112 <                PrefsReplaceString("dsp", "/dev/dsp");
113 <                PrefsReplaceString("mixer", "/dev/mixer");
114 <        } else {
110 >        if (access("/dev/sound/dsp", F_OK) == 0) {
111                  PrefsReplaceString("dsp", "/dev/sound/dsp");
112 +        } else {
113 +                PrefsReplaceString("dsp", "/dev/dsp");
114 +        }
115 +        if (access("/dev/sound/mixer", F_OK) == 0) {
116                  PrefsReplaceString("mixer", "/dev/sound/mixer");
117 +        } else {
118 +                PrefsReplaceString("mixer", "/dev/mixer");
119          }
120   #else
121          PrefsReplaceString("dsp", "/dev/dsp");
# Line 122 | Line 124 | void AddPlatformPrefsDefaults(void)
124   #ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION
125          PrefsAddBool("ignoresegv", false);
126   #endif
127 +        PrefsAddBool("idlewait", true);
128   }

Diff Legend

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