From 735b7d7f1b618f84fdb89aad5624959025f4bb87 Mon Sep 17 00:00:00 2001
From: punkrockguy318 <punkrockguy318@users.sf.net>
Date: Tue, 2 Jan 2007 02:28:59 +0000
Subject: [PATCH] Version 0.6.0

---
 ChangeLog |  4 +++-
 gfceu     | 13 ++++++++++---
 setup.py  |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 30e4b32f..c7a3f390 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-========================== version 0.5.3 ========================
+========================== version 0.6.0 ========================
+* Fixed evil no ROM problem.
+* Added ALSA support (sort of)
 * Fixed join/host problem.
 ========================== version 0.5.2 ========================
 Cleanup:
diff --git a/gfceu b/gfceu
index 44254791..83f6671b 100644
--- a/gfceu
+++ b/gfceu
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # gfceu - Graphical launcher for FCE Ultra.
 # Designed on Ubuntu, with platfrom independence in mind.
-version = "0.5.2"
+version = "0.6.0"
 # Copyright (C) 2006  Lukas Sabota <punkrockguy318@comcast.net>
 ##
 """
@@ -225,7 +225,7 @@ def set_options():
 
   
 def launch(passed, local=False):
-  global xml, options, fceu_server_binary, fceu_binary
+  global xml, options, fceu_server_binary, fceu_binary, aoss_binary
   set_options()
   
   if options.sound_check:
@@ -265,7 +265,7 @@ def launch(passed, local=False):
   else:
     opengl = '-opengl 0 '
   
-  command = fceu_binary +' '+ sound + fullscreen +\
+  command =  aoss_binary + ' ' + fceu_binary +' '+ sound + fullscreen +\
   network + opengl + options.extra_entry + ' '+ passed
   gfceu_message('Command: ' + command)
 
@@ -487,6 +487,7 @@ appconfigdir = os.getenv('HOME') + '/.gfceu'
 old_optionsfile = os.getenv('HOME')+'/.gfceu_options'
 optionsfile = appconfigdir + 'gfceu_options.dat'
 fceu_binary = None
+aoss_binary = None
 fceu_server_binary = None
 #version is defined earlier in the code
 #have_vfs is defined earlier in the code
@@ -528,6 +529,12 @@ if __name__ == '__main__':
     sudo apt-get install fceu', 4, True)
   else:
     gfceu_message('Using: '+fceu_binary)
+  aoss_binary = find_binary('aoss')
+  if aoss_binary == None:
+    gfceu_error('Could not find the the ALSA OSS wrapper.\n\
+    GFCEU will not be able to share the sound device with other applications.\n\
+    On Debian based systems (like Ubuntu), try the following command:\n\
+    sudo apt-get install alsa-oss', 76, True, False)
 
   widgets = WidgetsWrapper()
   widgets['main_window'].show_all()
diff --git a/setup.py b/setup.py
index 76b42092..c5317719 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 from distutils.core import setup
 
 setup(name="gfceu",
-		version="0.5.2",
+		version="0.6.0",
 		scripts = ['gfceu'],
 		data_files=[('share/gfceu/',['gfceu.glade', 'gfceu_big.png', 'gfceu.png']),
                 ('share/pixmaps/', ['gfceu.png']),