summaryrefslogtreecommitdiffstats
path: root/avmedia/source/quicktime
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 09:21:53 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 08:11:34 +0000
commit538f276ae0414ea34ede6090b5f56e8fecd6fc65 (patch)
treeefbfb952f3236a6f56540ddae6a896c8c73774a0 /avmedia/source/quicktime
parentFix tdf#97500 Reinstate missing file error dialog on WebDAV (diff)
downloadcore-538f276ae0414ea34ede6090b5f56e8fecd6fc65.tar.gz
core-538f276ae0414ea34ede6090b5f56e8fecd6fc65.zip
Formatting changes across all modules
+ Removed comment cruft + Tab formatting in number of files + Some commented out code removed + Tab characters replaced with spaces + Newline cleanup in quite a few files + Tweak header guard #endifs Change-Id: I3208ff2f047da890edcc49b73389aca22442f5fc Reviewed-on: https://gerrit.libreoffice.org/22221 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'avmedia/source/quicktime')
-rw-r--r--avmedia/source/quicktime/framegrabber.hxx4
-rw-r--r--avmedia/source/quicktime/framegrabber.mm9
-rw-r--r--avmedia/source/quicktime/manager.hxx3
-rw-r--r--avmedia/source/quicktime/manager.mm8
-rw-r--r--avmedia/source/quicktime/player.hxx6
-rw-r--r--avmedia/source/quicktime/player.mm26
-rw-r--r--avmedia/source/quicktime/window.hxx4
7 files changed, 0 insertions, 60 deletions
diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx
index 0a697c1aed43..7d2a8df902c7 100644
--- a/avmedia/source/quicktime/framegrabber.hxx
+++ b/avmedia/source/quicktime/framegrabber.hxx
@@ -27,10 +27,6 @@
namespace avmedia { namespace quicktime {
-
-// - FrameGrabber -
-
-
class FrameGrabber : public ::cppu::WeakImplHelper< css::media::XFrameGrabber,
css::lang::XServiceInfo >
{
diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm
index e3cc4809bccb..2fd457bbf092 100644
--- a/avmedia/source/quicktime/framegrabber.mm
+++ b/avmedia/source/quicktime/framegrabber.mm
@@ -35,9 +35,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9
namespace avmedia { namespace quicktime {
-// - FrameGrabber -
-
-
FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxMgr( rxMgr )
{
@@ -49,7 +46,6 @@ FrameGrabber::FrameGrabber( const uno::Reference< lang::XMultiServiceFactory >&
}
-
FrameGrabber::~FrameGrabber()
{
if( mbInitialized )
@@ -63,7 +59,6 @@ FrameGrabber::~FrameGrabber()
}
-
bool FrameGrabber::create( const ::rtl::OUString& rURL )
{
bool bRet = false;
@@ -87,7 +82,6 @@ bool FrameGrabber::create( const ::rtl::OUString& rURL )
}
-
uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime )
throw (uno::RuntimeException)
{
@@ -108,7 +102,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
}
-
::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( )
throw (uno::RuntimeException)
{
@@ -116,7 +109,6 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
}
-
sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
{
@@ -124,7 +116,6 @@ sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceN
}
-
uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx
index 0ab910c0be94..215e14c47017 100644
--- a/avmedia/source/quicktime/manager.hxx
+++ b/avmedia/source/quicktime/manager.hxx
@@ -26,9 +26,6 @@
#include "com/sun/star/media/XManager.hpp"
-// - Manager -
-
-
namespace avmedia { namespace quicktime {
class Manager : public ::cppu::WeakImplHelper< css::media::XManager,
diff --git a/avmedia/source/quicktime/manager.mm b/avmedia/source/quicktime/manager.mm
index b7081844f783..1426020a5be7 100644
--- a/avmedia/source/quicktime/manager.mm
+++ b/avmedia/source/quicktime/manager.mm
@@ -26,9 +26,6 @@ using namespace ::com::sun::star;
namespace avmedia { namespace quicktime {
-// - Manager -
-
-
Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxMgr( rxMgr )
{
@@ -36,13 +33,11 @@ Manager::Manager( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
}
-
Manager::~Manager()
{
}
-
uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL )
throw (uno::RuntimeException)
{
@@ -59,7 +54,6 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
}
-
::rtl::OUString SAL_CALL Manager::getImplementationName( )
throw (uno::RuntimeException)
{
@@ -67,7 +61,6 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU
}
-
sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
{
@@ -75,7 +68,6 @@ sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
}
-
uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index 11e12faf4349..636efb034fee 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -26,12 +26,6 @@
namespace avmedia { namespace quicktime {
-/*
-
-// - Player -
-
-*/
-
class Player : public ::cppu::WeakImplHelper< css::media::XPlayer,
css::lang::XServiceInfo >
{
diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm
index b5cd5f1e4df1..0c32df1e1444 100644
--- a/avmedia/source/quicktime/player.mm
+++ b/avmedia/source/quicktime/player.mm
@@ -29,16 +29,9 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9
namespace avmedia { namespace quicktime {
-
-// - Player -
-
-
Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
mxMgr( rxMgr ),
mpMovie( nil ),
- /* GST
- mbFakeVideo (false ),
- */
mnUnmutedVolume( 0 ),
mnStopTime( DBL_MAX ), //max double
mbMuted( false ),
@@ -51,7 +44,6 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
}
-
Player::~Player()
{
if( mpMovie )
@@ -69,7 +61,6 @@ QTMovie* Player::getMovie()
}
-
bool Player::create( const ::rtl::OUString& rURL )
{
bool bRet = false;
@@ -109,7 +100,6 @@ bool Player::create( const ::rtl::OUString& rURL )
}
-
void SAL_CALL Player::start( )
throw (uno::RuntimeException)
{
@@ -122,7 +112,6 @@ void SAL_CALL Player::start( )
}
-
void SAL_CALL Player::stop( )
throw (uno::RuntimeException)
{
@@ -134,7 +123,6 @@ void SAL_CALL Player::stop( )
}
-
sal_Bool SAL_CALL Player::isPlaying()
throw (uno::RuntimeException)
{
@@ -152,7 +140,6 @@ sal_Bool SAL_CALL Player::isPlaying()
}
-
double SAL_CALL Player::getDuration( )
throw (uno::RuntimeException)
{
@@ -169,7 +156,6 @@ double SAL_CALL Player::getDuration( )
}
-
void SAL_CALL Player::setMediaTime( double fTime )
throw (uno::RuntimeException)
{
@@ -182,7 +168,6 @@ void SAL_CALL Player::setMediaTime( double fTime )
}
-
double SAL_CALL Player::getMediaTime( )
throw (uno::RuntimeException)
{
@@ -219,7 +204,6 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
}
-
sal_Bool SAL_CALL Player::isPlaybackLoop( )
throw (uno::RuntimeException)
{
@@ -232,7 +216,6 @@ sal_Bool SAL_CALL Player::isPlaybackLoop( )
}
-
void SAL_CALL Player::setMute( sal_Bool bSet )
throw (uno::RuntimeException)
{
@@ -251,7 +234,6 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
}
-
sal_Bool SAL_CALL Player::isMute( )
throw (uno::RuntimeException)
{
@@ -261,7 +243,6 @@ sal_Bool SAL_CALL Player::isMute( )
}
-
void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
throw (uno::RuntimeException)
{
@@ -288,7 +269,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB )
}
-
sal_Int16 SAL_CALL Player::getVolumeDB( )
throw (uno::RuntimeException)
{
@@ -313,7 +293,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB( )
}
-
awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( )
throw (uno::RuntimeException)
{
@@ -323,7 +302,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( )
}
-
uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
throw (uno::RuntimeException)
{
@@ -348,7 +326,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
}
-
uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
throw (css::uno::RuntimeException)
{
@@ -371,7 +348,6 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
}
-
::rtl::OUString SAL_CALL Player::getImplementationName( )
throw (uno::RuntimeException)
{
@@ -379,7 +355,6 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( )
}
-
sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
{
@@ -387,7 +362,6 @@ sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
}
-
uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx
index 4268b358c55b..cbcb9ee2faf9 100644
--- a/avmedia/source/quicktime/window.hxx
+++ b/avmedia/source/quicktime/window.hxx
@@ -28,10 +28,6 @@
namespace avmedia { namespace quicktime {
-
-// - Window -
-
-
class Player;
class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow,