Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
fa289ee1
Commit
fa289ee1
authored
Aug 08, 2016
by
Steve Lhomme
Committed by
Thomas Guillem
Sep 20, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qt: set the demux-filter to use with a sout renderer
Signed-off-by:
Thomas Guillem
<
thomas@gllm.fr
>
parent
d69ead5d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
8 deletions
+15
-8
modules/gui/qt/actions_manager.cpp
modules/gui/qt/actions_manager.cpp
+15
-8
No files found.
modules/gui/qt/actions_manager.cpp
View file @
fa289ee1
...
...
@@ -235,13 +235,14 @@ bool ActionsManager::isItemSout( QVariant & m_obj, const char *psz_sout, bool as
{
if
(
psz_sout
==
NULL
)
return
false
;
if
(
!
m_obj
.
canConvert
<
Q
String
>
())
if
(
!
m_obj
.
canConvert
<
Q
VariantHash
>
())
return
false
;
QVariantHash
hash
=
m_obj
.
value
<
QVariantHash
>
();
QString
renderer
(
psz_sout
);
if
(
as_output
&&
renderer
.
at
(
0
)
==
'#'
)
renderer
=
renderer
.
right
(
renderer
.
length
()
-
1
);
return
QString
::
compare
(
m_obj
.
toString
(),
renderer
,
Qt
::
CaseInsensitive
)
==
0
;
return
QString
::
compare
(
hash
[
"sout"
]
.
toString
(),
renderer
,
Qt
::
CaseInsensitive
)
==
0
;
}
void
ActionsManager
::
renderer_event_received
(
const
vlc_event_t
*
p_event
,
void
*
user_data
)
...
...
@@ -265,7 +266,10 @@ void ActionsManager::renderer_event_received( const vlc_event_t * p_event, void
return
;
/* we already have this item */
}
QVariant
data
(
vlc_renderer_item_sout
(
p_item
));
QHash
<
QString
,
QVariant
>
itemData
;
itemData
.
insert
(
"sout"
,
vlc_renderer_item_sout
(
p_item
));
itemData
.
insert
(
"filter"
,
vlc_renderer_item_demux_filter
(
p_item
));
QVariant
data
(
itemData
);
QAction
*
action
=
new
QAction
(
vlc_renderer_item_flags
(
p_item
)
&
VLC_RENDERER_CAN_VIDEO
?
QIcon
(
":/sidebar/movie"
)
:
QIcon
(
":/sidebar/music"
),
vlc_renderer_item_name
(
p_item
),
VLCMenuBar
::
rendererMenu
);
...
...
@@ -300,7 +304,7 @@ void ActionsManager::ScanRendererAction(bool checked)
foreach
(
QAction
*
action
,
VLCMenuBar
::
rendererMenu
->
actions
())
{
QVariant
data
=
action
->
data
();
if
(
!
data
.
canConvert
<
Q
String
>
())
if
(
!
data
.
canConvert
<
Q
VariantHash
>
())
continue
;
VLCMenuBar
::
rendererMenu
->
removeAction
(
action
);
VLCMenuBar
::
rendererGroup
->
removeAction
(
action
);
...
...
@@ -310,7 +314,7 @@ void ActionsManager::ScanRendererAction(bool checked)
{
foreach
(
QAction
*
action
,
VLCMenuBar
::
rendererMenu
->
actions
())
{
if
(
!
action
->
data
().
canConvert
<
Q
String
>
())
if
(
!
action
->
data
().
canConvert
<
Q
VariantHash
>
())
continue
;
if
(
!
action
->
isSeparator
())
action
->
setChecked
(
true
);
...
...
@@ -371,14 +375,17 @@ void ActionsManager::ScanRendererAction(bool checked)
void
ActionsManager
::
RendererSelected
(
QAction
*
selected
)
{
QString
s_sout
;
QString
s_sout
,
s_demux_filter
;
QVariant
data
=
selected
->
data
();
if
(
data
.
canConvert
<
Q
String
>
())
if
(
data
.
canConvert
<
Q
VariantHash
>
())
{
QVariantHash
hash
=
data
.
value
<
QVariantHash
>
();
s_sout
.
append
(
'#'
);
s_sout
.
append
(
data
.
toString
());
s_sout
.
append
(
hash
[
"sout"
].
toString
());
s_demux_filter
.
append
(
hash
[
"filter"
].
toString
());
}
msg_Dbg
(
p_intf
,
"using sout: '%s'"
,
s_sout
.
toUtf8
().
constData
()
);
var_SetString
(
THEPL
,
"sout"
,
s_sout
.
toUtf8
().
constData
()
);
var_SetString
(
THEPL
,
"demux-filter"
,
s_demux_filter
.
toUtf8
().
constData
()
);
}
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