diff options
Diffstat (limited to 'avmedia/source/framework/soundhandler.cxx')
| -rwxr-xr-x[-rw-r--r--] | avmedia/source/framework/soundhandler.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index a1fed18a0f68..872106443732 100644..100755 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.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. @@ -29,13 +30,9 @@ // my own includes //_________________________________________________________________________________________________________________ -#ifndef __FRAMEWORK_DISPATCH_SOUNDHANDLER_HXX_ #include "soundhandler.hxx" -#endif -#ifndef __COMPHELPER_MEDIADESCRIPTOR_HXX_ #include <comphelper/mediadescriptor.hxx> -#endif //_________________________________________________________________________________________________________________ // interface includes @@ -333,7 +330,7 @@ void SAL_CALL SoundHandler::dispatchWithNotification(const css::util::URL& const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException) { // SAFE { - const ::vos::OGuard aLock( m_aLock ); + const ::osl::MutexGuard aLock( m_aLock ); { //close streams otherwise on windows we can't reopen the file in the @@ -427,7 +424,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL& // I think we can the following ones: // a) look for given extension of url to map our type decision HARD CODED!!! // b) return preferred type every time... it's easy :-) - sTypeName = ::rtl::OUString::createFromAscii("wav_Wave_Audio_File"); + sTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wav_Wave_Audio_File")); aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName; aDescriptor >> lDescriptor; } @@ -452,7 +449,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL& IMPL_LINK( SoundHandler, implts_PlayerNotify, void*, EMPTYARG ) { // SAFE { - ::vos::OClearableGuard aLock( m_aLock ); + ::osl::ClearableMutexGuard aLock( m_aLock ); if (m_xPlayer.is() && m_xPlayer->isPlaying() && m_xPlayer->getMediaTime() < m_xPlayer->getDuration()) { @@ -523,3 +520,5 @@ extern "C" void* SAL_CALL component_getFactory(const sal_Char* pImplementationNa /* Return with result of this operation. */ return pReturn; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |