WIP: Bugfix 9019 threading error

galicaster/classui/recorderui.py

@@ -483,15 +483,24 @@ def create_drawing_areas(self, sources):
         """Create as preview areas as video sources exits"""
         main = self.main_area
 
-        for child in main.get_children():
-            main.remove(child)
-            child.destroy()
-
         if self.swap:
             sources.reverse()
 
+        sources_num = len(sources)
+        i = 0
         areas = dict()
-        for source in sources:
+        for child in main.get_children():
+            if i > sources_num:
+                main.remove(child)
+                child.destroy()
+                continue
+            source = sources[i]
+            child.set_name(source)
+            child.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse("black"))
+            areas[source] = child
+            i+=1
+
+        for source in sources[i:]:
             new_area = Gtk.DrawingArea()
             new_area.set_name(source)
             new_area.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse("black"))

galicaster/recorder/service.py

@@ -13,6 +13,8 @@
 
 import os
 from datetime import datetime
+from gi.repository import Gdk, GLib
+
 from galicaster.mediapackage import mediapackage
 from galicaster.recorder import Recorder
 from galicaster.utils.i18n import _
@@ -121,10 +123,15 @@ def __prepare(self):
         self.dispatcher.emit("recorder-ready")
 
         self.mute_preview(self.mute)
-        if self.__create_drawing_areas_func:
-            info = self.recorder.get_display_areas_info()
-            areas = self.__create_drawing_areas_func(info)
-            self.recorder.set_drawing_areas(areas)
+
+        def drawing_areas_wrapper():
+            if self.__create_drawing_areas_func:
+                info = self.recorder.get_display_areas_info()
+                areas = self.__create_drawing_areas_func(info)
+                self.recorder.set_drawing_areas(areas)
+
+        Gdk.threads_add_idle(GLib.PRIORITY_HIGH, drawing_areas_wrapper)
+
 
 
     def record(self, mp=None):
@@ -152,14 +159,9 @@ def record(self, mp=None):
                 self.resume()
 
             if self.status == RECORDING_STATUS:
-                self.recorder.stop()
-                self.__close_mp()
-                try:
-                    self.__prepare()
-                    self.recorder.preview_and_record()
-                except Exception as exc:
-                    self.dispatcher.emit("recorder-error", str(exc))
-                    return False
+                self.stop()
+                self.record(mp)
+                return True
             else:
                 self.recorder and self.recorder.record()