Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-client-macos
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-client-macos
Commits
c0532c53
Commit
c0532c53
authored
4 years ago
by
Kateryna Kostiuk
Browse files
Options
Downloads
Patches
Plain Diff
fix conference layout
Change-Id: Ica47f7a6baffc3952356ad569302acc035b2fdff
parent
c578b3fe
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/CurrentCallVC.mm
+13
-3
13 additions, 3 deletions
src/CurrentCallVC.mm
with
13 additions
and
3 deletions
src/CurrentCallVC.mm
+
13
−
3
View file @
c0532c53
...
@@ -239,7 +239,7 @@ CVPixelBufferRef pixelBufferPreview;
...
@@ -239,7 +239,7 @@ CVPixelBufferRef pixelBufferPreview;
return
;
return
;
}
}
if
([
self
isCurrentCall
:
confId
])
{
if
([
self
isCurrentCall
:
confId
])
{
[
self
updateConference
:
confId
];
[
self
updateConference
];
}
}
});
});
//monitor for updated call state
//monitor for updated call state
...
@@ -385,8 +385,9 @@ CVPixelBufferRef pixelBufferPreview;
...
@@ -385,8 +385,9 @@ CVPixelBufferRef pixelBufferPreview;
participantsOverlays
=
[[
NSMutableDictionary
alloc
]
init
];
participantsOverlays
=
[[
NSMutableDictionary
alloc
]
init
];
}
}
-
(
void
)
updateConference
:(
QString
)
confId
-
(
void
)
updateConference
{
{
auto
confId
=
[
self
getcallID
];
if
(
confId
.
isEmpty
())
{
if
(
confId
.
isEmpty
())
{
[
self
removeConferenceLayout
];
[
self
removeConferenceLayout
];
return
;
return
;
...
@@ -400,6 +401,7 @@ CVPixelBufferRef pixelBufferPreview;
...
@@ -400,6 +401,7 @@ CVPixelBufferRef pixelBufferPreview;
[
self
removeConferenceLayout
];
[
self
removeConferenceLayout
];
return
;
return
;
}
}
NSMutableArray
*
participantUrs
=
[[
NSMutableArray
alloc
]
init
];
for
(
auto
participant
:
participants
)
{
for
(
auto
participant
:
participants
)
{
ConferenceParticipant
conferenceParticipant
;
ConferenceParticipant
conferenceParticipant
;
conferenceParticipant
.
x
=
participant
[
"x"
].
toFloat
();
conferenceParticipant
.
x
=
participant
[
"x"
].
toFloat
();
...
@@ -407,6 +409,7 @@ CVPixelBufferRef pixelBufferPreview;
...
@@ -407,6 +409,7 @@ CVPixelBufferRef pixelBufferPreview;
conferenceParticipant
.
width
=
participant
[
"w"
].
toFloat
();
conferenceParticipant
.
width
=
participant
[
"w"
].
toFloat
();
conferenceParticipant
.
hight
=
participant
[
"h"
].
toFloat
();
conferenceParticipant
.
hight
=
participant
[
"h"
].
toFloat
();
conferenceParticipant
.
uri
=
participant
[
"uri"
].
toNSString
();
conferenceParticipant
.
uri
=
participant
[
"uri"
].
toNSString
();
[
participantUrs
addObject
:
participant
[
"uri"
].
toNSString
()];
conferenceParticipant
.
active
=
participant
[
"active"
]
==
"true"
;
conferenceParticipant
.
active
=
participant
[
"active"
]
==
"true"
;
conferenceParticipant
.
isLocal
=
false
;
conferenceParticipant
.
isLocal
=
false
;
conferenceParticipant
.
bestName
=
participant
[
"uri"
].
toNSString
();
conferenceParticipant
.
bestName
=
participant
[
"uri"
].
toNSString
();
...
@@ -433,6 +436,13 @@ CVPixelBufferRef pixelBufferPreview;
...
@@ -433,6 +436,13 @@ CVPixelBufferRef pixelBufferPreview;
[
overlay
updateViewWithParticipant
:
conferenceParticipant
];
[
overlay
updateViewWithParticipant
:
conferenceParticipant
];
}
}
}
}
auto
keys
=
[
participantsOverlays
allKeys
];
for
(
auto
key
:
keys
)
{
if
(
!
[
participantUrs
containsObject
:
key
])
{
[
participantsOverlays
[
key
]
removeFromSuperview
];
participantsOverlays
[
key
]
=
nil
;
}
}
}
}
-
(
void
)
updateCall
-
(
void
)
updateCall
...
@@ -465,7 +475,7 @@ CVPixelBufferRef pixelBufferPreview;
...
@@ -465,7 +475,7 @@ CVPixelBufferRef pixelBufferPreview;
[
recordOnOffButton
setHidden
:
!
confUid_
.
isEmpty
()];
[
recordOnOffButton
setHidden
:
!
confUid_
.
isEmpty
()];
[
holdOnOffButton
setHidden
:
!
confUid_
.
isEmpty
()];
[
holdOnOffButton
setHidden
:
!
confUid_
.
isEmpty
()];
[
movableBaseForView
setHidden
:
!
confUid_
.
isEmpty
()];
[
movableBaseForView
setHidden
:
!
confUid_
.
isEmpty
()];
[
self
updateConference
:
confUid_
];
[
self
updateConference
];
[
timeSpentLabel
setStringValue
:
callModel
->
getFormattedCallDuration
(
callUid_
).
toNSString
()];
[
timeSpentLabel
setStringValue
:
callModel
->
getFormattedCallDuration
(
callUid_
).
toNSString
()];
if
(
refreshDurationTimer
==
nil
)
if
(
refreshDurationTimer
==
nil
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment