Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • djain/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
  • rhstone/vlc
  • talregev/vlc
  • Managor/vlc
403 results
Show changes
Commits on Source (13)
Showing
with 78 additions and 79 deletions
......@@ -133,8 +133,8 @@ libqt_plugin_la_SOURCES = \
gui/qt/maininterface/compositor_dummy.cpp \
gui/qt/maininterface/interface_window_handler.cpp \
gui/qt/maininterface/interface_window_handler.hpp \
gui/qt/maininterface/main_interface.cpp \
gui/qt/maininterface/main_interface.hpp \
gui/qt/maininterface/mainctx.cpp \
gui/qt/maininterface/mainctx.hpp \
gui/qt/maininterface/mainui.cpp \
gui/qt/maininterface/mainui.hpp \
gui/qt/maininterface/videosurface.cpp \
......@@ -238,8 +238,6 @@ libqt_plugin_la_SOURCES = \
gui/qt/util/listcache.hpp \
gui/qt/util/listcacheloader.hpp \
gui/qt/util/navigation_history.cpp gui/qt/util/navigation_history.hpp \
gui/qt/util/qml_main_context.cpp \
gui/qt/util/qml_main_context.hpp \
gui/qt/util/item_key_event_filter.cpp \
gui/qt/util/item_key_event_filter.hpp \
gui/qt/util/qt_dirs.cpp gui/qt/util/qt_dirs.hpp \
......@@ -278,8 +276,8 @@ libqt_plugin_la_SOURCES = \
gui/qt/widgets/native/searchlineedit.cpp gui/qt/widgets/native/searchlineedit.hpp
if HAVE_WIN32
libqt_plugin_la_SOURCES += \
gui/qt/maininterface/main_interface_win32.cpp \
gui/qt/maininterface/main_interface_win32.hpp \
gui/qt/maininterface/mainctx_win32.cpp \
gui/qt/maininterface/mainctx_win32.hpp \
gui/qt/maininterface/compositor_win7.cpp \
gui/qt/maininterface/compositor_win7.hpp
......@@ -370,7 +368,7 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/maininterface/compositor.moc.cpp \
gui/qt/maininterface/compositor_dummy.moc.cpp \
gui/qt/maininterface/interface_window_handler.moc.cpp \
gui/qt/maininterface/main_interface.moc.cpp \
gui/qt/maininterface/mainctx.moc.cpp \
gui/qt/maininterface/mainui.moc.cpp \
gui/qt/maininterface/videosurface.moc.cpp \
gui/qt/maininterface/video_window_handler.moc.cpp \
......@@ -417,7 +415,6 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/util/keyhelper.moc.cpp \
gui/qt/util/listcache.moc.cpp \
gui/qt/util/navigation_history.moc.cpp \
gui/qt/util/qml_main_context.moc.cpp \
gui/qt/util/item_key_event_filter.moc.cpp \
gui/qt/util/mouse_event_filter.moc.cpp \
gui/qt/util/qvlcapp.moc.cpp \
......@@ -439,7 +436,7 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/widgets/native/searchlineedit.moc.cpp
if HAVE_WIN32
nodist_libqt_plugin_la_SOURCES += gui/qt/maininterface/main_interface_win32.moc.cpp \
nodist_libqt_plugin_la_SOURCES += gui/qt/maininterface/mainctx_win32.moc.cpp \
gui/qt/maininterface/compositor_win7.moc.cpp
if HAVE_DCOMP
......
......@@ -34,7 +34,7 @@
#include "menus/menus.hpp"
#include "util/qt_dirs.hpp"
#include "widgets/native/customwidgets.hpp" /* VLCKeyToString() */
#include "maininterface/main_interface.hpp"
#include "maininterface/mainctx.hpp"
/* The dialogs */
#include "dialogs/bookmarks/bookmarks.hpp"
......
......@@ -47,7 +47,7 @@
#include "extended_panels.hpp"
#include "dialogs/preferences/preferences.hpp"
#include "qt.hpp"
#include "maininterface/main_interface.hpp"
#include "maininterface/mainctx.hpp"
#include "player/player_controller.hpp"
#include "util/qt_dirs.hpp"
#include "widgets/native/customwidgets.hpp"
......
......@@ -18,7 +18,7 @@
#include "firstrunwizard.hpp"
#include "util/color_scheme_model.hpp"
#include "maininterface/main_interface.hpp"
#include "maininterface/mainctx.hpp"
#include "dialogs/toolbar/controlbar_profile_model.hpp"
#include <QPushButton>
......@@ -101,7 +101,7 @@ FirstRunWizard::FirstRunWizard( qt_intf_t *_p_intf, QWidget *parent)
if ( vlc_ml_instance_get( p_intf ) )
{
const auto foldersModel = new MLFoldersModel( this );
foldersModel->setMl( vlc_ml_instance_get( p_intf ) );
foldersModel->setCtx( p_intf->p_mi );
ui.entryPoints->setMLFoldersModel( foldersModel );
mlFoldersEditor = ui.entryPoints;
mlFoldersModel = foldersModel;
......
......@@ -32,7 +32,7 @@
#include <assert.h>
#include "qt.hpp"
#include "maininterface/main_interface.hpp"
#include "maininterface/mainctx.hpp"
#include "open_panels.hpp"
#include "dialogs/open/open.hpp"
#include "dialogs/dialogs_provider.hpp" /* Open Subtitle file */
......
......@@ -28,7 +28,7 @@
// VLC includes
#include <vlc_media_library.h>
#include <maininterface/main_interface.hpp>
#include <maininterface/mainctx.hpp>
#include <medialibrary/mlplaylistlistmodel.hpp>
#include <medialibrary/mlqmltypes.hpp>
......@@ -47,9 +47,9 @@
PlaylistsDialog::PlaylistsDialog(qt_intf_t * _p_intf) : QVLCFrame(_p_intf)
{
MainInterface * mainInterface = p_intf->p_mi;
MainCtx * mainCtx = p_intf->p_mi;
assert(mainInterface->hasMediaLibrary());
assert(mainCtx->hasMediaLibrary());
setWindowFlags(Qt::Tool);
......@@ -71,7 +71,7 @@ PlaylistsDialog::PlaylistsDialog(qt_intf_t * _p_intf) : QVLCFrame(_p_intf)
m_model = new MLPlaylistListModel(vlc_ml_instance_get(_p_intf), m_playlists);
m_model->setMl(mainInterface->getMediaLibrary());
m_model->setMl(mainCtx->getMediaLibrary());
m_playlists->setModel(m_model);
......
......@@ -33,7 +33,7 @@
#include "dialogs/preferences/simple_preferences.hpp"
#include "widgets/native/searchlineedit.hpp"
#include "widgets/native/qvlcframe.hpp"
#include "maininterface/main_interface.hpp"
#include "maininterface/mainctx.hpp"
#include <QHBoxLayout>
#include <QGroupBox>
......
......@@ -28,7 +28,7 @@
#include "simple_preferences.hpp"
#include "preferences_widgets.hpp"
#include "maininterface/main_interface.hpp"
#include "maininterface/mainctx.hpp"
#include "util/color_scheme_model.hpp"
#include "util/qvlcapp.hpp"
#include "util/proxycolumnmodel.hpp"
......@@ -850,7 +850,7 @@ SPrefsPanel::SPrefsPanel( qt_intf_t *_p_intf, QWidget *_parent,
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_mi, &MainInterface::setPinVideoControls );
QObject::connect( ui.pinVideoControlsCheckbox, &QCheckBox::stateChanged, p_intf->p_mi, &MainCtx::setPinVideoControls );
ui.colorSchemeComboBox->setModel( p_intf->p_mi->getColorScheme() );
ui.colorSchemeComboBox->setCurrentText( p_intf->p_mi->getColorScheme()->currentText() );
......@@ -1023,12 +1023,12 @@ SPrefsPanel::SPrefsPanel( qt_intf_t *_p_intf, QWidget *_parent,
if ( vlc_ml_instance_get( p_intf ) != NULL )
{
auto foldersModel = new MLFoldersModel( this );
foldersModel->setMl( vlc_ml_instance_get( p_intf ) );
foldersModel->setCtx( p_intf->p_mi );
ui.entryPoints->setMLFoldersModel( foldersModel );
mlFoldersEditor = ui.entryPoints;
auto bannedFoldersModel = new MLBannedFoldersModel( this );
bannedFoldersModel->setMl( vlc_ml_instance_get( p_intf ));
bannedFoldersModel->setCtx( p_intf->p_mi );
ui.bannedEntryPoints->setMLFoldersModel( bannedFoldersModel );
mlBannedFoldersEditor = ui.bannedEntryPoints;
......
......@@ -27,7 +27,7 @@
#include "dialogs/sout/sout.hpp"
#include "dialogs/sout/convert.hpp"
#include "dialogs/sout/sout_widgets.hpp"
#include "maininterface/main_interface.hpp"
#include "maininterface/mainctx.hpp"
#include "util/qt_dirs.hpp"
......
......@@ -25,7 +25,7 @@
#include "dialogs/sout/sout_widgets.hpp"
#include "dialogs/sout/sout.hpp"
#include "maininterface/main_interface.hpp"
#include "maininterface/mainctx.hpp"
#include "util/soutchain.hpp"
#include "util/qt_dirs.hpp"
#include <vlc_intf_strings.h>
......
......@@ -18,6 +18,8 @@
import QtQuick 2.11
import QtQuick.Controls 2.4
import org.videolan.vlc 0.1
import "qrc:///style/"
import "qrc:///widgets/" as Widgets
......@@ -32,8 +34,8 @@ TabButton {
text: {
var text = mainPlayerControl.text
if (!!mainInterface.controlbarProfileModel.currentModel &&
mainInterface.controlbarProfileModel.currentModel.getModel(mainPlayerControl.identifier).dirty)
if (!!MainCtx.controlbarProfileModel.currentModel &&
MainCtx.controlbarProfileModel.currentModel.getModel(mainPlayerControl.identifier).dirty)
return _markDirty(text)
else
return text
......
......@@ -108,8 +108,8 @@ Rectangle{
readonly property int identifier: modelData.identifier
readonly property var model: {
if (!!mainInterface.controlbarProfileModel.currentModel)
return mainInterface.controlbarProfileModel.currentModel.getModel(identifier)
if (!!MainCtx.controlbarProfileModel.currentModel)
return MainCtx.controlbarProfileModel.currentModel.getModel(identifier)
else
return undefined
}
......
......@@ -40,17 +40,17 @@ WindowDialog {
Component.onCompleted: {
// Save first, in case the dialog is rejected.
mainInterface.controlbarProfileModel.save(false)
MainCtx.controlbarProfileModel.save(false)
}
onAccepted: {
mainInterface.controlbarProfileModel.save()
MainCtx.controlbarProfileModel.save()
unload()
}
onRejected: {
// Load saved to discard the changes
mainInterface.controlbarProfileModel.reload()
MainCtx.controlbarProfileModel.reload()
unload()
}
......@@ -103,25 +103,25 @@ WindowDialog {
displayText: {
var text
if (!!mainInterface.controlbarProfileModel.currentModel)
text = mainInterface.controlbarProfileModel.currentModel.name
if (!!MainCtx.controlbarProfileModel.currentModel)
text = MainCtx.controlbarProfileModel.currentModel.name
else {
text = "N/A"
return text
}
if (mainInterface.controlbarProfileModel.currentModel.dirty)
if (MainCtx.controlbarProfileModel.currentModel.dirty)
return _markDirty(text)
else
return text
}
model: mainInterface.controlbarProfileModel
model: MainCtx.controlbarProfileModel
currentIndex: mainInterface.controlbarProfileModel.selectedProfile
currentIndex: MainCtx.controlbarProfileModel.selectedProfile
onCurrentIndexChanged: {
mainInterface.controlbarProfileModel.selectedProfile = currentIndex
MainCtx.controlbarProfileModel.selectedProfile = currentIndex
}
Accessible.name: i18n.qtr("Profiles")
......@@ -139,8 +139,8 @@ WindowDialog {
if (!npDialog.ok)
return
mainInterface.controlbarProfileModel.cloneSelectedProfile(npDialog.text)
mainInterface.controlbarProfileModel.selectedProfile = (mainInterface.controlbarProfileModel.rowCount() - 1)
MainCtx.controlbarProfileModel.cloneSelectedProfile(npDialog.text)
MainCtx.controlbarProfileModel.selectedProfile = (MainCtx.controlbarProfileModel.rowCount() - 1)
}
toolTip.visible: hovered
......@@ -153,7 +153,7 @@ WindowDialog {
iconText: VLCIcons.history
onClicked: {
mainInterface.controlbarProfileModel.currentModel.injectDefaults(false)
MainCtx.controlbarProfileModel.currentModel.injectDefaults(false)
}
toolTip.visible: hovered
......@@ -164,7 +164,7 @@ WindowDialog {
iconText: VLCIcons.del
onClicked: {
mainInterface.controlbarProfileModel.deleteSelectedProfile()
MainCtx.controlbarProfileModel.deleteSelectedProfile()
}
toolTip.visible: hovered
......
......@@ -18,14 +18,14 @@
#include "compositor.hpp"
#include "compositor_dummy.hpp"
#include "main_interface.hpp"
#include "mainctx.hpp"
#include "video_window_handler.hpp"
#include "videosurface.hpp"
#include "interface_window_handler.hpp"
#include "mainui.hpp"
#ifdef _WIN32
#include "main_interface_win32.hpp"
#include "mainctx_win32.hpp"
#ifdef HAVE_DCOMP_H
# include "compositor_dcomp.hpp"
#endif
......@@ -237,13 +237,13 @@ void CompositorVideo::commonWindowDisable()
bool CompositorVideo::commonGUICreateImpl(QWindow* window, CompositorVideo::Flags flags)
{
assert(m_mainInterface);
assert(m_mainCtx);
m_videoSurfaceProvider = std::make_unique<VideoSurfaceProvider>();
m_mainInterface->setVideoSurfaceProvider(m_videoSurfaceProvider.get());
m_mainCtx->setVideoSurfaceProvider(m_videoSurfaceProvider.get());
if (flags & CompositorVideo::CAN_SHOW_PIP)
{
m_mainInterface->setCanShowVideoPIP(true);
m_mainCtx->setCanShowVideoPIP(true);
connect(m_videoSurfaceProvider.get(), &VideoSurfaceProvider::surfacePositionChanged,
this, &CompositorVideo::onSurfacePositionChanged);
connect(m_videoSurfaceProvider.get(), &VideoSurfaceProvider::surfaceSizeChanged,
......@@ -253,17 +253,17 @@ bool CompositorVideo::commonGUICreateImpl(QWindow* window, CompositorVideo::Flag
m_videoWindowHandler->setWindow( window );
#ifdef _WIN32
m_interfaceWindowHandler = std::make_unique<InterfaceWindowHandlerWin32>(m_intf, m_mainInterface, window);
m_interfaceWindowHandler = std::make_unique<InterfaceWindowHandlerWin32>(m_intf, m_mainCtx, window);
#else
m_interfaceWindowHandler = std::make_unique<InterfaceWindowHandler>(m_intf, m_mainInterface, window);
m_interfaceWindowHandler = std::make_unique<InterfaceWindowHandler>(m_intf, m_mainCtx, window);
#endif
m_mainInterface->setHasAcrylicSurface(flags & CompositorVideo::HAS_ACRYLIC);
m_mainCtx->setHasAcrylicSurface(flags & CompositorVideo::HAS_ACRYLIC);
#ifdef _WIN32
m_taskbarWidget = std::make_unique<WinTaskbarWidget>(m_intf, window);
qApp->installNativeEventFilter(m_taskbarWidget.get());
#endif
m_ui = std::make_unique<MainUI>(m_intf, m_mainInterface, window);
m_ui = std::make_unique<MainUI>(m_intf, m_mainCtx, window);
return true;
}
......
......@@ -34,7 +34,7 @@
#include "qt.hpp"
class MainInterface;
class MainCtx;
class VideoWindowHandler;
class VideoSurfaceProvider;
class InterfaceWindowHandler;
......@@ -65,7 +65,7 @@ public:
virtual bool init() = 0;
virtual bool makeMainInterface(MainInterface* intf) = 0;
virtual bool makeMainInterface(MainCtx* intf) = 0;
virtual void destroyMainInterface() = 0;
virtual void unloadGUI() = 0;
......@@ -134,7 +134,7 @@ protected:
qt_intf_t *m_intf = nullptr;
vout_window_t* m_wnd = nullptr;
MainInterface* m_mainInterface = nullptr;
MainCtx* m_mainCtx = nullptr;
VoutDestroyCb m_destroyCb = nullptr;
std::unique_ptr<VideoWindowHandler> m_videoWindowHandler;
......
......@@ -22,7 +22,7 @@
#include "compositor_dcomp.hpp"
#include "maininterface/main_interface_win32.hpp"
#include "maininterface/mainctx_win32.hpp"
#include <comdef.h>
......@@ -245,12 +245,12 @@ bool CompositorDirectComposition::init()
return true;
}
bool CompositorDirectComposition::makeMainInterface(MainInterface* mainInterface)
bool CompositorDirectComposition::makeMainInterface(MainCtx* mainCtx)
{
try
{
bool ret;
m_mainInterface = mainInterface;
m_mainCtx = mainCtx;
m_rootWindow = new QWindow();
......@@ -279,7 +279,7 @@ bool CompositorDirectComposition::makeMainInterface(MainInterface* mainInterface
auto resetAcrylicSurface = [this](QScreen * = nullptr)
{
m_acrylicSurface.reset(new CompositorDCompositionAcrylicSurface(m_intf, this, m_mainInterface, m_d3d11Device.Get()));
m_acrylicSurface.reset(new CompositorDCompositionAcrylicSurface(m_intf, this, m_mainCtx, m_d3d11Device.Get()));
};
resetAcrylicSurface();
......
......@@ -31,7 +31,7 @@
#include <QOpenGLContext>
class MainInterface;
class MainCtx;
class WinTaskbarWidget;
namespace vlc {
......@@ -46,7 +46,7 @@ public:
static bool preInit(qt_intf_t *);
bool init() override;
bool makeMainInterface(MainInterface*) override;
bool makeMainInterface(MainCtx*) override;
void destroyMainInterface() override;
void unloadGUI() override;
......
......@@ -78,27 +78,27 @@ bool isWinPreIron()
namespace vlc
{
CompositorDCompositionAcrylicSurface::CompositorDCompositionAcrylicSurface(qt_intf_t *intf, CompositorDirectComposition *compositor, MainInterface *mainInterface, ID3D11Device *device, QObject *parent)
CompositorDCompositionAcrylicSurface::CompositorDCompositionAcrylicSurface(qt_intf_t *intf, CompositorDirectComposition *compositor, MainCtx *mainCtx, ID3D11Device *device, QObject *parent)
: QObject(parent)
, m_intf {intf}
, m_compositor {compositor}
, m_mainInterface {mainInterface}
, m_mainCtx {mainCtx}
{
if (!init(device))
return;
qApp->installNativeEventFilter(this);
setActive(m_transparencyEnabled && m_mainInterface->acrylicActive());
connect(m_mainInterface, &MainInterface::acrylicActiveChanged, this, [this]()
setActive(m_transparencyEnabled && m_mainCtx->acrylicActive());
connect(m_mainCtx, &MainCtx::acrylicActiveChanged, this, [this]()
{
setActive(m_transparencyEnabled && m_mainInterface->acrylicActive());
setActive(m_transparencyEnabled && m_mainCtx->acrylicActive());
});
}
CompositorDCompositionAcrylicSurface::~CompositorDCompositionAcrylicSurface()
{
m_mainInterface->setHasAcrylicSurface(false);
m_mainCtx->setHasAcrylicSurface(false);
if (m_dummyWindow)
DestroyWindow(m_dummyWindow);
......@@ -133,8 +133,8 @@ bool CompositorDCompositionAcrylicSurface::nativeEventFilter(const QByteArray &e
break;
m_transparencyEnabled = transparencyEnabled;
m_mainInterface->setHasAcrylicSurface(m_transparencyEnabled);
setActive(m_transparencyEnabled && m_mainInterface->acrylicActive());
m_mainCtx->setHasAcrylicSurface(m_transparencyEnabled);
setActive(m_transparencyEnabled && m_mainCtx->acrylicActive());
}
break;
}
......@@ -168,7 +168,7 @@ bool CompositorDCompositionAcrylicSurface::init(ID3D11Device *device)
}
m_transparencyEnabled = isTransparencyEnabled();
m_mainInterface->setHasAcrylicSurface(m_transparencyEnabled);
m_mainCtx->setHasAcrylicSurface(m_transparencyEnabled);
return true;
}
......@@ -342,7 +342,7 @@ void CompositorDCompositionAcrylicSurface::sync()
int frameX = 0;
int frameY = 0;
if (!m_mainInterface->useClientSideDecoration())
if (!m_mainCtx->useClientSideDecoration())
{
frameX = GetSystemMetrics(SM_CXFRAME) + GetSystemMetrics(SM_CXPADDEDBORDER);
frameY = GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYCAPTION)
......
......@@ -38,7 +38,7 @@
#include <dwmapi.h>
#include "compositor_dcomp_error.hpp"
#include "main_interface.hpp"
#include "mainctx.hpp"
// Windows Private APIs, taken from https://blog.adeltax.com/dwm-thumbnails-but-with-idcompositionvisual/
......@@ -170,7 +170,7 @@ class CompositorDCompositionAcrylicSurface
Q_OBJECT
public:
CompositorDCompositionAcrylicSurface(qt_intf_t * intf, CompositorDirectComposition *compositor, MainInterface *mainInterface, ID3D11Device *device, QObject *parent = nullptr);
CompositorDCompositionAcrylicSurface(qt_intf_t * intf, CompositorDirectComposition *compositor, MainCtx *mainctx, ID3D11Device *device, QObject *parent = nullptr);
~CompositorDCompositionAcrylicSurface();
......@@ -225,7 +225,7 @@ private:
qt_intf_t *m_intf = nullptr;
CompositorDirectComposition *m_compositor = nullptr;
MainInterface *m_mainInterface = nullptr;
MainCtx *m_mainCtx = nullptr;
QBasicTimer m_resetTimer;
bool m_resetPending = false;
bool m_active = false;
......
......@@ -19,7 +19,7 @@
#include <QQuickView>
#include "maininterface/main_interface.hpp"
#include "maininterface/mainctx.hpp"
#include "maininterface/mainui.hpp"
#include "maininterface/interface_window_handler.hpp"
......@@ -45,18 +45,18 @@ bool CompositorDummy::init()
return true;
}
bool CompositorDummy::makeMainInterface(MainInterface* mainInterface)
bool CompositorDummy::makeMainInterface(MainCtx* mainCtx)
{
m_mainInterface = mainInterface;
m_mainCtx = mainCtx;
m_qmlWidget = std::make_unique<QQuickView>();
if (m_mainInterface->useClientSideDecoration())
if (m_mainCtx->useClientSideDecoration())
m_qmlWidget->setFlag(Qt::FramelessWindowHint);
m_qmlWidget->setResizeMode(QQuickView::SizeRootObjectToView);
m_intfWindowHandler = std::make_unique<InterfaceWindowHandler>(m_intf, m_mainInterface, m_qmlWidget.get());
m_intfWindowHandler = std::make_unique<InterfaceWindowHandler>(m_intf, m_mainCtx, m_qmlWidget.get());
MainUI* ui = new MainUI(m_intf, m_mainInterface, m_qmlWidget.get(), m_qmlWidget.get());
MainUI* ui = new MainUI(m_intf, m_mainCtx, m_qmlWidget.get(), m_qmlWidget.get());
ui->setup(m_qmlWidget->engine());
m_qmlWidget->setContent(QUrl(), ui->getComponent(), ui->createRootItem());
......