volume control

LenaPi/controllers/MusicPlayer.cpp

@@ -6,11 +6,10 @@
 
 MusicPlayer::MusicPlayer(QObject *parent) : QMediaPlayer(parent)
 {
-    /* nothing */
-}
-
-MusicPlayer::~MusicPlayer()
-{
+    // relay base class signal as NOTIFY doesn't seem to be able to handle it directly
+    connect(this, &QMediaPlayer::volumeChanged, this, &MusicPlayer::audioVolumeChanged);
+    // init audio
+    setAudioVolume(50);
 }
 
 void MusicPlayer::init(NavigationItemModel *item)
@@ -19,7 +18,7 @@ void MusicPlayer::init(NavigationItemModel *item)
         return;
     }
     mCurrentItem = item;
-    emit currentItemChanged();
+    emit coverImageSourceChanged();
 
     reset();
     clearMediaList();
@@ -72,11 +71,6 @@ void MusicPlayer::playPrevious()
     }
 }
 
-NavigationItemModel *MusicPlayer::getCurrentItem()
-{
-    return mCurrentItem;
-}
-
 bool MusicPlayer::isPlaying() const
 {
     return mIsPlaying;
@@ -94,15 +88,10 @@ bool MusicPlayer::hasPrevious() const
 
 void MusicPlayer::setAudioVolume(int newVolume)
 {
-    if(newVolume != mAudioVolume){
-        if(newVolume > 100){
-            mAudioVolume = 100;
-        } else if(newVolume < 0){
-            mAudioVolume = 0;
-        } else {
-            mAudioVolume = newVolume;
-        }
-        emit audioVolumeChanged(mAudioVolume);
+    if(newVolume != volume()){
+        qDebug() << volume() << newVolume;
+        setVolume(newVolume);
+        // signal audioVolumeChanged will be emitted automatically
     }
 }