Merge remote branch 'phish3/master'

src/Makefile.am

@@ -1185,6 +1185,7 @@ endif
 if HAVE_FFTW
 modlibexec_LTLIBRARIES += \
 		module-equalizer-sink.la
+bin_SCRIPTS += utils/qpaeq
 endif
 
 # These are generated by an M4 script

src/utils/qpaeq

@@ -17,12 +17,20 @@
 
 
 import os,math,sys
+try:
     import PyQt4,sip
     from PyQt4 import QtGui,QtCore
-from functools import partial
-
     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)
+
+from functools import partial
 
 import signal
 signal.signal(signal.SIGINT, signal.SIG_DFL)
@@ -31,6 +39,7 @@ SYNC_TIMEOUT = 4*1000
 CORE_PATH = "/org/pulseaudio/core1"
 CORE_IFACE = "org.PulseAudio.Core1"
 def connect():
+    try:
         if 'PULSE_DBUS_SERVER' in os.environ:
             address = os.environ['PULSE_DBUS_SERVER']
         else:
@@ -38,6 +47,11 @@ def connect():
             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)