Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-14 16:18:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #3056 from thunder2/fix-status

Browse source 
Added changes of RsChatFlags and RsStatusValue to VOIP plugin
This commit is contained in:
csoler 2025-12-06 10:08:46 +01:00 • committed by GitHub
commit e80ad9577d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/VOIP/gui/VOIPChatWidgetHolder.cpp
View file

@ -947,9 +947,9 @@ void VOIPChatWidgetHolder::sendAudioData()
}
}
void VOIPChatWidgetHolder::updateStatus(int status)
void VOIPChatWidgetHolder::updateStatus(RsStatusValue status)
{
bool enabled = (status != RS_STATUS_OFFLINE);
bool enabled = (status != RsStatusValue::RS_STATUS_OFFLINE);
audioListenToggleButton->setEnabled(audioCaptureToggleButton->isChecked() && enabled);
audioListenToggleButtonFS->setEnabled(audioCaptureToggleButton->isChecked() && enabled);

2
plugins/VOIP/gui/VOIPChatWidgetHolder.h
View file

@ -52,7 +52,7 @@ public:
VOIPChatWidgetHolder(ChatWidget *chatWidget, VOIPNotify *notify);
virtual ~VOIPChatWidgetHolder();
virtual void updateStatus(int status);
virtual void updateStatus(RsStatusValue status);
void addAudioData(const RsPeerId &peer_id, QByteArray* array) ;
void addVideoData(const RsPeerId &peer_id, QByteArray* array) ;

4
plugins/VOIP/gui/VOIPGUIHandler.cpp
View file

@ -33,7 +33,7 @@ void VOIPGUIHandler::ReceivedInvitation(const RsPeerId &peer_id, int flags)
#ifdef VOIPGUIHANDLER_DEBUG
std::cerr << "****** VOIPGUIHandler: received Invitation from peer " << peer_id.toStdString() << " with flags==" << flags << std::endl;
#endif
ChatDialog *di = ChatDialog::getChat(ChatId(peer_id), Settings->getChatFlags());
ChatDialog *di = ChatDialog::getChat(ChatId(peer_id), (RsChatFlags) Settings->getChatFlags());
if (di) {
ChatWidget *cw = di->getChatWidget();
if(cw) {
@ -113,7 +113,7 @@ void VOIPGUIHandler::ReceivedVoipData(const RsPeerId &peer_id)
return ;
}
ChatDialog *di = ChatDialog::getChat(ChatId(peer_id), Settings->getChatFlags());
ChatDialog *di = ChatDialog::getChat(ChatId(peer_id), (RsChatFlags) Settings->getChatFlags());
if (di) {
ChatWidget *cw = di->getChatWidget();
if (cw) {