[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.19-273-gc815441

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  5aa5c6c196b23acabca3e2c8a6724cb08485acdc (commit)

- Log -----------------------------------------------------------------
c815441 Merge remote branch 'phish3/master'
4eb65a0 src/utils/qpaeq: added more friendly error messages to common errors
f69e81f Makefile.am: added qpaeq to installed scripts
77c6b69 remove .py extension from qpaeq
-----------------------------------------------------------------------

Summary of changes:
 src/Makefile.am               |    1 +
 src/utils/{qpaeq.py => qpaeq} |   38 ++++++++++++++++++++++++++------------
 2 files changed, 27 insertions(+), 12 deletions(-)
 rename src/utils/{qpaeq.py => qpaeq} (95%)

-----------------------------------------------------------------------

commit 77c6b696560f460e74af85d069863e8337e99d33
Author: Jason Newton <nevion at gmail.com>
Date:   Fri Nov 20 15:07:47 2009 -0800

    remove .py extension from qpaeq

diff --git a/src/utils/qpaeq.py b/src/utils/qpaeq
similarity index 100%
rename from src/utils/qpaeq.py
rename to src/utils/qpaeq

commit f69e81f226e1f165bfe7d792b3c7895a55d43983
Author: Jason Newton <nevion at gmail.com>
Date:   Fri Nov 20 15:34:02 2009 -0800

    Makefile.am: added qpaeq to installed scripts

diff --git a/src/Makefile.am b/src/Makefile.am
index b45908b..fc8803c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1192,6 +1192,7 @@ endif
 if HAVE_FFTW
 modlibexec_LTLIBRARIES += \
 		module-equalizer-sink.la
+bin_SCRIPTS += utils/qpaeq
 endif
 
 # These are generated by an M4 script

commit 4eb65a0a46bd880faf620db3dff94f82f966bd61
Author: Jason Newton <nevion at gmail.com>
Date:   Fri Nov 20 15:18:59 2009 -0800

    src/utils/qpaeq: added more friendly error messages to common errors

diff --git a/src/utils/qpaeq b/src/utils/qpaeq
index dca0701..a8a9fda 100755
--- a/src/utils/qpaeq
+++ b/src/utils/qpaeq
@@ -17,12 +17,20 @@
 
 
 import os,math,sys
-import PyQt4,sip
-from PyQt4 import QtGui,QtCore
-from functools import partial
+try:
+    import PyQt4,sip
+    from PyQt4 import QtGui,QtCore
+    import dbus.mainloop.qt
+    import dbus
+except ImportError,e:
+    print 'There was an error importing need libraries'
+    print 'Make sure you haveqt4 and dbus forthon installed'
+    print 'The error that occured was'
+    print '\t%s' %(str(e))
+    import sys
+    sys.exit(-1)
 
-import dbus.mainloop.qt
-import dbus
+from functools import partial
 
 import signal
 signal.signal(signal.SIGINT, signal.SIG_DFL)
@@ -31,13 +39,19 @@ SYNC_TIMEOUT = 4*1000
 CORE_PATH = "/org/pulseaudio/core1"
 CORE_IFACE = "org.PulseAudio.Core1"
 def connect():
-    if 'PULSE_DBUS_SERVER' in os.environ:
-        address = os.environ['PULSE_DBUS_SERVER']
-    else:
-        bus = dbus.SessionBus() # Should be UserBus, but D-Bus doesn't implement that yet.
-        server_lookup = bus.get_object('org.PulseAudio1', '/org/pulseaudio/server_lookup1')
-        address = server_lookup.Get('org.PulseAudio.ServerLookup1', 'Address', dbus_interface='org.freedesktop.DBus.Properties')
-    return dbus.connection.Connection(address)
+    try:
+        if 'PULSE_DBUS_SERVER' in os.environ:
+            address = os.environ['PULSE_DBUS_SERVER']
+        else:
+            bus = dbus.SessionBus() # Should be UserBus, but D-Bus doesn't implement that yet.
+            server_lookup = bus.get_object('org.PulseAudio1', '/org/pulseaudio/server_lookup1')
+            address = server_lookup.Get('org.PulseAudio.ServerLookup1', 'Address', dbus_interface='org.freedesktop.DBus.Properties')
+        return dbus.connection.Connection(address)
+    except Exception,e:
+        print 'There was an error connecting to pulseaudio, please make sure you have the pulseaudio dbus'
+        print 'and equalizer modules loaded, exiting...'
+        import sys
+        sys.exit(-1)
 
 
 #TODO: signals: sink Filter changed, sink reconfigured (window size) (sink iface)

commit c815441ba19e92f88395de8763df4a1e57950f7b
Merge: 5aa5c6c 4eb65a0
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Nov 23 04:48:31 2009 +0100

    Merge remote branch 'phish3/master'


-- 
hooks/post-receive
PulseAudio Sound Server