Commit 537d41a4 authored by Pierre Lamot's avatar Pierre Lamot Committed by Pierre Lamot
Browse files

qt: load Qt in a detached structure from the interface module.

  this will allow to unload the interface module without unloading Qt in a
  further patch.

  the new structure is still a vlc object as we use it notably for logging
  capacity and to interact with vlc variables
parent 4044fe3b
......@@ -64,7 +64,7 @@ BookmarksDialog::BookmarksDialog( qt_intf_t *_p_intf ):QVLCFrame( _p_intf )
bookmarksList = new QTreeView( this );
m_model = new MLBookmarkModel( vlc_ml_instance_get(_p_intf ),
_p_intf->p_sys->p_player,
_p_intf->p_player,
bookmarksList );
bookmarksList->setModel( m_model );
bookmarksList->setRootIsDecorated( false );
......
......@@ -251,7 +251,7 @@ const QEvent::Type DialogEvent::DialogEvent_Type =
void DialogsProvider::prefsDialog()
{
PrefsDialog *p = new PrefsDialog( (QWidget *)p_intf->p_sys->p_mi, p_intf );
PrefsDialog *p = new PrefsDialog( (QWidget *)p_intf->p_mi, p_intf );
p->toggleVisible();
}
......@@ -334,7 +334,7 @@ void DialogsProvider::mediaInfoDialog( const PlaylistItem& pItem )
if( p_input )
{
MediaInfoDialog * const mid = new MediaInfoDialog( p_intf, p_input );
mid->setParent( p_intf->p_sys->p_mi, Qt::Dialog );
mid->setParent( p_intf->p_mi, Qt::Dialog );
mid->showTab( MediaInfoDialog::META_PANEL );
}
}
......@@ -424,7 +424,7 @@ void DialogsProvider::openFileGenericDialog( intf_dialog_args_t *p_arg )
{
QString file = getSaveFileName( NULL,
qfu( p_arg->psz_title ),
p_intf->p_sys->filepath, extensions );
p_intf->filepath, extensions );
if( !file.isEmpty() )
{
p_arg->i_results = 1;
......@@ -437,14 +437,14 @@ void DialogsProvider::openFileGenericDialog( intf_dialog_args_t *p_arg )
else /* non-save mode */
{
QList<QUrl> urls = QFileDialog::getOpenFileUrls( NULL, qfu( p_arg->psz_title ),
p_intf->p_sys->filepath, extensions );
p_intf->filepath, extensions );
p_arg->i_results = urls.count();
p_arg->psz_results = (char **)vlc_alloc( p_arg->i_results, sizeof( char * ) );
i = 0;
foreach( const QUrl &uri, urls )
p_arg->psz_results[i++] = strdup( uri.toEncoded().constData() );
if( !urls.isEmpty() )
p_intf->p_sys->filepath = urls.last();
p_intf->filepath = urls.last();
}
/* Callback */
......@@ -469,7 +469,7 @@ void DialogsProvider::openFileGenericDialog( intf_dialog_args_t *p_arg )
void DialogsProvider::openDialog( int i_tab )
{
OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf )->showTab( i_tab );
OpenDialog::getInstance( p_intf->p_mi , p_intf )->showTab( i_tab );
}
void DialogsProvider::openDialog()
{
......@@ -495,7 +495,7 @@ void DialogsProvider::openCaptureDialog()
/* Same as the open one, but force the enqueue */
void DialogsProvider::PLAppendDialog( int tab )
{
OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false,
OpenDialog::getInstance( p_intf->p_mi, p_intf, false,
OPEN_AND_ENQUEUE )->showTab( tab );
}
......@@ -528,11 +528,11 @@ QStringList DialogsProvider::showSimpleOpen( const QString& help,
QList<QUrl> urls = QFileDialog::getOpenFileUrls( NULL,
help.isEmpty() ? qfut(I_OP_SEL_FILES ) : help,
path.isEmpty() ? p_intf->p_sys->filepath : path,
path.isEmpty() ? p_intf->filepath : path,
fileTypes );
if( !urls.isEmpty() )
p_intf->p_sys->filepath = urls.last();
p_intf->filepath = urls.last();
QStringList res;
foreach( const QUrl &url, urls )
......@@ -600,12 +600,12 @@ QString DialogsProvider::getDirectoryDialog( qt_intf_t *p_intf )
{
const QStringList schemes = QStringList(QStringLiteral("file"));
QUrl dirurl = QFileDialog::getExistingDirectoryUrl( NULL,
qfut( I_OP_DIR_WINTITLE ), p_intf->p_sys->filepath,
qfut( I_OP_DIR_WINTITLE ), p_intf->filepath,
QFileDialog::ShowDirsOnly, schemes );
if( dirurl.isEmpty() ) return QString();
p_intf->p_sys->filepath = dirurl;
p_intf->filepath = dirurl;
QString dir = dirurl.toLocalFile();
const char *scheme = "directory";
......@@ -669,7 +669,7 @@ void DialogsProvider::savePlayingToPlaylist()
QString selected;
QString file = getSaveFileName( NULL,
qtr( "Save playlist as..." ),
p_intf->p_sys->filepath, filters.join( ";;" ),
p_intf->filepath, filters.join( ";;" ),
&selected );
const char *psz_selected_module = NULL;
const char *psz_last_playlist_ext = NULL;
......@@ -706,11 +706,11 @@ void DialogsProvider::savePlayingToPlaylist()
if ( psz_selected_module )
{
vlc_playlist_Lock( p_intf->p_sys->p_playlist );
vlc_playlist_Export( p_intf->p_sys->p_playlist,
vlc_playlist_Lock( p_intf->p_playlist );
vlc_playlist_Export( p_intf->p_playlist,
qtu( toNativeSeparators( file ) ),
psz_selected_module );
vlc_playlist_Unlock( p_intf->p_sys->p_playlist );
vlc_playlist_Unlock( p_intf->p_playlist );
getSettings()->setValue( "last-playlist-ext", psz_last_playlist_ext );
}
}
......@@ -788,13 +788,13 @@ void DialogsProvider::streamingDialog(const QList<QUrl> &urls, bool b_stream )
void DialogsProvider::openAndStreamingDialogs()
{
OpenDialog::getInstance( p_intf->p_sys->p_mi, p_intf, false, OPEN_AND_STREAM )
OpenDialog::getInstance( p_intf->p_mi, p_intf, false, OPEN_AND_STREAM )
->showTab( OPEN_FILE_TAB );
}
void DialogsProvider::openAndTranscodingDialogs()
{
OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf, false, OPEN_AND_SAVE )
OpenDialog::getInstance( p_intf->p_mi , p_intf, false, OPEN_AND_SAVE )
->showTab( OPEN_FILE_TAB );
}
......
......@@ -176,8 +176,8 @@ void EpgDialog::updateInfos()
{
input_item_t *media = NULL;
{
vlc_player_locker lock{ p_intf->p_sys->p_player };
media = vlc_player_HoldCurrentMedia( p_intf->p_sys->p_player ); /* w/hold */
vlc_player_locker lock{ p_intf->p_player };
media = vlc_player_HoldCurrentMedia( p_intf->p_player ); /* w/hold */
}
if( media )
......
......@@ -34,7 +34,7 @@
#include <QPushButton>
ErrorsDialog::ErrorsDialog( qt_intf_t *_p_intf )
: QVLCDialog( (QWidget*)_p_intf->p_sys->p_mi, _p_intf )
: QVLCDialog( (QWidget*)_p_intf->p_mi, _p_intf )
{
setWindowTitle( qtr( "Errors" ) );
setWindowRole( "vlc-errors" );
......
......@@ -38,7 +38,7 @@
#include <vlc_modules.h>
ExtendedDialog::ExtendedDialog( qt_intf_t *_p_intf )
: QVLCDialog( (QWidget*)_p_intf->p_sys->p_mi, _p_intf )
: QVLCDialog( (QWidget*)_p_intf->p_mi, _p_intf )
{
#ifdef __APPLE__
setWindowFlags( Qt::Drawer );
......@@ -137,7 +137,7 @@ ExtendedDialog::ExtendedDialog( qt_intf_t *_p_intf )
{
resize( QSize( 400, 280 ) );
MainInterface *p_mi = p_intf->p_sys->p_mi;
MainInterface *p_mi = p_intf->p_mi;
if( p_mi && p_mi->x() > 50 )
move( ( p_mi->x() - frameGeometry().width() - 10 ), p_mi->y() );
else
......
......@@ -369,7 +369,7 @@ void ExtVideo::browseLogo()
.arg( TITLE_EXTENSIONS_IMAGE )
.arg( TITLE_EXTENSIONS_ALL );
QString file = QFileDialog::getOpenFileUrl( NULL, qtr( "Logo filenames" ),
p_intf->p_sys->filepath, filter,
p_intf->filepath, filter,
NULL, QFileDialog::Options(), schemes ).toLocalFile();
UPDATE_AND_APPLY_TEXT( logoFileText, file );
......@@ -382,7 +382,7 @@ void ExtVideo::browseEraseFile()
.arg( TITLE_EXTENSIONS_IMAGE )
.arg( TITLE_EXTENSIONS_ALL );
QString file = QFileDialog::getOpenFileUrl( NULL, qtr( "Image mask" ),
p_intf->p_sys->filepath, filter,
p_intf->filepath, filter,
NULL, QFileDialog::Options(), schemes ).toLocalFile();
UPDATE_AND_APPLY_TEXT( eraseMaskText, file );
......@@ -623,8 +623,8 @@ void ExtV4l2::showEvent( QShowEvent *event )
void ExtV4l2::Refresh( void )
{
vlc_player_Lock(p_intf->p_sys->p_player);
vlc_object_t *p_obj = vlc_player_GetV4l2Object(p_intf->p_sys->p_player);
vlc_player_Lock(p_intf->p_player);
vlc_object_t *p_obj = vlc_player_GetV4l2Object(p_intf->p_player);
help->hide();
if( box )
{
......@@ -774,7 +774,7 @@ void ExtV4l2::Refresh( void )
if ( isVisible() )
QTimer::singleShot( 2000, this, SLOT(Refresh()) );
}
vlc_player_Unlock(p_intf->p_sys->p_player);
vlc_player_Unlock(p_intf->p_player);
}
void ExtV4l2::ValueChange( bool value )
......@@ -785,8 +785,8 @@ void ExtV4l2::ValueChange( bool value )
void ExtV4l2::ValueChange( int value )
{
QObject *s = sender();
vlc_player_Lock(p_intf->p_sys->p_player);
vlc_object_t *p_obj = vlc_player_GetV4l2Object(p_intf->p_sys->p_player);
vlc_player_Lock(p_intf->p_player);
vlc_object_t *p_obj = vlc_player_GetV4l2Object(p_intf->p_player);
if( p_obj )
{
QString var = s->objectName();
......@@ -808,11 +808,11 @@ void ExtV4l2::ValueChange( int value )
var_TriggerCallback( p_obj, qtu( var ) );
break;
}
vlc_player_Unlock(p_intf->p_sys->p_player);
vlc_player_Unlock(p_intf->p_player);
}
else
{
vlc_player_Unlock(p_intf->p_sys->p_player);
vlc_player_Unlock(p_intf->p_player);
msg_Warn( p_intf, "Oops, v4l2 object isn't available anymore" );
Refresh();
}
......@@ -963,7 +963,7 @@ void AudioFilterControlWidget::enable( bool b_enable )
QString result = ChangeFiltersString( p_intf, "audio-filter", qtu(name),
b_enable );
emit configChanged( qfu("audio-filter"), result );
vlc_player_aout_EnableFilter( p_intf->p_sys->p_player, qtu(name), b_enable );
vlc_player_aout_EnableFilter( p_intf->p_player, qtu(name), b_enable );
}
/**********************************************************************
......
......@@ -35,7 +35,7 @@
#include <QPushButton>
GotoTimeDialog::GotoTimeDialog( qt_intf_t *_p_intf)
: QVLCDialog( (QWidget*)_p_intf->p_sys->p_mi, _p_intf )
: QVLCDialog( (QWidget*)_p_intf->p_mi, _p_intf )
{
setWindowFlags( Qt::Tool );
setWindowTitle( qtr( "Go to Time" ) );
......
......@@ -78,7 +78,7 @@ HelpDialog::~HelpDialog()
}
AboutDialog::AboutDialog( qt_intf_t *_p_intf)
: QVLCDialog( (QWidget*)_p_intf->p_sys->p_mi, _p_intf ), b_advanced( false )
: QVLCDialog( (QWidget*)_p_intf->p_mi, _p_intf ), b_advanced( false )
{
/* Build UI */
ui.setupUi( this );
......
......@@ -42,6 +42,9 @@
#include <vlc_common.h>
#include <vlc_input_item.h>
#include <vlc_playlist.h>
#include <vlc_interface.h>
#include "dialogs/messages/messages.hpp"
......@@ -385,7 +388,7 @@ void MessagesDialog::updatePLTree()
{
pldebugTree->clear();
{
vlc_playlist_t* playlist = p_intf->p_sys->p_playlist;
vlc_playlist_t* playlist = p_intf->p_playlist;
vlc_playlist_Lock(playlist);
size_t count = vlc_playlist_Count( playlist );
for (size_t i = 0; i < count; i++)
......
......@@ -130,7 +130,7 @@ inline void FileOpenPanel::BuildOldPanel()
/* Make this QFileDialog a child of tempWidget from the ui. */
dialogBox = new FileOpenBox( ui.tempWidget, NULL,
p_intf->p_sys->filepath, "" );
p_intf->filepath, "" );
dialogBox->setFileMode( QFileDialog::ExistingFiles );
dialogBox->setAcceptMode( QFileDialog::AcceptOpen );
......@@ -245,7 +245,7 @@ void FileOpenPanel::browseFile()
);
item->setFlags( Qt::ItemIsEnabled );
ui.fileListWidg->addItem( item );
p_intf->p_sys->filepath = url;
p_intf->filepath = url;
}
updateButtons();
updateMRL();
......@@ -269,7 +269,7 @@ void FileOpenPanel::removeFile()
void FileOpenPanel::browseFileSub()
{
QStringList urls = THEDP->showSimpleOpen( qtr("Open subtitle file"),
EXT_FILTER_SUBTITLE, p_intf->p_sys->filepath );
EXT_FILTER_SUBTITLE, p_intf->filepath );
if( urls.isEmpty() ) {
return;
......@@ -310,7 +310,7 @@ void FileOpenPanel::updateMRL()
void FileOpenPanel::accept()
{
if( dialogBox )
p_intf->p_sys->filepath = dialogBox->directory().absolutePath();
p_intf->filepath = dialogBox->directory().absolutePath();
ui.fileListWidg->clear();
urlList.clear();
}
......@@ -649,7 +649,7 @@ void DiscOpenPanel::browseDevice()
{
const QStringList schemes = QStringList(QStringLiteral("file"));
QString dir = QFileDialog::getExistingDirectoryUrl( this,
qfut( I_DEVICE_TOOLTIP ), p_intf->p_sys->filepath,
qfut( I_DEVICE_TOOLTIP ), p_intf->filepath,
QFileDialog::ShowDirsOnly, schemes ).toLocalFile();
if( !dir.isEmpty() )
{
......
......@@ -41,7 +41,7 @@
OpenUrlDialog::OpenUrlDialog( qt_intf_t *_p_intf,
bool _bClipboard ) :
QVLCDialog( (QWidget*)_p_intf->p_sys->p_mi, _p_intf ), bClipboard( _bClipboard )
QVLCDialog( (QWidget*)_p_intf->p_mi, _p_intf ), bClipboard( _bClipboard )
{
setWindowTitle( qtr( "Open URL" ) );
setWindowRole( "vlc-open-url" );
......
......@@ -47,7 +47,7 @@
PlaylistsDialog::PlaylistsDialog(qt_intf_t * _p_intf) : QVLCFrame(_p_intf)
{
MainInterface * mainInterface = p_intf->p_sys->p_mi;
MainInterface * mainInterface = p_intf->p_mi;
assert(mainInterface->hasMediaLibrary());
......
......@@ -26,7 +26,7 @@
#include "podcast_configuration.hpp"
PodcastConfigDialog::PodcastConfigDialog( qt_intf_t *_p_intf)
: QVLCDialog( (QWidget*)_p_intf->p_sys->p_mi, _p_intf )
: QVLCDialog( (QWidget*)_p_intf->p_mi, _p_intf )
{
ui.setupUi( this );
......
......@@ -310,8 +310,8 @@ void PrefsDialog::save()
qtr("Preferences file could not be saved") );
}
if( p_intf->p_sys->p_mi )
p_intf->p_sys->p_mi->reloadPrefs();
if( p_intf->p_mi )
p_intf->p_mi->reloadPrefs();
accept();
QVLCTools::saveWidgetPosition( p_intf, "Preferences", this );
......
......@@ -850,14 +850,14 @@ SPrefsPanel::SPrefsPanel( qt_intf_t *_p_intf, QWidget *_parent,
CONFIG_BOOL( "metadata-network-access", MetadataNetworkAccessMode );
CONFIG_BOOL( "qt-menubar", menuBarCheck );
ui.pinVideoControlsCheckbox->setChecked( p_intf->p_sys->p_mi->pinVideoControls() );
ui.pinVideoControlsCheckbox->setChecked( p_intf->p_mi->pinVideoControls() );
m_resetters.push_back(std::make_unique<PropertyResetter>(ui.pinVideoControlsCheckbox, "checked"));
QObject::connect( ui.pinVideoControlsCheckbox, &QCheckBox::stateChanged, p_intf->p_sys->p_mi, &MainInterface::setPinVideoControls );
QObject::connect( ui.pinVideoControlsCheckbox, &QCheckBox::stateChanged, p_intf->p_mi, &MainInterface::setPinVideoControls );
ui.colorSchemeComboBox->insertItems(0, p_intf->p_sys->p_mi->getColorScheme()->stringList());
ui.colorSchemeComboBox->setCurrentText( p_intf->p_sys->p_mi->getColorScheme()->getCurrent() );
ui.colorSchemeComboBox->insertItems(0, p_intf->p_mi->getColorScheme()->stringList());
ui.colorSchemeComboBox->setCurrentText( p_intf->p_mi->getColorScheme()->getCurrent() );
m_resetters.push_back(std::make_unique<PropertyResetter>( ui.colorSchemeComboBox, "currentIndex" ));
QObject::connect( ui.colorSchemeComboBox, &QComboBox::currentTextChanged, p_intf->p_sys->p_mi->getColorScheme(), &ColorSchemeModel::setCurrent );
QObject::connect( ui.colorSchemeComboBox, &QComboBox::currentTextChanged, p_intf->p_mi->getColorScheme(), &ColorSchemeModel::setCurrent );
const float intfScaleFloatFactor = 100.f;
const auto updateIntfUserScaleFactorFromControls =
......@@ -873,21 +873,21 @@ SPrefsPanel::SPrefsPanel( qt_intf_t *_p_intf, QWidget *_parent,
QSignalBlocker s( spinBox );
spinBox->setValue( value );
}
p_intf->p_sys->p_mi->setIntfUserScaleFactor( value / intfScaleFloatFactor );
p_intf->p_mi->setIntfUserScaleFactor( value / intfScaleFloatFactor );
};
ui.intfScaleFactorSlider->setRange( p_intf->p_sys->p_mi->getMinIntfUserScaleFactor() * intfScaleFloatFactor
, p_intf->p_sys->p_mi->getMaxIntfUserScaleFactor() * intfScaleFloatFactor);
ui.intfScaleFactorSpinBox->setRange( p_intf->p_sys->p_mi->getMinIntfUserScaleFactor() * intfScaleFloatFactor
, p_intf->p_sys->p_mi->getMaxIntfUserScaleFactor() * intfScaleFloatFactor);
ui.intfScaleFactorSlider->setRange( p_intf->p_mi->getMinIntfUserScaleFactor() * intfScaleFloatFactor
, p_intf->p_mi->getMaxIntfUserScaleFactor() * intfScaleFloatFactor);
ui.intfScaleFactorSpinBox->setRange( p_intf->p_mi->getMinIntfUserScaleFactor() * intfScaleFloatFactor
, p_intf->p_mi->getMaxIntfUserScaleFactor() * intfScaleFloatFactor);
updateIntfUserScaleFactorFromControls( p_intf->p_sys->p_mi->getIntfUserScaleFactor() * intfScaleFloatFactor );
updateIntfUserScaleFactorFromControls( p_intf->p_mi->getIntfUserScaleFactor() * intfScaleFloatFactor );
m_resetters.push_back( std::make_unique<PropertyResetter>( ui.intfScaleFactorSlider, "value" ) );
QObject::connect( ui.intfScaleFactorSlider, QOverload<int>::of(&QSlider::valueChanged)
, p_intf->p_sys->p_mi , updateIntfUserScaleFactorFromControls );
, p_intf->p_mi , updateIntfUserScaleFactorFromControls );
QObject::connect( ui.intfScaleFactorSpinBox, QOverload<int>::of(&QSpinBox::valueChanged)
, p_intf->p_sys->p_mi , updateIntfUserScaleFactorFromControls );
, p_intf->p_mi , updateIntfUserScaleFactorFromControls );
#if QT_CLIENT_SIDE_DECORATION_AVAILABLE
CONFIG_BOOL( "qt-titlebar", titleBarCheckBox );
......@@ -1293,7 +1293,7 @@ void SPrefsPanel::lastfm_Changed( int i_state )
void SPrefsPanel::changeStyle()
{
QApplication::setStyle( getQStyleKey( qobject_cast<QComboBox *>( optionWidgets["styleCB"] )
, p_intf->p_sys->p_app->defaultStyle() ) );
, p_intf->p_app->defaultStyle() ) );
/* force refresh on all widgets */
QWidgetList widgets = QApplication::allWidgets();
......
......@@ -158,7 +158,7 @@ void ConvertDialog::fileBrowse()
QString fileExtension = ( ! profile->isEnabled() ) ? ".*" : "." + profile->getMux();
outgoingMRL = QFileDialog::getSaveFileUrl( this, qtr( "Save file..." ),
p_intf->p_sys->filepath,
p_intf->filepath,
QString( "%1 (*%2);;%3 (*.*)" ).arg( qtr( "Containers" ) )
.arg( fileExtension ).arg( qtr("All") ), 0, QFileDialog::DontConfirmOverwrite );
fileLine->setText( urlToDisplayString( outgoingMRL ) );
......
......@@ -171,7 +171,7 @@ void FileDestBox::fileBrowse()
{
const QStringList schemes = QStringList(QStringLiteral("file"));
QString fileName = QFileDialog::getSaveFileUrl( this, qtr( "Save file..." ),
p_intf->p_sys->filepath, qtr( "Containers (*.ps *.ts *.mpg *.ogg *.asf *.mp4 *.mov *.wav *.raw *.flv *.webm)" ),
p_intf->filepath, qtr( "Containers (*.ps *.ts *.mpg *.ogg *.asf *.mp4 *.mov *.wav *.raw *.flv *.webm)" ),
nullptr, QFileDialog::Options(), schemes).toLocalFile();
fileEdit->setText( toNativeSeparators( fileName ) );
emit mrlUpdated();
......
......@@ -421,13 +421,13 @@ ControlbarProfile* ControlbarProfileModel::currentModel() const
void ControlbarProfileModel::save(bool clearDirty) const
{
assert(m_intf->p_sys);
assert(m_intf->p_sys->mainSettings);
assert(m_intf);
assert(m_intf->mainSettings);
if (!m_intf || !m_intf->p_sys || !m_intf->p_sys->mainSettings)
if (!m_intf || !m_intf || !m_intf->mainSettings)
return;
const auto settings = m_intf->p_sys->mainSettings;
const auto settings = m_intf->mainSettings;
const auto groupName = metaObject()->className();
settings->beginGroup(groupName);
......@@ -487,13 +487,13 @@ void ControlbarProfileModel::save(bool clearDirty) const
bool ControlbarProfileModel::reload()
{
assert(m_intf->p_sys);
assert(m_intf->p_sys->mainSettings);
assert(m_intf);
assert(m_intf->mainSettings);
if (!m_intf || !m_intf->p_sys || !m_intf->p_sys->mainSettings)
if (!m_intf || !m_intf || !m_intf->mainSettings)
return false;
const auto settings = m_intf->p_sys->mainSettings;
const auto settings = m_intf->mainSettings;
const auto groupName = metaObject()->className();
settings->beginGroup(groupName);
......
......@@ -56,6 +56,8 @@
#include <QtANGLE/EGL/eglext.h>
#include <QtPlatformHeaders/QEGLNativeContext>
#include "qt.hpp"
namespace vlc {
class CompositorDCompositionRenderControl : public QQuickRenderControl
......
......@@ -265,7 +265,7 @@ MainInterface::~MainInterface()
var_DelCallback( libvlc, "intf-toggle-fscontrol", IntfShowCB, p_intf );
var_DelCallback( libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
p_intf->p_sys->p_mi = NULL;
p_intf->p_mi = NULL;
}
bool MainInterface::hasVLM() const {
......@@ -691,8 +691,8 @@ void MainInterface::dragLeaveEvent(QDragLeaveEvent *event)
void MainInterface::closeEvent( QCloseEvent *e )
{
PlaylistControllerModel* playlistController = p_intf->p_sys->p_mainPlaylistController;
PlayerController* playerController = p_intf->p_sys->p_mainPlayerController;
PlaylistControllerModel* playlistController = p_intf->p_mainPlaylistController;
PlayerController* playerController = p_intf->p_mainPlayerController;
if (m_videoSurfaceProvider)
m_videoSurfaceProvider->onWindowClosed();
......@@ -763,7 +763,7 @@ static int PopupMenuCB( vlc_object_t *, const char *,
if( p_intf->pf_show_dialog )
{
p_intf->pf_show_dialog( p_intf, INTF_DIALOG_POPUPMENU,
p_intf->pf_show_dialog( p_intf->intf, INTF_DIALOG_POPUPMENU,
new_val.b_bool, NULL );
}
......@@ -777,7 +777,7 @@ static int IntfShowCB( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void *param )
{
qt_intf_t *p_intf = (qt_intf_t *)param;
p_intf->p_sys->p_mi->emitShow();
p_intf->p_mi->emitShow();
return VLC_SUCCESS;
}
......@@ -789,7 +789,7 @@ static int IntfRaiseMainCB( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void *param )
{
qt_intf_t *p_intf = (qt_intf_t *)param;
p_intf->p_sys->p_mi->emitRaise();
p_intf->p_mi->emitRaise();
return VLC_SUCCESS;
}
......@@ -801,7 +801,7 @@ static int IntfBossCB( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void *param )
{
qt_intf_t *p_intf = (qt_intf_t *)param;
p_intf->p_sys->p_mi->emitBoss();
p_intf->p_mi->emitBoss();
return VLC_SUCCESS;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment