summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-03-16 22:33:14 +0200
committerTor Lillqvist <tml@iki.fi>2013-03-16 22:40:42 +0200
commit2976b53ff8c815f5f6a5deba1763fba153bd528f (patch)
tree178b9b8384f71f27c39922f3a30b432034375c49 /avmedia
parent7956ff62ee9a4b82f64d19d51cccddd73bc49d1e (diff)
Bin more pointless comments and ASCII graphics
Suggested Easy Hack: Replace all instances of // -------- comments including surrounding newlines with a single newline. Another Easy Hack, slightly harder to automate: Remove all the pointless comments that just tell the class name right before the declaration of that class. Change-Id: Ia890ed613b53c5d719988697e20a983d62334123
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/inc/avmedia/mediaplayer.hxx12
-rw-r--r--avmedia/inc/avmedia/mediawindow.hxx14
-rw-r--r--avmedia/source/quicktime/window.mm62
-rw-r--r--avmedia/source/win/window.cxx86
4 files changed, 0 insertions, 174 deletions
diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx
index 9db118811edc..b823f7c63b67 100644
--- a/avmedia/inc/avmedia/mediaplayer.hxx
+++ b/avmedia/inc/avmedia/mediaplayer.hxx
@@ -24,10 +24,6 @@
#include <sfx2/dockwin.hxx>
#include <avmedia/avmediadllapi.h>
-// -----------
-// - Defines -
-// -----------
-
#define AVMEDIA_MEDIAWINDOW() \
(static_cast< ::avmedia::MediaFloater* >( ( \
SfxViewFrame::Current() && SfxViewFrame::Current()->GetChildWindow(::avmedia::MediaPlayer::GetChildWindowId())) ? \
@@ -37,10 +33,6 @@ NULL))
namespace avmedia
{
-// ---------------
-// - MediaPlayer -
-// ---------------
-
class AVMEDIA_DLLPUBLIC MediaPlayer : public SfxChildWindow
{
public:
@@ -50,10 +42,6 @@ public:
SFX_DECL_CHILDWINDOW_WITHID( MediaPlayer );
};
-// ----------------
-// - MediaFloater -
-// ----------------
-
class MediaWindow;
class AVMEDIA_DLLPUBLIC MediaFloater : public SfxDockingWindow
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx
index 89fb9ff2ff31..bafb76561275 100644
--- a/avmedia/inc/avmedia/mediawindow.hxx
+++ b/avmedia/inc/avmedia/mediawindow.hxx
@@ -29,16 +29,8 @@
#include <com/sun/star/uno/XInterface.hpp>
#include <avmedia/avmediadllapi.h>
-// -----------
-// - Defines -
-// -----------
-
#define AVMEDIA_FRAMEGRABBER_DEFAULTFRAME -1.0
-// ------------------------
-// - Forward Declarations -
-// ------------------------
-
class Window;
class KeyEvent;
class MouseEvent;
@@ -50,8 +42,6 @@ struct ExecuteDropEvent;
namespace rtl { class OUString; }
-/* Declaration of MediaWindow class */
-
namespace avmedia
{
typedef ::std::vector< ::std::pair< OUString, OUString > > FilterNameVector;
@@ -60,10 +50,6 @@ namespace avmedia
namespace priv { class MediaWindowImpl; }
- // ---------------
- // - MediaWindow -
- // ---------------
-
class AVMEDIA_DLLPUBLIC MediaWindow
{
public:
diff --git a/avmedia/source/quicktime/window.mm b/avmedia/source/quicktime/window.mm
index bdb4e08ba4ce..0950eadb9bd9 100644
--- a/avmedia/source/quicktime/window.mm
+++ b/avmedia/source/quicktime/window.mm
@@ -27,10 +27,6 @@ using namespace ::com::sun::star;
namespace avmedia { namespace quicktime {
-// -----------
-// - statics -
-// -----------
-
static ::osl::Mutex& ImplGetOwnStaticMutex()
{
static ::osl::Mutex* pMutex = NULL;
@@ -49,12 +45,6 @@ static ::osl::Mutex& ImplGetOwnStaticMutex()
return *pMutex;
}
-// ---------------
-// - Window -
-// ---------------
-
-// ------------------------------------------------------------------------------
-
Window::Window( const uno::Reference< lang::XMultiServiceFactory >& i_rxMgr, Player& i_rPlayer, NSView* i_pParentView ) :
mxMgr( i_rxMgr ),
maListeners( maMutex ),
@@ -84,8 +74,6 @@ Window::Window( const uno::Reference< lang::XMultiServiceFactory >& i_rxMgr, Pla
OSL_TRACE ("Window::Window");
}
-// ------------------------------------------------------------------------------
-
Window::~Window()
{
if( mpMovieView )
@@ -103,7 +91,6 @@ bool Window::create( const ::com::sun::star::uno::Sequence< ::com::sun::star::un
}
// XPlayerWindow
-// ------------------------------------------------------------------------------
void SAL_CALL Window::update( )
throw (uno::RuntimeException)
@@ -111,24 +98,18 @@ void SAL_CALL Window::update( )
;
}
-// ------------------------------------------------------------------------------
-
sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel )
throw (uno::RuntimeException)
{
return false;
}
-// ------------------------------------------------------------------------------
-
media::ZoomLevel SAL_CALL Window::getZoomLevel( )
throw (uno::RuntimeException)
{
return meZoomLevel;
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
throw (uno::RuntimeException)
{
@@ -136,7 +117,6 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
}
// XWindow
-// ------------------------------------------------------------------------------
void SAL_CALL Window::setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
throw (uno::RuntimeException)
@@ -151,8 +131,6 @@ void SAL_CALL Window::setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_I
}
}
-// ------------------------------------------------------------------------------
-
awt::Rectangle SAL_CALL Window::getPosSize()
throw (uno::RuntimeException)
{
@@ -166,8 +144,6 @@ awt::Rectangle SAL_CALL Window::getPosSize()
return aRet;
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::setVisible( sal_Bool )
throw (uno::RuntimeException)
{
@@ -175,112 +151,84 @@ void SAL_CALL Window::setVisible( sal_Bool )
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::setEnable( sal_Bool )
throw (uno::RuntimeException)
{
;
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::setFocus( )
throw (uno::RuntimeException)
{
OSL_TRACE ("Window::setFocus");
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
throw (uno::RuntimeException)
{
@@ -288,23 +236,18 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList
}
// XComponent
-// ------------------------------------------------------------------------------
void SAL_CALL Window::dispose( )
throw (uno::RuntimeException)
{
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
throw (uno::RuntimeException)
{
@@ -312,7 +255,6 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
}
// XServiceInfo
-// ------------------------------------------------------------------------------
::rtl::OUString SAL_CALL Window::getImplementationName( )
throw (uno::RuntimeException)
@@ -320,16 +262,12 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis
return ::rtl::OUString( AVMEDIA_QUICKTIME_WINDOW_IMPLEMENTATIONNAME );
}
-// ------------------------------------------------------------------------------
-
sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
throw (uno::RuntimeException)
{
return ( ServiceName == AVMEDIA_QUICKTIME_WINDOW_SERVICENAME );
}
-// ------------------------------------------------------------------------------
-
uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index 70757e78ffb8..0956cc1a5003 100644
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
@@ -41,10 +41,6 @@ using namespace ::com::sun::star;
namespace avmedia { namespace win {
-// -----------
-// - statics -
-// -----------
-
static ::osl::Mutex& ImplGetOwnStaticMutex()
{
static ::osl::Mutex* pMutex = NULL;
@@ -63,10 +59,6 @@ static ::osl::Mutex& ImplGetOwnStaticMutex()
return *pMutex;
}
-// -----------
-// - WndProc -
-// -----------
-
LRESULT CALLBACK MediaPlayerWndProc( HWND hWnd,UINT nMsg, WPARAM nPar1, LPARAM nPar2 )
{
Window* pWindow = (Window*) ::GetWindowLong( hWnd, 0 );
@@ -165,10 +157,6 @@ LRESULT CALLBACK MediaPlayerWndProc( HWND hWnd,UINT nMsg, WPARAM nPar1, LPARAM n
return( bProcessed ? 0 : DefWindowProc( hWnd, nMsg, nPar1, nPar2 ) );
}
-// ---------------
-// - Window -
-// ---------------
-
WNDCLASS* lcl_getWndClass()
{
static WNDCLASS* s_pWndClass = NULL;
@@ -189,8 +177,6 @@ WNDCLASS* lcl_getWndClass()
return s_pWndClass;
}
-// ------------------------------------------------------------------------------
-
Window::Window( const uno::Reference< lang::XMultiServiceFactory >& rxMgr, Player& rPlayer ) :
mxMgr( rxMgr ),
mrPlayer( rPlayer ),
@@ -205,16 +191,12 @@ Window::Window( const uno::Reference< lang::XMultiServiceFactory >& rxMgr, Playe
lcl_getWndClass();
}
-// ------------------------------------------------------------------------------
-
Window::~Window()
{
if( mnFrameWnd )
::DestroyWindow( (HWND) mnFrameWnd );
}
-// ------------------------------------------------------------------------------
-
void Window::ImplLayoutVideoWindow()
{
if( media::ZoomLevel_NOT_AVAILABLE != meZoomLevel )
@@ -300,8 +282,6 @@ void Window::ImplLayoutVideoWindow()
}
}
-// ------------------------------------------------------------------------------
-
bool Window::create( const uno::Sequence< uno::Any >& rArguments )
{
IVideoWindow* pVideoWindow = const_cast< IVideoWindow* >( mrPlayer.getVideoWindow() );
@@ -351,15 +331,11 @@ bool Window::create( const uno::Sequence< uno::Any >& rArguments )
return( mnFrameWnd != 0 );
}
-// ------------------------------------------------------------------------------
-
void Window::processGraphEvent()
{
mrPlayer.processEvent();
}
-// ------------------------------------------------------------------------------
-
void Window::updatePointer()
{
char* pCursorName;
@@ -378,16 +354,12 @@ void Window::updatePointer()
::SetCursor( ::LoadCursor( NULL, pCursorName ) );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::update( )
throw (uno::RuntimeException)
{
::RedrawWindow( (HWND) mnFrameWnd, NULL, NULL, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_UPDATENOW | RDW_ERASE );
}
-// ------------------------------------------------------------------------------
-
sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
throw (uno::RuntimeException)
{
@@ -408,24 +380,18 @@ sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
return bRet;
}
-// ------------------------------------------------------------------------------
-
media::ZoomLevel SAL_CALL Window::getZoomLevel( )
throw (uno::RuntimeException)
{
return meZoomLevel;
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
throw (uno::RuntimeException)
{
mnPointerType = nPointerType;
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 )
throw (uno::RuntimeException)
{
@@ -436,8 +402,6 @@ void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal
}
}
-// ------------------------------------------------------------------------------
-
awt::Rectangle SAL_CALL Window::getPosSize()
throw (uno::RuntimeException)
{
@@ -459,8 +423,6 @@ awt::Rectangle SAL_CALL Window::getPosSize()
return aRet;
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::setVisible( sal_Bool bVisible )
throw (uno::RuntimeException)
{
@@ -475,8 +437,6 @@ void SAL_CALL Window::setVisible( sal_Bool bVisible )
}
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::setEnable( sal_Bool bEnable )
throw (uno::RuntimeException)
{
@@ -484,8 +444,6 @@ void SAL_CALL Window::setEnable( sal_Bool bEnable )
::EnableWindow( (HWND) mnFrameWnd, bEnable );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::setFocus( )
throw (uno::RuntimeException)
{
@@ -493,127 +451,95 @@ void SAL_CALL Window::setFocus( )
::SetFocus( (HWND) mnFrameWnd );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::dispose( )
throw (uno::RuntimeException)
{
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.addInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
throw (uno::RuntimeException)
{
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-// ------------------------------------------------------------------------------
-
void Window::fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
{
::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseListener >*) 0 ) );
@@ -627,8 +553,6 @@ void Window::fireMousePressedEvent( const ::com::sun::star::awt::MouseEvent& rEv
}
}
-// -----------------------------------------------------------------------------
-
void Window::fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
{
::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseListener >*) 0 ) );
@@ -642,8 +566,6 @@ void Window::fireMouseReleasedEvent( const ::com::sun::star::awt::MouseEvent& rE
}
}
-// -----------------------------------------------------------------------------
-
void Window::fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt )
{
::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XMouseMotionListener >*) 0 ) );
@@ -657,8 +579,6 @@ void Window::fireMouseMovedEvent( const ::com::sun::star::awt::MouseEvent& rEvt
}
}
-// -----------------------------------------------------------------------------
-
void Window::fireSetFocusEvent( const ::com::sun::star::awt::FocusEvent& rEvt )
{
::cppu::OInterfaceContainerHelper* pContainer = maListeners.getContainer( getCppuType( (uno::Reference< awt::XFocusListener >*) 0 ) );
@@ -672,24 +592,18 @@ void Window::fireSetFocusEvent( const ::com::sun::star::awt::FocusEvent& rEvt )
}
}
-// ------------------------------------------------------------------------------
-
OUString SAL_CALL Window::getImplementationName( )
throw (uno::RuntimeException)
{
return OUString( AVMEDIA_WIN_WINDOW_IMPLEMENTATIONNAME );
}
-// ------------------------------------------------------------------------------
-
sal_Bool SAL_CALL Window::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return ServiceName == AVMEDIA_WIN_WINDOW_SERVICENAME;
}
-// ------------------------------------------------------------------------------
-
uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames( )
throw (uno::RuntimeException)
{