Fix conflicts before merge

diff --cc timeside/api.py
Simple merge

diff --cc timeside/core.py
index ef7f4eae32a025bdad98cd3d4453e8cf7f84d887,d477ca459ae6fc81ea47a38f03ea2d95acd1bb56..b88bcea04fb40d22ddfef767de7ffd76aa827562
--- 1/timeside/core.py
--- 2/timeside/core.py
+++ b/timeside/core.py
@@@ -76,11 -70,7 +77,12 @@@ class Processor(Component)
      implements(IProcessor)
  
      def __init__(self):
 +        super(Processor, self).__init__()
 +
 +        self.parents = []
 +        self.source_mediainfo = None
 +        self.pipe = None
+         self.UUID = "%08x" % random.getrandbits(32)
  
      @interfacedoc
      def setup(self, channels=None, samplerate=None, blocksize=None,