diff options
| author | Ocke.Janssen <Ocke.Janssen@oracle.com> | 2011-02-08 12:38:25 +0100 |
|---|---|---|
| committer | Ocke.Janssen <Ocke.Janssen@oracle.com> | 2011-02-08 12:38:25 +0100 |
| commit | ad875044d10a74e092aa3b89989fd94f343da844 (patch) | |
| tree | 5b396ce5b801f4925c424b5fe5349fbdb03da0cd /avmedia | |
| parent | 2aa75d739448d4dad44d7c09c746243cefea25e2 (diff) | |
impress210: #i115617# set zoom to fit_to_window
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/gstreamer/gstplayer.cxx | 1 | ||||
| -rw-r--r-- | avmedia/source/gstreamer/gstplayer.hxx | 5 | ||||
| -rw-r--r-- | avmedia/source/win/player.cxx | 3 | ||||
| -rw-r--r-- | avmedia/source/win/player.hxx | 5 |
4 files changed, 9 insertions, 5 deletions
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index e5bff43f95cc..06ca9bef2ca2 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -70,6 +70,7 @@ struct GstBusSource : public GSource // - Player - // --------------- Player::Player( GString* pURI ) : + Player_BASE(m_aMutex), mpMutex( g_mutex_new() ), mpCond( g_cond_new() ), mpThread( NULL ), diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx index 4b73e898a4bf..8388f00b9f15 100644 --- a/avmedia/source/gstreamer/gstplayer.hxx +++ b/avmedia/source/gstreamer/gstplayer.hxx @@ -58,10 +58,11 @@ class Window; // --------------- // - Player_Impl - // --------------- +typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::media::XPlayer, + ::com::sun::star::lang::XServiceInfo > Player_BASE; class Player : public cppu::BaseMutex, - public ::cppu::WeakComponentImplHelper2< ::com::sun::star::media::XPlayer, - ::com::sun::star::lang::XServiceInfo > + public Player_BASE { public: diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx index a0f678327b03..e5c010dc258a 100644 --- a/avmedia/source/win/player.cxx +++ b/avmedia/source/win/player.cxx @@ -70,6 +70,7 @@ bool isWindowsVistaOrHigher() // ---------------- Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : + Player_BASE(m_aMutex), mxMgr( rxMgr ), mpGB( NULL ), mpOMF( NULL ), @@ -99,7 +100,7 @@ Player::~Player() void SAL_CALL Player::disposing() { - MutexGuard aGuard(m_aMutex); + ::osl::MutexGuard aGuard(m_aMutex); stop(); if( mpBA ) mpBA->Release(); diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx index 523d2800b150..d0c40e274f92 100644 --- a/avmedia/source/win/player.hxx +++ b/avmedia/source/win/player.hxx @@ -53,10 +53,11 @@ namespace avmedia { namespace win { // ---------- // - Player - // ---------- +typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::media::XPlayer, + ::com::sun::star::lang::XServiceInfo > Player_BASE; class Player : public cppu::BaseMutex, - public ::cppu::WeakComponentImplHelper2< ::com::sun::star::media::XPlayer, - ::com::sun::star::lang::XServiceInfo > + public Player_BASE { public: |