summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorAndrea Gelmini <andrea.gelmini@gelma.net>2014-11-10 15:05:25 +0100
committerNoel Grandin <noelgrandin@gmail.com>2014-11-12 11:04:11 +0000
commitda40cac540e7d735edbe9069b3c8ec6af4530208 (patch)
treef2abda7281129e13f588c77b18780a7090c8405f /avmedia
parentbb437029c1e5331bcc3f8fb2fc87837142a52f33 (diff)
Fix common typos. No automatic tools. Handmade…
Change-Id: I1ab4e23b0539f8d39974787f226e57a21f96e959 Reviewed-on: https://gerrit.libreoffice.org/12164 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/framework/soundhandler.cxx4
-rw-r--r--avmedia/source/framework/soundhandler.hxx2
-rw-r--r--avmedia/source/opengl/oglframegrabber.cxx2
-rw-r--r--avmedia/source/opengl/oglplayer.cxx4
-rw-r--r--avmedia/source/opengl/oglwindow.cxx2
5 files changed, 7 insertions, 7 deletions
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index d80d29ba46d4..5d0a18c91b75 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -260,7 +260,7 @@ void SAL_CALL SoundHandler::dispatchWithNotification(const css::util::URL&
m_bError = false;
m_xPlayer.set( avmedia::MediaWindow::createPlayer( aURL.Complete, aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REFERRER(), OUString()) ), css::uno::UNO_QUERY_THROW );
// OK- we can start async playing ...
- // Count this request and initialize self-holder against dieing by uno ref count ...
+ // Count this request and initialize self-holder against dying by uno ref count ...
m_xSelfHold = css::uno::Reference< css::uno::XInterface >(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
m_xPlayer->start();
m_aUpdateTimer.SetTimeout( 200 );
@@ -337,7 +337,7 @@ OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::Property
We use this information to callback our might existing listener.
@seealso method dispatchWithNotification()
- @return 0 everytime ... it doesn't matter for us.
+ @return 0 every time... it doesn't matter for us.
@threadsafe yes
*//*-*************************************************************************************************************/
IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify)
diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
index d41c033cb226..53c2f746a68f 100644
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -126,7 +126,7 @@ class SoundHandler : // interfaces
bool m_bError;
css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory ; // global uno service factory to create new services
- css::uno::Reference< css::uno::XInterface > m_xSelfHold ; // we must protect us against dieing during async(!) dispatch() call!
+ css::uno::Reference< css::uno::XInterface > m_xSelfHold ; // we must protect us against dying during async(!) dispatch() call!
css::uno::Reference< css::media::XPlayer > m_xPlayer ; // uses avmedia player to play sounds...
css::uno::Reference< css::frame::XDispatchResultListener > m_xListener ;
diff --git a/avmedia/source/opengl/oglframegrabber.cxx b/avmedia/source/opengl/oglframegrabber.cxx
index 23e97f100444..f98b4e188cb7 100644
--- a/avmedia/source/opengl/oglframegrabber.cxx
+++ b/avmedia/source/opengl/oglframegrabber.cxx
@@ -42,7 +42,7 @@ uno::Reference< css::graphic::XGraphic > SAL_CALL OGLFrameGrabber::grabFrame( do
int nRet = gltf_renderer_get_bitmap(&pHandle, 1, (char*)pBuffer.get(), GL_BGRA);
if( nRet != 0 )
{
- SAL_WARN("avmedia.opengl", "Error occured while rendering to bitmap! Error code: " << nRet);
+ SAL_WARN("avmedia.opengl", "Error occurred while rendering to bitmap! Error code: " << nRet);
return uno::Reference< css::graphic::XGraphic >();
}
BitmapEx aBitmap = OpenGLHelper::ConvertBGRABufferToBitmapEx(pBuffer.get(), m_rHandle.viewport.width, m_rHandle.viewport.height);
diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx
index 36f5e6874fa0..f8105133658c 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -286,7 +286,7 @@ uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( c
releaseInputFiles();
if( nRet != 0 )
{
- SAL_WARN("avmedia.opengl", "Error occured while setting up the scene! Error code: " << nRet);
+ SAL_WARN("avmedia.opengl", "Error occurred while setting up the scene! Error code: " << nRet);
return uno::Reference< media::XPlayerWindow >();
}
// The background color is white by default, but we need to separate the
@@ -329,7 +329,7 @@ uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber()
releaseInputFiles();
if( nRet != 0 )
{
- SAL_WARN("avmedia.opengl", "Error occured while setting up the scene! Error code: " << nRet);
+ SAL_WARN("avmedia.opengl", "Error occurred while setting up the scene! Error code: " << nRet);
return uno::Reference< media::XFrameGrabber >();
}
glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx
index 767844ddb5b4..2c9d40ad142e 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -36,7 +36,7 @@ void SAL_CALL OGLWindow::update() throw (css::uno::RuntimeException, std::except
int nRet = gltf_prepare_renderer(&m_rHandle);
if( nRet != 0 )
{
- SAL_WARN("avmedia.opengl", "Error occured while preparing for rendering! Error code: " << nRet);
+ SAL_WARN("avmedia.opengl", "Error occurred while preparing for rendering! Error code: " << nRet);
return;
}
gltf_renderer(&m_rHandle);