Commit 34616730 authored by Sergey Radionov's avatar Sergey Radionov Committed by Rafaël Carré

activex: Lotus Notes support

Signed-off-by: Rafaël Carré's avatarRafaël Carré <funman@videolan.org>
parent 0eb6bdad
...@@ -156,8 +156,8 @@ HRESULT VLCOleObject::doInPlaceActivate(LPMSG lpMsg, LPOLECLIENTSITE pActiveSite ...@@ -156,8 +156,8 @@ HRESULT VLCOleObject::doInPlaceActivate(LPMSG lpMsg, LPOLECLIENTSITE pActiveSite
// check if not already activated // check if not already activated
if( ! _p_instance->isInPlaceActive() ) if( ! _p_instance->isInPlaceActive() )
{ {
if( ((NULL == p_inPlaceSite) || (S_OK == p_inPlaceSite->CanInPlaceActivate())) if( p_inPlaceSite &&
&& SUCCEEDED(_p_instance->onActivateInPlace(lpMsg, hwndParent, lprcPosRect, lprcClipRect)) ) SUCCEEDED(_p_instance->onActivateInPlace(lpMsg, hwndParent, lprcPosRect, lprcClipRect)) )
{ {
if( p_inPlaceSiteEx ) if( p_inPlaceSiteEx )
{ {
......
...@@ -399,7 +399,6 @@ HRESULT VLCPlugin::onInit(void) ...@@ -399,7 +399,6 @@ HRESULT VLCPlugin::onInit(void)
// initialize persistable properties // initialize persistable properties
set_autoplay(true); set_autoplay(true);
_b_autoloop = FALSE; _b_autoloop = FALSE;
set_show_toolbar(false);
_bstr_baseurl = NULL; _bstr_baseurl = NULL;
_bstr_mrl = NULL; _bstr_mrl = NULL;
_b_visible = TRUE; _b_visible = TRUE;
...@@ -534,8 +533,6 @@ void VLCPlugin::initVLC() ...@@ -534,8 +533,6 @@ void VLCPlugin::initVLC()
if( !vlc_player::open(_p_libvlc) ) if( !vlc_player::open(_p_libvlc) )
return; return;
set_player_window();
// initial playlist item // initial playlist item
if( SysStringLen(_bstr_mrl) > 0 ) if( SysStringLen(_bstr_mrl) > 0 )
{ {
...@@ -580,6 +577,18 @@ void VLCPlugin::initVLC() ...@@ -580,6 +577,18 @@ void VLCPlugin::initVLC()
CoTaskMemFree(psz_mrl); CoTaskMemFree(psz_mrl);
} }
} }
if( !isInPlaceActive() )
{
LPOLECLIENTSITE pClientSite;
if( SUCCEEDED(vlcOleObject->GetClientSite(&pClientSite)) && (NULL != pClientSite) )
{
vlcOleObject->DoVerb(OLEIVERB_INPLACEACTIVATE, NULL, pClientSite, 0, NULL, NULL);
pClientSite->Release();
}
}
set_player_window();
}; };
void VLCPlugin::setErrorInfo(REFIID riid, const char *description) void VLCPlugin::setErrorInfo(REFIID riid, const char *description)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment