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

remove media from list instead of removing list

Browse source
This commit is contained in:
Anika Raemer 2018-12-03 19:47:31 +01:00
parent 71f7652a8a
commit 83402c5bf0
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
LenaPi/controllers/MusicController.cpp
View file

@ -25,9 +25,12 @@ MusicController::~MusicController()
void MusicController::initPlayer(NavigationItemModel *item) void MusicController::initPlayer(NavigationItemModel *item)
{ {
mModel->init(item);
mPlayer->stop(); mPlayer->stop();
mPlayer->setMediaList(mModel->getMedia()); mModel->init(item);
if(!mIsMediaListSet){
mPlayer->setMediaList(mModel->getMedia());
mIsMediaListSet = true;
}
} }
void MusicController::setContext(QQmlContext *context) void MusicController::setContext(QQmlContext *context)

2
LenaPi/controllers/MusicController.h
View file

@ -35,6 +35,8 @@ private:
VlcInstance* mVlc; VlcInstance* mVlc;
VlcMediaListPlayer* mPlayer; VlcMediaListPlayer* mPlayer;
bool mIsMediaListSet = false;
}; };
#endif // MUSICCONTROLLER_H #endif // MUSICCONTROLLER_H

10
LenaPi/models/MusicModel.cpp
View file

@ -4,7 +4,7 @@
#include <VLCQtCore/Media.h> #include <VLCQtCore/Media.h>
MusicModel::MusicModel(VlcInstance* instance, QObject *parent) : QObject(parent), MusicModel::MusicModel(VlcInstance* instance, QObject *parent) : QObject(parent),
mVlc(instance)//, mMedia(new VlcMediaList(instance)) mVlc(instance), mMedia(new VlcMediaList(instance))
{ {
} }
@ -20,13 +20,9 @@ void MusicModel::init(NavigationItemModel *item)
mCurrentItem = item; mCurrentItem = item;
emit currentItemChanged(); emit currentItemChanged();
/*for(int i = 0; i < mMedia->count(); i++){ while(mMedia->count() > 0){
mMedia->removeMedia(i); mMedia->removeMedia(0);
} }
qDebug() << mMedia->count();
*/
if(mMedia) delete mMedia;
mMedia = new VlcMediaList(mVlc);
auto dir = QDir(mCurrentItem->getPath()); auto dir = QDir(mCurrentItem->getPath());
if(!dir.exists()) return; if(!dir.exists()) return;