*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "plugin.h"
#include <string.h>
#include <winreg.h>
+#include <winuser.h>
+#include <servprov.h>
+#include <shlwapi.h>
+#include <wininet.h>
using namespace std;
VLCPluginClass::VLCPluginClass(LONG *p_class_ref, HINSTANCE hInstance) :
_p_class_ref(p_class_ref),
- _hinstance(hInstance)
+ _hinstance(hInstance),
+ _inplace_picture(NULL)
{
WNDCLASS wClass;
if( ! GetClassInfo(hInstance, getInPlaceWndClassName(), &wClass) )
{
- wClass.style = CS_NOCLOSE|CS_HREDRAW|CS_VREDRAW|CS_DBLCLKS;
+ wClass.style = CS_NOCLOSE|CS_DBLCLKS;
wClass.lpfnWndProc = VLCInPlaceClassWndProc;
wClass.cbClsExtra = 0;
wClass.cbWndExtra = 0;
if( ! GetClassInfo(hInstance, getVideoWndClassName(), &wClass) )
{
- wClass.style = CS_NOCLOSE|CS_HREDRAW|CS_VREDRAW;
+ wClass.style = CS_NOCLOSE;
wClass.lpfnWndProc = VLCVideoClassWndProc;
wClass.cbClsExtra = 0;
wClass.cbWndExtra = 0;
VLCPlugin::VLCPlugin(VLCPluginClass *p_class, LPUNKNOWN pUnkOuter) :
_inplacewnd(NULL),
+ _videownd(NULL),
_p_class(p_class),
_i_ref(1UL),
- _codepage(CP_ACP),
- _psz_src(NULL),
- _b_autostart(TRUE),
- _b_loopmode(FALSE),
- _b_visible(TRUE),
- _b_mute(FALSE),
+ _i_codepage(CP_ACP),
+ _b_usermode(TRUE),
_i_vlc(0)
{
p_class->AddRef();
- vlcOleObject = new VLCOleObject(this);
vlcOleControl = new VLCOleControl(this);
vlcOleInPlaceObject = new VLCOleInPlaceObject(this);
vlcOleInPlaceActiveObject = new VLCOleInPlaceActiveObject(this);
vlcControl = new VLCControl(this);
vlcViewObject = new VLCViewObject(this);
vlcDataObject = new VLCDataObject(this);
+ vlcOleObject = new VLCOleObject(this);
// configure controlling IUnknown interface for implemented interfaces
this->pUnkOuter = (NULL != pUnkOuter) ? pUnkOuter : dynamic_cast<LPUNKNOWN>(this);
// default picure
- _pict = p_class->getInPlacePict();
+ _p_pict = p_class->getInPlacePict();
- // set default/preferred size (320x240) pixels in HIMETRIC
- HDC hDC = CreateDevDC(NULL);
- _extent.cx = (320*2540L)/GetDeviceCaps(hDC, LOGPIXELSX);
- _extent.cy = (240*2540L)/GetDeviceCaps(hDC, LOGPIXELSY);
- DeleteDC(hDC);
+ // make sure that persistable properties are initialized
+ onInit();
};
VLCPlugin::~VLCPlugin()
{
- vlcOleInPlaceObject->UIDeactivate();
- vlcOleInPlaceObject->InPlaceDeactivate();
-
+ delete vlcOleObject;
delete vlcDataObject;
delete vlcViewObject;
delete vlcControl;
- delete vlcObjectSafety;
delete vlcConnectionPointContainer;
delete vlcProvideClassInfo;
delete vlcPersistPropertyBag;
delete vlcPersistStorage;
delete vlcOleInPlaceActiveObject;
delete vlcOleInPlaceObject;
- delete vlcOleControl;
- delete vlcOleObject;
+ delete vlcObjectSafety;
- if( _pict )
- _pict->Release();
+ delete vlcOleControl;
+ if( _p_pict )
+ _p_pict->Release();
- if( _psz_src )
- free(_psz_src);
+ SysFreeString(_bstr_mrl);
_p_class->Release();
};
else if( IID_IOleInPlaceActiveObject == riid )
*ppv = reinterpret_cast<LPVOID>(vlcOleInPlaceActiveObject);
else if( IID_IPersist == riid )
- *ppv = reinterpret_cast<LPVOID>(vlcPersistPropertyBag);
+ *ppv = reinterpret_cast<LPVOID>(vlcPersistStreamInit);
else if( IID_IPersistStreamInit == riid )
*ppv = reinterpret_cast<LPVOID>(vlcPersistStreamInit);
else if( IID_IPersistStorage == riid )
{
if( 0 == _i_vlc )
{
-#ifdef ACTIVEX_DEBUG
- char *ppsz_argv[] = { "vlc", "-vvv", "--fast-mutex", "--win9x-cv-method=1" };
-#else
- char *ppsz_argv[] = { "vlc", "-vv" };
-#endif
+ // initialize persistable properties
+ _bstr_mrl = NULL;
+ _b_autoplay = TRUE;
+ _b_autoloop = FALSE;
+ _b_visible = TRUE;
+ _b_mute = FALSE;
+ _i_volume = 50;
+ _i_time = 0;
+ // set default/preferred size (320x240) pixels in HIMETRIC
+ HDC hDC = CreateDevDC(NULL);
+ _extent.cx = 320;
+ _extent.cy = 240;
+ HimetricFromDP(hDC, (LPPOINT)&_extent, 1);
+ DeleteDC(hDC);
+
+ return S_OK;
+ }
+ return CO_E_ALREADYINITIALIZED;
+};
+
+HRESULT VLCPlugin::onLoad(void)
+{
+ if( SysStringLen(_bstr_mrl) > 0 )
+ {
+ /*
+ ** try to combine MRL with client site moniker, which for Internet Explorer
+ ** is the URL of the page the plugin is embedded into. Hence, if the MRL
+ ** is a relative URL, we should end up with an absolute URL
+ */
+ LPOLECLIENTSITE pClientSite;
+ if( SUCCEEDED(vlcOleObject->GetClientSite(&pClientSite)) && (NULL != pClientSite) )
+ {
+ IBindCtx *pBC = 0;
+ if( SUCCEEDED(CreateBindCtx(0, &pBC)) )
+ {
+ LPMONIKER pContMoniker = NULL;
+ if( SUCCEEDED(pClientSite->GetMoniker(OLEGETMONIKER_ONLYIFTHERE,
+ OLEWHICHMK_CONTAINER, &pContMoniker)) )
+ {
+ LPOLESTR base_url;
+ if( SUCCEEDED(pContMoniker->GetDisplayName(pBC, NULL, &base_url)) )
+ {
+ /*
+ ** check that the moniker name is a URL
+ */
+ if( UrlIsW(base_url, URLIS_URL) )
+ {
+ DWORD len = INTERNET_MAX_URL_LENGTH;
+ LPOLESTR abs_url = (LPOLESTR)CoTaskMemAlloc(sizeof(OLECHAR)*len);
+ if( NULL != abs_url )
+ {
+ if( SUCCEEDED(UrlCombineW(base_url, _bstr_mrl, abs_url, &len,
+ URL_ESCAPE_UNSAFE|URL_PLUGGABLE_PROTOCOL)) )
+ {
+ SysFreeString(_bstr_mrl);
+ _bstr_mrl = SysAllocStringLen(abs_url, len);
+ }
+ CoTaskMemFree(abs_url);
+ }
+ }
+ CoTaskMemFree(base_url);
+ }
+ pContMoniker->Release();
+ }
+ pBC->Release();
+ }
+ pClientSite->Release();
+ }
+ }
+ setDirty(FALSE);
+ return S_OK;
+};
+
+HRESULT VLCPlugin::getVLCObject(int *i_vlc)
+{
+ if( ! isRunning() )
+ {
+ _i_vlc = VLC_Create();
+ if( _i_vlc < 0 )
+ {
+ _i_vlc = 0;
+ return E_FAIL;
+ }
+
+ /*
+ ** default initialization options
+ */
+ char *ppsz_argv[10] = { "vlc", };
+ int ppsz_argc = 1;
+
HKEY h_key;
DWORD i_type, i_data = MAX_PATH + 1;
char p_data[MAX_PATH + 1];
ppsz_argv[0] = "C:\\cygwin\\home\\Damien_Fouilleul\\dev\\videolan\\vlc-trunk\\vlc";
#endif
- _i_vlc = VLC_Create();
+ // make sure plugin isn't affected with VLC single instance mode
+ ppsz_argv[ppsz_argc++] = "--no-one-instance";
+
+ // loop mode is a configuration option only
+ if( _b_autoloop )
+ ppsz_argv[ppsz_argc++] = "--loop";
+
+ if( IsDebuggerPresent() )
+ {
+ /*
+ ** VLC default threading mechanism is designed to be as compatible
+ ** with POSIX as possible, however when debugged on win32, threads
+ ** lose signals and eventually VLC get stuck during initialization.
+ ** threading support can be configured to be more debugging friendly
+ ** but it will be less compatible with POSIX.
+ ** This is done by initializing with the following options
+ */
+ ppsz_argv[ppsz_argc++] = "--fast-mutex";
+ ppsz_argv[ppsz_argc++] = "--win9x-cv-method=1";
+ }
- if( VLC_Init(_i_vlc, sizeof(ppsz_argv)/sizeof(char*), ppsz_argv) )
+ if( VLC_Init(_i_vlc, ppsz_argc, ppsz_argv) )
{
VLC_Destroy(_i_vlc);
_i_vlc = 0;
return E_FAIL;
}
- return S_OK;
- }
- return CO_E_ALREADYINITIALIZED;
-};
-HRESULT VLCPlugin::onLoad(void)
-{
- if( _b_mute )
- VLC_VolumeMute(_i_vlc);
+ VLC_VolumeSet(_i_vlc, _i_volume);
- if( NULL != _psz_src )
- {
- // add default target to playlist
- char *cOptions[1];
- int cOptionsCount = 0;
+ if( _b_mute )
+ VLC_VolumeMute(_i_vlc);
- if( _b_loopmode )
+ char *psz_mrl = CStrFromBSTR(CP_UTF8, _bstr_mrl);
+ if( NULL != psz_mrl )
{
- cOptions[cOptionsCount++] = "loop";
+ char timeBuffer[32];
+ const char *options[1];
+ int cOptions = 0;
+
+ if( _i_time )
+ {
+ snprintf(timeBuffer, sizeof(timeBuffer), ":start-time=%d", _i_time);
+ options[cOptions++] = timeBuffer;
+ }
+ // add default target to playlist
+ VLC_AddTarget(_i_vlc, psz_mrl, options, cOptions, PLAYLIST_APPEND, PLAYLIST_END);
+ CoTaskMemFree(psz_mrl);
}
- VLC_AddTarget(_i_vlc, _psz_src, (const char **)&cOptions, cOptionsCount, PLAYLIST_APPEND, PLAYLIST_END);
}
+ *i_vlc = _i_vlc;
return S_OK;
};
-HRESULT VLCPlugin::onClientSiteChanged(LPOLECLIENTSITE pActiveSite)
+HRESULT VLCPlugin::onAmbientChanged(LPUNKNOWN pContainer, DISPID dispID)
{
- if( NULL != pActiveSite )
+ VARIANT v;
+ switch( dispID )
{
- /*
- ** object is embedded in container
- ** try to activate in place if it has already been initialized
- */
- if( _i_vlc )
- {
- vlcOleObject->DoVerb(OLEIVERB_INPLACEACTIVATE, NULL, pActiveSite, 0, NULL, NULL);
- }
+ case DISPID_AMBIENT_BACKCOLOR:
+ break;
+ case DISPID_AMBIENT_DISPLAYNAME:
+ break;
+ case DISPID_AMBIENT_FONT:
+ break;
+ case DISPID_AMBIENT_FORECOLOR:
+ break;
+ case DISPID_AMBIENT_LOCALEID:
+ break;
+ case DISPID_AMBIENT_MESSAGEREFLECT:
+ break;
+ case DISPID_AMBIENT_SCALEUNITS:
+ break;
+ case DISPID_AMBIENT_TEXTALIGN:
+ break;
+ case DISPID_AMBIENT_USERMODE:
+ VariantInit(&v);
+ V_VT(&v) = VT_BOOL;
+ if( SUCCEEDED(GetObjectProperty(pContainer, dispID, v)) )
+ {
+ setUserMode(V_BOOL(&v) != VARIANT_FALSE);
+ }
+ break;
+ case DISPID_AMBIENT_UIDEAD:
+ break;
+ case DISPID_AMBIENT_SHOWGRABHANDLES:
+ break;
+ case DISPID_AMBIENT_SHOWHATCHING:
+ break;
+ case DISPID_AMBIENT_DISPLAYASDEFAULT:
+ break;
+ case DISPID_AMBIENT_SUPPORTSMNEMONICS:
+ break;
+ case DISPID_AMBIENT_AUTOCLIP:
+ break;
+ case DISPID_AMBIENT_APPEARANCE:
+ break;
+ case DISPID_AMBIENT_CODEPAGE:
+ VariantInit(&v);
+ V_VT(&v) = VT_I4;
+ if( SUCCEEDED(GetObjectProperty(pContainer, dispID, v)) )
+ {
+ setCodePage(V_I4(&v));
+ }
+ break;
+ case DISPID_AMBIENT_PALETTE:
+ break;
+ case DISPID_AMBIENT_CHARSET:
+ break;
+ case DISPID_AMBIENT_RIGHTTOLEFT:
+ break;
+ case DISPID_AMBIENT_TOPTOBOTTOM:
+ break;
+ case DISPID_UNKNOWN:
+ /*
+ ** multiple property change, look up the ones we are interested in
+ */
+ VariantInit(&v);
+ V_VT(&v) = VT_BOOL;
+ if( SUCCEEDED(GetObjectProperty(pContainer, DISPID_AMBIENT_USERMODE, v)) )
+ {
+ setUserMode(V_BOOL(&v) != VARIANT_FALSE);
+ }
+ VariantInit(&v);
+ V_VT(&v) = VT_I4;
+ if( SUCCEEDED(GetObjectProperty(pContainer, DISPID_AMBIENT_CODEPAGE, v)) )
+ {
+ setCodePage(V_I4(&v));
+ }
+ break;
}
return S_OK;
};
HRESULT VLCPlugin::onClose(DWORD dwSaveOption)
{
- if( _i_vlc )
+ if( isInPlaceActive() )
+ {
+ onInPlaceDeactivate();
+ }
+ if( isRunning() )
{
int i_vlc = _i_vlc;
_i_vlc = 0;
- if( isInPlaceActive() )
- {
- onInPlaceDeactivate();
- }
vlcDataObject->onClose();
VLC_CleanUp(i_vlc);
/*
** Create a window for in place activated control.
- ** the window geometry represents the control viewport
- ** so that embedded video is always properly clipped.
+ ** the window geometry matches the control viewport
+ ** within container so that embedded video is always
+ ** properly clipped.
*/
_inplacewnd = CreateWindow(_p_class->getInPlaceWndClassName(),
"VLC Plugin In-Place Window",
- WS_CHILD|WS_CLIPCHILDREN|WS_TABSTOP,
+ WS_CHILD|WS_CLIPCHILDREN|WS_CLIPSIBLINGS,
clipRect.left,
clipRect.top,
clipRect.right-clipRect.left,
SetWindowLongPtr(_inplacewnd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
/*
- ** VLC embedded video geometry automatically matches parent window.
- ** hence create a child window so that video position and size
+ ** VLC embedded video automatically grows to cover client
+ ** area of parent window.
+ ** hence create a such a 'parent' window whose geometry
** is always correct relative to the viewport bounds
*/
_videownd = CreateWindow(_p_class->getVideoWndClassName(),
SetWindowLongPtr(_videownd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
- if( getVisible() )
- ShowWindow(_inplacewnd, SW_SHOWNORMAL);
-
- /* horrible cast there */
- vlc_value_t val;
- val.i_int = reinterpret_cast<int>(_videownd);
- VLC_VariableSet(_i_vlc, "drawable", val);
-
- if( _b_autostart & (VLC_PlaylistNumberOfItems(_i_vlc) > 0) )
+ if( _b_usermode )
{
- VLC_Play(_i_vlc);
- fireOnPlayEvent();
+ /* will run vlc if not done already */
+ int i_vlc;
+ HRESULT result = getVLCObject(&i_vlc);
+ if( FAILED(result) )
+ return result;
+
+ /* set internal video width and height */
+ vlc_value_t val;
+ val.i_int = posRect.right-posRect.left;
+ VLC_VariableSet(i_vlc, "conf::width", val);
+ val.i_int = posRect.bottom-posRect.top;
+ VLC_VariableSet(i_vlc, "conf::height", val);
+
+ /* set internal video parent window */
+ /* horrible cast there */
+ val.i_int = reinterpret_cast<int>(_videownd);
+ VLC_VariableSet(i_vlc, "drawable", val);
+
+ if( _b_autoplay & (VLC_PlaylistNumberOfItems(i_vlc) > 0) )
+ {
+ VLC_Play(i_vlc);
+ fireOnPlayEvent();
+ }
}
+
+ if( isVisible() )
+ ShowWindow(_inplacewnd, SW_SHOW);
+
return S_OK;
};
HRESULT VLCPlugin::onInPlaceDeactivate(void)
{
- VLC_Stop(_i_vlc);
- fireOnStopEvent();
+ if( isRunning() )
+ {
+ VLC_Stop(_i_vlc);
+ fireOnStopEvent();
+ }
DestroyWindow(_videownd);
_videownd = NULL;
void VLCPlugin::setVisible(BOOL fVisible)
{
- _b_visible = fVisible;
- if( isInPlaceActive() )
- ShowWindow(_inplacewnd, fVisible ? SW_SHOWNORMAL : SW_HIDE);
- firePropChangedEvent(DISPID_Visible);
+ if( fVisible != _b_visible )
+ {
+ _b_visible = fVisible;
+ if( isInPlaceActive() )
+ {
+ ShowWindow(_inplacewnd, fVisible ? SW_SHOW : SW_HIDE);
+ if( fVisible )
+ InvalidateRect(_videownd, NULL, TRUE);
+ }
+ setDirty(TRUE);
+ firePropChangedEvent(DISPID_Visible);
+ }
+};
+
+void VLCPlugin::setVolume(int volume)
+{
+ if( volume < 0 )
+ volume = 0;
+ else if( volume > 200 )
+ volume = 200;
+
+ if( volume != _i_volume )
+ {
+ _i_volume = volume;
+ if( isRunning() )
+ {
+ VLC_VolumeSet(_i_vlc, _i_volume);
+ }
+ setDirty(TRUE);
+ }
+};
+
+void VLCPlugin::setTime(int seconds)
+{
+ if( seconds < 0 )
+ seconds = 0;
+
+ if( seconds != _i_time )
+ {
+ _i_time = seconds;
+ if( isRunning() )
+ {
+ VLC_TimeSet(_i_vlc, seconds, VLC_FALSE);
+ }
+ setDirty(TRUE);
+ }
};
void VLCPlugin::setFocus(BOOL fFocus)
void VLCPlugin::onDraw(DVTARGETDEVICE * ptd, HDC hicTargetDev,
HDC hdcDraw, LPCRECTL lprcBounds, LPCRECTL lprcWBounds)
{
- if( getVisible() )
+ if( isVisible() )
{
long width = lprcBounds->right-lprcBounds->left;
long height = lprcBounds->bottom-lprcBounds->top;
- SIZEL devSize;
- if( NULL != hicTargetDev ) {
- devSize.cx = GetDeviceCaps(hicTargetDev, LOGPIXELSX);
- devSize.cy = GetDeviceCaps(hicTargetDev, LOGPIXELSY);
- }
- else if( NULL != (hicTargetDev = CreateDevDC(ptd)) )
- {
- devSize.cx = GetDeviceCaps(hicTargetDev, LOGPIXELSX);
- devSize.cy = GetDeviceCaps(hicTargetDev, LOGPIXELSY);
- DeleteDC(hicTargetDev);
- }
-
RECT bounds = { lprcBounds->left, lprcBounds->top, lprcBounds->right, lprcBounds->bottom };
FillRect(hdcDraw, &bounds, (HBRUSH)GetStockObject(WHITE_BRUSH));
pict->get_Width(&picWidth);
pict->get_Height(&picHeight);
- POINT dstSize = { picWidth*devSize.cx/2540L, picHeight*devSize.cy/2540L };
+ SIZEL picSize = { picWidth, picHeight };
+
+ if( NULL != hicTargetDev )
+ {
+ DPFromHimetric(hicTargetDev, (LPPOINT)&picSize, 1);
+ }
+ else if( NULL != (hicTargetDev = CreateDevDC(ptd)) )
+ {
+ DPFromHimetric(hicTargetDev, (LPPOINT)&picSize, 1);
+ DeleteDC(hicTargetDev);
+ }
- DPtoLP(hdcDraw, &dstSize, 1);
- if( dstSize.x > width-4 )
- dstSize.x = width-4;
- if( dstSize.y > height-4 )
- dstSize.y = height-4;
+ if( picSize.cx > width-4 )
+ picSize.cx = width-4;
+ if( picSize.cy > height-4 )
+ picSize.cy = height-4;
- long dstX = lprcBounds->left+(width-dstSize.x)/2;
- long dstY = lprcBounds->top+(height-dstSize.y)/2;
+ LONG dstX = lprcBounds->left+(width-picSize.cx)/2;
+ LONG dstY = lprcBounds->top+(height-picSize.cy)/2;
if( NULL != lprcWBounds )
{
RECT wBounds = { lprcWBounds->left, lprcWBounds->top, lprcWBounds->right, lprcWBounds->bottom };
- pict->Render(hdcDraw, dstX, dstY, dstSize.x, dstSize.y,
+ pict->Render(hdcDraw, dstX, dstY, picSize.cx, picSize.cy,
0L, picHeight, picWidth, -picHeight, &wBounds);
}
else
- pict->Render(hdcDraw, dstX, dstY, dstSize.x, dstSize.y,
+ pict->Render(hdcDraw, dstX, dstY, picSize.cx, picSize.cy,
0L, picHeight, picWidth, -picHeight, NULL);
pict->Release();
void VLCPlugin::onPaint(HDC hdc, const RECT &bounds, const RECT &clipRect)
{
- if( getVisible() )
+ if( isVisible() )
{
/** if VLC is playing, it may not display any VIDEO content
** hence, draw control logo*/
- HDC hdcPict = CreateCompatibleDC(hdc);
- if( NULL != hdcPict )
+ HDC hdcDraw = CreateCompatibleDC(hdc);
+ if( NULL != hdcDraw )
{
+ SIZEL size = getExtent();
+ DPFromHimetric(hdc, (LPPOINT)&size, 1);
+ RECTL posRect = { 0, 0, size.cx, size.cy };
+
int width = bounds.right-bounds.left;
int height = bounds.bottom-bounds.top;
+
HBITMAP hBitmap = CreateCompatibleBitmap(hdc, width, height);
if( NULL != hBitmap )
{
- HBITMAP oldBmp = (HBITMAP)SelectObject(hdcPict, hBitmap);
+ HBITMAP oldBmp = (HBITMAP)SelectObject(hdcDraw, hBitmap);
- RECTL rcBounds = { bounds.left, bounds.top, bounds.right, bounds.bottom };
+ if( (size.cx != width) || (size.cy != height) )
+ {
+ // needs to scale canvas
+ SetMapMode(hdcDraw, MM_ANISOTROPIC);
+ SetWindowExtEx(hdcDraw, size.cx, size.cy, NULL);
+ SetViewportExtEx(hdcDraw, width, height, NULL);
+ }
- onDraw(NULL, hdc, hdcPict, &rcBounds, NULL);
+ onDraw(NULL, hdc, hdcDraw, &posRect, NULL);
- BitBlt(hdc, bounds.left, bounds.top, width, height,
- hdcPict, 0, 0, SRCCOPY);
+ SetMapMode(hdcDraw, MM_TEXT);
+ BitBlt(hdc, bounds.left, bounds.top,
+ width, height,
+ hdcDraw, 0, 0,
+ SRCCOPY);
- SelectObject(hdcPict, oldBmp);
+ SelectObject(hdcDraw, oldBmp);
DeleteObject(hBitmap);
}
- DeleteDC(hdcPict);
+ DeleteDC(hdcDraw);
}
}
};
RECT clipRect = *lprcClipRect;
RECT posRect = *lprcPosRect;
- /*
- ** tell container that previous area needs redrawing
- */
-
- InvalidateRect(GetParent(_inplacewnd), &_posRect, TRUE);
+ //RedrawWindow(GetParent(_inplacewnd), &_posRect, NULL, RDW_INVALIDATE|RDW_ERASE|RDW_ALLCHILDREN);
/*
** record keeping of control geometry within container
*/
-
_posRect = posRect;
/*
/*
** change in-place window geometry to match clipping region
*/
- MoveWindow(_inplacewnd,
+ SetWindowPos(_inplacewnd, NULL,
clipRect.left,
clipRect.top,
clipRect.right-clipRect.left,
clipRect.bottom-clipRect.top,
- FALSE);
+ SWP_NOACTIVATE|
+ SWP_NOCOPYBITS|
+ SWP_NOZORDER|
+ SWP_NOOWNERZORDER );
/*
** change video window geometry to match object bounds within clipping region
*/
- MoveWindow(_videownd,
+ SetWindowPos(_videownd, NULL,
posRect.left,
posRect.top,
posRect.right-posRect.left,
posRect.bottom-posRect.top,
- FALSE);
+ SWP_NOACTIVATE|
+ SWP_NOCOPYBITS|
+ SWP_NOZORDER|
+ SWP_NOOWNERZORDER );
- /*
- ** force a full refresh of control content
- */
- RECT updateRect;
- updateRect.left = -posRect.left;
- updateRect.top = -posRect.top;
- updateRect.right = posRect.right-posRect.left;
- updateRect.bottom = posRect.bottom-posRect.top;
-
- ValidateRect(_videownd, NULL);
- InvalidateRect(_videownd, &updateRect, FALSE);
- UpdateWindow(_videownd);
+ //RedrawWindow(_videownd, &posRect, NULL, RDW_INVALIDATE|RDW_ERASE|RDW_ALLCHILDREN);
+ vlc_value_t val;
+ val.i_int = posRect.right-posRect.left;
+ VLC_VariableSet(_i_vlc, "conf::width", val);
+ val.i_int = posRect.bottom-posRect.top;
+ VLC_VariableSet(_i_vlc, "conf::height", val);
};
void VLCPlugin::freezeEvents(BOOL freeze)