From 90dc652d33d44d4644c0e393ce1eab0a16d31a52 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Sun, 24 Jan 2010 22:50:29 +0100 Subject: [PATCH] ActiveX: fix compilation And deactivate the set_teletext functions, since they have been removed from libvlc... --- projects/activex/plugin.cpp | 6 +++--- projects/activex/plugin.h | 6 +++--- projects/activex/vlccontrol.cpp | 6 +++--- projects/activex/vlccontrol2.cpp | 15 ++++++++++----- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/projects/activex/plugin.cpp b/projects/activex/plugin.cpp index 1f027ce471..718d2bd519 100644 --- a/projects/activex/plugin.cpp +++ b/projects/activex/plugin.cpp @@ -1023,7 +1023,7 @@ bool VLCPlugin::playlist_select( int idx, libvlc_exception_t *ex ) libvlc_media_list_lock(_p_mlist); - int count = libvlc_media_list_count(_p_mlist,ex); + int count = libvlc_media_list_count(_p_mlist); if( libvlc_exception_raised(ex) ) goto bad_unlock; @@ -1059,7 +1059,7 @@ bad_unlock: void VLCPlugin::set_player_window(libvlc_exception_t *ex) { // XXX FIXME no idea if this is correct or not - libvlc_media_player_set_hwnd(_p_mplayer,getInPlaceWindow(),ex); + libvlc_media_player_set_hwnd(_p_mplayer,getInPlaceWindow()); } int VLCPlugin::playlist_add_extended_untrusted(const char *mrl, int optc, const char **optv, libvlc_exception_t *ex) @@ -1075,7 +1075,7 @@ int VLCPlugin::playlist_add_extended_untrusted(const char *mrl, int optc, const libvlc_media_list_lock(_p_mlist); libvlc_media_list_add_media(_p_mlist,p_m,ex); if( !libvlc_exception_raised(ex) ) - item = libvlc_media_list_count(_p_mlist,ex)-1; + item = libvlc_media_list_count(_p_mlist)-1; libvlc_media_list_unlock(_p_mlist); libvlc_media_release(p_m); diff --git a/projects/activex/plugin.h b/projects/activex/plugin.h index 867f2d17da..ac04a92428 100644 --- a/projects/activex/plugin.h +++ b/projects/activex/plugin.h @@ -245,7 +245,7 @@ public: */ bool isPlaying(libvlc_exception_t *ex) { - return _p_mplayer && libvlc_media_player_is_playing(_p_mplayer,ex); + return _p_mplayer && libvlc_media_player_is_playing(_p_mplayer); } int playlist_get_current_index(libvlc_exception_t *) { return _i_midx; } int playlist_add_extended_untrusted(const char *, int, const char **, libvlc_exception_t *); @@ -268,7 +268,7 @@ public: if( !_p_mlist ) return 0; libvlc_media_list_lock(_p_mlist); - r = libvlc_media_list_count(_p_mlist,ex); + r = libvlc_media_list_count(_p_mlist); libvlc_media_list_unlock(_p_mlist); return r; } @@ -294,7 +294,7 @@ public: void playlist_stop(libvlc_exception_t *ex) { if( _p_mplayer ) - libvlc_media_player_stop(_p_mplayer,ex); + libvlc_media_player_stop(_p_mplayer); } void playlist_next(libvlc_exception_t *ex) { diff --git a/projects/activex/vlccontrol.cpp b/projects/activex/vlccontrol.cpp index 8e7f135cd4..a7634eb4a3 100644 --- a/projects/activex/vlccontrol.cpp +++ b/projects/activex/vlccontrol.cpp @@ -160,7 +160,7 @@ STDMETHODIMP VLCControl::stop(void) libvlc_exception_t ex; libvlc_exception_init(&ex); - libvlc_media_player_stop(p_md, &ex); + libvlc_media_player_stop(p_md); result = exception_bridge(&ex); if( SUCCEEDED(result) ) _p_instance->fireOnStopEvent(); @@ -177,7 +177,7 @@ STDMETHODIMP VLCControl::get_Playing(VARIANT_BOOL *isPlaying) HRESULT result = _p_instance->getMD(&p_md); if( SUCCEEDED(result) ) { - *isPlaying = libvlc_media_player_is_playing(p_md, NULL) ? + *isPlaying = libvlc_media_player_is_playing(p_md) ? VARIANT_TRUE : VARIANT_FALSE; } else *isPlaying = VARIANT_FALSE; return result; @@ -266,7 +266,7 @@ STDMETHODIMP VLCControl::fullscreen(void) HRESULT result = _p_instance->getMD(&p_md); if( SUCCEEDED(result) ) { - if( libvlc_media_player_is_playing(p_md, NULL) ) + if( libvlc_media_player_is_playing(p_md) ) { libvlc_toggle_fullscreen(p_md, NULL); } diff --git a/projects/activex/vlccontrol2.cpp b/projects/activex/vlccontrol2.cpp index ca3ab5f035..8a8aefde74 100644 --- a/projects/activex/vlccontrol2.cpp +++ b/projects/activex/vlccontrol2.cpp @@ -389,7 +389,7 @@ STDMETHODIMP VLCInput::get_state(long* state) libvlc_exception_t ex; libvlc_exception_init(&ex); - *state = libvlc_media_player_get_state(p_md, &ex); + *state = libvlc_media_player_get_state(p_md); if( libvlc_exception_raised(&ex) ) { // don't fail, just return the idle state @@ -973,7 +973,7 @@ STDMETHODIMP VLCPlaylist::get_isPlaying(VARIANT_BOOL* isPlaying) libvlc_exception_t ex; libvlc_exception_init(&ex); - *isPlaying = libvlc_media_player_is_playing(p_md, &ex) ? + *isPlaying = libvlc_media_player_is_playing(p_md) ? VARIANT_TRUE: VARIANT_FALSE; libvlc_exception_clear(&ex); } @@ -1100,7 +1100,7 @@ STDMETHODIMP VLCPlaylist::stop() libvlc_exception_t ex; libvlc_exception_init(&ex); - libvlc_media_player_stop(p_md, &ex); + libvlc_media_player_stop(p_md); hr = exception_bridge(&ex);; } return hr; @@ -1486,29 +1486,34 @@ STDMETHODIMP VLCVideo::get_teletext(long* page) libvlc_media_player_t *p_md; HRESULT hr = getMD(&p_md); +#if 0 if( SUCCEEDED(hr) ) { libvlc_exception_t ex; libvlc_exception_init(&ex); - *page = libvlc_video_get_teletext(p_md, &ex); + *page = libvlc_video_get_teletext(p_md); hr = exception_bridge(&ex); } +#endif return hr; }; STDMETHODIMP VLCVideo::put_teletext(long page) { +#warning Broken libvlc_media_player_t *p_md; HRESULT hr = getMD(&p_md); +#if 0 if( SUCCEEDED(hr) ) { libvlc_exception_t ex; libvlc_exception_init(&ex); - libvlc_video_set_teletext(p_md, page, &ex); + libvlc_video_set_teletext(p_md, page); hr = exception_bridge(&ex); } +#endif return hr; }; -- 2.39.2