gaming/lutris
gaming/lutris
1
0
Fork 0
mirror of https://github.com/lutris/lutris synced 2024-07-20 17:34:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better handling of padsp32

Browse source
This commit is contained in:
Mathieu Comandon 2013-06-07 02:23:57 +02:00
parent 7b70c5a169
commit c2b690b41e
3 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bin/padsp32
View file

@ -75,11 +75,17 @@ done
shift $(( $OPTIND - 1 ))
if [ -e "/usr/lib/i386-linux-gnu/pulseaudio/libpulsedsp.so" ]; then
libpulsedsp="/usr/lib/i386-linux-gnu/pulseaudio/libpulsedsp.so"
elif [ -e "/usr/lib/pulseaudio/libpulsedsp.so" ]; then
libpulsedsp="/usr/lib/pulseaudio/libpulsedsp.so"
fi
if `pgrep -f /usr/bin/pulseaudio 1>/dev/null` ; then
if [ x"$LD_PRELOAD" = x ] ; then
LD_PRELOAD="/usr/lib/i386-linux-gnu/pulseaudio/libpulsedsp.so"
LD_PRELOAD=$libpulsedsp
else
LD_PRELOAD="$LD_PRELOAD /usr/lib/i386-linux-gnu/pulseaudio/libpulsedsp.so"
LD_PRELOAD="$LD_PRELOAD $libpulsedsp"
fi
fi

2
lutris/gui/systemconfigdialog.py
View file

@ -5,7 +5,6 @@ from lutris.config import LutrisConfig
from lutris.gui.systemconfigvbox import SystemConfigVBox
class SystemConfigDialog(Gtk.Dialog):
def __init__(self):
super(SystemConfigDialog, self).__init__()
@ -24,7 +23,6 @@ class SystemConfigDialog(Gtk.Dialog):
cancel_button.connect("clicked", self.close)
add_button.connect("clicked", self.save_config)
self.show_all()
def save_config(self, widget):

29
lutris/gui/systemconfigvbox.py
View file

@ -33,34 +33,19 @@ class SystemConfigVBox(ConfigVBox):
ConfigVBox.__init__(self, "system", caller)
self.lutris_config = lutris_config
#TODO : Move the list of window manager somewhere else, in
# lutris_desktop_control for example.
#TODO : Auto detect the installed WMs on the user's machine
#TODO : If the user_wm has not yet been set, detect the WM currently
# running
wm_list = [("Compiz", "compiz"), ("OpenBox", "openbox"),
("KWin", "kwin"), ("Metacity", "metacity"),
("Metacity (Composited)", "metacity_composited")]
#TODO : Same thing for OSS Wrappers
oss_list = [("None (don't use OSS)", "none"),
("aoss (OSS Wrapper for Alsa)", "aoss"),
("esddsp (OSS Wrapper for esound)", "esddsp"),
("padsp (OSS Wrapper for PulseAudio)", "padsp")]
oss_list = [
("None (don't use OSS)", "none"),
("padsp (PulseAudio OSS Wrapper)", "padsp"),
("padsp32 (PulseAudio OSS Wrapper for 32bit apps)", "padsp32"),
("aoss (OSS Wrapper for Alsa)", "aoss"),
("esddsp (OSS Wrapper for esound)", "esddsp"),
]
resolution_list = get_resolutions()
self.options = [{'option': 'game_path',
'type': 'directory_chooser',
'label': 'Default game path'},
{'option': 'user_wm',
'type': 'one_choice',
'label': 'Desktop Window Manager',
'choices': wm_list},
{'option': 'game_wm',
'type': 'one_choice',
'label': 'Gaming Window Manager',
'choices': wm_list},
{'option': 'resolution',
'type': 'one_choice',
'label': 'Resolution',