Fix Python whitespace (follow PEP8 guidelines, reformatted by Python Reindent)

git-svn-id: svn://localhost/ardour2/branches/3.0@9409 d708f5d6-7413-0410-9779-e7cbd77b26cf

9 files changed, 203 insertions, 212 deletions

diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript
index 6dc2e55447..a4afd68539 100644
--- a/libs/surfaces/control_protocol/wscript
+++ b/libs/surfaces/control_protocol/wscript
@@ -14,26 +14,25 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
+    autowaf.configure(conf)
 
 def build(bld):
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	basic_ui.cc
-        	control_protocol.cc
-        '''
-        obj.export_incdirs = ['.', './control_protocol' ]
-        obj.cxxflags     = '-DPACKAGE="ardour_cp"'
-        obj.includes     = ['.', './control_protocol']
-        obj.name         = 'libardour_cp'
-        obj.target       = 'ardourcp'
-        obj.uselib_local = 'libardour libtimecode'
-        obj.vnum         = LIBARDOUR_CP_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            basic_ui.cc
+            control_protocol.cc
+    '''
+    obj.export_incdirs = ['.', './control_protocol' ]
+    obj.cxxflags     = '-DPACKAGE="ardour_cp"'
+    obj.includes     = ['.', './control_protocol']
+    obj.name         = 'libardour_cp'
+    obj.target       = 'ardourcp'
+    obj.uselib_local = 'libardour libtimecode'
+    obj.vnum         = LIBARDOUR_CP_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/surfaces/frontier/wscript b/libs/surfaces/frontier/wscript
index 6c383aa072..cd388b8bff 100644
--- a/libs/surfaces/frontier/wscript
+++ b/libs/surfaces/frontier/wscript
@@ -20,28 +20,27 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
+    autowaf.configure(conf)
 
 def build(bld):
-        # Generic MIDI
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	generic_midi_control_protocol.cc
-        	interface.cc
-        	midicontrollable.cc
-        '''
-        obj.export_incdirs = ['./generic_midi']
-        obj.cxxflags     = '-DPACKAGE="ardour_genericmidi"'
-        obj.includes     = ['.', './generic_midi']
-        obj.name         = 'libgeneric_midi'
-        obj.target       = 'generic_midi'
-        obj.uselib_local = 'libardour libsurfaces'
-        obj.vnum         = LIBSURFACES_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    # Generic MIDI
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            generic_midi_control_protocol.cc
+            interface.cc
+            midicontrollable.cc
+    '''
+    obj.export_incdirs = ['./generic_midi']
+    obj.cxxflags     = '-DPACKAGE="ardour_genericmidi"'
+    obj.includes     = ['.', './generic_midi']
+    obj.name         = 'libgeneric_midi'
+    obj.target       = 'generic_midi'
+    obj.uselib_local = 'libardour libsurfaces'
+    obj.vnum         = LIBSURFACES_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/surfaces/generic_midi/wscript b/libs/surfaces/generic_midi/wscript
index 4cc97edb52..9111df5982 100644
--- a/libs/surfaces/generic_midi/wscript
+++ b/libs/surfaces/generic_midi/wscript
@@ -13,32 +13,31 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
+    autowaf.configure(conf)
 
 def build(bld):
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	generic_midi_control_protocol.cc
-                gmcp_gui.cc
-        	interface.cc
-        	midiinvokable.cc
-        	midicontrollable.cc
-        	midifunction.cc
-                midiaction.cc
-        '''
-        obj.export_incdirs = ['.']
-        obj.cxxflags     = '-DPACKAGE="ardour_genericmidi"'
-        obj.includes     = ['.', './generic_midi']
-        obj.name         = 'libardour_generic_midi'
-        obj.target       = 'ardour_generic_midi'
-        obj.uselib       = 'GTKMM GTK GDK'
-        obj.uselib_local = 'libardour libardour_cp libgtkmm2ext libpbd'
-        obj.vnum         = LIBARDOUR_GENERIC_MIDI_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            generic_midi_control_protocol.cc
+            gmcp_gui.cc
+            interface.cc
+            midiinvokable.cc
+            midicontrollable.cc
+            midifunction.cc
+            midiaction.cc
+    '''
+    obj.export_incdirs = ['.']
+    obj.cxxflags     = '-DPACKAGE="ardour_genericmidi"'
+    obj.includes     = ['.', './generic_midi']
+    obj.name         = 'libardour_generic_midi'
+    obj.target       = 'ardour_generic_midi'
+    obj.uselib       = 'GTKMM GTK GDK'
+    obj.uselib_local = 'libardour libardour_cp libgtkmm2ext libpbd'
+    obj.vnum         = LIBARDOUR_GENERIC_MIDI_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript
index 3935b22546..437865ec9c 100644
--- a/libs/surfaces/mackie/wscript
+++ b/libs/surfaces/mackie/wscript
@@ -13,42 +13,41 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
+    autowaf.configure(conf)
 
 def build(bld):
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	bcf_surface.cc
-        	bcf_surface_generated.cc
-        	controls.cc
-        	dummy_port.cc
-        	interface.cc
-        	mackie_button_handler.cc
-        	mackie_control_protocol.cc
-        	mackie_control_protocol_poll.cc
-        	mackie_jog_wheel.cc
-        	mackie_midi_builder.cc
-        	mackie_port.cc
-        	mackie_surface.cc
-        	mackie_surface_generated.cc
-        	midi_byte_array.cc
-        	route_signal.cc
-        	surface.cc
-        	surface_port.cc
-        	types.cc
-        '''
-        obj.export_incdirs = ['./mackie']
-        obj.cxxflags     = '-DPACKAGE="ardour_mackie"'
-        obj.includes     = ['.', './mackie']
-        obj.name         = 'libardour_mcp'
-        obj.target       = 'ardour_mcp'
-        obj.uselib_local = 'libardour libardour_cp'
-        obj.vnum         = LIBARDOUR_MCP_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            bcf_surface.cc
+            bcf_surface_generated.cc
+            controls.cc
+            dummy_port.cc
+            interface.cc
+            mackie_button_handler.cc
+            mackie_control_protocol.cc
+            mackie_control_protocol_poll.cc
+            mackie_jog_wheel.cc
+            mackie_midi_builder.cc
+            mackie_port.cc
+            mackie_surface.cc
+            mackie_surface_generated.cc
+            midi_byte_array.cc
+            route_signal.cc
+            surface.cc
+            surface_port.cc
+            types.cc
+    '''
+    obj.export_incdirs = ['./mackie']
+    obj.cxxflags     = '-DPACKAGE="ardour_mackie"'
+    obj.includes     = ['.', './mackie']
+    obj.name         = 'libardour_mcp'
+    obj.target       = 'ardour_mcp'
+    obj.uselib_local = 'libardour libardour_cp'
+    obj.vnum         = LIBARDOUR_MCP_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript
index a49020e528..4d62bda7bc 100644
--- a/libs/surfaces/osc/wscript
+++ b/libs/surfaces/osc/wscript
@@ -13,30 +13,29 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
-        autowaf.check_pkg(conf, 'liblo', uselib_store='LO', linkflags='-llo')
+    autowaf.configure(conf)
+    autowaf.check_pkg(conf, 'liblo', uselib_store='LO', linkflags='-llo')
 
 def build(bld):
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	osc.cc
-        	osc_controllable.cc
-        	osc_route_observer.cc
-        	interface.cc
-        '''
-        obj.export_incdirs = ['.']
-        obj.cxxflags     = '-DPACKAGE="ardour_cp"'
-        obj.includes     = ['.', './osc']
-        obj.name         = 'libardour_osc'
-        obj.target       = 'ardour_osc'
-        obj.uselib       = ' LO '
-        obj.uselib_local = 'libardour libardour_cp libpbd'
-        obj.vnum         = LIBARDOUR_OSC_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            osc.cc
+            osc_controllable.cc
+            osc_route_observer.cc
+            interface.cc
+    '''
+    obj.export_incdirs = ['.']
+    obj.cxxflags     = '-DPACKAGE="ardour_cp"'
+    obj.includes     = ['.', './osc']
+    obj.name         = 'libardour_osc'
+    obj.target       = 'ardour_osc'
+    obj.uselib       = ' LO '
+    obj.uselib_local = 'libardour libardour_cp libpbd'
+    obj.vnum         = LIBARDOUR_OSC_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/surfaces/powermate/wscript b/libs/surfaces/powermate/wscript
index 5f670737bf..6f263fc9a0 100644
--- a/libs/surfaces/powermate/wscript
+++ b/libs/surfaces/powermate/wscript
@@ -13,26 +13,25 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
+    autowaf.configure(conf)
 
 def build(bld):
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	interface.cc
-        	powermate.cc
-        '''
-        obj.export_incdirs = ['.']
-        obj.cxxflags     = '-DPACKAGE="ardour_powermate"'
-        obj.includes     = ['.' ]
-        obj.name         = 'libpowermate'
-        obj.target       = 'powermate'
-        obj.uselib_local = 'libardour libardour_cp'
-        obj.vnum         = LIBARDOUR_POWERMATE_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            interface.cc
+            powermate.cc
+    '''
+    obj.export_incdirs = ['.']
+    obj.cxxflags     = '-DPACKAGE="ardour_powermate"'
+    obj.includes     = ['.' ]
+    obj.name         = 'libpowermate'
+    obj.target       = 'powermate'
+    obj.uselib_local = 'libardour libardour_cp'
+    obj.vnum         = LIBARDOUR_POWERMATE_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/surfaces/tranzport/wscript b/libs/surfaces/tranzport/wscript
index f2c4ccc0fc..7a7d5d2a05 100644
--- a/libs/surfaces/tranzport/wscript
+++ b/libs/surfaces/tranzport/wscript
@@ -13,40 +13,39 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
+    autowaf.configure(conf)
 
 def build(bld):
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	button_events.cc
-        	buttons.cc
-        	general.cc
-        	init.cc
-        	interface.cc
-        	io.cc
-        	io_usb.cc
-        	lcd.cc
-        	lights.cc
-        	mode.cc
-        	panner.cc
-        	screen.cc
-        	show.cc
-        	state.cc
-        	wheel.cc
-        	wheel_modes.cc
-        '''
-        obj.export_incdirs = ['./tranzport']
-        obj.cxxflags     = '-DPACKAGE="ardour_tranzport"'
-        obj.includes     = ['.', './tranzport']
-        obj.name         = 'libardour_tranzport'
-        obj.target       = 'ardour_tranzport'
-        obj.uselib_local = 'libardour libardour_cp'
-        obj.vnum         = LIBARDOUR_TRANZPORT_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            button_events.cc
+            buttons.cc
+            general.cc
+            init.cc
+            interface.cc
+            io.cc
+            io_usb.cc
+            lcd.cc
+            lights.cc
+            mode.cc
+            panner.cc
+            screen.cc
+            show.cc
+            state.cc
+            wheel.cc
+            wheel_modes.cc
+    '''
+    obj.export_incdirs = ['./tranzport']
+    obj.cxxflags     = '-DPACKAGE="ardour_tranzport"'
+    obj.includes     = ['.', './tranzport']
+    obj.name         = 'libardour_tranzport'
+    obj.target       = 'ardour_tranzport'
+    obj.uselib_local = 'libardour libardour_cp'
+    obj.vnum         = LIBARDOUR_TRANZPORT_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/surfaces/wiimote/wscript b/libs/surfaces/wiimote/wscript
index 8923df7015..3c4650ca9b 100644
--- a/libs/surfaces/wiimote/wscript
+++ b/libs/surfaces/wiimote/wscript
@@ -13,26 +13,25 @@ srcdir = '.'
 blddir = 'build'
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def configure(conf):
-        autowaf.configure(conf)
+    autowaf.configure(conf)
 
 def build(bld):
-        obj = bld.new_task_gen('cxx', 'shlib')
-        obj.source = '''
-        	wiimote.cc
-        	interface.cc
-        '''
-        obj.export_incdirs = ['./wiimote']
-        obj.cxxflags     = '-DPACKAGE="ardour_wiimote"'
-        obj.includes     = ['.', './wiimote']
-        obj.name         = 'libwiimote'
-        obj.target       = 'wiimote'
-        obj.uselib_local = 'libardour libardour_cp'
-        obj.vnum         = LIBARDOUR_WIIMOTE_LIB_VERSION
-        obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
+    obj = bld.new_task_gen('cxx', 'shlib')
+    obj.source = '''
+            wiimote.cc
+            interface.cc
+    '''
+    obj.export_incdirs = ['./wiimote']
+    obj.cxxflags     = '-DPACKAGE="ardour_wiimote"'
+    obj.includes     = ['.', './wiimote']
+    obj.name         = 'libwiimote'
+    obj.target       = 'wiimote'
+    obj.uselib_local = 'libardour libardour_cp'
+    obj.vnum         = LIBARDOUR_WIIMOTE_LIB_VERSION
+    obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()
diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript
index 9bac418696..1b9d5c7091 100644
--- a/libs/surfaces/wscript
+++ b/libs/surfaces/wscript
@@ -31,47 +31,46 @@ children = [
 ]
 
 def set_options(opt):
-        autowaf.set_options(opt)
+    autowaf.set_options(opt)
 
 def sub_config_and_use(conf, name, has_objects = True):
-        conf.sub_config(name)
-        autowaf.set_local_lib(conf, name, has_objects)
+    conf.sub_config(name)
+    autowaf.set_local_lib(conf, name, has_objects)
 
 def configure(conf):
-        autowaf.set_recursive()
-        autowaf.configure(conf)
+    autowaf.set_recursive()
+    autowaf.configure(conf)
 
-        for i in children:
-        	sub_config_and_use(conf, i)
+    for i in children:
+        sub_config_and_use(conf, i)
 
-        conf.check_cc (lib='libusb', header_name='libusb.h', function_name='usb_interrupt_write', define_name='BUILD_TRANZPORT')
-        conf.check_cc (header_name='linux/input.h', define_name='BUILD_POWERMATE')
-        conf.check_cc (lib='lo', header_name='lo/lo.h', function_name='lo_server_new', define_name='BUILD_OSC')
-        
-        if Options.options.wiimote:
-        	conf.check_cc (header_name='cwiid.h',define_name='HAVE_CWIID_H')
-        	if not conf.env['HAVE_CWIID_H']:
-        		print('WIIMOTE configured but you are missing libcwiid!')
-        		sys.exit(1)
-        	conf.check_cc (header_name='bluetooth/bluetooth.h',define_name='HAVE_BLUETOOTH_H')
-        	if not conf.env['HAVE_BLUETOOTH_H']:
-        		print('WIIMOTE configured but you are missing the libbluetooth headers needed to compile wiimote support!')
-        		sys.exit(1)
-        	conf.define ('BUILD_WIIMOTE', 1)
+    conf.check_cc (lib='libusb', header_name='libusb.h', function_name='usb_interrupt_write', define_name='BUILD_TRANZPORT')
+    conf.check_cc (header_name='linux/input.h', define_name='BUILD_POWERMATE')
+    conf.check_cc (lib='lo', header_name='lo/lo.h', function_name='lo_server_new', define_name='BUILD_OSC')
+
+    if Options.options.wiimote:
+        conf.check_cc (header_name='cwiid.h',define_name='HAVE_CWIID_H')
+        if not conf.env['HAVE_CWIID_H']:
+            print('WIIMOTE configured but you are missing libcwiid!')
+            sys.exit(1)
+        conf.check_cc (header_name='bluetooth/bluetooth.h',define_name='HAVE_BLUETOOTH_H')
+        if not conf.env['HAVE_BLUETOOTH_H']:
+            print('WIIMOTE configured but you are missing the libbluetooth headers needed to compile wiimote support!')
+            sys.exit(1)
+        conf.define ('BUILD_WIIMOTE', 1)
 
 def build(bld):
-        bld.add_subdirs('control_protocol')
-        bld.add_subdirs('generic_midi')
-        bld.add_subdirs('mackie')
-        if bld.env['BUILD_OSC']:
-        	bld.add_subdirs('osc')
-        if bld.env['BUILD_POWERMATE']:
-        	bld.add_subdirs('powermate')
-        if bld.env['BUILD_WIIMOTE']:
-        	bld.add_subdirs('wiimote')
-        if bld.env['BUILD_TRANZPORT']:
-        	bld.add_subdirs('tranzport')
+    bld.add_subdirs('control_protocol')
+    bld.add_subdirs('generic_midi')
+    bld.add_subdirs('mackie')
+    if bld.env['BUILD_OSC']:
+        bld.add_subdirs('osc')
+    if bld.env['BUILD_POWERMATE']:
+        bld.add_subdirs('powermate')
+    if bld.env['BUILD_WIIMOTE']:
+        bld.add_subdirs('wiimote')
+    if bld.env['BUILD_TRANZPORT']:
+        bld.add_subdirs('tranzport')
 
 def shutdown():
-        autowaf.shutdown()
-
+    autowaf.shutdown()