[vlc-commits] qt4: remove unused x, y parameters for video widget request

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Oct  9 22:21:08 2014 +0300| [7876f294dad70283d25e7a4f1ef04a95c768200f] | committer: Rémi Denis-Courmont

qt4: remove unused x, y parameters for video widget request

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7876f294dad70283d25e7a4f1ef04a95c768200f
---

 modules/gui/qt4/components/interface_widgets.cpp |    5 +----
 modules/gui/qt4/components/interface_widgets.hpp |    2 +-
 modules/gui/qt4/main_interface.cpp               |   14 ++++++--------
 modules/gui/qt4/main_interface.hpp               |    9 +++------
 modules/gui/qt4/qt4.cpp                          |    4 +---
 5 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index c6f208f..8c7177f 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -100,12 +100,9 @@ void VideoWidget::sync( void )
 /**
  * Request the video to avoid the conflicts
  **/
-WId VideoWidget::request( int *pi_x, int *pi_y,
-                          unsigned int *pi_width, unsigned int *pi_height,
+WId VideoWidget::request( unsigned int *pi_width, unsigned int *pi_height,
                           bool b_keep_size )
 {
-    msg_Dbg( p_intf, "Video was requested %i, %i", *pi_x, *pi_y );
-
     if( stable )
     {
         msg_Dbg( p_intf, "embedded video already in use" );
diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index 7796b2a..1ee86eb 100644
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -59,7 +59,7 @@ public:
     VideoWidget( intf_thread_t * );
     virtual ~VideoWidget();
 
-    WId request( int *, int *, unsigned int *, unsigned int *, bool );
+    WId request( unsigned int *, unsigned int *, bool );
     void  release( void );
     void  sync( void );
 
diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 8b76e5a..d99d3b7 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -203,8 +203,8 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
 
     /* VideoWidget connects for asynchronous calls */
     b_videoFullScreen = false;
-    connect( this, SIGNAL(askGetVideo(WId*,int*,int*,unsigned*,unsigned *)),
-             this, SLOT(getVideoSlot(WId*,int*,int*,unsigned*,unsigned*)),
+    connect( this, SIGNAL(askGetVideo(WId*,unsigned*,unsigned *)),
+             this, SLOT(getVideoSlot(WId*,unsigned*,unsigned*)),
              Qt::BlockingQueuedConnection );
     connect( this, SIGNAL(askReleaseVideo( void )),
              this, SLOT(releaseVideoSlot( void )),
@@ -681,8 +681,7 @@ void MainInterface::toggleFSC()
  * All window provider queries must be handled through signals or events.
  * That's why we have all those emit statements...
  */
-WId MainInterface::getVideo( int *pi_x, int *pi_y,
-                             unsigned int *pi_width, unsigned int *pi_height )
+WId MainInterface::getVideo( unsigned int *pi_width, unsigned int *pi_height )
 {
     if( !videoWidget )
         return 0;
@@ -690,11 +689,11 @@ WId MainInterface::getVideo( int *pi_x, int *pi_y,
     /* This is a blocking call signal. Results are returned through pointers.
      * Beware of deadlocks! */
     WId id;
-    emit askGetVideo( &id, pi_x, pi_y, pi_width, pi_height );
+    emit askGetVideo( &id, pi_width, pi_height );
     return id;
 }
 
-void MainInterface::getVideoSlot( WId *p_id, int *pi_x, int *pi_y,
+void MainInterface::getVideoSlot( WId *p_id,
                                   unsigned *pi_width, unsigned *pi_height )
 {
     /* Hidden or minimized, activate */
@@ -702,8 +701,7 @@ void MainInterface::getVideoSlot( WId *p_id, int *pi_x, int *pi_y,
         toggleUpdateSystrayMenu();
 
     /* Request the videoWidget */
-    WId ret = videoWidget->request( pi_x, pi_y,
-                                    pi_width, pi_height, !b_autoresize );
+    WId ret = videoWidget->request( pi_width, pi_height, !b_autoresize );
     *p_id = ret;
     if( ret ) /* The videoWidget is available */
     {
diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 12ddd0d..34ca4af 100644
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -70,8 +70,7 @@ public:
     static const QEvent::Type ToolbarsNeedRebuild;
 
     /* Video requests from core */
-    WId  getVideo( int *pi_x, int *pi_y,
-                  unsigned int *pi_width, unsigned int *pi_height );
+    WId  getVideo( unsigned int *pi_width, unsigned int *pi_height );
     void releaseVideo( void );
     int  controlVideo( int i_query, va_list args );
 
@@ -209,8 +208,7 @@ public slots:
 #endif
 
     /* Manage the Video Functions from the vout threads */
-    void getVideoSlot( WId *p_id, int *pi_x, int *pi_y,
-                       unsigned *pi_width, unsigned *pi_height );
+    void getVideoSlot( WId *p_id, unsigned *pi_width, unsigned *pi_height );
     void releaseVideoSlot( void );
 
     void emitBoss();
@@ -261,8 +259,7 @@ private slots:
     void continuePlayback();
 
 signals:
-    void askGetVideo( WId *p_id, int *pi_x, int *pi_y,
-                      unsigned *pi_width, unsigned *pi_height );
+    void askGetVideo( WId *p_id, unsigned *pi_width, unsigned *pi_height );
     void askReleaseVideo( );
     void askVideoToResize( unsigned int, unsigned int );
     void askVideoSetFullScreen( bool );
diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 385b249..9f63031 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -669,12 +669,10 @@ static int WindowOpen( vout_window_t *p_wnd, const vout_window_cfg_t *cfg )
     MainInterface *p_mi = p_intf->p_sys->p_mi;
     msg_Dbg( p_wnd, "requesting video window..." );
 
-    int i_x = cfg->x;
-    int i_y = cfg->y;
     unsigned i_width = cfg->width;
     unsigned i_height = cfg->height;
 
-    WId wid = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );
+    WId wid = p_mi->getVideo( &i_width, &i_height );
     if( !wid )
         return VLC_EGENERIC;