From 2ddeee2d73769eb2ed02b811eff041b964a41a03 Mon Sep 17 00:00:00 2001 From: Anika Raemer Date: Fri, 7 Dec 2018 11:27:23 +0100 Subject: [PATCH] reorder connects for better readability --- LenaPi/controllers/MusicController.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/LenaPi/controllers/MusicController.cpp b/LenaPi/controllers/MusicController.cpp index 6fb7ffc..00ec739 100644 --- a/LenaPi/controllers/MusicController.cpp +++ b/LenaPi/controllers/MusicController.cpp @@ -11,14 +11,15 @@ MusicController::MusicController(QObject *parent) : QObject(parent) mPlayer = new VlcMediaListPlayer(mVlc); connect(mModel, &MusicModel::navigateTo, this, &MusicController::navigateTo); + connect(mModel, &MusicModel::navigateTo, [this](NavigationItemModel*){ + if(mModel->isPlaying()) mModel->playPause(); + }); + connect(mModel, &MusicModel::play, mPlayer, &VlcMediaListPlayer::play); connect(mModel, &MusicModel::stop, mPlayer, &VlcMediaListPlayer::stop); connect(mModel, &MusicModel::previous, mPlayer, &VlcMediaListPlayer::previous); connect(mModel, &MusicModel::next, mPlayer, &VlcMediaListPlayer::next); connect(mModel, &MusicModel::pause, mPlayer->mediaPlayer(), &VlcMediaPlayer::pause); - connect(mModel, &MusicModel::navigateTo, [this](NavigationItemModel*){ - if(mModel->isPlaying()) mModel->playPause(); - }); connect(mPlayer, SIGNAL(nextItemSet(VlcMedia*)), mModel, SLOT(onNextMediaSet(VlcMedia*))); connect(mPlayer->mediaPlayer(), &VlcMediaPlayer::lengthChanged, mModel, &MusicModel::onLengthChanged);