diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-09-30 15:46:24 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-10-25 13:41:50 +0100 |
| commit | 6297a9c4a117fcfd01ed99a54efba7e130805598 (patch) | |
| tree | 962b2526d955654a7f5fe8f7f9e5d900e89109a0 /vcl/inc/headless | |
| parent | ef93683de1b1d1dbcd7e76df5033c4d117198667 (diff) | |
generic: share sal yield mutex properly
Diffstat (limited to 'vcl/inc/headless')
| -rw-r--r-- | vcl/inc/headless/svpinst.hxx | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx index 34a9c7f8ba2e..d3307abdb5ed 100644 --- a/vcl/inc/headless/svpinst.hxx +++ b/vcl/inc/headless/svpinst.hxx @@ -46,27 +46,6 @@ #define VIRTUAL_DESKTOP_HEIGHT 768 #define VIRTUAL_DESKTOP_DEPTH 24 -// ------------------------------------------------------------------------- -// SalYieldMutex -// ------------------------------------------------------------------------- - -class SvpSalYieldMutex : public ::vcl::SolarMutexObject -{ -protected: - sal_uLong mnCount; - oslThreadIdentifier mnThreadId; - -public: - SvpSalYieldMutex(); - - virtual void acquire(); - virtual void release(); - virtual sal_Bool tryToAcquire(); - - sal_uLong GetAcquireCount() const { return mnCount; } - oslThreadIdentifier GetThreadId() const { return mnThreadId; } -}; - // --------------- // - SalTimer - // --------------- @@ -92,7 +71,6 @@ class SvpSalInstance : public SalGenericInstance timeval m_aTimeout; sal_uLong m_nTimeoutMS; int m_pTimeoutFDS[2]; - SvpSalYieldMutex m_aYieldMutex; // internal event queue struct SalUserEvent @@ -118,7 +96,7 @@ class SvpSalInstance : public SalGenericInstance public: static SvpSalInstance* s_pDefaultInstance; - SvpSalInstance(); + SvpSalInstance( SalYieldMutex *pMutex ); virtual ~SvpSalInstance(); void PostEvent( const SalFrame* pFrame, void* pData, sal_uInt16 nEvent ); @@ -177,12 +155,6 @@ public: // SalBitmap virtual SalBitmap* CreateSalBitmap(); - // YieldMutex - virtual osl::SolarMutex* GetYieldMutex(); - virtual sal_uLong ReleaseYieldMutex(); - virtual void AcquireYieldMutex( sal_uLong nCount ); - virtual bool CheckYieldMutex(); - // wait next event and dispatch // must returned by UserEvent (SalFrame::PostEvent) // and timer |