diff options
Diffstat (limited to 'avmedia/source/win/window.cxx')
| -rwxr-xr-x[-rw-r--r--] | avmedia/source/win/window.cxx | 40 |
1 files changed, 5 insertions, 35 deletions
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx index 1170505b440b..f8ddd7866098 100644..100755 --- a/avmedia/source/win/window.cxx +++ b/avmedia/source/win/window.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,12 +26,11 @@ * ************************************************************************/ -#include <tools/prewin.h> +#include <prewin.h> #if defined _MSC_VER #pragma warning(push, 1) #pragma warning(disable: 4917) #endif -#include <windows.h> #include <objbase.h> #include <strmif.h> #include <control.h> @@ -38,7 +38,7 @@ #if defined _MSC_VER #pragma warning(pop) #endif -#include <tools/postwin.h> +#include <postwin.h> #include <com/sun/star/awt/SystemPointer.hdl> #include "window.hxx" @@ -341,33 +341,6 @@ bool Window::create( const uno::Sequence< uno::Any >& rArguments ) { ::SetWindowLong( (HWND) mnFrameWnd, 0, (DWORD) this ); -#ifdef DDRAW_TEST_OUTPUT - IDirectDraw7* pDDraw; - IDirectDrawSurface7* pDDSurface; - IDirectDrawClipper* pDDClipper; - - if( DD_OK == DirectDrawCreateEx( NULL, (void**) &pDDraw, IID_IDirectDraw7, NULL ) ) - { - if( DD_OK == pDDraw->SetCooperativeLevel( (HWND) mnParentWnd, DDSCL_NORMAL ) ) - { - DDSURFACEDESC2 aDDDesc; - - memset( &aDDDesc, 0, sizeof( aDDDesc ) ); - aDDDesc.dwSize = sizeof( aDDDesc ); - aDDDesc.dwFlags = DDSD_CAPS; - aDDDesc.ddsCaps.dwCaps |= DDSCAPS_PRIMARYSURFACE; - - if( DD_OK == pDDraw->CreateSurface( &aDDDesc, &pDDSurface, NULL ) ) - { - if( DD_OK == pDDraw->CreateClipper( 0, &pDDClipper, NULL ) ) - { - pDDClipper->SetHWnd( 0, (HWND) mnFrameWnd ); - pDDSurface->SetClipper( pDDClipper ); - } - - mrPlayer.setDDrawParams( (IDirectDraw*) pDDraw, (IDirectDrawSurface*) pDDSurface ); -#endif - pVideoWindow->put_Owner( (OAHWND) mnFrameWnd ); pVideoWindow->put_MessageDrain( (OAHWND) mnFrameWnd ); pVideoWindow->put_WindowStyle( WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN ); @@ -376,11 +349,6 @@ bool Window::create( const uno::Sequence< uno::Any >& rArguments ) meZoomLevel = media::ZoomLevel_ORIGINAL; ImplLayoutVideoWindow(); -#ifdef DDRAW_TEST_OUTPUT - } - } - } -#endif } } @@ -738,3 +706,5 @@ uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( ) } // namespace win } // namespace avmedia + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |