timvideos · Nov 9, 2014 · Nov 9, 2014 · Nov 9, 2014 · Nov 9, 2014 · Nov 9, 2014
diff --git a/configure.ac b/configure.ac
@@ -99,6 +99,17 @@ AC_ARG_ENABLE(gprof,
 AM_CONDITIONAL(GCOV_ENABLED, test "x$BUILD_GCOV" = "xyes")
 AM_CONDITIONAL(GPROF_ENABLED, test "x$BUILD_GPROF" = "xyes")
 
+AC_ARG_ENABLE(speakertrack,
+  AS_HELP_STRING([--enable-speakertrack],[enable speakertrack]),
+  [
+    case "${enableval}" in
+      yes) BUILD_SPEAKERTRACK=yes ;;
+      no)  BUILD_SPEAKERTRACK=no ;;
+    esac
+  ],
+  [BUILD_SPEAKERTRACK=no])
+  AM_CONDITIONAL(SPEAKERTRACK_ENABLED, test "x$BUILD_SPEAKERTRACK" = "xyes")
+
 dnl Check for the required version of GStreamer core (and gst-plugins-base)
 dnl This will export GST_CFLAGS and GST_LIBS variables for use in Makefile.am
 dnl

diff --git a/python-api/gstswitch/controller.py b/python-api/gstswitch/controller.py
@@ -360,7 +360,7 @@ def parse_preview_ports(cls, res):
             liststr = ast.literal_eval(res)
         except (ValueError, SyntaxError):
             raise ConnectionReturnError(("Connection returned "
-                                        "invalid values:{0}")
+                                         "invalid values:{0}")
                                         .format(res))
         preview_ports = []
         for tupl in liststr:

diff --git a/python-api/gstswitch/helpers.py b/python-api/gstswitch/helpers.py
@@ -166,11 +166,7 @@ def terminate_video(self):
         for _ in range(len(self._running_tests_video)):
             self.terminate_index_video(0)
 
-    def new_test_audio(
-        self,
-        freq=110,
-        wave=None
-    ):
+    def new_test_audio(self, freq=110, wave=None):
         """Start a new test audio
         :param port: The port of where the TCP stream will be sent
         Should be same as audio port of gst-switch-src

diff --git a/python-api/tests/integrationtests/test_controller.py b/python-api/tests/integrationtests/test_controller.py
@@ -386,7 +386,7 @@ def test_new_record(self):
                 sources.terminate_video()
                 serv.terminate(1)
                 assert ((os.path.exists(test_filename)) or
-                       (os.path.exists(alt_test_filename))) is True
+                        (os.path.exists(alt_test_filename))) is True
             finally:
                 if serv.proc:
                     poll = serv.proc.poll()
@@ -405,14 +405,13 @@ class TestAdjustPIP(object):
     NUM = 1
     FACTOR = 1
 
-    def adjust_pip(
-        self,
-        xpos,
-        ypos,
-        width,
-        heigth,
-        index,
-            generate_frames=False):
+    def adjust_pip(self,
+                   xpos,
+                   ypos,
+                   width,
+                   heigth,
+                   index,
+                   generate_frames=False):
         """Create Controller object and call adjust_pip"""
         for _ in range(self.NUM):
             serv = Server(path=PATH)
@@ -531,14 +530,13 @@ class TestClickVideo(object):
     NUM = 1
     FACTOR = 1
 
-    def click_video(
-        self,
-        xpos,
-        ypos,
-        width,
-        heigth,
-        index,
-            generate_frames=False):
+    def click_video(self,
+                    xpos,
+                    ypos,
+                    width,
+                    heigth,
+                    index,
+                    generate_frames=False):
         """Create Controller object and call click_video method"""
         for _ in range(self.NUM):
             serv = Server(path=PATH)

diff --git a/python-api/tests/unittests/test_helpers_unit.py b/python-api/tests/unittests/test_helpers_unit.py
@@ -68,14 +68,13 @@ class MockVideoSrc(object):
 
         """A mock video source"""
 
-        def __init__(
-            self,
-            port,
-            width=300,
-            height=200,
-            pattern=None,
-            timeoverlay=False,
-                clockoverlay=False):
+        def __init__(self,
+                     port,
+                     width=300,
+                     height=200,
+                     pattern=None,
+                     timeoverlay=False,
+                     clockoverlay=False):
             pass
 
         def run(self):
@@ -154,11 +153,7 @@ class MockAudioSrc(object):
 
         """A Mock audio source"""
 
-        def __init__(
-            self,
-            port,
-            freq=110,
-                wave=None):
+        def __init__(self, port, freq=110, wave=None):
             pass
 
         def run(self):

diff --git a/tools/Makefile.am b/tools/Makefile.am
@@ -1,4 +1,8 @@
-bin_PROGRAMS = gst-switch-srv gst-switch-ui gst-switch-cap # gst-switch-ptz
+if SPEAKERTRACK_ENABLED
+  bin_PROGRAMS = gst-switch-srv gst-switch-ui gst-switch-cap gst-switch-ptz
+else
+  bin_PROGRAMS = gst-switch-srv gst-switch-ui gst-switch-cap
+endif
 
 if GCOV_ENABLED
 # --coverage