Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
f5292e55
Commit
f5292e55
authored
Sep 28, 2008
by
Christophe Mutricy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Compile fix
parent
c205ecf9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
modules/gui/skins2/src/skin_main.cpp
modules/gui/skins2/src/skin_main.cpp
+1
-1
modules/gui/skins2/src/vlcproc.cpp
modules/gui/skins2/src/vlcproc.cpp
+4
-3
modules/gui/skins2/vars/playtree.cpp
modules/gui/skins2/vars/playtree.cpp
+2
-2
No files found.
modules/gui/skins2/src/skin_main.cpp
View file @
f5292e55
...
...
@@ -322,7 +322,7 @@ static int DemuxOpen( vlc_object_t *p_this )
playlist_t
*
p_playlist
=
pl_Hold
(
p_this
);
// Make sure the item is deleted afterwards
/// \bug does not always work
p
_playlist
->
status
.
p_item
->
i_flags
|=
PLAYLIST_REMOVE_FLAG
;
p
laylist_CurrentPlayingItem
(
p_playlist
)
->
i_flags
|=
PLAYLIST_REMOVE_FLAG
;
vlc_object_release
(
p_playlist
);
vlc_value_t
val
;
...
...
modules/gui/skins2/src/vlcproc.cpp
View file @
f5292e55
...
...
@@ -328,7 +328,8 @@ void VlcProc::refreshInput()
// Update the input
if
(
getIntf
()
->
p_sys
->
p_input
==
NULL
)
{
getIntf
()
->
p_sys
->
p_input
=
getIntf
()
->
p_sys
->
p_playlist
->
p_input
;
getIntf
()
->
p_sys
->
p_input
=
playlist_CurrentInput
(
getIntf
()
->
p_sys
->
p_playlist
);
if
(
getIntf
()
->
p_sys
->
p_input
)
vlc_object_hold
(
getIntf
()
->
p_sys
->
p_input
);
}
...
...
@@ -560,10 +561,10 @@ int VlcProc::onInteraction( vlc_object_t *pObj, const char *pVariable,
void
VlcProc
::
updateStreamName
(
playlist_t
*
p_playlist
)
{
if
(
p_playlist
&&
p
_playlist
->
p_input
)
if
(
p_playlist
&&
p
laylist_CurrentInput
(
p_playlist
)
)
{
// Get playlist item information
input_item_t
*
pItem
=
input_GetItem
(
p
_playlist
->
p_input
);
input_item_t
*
pItem
=
input_GetItem
(
p
laylist_CurrentInput
(
p_playlist
)
);
VarText
&
rStreamName
=
getStreamNameVar
();
VarText
&
rStreamURI
=
getStreamURIVar
();
...
...
modules/gui/skins2/vars/playtree.cpp
View file @
f5292e55
...
...
@@ -136,7 +136,7 @@ void Playtree::onUpdateItem( int id )
playlist_item_t
*
pNode
=
(
playlist_item_t
*
)(
it
->
m_pData
);
UString
*
pName
=
new
UString
(
getIntf
(),
pNode
->
p_input
->
psz_name
);
it
->
m_cString
=
UStringPtr
(
pName
);
it
->
m_playing
=
m_pPlaylist
->
status
.
p_item
==
pNode
;
it
->
m_playing
=
playlist_CurrentPlayingItem
(
m_pPlaylist
)
==
pNode
;
if
(
it
->
m_playing
)
descr
.
b_active_item
=
true
;
}
else
...
...
@@ -200,7 +200,7 @@ void Playtree::buildNode( playlist_item_t *pNode, VarTree &rTree )
pNode
->
pp_children
[
i
]
->
p_input
->
psz_name
);
rTree
.
add
(
pNode
->
pp_children
[
i
]
->
i_id
,
UStringPtr
(
pName
),
false
,
m_pPlaylist
->
status
.
p_item
==
pNode
->
pp_children
[
i
],
playlist_CurrentPlayingItem
(
m_pPlaylist
)
==
pNode
->
pp_children
[
i
],
false
,
pNode
->
pp_children
[
i
]
->
i_flags
&
PLAYLIST_RO_FLAG
,
pNode
->
pp_children
[
i
]
);
if
(
pNode
->
pp_children
[
i
]
->
i_children
)
...
...
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