[vlc-commits] qt: move network component to its own folder
Pierre Lamot
git at videolan.org
Tue Dec 17 15:37:14 CET 2019
vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Fri Oct 11 16:47:10 2019 +0200| [9f6f0b1fa4b25c0fb6cc802c9e4c077aa36e5acd] | committer: Jean-Baptiste Kempf
qt: move network component to its own folder
MLNetwork... classes have been renamed to Network...
no functionnal changes
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9f6f0b1fa4b25c0fb6cc802c9e4c077aa36e5acd
---
modules/gui/qt/Makefile.am | 29 +++++------
.../mediacenter/mlnetworksourcelistener.cpp | 58 ----------------------
modules/gui/qt/main_interface.cpp | 9 ++--
.../networkdevicemodel.cpp} | 36 +++++++-------
.../networkdevicemodel.hpp} | 8 +--
.../networkmediamodel.cpp} | 50 +++++++++----------
.../networkmediamodel.hpp} | 10 ++--
modules/gui/qt/network/networksourcelistener.cpp | 58 ++++++++++++++++++++++
.../networksourcelistener.hpp} | 14 +++---
.../qml/NetworkBrowseDisplay.qml} | 16 +++---
.../qml/NetworkDisplay.qml} | 4 +-
.../qml}/NetworkGridItem.qml | 10 ++--
.../qml/NetworkHomeDisplay.qml} | 12 ++---
.../qml}/NetworkListItem.qml | 12 ++---
.../qml/NetworksSectionSelectableDM.qml} | 8 +--
modules/gui/qt/qml/mediacenter/MCMainDisplay.qml | 3 +-
modules/gui/qt/vlc.qrc | 14 +++---
17 files changed, 178 insertions(+), 173 deletions(-)
diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index a78aceabe9..5c73764bde 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -155,18 +155,18 @@ libqt_plugin_la_SOURCES = \
gui/qt/components/mediacenter/mlgenre.hpp \
gui/qt/components/mediacenter/mlgenremodel.cpp \
gui/qt/components/mediacenter/mlgenremodel.hpp \
- gui/qt/components/mediacenter/mlnetworkdevicemodel.cpp \
- gui/qt/components/mediacenter/mlnetworkdevicemodel.hpp \
- gui/qt/components/mediacenter/mlnetworkmediamodel.cpp \
- gui/qt/components/mediacenter/mlnetworkmediamodel.hpp \
- gui/qt/components/mediacenter/mlnetworksourcelistener.cpp \
- gui/qt/components/mediacenter/mlnetworksourcelistener.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/network/networkdevicemodel.cpp \
+ gui/qt/network/networkdevicemodel.hpp \
+ gui/qt/network/networkmediamodel.cpp \
+ gui/qt/network/networkmediamodel.hpp \
+ gui/qt/network/networksourcelistener.cpp \
+ gui/qt/network/networksourcelistener.hpp \
gui/qt/playlist/media.hpp \
gui/qt/playlist/playlist_common.cpp \
gui/qt/playlist/playlist_common.hpp \
@@ -299,11 +299,12 @@ nodist_libqt_plugin_la_SOURCES = \
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/mlnetworkdevicemodel.moc.cpp \
- gui/qt/components/mediacenter/mlnetworkmediamodel.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/network/networkdevicemodel.moc.cpp \
+ gui/qt/network/networkmediamodel.moc.cpp \
+ gui/qt/network/networksourcelistener.moc.cpp \
gui/qt/playlist/playlist_common.moc.cpp \
gui/qt/playlist/playlist_item.moc.cpp \
gui/qt/playlist/playlist_model.moc.cpp \
@@ -634,18 +635,18 @@ libqt_plugin_la_QML = \
gui/qt/qml/mediacenter/MCMusicDisplay.qml \
gui/qt/qml/mediacenter/MCVideoDisplay.qml \
gui/qt/qml/mediacenter/MCVideoListDisplay.qml \
- gui/qt/qml/mediacenter/MCNetworkDisplay.qml \
- gui/qt/qml/mediacenter/MCNetworkBrowseDisplay.qml \
- gui/qt/qml/mediacenter/MCNetworkHomeDisplay.qml \
- gui/qt/qml/mediacenter/MCNetworksSectionSelectableDM.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/NetworkGridItem.qml \
- gui/qt/qml/mediacenter/NetworkListItem.qml \
gui/qt/qml/mediacenter/VideoInfoExpandPanel.qml \
gui/qt/qml/mediacenter/VideoGridItem.qml \
gui/qt/playlist/qml/PlaylistListView.qml \
diff --git a/modules/gui/qt/components/mediacenter/mlnetworksourcelistener.cpp b/modules/gui/qt/components/mediacenter/mlnetworksourcelistener.cpp
deleted file mode 100644
index 7cedf90afa..0000000000
--- a/modules/gui/qt/components/mediacenter/mlnetworksourcelistener.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "mlnetworksourcelistener.hpp"
-
-MLNetworkSourceListener::SourceListenerCb::~SourceListenerCb()
-{
-}
-
-MLNetworkSourceListener::MLNetworkSourceListener(MediaSourcePtr s, SourceListenerCb* m)
- : source( s )
- , listener( nullptr, [s]( vlc_media_tree_listener_id* l ) {
- vlc_media_tree_RemoveListener( s->tree, l );
- } )
- , cb( m )
-{
- static const vlc_media_tree_callbacks cbs {
- &MLNetworkSourceListener::onItemCleared,
- &MLNetworkSourceListener::onItemAdded,
- &MLNetworkSourceListener::onItemRemoved,
- &MLNetworkSourceListener::onItemPreparseEnded
- };
- auto l = vlc_media_tree_AddListener( s->tree, &cbs, this, true );
- if ( l == nullptr )
- return;
- listener.reset( l );
-}
-
-MLNetworkSourceListener::MLNetworkSourceListener()
-{
-}
-
-void MLNetworkSourceListener::onItemCleared( vlc_media_tree_t*, input_item_node_t* node,
- void* userdata)
-{
- auto* self = static_cast<MLNetworkSourceListener*>( userdata );
- self->cb->onItemCleared( self->source, node );
-}
-
-void MLNetworkSourceListener::onItemAdded( vlc_media_tree_t *, input_item_node_t * parent,
- input_item_node_t *const children[], size_t count,
- void *userdata )
-{
- auto* self = static_cast<MLNetworkSourceListener*>( userdata );
- auto source = self->source;
- self->cb->onItemAdded( self->source, parent, children, count );
-}
-
-void MLNetworkSourceListener::onItemRemoved( vlc_media_tree_t *, input_item_node_t *,
- input_item_node_t *const children[], size_t count,
- void *userdata )
-{
- auto* self = static_cast<MLNetworkSourceListener*>( userdata );
- self->cb->onItemRemoved( self->source, children, count );
-}
-
-void MLNetworkSourceListener::onItemPreparseEnded(vlc_media_tree_t *, input_item_node_t * node, enum input_item_preparse_status status, void *userdata)
-{
- auto* self = static_cast<MLNetworkSourceListener*>( userdata );
- self->cb->onItemPreparseEnded( self->source, node, status );
-}
diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/main_interface.cpp
index 8ab3d43cbd..12acc5585b 100644
--- a/modules/gui/qt/main_interface.cpp
+++ b/modules/gui/qt/main_interface.cpp
@@ -51,11 +51,12 @@
#include "components/mediacenter/mlgenremodel.hpp"
#include "components/mediacenter/mlvideomodel.hpp"
#include "components/mediacenter/mlrecentsvideomodel.hpp"
-#include "components/mediacenter/mlnetworkmediamodel.hpp"
-#include "components/mediacenter/mlnetworkdevicemodel.hpp"
#include "components/recent_media_model.hpp"
#include "components/settings.hpp"
+#include "network/networkmediamodel.hpp"
+#include "network/networkdevicemodel.hpp"
+
#include "components/navigation_history.hpp"
#include "components/aboutmodel.hpp"
#include "components/dialogmodel.hpp"
@@ -347,8 +348,8 @@ void MainInterface::createMainWidget( QSettings * )
qmlRegisterType<MLVideoModel>( "org.videolan.medialib", 0, 1, "MLVideoModel" );
qmlRegisterType<MLRecentsVideoModel>( "org.videolan.medialib", 0, 1, "MLRecentsVideoModel" );
qRegisterMetaType<NetworkTreeItem>();
- qmlRegisterType<MLNetworkMediaModel>( "org.videolan.medialib", 0, 1, "MLNetworkMediaModel");
- qmlRegisterType<MLNetworkDeviceModel>( "org.videolan.medialib", 0, 1, "MLNetworkDeviceModel");
+ qmlRegisterType<NetworkMediaModel>( "org.videolan.medialib", 0, 1, "NetworkMediaModel");
+ qmlRegisterType<NetworkDeviceModel>( "org.videolan.medialib", 0, 1, "NetworkDeviceModel");
//expose base object, they aren't instanciable from QML side
qmlRegisterType<MLAlbum>();
diff --git a/modules/gui/qt/components/mediacenter/mlnetworkdevicemodel.cpp b/modules/gui/qt/network/networkdevicemodel.cpp
similarity index 87%
rename from modules/gui/qt/components/mediacenter/mlnetworkdevicemodel.cpp
rename to modules/gui/qt/network/networkdevicemodel.cpp
index df5b79eb39..21d6c50ab5 100644
--- a/modules/gui/qt/components/mediacenter/mlnetworkdevicemodel.cpp
+++ b/modules/gui/qt/network/networkdevicemodel.cpp
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include "mlnetworkdevicemodel.hpp"
-#include "mlnetworkmediamodel.hpp"
+#include "networkdevicemodel.hpp"
+#include "networkmediamodel.hpp"
#include "playlist/media.hpp"
#include "playlist/playlist_controller.hpp"
@@ -35,13 +35,13 @@ enum Role {
}
-MLNetworkDeviceModel::MLNetworkDeviceModel( QObject* parent )
+NetworkDeviceModel::NetworkDeviceModel( QObject* parent )
: QAbstractListModel( parent )
, m_ml( nullptr )
{
}
-QVariant MLNetworkDeviceModel::data( const QModelIndex& index, int role ) const
+QVariant NetworkDeviceModel::data( const QModelIndex& index, int role ) const
{
if (!m_ctx)
return {};
@@ -68,7 +68,7 @@ QVariant MLNetworkDeviceModel::data( const QModelIndex& index, int role ) const
}
}
-QHash<int, QByteArray> MLNetworkDeviceModel::roleNames() const
+QHash<int, QByteArray> NetworkDeviceModel::roleNames() const
{
return {
{ NETWORK_NAME, "name" },
@@ -81,7 +81,7 @@ QHash<int, QByteArray> MLNetworkDeviceModel::roleNames() const
}
-int MLNetworkDeviceModel::rowCount(const QModelIndex& parent) const
+int NetworkDeviceModel::rowCount(const QModelIndex& parent) const
{
if ( parent.isValid() )
return 0;
@@ -90,7 +90,7 @@ int MLNetworkDeviceModel::rowCount(const QModelIndex& parent) const
}
-void MLNetworkDeviceModel::setCtx(QmlMainContext* ctx)
+void NetworkDeviceModel::setCtx(QmlMainContext* ctx)
{
if (ctx) {
m_ctx = ctx;
@@ -102,7 +102,7 @@ void MLNetworkDeviceModel::setCtx(QmlMainContext* ctx)
emit ctxChanged();
}
-void MLNetworkDeviceModel::setSdSource(SDCatType s)
+void NetworkDeviceModel::setSdSource(SDCatType s)
{
m_sdSource = s;
if (m_ctx && m_sdSource != CAT_UNDEFINED) {
@@ -112,7 +112,7 @@ void MLNetworkDeviceModel::setSdSource(SDCatType s)
}
-bool MLNetworkDeviceModel::addToPlaylist(int index)
+bool NetworkDeviceModel::addToPlaylist(int index)
{
if (!(m_ctx && m_sdSource != CAT_MYCOMPUTER))
return false;
@@ -123,7 +123,7 @@ bool MLNetworkDeviceModel::addToPlaylist(int index)
return true;
}
-bool MLNetworkDeviceModel::addToPlaylist(const QVariantList &itemIdList)
+bool NetworkDeviceModel::addToPlaylist(const QVariantList &itemIdList)
{
bool ret = false;
for (const QVariant& varValue: itemIdList)
@@ -137,7 +137,7 @@ bool MLNetworkDeviceModel::addToPlaylist(const QVariantList &itemIdList)
return ret;
}
-bool MLNetworkDeviceModel::addAndPlay(int index)
+bool NetworkDeviceModel::addAndPlay(int index)
{
if (!(m_ctx && m_sdSource != CAT_MYCOMPUTER))
return false;
@@ -149,7 +149,7 @@ bool MLNetworkDeviceModel::addAndPlay(int index)
return true;
}
-bool MLNetworkDeviceModel::addAndPlay(const QVariantList& itemIdList)
+bool NetworkDeviceModel::addAndPlay(const QVariantList& itemIdList)
{
bool ret = false;
for (const QVariant& varValue: itemIdList)
@@ -166,7 +166,7 @@ bool MLNetworkDeviceModel::addAndPlay(const QVariantList& itemIdList)
return ret;
}
-bool MLNetworkDeviceModel::initializeMediaSources()
+bool NetworkDeviceModel::initializeMediaSources()
{
auto libvlc = vlc_object_instance(m_ctx->getIntf());
@@ -196,7 +196,7 @@ bool MLNetworkDeviceModel::initializeMediaSources()
meta->name );
if ( mediaSource == nullptr )
continue;
- std::unique_ptr<MLNetworkSourceListener> l{ new MLNetworkSourceListener(
+ std::unique_ptr<NetworkSourceListener> l{ new NetworkSourceListener(
MediaSourcePtr{ mediaSource, false }, this ) };
if ( l->listener == nullptr )
return false;
@@ -206,19 +206,19 @@ bool MLNetworkDeviceModel::initializeMediaSources()
}
-void MLNetworkDeviceModel::onItemCleared( MediaSourcePtr mediaSource, input_item_node_t* node )
+void NetworkDeviceModel::onItemCleared( MediaSourcePtr mediaSource, input_item_node_t* node )
{
refreshDeviceList( std::move( mediaSource), node->pp_children, node->i_children, true );
}
-void MLNetworkDeviceModel::onItemAdded( MediaSourcePtr mediaSource, input_item_node_t*,
+void NetworkDeviceModel::onItemAdded( MediaSourcePtr mediaSource, input_item_node_t*,
input_item_node_t *const children[],
size_t count )
{
refreshDeviceList( std::move( mediaSource ), children, count, false );
}
-void MLNetworkDeviceModel::onItemRemoved( MediaSourcePtr,
+void NetworkDeviceModel::onItemRemoved( MediaSourcePtr,
input_item_node_t *const children[],
size_t count )
{
@@ -255,7 +255,7 @@ void MLNetworkDeviceModel::onItemRemoved( MediaSourcePtr,
}
}
-void MLNetworkDeviceModel::refreshDeviceList( MediaSourcePtr mediaSource, input_item_node_t* const children[], size_t count, bool clear )
+void NetworkDeviceModel::refreshDeviceList( MediaSourcePtr mediaSource, input_item_node_t* const children[], size_t count, bool clear )
{
if ( clear == true )
{
diff --git a/modules/gui/qt/components/mediacenter/mlnetworkdevicemodel.hpp b/modules/gui/qt/network/networkdevicemodel.hpp
similarity index 93%
rename from modules/gui/qt/components/mediacenter/mlnetworkdevicemodel.hpp
rename to modules/gui/qt/network/networkdevicemodel.hpp
index 7867da57bf..ddb66d85d3 100644
--- a/modules/gui/qt/components/mediacenter/mlnetworkdevicemodel.hpp
+++ b/modules/gui/qt/network/networkdevicemodel.hpp
@@ -31,11 +31,11 @@
#include <vlc_cxx_helpers.hpp>
#include <components/qml_main_context.hpp>
-#include "mlnetworksourcelistener.hpp"
+#include "networksourcelistener.hpp"
#include <memory>
-class MLNetworkDeviceModel : public QAbstractListModel, public MLNetworkSourceListener::SourceListenerCb
+class NetworkDeviceModel : public QAbstractListModel, public NetworkSourceListener::SourceListenerCb
{
Q_OBJECT
public:
@@ -68,7 +68,7 @@ public:
public:
- MLNetworkDeviceModel( QObject* parent = nullptr );
+ NetworkDeviceModel( QObject* parent = nullptr );
QVariant data(const QModelIndex& index, int role) const override;
QHash<int, QByteArray> roleNames() const override;
@@ -122,7 +122,7 @@ private:
vlc_medialibrary_t* m_ml = nullptr;
SDCatType m_sdSource = CAT_UNDEFINED;
- std::vector<std::unique_ptr<MLNetworkSourceListener>> m_listeners;
+ std::vector<std::unique_ptr<NetworkSourceListener>> m_listeners;
};
#endif // MLNETWORKDEVICEMODEL_HPP
diff --git a/modules/gui/qt/components/mediacenter/mlnetworkmediamodel.cpp b/modules/gui/qt/network/networkmediamodel.cpp
similarity index 86%
rename from modules/gui/qt/components/mediacenter/mlnetworkmediamodel.cpp
rename to modules/gui/qt/network/networkmediamodel.cpp
index a0ac44a62f..a832e0cda8 100644
--- a/modules/gui/qt/components/mediacenter/mlnetworkmediamodel.cpp
+++ b/modules/gui/qt/network/networkmediamodel.cpp
@@ -16,9 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include "mlnetworkmediamodel.hpp"
+#include "networkmediamodel.hpp"
-#include "mlhelper.hpp"
+#include "components/mediacenter/mlhelper.hpp"
#include "playlist/media.hpp"
#include "playlist/playlist_controller.hpp"
@@ -38,13 +38,13 @@ enum Role {
}
-MLNetworkMediaModel::MLNetworkMediaModel( QObject* parent )
+NetworkMediaModel::NetworkMediaModel( QObject* parent )
: QAbstractListModel( parent )
, m_ml( nullptr )
{
}
-QVariant MLNetworkMediaModel::data( const QModelIndex& index, int role ) const
+QVariant NetworkMediaModel::data( const QModelIndex& index, int role ) const
{
if (!m_ctx)
return {};
@@ -75,7 +75,7 @@ QVariant MLNetworkMediaModel::data( const QModelIndex& index, int role ) const
}
}
-QHash<int, QByteArray> MLNetworkMediaModel::roleNames() const
+QHash<int, QByteArray> NetworkMediaModel::roleNames() const
{
return {
{ NETWORK_NAME, "name" },
@@ -89,7 +89,7 @@ QHash<int, QByteArray> MLNetworkMediaModel::roleNames() const
};
}
-int MLNetworkMediaModel::rowCount(const QModelIndex& parent) const
+int NetworkMediaModel::rowCount(const QModelIndex& parent) const
{
if ( parent.isValid() )
return 0;
@@ -97,14 +97,14 @@ int MLNetworkMediaModel::rowCount(const QModelIndex& parent) const
return static_cast<int>( m_items.size() );
}
-Qt::ItemFlags MLNetworkMediaModel::flags( const QModelIndex& idx ) const
+Qt::ItemFlags NetworkMediaModel::flags( const QModelIndex& idx ) const
{
return QAbstractListModel::flags( idx ) | Qt::ItemIsEditable;
}
-bool MLNetworkMediaModel::setData( const QModelIndex& idx, const QVariant& value, int role )
+bool NetworkMediaModel::setData( const QModelIndex& idx, const QVariant& value, int role )
{
- printf("MLNetworkMediaModel::setData `\n");
+ printf("NetworkMediaModel::setData `\n");
if (!m_ml)
return false;
@@ -113,7 +113,7 @@ bool MLNetworkMediaModel::setData( const QModelIndex& idx, const QVariant& value
auto enabled = value.toBool();
if ( m_items[idx.row()].indexed == enabled )
return false;
- printf("MLNetworkMediaModel::setData change indexed`\n");
+ printf("NetworkMediaModel::setData change indexed`\n");
int res;
if ( enabled )
res = vlc_ml_add_folder( m_ml, qtu( m_items[idx.row()].mainMrl.toString( QUrl::None ) ) );
@@ -125,7 +125,7 @@ bool MLNetworkMediaModel::setData( const QModelIndex& idx, const QVariant& value
}
-void MLNetworkMediaModel::setIndexed(bool indexed)
+void NetworkMediaModel::setIndexed(bool indexed)
{
if (indexed == m_indexed || !m_canBeIndexed)
return;
@@ -141,7 +141,7 @@ void MLNetworkMediaModel::setIndexed(bool indexed)
}
}
-void MLNetworkMediaModel::setCtx(QmlMainContext* ctx)
+void NetworkMediaModel::setCtx(QmlMainContext* ctx)
{
if (ctx) {
m_ctx = ctx;
@@ -153,7 +153,7 @@ void MLNetworkMediaModel::setCtx(QmlMainContext* ctx)
emit ctxChanged();
}
-void MLNetworkMediaModel::setTree(QVariant parentTree)
+void NetworkMediaModel::setTree(QVariant parentTree)
{
if (parentTree.canConvert<NetworkTreeItem>())
m_treeItem = parentTree.value<NetworkTreeItem>();
@@ -166,7 +166,7 @@ void MLNetworkMediaModel::setTree(QVariant parentTree)
emit treeChanged();
}
-bool MLNetworkMediaModel::addToPlaylist(int index)
+bool NetworkMediaModel::addToPlaylist(int index)
{
if (!(m_ctx && m_hasTree))
return false;
@@ -178,7 +178,7 @@ bool MLNetworkMediaModel::addToPlaylist(int index)
return true;
}
-bool MLNetworkMediaModel::addToPlaylist(const QVariantList &itemIdList)
+bool NetworkMediaModel::addToPlaylist(const QVariantList &itemIdList)
{
bool ret = false;
for (const QVariant& varValue: itemIdList)
@@ -192,7 +192,7 @@ bool MLNetworkMediaModel::addToPlaylist(const QVariantList &itemIdList)
return ret;
}
-bool MLNetworkMediaModel::addAndPlay(int index)
+bool NetworkMediaModel::addAndPlay(int index)
{
if (!(m_ctx && m_hasTree))
return false;
@@ -204,7 +204,7 @@ bool MLNetworkMediaModel::addAndPlay(int index)
return true;
}
-bool MLNetworkMediaModel::addAndPlay(const QVariantList& itemIdList)
+bool NetworkMediaModel::addAndPlay(const QVariantList& itemIdList)
{
bool ret = false;
for (const QVariant& varValue: itemIdList)
@@ -222,7 +222,7 @@ bool MLNetworkMediaModel::addAndPlay(const QVariantList& itemIdList)
}
-bool MLNetworkMediaModel::initializeMediaSources()
+bool NetworkMediaModel::initializeMediaSources()
{
auto libvlc = vlc_object_instance(m_ctx->getIntf());
@@ -237,7 +237,7 @@ bool MLNetworkMediaModel::initializeMediaSources()
return false;
auto tree = m_treeItem.source->tree;
- std::unique_ptr<MLNetworkSourceListener> l{ new MLNetworkSourceListener( m_treeItem.source, this ) };
+ std::unique_ptr<NetworkSourceListener> l{ new NetworkSourceListener( m_treeItem.source, this ) };
if ( l->listener == nullptr )
return false;
@@ -267,7 +267,7 @@ bool MLNetworkMediaModel::initializeMediaSources()
return true;
}
-void MLNetworkMediaModel::onItemCleared( MediaSourcePtr mediaSource, input_item_node_t*)
+void NetworkMediaModel::onItemCleared( MediaSourcePtr mediaSource, input_item_node_t*)
{
input_item_node_t *res;
input_item_node_t *parent;
@@ -277,7 +277,7 @@ void MLNetworkMediaModel::onItemCleared( MediaSourcePtr mediaSource, input_item_
refreshMediaList( std::move( mediaSource ), res->pp_children, res->i_children, true );
}
-void MLNetworkMediaModel::onItemAdded( MediaSourcePtr mediaSource, input_item_node_t* parent,
+void NetworkMediaModel::onItemAdded( MediaSourcePtr mediaSource, input_item_node_t* parent,
input_item_node_t *const children[],
size_t count )
{
@@ -285,7 +285,7 @@ void MLNetworkMediaModel::onItemAdded( MediaSourcePtr mediaSource, input_item_no
refreshMediaList( std::move( mediaSource ), children, count, false );
}
-void MLNetworkMediaModel::onItemRemoved( MediaSourcePtr,
+void NetworkMediaModel::onItemRemoved( MediaSourcePtr,
input_item_node_t *const children[],
size_t count )
{
@@ -322,7 +322,7 @@ void MLNetworkMediaModel::onItemRemoved( MediaSourcePtr,
}
}
-void MLNetworkMediaModel::onItemPreparseEnded(MediaSourcePtr, input_item_node_t*, enum input_item_preparse_status)
+void NetworkMediaModel::onItemPreparseEnded(MediaSourcePtr, input_item_node_t*, enum input_item_preparse_status)
{
QMetaObject::invokeMethod(this, [this]() {
m_parsingPending = false;
@@ -330,7 +330,7 @@ void MLNetworkMediaModel::onItemPreparseEnded(MediaSourcePtr, input_item_node_t*
});
}
-void MLNetworkMediaModel::refreshMediaList( MediaSourcePtr mediaSource,
+void NetworkMediaModel::refreshMediaList( MediaSourcePtr mediaSource,
input_item_node_t* const children[], size_t count,
bool clear )
{
@@ -376,7 +376,7 @@ void MLNetworkMediaModel::refreshMediaList( MediaSourcePtr mediaSource,
});
}
-bool MLNetworkMediaModel::canBeIndexed(const QUrl& url , ItemType itemType )
+bool NetworkMediaModel::canBeIndexed(const QUrl& url , ItemType itemType )
{
return static_cast<input_item_type_e>(itemType) != ITEM_TYPE_FILE && (url.scheme() == "smb" || url.scheme() == "ftp");
}
diff --git a/modules/gui/qt/components/mediacenter/mlnetworkmediamodel.hpp b/modules/gui/qt/network/networkmediamodel.hpp
similarity index 94%
rename from modules/gui/qt/components/mediacenter/mlnetworkmediamodel.hpp
rename to modules/gui/qt/network/networkmediamodel.hpp
index a1a323b8e2..611ea3a9de 100644
--- a/modules/gui/qt/components/mediacenter/mlnetworkmediamodel.hpp
+++ b/modules/gui/qt/network/networkmediamodel.hpp
@@ -31,7 +31,7 @@
#include <vlc_cxx_helpers.hpp>
#include <components/qml_main_context.hpp>
-#include "mlnetworksourcelistener.hpp"
+#include "networksourcelistener.hpp"
#include <memory>
@@ -67,7 +67,7 @@ public:
InputItemPtr media;
};
-class MLNetworkMediaModel : public QAbstractListModel, public MLNetworkSourceListener::SourceListenerCb
+class NetworkMediaModel : public QAbstractListModel, public NetworkSourceListener::SourceListenerCb
{
Q_OBJECT
@@ -96,8 +96,8 @@ public:
Q_PROPERTY(bool parsingPending READ getParsingPending NOTIFY parsingPendingChanged)
- explicit MLNetworkMediaModel(QObject* parent = nullptr);
- MLNetworkMediaModel( QmlMainContext* ctx, QString parentMrl, QObject* parent = nullptr );
+ explicit NetworkMediaModel(QObject* parent = nullptr);
+ NetworkMediaModel( QmlMainContext* ctx, QString parentMrl, QObject* parent = nullptr );
QVariant data(const QModelIndex& index, int role) const override;
QHash<int, QByteArray> roleNames() const override;
@@ -178,7 +178,7 @@ private:
vlc_medialibrary_t* m_ml;
bool m_hasTree = false;
NetworkTreeItem m_treeItem;
- std::unique_ptr<MLNetworkSourceListener> m_listener;
+ std::unique_ptr<NetworkSourceListener> m_listener;
};
#endif // MLNETWORKMEDIAMODEL_HPP
diff --git a/modules/gui/qt/network/networksourcelistener.cpp b/modules/gui/qt/network/networksourcelistener.cpp
new file mode 100644
index 0000000000..e77a6e204e
--- /dev/null
+++ b/modules/gui/qt/network/networksourcelistener.cpp
@@ -0,0 +1,58 @@
+#include "networksourcelistener.hpp"
+
+NetworkSourceListener::SourceListenerCb::~SourceListenerCb()
+{
+}
+
+NetworkSourceListener::NetworkSourceListener(MediaSourcePtr s, SourceListenerCb* m)
+ : source( s )
+ , listener( nullptr, [s]( vlc_media_tree_listener_id* l ) {
+ vlc_media_tree_RemoveListener( s->tree, l );
+ } )
+ , cb( m )
+{
+ static const vlc_media_tree_callbacks cbs {
+ &NetworkSourceListener::onItemCleared,
+ &NetworkSourceListener::onItemAdded,
+ &NetworkSourceListener::onItemRemoved,
+ &NetworkSourceListener::onItemPreparseEnded
+ };
+ auto l = vlc_media_tree_AddListener( s->tree, &cbs, this, true );
+ if ( l == nullptr )
+ return;
+ listener.reset( l );
+}
+
+NetworkSourceListener::NetworkSourceListener()
+{
+}
+
+void NetworkSourceListener::onItemCleared( vlc_media_tree_t*, input_item_node_t* node,
+ void* userdata)
+{
+ auto* self = static_cast<NetworkSourceListener*>( userdata );
+ self->cb->onItemCleared( self->source, node );
+}
+
+void NetworkSourceListener::onItemAdded( vlc_media_tree_t *, input_item_node_t * parent,
+ input_item_node_t *const children[], size_t count,
+ void *userdata )
+{
+ auto* self = static_cast<NetworkSourceListener*>( userdata );
+ auto source = self->source;
+ self->cb->onItemAdded( self->source, parent, children, count );
+}
+
+void NetworkSourceListener::onItemRemoved( vlc_media_tree_t *, input_item_node_t *,
+ input_item_node_t *const children[], size_t count,
+ void *userdata )
+{
+ auto* self = static_cast<NetworkSourceListener*>( userdata );
+ self->cb->onItemRemoved( self->source, children, count );
+}
+
+void NetworkSourceListener::onItemPreparseEnded(vlc_media_tree_t *, input_item_node_t * node, enum input_item_preparse_status status, void *userdata)
+{
+ auto* self = static_cast<NetworkSourceListener*>( userdata );
+ self->cb->onItemPreparseEnded( self->source, node, status );
+}
diff --git a/modules/gui/qt/components/mediacenter/mlnetworksourcelistener.hpp b/modules/gui/qt/network/networksourcelistener.hpp
similarity index 87%
rename from modules/gui/qt/components/mediacenter/mlnetworksourcelistener.hpp
rename to modules/gui/qt/network/networksourcelistener.hpp
index ca56d832b8..ed63965425 100644
--- a/modules/gui/qt/components/mediacenter/mlnetworksourcelistener.hpp
+++ b/modules/gui/qt/network/networksourcelistener.hpp
@@ -33,7 +33,7 @@
#include <memory>
#include <functional>
-class MLNetworkSourceListener
+class NetworkSourceListener
{
public:
using MediaSourcePtr = vlc_shared_data_ptr_type(vlc_media_source_t,
@@ -54,14 +54,14 @@ public:
};
public:
- MLNetworkSourceListener( MediaSourcePtr s, SourceListenerCb* m );
- MLNetworkSourceListener();
+ NetworkSourceListener( MediaSourcePtr s, SourceListenerCb* m );
+ NetworkSourceListener();
- MLNetworkSourceListener( MLNetworkSourceListener&& ) = default;
- MLNetworkSourceListener& operator=( MLNetworkSourceListener&& ) = default;
+ NetworkSourceListener( NetworkSourceListener&& ) = default;
+ NetworkSourceListener& operator=( NetworkSourceListener&& ) = default;
- MLNetworkSourceListener( const MLNetworkSourceListener& ) = delete;
- MLNetworkSourceListener& operator=( const MLNetworkSourceListener& ) = delete;
+ NetworkSourceListener( const NetworkSourceListener& ) = delete;
+ NetworkSourceListener& operator=( const NetworkSourceListener& ) = delete;
static void onItemCleared( vlc_media_tree_t* tree, input_item_node_t* node,
void* userdata );
diff --git a/modules/gui/qt/qml/mediacenter/MCNetworkBrowseDisplay.qml b/modules/gui/qt/network/qml/NetworkBrowseDisplay.qml
similarity index 94%
rename from modules/gui/qt/qml/mediacenter/MCNetworkBrowseDisplay.qml
rename to modules/gui/qt/network/qml/NetworkBrowseDisplay.qml
index b8ee21552f..38160b8365 100644
--- a/modules/gui/qt/qml/mediacenter/MCNetworkBrowseDisplay.qml
+++ b/modules/gui/qt/network/qml/NetworkBrowseDisplay.qml
@@ -39,13 +39,13 @@ Utils.NavigableFocusScope {
}
}
- MLNetworkMediaModel {
+ NetworkMediaModel {
id: providerModel
ctx: mainctx
tree: undefined
}
- MCNetworksSectionSelectableDM{
+ NetworksSectionSelectableDM{
id: delegateModel
model: providerModel
}
@@ -148,15 +148,15 @@ Utils.NavigableFocusScope {
image: {
switch (model.type){
- case MLNetworkMediaModel.TYPE_DISC:
+ case NetworkMediaModel.TYPE_DISC:
return "qrc:///type/disc.svg"
- case MLNetworkMediaModel.TYPE_CARD:
+ case NetworkMediaModel.TYPE_CARD:
return "qrc:///type/capture-card.svg"
- case MLNetworkMediaModel.TYPE_STREAM:
+ case NetworkMediaModel.TYPE_STREAM:
return "qrc:///type/stream.svg"
- case MLNetworkMediaModel.TYPE_PLAYLIST:
+ case NetworkMediaModel.TYPE_PLAYLIST:
return "qrc:///type/playlist.svg"
- case MLNetworkMediaModel.TYPE_FILE:
+ case NetworkMediaModel.TYPE_FILE:
return "qrc:///type/file_black.svg"
default:
return "qrc:///type/directory_black.svg"
@@ -173,7 +173,7 @@ Utils.NavigableFocusScope {
}
onItemDoubleClicked: {
- if (model.type === MLNetworkMediaModel.TYPE_NODE || model.type === MLNetworkMediaModel.TYPE_DIRECTORY)
+ if (model.type === NetworkMediaModel.TYPE_NODE || model.type === NetworkMediaModel.TYPE_DIRECTORY)
history.push( ["mc", "network", { tree: model.tree } ], History.Go)
else
delegateModel.model.addAndPlay( index )
diff --git a/modules/gui/qt/qml/mediacenter/MCNetworkDisplay.qml b/modules/gui/qt/network/qml/NetworkDisplay.qml
similarity index 93%
rename from modules/gui/qt/qml/mediacenter/MCNetworkDisplay.qml
rename to modules/gui/qt/network/qml/NetworkDisplay.qml
index 27efd31e49..9d4f974521 100644
--- a/modules/gui/qt/qml/mediacenter/MCNetworkDisplay.qml
+++ b/modules/gui/qt/network/qml/NetworkDisplay.qml
@@ -43,9 +43,9 @@ Utils.NavigableFocusScope {
function loadView() {
var page = "";
if (root.tree === undefined)
- page ="qrc:///mediacenter/MCNetworkHomeDisplay.qml"
+ page ="qrc:///network/NetworkHomeDisplay.qml"
else
- page = "qrc:///mediacenter/MCNetworkBrowseDisplay.qml"
+ page = "qrc:///network/NetworkBrowseDisplay.qml"
view.replace(page)
if (root.tree) {
view.currentItem.tree = root.tree
diff --git a/modules/gui/qt/qml/mediacenter/NetworkGridItem.qml b/modules/gui/qt/network/qml/NetworkGridItem.qml
similarity index 88%
rename from modules/gui/qt/qml/mediacenter/NetworkGridItem.qml
rename to modules/gui/qt/network/qml/NetworkGridItem.qml
index 55b1164ded..50aa6b1488 100644
--- a/modules/gui/qt/qml/mediacenter/NetworkGridItem.qml
+++ b/modules/gui/qt/network/qml/NetworkGridItem.qml
@@ -32,15 +32,15 @@ Utils.GridItem {
pictureHeight: VLCStyle.network_normal
image: {
switch (model.type){
- case MLNetworkMediaModel.TYPE_DISC:
+ case NetworkMediaModel.TYPE_DISC:
return "qrc:///type/disc.svg"
- case MLNetworkMediaModel.TYPE_CARD:
+ case NetworkMediaModel.TYPE_CARD:
return "qrc:///type/capture-card.svg"
- case MLNetworkMediaModel.TYPE_STREAM:
+ case NetworkMediaModel.TYPE_STREAM:
return "qrc:///type/stream.svg"
- case MLNetworkMediaModel.TYPE_PLAYLIST:
+ case NetworkMediaModel.TYPE_PLAYLIST:
return "qrc:///type/playlist.svg"
- case MLNetworkMediaModel.TYPE_FILE:
+ case NetworkMediaModel.TYPE_FILE:
return "qrc:///type/file_black.svg"
default:
return "qrc:///type/directory_black.svg"
diff --git a/modules/gui/qt/qml/mediacenter/MCNetworkHomeDisplay.qml b/modules/gui/qt/network/qml/NetworkHomeDisplay.qml
similarity index 94%
rename from modules/gui/qt/qml/mediacenter/MCNetworkHomeDisplay.qml
rename to modules/gui/qt/network/qml/NetworkHomeDisplay.qml
index 8ce438b23f..19126cc6ea 100644
--- a/modules/gui/qt/qml/mediacenter/MCNetworkHomeDisplay.qml
+++ b/modules/gui/qt/network/qml/NetworkHomeDisplay.qml
@@ -37,21 +37,21 @@ Utils.NavigableFocusScope {
text: qsTr("No network shares found")
}
- MCNetworksSectionSelectableDM{
+ NetworksSectionSelectableDM{
id: machineDM
- model: MLNetworkDeviceModel {
+ model: NetworkDeviceModel {
id: machineModel
ctx: mainctx
- sd_source: MLNetworkDeviceModel.CAT_DEVICES
+ sd_source: NetworkDeviceModel.CAT_DEVICES
}
}
- MCNetworksSectionSelectableDM{
+ NetworksSectionSelectableDM{
id: lanDM
- model: MLNetworkDeviceModel {
+ model: NetworkDeviceModel {
id: lanModel
ctx: mainctx
- sd_source: MLNetworkDeviceModel.CAT_LAN
+ sd_source: NetworkDeviceModel.CAT_LAN
}
}
diff --git a/modules/gui/qt/qml/mediacenter/NetworkListItem.qml b/modules/gui/qt/network/qml/NetworkListItem.qml
similarity index 83%
rename from modules/gui/qt/qml/mediacenter/NetworkListItem.qml
rename to modules/gui/qt/network/qml/NetworkListItem.qml
index bba0332491..18d43a3b77 100644
--- a/modules/gui/qt/qml/mediacenter/NetworkListItem.qml
+++ b/modules/gui/qt/network/qml/NetworkListItem.qml
@@ -40,15 +40,15 @@ Utils.ListItem {
fillMode: Image.PreserveAspectFit
source: {
switch (model.type) {
- case MLNetworkMediaModel.TYPE_DISC:
+ case NetworkMediaModel.TYPE_DISC:
return "qrc:///type/disc.svg"
- case MLNetworkMediaModel.TYPE_CARD:
+ case NetworkMediaModel.TYPE_CARD:
return "qrc:///type/capture-card.svg"
- case MLNetworkMediaModel.TYPE_STREAM:
+ case NetworkMediaModel.TYPE_STREAM:
return "qrc:///type/stream.svg"
- case MLNetworkMediaModel.TYPE_PLAYLIST:
+ case NetworkMediaModel.TYPE_PLAYLIST:
return "qrc:///type/playlist.svg"
- case MLNetworkMediaModel.TYPE_FILE:
+ case NetworkMediaModel.TYPE_FILE:
return "qrc:///type/file_black.svg"
default:
return "qrc:///type/directory_black.svg"
@@ -57,7 +57,7 @@ Utils.ListItem {
}
line1: model.name || qsTr("Unknown share")
line2: model.mrl
- imageText: (model.type !== MLNetworkMediaModel.TYPE_DIRECTORY && model.type !== MLNetworkMediaModel.TYPE_NODE) ? model.protocol : ""
+ imageText: (model.type !== NetworkMediaModel.TYPE_DIRECTORY && model.type !== NetworkMediaModel.TYPE_NODE) ? model.protocol : ""
showContextButton: true
diff --git a/modules/gui/qt/qml/mediacenter/MCNetworksSectionSelectableDM.qml b/modules/gui/qt/network/qml/NetworksSectionSelectableDM.qml
similarity index 92%
rename from modules/gui/qt/qml/mediacenter/MCNetworksSectionSelectableDM.qml
rename to modules/gui/qt/network/qml/NetworksSectionSelectableDM.qml
index 09ba11f34e..ead75f9f1e 100644
--- a/modules/gui/qt/qml/mediacenter/MCNetworksSectionSelectableDM.qml
+++ b/modules/gui/qt/network/qml/NetworksSectionSelectableDM.qml
@@ -45,7 +45,7 @@ Utils.SelectableDelegateModel {
}
onItemDoubleClicked: {
- if (model.type === MLNetworkMediaModel.TYPE_NODE || model.type === MLNetworkMediaModel.TYPE_DIRECTORY)
+ if (model.type === NetworkMediaModel.TYPE_NODE || model.type === NetworkMediaModel.TYPE_DIRECTORY)
history.push( ["mc", "network", { tree: model.tree } ], History.Go)
else
delegateModel.model.addAndPlay( index )
@@ -70,7 +70,7 @@ Utils.SelectableDelegateModel {
}
onItemDoubleClicked: {
- if (model.type === MLNetworkMediaModel.TYPE_NODE || model.type === MLNetworkMediaModel.TYPE_DIRECTORY)
+ if (model.type === NetworkMediaModel.TYPE_NODE || model.type === NetworkMediaModel.TYPE_DIRECTORY)
history.push( ["mc", "network", { tree: model.tree } ], History.Go)
else
delegateModel.model.addAndPlay( index )
@@ -120,8 +120,8 @@ Utils.SelectableDelegateModel {
if ( delegateModel.selectedGroup.count > 1 ) {
playSelection()
} else {
- if (delegateModel.items.get(index).model.type === MLNetworkMediaModel.TYPE_DIRECTORY
- || delegateModel.items.get(index).model.type === MLNetworkMediaModel.TYPE_NODE) {
+ if (delegateModel.items.get(index).model.type === NetworkMediaModel.TYPE_DIRECTORY
+ || delegateModel.items.get(index).model.type === NetworkMediaModel.TYPE_NODE) {
console.log("push network tree", delegateModel.items.get(index).model.tree)
history.push(["mc", "network", { tree: delegateModel.items.get(index).model.tree }], History.Go);
} else {
diff --git a/modules/gui/qt/qml/mediacenter/MCMainDisplay.qml b/modules/gui/qt/qml/mediacenter/MCMainDisplay.qml
index 0f9d33dbdb..ff19991940 100644
--- a/modules/gui/qt/qml/mediacenter/MCMainDisplay.qml
+++ b/modules/gui/qt/qml/mediacenter/MCMainDisplay.qml
@@ -27,6 +27,7 @@ import "qrc:///utils/" as Utils
import "qrc:///utils/KeyHelper.js" as KeyHelper
import "qrc:///playlist/" as PL
import "qrc:///player/" as Player
+import "qrc:///network/" as Network
Utils.NavigableFocusScope {
id: root
@@ -81,7 +82,7 @@ Utils.NavigableFocusScope {
Component {
id: networkComp
- MCNetworkDisplay {
+ Network.NetworkDisplay {
navigationParent: medialibId
navigationUpItem: sourcesBanner
navigationRightItem: playlist
diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc
index b712a1a190..3ebbdaae0c 100644
--- a/modules/gui/qt/vlc.qrc
+++ b/modules/gui/qt/vlc.qrc
@@ -210,11 +210,17 @@
<file alias="TabButtonExt.qml">qml/utils/TabButtonExt.qml</file>
<file alias="KeyHelper.js">qml/utils/KeyHelper.js</file>
</qresource>
+ <qresource prefix="/network">
+ <file alias="NetworkDisplay.qml">network/qml/NetworkDisplay.qml</file>
+ <file alias="NetworksSectionSelectableDM.qml">network/qml/NetworksSectionSelectableDM.qml</file>
+ <file alias="NetworkHomeDisplay.qml">network/qml/NetworkHomeDisplay.qml</file>
+ <file alias="NetworkBrowseDisplay.qml">network/qml/NetworkBrowseDisplay.qml</file>
+ <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="MCNetworkDisplay.qml">qml/mediacenter/MCNetworkDisplay.qml</file>
- <file alias="MCNetworksSectionSelectableDM.qml">qml/mediacenter/MCNetworksSectionSelectableDM.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>
@@ -223,14 +229,10 @@
<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="NetworkGridItem.qml">qml/mediacenter/NetworkGridItem.qml</file>
- <file alias="NetworkListItem.qml">qml/mediacenter/NetworkListItem.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>
- <file alias="MCNetworkHomeDisplay.qml">qml/mediacenter/MCNetworkHomeDisplay.qml</file>
- <file alias="MCNetworkBrowseDisplay.qml">qml/mediacenter/MCNetworkBrowseDisplay.qml</file>
</qresource>
<qresource prefix="/style">
<file alias="qmldir">qml/style/qmldir</file>
More information about the vlc-commits
mailing list