vlc/vlc-2.2 | branch: master | Erwan Tulou <erwa...@videolan.org> | Tue Oct 21 18:44:54 2014 +0200| [771558d086d007aebb0ed7d532b4839bd175e539] | committer: Erwan Tulou
Revert "skins2: use new vout_window_ReportSize" This reverts commit 6ddc0f39482dfd88b1bebbeb9246ac63abbd03c5. > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=771558d086d007aebb0ed7d532b4839bd175e539 --- modules/gui/skins2/src/vout_window.cpp | 12 ------------ modules/gui/skins2/src/vout_window.hpp | 3 --- 2 files changed, 15 deletions(-) diff --git a/modules/gui/skins2/src/vout_window.cpp b/modules/gui/skins2/src/vout_window.cpp index ef58c07..e209363 100644 --- a/modules/gui/skins2/src/vout_window.cpp +++ b/modules/gui/skins2/src/vout_window.cpp @@ -77,7 +77,6 @@ void VoutWindow::setCtrlVideo( CtrlVideo* pCtrlVideo ) setParent( pCtrlVideo->getWindow(), x, y, w, h ); m_pParentWindow = pCtrlVideo->getWindow(); - resize( w, h ); show(); } else @@ -90,8 +89,6 @@ void VoutWindow::setCtrlVideo( CtrlVideo* pCtrlVideo ) 0, 0, w, h ); m_pParentWindow = VoutManager::instance( getIntf() )->getVoutMainWindow(); - - resize( w, h ); show(); } @@ -99,15 +96,6 @@ void VoutWindow::setCtrlVideo( CtrlVideo* pCtrlVideo ) } -void VoutWindow::resize( int width, int height ) -{ - GenericWindow::resize( width, height ); - - if( m_pWnd ) - vout_window_ReportSize( m_pWnd, width, height ); -} - - void VoutWindow::processEvent( EvtKey &rEvtKey ) { // Only do the action when the key is down diff --git a/modules/gui/skins2/src/vout_window.hpp b/modules/gui/skins2/src/vout_window.hpp index 5b78277..bdd2fe6 100644 --- a/modules/gui/skins2/src/vout_window.hpp +++ b/modules/gui/skins2/src/vout_window.hpp @@ -68,9 +68,6 @@ public: virtual void setOriginalWidth( int width ) { original_width = width; } virtual void setOriginalHeight( int height ) { original_height = height; } - /// Resize the window - virtual void resize( int width, int height ); - virtual string getType() const { return "Vout"; } private: _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits