Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
J
jami-client-windows
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
savoirfairelinux
jami-client-windows
Commits
53971615
Commit
53971615
authored
Jul 15, 2015
by
Edric Milaret
Committed by
Stepan Salenikovich
Jul 21, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
settings: fix video not showing on settings panel
Refs #77657 Change-Id: I4f9cf419f20f79e394ac9cde62ea4ee3fc665e25
parent
d9844072
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
14 deletions
+10
-14
videowidget.cpp
videowidget.cpp
+10
-14
No files found.
videowidget.cpp
View file @
53971615
...
...
@@ -42,13 +42,11 @@ VideoWidget::~VideoWidget()
void
VideoWidget
::
previewStarted
(
Video
::
Renderer
*
renderer
)
{
if
(
this
->
isVisible
())
{
previewRenderer_
=
renderer
;
connect
(
previewRenderer_
,
SIGNAL
(
frameUpdated
()),
this
,
SLOT
(
frameFromPreview
()));
connect
(
previewRenderer_
,
SIGNAL
(
stopped
()),
this
,
SLOT
(
previewStopped
()));
}
previewRenderer_
=
renderer
;
connect
(
previewRenderer_
,
SIGNAL
(
frameUpdated
()),
this
,
SLOT
(
frameFromPreview
()));
connect
(
previewRenderer_
,
SIGNAL
(
stopped
()),
this
,
SLOT
(
previewStopped
()));
}
void
...
...
@@ -75,7 +73,7 @@ VideoWidget::paintEvent(QPaintEvent *evt) {
if
(
renderer_
&&
currentDistantFrame_
)
{
const
QSize
imgSize
(
renderer_
->
size
());
QImage
distantFrame
(
currentDistantFrame_
.
get
()
->
data
(),
imgSize
.
width
(),
imgSize
.
height
(),
QImage
::
Format_ARGB32_Premultiplied
);
imgSize
.
width
(),
imgSize
.
height
(),
QImage
::
Format_ARGB32_Premultiplied
);
auto
scaledDistant
=
distantFrame
.
scaled
(
size
(),
Qt
::
KeepAspectRatio
);
auto
xDiff
=
(
width
()
-
scaledDistant
.
width
())
/
2
;
auto
yDiff
=
(
height
()
-
scaledDistant
.
height
())
/
2
;
...
...
@@ -102,12 +100,10 @@ VideoWidget::paintEvent(QPaintEvent *evt) {
void
VideoWidget
::
callInitiated
(
Call
*
call
,
Video
::
Renderer
*
renderer
)
{
Q_UNUSED
(
call
)
if
(
this
->
isVisible
())
{
renderer_
=
renderer
;
connect
(
renderer_
,
SIGNAL
(
frameUpdated
()),
this
,
SLOT
(
frameFromDistant
()));
connect
(
renderer_
,
SIGNAL
(
stopped
()),
this
,
SLOT
(
renderingStopped
()),
Qt
::
ConnectionType
::
DirectConnection
);
}
renderer_
=
renderer
;
connect
(
renderer_
,
SIGNAL
(
frameUpdated
()),
this
,
SLOT
(
frameFromDistant
()));
connect
(
renderer_
,
SIGNAL
(
stopped
()),
this
,
SLOT
(
renderingStopped
()),
Qt
::
ConnectionType
::
DirectConnection
);
}
void
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment