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

added VlcMediaPlayer, still trouble with pulseAudio

Browse source
This commit is contained in:
Anika Raemer 2018-10-30 17:11:48 +01:00
parent 6f5c9138a8
commit a4006ea015
7 changed files with 51 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
LenaPi/models/MusicModel.cpp
View file

@ -1,14 +1,25 @@
#include "MusicModel.h"
MusicModel::MusicModel(QObject *parent) : QObject(parent)
MusicModel::MusicModel(VlcInstance* instance, QObject *parent) : QObject(parent),
mVlc(instance)
{
}
MusicModel::~MusicModel()
{
if(mMedia)
mMedia->deleteLater();
}
void MusicModel::init(NavigationItemModel *item)
{
mCurrentItem = item;
emit currentItemChanged();
if(mMedia)
delete mMedia;
mMedia = new VlcMedia(mCurrentItem->getPath(), true, mVlc);
}
void MusicModel::navigateBack()
@ -26,6 +37,11 @@ NavigationItemModel *MusicModel::getCurrentItem()
return mCurrentItem;
}
VlcMedia *MusicModel::getMedia()
{
return mMedia;
}
bool MusicModel::isPlaying()
{
return mIsPlaying;

8
LenaPi/models/MusicModel.h
View file

@ -4,6 +4,7 @@
#include <QObject>
#include <models/NavigationItemModel.h>
#include <VLCQtCore/Media.h>
class MusicModel : public QObject
{
@ -16,7 +17,8 @@ signals:
void currentItemChanged();
public:
MusicModel(QObject *parent = Q_NULLPTR);
MusicModel(VlcInstance* instance, QObject *parent = Q_NULLPTR);
~MusicModel();
void init(NavigationItemModel* item);
@ -25,11 +27,15 @@ public:
NavigationItemModel *getCurrentItem();
VlcMedia *getMedia();
bool isPlaying();
private:
bool mIsPlaying = false;
NavigationItemModel* mCurrentItem = Q_NULLPTR;
VlcMedia* mMedia = Q_NULLPTR;
VlcInstance* mVlc;
};
#endif // MUSICMODEL_H