[vlc-commits] ActiveX: switch VLCPlaylistItems to vlc_player

[Sergey Radionov]

npapi-vlc | branch: master | Sergey Radionov <RSATom at gmail.com> | Sun Mar 18 22:13:26 2012 +0700| [42043064c53d16a433b278c150c1d5d17ce30b55] | committer: Jean-Baptiste Kempf

ActiveX: switch VLCPlaylistItems to vlc_player

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=42043064c53d16a433b278c150c1d5d17ce30b55
---

 activex/vlccontrol2.cpp |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/activex/vlccontrol2.cpp b/activex/vlccontrol2.cpp
index 026664c..701dfed 100644
--- a/activex/vlccontrol2.cpp
+++ b/activex/vlccontrol2.cpp
@@ -510,25 +510,20 @@ STDMETHODIMP VLCPlaylistItems::get_count(long* count)
     if( NULL == count )
         return E_POINTER;
 
-    *count = Instance()->playlist_count();
+    *count = Instance()->get_player().items_count();
     return S_OK;
 };
 
 STDMETHODIMP VLCPlaylistItems::clear()
 {
-    Instance()->playlist_clear();
+    Instance()->get_player().clear_items();
     return S_OK;
 };
 
 STDMETHODIMP VLCPlaylistItems::remove(long item)
 {
-    libvlc_instance_t* p_libvlc;
-    HRESULT hr = getVLC(&p_libvlc);
-    if( SUCCEEDED(hr) )
-    {
-        Instance()->playlist_delete_item(item);
-    }
-    return hr;
+    Instance()->get_player().delete_item(item);
+    return S_OK;
 };
 
 /****************************************************************************/