diff options
author | Xisco Fauli <anistenis@gmail.com> | 2011-03-08 16:47:03 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-14 14:15:00 +0000 |
commit | 5c7f1340820ebd5aba6fc994b7435e97bfaff9de (patch) | |
tree | b7e1d6e20da71b75750b72e8df69dc536e1bbb33 /avmedia | |
parent | 30015e6e0a1b47160f79a6b5b9089d4acc588fcf (diff) |
Remove dead code in libs-core
Diffstat (limited to 'avmedia')
-rw-r--r-- | avmedia/inc/avmedia/mediawindow.hxx | 1 | ||||
-rw-r--r-- | avmedia/source/framework/mediacontrol.cxx | 1 | ||||
-rw-r--r-- | avmedia/source/framework/soundhandler.cxx | 1 | ||||
-rw-r--r-- | avmedia/source/framework/soundhandler.hxx | 1 | ||||
-rw-r--r-- | avmedia/source/gstreamer/gstplayer.cxx | 1 | ||||
-rw-r--r-- | avmedia/source/gstreamer/gstwindow.cxx | 34 | ||||
-rw-r--r-- | avmedia/source/gstreamer/gstwindow.hxx | 1 | ||||
-rw-r--r-- | avmedia/source/quicktime/player.cxx | 2 | ||||
-rw-r--r-- | avmedia/source/quicktime/player.hxx | 6 | ||||
-rw-r--r-- | avmedia/source/quicktime/quicktimecommon.hxx | 1 | ||||
-rw-r--r-- | avmedia/source/quicktime/window.cxx | 2 | ||||
-rw-r--r-- | avmedia/source/viewer/mediawindowbase_impl.cxx | 6 | ||||
-rw-r--r-- | avmedia/source/win/window.cxx | 1 |
13 files changed, 1 insertions, 57 deletions
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx index fd56282d284c..5b56f1fd3aa2 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 110900071d3b..0bb5f0c93760 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 aba551d8f928..188527b20d2e 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 0544ee41071b..d76bd13df5b7 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 f6ea7295a540..227f1eca8c0c 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 4e0f6f3c3dfb..9228f9e6c9a0 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 b63e769e3fc1..18b9a7dbd0ae 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 d2ca846f053a..8b623e93c8ce 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 e7b35c9d5017..da9bbfc8ec8b 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 f0d9996c193f..1c22377efe9a 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 3f5aa3dc54d5..9b9c14ae2622 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 959b89e47cb8..07200c554f33 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 f8ddd7866098..a6f0bd85a15c 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; |