jmr/lena_pi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove vlc and replace by basic QMediaPlayer

Browse source
This commit is contained in:
Anika Raemer 2021-10-12 22:15:06 +02:00
parent a567428093
commit fe7bbed7c1
10 changed files with 303 additions and 470 deletions
Download patch file Download diff file Expand all files Collapse all files

10
LenaPi/controllers/NavigationController.cpp
View file

@ -6,15 +6,15 @@
#include <models/NavigationItemModel.h>
#include <models/NavigationListModel.h>
#include <models/UiStateModel.h>
#include <controllers/MusicController.h>
#include <controllers/MusicPlayer.h>
NavigationController::NavigationController(QObject *parent) : QObject(parent),
mRootItem(new NavigationItemModel(this)),
mNavList(new NavigationListModel(this)),
mUiState(new UiStateModel(this)),
mMusicController(new MusicController(this))
mMediaPlayer(new MusicPlayer(this))
{
connect(mMusicController, &MusicController::navigateTo, [this](NavigationItemModel* item) {
connect(mMediaPlayer, &MusicPlayer::navigateTo, [this](NavigationItemModel* item) {
mUiState->showNavigation();
mNavList->navigateTo(item);
});
@ -40,7 +40,6 @@ void NavigationController::setContext(QQmlContext *context)
{
mContext = context;
setContextProperties();
mMusicController->setContext(mContext);
}
void NavigationController::setContextProperties()
@ -48,6 +47,7 @@ void NavigationController::setContextProperties()
if(!mContext) return;
mContext->setContextProperty("navigationList", mNavList);
mContext->setContextProperty("uiStateModel", mUiState);
mContext->setContextProperty("musicModel", mMediaPlayer);
}
void NavigationController::add(const QString &path, NavigationItemModel *parentItem)
@ -99,7 +99,7 @@ void NavigationController::onNavigationRequest()
if(item->hasChildren())
mNavList->setModelItems(item->getChildren());
else {
mMusicController->initPlayer(item);
mMediaPlayer->init(item);
mUiState->showMusicPlayer();
}
}