Merge pull request #374 from justjanne/revert-wayland-ui

Revert "Merge pull request #366 from justjanne/wayland-ui"

Author: Kunsi

uv.lock

@@ -1,6 +1,4 @@
 import logging
-from typing import cast
-
 from gi.repository import Gtk, Gdk
 
 from voctogui.lib.config import Config
@@ -81,14 +79,12 @@ def setup(self):
         self.mix_audio_display = AudioDisplay(audio_box, "mix", uibuilder=self)
 
         # Create Main-Video Display
-        video_main = cast(Gtk.Box, self.find_widget_recursive(self.win, 'video_main'))
         self.mix_video_display = VideoDisplay(
+            self.find_widget_recursive(self.win, 'video_main'),
             self.mix_audio_display,
             port=Port.MIX_PREVIEW if Config.getPreviewsEnabled() else Port.MIX_OUT,
             name="MIX"
         )
-        video_main.pack_start(self.mix_video_display.widget, fill=True, expand=True, padding=0)
-        self.mix_video_display.play()
 
         for idx, livepreview in enumerate(Config.getLivePreviews()):
             if Config.getPreviewsEnabled():

voctogui/lib/ui.py

@@ -1,8 +1,7 @@
 import logging
 import sys
-from typing import cast
 
-from gi.repository import Gst, Gdk, Gtk
+from gi.repository import Gst, Gdk
 
 from voctogui.lib.args import Args
 from voctogui.lib.config import Config
@@ -16,14 +15,12 @@
 
 class VideoDisplay(object):
     """Displays a Voctomix-Video-Stream into a GtkWidget"""
-    imagesink: Gst.Element
-    widget: Gtk.Widget
-    pipeline: Gst.Pipeline
 
-    def __init__(self, audio_display, port, name, width=None, height=None,
+    def __init__(self, video_drawing_area, audio_display, port, name, width=None, height=None,
                  has_audio=True, play_audio=False):
         self.log = logging.getLogger('VideoDisplay:%s' % name)
         self.name = name
+        self.video_drawing_area = video_drawing_area
         self.level_callback = None if audio_display is None else audio_display.callback
         video_decoder = None
 
@@ -81,16 +78,28 @@ def __init__(self, audio_display, port, name, width=None, height=None,
         # Video Display
         videosystem = Config.getVideoSystem()
         self.log.debug('Configuring for Video-System %s', videosystem)
-        if videosystem == 'gtk':
-            pipe += """ ! gtksink
-                            name=imagesink-{name} sync=false
-                """.format(name=name)
 
-        elif videosystem == 'gtkgl':
+        if videosystem == 'gl':
             pipe += """ ! glupload
-                        ! gtkglsink
-                            name=imagesink-{name} sync=false
-                """.format(name=name)
+                        ! glcolorconvert
+                        ! glimagesinkelement
+                            name=imagesink-{name}
+                            """.format(name=name)
+
+        elif videosystem == 'xv':
+            pipe += """ ! xvimagesink
+                            name=imagesink-{name}
+                        """.format(name=name)
+
+        elif videosystem == 'x':
+            pipe += """ ! ximagesink
+                            name=imagesink-{name}
+                        """.format(name=name)
+
+        elif videosystem == 'vaapi':
+            pipe += """ ! vaapisink
+                            name=imagesink-{name}
+                        """.format(name=name)
 
         else:
             raise Exception(
@@ -125,27 +134,48 @@ def __init__(self, audio_display, port, name, width=None, height=None,
         self.log.info("Creating Display-Pipeline:\n%s",  pretty(pipe))
         try:
             # launch gstreamer pipeline
-            self.pipeline = cast(Gst.Pipeline, Gst.parse_launch(pipe))
+            self.pipeline = Gst.parse_launch(pipe)
             self.log.info("pipeline launched successfuly")
         except:
             self.log.error("Can not launch pipeline")
             sys.exit(-1)
 
-        self.imagesink = cast(Gst.Element, self.pipeline.get_by_name('imagesink-{name}'.format(name=self.name)))
-        self.widget = cast(Gtk.Widget, self.imagesink.get_property("widget"))
-
         if Args.dot:
             self.log.debug("Generating DOT image of videodisplay pipeline")
             gst_generate_dot(self.pipeline, "gui.videodisplay.{}".format(name), Args.gst_debug_details)
 
-        self.pipeline.set_clock(Clock)
+        self.pipeline.use_clock(Clock)
+
+        self.video_drawing_area.add_events(
+            Gdk.EventMask.KEY_PRESS_MASK | Gdk.EventMask.KEY_RELEASE_MASK)
+        self.video_drawing_area.connect("realize", self.on_realize)
         bus = self.pipeline.get_bus()
         bus.add_signal_watch()
         bus.enable_sync_message_emission()
 
         bus.connect('message::error', self.on_error)
+        bus.connect('sync-message::element', self.on_syncmsg)
+        bus.connect('message::state-changed', self.on_state_changed)
         bus.connect("message::element", self.on_level)
 
+    def on_realize(self, win):
+        self.imagesink = self.pipeline.get_by_name(
+            'imagesink-{name}'.format(name=self.name))
+        self.xid = self.video_drawing_area.get_property('window').get_xid()
+
+        self.log.debug('Realized Drawing-Area with xid %u', self.xid)
+        self.video_drawing_area.realize()
+
+        self.log.info("Launching Display-Pipeline")
+        self.pipeline.set_state(Gst.State.PLAYING)
+
+    def on_syncmsg(self, bus, msg):
+        if type(msg) == Gst.Message and self.imagesink:
+            if msg.get_structure().get_name() == "prepare-window-handle":
+                self.log.info(
+                    'Setting imagesink window-handle to 0x%x', self.xid)
+                self.imagesink.set_window_handle(self.xid)
+
     def on_error(self, bus, message):
         (error, debug) = message.parse_error()
         self.log.error(
@@ -162,5 +192,6 @@ def on_level(self, bus, msg):
             decay = msg.get_structure().get_value('decay')
             self.level_callback(rms, peak, decay)
 
-    def play(self):
-        self.pipeline.set_state(Gst.State.PLAYING)
+    def on_state_changed(self, bus, message):
+        if message.parse_state_changed().newstate == Gst.State.PLAYING:
+            self.video_drawing_area.show()

voctogui/lib/videodisplay.py

@@ -4,10 +4,8 @@
 import math
 import os
 from configparser import NoOptionError
-from typing import cast
 
-from gi.repository import Gst, Gtk, Gdk, GObject
-from voctogui.lib.videopreviewframe import VideoPreviewFrame
+from gi.repository import Gtk, Gdk, GObject
 from voctogui.lib.videodisplay import VideoDisplay
 from voctogui.lib.audioonlydisplay import AudioOnlyDisplay
 from voctogui.lib.audiodisplay import AudioDisplay
@@ -62,16 +60,18 @@ def addPreview(self, uibuilder, source, port, has_volume=True):
         if has_audio and Config.getAudioStreams().get_source_streams(source):
             mix_audio_display = AudioDisplay(self.audio_box, source, uibuilder, has_volume)
         if source in Config.getVideoSources(internal=True):
-            player = VideoDisplay(audio_display=mix_audio_display, port=port,
+            video = uibuilder.load_check_widget('video',
+                                                os.path.dirname(uibuilder.uifile) +
+                                                "/widgetpreview.ui")
+            video.set_size_request(*self.previewSize)
+            self.video_box.pack_start(video, fill=False,
+                                   expand=False, padding=0)
+
+            player = VideoDisplay(video, mix_audio_display, port=port,
                                   width=self.previewSize[0],
                                   height=self.previewSize[1],
                                   name=source.upper(),
                                   has_audio=has_audio,
                                   )
-            video = cast(Gtk.Widget, player.widget)
-            frame = VideoPreviewFrame(*self.previewSize)
-            frame.add(video)
-            self.video_box.pack_start(frame, False, False, 0)
-            player.play()
         elif has_audio and Config.getAudioStreams().get_source_streams(source):
             player = AudioOnlyDisplay(mix_audio_display, port=port, name=source.upper())

voctogui/lib/videopreviewframe.py

@@ -113,16 +113,13 @@
                     <property name="shadow-type">none</property>
                     <property name="obey-child">False</property>
                     <child>
-                      <object class="GtkBox" id="video_main">
+                      <object class="GtkDrawingArea" id="video_main">
                         <property name="width-request">100</property>
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="double-buffered">False</property>
                         <property name="hexpand">True</property>
                         <property name="vexpand">True</property>
-                        <child>
-                          <placeholder/>
-                        </child>
                       </object>
                     </child>
                   </object>

voctogui/lib/videopreviews.py

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
+<interface>
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkDrawingArea" id="video">
+    <property name="width_request">320</property>
+    <property name="height_request">180</property>
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="double_buffered">False</property>
+  </object>
+</interface>