npapi-vlc | branch: master | Sergey Radionov <rsa...@gmail.com> | Sun Mar 18 22:03:13 2012 +0700| [60ac24267deec3fad9688fbb0d431c3f3bb4cf44] | committer: Jean-Baptiste Kempf
ActiveX: switch VLCPlaylist to vlc_player Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=60ac24267deec3fad9688fbb0d431c3f3bb4cf44 --- activex/vlccontrol2.cpp | 51 +++++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 35 deletions(-) diff --git a/activex/vlccontrol2.cpp b/activex/vlccontrol2.cpp index 28cb940..026664c 100644 --- a/activex/vlccontrol2.cpp +++ b/activex/vlccontrol2.cpp @@ -538,8 +538,8 @@ STDMETHODIMP VLCPlaylist::get_itemCount(long* count) if( NULL == count ) return E_POINTER; - *count = 0; - *count = Instance()->playlist_count(); + *count = Instance()->get_player().items_count(); + return S_OK; }; @@ -548,13 +548,9 @@ STDMETHODIMP VLCPlaylist::get_isPlaying(VARIANT_BOOL* isPlaying) if( NULL == isPlaying ) return E_POINTER; - libvlc_media_player_t *p_md; - HRESULT hr = getMD(&p_md); - if( SUCCEEDED(hr) ) - { - *isPlaying = varbool( libvlc_media_player_is_playing(p_md) ); - } - return hr; + *isPlaying = varbool( Instance()->get_player().is_playing()!=0 ); + + return S_OK; }; STDMETHODIMP VLCPlaylist::add(BSTR uri, VARIANT name, VARIANT options, long* item) @@ -633,65 +629,50 @@ STDMETHODIMP VLCPlaylist::add(BSTR uri, VARIANT name, VARIANT options, long* ite STDMETHODIMP VLCPlaylist::play() { - Instance()->playlist_play(); + Instance()->get_player().play(); return S_OK; }; STDMETHODIMP VLCPlaylist::playItem(long item) { - Instance()->playlist_play_item(item); + Instance()->get_player().play(item); return S_OK; }; STDMETHODIMP VLCPlaylist::togglePause() { - libvlc_media_player_t* p_md; - HRESULT hr = getMD(&p_md); - if( SUCCEEDED(hr) ) - { - libvlc_media_player_pause(p_md); - } - return hr; + Instance()->get_player().pause(); + return S_OK; }; STDMETHODIMP VLCPlaylist::stop() { - libvlc_media_player_t *p_md; - HRESULT hr = getMD(&p_md); - if( SUCCEEDED(hr) ) - { - libvlc_media_player_stop(p_md); - } - return hr; + Instance()->get_player().stop(); + return S_OK; }; STDMETHODIMP VLCPlaylist::next() { - Instance()->playlist_next(); + Instance()->get_player().next(); return S_OK; }; STDMETHODIMP VLCPlaylist::prev() { - Instance()->playlist_prev(); + Instance()->get_player().prev(); return S_OK; }; STDMETHODIMP VLCPlaylist::clear() { - Instance()->playlist_clear(); + Instance()->get_player().clear_items(); return S_OK; }; STDMETHODIMP VLCPlaylist::removeItem(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; }; STDMETHODIMP VLCPlaylist::get_items(IVLCPlaylistItems** obj) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits