fix issue where preview and program would share a cropper or overlay …

…mixer
voc · Jan 13, 2025 · 5a7784f · 5a7784f
1 parent b8eb3f0
commit 5a7784f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/voctocore/lib/previewscene.py b/voctocore/lib/previewscene.py
@@ -10,7 +10,7 @@ class PreviewScene:
         and voctomix frames.
         With commit() you add frames at a specified play time
     """
-    log = logging.getLogger('Scene')
+    log = logging.getLogger('PreviewScene')
 
     def __init__(self, sources, pipeline, fps, start_sink, cropping=True):
         """ initialize with a gstreamer pipeline and names
@@ -62,7 +62,7 @@ def bind(pad, prop):
             # get mixer and cropper pad from pipeline
             if self.cpads is not None:
                 cropperpad = (pipeline
-                              .get_by_name("cropper-%s" % source))
+                              .get_by_name("precropper-%s" % source))
                 self.cpads[source] = {
                     'croptop': bind(cropperpad, 'top'),
                     'cropleft': bind(cropperpad, 'left'),

diff --git a/voctocore/lib/videopremix.py b/voctocore/lib/videopremix.py
@@ -49,9 +49,9 @@ def __init__(self):
             self.bin += """\
                 ! queue
                     max-size-time=3000000000
-                    name=queue-overlay
+                    name=queue-preoverlay
                 ! gdkpixbufoverlay
-                    name=overlay
+                    name=preoverlay
                     overlay-width={width}
                     overlay-height={height}
                 """.format(
@@ -83,15 +83,15 @@ def __init__(self):
                 video-{name}.
                 ! queue
                     max-size-time=3000000000
-                    name=queue-video-{name}
+                    name=queue-prevideo-{name}
                 ! videopremixer.
                 """.format(name=background)
 
         for idx, name in enumerate(self.sources):
             self.bin += """
                 video-{name}.
                 ! videobox
-                    name=cropper-{name}
+                    name=precropper-{name}
                 ! queue
                     max-size-time=3000000000
                     name=queue-videopremixer-{name}