Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
1b20e18a
Commit
1b20e18a
authored
Feb 14, 2010
by
Erwan Tulou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
skins2(playlist): fix current playing item still on when stopping an input
parent
32e68688
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
15 deletions
+26
-15
modules/gui/skins2/src/vlcproc.cpp
modules/gui/skins2/src/vlcproc.cpp
+3
-1
modules/gui/skins2/vars/playtree.cpp
modules/gui/skins2/vars/playtree.cpp
+22
-13
modules/gui/skins2/vars/playtree.hpp
modules/gui/skins2/vars/playtree.hpp
+1
-1
No files found.
modules/gui/skins2/src/vlcproc.cpp
View file @
1b20e18a
...
@@ -450,7 +450,7 @@ void VlcProc::on_item_current_changed( vlc_object_t* p_obj, vlc_value_t newVal )
...
@@ -450,7 +450,7 @@ void VlcProc::on_item_current_changed( vlc_object_t* p_obj, vlc_value_t newVal )
free
(
psz_uri
);
free
(
psz_uri
);
// Update playtree
// Update playtree
getPlaytreeVar
().
onUpdateCurrent
();
getPlaytreeVar
().
onUpdateCurrent
(
true
);
}
}
void
VlcProc
::
on_intf_event_changed
(
vlc_object_t
*
p_obj
,
vlc_value_t
newVal
)
void
VlcProc
::
on_intf_event_changed
(
vlc_object_t
*
p_obj
,
vlc_value_t
newVal
)
...
@@ -727,6 +727,8 @@ void VlcProc::reset_input()
...
@@ -727,6 +727,8 @@ void VlcProc::reset_input()
SET_TEXT
(
m_cVarStreamURI
,
UString
(
getIntf
(),
""
)
);
SET_TEXT
(
m_cVarStreamURI
,
UString
(
getIntf
(),
""
)
);
SET_TEXT
(
m_cVarStreamBitRate
,
UString
(
getIntf
(),
""
)
);
SET_TEXT
(
m_cVarStreamBitRate
,
UString
(
getIntf
(),
""
)
);
SET_TEXT
(
m_cVarStreamSampleRate
,
UString
(
getIntf
(),
""
)
);
SET_TEXT
(
m_cVarStreamSampleRate
,
UString
(
getIntf
(),
""
)
);
getPlaytreeVar
().
onUpdateCurrent
(
false
);
}
}
void
VlcProc
::
init_variables
()
void
VlcProc
::
init_variables
()
...
...
modules/gui/skins2/vars/playtree.cpp
View file @
1b20e18a
...
@@ -144,8 +144,18 @@ void Playtree::onUpdateItem( int id )
...
@@ -144,8 +144,18 @@ void Playtree::onUpdateItem( int id )
}
}
void
Playtree
::
onUpdateCurrent
()
void
Playtree
::
onUpdateCurrent
(
bool
b_active
)
{
{
if
(
!
b_active
)
{
if
(
m_playingIt
==
end
()
)
return
;
m_playingIt
->
m_playing
=
false
;
m_playingIt
=
end
();
}
else
{
playlist_Lock
(
m_pPlaylist
);
playlist_Lock
(
m_pPlaylist
);
playlist_item_t
*
current
=
playlist_CurrentPlayingItem
(
m_pPlaylist
);
playlist_item_t
*
current
=
playlist_CurrentPlayingItem
(
m_pPlaylist
);
...
@@ -157,11 +167,10 @@ void Playtree::onUpdateCurrent()
...
@@ -157,11 +167,10 @@ void Playtree::onUpdateCurrent()
Iterator
it
=
findById
(
current
->
i_id
);
Iterator
it
=
findById
(
current
->
i_id
);
it
->
m_playing
=
true
;
it
->
m_playing
=
true
;
if
(
m_playingIt
!=
end
()
)
m_playingIt
->
m_playing
=
false
;
m_playingIt
=
it
;
m_playingIt
=
it
;
playlist_Unlock
(
m_pPlaylist
);
playlist_Unlock
(
m_pPlaylist
);
}
tree_update
descr
;
tree_update
descr
;
descr
.
b_active_item
=
true
;
descr
.
b_active_item
=
true
;
...
...
modules/gui/skins2/vars/playtree.hpp
View file @
1b20e18a
...
@@ -47,7 +47,7 @@ public:
...
@@ -47,7 +47,7 @@ public:
void
onUpdateItem
(
int
id
);
void
onUpdateItem
(
int
id
);
/// Function called to notify about current playing item
/// Function called to notify about current playing item
void
onUpdateCurrent
(
);
void
onUpdateCurrent
(
bool
b_active
);
/// Function called to notify playlist item append
/// Function called to notify playlist item append
void
onAppend
(
playlist_add_t
*
);
void
onAppend
(
playlist_add_t
*
);
...
...
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