Merge remote-tracking branch 'origin/master' into cross-signing
This commit is contained in:
commit
99ba1f17d3
21 changed files with 2228 additions and 279 deletions
|
|
@ -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
|
||||
|
|
@ -304,6 +309,13 @@ TimelineViewManager::escapeEmoji(QString str) const
|
|||
return utils::replaceEmoji(str);
|
||||
}
|
||||
|
||||
void
|
||||
TimelineViewManager::toggleMicMute()
|
||||
{
|
||||
WebRTCSession::instance().toggleMicMute();
|
||||
emit micMuteChanged();
|
||||
}
|
||||
|
||||
void
|
||||
TimelineViewManager::openImageOverlay(QString mxcUrl, QString eventId) const
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue