/**
* 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" );
/* 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 )),
* 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;
/* 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 */
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 */
{
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 );
#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();
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 );