summaryrefslogtreecommitdiff
path: root/avmedia/source/win
diff options
context:
space:
mode:
Diffstat (limited to 'avmedia/source/win')
-rw-r--r--avmedia/source/win/framegrabber.cxx10
-rw-r--r--avmedia/source/win/framegrabber.hxx4
-rw-r--r--avmedia/source/win/manager.cxx8
-rw-r--r--avmedia/source/win/manager.hxx3
-rw-r--r--avmedia/source/win/player.cxx27
-rw-r--r--avmedia/source/win/player.hxx5
-rw-r--r--avmedia/source/win/window.hxx5
7 files changed, 38 insertions, 24 deletions
diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx
index 4d6305c8ca12..65300406b276 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -49,20 +49,19 @@ using namespace ::com::sun::star;
namespace avmedia { namespace win {
-// - FrameGrabber -
-
-
FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxMgr( rxMgr )
{
::CoInitialize( NULL );
}
+
FrameGrabber::~FrameGrabber()
{
::CoUninitialize();
}
+
IMediaDet* FrameGrabber::implCreateMediaDet( const OUString& rURL ) const
{
IMediaDet* pDet = NULL;
@@ -85,6 +84,7 @@ IMediaDet* FrameGrabber::implCreateMediaDet( const OUString& rURL ) const
return pDet;
}
+
bool FrameGrabber::create( const OUString& rURL )
{
// just check if a MediaDet interface can be created with the given URL
@@ -102,6 +102,7 @@ bool FrameGrabber::create( const OUString& rURL )
return !maURL.isEmpty();
}
+
uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
throw (uno::RuntimeException)
{
@@ -198,18 +199,21 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
return xRet;
}
+
OUString SAL_CALL FrameGrabber::getImplementationName( )
throw (uno::RuntimeException)
{
return OUString( AVMEDIA_WIN_FRAMEGRABBER_IMPLEMENTATIONNAME );
}
+
sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return cppu::supportsService(this, ServiceName);
}
+
uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx
index 98dc0cc78d1c..d9845c08cb18 100644
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
@@ -28,10 +28,6 @@ struct IMediaDet;
namespace avmedia { namespace win {
-
-// - FrameGrabber -
-
-
class FrameGrabber : public ::cppu::WeakImplHelper< css::media::XFrameGrabber,
css::lang::XServiceInfo >
{
diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx
index d33c9c8949bd..a5042d4e49b9 100644
--- a/avmedia/source/win/manager.cxx
+++ b/avmedia/source/win/manager.cxx
@@ -30,18 +30,17 @@ using namespace ::com::sun::star;
namespace avmedia { namespace win {
-// - Manager -
-
-
Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxMgr( rxMgr )
{
}
+
Manager::~Manager()
{
}
+
uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL )
throw (uno::RuntimeException)
{
@@ -55,18 +54,21 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString&
return xRet;
}
+
OUString SAL_CALL Manager::getImplementationName( )
throw (uno::RuntimeException)
{
return OUString( AVMEDIA_WIN_MANAGER_IMPLEMENTATIONNAME );
}
+
sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return cppu::supportsService(this, ServiceName);
}
+
uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx
index 9f309c750c10..a70861ef22d8 100644
--- a/avmedia/source/win/manager.hxx
+++ b/avmedia/source/win/manager.hxx
@@ -25,9 +25,6 @@
#include "com/sun/star/media/XManager.hpp"
-// - Manager -
-
-
namespace avmedia { namespace win {
class Manager : public ::cppu::WeakImplHelper< css::media::XManager,
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index 8bf50f231d45..5bb45e07a1ad 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -85,9 +85,6 @@ bool isWindowsVistaOrHigher()
}
-// - Player -
-
-
Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
Player_BASE(m_aMutex),
mxMgr( rxMgr ),
@@ -110,6 +107,7 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
::CoInitialize( NULL );
}
+
Player::~Player()
{
if( mnFrameWnd )
@@ -118,6 +116,7 @@ Player::~Player()
::CoUninitialize();
}
+
void SAL_CALL Player::disposing()
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -156,6 +155,7 @@ void SAL_CALL Player::disposing()
mpGB->Release();
}
+
bool Player::create( const OUString& rURL )
{
HRESULT hR;
@@ -202,11 +202,13 @@ bool Player::create( const OUString& rURL )
return bRet;
}
+
const IVideoWindow* Player::getVideoWindow() const
{
return mpVW;
}
+
void Player::setNotifyWnd( HWND nNotifyWnd )
{
mbAddWindow = false;
@@ -214,6 +216,7 @@ void Player::setNotifyWnd( HWND nNotifyWnd )
mpME->SetNotifyWindow( (OAHWND) nNotifyWnd, WM_GRAPHNOTIFY, reinterpret_cast< LONG_PTR>( this ) );
}
+
long Player::processEvent()
{
long nCode;
@@ -241,6 +244,7 @@ long Player::processEvent()
return 0;
}
+
void SAL_CALL Player::start( )
throw (uno::RuntimeException)
{
@@ -284,6 +288,7 @@ void SAL_CALL Player::start( )
}
}
+
void SAL_CALL Player::stop( )
throw (uno::RuntimeException)
{
@@ -292,6 +297,7 @@ void SAL_CALL Player::stop( )
mpMC->Stop();
}
+
sal_Bool SAL_CALL Player::isPlaying()
throw (uno::RuntimeException)
{
@@ -306,6 +312,7 @@ sal_Bool SAL_CALL Player::isPlaying()
return bRet;
}
+
double SAL_CALL Player::getDuration( )
throw (uno::RuntimeException)
{
@@ -319,6 +326,7 @@ double SAL_CALL Player::getDuration( )
return aRefTime;
}
+
void SAL_CALL Player::setMediaTime( double fTime )
throw (uno::RuntimeException)
{
@@ -335,6 +343,7 @@ void SAL_CALL Player::setMediaTime( double fTime )
}
}
+
double SAL_CALL Player::getMediaTime( )
throw (uno::RuntimeException)
{
@@ -348,6 +357,7 @@ double SAL_CALL Player::getMediaTime( )
return aRefTime;
}
+
void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
throw (uno::RuntimeException)
{
@@ -356,6 +366,7 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
mbLooping = bSet;
}
+
sal_Bool SAL_CALL Player::isPlaybackLoop( )
throw (uno::RuntimeException)
{
@@ -364,6 +375,7 @@ sal_Bool SAL_CALL Player::isPlaybackLoop( )
return mbLooping;
}
+
void SAL_CALL Player::setMute( sal_Bool bSet )
throw (uno::RuntimeException)
{
@@ -376,6 +388,7 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
}
}
+
sal_Bool SAL_CALL Player::isMute( )
throw (uno::RuntimeException)
{
@@ -384,6 +397,7 @@ sal_Bool SAL_CALL Player::isMute( )
return mbMuted;
}
+
void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
throw (uno::RuntimeException)
{
@@ -395,6 +409,7 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
mpBA->put_Volume( mnUnmutedVolume );
}
+
sal_Int16 SAL_CALL Player::getVolumeDB( )
throw (uno::RuntimeException)
{
@@ -403,6 +418,7 @@ sal_Int16 SAL_CALL Player::getVolumeDB( )
return( static_cast< sal_Int16 >( mnUnmutedVolume / 100 ) );
}
+
awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( )
throw (uno::RuntimeException)
{
@@ -422,6 +438,7 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( )
return aSize;
}
+
uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
throw (uno::RuntimeException)
{
@@ -443,6 +460,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
return xRet;
}
+
uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
throw (uno::RuntimeException)
{
@@ -461,18 +479,21 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
return xRet;
}
+
OUString SAL_CALL Player::getImplementationName( )
throw (uno::RuntimeException)
{
return OUString( AVMEDIA_WIN_PLAYER_IMPLEMENTATIONNAME );
}
+
sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return cppu::supportsService(this, ServiceName);
}
+
uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index e7c84012c09b..2923d0ded939 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -46,13 +46,10 @@ struct IDirectDrawSurface;
namespace avmedia { namespace win {
-
-// - Player -
-
-
typedef ::cppu::WeakComponentImplHelper< css::media::XPlayer,
css::lang::XServiceInfo > Player_BASE;
+
class Player : public cppu::BaseMutex,
public Player_BASE
{
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index fa01b19c1ed7..ca44d392ca91 100644
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
@@ -34,12 +34,9 @@ struct IVideoWindow;
namespace avmedia { namespace win {
-
-// - Window -
-
-
class Player;
+
class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow,
css::lang::XServiceInfo >
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-28 18:12:22 +0000