Compare commits

..

No commits in common. "e221626191b9b45b9778d7932c8164b31614fb36" and "793da444ade53a6b973a34e1f6899f12564b9e26" have entirely different histories.

3 changed files with 3 additions and 10 deletions

View file

@ -28,8 +28,7 @@ CONFIG = {
"sub_border_color": "0.0/0.0/0.0/0.75", "sub_border_color": "0.0/0.0/0.0/0.75",
"sub_margin": 2 * 36 + 6, "sub_margin": 2 * 36 + 6,
"sub_spacing": 0, "sub_spacing": 0,
"vf": None, "vf": None
"sync_group": None,
} }
@ -278,8 +277,6 @@ class Sync(Thread):
"%0.4f %s" "%0.4f %s"
% (self.mpv.time_pos, self.mpv.playlist_current_pos) % (self.mpv.time_pos, self.mpv.playlist_current_pos)
).encode() ).encode()
if CONFIG.get("sync_group"):
msg = (b"%s " % CONFIG["sync_group"]) + msg
except: except:
return return
try: try:
@ -310,11 +307,6 @@ class Sync(Thread):
except OSError: except OSError:
logger.error("socket closed") logger.error("socket closed")
else: else:
if CONFIG.get("sync_group"):
if data[0] != str(CONFIG["sync_group"]):
return self.read_position_main()
else:
data = data[1:]
self._last_ping = data[0] self._last_ping = data[0]
if data[0] == "pause": if data[0] == "pause":
self.is_paused = True self.is_paused = True

View file

@ -552,7 +552,7 @@ def render_all(options):
shutil.move(fragment_prefix / "front-5.1.mp4", fragment_prefix / "front.mp4") shutil.move(fragment_prefix / "front-5.1.mp4", fragment_prefix / "front.mp4")
for fn in ( for fn in (
"audio-5.1.mp4", "audio-5.1.mp4",
"audio-center.wav", "audio-rear.wav", "audio-center.wav", "audio-rear.wav", "audio-center.wav",
"audio-front.wav", "audio-back.wav", "back-audio.mp4", "audio-front.wav", "audio-back.wav", "back-audio.mp4",
"fl.wav", "fr.wav", "fc.wav", "lfe.wav", "bl.wav", "br.wav", "fl.wav", "fr.wav", "fc.wav", "lfe.wav", "bl.wav", "br.wav",
): ):

View file

@ -554,6 +554,7 @@ class KDEnliveProject:
] + value) ] + value)
] ]
def properties(self, *props): def properties(self, *props):
return [ return [
self.get_element("property", attrib={"name": name}, text=str(value) if value is not None else value) self.get_element("property", attrib={"name": name}, text=str(value) if value is not None else value)