Philipp Hörist pushed to branch master at gajim / gajim

Commits: fb4c5a23 by Philipp Hörist at 2018-08-21T16:48:20Z Call link() on correct object

- - - - - a087486e by Philipp Hörist at 2018-08-21T17:21:07Z Windows: Fix gstreamer/farstream plugin paths

- - - - -

2 changed files:

- gajim/common/app.py - gajim/common/jingle_rtp.py

Changes:

===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -32,6 +32,7 @@ import os import sys import logging import uuid +from pathlib import Path from distutils.version import LooseVersion as V from collections import namedtuple

@@ -229,8 +230,11 @@ def detect_dependencies(): # FARSTREAM try: if os.name == 'nt': - os.environ['FS_PLUGIN_PATH'] = 'gtk\lib\farstream-0.1' - os.environ['GST_PLUGIN_PATH'] = 'gtk\lib\gstreamer-0.10' + root_path = Path(sys.executable).parents[1] + fs_plugin_path = str(root_path / 'lib' / 'farstream-0.2') + gst_plugin_path = str(root_path / 'lib' / 'gstreamer-1.0') + os.environ['FS_PLUGIN_PATH'] = fs_plugin_path + os.environ['GST_PLUGIN_PATH'] = gst_plugin_path gi.require_version('Farstream', '0.2') from gi.repository import Farstream gi.require_version('Gst', '1.0')

===================================== gajim/common/jingle_rtp.py ===================================== --- a/gajim/common/jingle_rtp.py +++ b/gajim/common/jingle_rtp.py @@ -243,7 +243,7 @@ class JingleRTPContent(JingleContent): # Add fallback source self.src_bin = self.get_fallback_src() self.pipeline.add(self.src_bin) - self.src_bin.link(sink_pad) + self.src_bin.get_static_pad('src').link(sink_pad) self.stream_failed_once = True else: reason = nbxmpp.Node('reason')

View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/fef8cff254434525f0588eff2cbeb8524c...