vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun May 14 17:22:17 2017 +0300| [e8ade5d662efdb06ad97ed9e1b9741c0c9c40141] | committer: Rémi Denis-Courmont
macosx: use playlist_ViewPlay(), fix aliasing (The node parameter must be a playlist_item_t *, cannot be a void *.) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e8ade5d662efdb06ad97ed9e1b9741c0c9c40141 --- modules/gui/macosx/VLCConvertAndSaveWindowController.m | 3 +-- modules/gui/macosx/VLCPlaylist.m | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/gui/macosx/VLCConvertAndSaveWindowController.m b/modules/gui/macosx/VLCConvertAndSaveWindowController.m index f203a5e78a..55000072b7 100644 --- a/modules/gui/macosx/VLCConvertAndSaveWindowController.m +++ b/modules/gui/macosx/VLCConvertAndSaveWindowController.m @@ -293,8 +293,7 @@ /* let's "play" */ PL_LOCK; playlist_item_t *p_item = playlist_ItemGetByInput(p_playlist, p_input); - playlist_Control(p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, NULL, - p_item); + playlist_ViewPlay(p_playlist, NULL, p_item); PL_UNLOCK; } else diff --git a/modules/gui/macosx/VLCPlaylist.m b/modules/gui/macosx/VLCPlaylist.m index 70170fdfee..d6e89b9ceb 100644 --- a/modules/gui/macosx/VLCPlaylist.m +++ b/modules/gui/macosx/VLCPlaylist.m @@ -304,7 +304,7 @@ playlist_item_t *p_node = playlist_ItemGetById(p_playlist, [[[self model] rootItem] plItemId]); if (p_item && p_node) { - playlist_Control(p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, p_node, p_item); + playlist_ViewPlay(p_playlist, p_node, p_item); } PL_UNLOCK; } @@ -645,7 +645,7 @@ continue; if (i == 0 && b_start) { - playlist_Control(p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, p_parent, p_item); + playlist_ViewPlay(p_playlist, p_parent, p_item); } input_item_Release(p_input); } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
