Merge remote-tracking branch 'origin/master' into cross-signing

1 files changed, 13 insertions, 1 deletions

diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp

index ed720056..18151173 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -8,7 +8,6 @@
 #include <QString>
 
 #include "BlurhashProvider.h"
-#include "CallManager.h"
 #include "ChatPage.h"
 #include "ColorImageProvider.h"
 #include "DelegateChooser.h"
@@ -233,6 +232,12 @@ TimelineViewManager::TimelineViewManager(QSharedPointer<UserSettings> userSettin
                 isInitialSync_ = true;
                 emit initialSyncChanged(true);
         });
+        connect(&WebRTCSession::instance(),
+                &WebRTCSession::stateChanged,
+                this,
+                &TimelineViewManager::callStateChanged);
+        connect(
+          callManager_, &CallManager::newCallParty, this, &TimelineViewManager::callPartyChanged);
 }
 
 void
@@ -305,6 +310,13 @@ TimelineViewManager::escapeEmoji(QString str) const
 }
 
 void
+TimelineViewManager::toggleMicMute()
+{
+        WebRTCSession::instance().toggleMicMute();
+        emit micMuteChanged();
+}
+
+void
 TimelineViewManager::openImageOverlay(QString mxcUrl, QString eventId) const
 {
         QQuickImageResponse *imgResponse =