From: Thomas Fillon <thomas@parisson.com>
Date: Thu, 31 Oct 2013 17:10:38 +0000 (+0100)
Subject: Fix conflicts before merge
X-Git-Tag: 0.5.1-0~9
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5ca994a4032d8aac775394196b28ca11be59bb4e;p=timeside.git

Fix conflicts before merge
---

5ca994a4032d8aac775394196b28ca11be59bb4e
diff --cc timeside/core.py
index ef7f4ea,d477ca4..b88bcea
--- a/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,