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

connected vlc to play audio

Browse source
This commit is contained in:
Anika Raemer 2018-11-27 22:05:56 +01:00
parent 20094b0cf2
commit 71f7652a8a
4 changed files with 44 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
LenaPi/models/MusicModel.cpp
View file

@ -1,15 +1,18 @@
#include "MusicModel.h"
#include <QDir>
#include <QDebug>
#include <VLCQtCore/Media.h>
MusicModel::MusicModel(VlcInstance* instance, QObject *parent) : QObject(parent),
mVlc(instance)
mVlc(instance)//, mMedia(new VlcMediaList(instance))
{
}
MusicModel::~MusicModel()
{
if(mMedia)
mMedia->deleteLater();
//if(mMedia)
// mMedia->deleteLater();
}
void MusicModel::init(NavigationItemModel *item)
@ -17,9 +20,23 @@ void MusicModel::init(NavigationItemModel *item)
mCurrentItem = item;
emit currentItemChanged();
if(mMedia)
delete mMedia;
mMedia = new VlcMedia(mCurrentItem->getPath()+"/Pink Panther.mp3", true, mVlc);
/*for(int i = 0; i < mMedia->count(); i++){
mMedia->removeMedia(i);
}
qDebug() << mMedia->count();
*/
if(mMedia) delete mMedia;
mMedia = new VlcMediaList(mVlc);
auto dir = QDir(mCurrentItem->getPath());
if(!dir.exists()) return;
auto fileNames = dir.entryList(QDir::Files);
for(auto file:fileNames){
if(file.endsWith(".flac") || file.endsWith(".mp3")){
mMedia->addMedia(new VlcMedia(dir.filePath(file), true, mVlc));
}
}
}
void MusicModel::navigateBack()
@ -30,6 +47,10 @@ void MusicModel::navigateBack()
void MusicModel::playPause()
{
mIsPlaying = !mIsPlaying;
if(mIsPlaying)
emit play();
else
emit pause();
}
NavigationItemModel *MusicModel::getCurrentItem()
@ -37,7 +58,7 @@ NavigationItemModel *MusicModel::getCurrentItem()
return mCurrentItem;
}
VlcMedia *MusicModel::getMedia()
VlcMediaList *MusicModel::getMedia()
{
return mMedia;
}

8
LenaPi/models/MusicModel.h
View file

@ -4,7 +4,7 @@
#include <QObject>
#include <models/NavigationItemModel.h>
#include <VLCQtCore/Media.h>
#include <VLCQtCore/MediaList.h>
class MusicModel : public QObject
{
@ -15,6 +15,8 @@ class MusicModel : public QObject
signals:
void navigateTo(NavigationItemModel *item);
void currentItemChanged();
void play();
void pause();
public:
MusicModel(VlcInstance* instance, QObject *parent = Q_NULLPTR);
@ -27,14 +29,14 @@ public:
NavigationItemModel *getCurrentItem();
VlcMedia *getMedia();
VlcMediaList *getMedia();
bool isPlaying();
private:
bool mIsPlaying = false;
NavigationItemModel* mCurrentItem = Q_NULLPTR;
VlcMedia* mMedia = Q_NULLPTR;
VlcMediaList* mMedia = Q_NULLPTR;
VlcInstance* mVlc;
};