From 20094b0cf2cf245e63cd675af9497e7fbcd13e94 Mon Sep 17 00:00:00 2001 From: Anika Raemer Date: Mon, 5 Nov 2018 17:34:52 +0100 Subject: [PATCH] fix default preview image --- LenaPi/controllers/MusicController.cpp | 1 + LenaPi/main.cpp | 2 +- LenaPi/models/MusicModel.cpp | 2 +- LenaPi/models/NavigationItemModel.cpp | 8 +++----- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/LenaPi/controllers/MusicController.cpp b/LenaPi/controllers/MusicController.cpp index fd897cc..2e9e9bc 100644 --- a/LenaPi/controllers/MusicController.cpp +++ b/LenaPi/controllers/MusicController.cpp @@ -2,6 +2,7 @@ #include #include +#include MusicController::MusicController(QObject *parent) : QObject(parent) { diff --git a/LenaPi/main.cpp b/LenaPi/main.cpp index 1cbcbff..e561eb1 100644 --- a/LenaPi/main.cpp +++ b/LenaPi/main.cpp @@ -11,7 +11,7 @@ int main(int argc, char *argv[]) /// @todo add reaction to system signal reload config. NavigationController navController; navController.setContext(engine.rootContext()); - navController.init("/home/ar/source/testLenaPi/"); + navController.init("/home/ar/source/lenaMusic/"); engine.load(QUrl("qrc:/main.qml")); diff --git a/LenaPi/models/MusicModel.cpp b/LenaPi/models/MusicModel.cpp index 0311a1d..6c10bb9 100644 --- a/LenaPi/models/MusicModel.cpp +++ b/LenaPi/models/MusicModel.cpp @@ -19,7 +19,7 @@ void MusicModel::init(NavigationItemModel *item) if(mMedia) delete mMedia; - mMedia = new VlcMedia(mCurrentItem->getPath(), true, mVlc); + mMedia = new VlcMedia(mCurrentItem->getPath()+"/Pink Panther.mp3", true, mVlc); } void MusicModel::navigateBack() diff --git a/LenaPi/models/NavigationItemModel.cpp b/LenaPi/models/NavigationItemModel.cpp index e442515..6b07720 100644 --- a/LenaPi/models/NavigationItemModel.cpp +++ b/LenaPi/models/NavigationItemModel.cpp @@ -34,12 +34,10 @@ bool NavigationItemModel::setPath(const QString &path) /// @todo move default image to qrc auto source = dir.filePath("image.jpg"); - if(QFile(source).exists()) + if(QFile(source).exists()){ mImageSource = "file:///" + source; - else - mImageSource = "file:///home/ar/source/LenaPi/pics/benjamin.jpeg"; - - emit imageSourceChanged(); + emit imageSourceChanged(); + } return true; }