var_AddCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
/* Register callback for the intf-popupmenu variable */
- playlist_t *p_playlist = pl_Yield( p_intf );
- var_AddCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
- pl_Release( p_intf );
+ var_AddCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
/* VideoWidget connect mess to avoid different threads speaking to each other */
CONNECT( this, askReleaseVideo( void * ),
CONNECT( fullscreenControls, advancedControlsToggled( bool ),
this, doComponentsUpdate() );
- CONNECT( THEMIM->getIM(), inputUnset(),
- fullscreenControls, unregFullscreenCallback() );
-
-
/* Size and placement of interface */
QVLCTools::restoreWidgetPosition(settings,this,QSize(350,60));
var_DelCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
/* Unregister callback for the intf-popupmenu variable */
- playlist_t *p_playlist = pl_Yield( p_intf );
- var_DelCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
- pl_Release( p_intf );
+ var_DelCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
p_intf->b_interaction = false;
var_DelCallback( p_intf, "interaction", InteractCallback, this );
if( videoEmbeddedFlag )
{
videoWidget = new VideoWidget( p_intf );
- mainLayout->insertWidget( 0, videoWidget );
-
- var_Create( p_intf, "window_widget", VLC_VAR_ADDRESS );
- vlc_value_t val;
- val.p_address = this;
- var_Set( p_intf, "window_widget", val );
+ mainLayout->insertWidget( 0, videoWidget, 10 );
}
/* Finish the sizing */
{
QDialog *privacy = new QDialog();
- privacy->setWindowTitle( qtr( "Privacy and Network policies" ) );
+ privacy->setWindowTitle( qtr( "Privacy and Network Policies" ) );
QGridLayout *gLayout = new QGridLayout( privacy );
"<p>The <i>VideoLAN Team</i> doesn't like when an application goes "
"online without authorization.</p>\n "
"<p><i>VLC media player</i> can request limited information on "
- "the Internet, especially to get CD covers and songs metadata or to know "
+ "the Internet, especially to get CD covers or to know "
"if updates are available.</p>\n"
"<p><i>VLC media player</i> <b>DOES NOT</b> send or collect <b>ANY</b> "
"information, even anonymously, about your usage.</p>\n"
}
CONFIG_GENERIC( "album-art", IntegerList ); line++;
- CONFIG_GENERIC_NOBOOL( "fetch-meta", Bool ); line++;
#ifdef UPDATE_CHECK
CONFIG_GENERIC_NOBOOL( "qt-updates-notif", Bool ); line++;
CONFIG_GENERIC_NOBOOL( "qt-updates-days", Integer ); line++;
#endif
- QPushButton *ok = new QPushButton( qtr( "Ok" ) );
+ QPushButton *ok = new QPushButton( qtr( "OK" ) );
gLayout->addWidget( ok, 2, 2 );
* Thou shall not call/resize/hide widgets from on another thread.
* This is wrong, and this is TEH reason to emit signals on those Video Functions
**/
-/* function called from ::DoRequest in order to show a nice VideoWidget
- at the good size */
void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
int *pi_y, unsigned int *pi_width,
unsigned int *pi_height )
#endif
videoIsActive = true;
- emit askVideoToResize( *pi_width, *pi_height );
+// emit askVideoToResize( *pi_width, *pi_height );
emit askUpdate();
- fullscreenControls->regFullscreenCallback( p_nvout );
+ fullscreenControls->attachVout( p_nvout );
}
return ret;
}
-/* function called from ::DoRequest in order to show a nice VideoWidget
- at the good size */
-void MainInterface::requestNotEmbeddedVideo( vout_thread_t *p_nvout )
-{
- fullscreenControls->regFullscreenCallback( p_nvout );
-}
-
-void MainInterface::releaseVideo( void *p_win )
+void MainInterface::releaseVideo( vout_thread_t *p_vout, void *p_win )
{
+ fullscreenControls->detachVout( p_vout );
emit askReleaseVideo( p_win );
}
void MainInterface::toggleMinimalView()
{
+ /* HACK for minimalView, see menus.cpp */
+ if( !menuBar()->isVisible() ) QVLCMenu::minimalViewAction->toggle();
TOGGLEV( menuBar() );
TOGGLEV( controls );
TOGGLEV( statusBar() );