Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Merge Requests
0
Merge Requests
0
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Jean-Baptiste Kempf
vlc
Commits
8192c527
Commit
8192c527
authored
Mar 08, 2019
by
Thomas Guillem
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qt: use vlc_player_GetV4l2Object
parent
39d5cebe
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
3 deletions
+8
-3
modules/gui/qt/components/extended_panels.cpp
modules/gui/qt/components/extended_panels.cpp
+8
-3
No files found.
modules/gui/qt/components/extended_panels.cpp
View file @
8192c527
...
@@ -635,7 +635,8 @@ void ExtV4l2::showEvent( QShowEvent *event )
...
@@ -635,7 +635,8 @@ void ExtV4l2::showEvent( QShowEvent *event )
void
ExtV4l2
::
Refresh
(
void
)
void
ExtV4l2
::
Refresh
(
void
)
{
{
vlc_object_t
*
p_obj
=
(
vlc_object_t
*
)
p_intf
->
p_sys
->
p_player
;
vlc_player_Lock
(
p_intf
->
p_sys
->
p_player
);
vlc_object_t
*
p_obj
=
vlc_player_GetV4l2Object
(
p_intf
->
p_sys
->
p_player
);
help
->
hide
();
help
->
hide
();
if
(
box
)
if
(
box
)
{
{
...
@@ -644,7 +645,7 @@ void ExtV4l2::Refresh( void )
...
@@ -644,7 +645,7 @@ void ExtV4l2::Refresh( void )
box
=
NULL
;
box
=
NULL
;
}
}
if
(
p_obj
!=
NULL
&&
var_Type
(
p_obj
,
"controls"
)
)
if
(
p_obj
!=
NULL
)
{
{
vlc_value_t
*
val
;
vlc_value_t
*
val
;
char
**
text
;
char
**
text
;
...
@@ -785,6 +786,7 @@ void ExtV4l2::Refresh( void )
...
@@ -785,6 +786,7 @@ void ExtV4l2::Refresh( void )
if
(
isVisible
()
)
if
(
isVisible
()
)
QTimer
::
singleShot
(
2000
,
this
,
SLOT
(
Refresh
())
);
QTimer
::
singleShot
(
2000
,
this
,
SLOT
(
Refresh
())
);
}
}
vlc_player_Unlock
(
p_intf
->
p_sys
->
p_player
);
}
}
void
ExtV4l2
::
ValueChange
(
bool
value
)
void
ExtV4l2
::
ValueChange
(
bool
value
)
...
@@ -795,7 +797,8 @@ void ExtV4l2::ValueChange( bool value )
...
@@ -795,7 +797,8 @@ void ExtV4l2::ValueChange( bool value )
void
ExtV4l2
::
ValueChange
(
int
value
)
void
ExtV4l2
::
ValueChange
(
int
value
)
{
{
QObject
*
s
=
sender
();
QObject
*
s
=
sender
();
vlc_object_t
*
p_obj
=
(
vlc_object_t
*
)
p_intf
->
p_sys
->
p_player
;
vlc_player_Lock
(
p_intf
->
p_sys
->
p_player
);
vlc_object_t
*
p_obj
=
vlc_player_GetV4l2Object
(
p_intf
->
p_sys
->
p_player
);
if
(
p_obj
)
if
(
p_obj
)
{
{
QString
var
=
s
->
objectName
();
QString
var
=
s
->
objectName
();
...
@@ -817,9 +820,11 @@ void ExtV4l2::ValueChange( int value )
...
@@ -817,9 +820,11 @@ void ExtV4l2::ValueChange( int value )
var_TriggerCallback
(
p_obj
,
qtu
(
var
)
);
var_TriggerCallback
(
p_obj
,
qtu
(
var
)
);
break
;
break
;
}
}
vlc_player_Unlock
(
p_intf
->
p_sys
->
p_player
);
}
}
else
else
{
{
vlc_player_Unlock
(
p_intf
->
p_sys
->
p_player
);
msg_Warn
(
p_intf
,
"Oops, v4l2 object isn't available anymore"
);
msg_Warn
(
p_intf
,
"Oops, v4l2 object isn't available anymore"
);
Refresh
();
Refresh
();
}
}
...
...
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