Changeset 68cb7744866cfe9f18516c186d1c84dc3667c07d

Show
Ignore:
Timestamp:
06/25/08 01:31:12 (3 months ago)
Author:
Jean-Baptiste Kempf <jb@videolan.org>
git-committer:
Jean-Baptiste Kempf <jb@videolan.org> 1214350272 -0700
git-parent:

[14440202e06ef7a26a50abbc32a0d5c3bc0d1140]

git-author:
Jean-Baptiste Kempf <jb@videolan.org> 1214350272 -0700
Message:

Resize the video to the normal size on launch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/gui/qt4/components/interface_widgets.cpp

    r4f541d3 r68cb774  
    7575 
    7676    /* The core can ask through a callback to show the video. */ 
    77     connect( this, SIGNAL(askVideoWidgetToShow()), this, SLOT(show()), Qt::BlockingQueuedConnection ); 
    78  
    79     /* The core can ask through a callback to resize the video */ 
    80    // CONNECT( this, askResize( int, int ), this, SetSizing( int, int ) ); 
     77    connect( this, SIGNAL(askVideoWidgetToShow( unsigned int, unsigned int)), 
     78             this, SLOT(SetSizing(unsigned int, unsigned int )), 
     79             Qt::BlockingQueuedConnection ); 
    8180} 
    8281 
     
    116115{ 
    117116    msg_Dbg( p_intf, "Video was requested %i, %i", *pi_x, *pi_y ); 
    118     emit askVideoWidgetToShow(); 
     117    emit askVideoWidgetToShow( *pi_width, *pi_height ); 
    119118    if( p_vout ) 
    120119    { 
     
    135134    videoSize.rwidth() = w; 
    136135    videoSize.rheight() = h; 
     136    if( isHidden() ) show(); 
    137137    updateGeometry(); // Needed for deinterlace 
    138138} 
  • modules/gui/qt4/components/interface_widgets.hpp

    rec725cd r68cb774  
    9292 
    9393signals: 
    94     void askVideoWidgetToShow(); 
    95     //void askResize(); 
     94    void askVideoWidgetToShow( unsigned int, unsigned int ); 
    9695 
    9796public slots: 
  • modules/gui/qt4/main_interface.cpp

    rea20728 r68cb774  
    693693        videoIsActive = true; 
    694694 
    695         emit askVideoToResize( *pi_width, *pi_height ); 
     695//        emit askVideoToResize( *pi_width, *pi_height ); 
    696696        emit askUpdate(); 
    697697