Changeset 2ddb54ad55c123337dee1c58f965cd8802f6246f

Show
Ignore:
Timestamp:
24/04/04 18:28:21 (5 years ago)
Author:
Jean-Paul Saman <jpsaman@videolan.org>
git-committer:
Jean-Paul Saman <jpsaman@videolan.org> 1082824101 +0000
git-parent:

[4526bdb8d557c189aa1aa2833475e01a79970f0f]

git-author:
Jean-Paul Saman <jpsaman@videolan.org> 1082824101 +0000
Message:

Properly attach and detach the qte_main object

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/misc/qte_main.cpp

    rd9043cc r2ddb54a  
    117117    vlc_mutex_unlock( (vlc_mutex_t *) lockval.p_address ); 
    118118 
     119    vlc_object_attach( p_qte_main, p_this ); 
     120    msg_Dbg( p_this, "qte_main running" ); 
     121 
    119122    return VLC_SUCCESS; 
    120123} 
    …… 
    143146    delete p_qte_main->p_qte_widget; 
    144147    delete p_qte_main->p_qte_application; 
     148 
     149    msg_Dbg( p_this, "Detaching qte_main" ); 
     150    vlc_object_detach( p_qte_main ); 
    145151 
    146152    vlc_object_destroy( p_qte_main ); 
    …… 
    176182    } 
    177183 
    178     QWidget* pWidget = new QWidget(); 
     184    QWidget* pWidget = new QWidget(0, _("video") ); 
    179185    if(pWidget) 
    180186    { 
    …… 
    182188    } 
    183189 
    184     if (p_this->b_gui_server) { 
    185         p_this->p_qte_application->desktop()->setFixedSize(240, 320); 
    186     } 
    187190    /* signal the creation of the window */ 
    188191    p_this->p_qte_application->setMainWidget(p_this->p_qte_widget);