Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-client-uwp
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-uwp
Commits
f11cbec8
Commit
f11cbec8
authored
Dec 7, 2016
by
Nicolas Jager
Browse files
Options
Downloads
Patches
Plain Diff
video : add icon for muted video
Change-Id: Iba4f3c03c0fb833d4e4caf19fc5d1218f9937a78 Tuleap: #790
parent
c680e4f0
No related branches found
No related tags found
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
RingD.cpp
+15
-0
15 additions, 0 deletions
RingD.cpp
RingD.h
+2
-0
2 additions, 0 deletions
RingD.h
VideoPage.xaml
+17
-3
17 additions, 3 deletions
VideoPage.xaml
VideoPage.xaml.cpp
+8
-0
8 additions, 0 deletions
VideoPage.xaml.cpp
VideoPage.xaml.h
+1
-0
1 addition, 0 deletions
VideoPage.xaml.h
with
43 additions
and
3 deletions
RingD.cpp
+
15
−
0
View file @
f11cbec8
...
...
@@ -434,6 +434,21 @@ RingD::registerCallbacks()
audioMuted
(
callId
,
state
);
}));
}),
DRing
::
exportable_callback
<
DRing
::
CallSignal
::
VideoMuted
>
([
this
](
const
std
::
string
&
callId
,
bool
state
)
{
// why this cllaback exist ? why are we not using stateChange ?
MSG_
(
"<VideoMuted>"
);
MSG_
(
"callId = "
+
callId
);
MSG_
(
"state = "
+
Utils
::
toString
(
state
.
ToString
()));
CoreApplication
::
MainView
->
CoreWindow
->
Dispatcher
->
RunAsync
(
CoreDispatcherPriority
::
High
,
ref
new
DispatchedHandler
([
=
]()
{
videoMuted
(
callId
,
state
);
}));
}),
DRing
::
exportable_callback
<
DRing
::
CallSignal
::
StateChange
>
([
this
](
const
std
::
string
&
callId
,
const
std
::
string
&
state
,
...
...
This diff is collapsed.
Click to expand it.
RingD.h
+
2
−
0
View file @
f11cbec8
...
...
@@ -45,6 +45,7 @@ delegate void RegistrationStateRegistered();
delegate
void
SetLoadingStatusText
(
String
^
statusText
,
String
^
color
);
delegate
void
CallsListRecieved
(
const
std
::
vector
<
std
::
string
>&
callsList
);
delegate
void
AudioMuted
(
const
std
::
string
&
callId
,
bool
state
);
delegate
void
VideoMuted
(
const
std
::
string
&
callId
,
bool
state
);
delegate
void
NameRegistred
(
bool
status
);
delegate
void
VolatileDetailsChanged
(
const
std
::
string
&
accountId
,
const
std
::
map
<
std
::
string
,
std
::
string
>&
details
);
...
...
@@ -162,6 +163,7 @@ internal:
event
SetLoadingStatusText
^
setLoadingStatusText
;
event
CallsListRecieved
^
callsListRecieved
;
// est implemente a la base pour regler le probleme du boutton d'appel qui est present lorsqu'un appel est en cours, mais il n'est pas utilise. Voir si ca peut servir a autre chose
event
AudioMuted
^
audioMuted
;
event
VideoMuted
^
videoMuted
;
event
NameRegistred
^
nameRegistred
;
event
VolatileDetailsChanged
^
volatileDetailsChanged
;
...
...
This diff is collapsed.
Click to expand it.
VideoPage.xaml
+
17
−
3
View file @
f11cbec8
...
...
@@ -341,12 +341,26 @@
</TextBlock>
</Grid>
</Button>
<!--Tapped="_btnVideo__Tapped"-->
<Button x:Name="_btnVideo_"
PointerEntered="btnAny_entered"
PointerExited="btnAny_exited"
Click="_btnVideo__Click"
Tapped="_btnVideo__Tapped"
>
Click="_btnVideo__Click"
>
<Grid
>
<SymbolIcon Symbol="Video"/>
<TextBlock x:Name="_txbkVideoMuted_"
Text=""
FontSize="16"
IsHitTestVisible="True"
Visibility="Collapsed"
Foreground="Red"
FontWeight="Bold"
FontFamily="Segoe MDL2 Assets">
<TextBlock.RenderTransform>
<TranslateTransform X="1" Y="2"/>
</TextBlock.RenderTransform>
</TextBlock>
</Grid>
</Button>
<Button x:Name="_btnMemo_"
PointerEntered="btnAny_entered"
...
...
This diff is collapsed.
Click to expand it.
VideoPage.xaml.cpp
+
8
−
0
View file @
f11cbec8
...
...
@@ -151,6 +151,7 @@ VideoPage::VideoPage()
VideoManager
::
instance
->
captureManager
()
->
startPreviewing
+=
ref
new
RingClientUWP
::
StartPreviewing
(
this
,
&
RingClientUWP
::
Views
::
VideoPage
::
OnstartPreviewing
);
VideoManager
::
instance
->
captureManager
()
->
stopPreviewing
+=
ref
new
RingClientUWP
::
StopPreviewing
(
this
,
&
RingClientUWP
::
Views
::
VideoPage
::
OnstopPreviewing
);
RingD
::
instance
->
audioMuted
+=
ref
new
RingClientUWP
::
AudioMuted
(
this
,
&
RingClientUWP
::
Views
::
VideoPage
::
OnaudioMuted
);
RingD
::
instance
->
videoMuted
+=
ref
new
RingClientUWP
::
VideoMuted
(
this
,
&
RingClientUWP
::
Views
::
VideoPage
::
OnvideoMuted
);
}
void
...
...
@@ -458,3 +459,10 @@ void RingClientUWP::Views::VideoPage::OnaudioMuted(const std::string &callId, bo
_txbkMicrophoneMuted_
->
Visibility
=
(
state
)
?
Windows
::
UI
::
Xaml
::
Visibility
::
Visible
:
Windows
::
UI
::
Xaml
::
Visibility
::
Collapsed
;
}
void
RingClientUWP
::
Views
::
VideoPage
::
OnvideoMuted
(
const
std
::
string
&
callId
,
bool
state
)
{
_txbkVideoMuted_
->
Visibility
=
(
state
)
?
Windows
::
UI
::
Xaml
::
Visibility
::
Visible
:
Windows
::
UI
::
Xaml
::
Visibility
::
Collapsed
;
}
This diff is collapsed.
Click to expand it.
VideoPage.xaml.h
+
1
−
0
View file @
f11cbec8
...
...
@@ -124,6 +124,7 @@ private:
void
OnstopPreviewing
();
void
_btnMicrophone__Click
(
Platform
::
Object
^
sender
,
Windows
::
UI
::
Xaml
::
RoutedEventArgs
^
e
);
void
OnaudioMuted
(
const
std
::
string
&
callId
,
bool
state
);
void
OnvideoMuted
(
const
std
::
string
&
callId
,
bool
state
);
};
}
}
\ No newline at end of file
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
sign in
to comment