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 (4)
......@@ -277,7 +277,6 @@ libqt_plugin_la_SOURCES = \
gui/qt/player/control_list_filter.cpp \
gui/qt/player/control_list_filter.hpp \
gui/qt/playlist/media.hpp \
gui/qt/playlist/playlist_common.cpp \
gui/qt/playlist/playlist_common.hpp \
gui/qt/playlist/playlist_controller.cpp \
gui/qt/playlist/playlist_controller.hpp \
......
......@@ -390,7 +390,6 @@ some_sources = files(
'player/control_list_filter.cpp',
'player/control_list_filter.hpp',
'playlist/media.hpp',
'playlist/playlist_common.cpp',
'playlist/playlist_common.hpp',
'playlist/playlist_controller.cpp',
'playlist/playlist_controller.hpp',
......
/*****************************************************************************
* Copyright (C) 2019 VLC authors and VideoLAN
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* ( at your option ) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "playlist_common.hpp"
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_playlist.h>
PlaylistPtr::PlaylistPtr()
: m_playlist(nullptr)
{}
PlaylistPtr::PlaylistPtr(vlc_playlist_t* pl)
: m_playlist(pl)
{}
PlaylistPtr::PlaylistPtr(const PlaylistPtr& ptr)
: m_playlist(ptr.m_playlist)
{
}
PlaylistPtr&PlaylistPtr::operator=(const PlaylistPtr& ptr)
{
this->m_playlist = ptr.m_playlist;
return *this;
}
......@@ -24,17 +24,17 @@ extern "C" {
typedef struct vlc_playlist vlc_playlist_t;
}
// QObject wrapper to carry playlist ptr through QML
class PlaylistPtr
class Playlist
{
Q_GADGET
public:
PlaylistPtr();
PlaylistPtr(vlc_playlist_t* pl);
PlaylistPtr(const PlaylistPtr& ptr);
PlaylistPtr& operator=(const PlaylistPtr& ptr);
Playlist() = default;
explicit Playlist(vlc_playlist_t * const playlist)
: m_playlist(playlist)
{ };
vlc_playlist_t* m_playlist = nullptr;
vlc_playlist_t * m_playlist = nullptr;
};
Q_DECLARE_METATYPE(Playlist)
#endif // PLAYLIST_COMMON_HPP
......@@ -353,7 +353,7 @@ PlaylistController::PlaylistController(vlc_playlist_t *playlist, QObject *parent
: QObject(parent)
, d_ptr( new PlaylistControllerPrivate(this) )
{
setPlaylistPtr(playlist);
setPlaylist(playlist);
}
PlaylistController::~PlaylistController()
......@@ -672,13 +672,13 @@ void PlaylistController::setRandom(bool random)
vlc_playlist_SetPlaybackOrder( d->m_playlist, random ? VLC_PLAYLIST_PLAYBACK_ORDER_RANDOM : VLC_PLAYLIST_PLAYBACK_ORDER_NORMAL );
}
PlaylistPtr PlaylistController::getPlaylistPtr() const
Playlist PlaylistController::getPlaylist() const
{
Q_D(const PlaylistController);
return PlaylistPtr(d->m_playlist);
return Playlist(d->m_playlist);
}
void PlaylistController::setPlaylistPtr(vlc_playlist_t* newPlaylist)
void PlaylistController::setPlaylist(vlc_playlist_t* newPlaylist)
{
Q_D(PlaylistController);
if (d->m_playlist && d->m_listener)
......@@ -703,7 +703,7 @@ void PlaylistController::setPlaylistPtr(vlc_playlist_t* newPlaylist)
emit playlistInitialized();
});
}
emit playlistPtrChanged( PlaylistPtr(newPlaylist) );
emit playlistChanged( Playlist(newPlaylist) );
}
void PlaylistController::resetSortKey()
......@@ -713,9 +713,9 @@ void PlaylistController::resetSortKey()
emit sortKeyChanged();
}
void PlaylistController::setPlaylistPtr(PlaylistPtr ptr)
void PlaylistController::setPlaylist(const Playlist& playlist)
{
setPlaylistPtr(ptr.m_playlist);
setPlaylist(playlist.m_playlist);
}
PlaylistController::PlaybackRepeat PlaylistController::getRepeatMode() const
......
......@@ -79,7 +79,7 @@ public:
Q_PROPERTY(QVariantList sortKeyTitleList READ getSortKeyTitleList CONSTANT FINAL)
Q_PROPERTY(PlaylistPtr playlistPtr READ getPlaylistPtr WRITE setPlaylistPtr NOTIFY playlistPtrChanged FINAL)
Q_PROPERTY(Playlist playlist READ getPlaylist WRITE setPlaylist NOTIFY playlistChanged FINAL)
Q_PROPERTY(PlaylistItem currentItem READ getCurrentItem NOTIFY currentItemChanged FINAL)
......@@ -156,14 +156,14 @@ public slots:
void switchSortOrder();
QVariantList getSortKeyTitleList() const;
PlaylistPtr getPlaylistPtr() const;
void setPlaylistPtr(PlaylistPtr id);
void setPlaylistPtr(vlc_playlist_t* newPlaylist);
Playlist getPlaylist() const;
void setPlaylist(const Playlist& playlist);
void setPlaylist(vlc_playlist_t* newPlaylist);
void resetSortKey();
signals:
void playlistPtrChanged( PlaylistPtr );
void playlistChanged( Playlist );
void currentItemChanged( );
......
......@@ -269,7 +269,7 @@ PlaylistListModel::PlaylistListModel(vlc_playlist_t *raw_playlist, QObject *pare
: SelectableListModel(parent)
, d_ptr(new PlaylistListModelPrivate(this))
{
setPlaylistId(PlaylistPtr(raw_playlist));
setPlaylist(Playlist(raw_playlist));
}
PlaylistListModel::~PlaylistListModel()
......@@ -449,15 +449,15 @@ QVariantList PlaylistListModel::getItemsForIndexes(const QList<int> & indexes) c
return items;
}
PlaylistPtr PlaylistListModel::getPlaylistId() const
Playlist PlaylistListModel::getPlaylist() const
{
Q_D(const PlaylistListModel);
if (!d->m_playlist)
return {};
return PlaylistPtr(d->m_playlist);
return Playlist(d->m_playlist);
}
void PlaylistListModel::setPlaylistId(vlc_playlist_t* playlist)
void PlaylistListModel::setPlaylist(vlc_playlist_t* playlist)
{
Q_D(PlaylistListModel);
if (d->m_playlist && d->m_listener)
......@@ -473,12 +473,12 @@ void PlaylistListModel::setPlaylistId(vlc_playlist_t* playlist)
d->m_playlist = playlist;
d->m_listener = vlc_playlist_AddListener(d->m_playlist, &playlist_callbacks, d, true);
}
emit playlistIdChanged( PlaylistPtr(d->m_playlist) );
emit playlistChanged( Playlist(d->m_playlist) );
}
void PlaylistListModel::setPlaylistId(PlaylistPtr id)
void PlaylistListModel::setPlaylist(const Playlist& playlist)
{
setPlaylistId(id.m_playlist);
setPlaylist(playlist.m_playlist);
}
QVariant
......
......@@ -35,7 +35,7 @@ class PlaylistListModelPrivate;
class PlaylistListModel : public SelectableListModel
{
Q_OBJECT
Q_PROPERTY(PlaylistPtr playlistId READ getPlaylistId WRITE setPlaylistId NOTIFY playlistIdChanged FINAL)
Q_PROPERTY(Playlist playlist READ getPlaylist WRITE setPlaylist NOTIFY playlistChanged FINAL)
Q_PROPERTY(int currentIndex READ getCurrentIndex NOTIFY currentIndexChanged FINAL)
Q_PROPERTY(int count READ rowCount NOTIFY countChanged FINAL)
Q_PROPERTY(VLCTick duration READ getDuration NOTIFY countChanged FINAL)
......@@ -79,12 +79,12 @@ protected:
int getSelectedRole() const override;
public slots:
PlaylistPtr getPlaylistId() const;
void setPlaylistId(PlaylistPtr id);
void setPlaylistId(vlc_playlist_t* playlist);
Playlist getPlaylist() const;
void setPlaylist(const Playlist& playlist);
void setPlaylist(vlc_playlist_t* playlist);
signals:
void playlistIdChanged(const PlaylistPtr& );
void playlistChanged(const Playlist&);
void currentIndexChanged( int );
void countChanged(int);
......
......@@ -277,7 +277,7 @@ Control {
clip: true // else out of view items will overlap with surronding items
model: PlaylistListModel {
playlistId: MainPlaylistController.playlistPtr
playlist: MainPlaylistController.playlist
}
dragAutoScrollDragItem: dragItem
......
......@@ -675,7 +675,7 @@ static inline void registerMetaTypes()
qRegisterMetaType<VLCTick>();
qRegisterMetaType<SharedInputItem>();
qRegisterMetaType<NetworkTreeItem>();
qRegisterMetaType<PlaylistPtr>();
qRegisterMetaType<Playlist>();
qRegisterMetaType<PlaylistItem>();
qRegisterMetaType<DialogId>();
qRegisterMetaType<MLItemId>();
......