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 (9)
Showing
with 65 additions and 62 deletions
......@@ -689,7 +689,7 @@ void MainCtx::updateSystrayTooltipStatus( PlayerController::PlayingState )
bool MainCtx::onWindowClose( QWindow* )
{
PlaylistControllerModel* playlistController = p_intf->p_mainPlaylistController;
PlaylistController* playlistController = p_intf->p_mainPlaylistController;
PlayerController* playerController = p_intf->p_mainPlayerController;
if (m_videoSurfaceProvider)
......
......@@ -62,7 +62,6 @@ class VideoSurfaceProvider;
class ControlbarProfileModel;
namespace vlc {
namespace playlist {
class PlaylistControllerModel;
}
}
......@@ -173,8 +172,6 @@ class MainCtx : public QObject
Q_PROPERTY(float pinOpacity READ pinOpacity WRITE setPinOpacity NOTIFY pinOpacityChanged FINAL)
Q_PROPERTY(ControlbarProfileModel* controlbarProfileModel READ controlbarProfileModel CONSTANT FINAL)
Q_PROPERTY(bool hasAcrylicSurface READ hasAcrylicSurface NOTIFY hasAcrylicSurfaceChanged FINAL)
Q_PROPERTY(PlaylistPtr mainPlaylist READ getMainPlaylist CONSTANT FINAL)
Q_PROPERTY(vlc::playlist::PlaylistControllerModel* mainPlaylistController READ getMainPlaylistController CONSTANT FINAL)
Q_PROPERTY(bool smoothScroll READ smoothScroll NOTIFY smoothScrollChanged FINAL)
Q_PROPERTY(QWindow* intfMainWindow READ intfMainWindow CONSTANT FINAL)
Q_PROPERTY(QScreen* screen READ screen NOTIFY screenChanged)
......@@ -202,8 +199,6 @@ public:
public:
/* Getters */
inline qt_intf_t* getIntf() const { return p_intf; }
inline PlaylistPtr getMainPlaylist() const { return PlaylistPtr(p_intf->p_playlist); }
inline vlc::playlist::PlaylistControllerModel* getMainPlaylistController() const { return p_intf->p_mainPlaylistController; }
bool smoothScroll() const { return m_smoothScroll; }
QSystemTrayIcon *getSysTray() { return sysTray; }
......
......@@ -542,7 +542,7 @@ WinTaskbarWidget::WinTaskbarWidget(qt_intf_t *_p_intf, QWindow* windowHandle, QO
taskbar_wmsg = RegisterWindowMessage(TEXT("TaskbarButtonCreated"));
if (taskbar_wmsg == 0)
msg_Warn( p_intf, "Failed to register TaskbarButtonCreated message" );
connect(THEMPL, &PlaylistControllerModel::countChanged,
connect(THEMPL, &PlaylistController::countChanged,
this, &WinTaskbarWidget::playlistItemCountChanged);
connect(THEMIM, &PlayerController::fullscreenChanged,
this, &WinTaskbarWidget::onVideoFullscreenChanged);
......@@ -658,7 +658,7 @@ void WinTaskbarWidget::createTaskBarButtons()
}
connect( THEMIM, &PlayerController::playingStateChanged,
this, &WinTaskbarWidget::changeThumbbarButtons);
connect( THEMPL, &vlc::playlist::PlaylistControllerModel::countChanged,
connect( THEMPL, &vlc::playlist::PlaylistController::countChanged,
this, &WinTaskbarWidget::playlistItemCountChanged );
if( THEMIM->getPlayingState() == PlayerController::PLAYING_STATE_PLAYING )
changeThumbbarButtons( THEMIM->getPlayingState() );
......
......@@ -129,6 +129,9 @@ MainUI::MainUI(qt_intf_t *p_intf, MainCtx *mainCtx, QWindow* interfaceWindow, Q
assert(m_intf->p_mainPlayerController);
SingletonRegisterHelper<PlayerController>::setInstance(m_intf->p_mainPlayerController);
assert(m_intf->p_mainPlaylistController);
SingletonRegisterHelper<PlaylistController>::setInstance(m_intf->p_mainPlaylistController);
assert(DialogsProvider::getInstance());
SingletonRegisterHelper<DialogsProvider>::setInstance(DialogsProvider::getInstance());
......@@ -234,6 +237,7 @@ void MainUI::registerQMLTypes()
qmlRegisterSingletonType<QmlKeyHelper>(uri, versionMajor, versionMinor, "KeyHelper", SingletonRegisterHelper<QmlKeyHelper>::callback);
qmlRegisterSingletonType<EffectsImageProvider>(uri, versionMajor, versionMinor, "Effects", SingletonRegisterHelper<EffectsImageProvider>::callback);
qmlRegisterSingletonType<SVGColorImage>(uri, versionMajor, versionMinor, "SVGColorImage", SingletonRegisterHelper<SVGColorImage>::callback);
qmlRegisterSingletonType<PlaylistController>(uri, versionMajor, versionMinor, "MainPlaylistController", SingletonRegisterHelper<PlaylistController>::callback);
qmlRegisterUncreatableType<QAbstractItemModel>(uri, versionMajor, versionMinor, "QtAbstractItemModel", "");
qmlRegisterUncreatableType<QWindow>(uri, versionMajor, versionMinor, "QtWindow", "");
......@@ -268,7 +272,7 @@ void MainUI::registerQMLTypes()
qmlRegisterUncreatableType<PlaylistItem>(uri, versionMajor, versionMinor, "PlaylistItem", "");
qmlRegisterType<PlaylistListModel>( uri, versionMajor, versionMinor, "PlaylistListModel" );
qmlRegisterType<PlaylistControllerModel>( uri, versionMajor, versionMinor, "PlaylistControllerModel" );
qmlRegisterType<PlaylistController>( uri, versionMajor, versionMinor, "PlaylistController" );
qmlRegisterType<AboutModel>( uri, versionMajor, versionMinor, "AboutModel" );
......
......@@ -306,7 +306,7 @@ FocusScope {
criteriaRole: "criteria"
sortKey: contentModel ? contentModel.sortCriteria
: PlaylistControllerModel.SORT_KEY_NONE
: PlaylistController.SORT_KEY_NONE
sortOrder: contentModel ? contentModel.sortOrder : undefined
......
......@@ -83,10 +83,8 @@ Item {
onClosing: MainCtx.playlistVisible = false
}
PlaylistControllerModel {
id: mainPlaylistController
playlistPtr: MainCtx.mainPlaylist
Connections {
target: MainPlaylistController
onPlaylistInitialized: {
g_mainInterface._playlistReady = true
......@@ -124,7 +122,7 @@ Item {
// NOTE: Useful when we started the application on the 'player' view.
if (History.previousEmpty) {
if (MainCtx.hasEmbededVideo && MainCtx.canShowVideoPIP === false)
mainPlaylistController.stop()
MainPlaylistController.stop()
_pushHome()
......@@ -135,7 +133,7 @@ Item {
return
if (MainCtx.hasEmbededVideo && MainCtx.canShowVideoPIP === false)
mainPlaylistController.stop()
MainPlaylistController.stop()
History.previous()
} else {
......@@ -151,7 +149,7 @@ Item {
function setInitialView() {
//set the initial view
const loadPlayer = !mainPlaylistController.empty;
const loadPlayer = !MainPlaylistController.empty;
if (MainCtx.mediaLibraryAvailable)
History.push(["mc", "video"],
......@@ -204,7 +202,7 @@ Item {
}
}
mainPlaylistController.append(urls, true)
MainPlaylistController.append(urls, true)
drop.accept()
}
}
......
......@@ -216,7 +216,7 @@ void VLCMenuBar::FileMenu(qt_intf_t *p_intf, QMenu *menu)
menu->addSeparator();
action = addMPLStaticEntry( p_intf, menu, qtr( "Quit at the end of playlist" ), "",
&PlaylistControllerModel::playAndExitChanged );
&PlaylistController::playAndExitChanged );
action->setCheckable( true );
action->setChecked( THEMPL->isPlayAndExit() );
......@@ -585,26 +585,26 @@ void VLCMenuBar::PopupMenuPlaylistEntries( QMenu *menu, qt_intf_t *p_intf )
else
{
action = addMPLStaticEntry( p_intf, menu, qtr( "Pause" ),
":/menu/pause.svg", &PlaylistControllerModel::togglePlayPause );
":/menu/pause.svg", &PlaylistController::togglePlayPause );
}
/* Stop */
action = addMPLStaticEntry( p_intf, menu, qtr( "&Stop" ),
":/menu/stop.svg", &PlaylistControllerModel::stop );
":/menu/stop.svg", &PlaylistController::stop );
if( !hasInput )
action->setEnabled( false );
/* Next / Previous */
bool bPlaylistEmpty = THEMPL->isEmpty();
QAction* previousAction = addMPLStaticEntry( p_intf, menu, qtr( "Pre&vious" ),
":/menu/previous.svg", &PlaylistControllerModel::prev );
":/menu/previous.svg", &PlaylistController::prev );
previousAction->setEnabled( !bPlaylistEmpty );
connect( THEMPL, &PlaylistControllerModel::isEmptyChanged, previousAction, &QAction::setDisabled);
connect( THEMPL, &PlaylistController::isEmptyChanged, previousAction, &QAction::setDisabled);
QAction* nextAction = addMPLStaticEntry( p_intf, menu, qtr( "Ne&xt" ),
":/menu/next.svg", &PlaylistControllerModel::next );
":/menu/next.svg", &PlaylistController::next );
nextAction->setEnabled( !bPlaylistEmpty );
connect( THEMPL, &PlaylistControllerModel::isEmptyChanged, nextAction, &QAction::setDisabled);
connect( THEMPL, &PlaylistController::isEmptyChanged, nextAction, &QAction::setDisabled);
action = menu->addAction( qtr( "Record" ), THEMIM, &PlayerController::toggleRecord );
action->setIcon( QIcon( ":/menu/record.svg" ) );
......
......@@ -940,13 +940,13 @@ void PlaylistContextMenu::popup(int currentIndex, QPoint pos )
m_menu->addSeparator();
using namespace vlc::playlist;
PlaylistControllerModel::SortKey currentKey = m_controler->getSortKey();
PlaylistControllerModel::SortOrder currentOrder = m_controler->getSortOrder();
PlaylistController::SortKey currentKey = m_controler->getSortKey();
PlaylistController::SortOrder currentOrder = m_controler->getSortOrder();
QMenu* sortMenu = m_menu->addMenu(qtr("Sort by"));
QActionGroup * group = new QActionGroup(sortMenu);
auto addSortAction = [&](const QString& label, PlaylistControllerModel::SortKey key, PlaylistControllerModel::SortOrder order) {
auto addSortAction = [&](const QString& label, PlaylistController::SortKey key, PlaylistController::SortOrder order) {
QAction* action = sortMenu->addAction(label);
connect(action, &QAction::triggered, this, [this, key, order]( ) {
m_controler->sort(key, order);
......@@ -961,11 +961,11 @@ void PlaylistContextMenu::popup(int currentIndex, QPoint pos )
{
const QVariantMap varmap = it.toMap();
auto key = static_cast<PlaylistControllerModel::SortKey>(varmap.value("key").toInt());
auto key = static_cast<PlaylistController::SortKey>(varmap.value("key").toInt());
QString label = varmap.value("title").toString();
addSortAction(qtr("%1 Ascending").arg(label), key, PlaylistControllerModel::SORT_ORDER_ASC);
addSortAction(qtr("%1 Descending").arg(label), key, PlaylistControllerModel::SORT_ORDER_DESC);
addSortAction(qtr("%1 Ascending").arg(label), key, PlaylistController::SORT_ORDER_ASC);
addSortAction(qtr("%1 Descending").arg(label), key, PlaylistController::SORT_ORDER_DESC);
}
action = m_menu->addAction( qtr("Shuffle the playlist") );
......
......@@ -34,7 +34,7 @@ class NetworkMediaModel;
class MainCtx;
namespace vlc {
namespace playlist {
class PlaylistControllerModel;
class PlaylistController;
class PlaylistListModel;
}
}
......@@ -359,7 +359,7 @@ private:
class PlaylistContextMenu : public QObject {
Q_OBJECT
SIMPLE_MENU_PROPERTY(vlc::playlist::PlaylistListModel*, model, nullptr)
SIMPLE_MENU_PROPERTY(vlc::playlist::PlaylistControllerModel*, controler, nullptr)
SIMPLE_MENU_PROPERTY(vlc::playlist::PlaylistController*, controler, nullptr)
public:
PlaylistContextMenu(QObject* parent = nullptr);
......
......@@ -118,7 +118,7 @@ bool NetworkDeviceModel::insertIntoPlaylist(const QModelIndexList &itemIdList, s
}
if (medias.isEmpty())
return false;
m_ctx->getMainPlaylistController()->insert(playlistIndex, medias, false);
m_ctx->getIntf()->p_mainPlaylistController->insert(playlistIndex, medias, false);
return true;
}
......@@ -130,7 +130,7 @@ bool NetworkDeviceModel::addToPlaylist(int index)
return false;
auto item = m_items[index];
vlc::playlist::Media media{ item.inputItem.get() };
m_ctx->getMainPlaylistController()->append( { media }, false);
m_ctx->getIntf()->p_mainPlaylistController->append( { media }, false);
return true;
}
......@@ -168,7 +168,7 @@ bool NetworkDeviceModel::addAndPlay(int index)
return false;
auto item = m_items[index];
vlc::playlist::Media media{ item.inputItem.get() };
m_ctx->getMainPlaylistController()->append( { media }, true);
m_ctx->getIntf()->p_mainPlaylistController->append( { media }, true);
return true;
}
......
......@@ -245,7 +245,7 @@ bool NetworkMediaModel::insertIntoPlaylist(const QModelIndexList &itemIdList, co
}
if (medias.isEmpty())
return false;
m_ctx->getMainPlaylistController()->insert(playlistIndex, medias, false);
m_ctx->getIntf()->p_mainPlaylistController->insert(playlistIndex, medias, false);
return true;
}
......@@ -257,7 +257,7 @@ bool NetworkMediaModel::addToPlaylist(const int index)
return false;
auto item = m_items[index];
vlc::playlist::Media media{ item.tree.media.get() };
m_ctx->getMainPlaylistController()->append( { media }, false);
m_ctx->getIntf()->p_mainPlaylistController->append( { media }, false);
return true;
}
......@@ -300,7 +300,7 @@ bool NetworkMediaModel::addAndPlay(int index)
return false;
auto item = m_items[index];
vlc::playlist::Media media{ item.tree.media.get() };
m_ctx->getMainPlaylistController()->append( { media }, true);
m_ctx->getIntf()->p_mainPlaylistController->append( { media }, true);
return true;
}
......
......@@ -74,7 +74,7 @@ FocusScope {
if (urlListDisplay.status == Loader.Ready)
urlListDisplay.item.model.addAndPlay(text)
else
mainPlaylistController.append([text], true)
MainPlaylistController.append([text], true)
}
Keys.priority: Keys.AfterItem
......
......@@ -17,6 +17,8 @@
*****************************************************************************/
#include "input_models.hpp"
#include "player/player_controller.hpp"
//***************************
// track list model
//***************************
......
......@@ -34,6 +34,9 @@
#include "util/varchoicemodel.hpp"
#include "util/vlctick.hpp"
using vlc_player_locker = vlc_locker<vlc_player_t, vlc_player_Lock, vlc_player_Unlock>;
class QSignalMapper;
class IMEvent : public QEvent
......
......@@ -73,7 +73,7 @@ Item {
z: 1
hoverEnabled: true
onClicked: mainPlaylistController.togglePlayPause()
onClicked: MainPlaylistController.togglePlayPause()
enabled: root.enabled
visible: root.visible
......@@ -103,7 +103,7 @@ Item {
? VLCIcons.pause
: VLCIcons.play
onClicked: mainPlaylistController.togglePlayPause()
onClicked: MainPlaylistController.togglePlayPause()
}
Widgets.IconButton {
......@@ -118,7 +118,7 @@ Item {
text: I18n.qtr("close video")
iconText: VLCIcons.close
onClicked: mainPlaylistController.stop()
onClicked: MainPlaylistController.stop()
}
......
......@@ -41,8 +41,9 @@ FocusScope {
readonly property int positionSliderY: controlBarView.y + controlBarView.sliderY
readonly property string coverSource: {
if (mainPlaylistController.currentItem.artwork && mainPlaylistController.currentItem.artwork.toString())
mainPlaylistController.currentItem.artwork
if (MainPlaylistController.currentItem.artwork &&
MainPlaylistController.currentItem.artwork.toString())
MainPlaylistController.currentItem.artwork
else if (Player.hasVideoOutput)
VLCStyle.noArtVideoCover
else
......@@ -130,7 +131,7 @@ FocusScope {
toolbarAutoHide.setVisibleControlBar(false)
} else {
if (MainCtx.hasEmbededVideo && !MainCtx.canShowVideoPIP) {
mainPlaylistController.stop()
MainPlaylistController.stop()
}
History.previous()
}
......@@ -318,7 +319,7 @@ FocusScope {
resumeVisible)
focus: true
title: mainPlaylistController.currentItem.title
title: MainPlaylistController.currentItem.title
pinControls: MainCtx.pinVideoControls
......@@ -336,7 +337,7 @@ FocusScope {
onBackRequested: {
if (MainCtx.hasEmbededVideo && !MainCtx.canShowVideoPIP) {
mainPlaylistController.stop()
MainPlaylistController.stop()
}
History.previous()
}
......@@ -431,7 +432,7 @@ FocusScope {
value: centerContent.height > (albumLabel.y + albumLabel.height)
}
text: mainPlaylistController.currentItem.album
text: MainPlaylistController.currentItem.album
font.pixelSize: VLCStyle.fontSize_xxlarge
horizontalAlignment: Text.AlignHCenter
color: centerTheme.fg.primary
......@@ -449,7 +450,7 @@ FocusScope {
value: centerContent.height > (artistLabel.y + artistLabel.height)
}
text: mainPlaylistController.currentItem.artist
text: MainPlaylistController.currentItem.artist
font.weight: Font.Light
horizontalAlignment: Text.AlignHCenter
color: centerTheme.fg.primary
......
......@@ -25,10 +25,10 @@ import "qrc:///style/"
Widgets.IconControlButton {
id: repeatBtn
checked: mainPlaylistController.repeatMode !== PlaylistControllerModel.PLAYBACK_REPEAT_NONE
iconText: (mainPlaylistController.repeatMode === PlaylistControllerModel.PLAYBACK_REPEAT_CURRENT)
checked: MainPlaylistController.repeatMode !== PlaylistController.PLAYBACK_REPEAT_NONE
iconText: (MainPlaylistController.repeatMode === PlaylistController.PLAYBACK_REPEAT_CURRENT)
? VLCIcons.repeat_one
: VLCIcons.repeat_all
onClicked: mainPlaylistController.toggleRepeatMode()
onClicked: MainPlaylistController.toggleRepeatMode()
text: I18n.qtr("Repeat")
}
......@@ -26,7 +26,7 @@ import "qrc:///style/"
Widgets.IconControlButton {
id: nextBtn
iconText: VLCIcons.next
enabled: mainPlaylistController.hasNext
onClicked: mainPlaylistController.next()
enabled: MainPlaylistController.hasNext
onClicked: MainPlaylistController.next()
text: I18n.qtr("Next")
}
......@@ -65,8 +65,8 @@ T.Control {
Accessible.checkable: true
Accessible.checked: Player.playingState !== Player.PLAYING_STATE_PAUSED
&& Player.playingState !== Player.PLAYING_STATE_STOPPED
Accessible.onPressAction: mainPlaylistController.togglePlayPause()
Accessible.onToggleAction: mainPlaylistController.togglePlayPause()
Accessible.onPressAction: MainPlaylistController.togglePlayPause()
Accessible.onToggleAction: MainPlaylistController.togglePlayPause()
// States
......@@ -130,7 +130,7 @@ T.Control {
_keyOkPressed = false
keyHoldTimer.stop()
if (Player.playingState !== Player.PLAYING_STATE_STOPPED)
mainPlaylistController.togglePlayPause()
MainPlaylistController.togglePlayPause()
}
event.accepted = true
}
......@@ -140,7 +140,7 @@ T.Control {
function _pressAndHoldAction() {
_keyOkPressed = false
mainPlaylistController.stop()
MainPlaylistController.stop()
}
// Children
......@@ -186,7 +186,7 @@ T.Control {
}
onClicked: {
mainPlaylistController.togglePlayPause()
MainPlaylistController.togglePlayPause()
mouse.accepted = true
}
......
......@@ -25,7 +25,7 @@ import "qrc:///style/"
Widgets.IconControlButton {
id: prevBtn
iconText: VLCIcons.previous
enabled: mainPlaylistController.hasPrev
onClicked: mainPlaylistController.prev()
enabled: MainPlaylistController.hasPrev
onClicked: MainPlaylistController.prev()
text: I18n.qtr("Previous")
}