Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
9fa2642c
Commit
9fa2642c
authored
Nov 19, 2006
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes wxwidgets compilation
parent
d732fd2f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
modules/gui/wxwidgets/dialogs/playlist.cpp
modules/gui/wxwidgets/dialogs/playlist.cpp
+1
-1
modules/gui/wxwidgets/dialogs/wizard.cpp
modules/gui/wxwidgets/dialogs/wizard.cpp
+1
-2
modules/gui/wxwidgets/playlist_manager.cpp
modules/gui/wxwidgets/playlist_manager.cpp
+5
-4
No files found.
modules/gui/wxwidgets/dialogs/playlist.cpp
View file @
9fa2642c
...
...
@@ -907,7 +907,7 @@ void Playlist::DeleteTreeItem( wxTreeItemId item )
void
Playlist
::
DeleteItem
(
int
item_id
)
{
playlist_Delete
AllFromInput
(
p_playlist
,
item_id
);
playlist_Delete
FromInput
(
p_playlist
,
item_id
,
VLC_TRUE
);
}
void
Playlist
::
DeleteNode
(
playlist_item_t
*
p_item
)
...
...
modules/gui/wxwidgets/dialogs/wizard.cpp
View file @
9fa2642c
...
...
@@ -721,8 +721,7 @@ void wizInputPage::OnWizardPageChanging(wxWizardEvent& event)
VLC_OBJECT_PLAYLIST
,
FIND_ANYWHERE
);
if
(
p_playlist
)
{
playlist_item_t
*
p_item
=
playlist_LockItemGetById
(
p_playlist
,
(
int
)
data
);
playlist_item_t
*
p_item
=
playlist_ItemGetById
(
p_playlist
,
(
int
)
data
,
VLC_TRUE
);
if
(
p_item
)
{
p_parent
->
SetMrl
(
(
const
char
*
)
p_item
->
p_input
->
psz_uri
);
...
...
modules/gui/wxwidgets/playlist_manager.cpp
View file @
9fa2642c
...
...
@@ -281,7 +281,8 @@ void PlaylistManager::UpdateTreeItem( wxTreeItemId item )
LockPlaylist
(
p_intf
->
p_sys
,
p_playlist
);
playlist_item_t
*
p_item
=
playlist_ItemGetById
(
p_playlist
,
((
PlaylistItem
*
)
p_data
)
->
i_id
);
playlist_ItemGetById
(
p_playlist
,
((
PlaylistItem
*
)
p_data
)
->
i_id
,
VLC_TRUE
);
if
(
!
p_item
)
{
UnlockPlaylist
(
p_intf
->
p_sys
,
p_playlist
);
...
...
@@ -354,7 +355,7 @@ void PlaylistManager::AppendItem( wxCommandEvent& event )
node
=
FindItem
(
treectrl
->
GetRootItem
(),
p_add
->
i_node
);
if
(
!
node
.
IsOk
()
)
goto
update
;
p_item
=
playlist_ItemGetById
(
p_playlist
,
p_add
->
i_item
);
p_item
=
playlist_ItemGetById
(
p_playlist
,
p_add
->
i_item
,
VLC_TRUE
);
if
(
!
p_item
)
goto
update
;
item
=
FindItem
(
treectrl
->
GetRootItem
(),
p_add
->
i_item
);
...
...
@@ -495,8 +496,8 @@ void PlaylistManager::OnActivateItem( wxTreeEvent& event )
if
(
!
p_wxparent
)
return
;
LockPlaylist
(
p_intf
->
p_sys
,
p_playlist
);
p_item
=
playlist_ItemGetById
(
p_playlist
,
p_wxitem
->
i_id
);
p_node
=
playlist_ItemGetById
(
p_playlist
,
p_wxparent
->
i_id
);
p_item
=
playlist_ItemGetById
(
p_playlist
,
p_wxitem
->
i_id
,
VLC_TRUE
);
p_node
=
playlist_ItemGetById
(
p_playlist
,
p_wxparent
->
i_id
,
VLC_TRUE
);
if
(
!
p_item
||
p_item
->
i_children
>=
0
)
{
p_node
=
p_item
;
...
...
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