[vlc-commits] qt: move medialibrary component to its own folder
Pierre Lamot
git at videolan.org
Tue Dec 17 15:37:15 CET 2019
vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Fri Oct 11 17:40:38 2019 +0200| [84ef2085f988c7abb143996a7342c8ee556c9a76] | committer: Jean-Baptiste Kempf
qt: move medialibrary component to its own folder
no functional changes
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=84ef2085f988c7abb143996a7342c8ee556c9a76
---
modules/gui/qt/Makefile.am | 118 ++++++++++-----------
modules/gui/qt/components/simple_preferences.hpp | 2 +-
modules/gui/qt/main_interface.cpp | 19 ++--
.../mcmedialib.cpp => medialibrary/medialib.cpp} | 34 +++---
.../mcmedialib.hpp => medialibrary/medialib.hpp} | 4 +-
.../mediacenter => medialibrary}/mlalbum.cpp | 0
.../mediacenter => medialibrary}/mlalbum.hpp | 0
.../mediacenter => medialibrary}/mlalbummodel.cpp | 0
.../mediacenter => medialibrary}/mlalbummodel.hpp | 2 +-
.../mediacenter => medialibrary}/mlalbumtrack.cpp | 0
.../mediacenter => medialibrary}/mlalbumtrack.hpp | 0
.../mlalbumtrackmodel.cpp | 0
.../mlalbumtrackmodel.hpp | 0
.../mediacenter => medialibrary}/mlartist.cpp | 0
.../mediacenter => medialibrary}/mlartist.hpp | 0
.../mediacenter => medialibrary}/mlartistmodel.cpp | 0
.../mediacenter => medialibrary}/mlartistmodel.hpp | 0
.../mediacenter => medialibrary}/mlbasemodel.cpp | 12 +--
.../mediacenter => medialibrary}/mlbasemodel.hpp | 12 +--
.../mlfoldersmodel.cpp} | 2 +-
.../mlfoldersmodel.hpp} | 2 +-
.../mediacenter => medialibrary}/mlgenre.cpp | 0
.../mediacenter => medialibrary}/mlgenre.hpp | 0
.../mediacenter => medialibrary}/mlgenremodel.cpp | 0
.../mediacenter => medialibrary}/mlgenremodel.hpp | 0
.../mediacenter => medialibrary}/mlhelper.hpp | 0
.../mediacenter => medialibrary}/mlqmltypes.hpp | 0
.../mlrecentsvideomodel.cpp | 0
.../mlrecentsvideomodel.hpp | 0
.../mediacenter => medialibrary}/mlvideo.cpp | 0
.../mediacenter => medialibrary}/mlvideo.hpp | 0
.../mediacenter => medialibrary}/mlvideomodel.cpp | 0
.../mediacenter => medialibrary}/mlvideomodel.hpp | 0
.../qml}/ArtistTopBanner.qml | 0
.../qml}/AudioGridItem.qml | 0
.../qml/MainDisplay.qml} | 6 +-
.../qml}/MusicAlbumsDisplay.qml | 0
.../qml}/MusicAlbumsGridExpandDelegate.qml | 0
.../qml}/MusicArtistsDisplay.qml | 0
.../qml/MusicDisplay.qml} | 0
.../qml}/MusicGenresDisplay.qml | 0
.../qml}/MusicTrackListDisplay.qml | 0
.../qml}/MusicTracksDisplay.qml | 0
.../qml/VideoDisplay.qml} | 2 +-
.../qml}/VideoGridItem.qml | 0
.../qml}/VideoInfoExpandPanel.qml | 0
.../qml/VideoListDisplay.qml} | 0
modules/gui/qt/network/networkmediamodel.cpp | 2 +-
modules/gui/qt/qml/MainInterface.qml | 2 +-
modules/gui/qt/qml/style/VLCStyle.qml | 2 +-
modules/gui/qt/vlc.qrc | 30 +++---
51 files changed, 126 insertions(+), 125 deletions(-)
diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 5c73764bde..3dd68b106f 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -113,8 +113,6 @@ libqt_plugin_la_SOURCES = \
gui/qt/components/settings.hpp \
gui/qt/components/audio_device_model.cpp \
gui/qt/components/audio_device_model.hpp \
- gui/qt/components/mediacenter/ml_folders_model.hpp \
- gui/qt/components/mediacenter/ml_folders_model.cpp \
gui/qt/components/voutwindow/videosurface.cpp \
gui/qt/components/voutwindow/videosurface.hpp \
gui/qt/components/voutwindow/qvoutwindow.cpp \
@@ -133,34 +131,36 @@ libqt_plugin_la_SOURCES = \
gui/qt/components/epg/EPGView.cpp gui/qt/components/epg/EPGView.hpp \
gui/qt/components/epg/EPGWidget.cpp \
gui/qt/components/epg/EPGWidget.hpp \
- gui/qt/components/mediacenter/mcmedialib.cpp \
- gui/qt/components/mediacenter/mcmedialib.hpp \
- gui/qt/components/mediacenter/mlhelper.hpp \
- gui/qt/components/mediacenter/mlqmltypes.hpp \
- gui/qt/components/mediacenter/mlbasemodel.cpp \
- gui/qt/components/mediacenter/mlbasemodel.hpp \
- gui/qt/components/mediacenter/mlalbum.cpp \
- gui/qt/components/mediacenter/mlalbum.hpp \
- gui/qt/components/mediacenter/mlalbummodel.cpp \
- gui/qt/components/mediacenter/mlalbummodel.hpp \
- gui/qt/components/mediacenter/mlalbumtrack.cpp \
- gui/qt/components/mediacenter/mlalbumtrack.hpp \
- gui/qt/components/mediacenter/mlalbumtrackmodel.cpp \
- gui/qt/components/mediacenter/mlalbumtrackmodel.hpp \
- gui/qt/components/mediacenter/mlartist.cpp \
- gui/qt/components/mediacenter/mlartist.hpp \
- gui/qt/components/mediacenter/mlartistmodel.cpp \
- gui/qt/components/mediacenter/mlartistmodel.hpp \
- gui/qt/components/mediacenter/mlgenre.cpp \
- gui/qt/components/mediacenter/mlgenre.hpp \
- gui/qt/components/mediacenter/mlgenremodel.cpp \
- gui/qt/components/mediacenter/mlgenremodel.hpp \
- gui/qt/components/mediacenter/mlvideo.hpp \
- gui/qt/components/mediacenter/mlvideo.cpp \
- gui/qt/components/mediacenter/mlvideomodel.cpp \
- gui/qt/components/mediacenter/mlvideomodel.hpp \
- gui/qt/components/mediacenter/mlrecentsvideomodel.cpp \
- gui/qt/components/mediacenter/mlrecentsvideomodel.hpp \
+ gui/qt/medialibrary/medialib.cpp \
+ gui/qt/medialibrary/medialib.hpp \
+ gui/qt/medialibrary/mlhelper.hpp \
+ gui/qt/medialibrary/mlqmltypes.hpp \
+ gui/qt/medialibrary/mlbasemodel.cpp \
+ gui/qt/medialibrary/mlbasemodel.hpp \
+ gui/qt/medialibrary/mlalbum.cpp \
+ gui/qt/medialibrary/mlalbum.hpp \
+ gui/qt/medialibrary/mlalbummodel.cpp \
+ gui/qt/medialibrary/mlalbummodel.hpp \
+ gui/qt/medialibrary/mlalbumtrack.cpp \
+ gui/qt/medialibrary/mlalbumtrack.hpp \
+ gui/qt/medialibrary/mlalbumtrackmodel.cpp \
+ gui/qt/medialibrary/mlalbumtrackmodel.hpp \
+ gui/qt/medialibrary/mlartist.cpp \
+ gui/qt/medialibrary/mlartist.hpp \
+ gui/qt/medialibrary/mlartistmodel.cpp \
+ gui/qt/medialibrary/mlartistmodel.hpp \
+ gui/qt/medialibrary/mlfoldersmodel.cpp \
+ gui/qt/medialibrary/mlfoldersmodel.hpp \
+ gui/qt/medialibrary/mlgenre.cpp \
+ gui/qt/medialibrary/mlgenre.hpp \
+ gui/qt/medialibrary/mlgenremodel.cpp \
+ gui/qt/medialibrary/mlgenremodel.hpp \
+ gui/qt/medialibrary/mlvideo.hpp \
+ gui/qt/medialibrary/mlvideo.cpp \
+ gui/qt/medialibrary/mlvideomodel.cpp \
+ gui/qt/medialibrary/mlvideomodel.hpp \
+ gui/qt/medialibrary/mlrecentsvideomodel.cpp \
+ gui/qt/medialibrary/mlrecentsvideomodel.hpp \
gui/qt/network/networkdevicemodel.cpp \
gui/qt/network/networkdevicemodel.hpp \
gui/qt/network/networkmediamodel.cpp \
@@ -279,7 +279,6 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/components/selectable_list_model.moc.cpp \
gui/qt/components/settings.moc.cpp \
gui/qt/components/audio_device_model.moc.cpp \
- gui/qt/components/mediacenter/ml_folders_model.moc.cpp \
gui/qt/components/voutwindow/videosurface.moc.cpp \
gui/qt/components/voutwindow/qvoutwindow.moc.cpp \
gui/qt/components/voutwindow/qvoutwindowdummy.moc.cpp \
@@ -288,20 +287,21 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/components/epg/EPGRuler.moc.cpp \
gui/qt/components/epg/EPGView.moc.cpp \
gui/qt/components/epg/EPGWidget.moc.cpp \
- gui/qt/components/mediacenter/mcmedialib.moc.cpp \
- gui/qt/components/mediacenter/mlqmltypes.moc.cpp \
- gui/qt/components/mediacenter/mlbasemodel.moc.cpp \
- gui/qt/components/mediacenter/mlalbum.moc.cpp \
- gui/qt/components/mediacenter/mlalbummodel.moc.cpp \
- gui/qt/components/mediacenter/mlalbumtrack.moc.cpp \
- gui/qt/components/mediacenter/mlalbumtrackmodel.moc.cpp \
- gui/qt/components/mediacenter/mlartist.moc.cpp \
- gui/qt/components/mediacenter/mlartistmodel.moc.cpp \
- gui/qt/components/mediacenter/mlgenre.moc.cpp \
- gui/qt/components/mediacenter/mlgenremodel.moc.cpp \
- gui/qt/components/mediacenter/mlvideo.moc.cpp \
- gui/qt/components/mediacenter/mlvideomodel.moc.cpp \
- gui/qt/components/mediacenter/mlrecentsvideomodel.moc.cpp \
+ gui/qt/medialibrary/medialib.moc.cpp \
+ gui/qt/medialibrary/mlqmltypes.moc.cpp \
+ gui/qt/medialibrary/mlbasemodel.moc.cpp \
+ gui/qt/medialibrary/mlalbum.moc.cpp \
+ gui/qt/medialibrary/mlalbummodel.moc.cpp \
+ gui/qt/medialibrary/mlalbumtrack.moc.cpp \
+ gui/qt/medialibrary/mlalbumtrackmodel.moc.cpp \
+ gui/qt/medialibrary/mlartist.moc.cpp \
+ gui/qt/medialibrary/mlartistmodel.moc.cpp \
+ gui/qt/medialibrary/mlfoldersmodel.moc.cpp \
+ gui/qt/medialibrary/mlgenre.moc.cpp \
+ gui/qt/medialibrary/mlgenremodel.moc.cpp \
+ gui/qt/medialibrary/mlvideo.moc.cpp \
+ gui/qt/medialibrary/mlvideomodel.moc.cpp \
+ gui/qt/medialibrary/mlrecentsvideomodel.moc.cpp \
gui/qt/network/networkdevicemodel.moc.cpp \
gui/qt/network/networkmediamodel.moc.cpp \
gui/qt/network/networksourcelistener.moc.cpp \
@@ -629,26 +629,26 @@ libqt_plugin_la_QML = \
gui/qt/qml/menus/ToolsMenu.qml \
gui/qt/qml/menus/ViewMenu.qml \
gui/qt/qml/menus/VideoMenu.qml \
- gui/qt/qml/mediacenter/ArtistTopBanner.qml \
- gui/qt/qml/mediacenter/AudioGridItem.qml \
- gui/qt/qml/mediacenter/MCMainDisplay.qml \
- gui/qt/qml/mediacenter/MCMusicDisplay.qml \
- gui/qt/qml/mediacenter/MCVideoDisplay.qml \
- gui/qt/qml/mediacenter/MCVideoListDisplay.qml \
+ gui/qt/medialibrary/qml/ArtistTopBanner.qml \
+ gui/qt/medialibrary/qml/AudioGridItem.qml \
+ gui/qt/medialibrary/qml/MainDisplay.qml \
+ gui/qt/medialibrary/qml/MusicDisplay.qml \
+ gui/qt/medialibrary/qml/VideoDisplay.qml \
+ gui/qt/medialibrary/qml/VideoListDisplay.qml \
+ gui/qt/medialibrary/qml/MusicAlbumsDisplay.qml \
+ gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml \
+ gui/qt/medialibrary/qml/MusicArtistsDisplay.qml \
+ gui/qt/medialibrary/qml/MusicGenresDisplay.qml \
+ gui/qt/medialibrary/qml/MusicTracksDisplay.qml \
+ gui/qt/medialibrary/qml/MusicTrackListDisplay.qml \
+ gui/qt/medialibrary/qml/VideoInfoExpandPanel.qml \
+ gui/qt/medialibrary/qml/VideoGridItem.qml \
gui/qt/network/qml/NetworkDisplay.qml \
gui/qt/network/qml/NetworkBrowseDisplay.qml \
gui/qt/network/qml/NetworkHomeDisplay.qml \
gui/qt/network/qml/NetworksSectionSelectableDM.qml \
gui/qt/network/qml/NetworkGridItem.qml \
gui/qt/network/qml/NetworkListItem.qml \
- gui/qt/qml/mediacenter/MusicAlbumsDisplay.qml \
- gui/qt/qml/mediacenter/MusicAlbumsGridExpandDelegate.qml \
- gui/qt/qml/mediacenter/MusicArtistsDisplay.qml \
- gui/qt/qml/mediacenter/MusicGenresDisplay.qml \
- gui/qt/qml/mediacenter/MusicTracksDisplay.qml \
- gui/qt/qml/mediacenter/MusicTrackListDisplay.qml \
- gui/qt/qml/mediacenter/VideoInfoExpandPanel.qml \
- gui/qt/qml/mediacenter/VideoGridItem.qml \
gui/qt/playlist/qml/PlaylistListView.qml \
gui/qt/playlist/qml/PlaylistMainView.qml \
gui/qt/playlist/qml/PlaylistToolbar.qml \
diff --git a/modules/gui/qt/components/simple_preferences.hpp b/modules/gui/qt/components/simple_preferences.hpp
index b8a9286c7e..f33431d068 100644
--- a/modules/gui/qt/components/simple_preferences.hpp
+++ b/modules/gui/qt/components/simple_preferences.hpp
@@ -40,7 +40,7 @@
#include <QDialogButtonBox>
#include <QTableView>
#include <QFileDialog>
-#include "components/mediacenter/ml_folders_model.hpp"
+#include "medialibrary/mlfoldersmodel.hpp"
#ifdef _WIN32
# include "util/registry.hpp"
diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/main_interface.cpp
index 12acc5585b..533307dc86 100644
--- a/modules/gui/qt/main_interface.cpp
+++ b/modules/gui/qt/main_interface.cpp
@@ -43,14 +43,15 @@
#include "playlist/playlist_model.hpp"
#include <vlc_playlist.h>
-#include "components/mediacenter/mcmedialib.hpp"
-#include "components/mediacenter/mlqmltypes.hpp"
-#include "components/mediacenter/mlalbummodel.hpp"
-#include "components/mediacenter/mlartistmodel.hpp"
-#include "components/mediacenter/mlalbumtrackmodel.hpp"
-#include "components/mediacenter/mlgenremodel.hpp"
-#include "components/mediacenter/mlvideomodel.hpp"
-#include "components/mediacenter/mlrecentsvideomodel.hpp"
+#include "medialibrary/medialib.hpp"
+#include "medialibrary/mlqmltypes.hpp"
+#include "medialibrary/mlalbummodel.hpp"
+#include "medialibrary/mlartistmodel.hpp"
+#include "medialibrary/mlalbumtrackmodel.hpp"
+#include "medialibrary/mlgenremodel.hpp"
+#include "medialibrary/mlvideomodel.hpp"
+#include "medialibrary/mlrecentsvideomodel.hpp"
+
#include "components/recent_media_model.hpp"
#include "components/settings.hpp"
@@ -403,7 +404,7 @@ void MainInterface::createMainWidget( QSettings * )
if (b_hasMedialibrary)
{
- MCMediaLib *medialib = new MCMediaLib(p_intf, mediacenterView);
+ MediaLib *medialib = new MediaLib(p_intf, mediacenterView);
rootCtx->setContextProperty( "medialib", medialib );
}
else
diff --git a/modules/gui/qt/components/mediacenter/mcmedialib.cpp b/modules/gui/qt/medialibrary/medialib.cpp
similarity index 90%
rename from modules/gui/qt/components/mediacenter/mcmedialib.cpp
rename to modules/gui/qt/medialibrary/medialib.cpp
index aa89961484..3a63a293bd 100644
--- a/modules/gui/qt/components/mediacenter/mcmedialib.cpp
+++ b/modules/gui/qt/medialibrary/medialib.cpp
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include "mcmedialib.hpp"
+#include "medialib.hpp"
#include "mlhelper.hpp"
#include "recents.hpp"
@@ -26,7 +26,7 @@
#include "playlist/playlist_controller.hpp"
#include <QSettings>
-MCMediaLib::MCMediaLib(intf_thread_t *_intf, QObject *_parent)
+MediaLib::MediaLib(intf_thread_t *_intf, QObject *_parent)
: QObject( _parent )
, m_intf( _intf )
, m_gridView ( m_intf->p_sys->mainSettings->value("medialib-gridView",true).toBool() )
@@ -35,24 +35,24 @@ MCMediaLib::MCMediaLib(intf_thread_t *_intf, QObject *_parent)
vlc_ml_event_unregister_callback( m_ml, cb );
})
{
- m_event_cb.reset( vlc_ml_event_register_callback( m_ml, MCMediaLib::onMediaLibraryEvent,
+ m_event_cb.reset( vlc_ml_event_register_callback( m_ml, MediaLib::onMediaLibraryEvent,
this ) );
}
// Should the items be displayed as a grid or as list ?
-bool MCMediaLib::isGridView() const
+bool MediaLib::isGridView() const
{
return m_gridView;
}
-void MCMediaLib::setGridView(bool state)
+void MediaLib::setGridView(bool state)
{
m_gridView = state;
m_intf->p_sys->mainSettings->setValue("medialib-gridView",state);
emit gridViewChanged();
}
-void MCMediaLib::openMRLFromMedia(const vlc_ml_media_t& media, bool start )
+void MediaLib::openMRLFromMedia(const vlc_ml_media_t& media, bool start )
{
if (!media.p_files)
return;
@@ -64,20 +64,20 @@ void MCMediaLib::openMRLFromMedia(const vlc_ml_media_t& media, bool start )
}
}
-void MCMediaLib::addToPlaylist(const QString& mrl)
+void MediaLib::addToPlaylist(const QString& mrl)
{
vlc::playlist::Media media{ mrl, mrl };
m_intf->p_sys->p_mainPlaylistController->append( {media}, false );
}
-void MCMediaLib::addToPlaylist(const QUrl& mrl)
+void MediaLib::addToPlaylist(const QUrl& mrl)
{
vlc::playlist::Media media{ mrl.toString(QUrl::None), mrl.fileName() };
m_intf->p_sys->p_mainPlaylistController->append( {media} , false );
}
// A specific item has been asked to be added to the playlist
-void MCMediaLib::addToPlaylist(const MLParentId & itemId)
+void MediaLib::addToPlaylist(const MLParentId & itemId)
{
//invalid item
if (itemId.id == 0)
@@ -109,7 +109,7 @@ void MCMediaLib::addToPlaylist(const MLParentId & itemId)
}
}
-void MCMediaLib::addToPlaylist(const QVariantList& itemIdList)
+void MediaLib::addToPlaylist(const QVariantList& itemIdList)
{
for (const QVariant& varValue: itemIdList)
{
@@ -133,7 +133,7 @@ void MCMediaLib::addToPlaylist(const QVariantList& itemIdList)
// A specific item has been asked to be played,
// so it's added to the playlist and played
-void MCMediaLib::addAndPlay(const MLParentId & itemId )
+void MediaLib::addAndPlay(const MLParentId & itemId )
{
if (itemId.id == 0)
return;
@@ -163,20 +163,20 @@ void MCMediaLib::addAndPlay(const MLParentId & itemId )
}
}
-void MCMediaLib::addAndPlay(const QString& mrl)
+void MediaLib::addAndPlay(const QString& mrl)
{
vlc::playlist::Media media{ mrl, mrl };
m_intf->p_sys->p_mainPlaylistController->append( {media}, true );
}
-void MCMediaLib::addAndPlay(const QUrl& mrl)
+void MediaLib::addAndPlay(const QUrl& mrl)
{
vlc::playlist::Media media{ mrl.toString(QUrl::None), mrl.fileName() };
m_intf->p_sys->p_mainPlaylistController->append( {media}, true );
}
-void MCMediaLib::addAndPlay(const QVariantList& itemIdList)
+void MediaLib::addAndPlay(const QVariantList& itemIdList)
{
bool b_start = true;
for (const QVariant& varValue: itemIdList)
@@ -211,14 +211,14 @@ void MCMediaLib::addAndPlay(const QVariantList& itemIdList)
}
}
-vlc_medialibrary_t* MCMediaLib::vlcMl()
+vlc_medialibrary_t* MediaLib::vlcMl()
{
return vlc_ml_instance_get( m_intf );
}
-void MCMediaLib::onMediaLibraryEvent( void* data, const vlc_ml_event_t* event )
+void MediaLib::onMediaLibraryEvent( void* data, const vlc_ml_event_t* event )
{
- MCMediaLib* self = static_cast<MCMediaLib*>( data );
+ MediaLib* self = static_cast<MediaLib*>( data );
switch ( event->i_type )
{
case VLC_ML_EVENT_PARSING_PROGRESS_UPDATED:
diff --git a/modules/gui/qt/components/mediacenter/mcmedialib.hpp b/modules/gui/qt/medialibrary/medialib.hpp
similarity index 97%
rename from modules/gui/qt/components/mediacenter/mcmedialib.hpp
rename to modules/gui/qt/medialibrary/medialib.hpp
index db52978bf4..a3deb7d3d1 100644
--- a/modules/gui/qt/components/mediacenter/mcmedialib.hpp
+++ b/modules/gui/qt/medialibrary/medialib.hpp
@@ -34,7 +34,7 @@
#include "qt.hpp"
#include "mlqmltypes.hpp"
-class MCMediaLib : public QObject
+class MediaLib : public QObject
{
Q_OBJECT
@@ -45,7 +45,7 @@ class MCMediaLib : public QObject
Q_PROPERTY(bool idle READ idle NOTIFY idleChanged)
public:
- MCMediaLib(intf_thread_t* _intf, QObject* _parent = nullptr );
+ MediaLib(intf_thread_t* _intf, QObject* _parent = nullptr );
Q_INVOKABLE void addToPlaylist(const MLParentId &itemId);
Q_INVOKABLE void addToPlaylist(const QString& mrl);
diff --git a/modules/gui/qt/components/mediacenter/mlalbum.cpp b/modules/gui/qt/medialibrary/mlalbum.cpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlalbum.cpp
rename to modules/gui/qt/medialibrary/mlalbum.cpp
diff --git a/modules/gui/qt/components/mediacenter/mlalbum.hpp b/modules/gui/qt/medialibrary/mlalbum.hpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlalbum.hpp
rename to modules/gui/qt/medialibrary/mlalbum.hpp
diff --git a/modules/gui/qt/components/mediacenter/mlalbummodel.cpp b/modules/gui/qt/medialibrary/mlalbummodel.cpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlalbummodel.cpp
rename to modules/gui/qt/medialibrary/mlalbummodel.cpp
diff --git a/modules/gui/qt/components/mediacenter/mlalbummodel.hpp b/modules/gui/qt/medialibrary/mlalbummodel.hpp
similarity index 98%
rename from modules/gui/qt/components/mediacenter/mlalbummodel.hpp
rename to modules/gui/qt/medialibrary/mlalbummodel.hpp
index 6899bf4a86..b0befe5b77 100644
--- a/modules/gui/qt/components/mediacenter/mlalbummodel.hpp
+++ b/modules/gui/qt/medialibrary/mlalbummodel.hpp
@@ -26,7 +26,7 @@
#include <QObject>
#include "mlbasemodel.hpp"
#include "mlalbum.hpp"
-#include "mcmedialib.hpp"
+#include "medialib.hpp"
class MLAlbumModel : public MLSlidingWindowModel<MLAlbum>
{
diff --git a/modules/gui/qt/components/mediacenter/mlalbumtrack.cpp b/modules/gui/qt/medialibrary/mlalbumtrack.cpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlalbumtrack.cpp
rename to modules/gui/qt/medialibrary/mlalbumtrack.cpp
diff --git a/modules/gui/qt/components/mediacenter/mlalbumtrack.hpp b/modules/gui/qt/medialibrary/mlalbumtrack.hpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlalbumtrack.hpp
rename to modules/gui/qt/medialibrary/mlalbumtrack.hpp
diff --git a/modules/gui/qt/components/mediacenter/mlalbumtrackmodel.cpp b/modules/gui/qt/medialibrary/mlalbumtrackmodel.cpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlalbumtrackmodel.cpp
rename to modules/gui/qt/medialibrary/mlalbumtrackmodel.cpp
diff --git a/modules/gui/qt/components/mediacenter/mlalbumtrackmodel.hpp b/modules/gui/qt/medialibrary/mlalbumtrackmodel.hpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlalbumtrackmodel.hpp
rename to modules/gui/qt/medialibrary/mlalbumtrackmodel.hpp
diff --git a/modules/gui/qt/components/mediacenter/mlartist.cpp b/modules/gui/qt/medialibrary/mlartist.cpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlartist.cpp
rename to modules/gui/qt/medialibrary/mlartist.cpp
diff --git a/modules/gui/qt/components/mediacenter/mlartist.hpp b/modules/gui/qt/medialibrary/mlartist.hpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlartist.hpp
rename to modules/gui/qt/medialibrary/mlartist.hpp
diff --git a/modules/gui/qt/components/mediacenter/mlartistmodel.cpp b/modules/gui/qt/medialibrary/mlartistmodel.cpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlartistmodel.cpp
rename to modules/gui/qt/medialibrary/mlartistmodel.cpp
diff --git a/modules/gui/qt/components/mediacenter/mlartistmodel.hpp b/modules/gui/qt/medialibrary/mlartistmodel.hpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlartistmodel.hpp
rename to modules/gui/qt/medialibrary/mlartistmodel.hpp
diff --git a/modules/gui/qt/components/mediacenter/mlbasemodel.cpp b/modules/gui/qt/medialibrary/mlbasemodel.cpp
similarity index 96%
rename from modules/gui/qt/components/mediacenter/mlbasemodel.cpp
rename to modules/gui/qt/medialibrary/mlbasemodel.cpp
index 64d87f9be3..faec9d28a7 100644
--- a/modules/gui/qt/components/mediacenter/mlbasemodel.cpp
+++ b/modules/gui/qt/medialibrary/mlbasemodel.cpp
@@ -18,7 +18,7 @@
#include <cassert>
#include "mlbasemodel.hpp"
-#include "mcmedialib.hpp"
+#include "medialib.hpp"
#include <vlc_cxx_helpers.hpp>
MLBaseModel::MLBaseModel(QObject *parent)
@@ -112,15 +112,15 @@ void MLBaseModel::unsetParentId()
emit parentIdChanged();
}
-MCMediaLib* MLBaseModel::ml() const
+MediaLib* MLBaseModel::ml() const
{
- return m_mcMediaLib;
+ return m_mediaLib;
}
-void MLBaseModel::setMl(MCMediaLib* mcMl)
+void MLBaseModel::setMl(MediaLib* medialib)
{
- m_ml = mcMl->vlcMl();
- m_mcMediaLib = mcMl;
+ m_ml = medialib->vlcMl();
+ m_mediaLib = medialib;
if ( m_ml_event_handle == nullptr )
m_ml_event_handle.reset( vlc_ml_event_register_callback( m_ml, onVlcMlEvent, this ) );
}
diff --git a/modules/gui/qt/components/mediacenter/mlbasemodel.hpp b/modules/gui/qt/medialibrary/mlbasemodel.hpp
similarity index 97%
rename from modules/gui/qt/components/mediacenter/mlbasemodel.hpp
rename to modules/gui/qt/medialibrary/mlbasemodel.hpp
index 7b273e4810..bdacb415b6 100644
--- a/modules/gui/qt/components/mediacenter/mlbasemodel.hpp
+++ b/modules/gui/qt/medialibrary/mlbasemodel.hpp
@@ -29,10 +29,10 @@
#include <QAbstractListModel>
#include "vlc_media_library.h"
#include "mlqmltypes.hpp"
-#include "mcmedialib.hpp"
+#include "medialib.hpp"
#include <memory>
-class MCMediaLib;
+class MediaLib;
class MLBaseModel : public QAbstractListModel
{
@@ -45,7 +45,7 @@ public:
Q_INVOKABLE void sortByColumn(QByteArray name, Qt::SortOrder order);
Q_PROPERTY( MLParentId parentId READ parentId WRITE setParentId NOTIFY parentIdChanged RESET unsetParentId )
- Q_PROPERTY( MCMediaLib* ml READ ml WRITE setMl )
+ Q_PROPERTY( MediaLib* ml READ ml WRITE setMl )
Q_PROPERTY( unsigned int maxItems MEMBER m_nb_max_items )
Q_PROPERTY( QString searchPattern READ searchPattern WRITE setSearchPattern )
@@ -79,8 +79,8 @@ protected:
void setParentId(MLParentId parentId);
void unsetParentId();
- MCMediaLib* ml() const;
- void setMl(MCMediaLib* ml);
+ MediaLib* ml() const;
+ void setMl(MediaLib* ml);
const QString& searchPattern() const;
void setSearchPattern( const QString& pattern );
@@ -96,7 +96,7 @@ protected:
MLParentId m_parent;
vlc_medialibrary_t* m_ml;
- MCMediaLib* m_mcMediaLib;
+ MediaLib* m_mediaLib;
mutable vlc_ml_query_params_t m_query_param;
std::unique_ptr<char, void(*)(void*)> m_search_pattern_cstr;
QString m_search_pattern;
diff --git a/modules/gui/qt/components/mediacenter/ml_folders_model.cpp b/modules/gui/qt/medialibrary/mlfoldersmodel.cpp
similarity index 99%
rename from modules/gui/qt/components/mediacenter/ml_folders_model.cpp
rename to modules/gui/qt/medialibrary/mlfoldersmodel.cpp
index e7469830e7..4829918488 100644
--- a/modules/gui/qt/components/mediacenter/ml_folders_model.cpp
+++ b/modules/gui/qt/medialibrary/mlfoldersmodel.cpp
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include "ml_folders_model.hpp"
+#include "mlfoldersmodel.hpp"
#include <cassert>
MlFoldersModel::MlFoldersModel( vlc_medialibrary_t *p_ml , QObject *parent )
diff --git a/modules/gui/qt/components/mediacenter/ml_folders_model.hpp b/modules/gui/qt/medialibrary/mlfoldersmodel.hpp
similarity index 98%
rename from modules/gui/qt/components/mediacenter/ml_folders_model.hpp
rename to modules/gui/qt/medialibrary/mlfoldersmodel.hpp
index b1f9303e51..8b8823a8ce 100644
--- a/modules/gui/qt/components/mediacenter/ml_folders_model.hpp
+++ b/modules/gui/qt/medialibrary/mlfoldersmodel.hpp
@@ -29,7 +29,7 @@
#include <QAbstractListModel>
#include <QUrl>
#include <QList>
-#include "components/mediacenter/mlhelper.hpp"
+#include "mlhelper.hpp"
#include <vlc_media_library.h>
diff --git a/modules/gui/qt/components/mediacenter/mlgenre.cpp b/modules/gui/qt/medialibrary/mlgenre.cpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlgenre.cpp
rename to modules/gui/qt/medialibrary/mlgenre.cpp
diff --git a/modules/gui/qt/components/mediacenter/mlgenre.hpp b/modules/gui/qt/medialibrary/mlgenre.hpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlgenre.hpp
rename to modules/gui/qt/medialibrary/mlgenre.hpp
diff --git a/modules/gui/qt/components/mediacenter/mlgenremodel.cpp b/modules/gui/qt/medialibrary/mlgenremodel.cpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlgenremodel.cpp
rename to modules/gui/qt/medialibrary/mlgenremodel.cpp
diff --git a/modules/gui/qt/components/mediacenter/mlgenremodel.hpp b/modules/gui/qt/medialibrary/mlgenremodel.hpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlgenremodel.hpp
rename to modules/gui/qt/medialibrary/mlgenremodel.hpp
diff --git a/modules/gui/qt/components/mediacenter/mlhelper.hpp b/modules/gui/qt/medialibrary/mlhelper.hpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlhelper.hpp
rename to modules/gui/qt/medialibrary/mlhelper.hpp
diff --git a/modules/gui/qt/components/mediacenter/mlqmltypes.hpp b/modules/gui/qt/medialibrary/mlqmltypes.hpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlqmltypes.hpp
rename to modules/gui/qt/medialibrary/mlqmltypes.hpp
diff --git a/modules/gui/qt/components/mediacenter/mlrecentsvideomodel.cpp b/modules/gui/qt/medialibrary/mlrecentsvideomodel.cpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlrecentsvideomodel.cpp
rename to modules/gui/qt/medialibrary/mlrecentsvideomodel.cpp
diff --git a/modules/gui/qt/components/mediacenter/mlrecentsvideomodel.hpp b/modules/gui/qt/medialibrary/mlrecentsvideomodel.hpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlrecentsvideomodel.hpp
rename to modules/gui/qt/medialibrary/mlrecentsvideomodel.hpp
diff --git a/modules/gui/qt/components/mediacenter/mlvideo.cpp b/modules/gui/qt/medialibrary/mlvideo.cpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlvideo.cpp
rename to modules/gui/qt/medialibrary/mlvideo.cpp
diff --git a/modules/gui/qt/components/mediacenter/mlvideo.hpp b/modules/gui/qt/medialibrary/mlvideo.hpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlvideo.hpp
rename to modules/gui/qt/medialibrary/mlvideo.hpp
diff --git a/modules/gui/qt/components/mediacenter/mlvideomodel.cpp b/modules/gui/qt/medialibrary/mlvideomodel.cpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlvideomodel.cpp
rename to modules/gui/qt/medialibrary/mlvideomodel.cpp
diff --git a/modules/gui/qt/components/mediacenter/mlvideomodel.hpp b/modules/gui/qt/medialibrary/mlvideomodel.hpp
similarity index 100%
rename from modules/gui/qt/components/mediacenter/mlvideomodel.hpp
rename to modules/gui/qt/medialibrary/mlvideomodel.hpp
diff --git a/modules/gui/qt/qml/mediacenter/ArtistTopBanner.qml b/modules/gui/qt/medialibrary/qml/ArtistTopBanner.qml
similarity index 100%
rename from modules/gui/qt/qml/mediacenter/ArtistTopBanner.qml
rename to modules/gui/qt/medialibrary/qml/ArtistTopBanner.qml
diff --git a/modules/gui/qt/qml/mediacenter/AudioGridItem.qml b/modules/gui/qt/medialibrary/qml/AudioGridItem.qml
similarity index 100%
rename from modules/gui/qt/qml/mediacenter/AudioGridItem.qml
rename to modules/gui/qt/medialibrary/qml/AudioGridItem.qml
diff --git a/modules/gui/qt/qml/mediacenter/MCMainDisplay.qml b/modules/gui/qt/medialibrary/qml/MainDisplay.qml
similarity index 98%
rename from modules/gui/qt/qml/mediacenter/MCMainDisplay.qml
rename to modules/gui/qt/medialibrary/qml/MainDisplay.qml
index ff19991940..896341ff28 100644
--- a/modules/gui/qt/qml/mediacenter/MCMainDisplay.qml
+++ b/modules/gui/qt/medialibrary/qml/MainDisplay.qml
@@ -60,7 +60,7 @@ Utils.NavigableFocusScope {
Component {
id: musicComp
- MCMusicDisplay {
+ MusicDisplay {
navigationParent: medialibId
navigationUpItem: sourcesBanner
navigationRightItem: playlist
@@ -71,7 +71,7 @@ Utils.NavigableFocusScope {
Component {
id: videoComp
- MCVideoDisplay {
+ VideoDisplay {
navigationParent: medialibId
navigationUpItem: sourcesBanner
navigationRightItem: playlist
@@ -136,7 +136,7 @@ Utils.NavigableFocusScope {
id: column
anchors.fill: parent
- Layout.minimumWidth: VLCStyle.minWidthMediacenter
+ Layout.minimumWidth: VLCStyle.minWindowWidth
spacing: 0
/* Source selection*/
diff --git a/modules/gui/qt/qml/mediacenter/MusicAlbumsDisplay.qml b/modules/gui/qt/medialibrary/qml/MusicAlbumsDisplay.qml
similarity index 100%
rename from modules/gui/qt/qml/mediacenter/MusicAlbumsDisplay.qml
rename to modules/gui/qt/medialibrary/qml/MusicAlbumsDisplay.qml
diff --git a/modules/gui/qt/qml/mediacenter/MusicAlbumsGridExpandDelegate.qml b/modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml
similarity index 100%
rename from modules/gui/qt/qml/mediacenter/MusicAlbumsGridExpandDelegate.qml
rename to modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml
diff --git a/modules/gui/qt/qml/mediacenter/MusicArtistsDisplay.qml b/modules/gui/qt/medialibrary/qml/MusicArtistsDisplay.qml
similarity index 100%
rename from modules/gui/qt/qml/mediacenter/MusicArtistsDisplay.qml
rename to modules/gui/qt/medialibrary/qml/MusicArtistsDisplay.qml
diff --git a/modules/gui/qt/qml/mediacenter/MCMusicDisplay.qml b/modules/gui/qt/medialibrary/qml/MusicDisplay.qml
similarity index 100%
rename from modules/gui/qt/qml/mediacenter/MCMusicDisplay.qml
rename to modules/gui/qt/medialibrary/qml/MusicDisplay.qml
diff --git a/modules/gui/qt/qml/mediacenter/MusicGenresDisplay.qml b/modules/gui/qt/medialibrary/qml/MusicGenresDisplay.qml
similarity index 100%
rename from modules/gui/qt/qml/mediacenter/MusicGenresDisplay.qml
rename to modules/gui/qt/medialibrary/qml/MusicGenresDisplay.qml
diff --git a/modules/gui/qt/qml/mediacenter/MusicTrackListDisplay.qml b/modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml
similarity index 100%
rename from modules/gui/qt/qml/mediacenter/MusicTrackListDisplay.qml
rename to modules/gui/qt/medialibrary/qml/MusicTrackListDisplay.qml
diff --git a/modules/gui/qt/qml/mediacenter/MusicTracksDisplay.qml b/modules/gui/qt/medialibrary/qml/MusicTracksDisplay.qml
similarity index 100%
rename from modules/gui/qt/qml/mediacenter/MusicTracksDisplay.qml
rename to modules/gui/qt/medialibrary/qml/MusicTracksDisplay.qml
diff --git a/modules/gui/qt/qml/mediacenter/MCVideoDisplay.qml b/modules/gui/qt/medialibrary/qml/VideoDisplay.qml
similarity index 99%
rename from modules/gui/qt/qml/mediacenter/MCVideoDisplay.qml
rename to modules/gui/qt/medialibrary/qml/VideoDisplay.qml
index cad09b0afc..448af2e670 100644
--- a/modules/gui/qt/qml/mediacenter/MCVideoDisplay.qml
+++ b/modules/gui/qt/medialibrary/qml/VideoDisplay.qml
@@ -178,7 +178,7 @@ Utils.NavigableFocusScope {
Component {
id: listComponent
- MCVideoListDisplay {
+ VideoListDisplay {
height: view.height
width: view.width
onContextMenuButtonClicked:{
diff --git a/modules/gui/qt/qml/mediacenter/VideoGridItem.qml b/modules/gui/qt/medialibrary/qml/VideoGridItem.qml
similarity index 100%
rename from modules/gui/qt/qml/mediacenter/VideoGridItem.qml
rename to modules/gui/qt/medialibrary/qml/VideoGridItem.qml
diff --git a/modules/gui/qt/qml/mediacenter/VideoInfoExpandPanel.qml b/modules/gui/qt/medialibrary/qml/VideoInfoExpandPanel.qml
similarity index 100%
rename from modules/gui/qt/qml/mediacenter/VideoInfoExpandPanel.qml
rename to modules/gui/qt/medialibrary/qml/VideoInfoExpandPanel.qml
diff --git a/modules/gui/qt/qml/mediacenter/MCVideoListDisplay.qml b/modules/gui/qt/medialibrary/qml/VideoListDisplay.qml
similarity index 100%
rename from modules/gui/qt/qml/mediacenter/MCVideoListDisplay.qml
rename to modules/gui/qt/medialibrary/qml/VideoListDisplay.qml
diff --git a/modules/gui/qt/network/networkmediamodel.cpp b/modules/gui/qt/network/networkmediamodel.cpp
index a832e0cda8..cece2d531c 100644
--- a/modules/gui/qt/network/networkmediamodel.cpp
+++ b/modules/gui/qt/network/networkmediamodel.cpp
@@ -18,7 +18,7 @@
#include "networkmediamodel.hpp"
-#include "components/mediacenter/mlhelper.hpp"
+#include "medialibrary/mlhelper.hpp"
#include "playlist/media.hpp"
#include "playlist/playlist_controller.hpp"
diff --git a/modules/gui/qt/qml/MainInterface.qml b/modules/gui/qt/qml/MainInterface.qml
index 6a7da28825..a45053566d 100644
--- a/modules/gui/qt/qml/MainInterface.qml
+++ b/modules/gui/qt/qml/MainInterface.qml
@@ -75,7 +75,7 @@ Rectangle {
readonly property var pageModel: [
{ name: "about", component: aboutComp },
- { name: "mc", url: "qrc:///mediacenter/MCMainDisplay.qml" },
+ { name: "mc", url: "qrc:///medialibrary/MainDisplay.qml" },
{ name: "playlist", url: "qrc:///playlist/PlaylistMainView.qml" },
{ name: "player", component: audioplayerComp },
]
diff --git a/modules/gui/qt/qml/style/VLCStyle.qml b/modules/gui/qt/qml/style/VLCStyle.qml
index de079c20e2..e5401e2ad9 100644
--- a/modules/gui/qt/qml/style/VLCStyle.qml
+++ b/modules/gui/qt/qml/style/VLCStyle.qml
@@ -92,7 +92,7 @@ Item {
property int heightBar_xlarge: 128 * scale;
property int heightBar_xxlarge: 256 * scale;
- property int minWidthMediacenter: 500 * scale;
+ property int minWindowWidth: 500 * scale;
property int maxWidthPlaylist: 400 * scale;
property int defaultWidthPlaylist: 300 * scale;
property int closedWidthPlaylist: 20 * scale;
diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc
index 3ebbdaae0c..c85e0786ad 100644
--- a/modules/gui/qt/vlc.qrc
+++ b/modules/gui/qt/vlc.qrc
@@ -218,21 +218,21 @@
<file alias="NetworkGridItem.qml">network/qml/NetworkGridItem.qml</file>
<file alias="NetworkListItem.qml">network/qml/NetworkListItem.qml</file>
</qresource>
- <qresource prefix="/mediacenter">
- <file alias="MCMusicDisplay.qml">qml/mediacenter/MCMusicDisplay.qml</file>
- <file alias="MCVideoDisplay.qml">qml/mediacenter/MCVideoDisplay.qml</file>
- <file alias="MusicAlbumsDisplay.qml">qml/mediacenter/MusicAlbumsDisplay.qml</file>
- <file alias="MusicAlbumsGridExpandDelegate.qml">qml/mediacenter/MusicAlbumsGridExpandDelegate.qml</file>
- <file alias="MusicArtistsDisplay.qml">qml/mediacenter/MusicArtistsDisplay.qml</file>
- <file alias="MusicGenresDisplay.qml">qml/mediacenter/MusicGenresDisplay.qml</file>
- <file alias="MusicTracksDisplay.qml">qml/mediacenter/MusicTracksDisplay.qml</file>
- <file alias="MusicTrackListDisplay.qml">qml/mediacenter/MusicTrackListDisplay.qml</file>
- <file alias="ArtistTopBanner.qml">qml/mediacenter/ArtistTopBanner.qml</file>
- <file alias="MCMainDisplay.qml">qml/mediacenter/MCMainDisplay.qml</file>
- <file alias="VideoInfoExpandPanel.qml">qml/mediacenter/VideoInfoExpandPanel.qml</file>
- <file alias="MCVideoListDisplay.qml">qml/mediacenter/MCVideoListDisplay.qml</file>
- <file alias="VideoGridItem.qml">qml/mediacenter/VideoGridItem.qml</file>
- <file alias="AudioGridItem.qml">qml/mediacenter/AudioGridItem.qml</file>
+ <qresource prefix="/medialibrary">
+ <file alias="MusicDisplay.qml">medialibrary/qml/MusicDisplay.qml</file>
+ <file alias="VideoDisplay.qml">medialibrary/qml/VideoDisplay.qml</file>
+ <file alias="MusicAlbumsDisplay.qml">medialibrary/qml/MusicAlbumsDisplay.qml</file>
+ <file alias="MusicAlbumsGridExpandDelegate.qml">medialibrary/qml/MusicAlbumsGridExpandDelegate.qml</file>
+ <file alias="MusicArtistsDisplay.qml">medialibrary/qml/MusicArtistsDisplay.qml</file>
+ <file alias="MusicGenresDisplay.qml">medialibrary/qml/MusicGenresDisplay.qml</file>
+ <file alias="MusicTracksDisplay.qml">medialibrary/qml/MusicTracksDisplay.qml</file>
+ <file alias="MusicTrackListDisplay.qml">medialibrary/qml/MusicTrackListDisplay.qml</file>
+ <file alias="ArtistTopBanner.qml">medialibrary/qml/ArtistTopBanner.qml</file>
+ <file alias="MainDisplay.qml">medialibrary/qml/MainDisplay.qml</file>
+ <file alias="VideoInfoExpandPanel.qml">medialibrary/qml/VideoInfoExpandPanel.qml</file>
+ <file alias="VideoListDisplay.qml">medialibrary/qml/VideoListDisplay.qml</file>
+ <file alias="VideoGridItem.qml">medialibrary/qml/VideoGridItem.qml</file>
+ <file alias="AudioGridItem.qml">medialibrary/qml/AudioGridItem.qml</file>
</qresource>
<qresource prefix="/style">
<file alias="qmldir">qml/style/qmldir</file>
More information about the vlc-commits
mailing list