[Libreoffice-commits] .: avmedia/inc avmedia/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Mar 14 07:32:25 PDT 2011
avmedia/inc/avmedia/mediawindow.hxx | 1
avmedia/source/framework/mediacontrol.cxx | 1
avmedia/source/framework/soundhandler.cxx | 1
avmedia/source/framework/soundhandler.hxx | 1
avmedia/source/gstreamer/gstplayer.cxx | 1
avmedia/source/gstreamer/gstwindow.cxx | 34 -------------------------
avmedia/source/gstreamer/gstwindow.hxx | 1
avmedia/source/quicktime/player.cxx | 2 -
avmedia/source/quicktime/player.hxx | 6 ----
avmedia/source/quicktime/quicktimecommon.hxx | 1
avmedia/source/quicktime/window.cxx | 2 -
avmedia/source/viewer/mediawindowbase_impl.cxx | 8 -----
avmedia/source/win/window.cxx | 1
13 files changed, 2 insertions(+), 58 deletions(-)
New commits:
commit 0052dd56c55eeb4689c923d4cff03e295ee18c96
Author: Xisco Fauli <anistenis at gmail.com>
Date: Tue Mar 8 16:47:03 2011 +0100
Remove dead code in libs-core
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx
index 62b998b..dc4ea62 100644
--- a/avmedia/inc/avmedia/mediawindow.hxx
+++ b/avmedia/inc/avmedia/mediawindow.hxx
@@ -82,7 +82,6 @@ namespace avmedia
const ::rtl::OUString& getURL() const;
bool isValid() const;
-//
bool hasPreferredSize() const;
Size getPreferredSize() const;
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 56fac24..2afc68c 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -93,7 +93,6 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
if( MEDIACONTROLSTYLE_SINGLELINE != meControlStyle )
{
-
maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, implGetImage( AVMEDIA_IMG_OPEN ), String( AVMEDIA_RESID( AVMEDIA_STR_OPEN ) ) );
maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, HID_AVMEDIA_TOOLBOXITEM_OPEN );
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index b3203e3..5048961 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -256,7 +256,6 @@ void SAL_CALL SoundHandler::impl_initService()
{
}
-
/*-************************************************************************************************************//**
@short standard ctor
@descr These initialize a new instance of this class with needed informations for work.
diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
index decb177..67f4f6b 100644
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -119,7 +119,6 @@ class SoundHandler : // interfaces
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes () throw( css::uno::RuntimeException );
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException );
-
/* interface XServiceInfo */
virtual ::rtl::OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException );
virtual sal_Bool SAL_CALL supportsService ( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException );
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index f6ea729..227f1ec 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -295,7 +295,6 @@ bool Player::create( const ::rtl::OUString& rURL )
bRet = true;
}
-
if( bRet )
maURL = rURL;
else
diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx
index 4e0f6f3..9228f9e 100644
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
@@ -89,7 +89,6 @@ Window::~Window()
void SAL_CALL Window::update( )
throw (uno::RuntimeException)
{
- //::RedrawWindow( (HWND) mnFrameWnd, NULL, NULL, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_UPDATENOW | RDW_ERASE );
}
// ------------------------------------------------------------------------------
@@ -105,7 +104,6 @@ sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
if( eZoomLevel != meZoomLevel )
{
meZoomLevel = eZoomLevel;
- //ImplLayoutVideoWindow();
}
bRet = true;
@@ -136,11 +134,6 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType )
void SAL_CALL Window::setPosSize( sal_Int32 /*X*/, sal_Int32 /*Y*/, sal_Int32 /*Width*/, sal_Int32 /*Height*/, sal_Int16 /*Flags*/ )
throw (uno::RuntimeException)
{
-// if( mnFrameWnd )
-// {
-// ::SetWindowPos( (HWND) mnFrameWnd, HWND_TOP, X, Y, Width, Height, 0 );
-// ImplLayoutVideoWindow();
-// }
}
// ------------------------------------------------------------------------------
@@ -154,20 +147,6 @@ awt::Rectangle SAL_CALL Window::getPosSize()
aRet.Width = 320;
aRet.Height = 240;
-// if( mnFrameWnd )
-// {
-// ::RECT aWndRect;
-// long nX = 0, nY = 0, nWidth = 0, nHeight = 0;
-
-// if( ::GetClientRect( (HWND) mnFrameWnd, &aWndRect ) )
-// {
-// aRet.X = aWndRect.left;
-// aRet.Y = aWndRect.top;
-// aRet.Width = aWndRect.right - aWndRect.left + 1;
-// aRet.Height = aWndRect.bottom - aWndRect.top + 1;
-// }
-// }
-
return aRet;
}
@@ -176,15 +155,7 @@ awt::Rectangle SAL_CALL Window::getPosSize()
void SAL_CALL Window::setVisible( sal_Bool /*bVisible*/ )
throw (uno::RuntimeException)
{
-// if( mnFrameWnd )
-// {
-// IVideoWindow* pVideoWindow = const_cast< IVideoWindow* >( mrPlayer.getVideoWindow() );
-// if( pVideoWindow )
-// pVideoWindow->put_Visible( bVisible ? OATRUE : OAFALSE );
-
-// ::ShowWindow( (HWND) mnFrameWnd, bVisible ? SW_SHOW : SW_HIDE );
-// }
}
// ------------------------------------------------------------------------------
@@ -192,8 +163,6 @@ void SAL_CALL Window::setVisible( sal_Bool /*bVisible*/ )
void SAL_CALL Window::setEnable( sal_Bool /*bEnable*/ )
throw (uno::RuntimeException)
{
-// if( mnFrameWnd )
-// ::EnableWindow( (HWND) mnFrameWnd, bEnable );
}
// ------------------------------------------------------------------------------
@@ -201,8 +170,6 @@ void SAL_CALL Window::setEnable( sal_Bool /*bEnable*/ )
void SAL_CALL Window::setFocus( )
throw (uno::RuntimeException)
{
-// if( mnFrameWnd )
-// ::SetFocus( (HWND) mnFrameWnd );
}
// ------------------------------------------------------------------------------
@@ -301,7 +268,6 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-
// XComponent
// ------------------------------------------------------------------------------
diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx
index b63e769..18b9a7d 100644
--- a/avmedia/source/gstreamer/gstwindow.hxx
+++ b/avmedia/source/gstreamer/gstwindow.hxx
@@ -90,7 +90,6 @@ public:
virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
-
private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
diff --git a/avmedia/source/quicktime/player.cxx b/avmedia/source/quicktime/player.cxx
index 079307f..d77dcf2 100644
--- a/avmedia/source/quicktime/player.cxx
+++ b/avmedia/source/quicktime/player.cxx
@@ -140,7 +140,6 @@ bool Player::create( const ::rtl::OUString& rURL )
NSString* aNSStr = [[[NSString alloc] initWithCharacters: rURL.getStr() length: rURL.getLength()]stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] ;
NSURL* aURL = [NSURL URLWithString:aNSStr ];
-
NSError* pErr = nil;
mpMovie = [QTMovie movieWithURL:aURL error:&pErr];
if(mpMovie)
@@ -423,7 +422,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( )
return aSize;
}
-
// ------------------------------------------------------------------------------
uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index 204f520..f8dd0eb 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -52,8 +52,6 @@ public:
bool create( const ::rtl::OUString& rURL );
-// void processMessage( GstMessage *message );
-
// XPlayer
virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL stop( ) throw (::com::sun::star::uno::RuntimeException);
@@ -87,9 +85,7 @@ private:
::rtl::OUString maURL;
QTMovie *mpMovie; // the Movie object
- /* GST
- sal_Bool mbFakeVideo;
- */
+
float mnUnmutedVolume;
double mnStopTime;
diff --git a/avmedia/source/quicktime/quicktimecommon.hxx b/avmedia/source/quicktime/quicktimecommon.hxx
index e89bc21..c768901 100644
--- a/avmedia/source/quicktime/quicktimecommon.hxx
+++ b/avmedia/source/quicktime/quicktimecommon.hxx
@@ -78,7 +78,6 @@
// Quicktime 6.4+ in Mac OS X 10.3
#define QT64 0x06400000
-
#endif // _QUICKTIMECOMMOM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/quicktime/window.cxx b/avmedia/source/quicktime/window.cxx
index 0243540..7e09966 100644
--- a/avmedia/source/quicktime/window.cxx
+++ b/avmedia/source/quicktime/window.cxx
@@ -76,7 +76,6 @@ Window::Window( const uno::Reference< lang::XMultiServiceFactory >& i_rxMgr, Pla
::osl::MutexGuard aGuard( ImplGetOwnStaticMutex() );
-
if( mpParentView ) // sanity check
{
@@ -297,7 +296,6 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList
maListeners.removeInterface( getCppuType( &xListener ), xListener );
}
-
// XComponent
// ------------------------------------------------------------------------------
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx
index a5abf00..24f6802 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -88,7 +88,6 @@ uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl:
return xPlayer;
}
-
// ---------------------------------------------------------------------
void MediaWindowBaseImpl::setURL( const ::rtl::OUString& rURL )
@@ -405,12 +404,7 @@ void MediaWindowBaseImpl::executeMediaItem( const MediaItem& rItem )
case( MEDIASTATE_PLAY ):
case( MEDIASTATE_PLAYFFW ):
{
-/*
- const double fNewRate = ( ( MEDIASTATE_PLAYFFW == rItem.getState() ) ? AVMEDIA_FFW_PLAYRATE : 1.0 );
-
- if( getRate() != fNewRate )
- setRate( fNewRate );
-*/
+
if( !isPlaying() )
start();
}
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index ca66b0e..1f9dd0f 100644
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
@@ -371,7 +371,6 @@ void Window::updatePointer()
switch( mnPointerType )
{
case( awt::SystemPointer::CROSS ): pCursorName = IDC_CROSS; break;
- //case( awt::SystemPointer::HAND ): pCursorName = IDC_HAND; break;
case( awt::SystemPointer::MOVE ): pCursorName = IDC_SIZEALL; break;
case( awt::SystemPointer::WAIT ): pCursorName = IDC_WAIT; break;
More information about the Libreoffice-commits
mailing list