Commit 28b99be3 authored by Kateryna Kostiuk's avatar Kateryna Kostiuk

conference: manage hold and hang up

Change-Id: I4b7638a46566449914d39e9496bd5583f9d98f7f
parent c3896547
...@@ -162,6 +162,7 @@ CVPixelBufferRef pixelBufferPreview; ...@@ -162,6 +162,7 @@ CVPixelBufferRef pixelBufferPreview;
confUid_ = convIt->confId; confUid_ = convIt->confId;
[self.chatVC setConversationUid:convUid model:account->conversationModel.get()]; [self.chatVC setConversationUid:convUid model:account->conversationModel.get()];
[self connectSignals]; [self connectSignals];
callModel->setCurrentCall([self getcallID]);
} }
-(void) connectSignals { -(void) connectSignals {
...@@ -330,6 +331,7 @@ CVPixelBufferRef pixelBufferPreview; ...@@ -330,6 +331,7 @@ CVPixelBufferRef pixelBufferPreview;
[muteAudioButton setHidden:!confUid_.empty()]; [muteAudioButton setHidden:!confUid_.empty()];
[muteVideoButton setHidden:!confUid_.empty()]; [muteVideoButton setHidden:!confUid_.empty()];
[recordOnOffButton setHidden:!confUid_.empty()]; [recordOnOffButton setHidden:!confUid_.empty()];
[holdOnOffButton setHidden:!confUid_.empty()];
[timeSpentLabel setStringValue:@(callModel->getFormattedCallDuration(callUid_).c_str())]; [timeSpentLabel setStringValue:@(callModel->getFormattedCallDuration(callUid_).c_str())];
if (refreshDurationTimer == nil) if (refreshDurationTimer == nil)
...@@ -802,7 +804,7 @@ CVPixelBufferRef pixelBufferPreview; ...@@ -802,7 +804,7 @@ CVPixelBufferRef pixelBufferPreview;
return; return;
auto* callModel = accountInfo_->callModel.get(); auto* callModel = accountInfo_->callModel.get();
callModel->hangUp([self getcallID]); callModel->hangUp(callUid_);
} }
- (IBAction)accept:(id)sender { - (IBAction)accept:(id)sender {
...@@ -915,7 +917,7 @@ CVPixelBufferRef pixelBufferPreview; ...@@ -915,7 +917,7 @@ CVPixelBufferRef pixelBufferPreview;
- (IBAction)hidePreview:(id)sender { - (IBAction)hidePreview:(id)sender {
CGRect previewFrame = previewView.frame; CGRect previewFrame = previewView.frame;
CGRect newPreviewFrame;//, bcHidePreviewFrame; CGRect newPreviewFrame;
if (previewFrame.size.width > HIDE_PREVIEW_BUTTON_SIZE) { if (previewFrame.size.width > HIDE_PREVIEW_BUTTON_SIZE) {
self.movableBaseForView.movable = false; self.movableBaseForView.movable = false;
newPreviewFrame = self.getVideoPreviewCollapsedSize; newPreviewFrame = self.getVideoPreviewCollapsedSize;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment