Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
77595c2b
Commit
77595c2b
authored
Nov 02, 2005
by
Gildas Bazin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/gui/wxwidgets/playlist.cpp: don't forget to unlock the playlist.
parent
b0350b5b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
15 deletions
+19
-15
modules/gui/wxwidgets/playlist.cpp
modules/gui/wxwidgets/playlist.cpp
+19
-15
No files found.
modules/gui/wxwidgets/playlist.cpp
View file @
77595c2b
...
@@ -483,15 +483,23 @@ void Playlist::UpdateTreeItem( wxTreeItemId item )
...
@@ -483,15 +483,23 @@ void Playlist::UpdateTreeItem( wxTreeItemId item )
LockPlaylist
(
p_intf
->
p_sys
,
p_playlist
);
LockPlaylist
(
p_intf
->
p_sys
,
p_playlist
);
playlist_item_t
*
p_item
=
playlist_ItemGetById
(
p_playlist
,
playlist_item_t
*
p_item
=
playlist_ItemGetById
(
p_playlist
,
((
PlaylistItem
*
)
p_data
)
->
i_id
);
((
PlaylistItem
*
)
p_data
)
->
i_id
);
if
(
!
p_item
)
return
;
if
(
!
p_item
)
{
UnlockPlaylist
(
p_intf
->
p_sys
,
p_playlist
);
return
;
}
wxString
msg
;
wxString
msg
;
wxString
duration
=
wxU
(
""
);
wxString
duration
=
wxU
(
""
);
char
*
psz_author
=
vlc_input_item_GetInfo
(
&
p_item
->
input
,
char
*
psz_author
=
vlc_input_item_GetInfo
(
&
p_item
->
input
,
_
(
"Meta-information"
),
_
(
"Meta-information"
),
_
(
"Artist"
));
_
(
"Artist"
));
if
(
psz_author
==
NULL
)
if
(
!
psz_author
)
{
UnlockPlaylist
(
p_intf
->
p_sys
,
p_playlist
);
return
;
return
;
}
char
psz_duration
[
MSTRTIME_MAX_SIZE
];
char
psz_duration
[
MSTRTIME_MAX_SIZE
];
mtime_t
dur
=
p_item
->
input
.
i_duration
;
mtime_t
dur
=
p_item
->
input
.
i_duration
;
...
@@ -851,21 +859,13 @@ void Playlist::DeleteTreeItem( wxTreeItemId item )
...
@@ -851,21 +859,13 @@ void Playlist::DeleteTreeItem( wxTreeItemId item )
return
;
return
;
}
}
if
(
p_item
->
i_children
==
-
1
)
if
(
p_item
->
i_children
==
-
1
)
DeleteItem
(
p_item
->
input
.
i_id
);
{
else
DeleteNode
(
p_item
);
UnlockPlaylist
(
p_intf
->
p_sys
,
p_playlist
);
DeleteItem
(
p_item
->
input
.
i_id
);
}
else
{
UnlockPlaylist
(
p_intf
->
p_sys
,
p_playlist
);
DeleteNode
(
p_item
);
}
RemoveItem
(
item
);
RemoveItem
(
item
);
UnlockPlaylist
(
p_intf
->
p_sys
,
p_playlist
);
}
}
void
Playlist
::
DeleteItem
(
int
item_id
)
void
Playlist
::
DeleteItem
(
int
item_id
)
{
{
playlist_LockDelete
(
p_playlist
,
item_id
);
playlist_LockDelete
(
p_playlist
,
item_id
);
...
@@ -1078,7 +1078,11 @@ void Playlist::OnActivateItem( wxTreeEvent& event )
...
@@ -1078,7 +1078,11 @@ void Playlist::OnActivateItem( wxTreeEvent& event )
LockPlaylist
(
p_intf
->
p_sys
,
p_playlist
);
LockPlaylist
(
p_intf
->
p_sys
,
p_playlist
);
if
(
!
(
p_wxitem
&&
p_wxparent
)
)
return
;
if
(
!
(
p_wxitem
&&
p_wxparent
)
)
{
UnlockPlaylist
(
p_intf
->
p_sys
,
p_playlist
);
return
;
}
p_item2
=
playlist_ItemGetById
(
p_playlist
,
p_wxitem
->
i_id
);
p_item2
=
playlist_ItemGetById
(
p_playlist
,
p_wxitem
->
i_id
);
p_node2
=
playlist_ItemGetById
(
p_playlist
,
p_wxparent
->
i_id
);
p_node2
=
playlist_ItemGetById
(
p_playlist
,
p_wxparent
->
i_id
);
...
...
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