Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
-
c9590b13
by wurstsalat at 2021-12-07T18:42:02+01:00
-
a0fea967
by wurstsalat at 2021-12-07T18:43:07+01:00
3 changed files:
Changes:
| ... | ... | @@ -73,8 +73,6 @@ def __init__(self, account, contact): |
| 73 | 73 |
self._video_widget_other = None
|
| 74 | 74 |
self._video_widget_self = None
|
| 75 | 75 |
|
| 76 |
- self._detect_av()
|
|
| 77 |
- |
|
| 78 | 76 |
self._ui = get_builder('call_widget.ui')
|
| 79 | 77 |
self.add(self._ui.av_box)
|
| 80 | 78 |
self.connect('destroy', self._on_destroy)
|
| ... | ... | @@ -92,9 +90,9 @@ def _on_destroy(self, *args): |
| 92 | 90 |
self._close_jingle_content(jingle_type, shutdown=True)
|
| 93 | 91 |
self._jingle.clear()
|
| 94 | 92 |
|
| 95 |
- def _detect_av(self):
|
|
| 93 |
+ def detect_av(self):
|
|
| 96 | 94 |
if (self._contact.supports(Namespace.JINGLE_ICE_UDP) and
|
| 97 |
- app.is_installed('FARSTREAM') and self._contact.jid.resource):
|
|
| 95 |
+ app.is_installed('FARSTREAM')):
|
|
| 98 | 96 |
self._jingle['audio'].available = self._contact.supports(
|
| 99 | 97 |
Namespace.JINGLE_RTP_AUDIO)
|
| 100 | 98 |
self._jingle['video'].available = self._contact.supports(
|
| ... | ... | @@ -205,6 +205,7 @@ def update_actions(self) -> None: |
| 205 | 205 |
online and self._client.get_module('Blocking').supported)
|
| 206 | 206 |
|
| 207 | 207 |
# Jingle AV
|
| 208 |
+ self._call_widget.detect_av()
|
|
| 208 | 209 |
audio_available = self._call_widget.get_jingle_available('audio')
|
| 209 | 210 |
video_available = self._call_widget.get_jingle_available('video')
|
| 210 | 211 |
self._get_action('start-call-').set_enabled(
|
| ... | ... | @@ -486,7 +487,10 @@ def _nec_ping(self, event): |
| 486 | 487 |
self.add_info_message(event.error)
|
| 487 | 488 |
|
| 488 | 489 |
# Jingle AV calls
|
| 489 |
- def _on_start_call(self) -> None:
|
|
| 490 |
+ def _on_start_call(self,
|
|
| 491 |
+ _action: Gio.SimpleAction,
|
|
| 492 |
+ _param: Optional[GLib.Variant]
|
|
| 493 |
+ ) -> None:
|
|
| 490 | 494 |
self._call_widget.start_call()
|
| 491 | 495 |
|
| 492 | 496 |
def _process_jingle_av_event(self, event):
|
| ... | ... | @@ -81,9 +81,11 @@ function install_deps { |
| 81 | 81 |
mingw-w64-"${ARCH}"-gtksourceview4 \
|
| 82 | 82 |
mingw-w64-"${ARCH}"-gstreamer \
|
| 83 | 83 |
mingw-w64-"${ARCH}"-gst-plugins-base \
|
| 84 |
+ mingw-w64-"${ARCH}"-gst-plugins-good \
|
|
| 84 | 85 |
mingw-w64-"${ARCH}"-gst-libav \
|
| 85 | 86 |
mingw-w64-"${ARCH}"-gst-python \
|
| 86 | 87 |
mingw-w64-"${ARCH}"-farstream \
|
| 88 |
+ mingw-w64-"${ARCH}"-libnice \
|
|
| 87 | 89 |
mingw-w64-"${ARCH}"-python-pip \
|
| 88 | 90 |
mingw-w64-"${ARCH}"-adwaita-icon-theme \
|
| 89 | 91 |
mingw-w64-"${ARCH}"-libwebp \
|