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

show media title

Browse source
This commit is contained in:
Anika Raemer 2018-12-07 19:18:57 +01:00
parent 2ddeee2d73
commit beba95ccef
3 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
LenaPi/MediaProgress.qml
View file

@ -6,6 +6,14 @@ Item {
id: container id: container
property var model property var model
Label{
anchors.left: progress.left
anchors.bottom: progress.top
font.pointSize: 9
color: "grey"
text: model.pMediaTitle
}
Label{ Label{
anchors.right: progress.right anchors.right: progress.right
anchors.bottom: progress.top anchors.bottom: progress.top

17
LenaPi/models/MusicModel.cpp
View file

@ -38,6 +38,8 @@ void MusicModel::init(NavigationItemModel *item)
mMedia->addMedia(new VlcMedia(dir.filePath(file), true, mVlc)); mMedia->addMedia(new VlcMedia(dir.filePath(file), true, mVlc));
} }
} }
setMediaTitle(mMedia->at(0));
} }
void MusicModel::navigateBack() void MusicModel::navigateBack()
@ -115,6 +117,11 @@ double MusicModel::getProgress() const
return mCurrentMediaItemProgress; return mCurrentMediaItemProgress;
} }
QString MusicModel::getMediaTitle() const
{
return mMediaTitle;
}
QString MusicModel::getMediaLength() QString MusicModel::getMediaLength()
{ {
return timeToString(mCurrentMediaItemLength); return timeToString(mCurrentMediaItemLength);
@ -127,6 +134,8 @@ QString MusicModel::getTime()
void MusicModel::onNextMediaSet(VlcMedia *media) void MusicModel::onNextMediaSet(VlcMedia *media)
{ {
setMediaTitle(media);
mHasNext = true; mHasNext = true;
mHasPrevious = true; mHasPrevious = true;
if(mMedia->at(0) == media){ if(mMedia->at(0) == media){
@ -175,3 +184,11 @@ QString MusicModel::timeToString(int time)
QString secStr = sec < 10 ? "0"+QString::number(sec) : QString::number(sec); QString secStr = sec < 10 ? "0"+QString::number(sec) : QString::number(sec);
return QString::number(min) + ":" + secStr; return QString::number(min) + ":" + secStr;
} }
void MusicModel::setMediaTitle(VlcMedia *media)
{
auto list = media->currentLocation().split("/");
auto title = list.at(list.count() -1 );
mMediaTitle = title.left(title.lastIndexOf("."));
emit mediaTitleChanged();
}

5
LenaPi/models/MusicModel.h
View file

@ -17,6 +17,7 @@ class MusicModel : public QObject
Q_PROPERTY(double pProgress READ getProgress NOTIFY progressChanged) Q_PROPERTY(double pProgress READ getProgress NOTIFY progressChanged)
Q_PROPERTY(QString pMediaLength READ getMediaLength NOTIFY mediaLengthChanged) Q_PROPERTY(QString pMediaLength READ getMediaLength NOTIFY mediaLengthChanged)
Q_PROPERTY(QString pTime READ getTime NOTIFY progressChanged) Q_PROPERTY(QString pTime READ getTime NOTIFY progressChanged)
Q_PROPERTY(QString pMediaTitle READ getMediaTitle NOTIFY mediaTitleChanged)
signals: signals:
void navigateTo(NavigationItemModel *item); void navigateTo(NavigationItemModel *item);
@ -31,6 +32,7 @@ signals:
void isPlayingChanged(); void isPlayingChanged();
void progressChanged(); void progressChanged();
void mediaLengthChanged(); void mediaLengthChanged();
void mediaTitleChanged();
public: public:
MusicModel(VlcInstance* instance, QObject *parent = Q_NULLPTR); MusicModel(VlcInstance* instance, QObject *parent = Q_NULLPTR);
@ -54,6 +56,7 @@ public:
double getProgress() const; double getProgress() const;
QString getMediaTitle() const;
QString getMediaLength(); QString getMediaLength();
QString getTime(); QString getTime();
@ -65,6 +68,7 @@ public slots:
private: private:
void reset(); void reset();
QString timeToString(int time); QString timeToString(int time);
void setMediaTitle(VlcMedia* media);
bool mIsPlaying = false; bool mIsPlaying = false;
bool mHasNext = false; bool mHasNext = false;
@ -72,6 +76,7 @@ private:
int mCurrentMediaItemLength = 0; int mCurrentMediaItemLength = 0;
int mCurrentTime = 0; int mCurrentTime = 0;
double mCurrentMediaItemProgress = 0; double mCurrentMediaItemProgress = 0;
QString mMediaTitle = QString("");
NavigationItemModel* mCurrentItem = Q_NULLPTR; NavigationItemModel* mCurrentItem = Q_NULLPTR;
VlcMediaList* mMedia = Q_NULLPTR; VlcMediaList* mMedia = Q_NULLPTR;
VlcInstance* mVlc; VlcInstance* mVlc;