library shows current item

bit-shift-io · Jul 30, 2020 · 601dc0a · 601dc0a
1 parent 88b1bbc
commit 601dc0a
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 27 deletions.
diff --git a/src/chaptermodel.cpp b/src/chaptermodel.cpp
@@ -8,7 +8,7 @@ ChapterModel::ChapterModel(QObject *parent)
     : QAbstractListModel(parent)
 {
     // connect library
-    connect(Player::instance(), &Player::currentIndexChanged, this, &ChapterModel::chapterIndexChanged);
+    connect(Player::instance(), &Player::currentIndexChanged, this, &ChapterModel::refresh);
 }
 
 
@@ -17,11 +17,6 @@ void ChapterModel::refresh() {
     endResetModel();
 }
 
-void ChapterModel::chapterIndexChanged(int xIndex)
-{
-    refresh();
-}
-
 
 int ChapterModel::rowCount(const QModelIndex & /*parent*/) const
 {
@@ -52,6 +47,8 @@ QVariant ChapterModel::data(const QModelIndex &index, int role) const
             return QVariant(c.path);
         case DurationRole:
             return QVariant(Util::getDisplayTime(c.duration));
+        case CurrentItemRole:
+            return QVariant(index.row() == Player::instance()->chapterIndex());
     }
     return QVariant();
 }
diff --git a/src/chaptermodel.h b/src/chaptermodel.h
@@ -19,6 +19,7 @@ class ChapterModel : public QAbstractListModel
         TitleRole,
         FileNameRole,
         DurationRole,
+        CurrentItemRole,
     };
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
@@ -33,12 +34,10 @@ class ChapterModel : public QAbstractListModel
         names[TitleRole] = "title";
         names[FileNameRole] = "fileName";
         names[DurationRole] = "duration";
+        names[CurrentItemRole] = "isCurrentItem";
         return names;
     }
 
-public slots:
-    void chapterIndexChanged(int xIndex);
-
 
 };
 

diff --git a/src/librarymodel.cpp b/src/librarymodel.cpp
@@ -2,11 +2,13 @@
 #include "librarymodel.h"
 #include "database.h"
 #include "util.h"
+#include "player.h"
 
 
 LibraryModel::LibraryModel(QObject *parent)
     : QAbstractListModel(parent)
 {
+    connect(Player::instance(), &Player::playlistChanged, this, &LibraryModel::refresh);
 }
 
 
@@ -30,18 +32,20 @@ QVariant LibraryModel::data(const QModelIndex &index, int role) const
     const Book &book = Database::instance()->getLibraryItems().at(index.row());
 
     switch (role) {
-        case LibraryIndexRole:
-            return QVariant(index.row());
-        case TitleRole:
-            return QVariant(book.title);
-        case ChaptersRole:
-            return QVariant(book.chapters.count());
-        case DurationRole:
-            return QVariant(Util::getDisplayTime(book.duration));
-        case ArtistRole:
-            return QVariant(book.artist);
+    case LibraryIndexRole:
+        return QVariant(index.row());
+    case TitleRole:
+        return QVariant(book.title);
+    case ChaptersRole:
+        return QVariant(book.chapters.count());
+    case DurationRole:
+        return QVariant(Util::getDisplayTime(book.duration));
+    case ArtistRole:
+        return QVariant(book.artist);
     case PathRole:
         return QVariant(book.path);
+    case CurrentItemRole:
+        return Player::instance()->currentItem() == book.path;
     }
     return QVariant();
 }
diff --git a/src/librarymodel.h b/src/librarymodel.h
@@ -21,6 +21,7 @@ class LibraryModel : public QAbstractListModel
         DurationRole,
         ArtistRole,
         PathRole,
+        CurrentItemRole,
     };
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
@@ -37,6 +38,7 @@ class LibraryModel : public QAbstractListModel
         names[DurationRole] = "duration";
         names[ArtistRole] = "artist";
         names[PathRole] = "path";
+        names[CurrentItemRole] = "isCurrentItem";
         return names;
     }
 

diff --git a/src/player.cpp b/src/player.cpp
@@ -20,7 +20,7 @@ Player::Player(QMediaPlayer *parent)
     connect(this, &QMediaPlayer::volumeChanged, this, &Player::volumeChanged);
     connect(this, &QMediaPlayer::playbackRateChanged, this, &Player::speedChanged);
 
-    //connect(this, &QMediaPlayer::seekableChanged, this, &Player::seekableChanged); // broken on android
+    connect(this, &QMediaPlayer::seekableChanged, this, &Player::updateSeekable); // broken on android
     //connect(this, &QMediaPlayer::bufferStatusChanged, this, &Player::bufferChanged); // broken
 
     mTimer = new QTimer(this);
@@ -147,6 +147,7 @@ void Player::endSleepTimer()
 
 void Player::exitHandler()
 {
+    Database::instance()->writeBook(*mCurrentBook);
 }
 
 
@@ -215,20 +216,20 @@ QString Player::titleText() const
 
 void Player::positionChanged(qint64 xPosition)
 {
-
-    if (mSetPosition > xPosition) {
+    if (mSetPosition != -1) {
         // dont change progress if media is changing
         if (!QMediaPlayer::isSeekable())
             return;
 
-        setPosition(mSetPosition);
+        QMediaPlayer::setPosition(mSetPosition);
         setMuted(false);
+        qDebug() << "unmute";
         mSetPosition = -1;
+        mChangingBook = false;
     }
 
     mProgress = mCurrentBook->getStartProgressChapter(chapterIndex()) + xPosition;
     mCurrentBook->progress = mProgress;
-    Database::instance()->writeBook(*mCurrentBook);
     emit progressChanged();
 }
 
@@ -248,6 +249,7 @@ void Player::setProgress(qint64 xPosition) {
     // set chapter and position
     QMediaPlayer::setMuted(true);
     mSetPosition = chapter_position;
+    qDebug() << "muted" << mSetPosition;
     setChapterIndex(chapter_index);
 }
 
@@ -327,13 +329,17 @@ void Player::setSleepTimerEnabled(bool xEnabled)
 
 void Player::updateMediaStatus(QMediaPlayer::MediaStatus xStatus)
 {
-    if (xStatus == QMediaPlayer::NoMedia && chapterIndex() == -1 && mRepeatMode == Repeat::LIBRARY) {
+    if (xStatus == QMediaPlayer::NoMedia && chapterIndex() == -1 && mRepeatMode == Repeat::LIBRARY && !mChangingBook) {
         QString next_book = Database::instance()->getNextLibraryItem(mCurrentBook->path)->path;
         setCurrentItem(next_book);
-        qDebug() << "load next book from lib" << next_book;
     }
 }
 
+void Player::updateSeekable(bool xSeekable)
+{
+    qDebug() << "seekable" << xSeekable;
+}
+
 
 void Player::setRepeatMode(Player::Repeat xMode)
 {
@@ -365,12 +371,15 @@ void Player::setRepeatMode(Player::Repeat xMode)
 
 void Player::setCurrentItem(QString &xIndex)
 {
+    qDebug() << "setItem" << xIndex;
+
     if (xIndex.isEmpty())
         return;
 
     if (mCurrentBook != nullptr && mCurrentBook->path == xIndex)
         return;
 
+    mChangingBook = true;
 
     // save book progress
     if (mCurrentBook != nullptr)

diff --git a/src/player.h b/src/player.h
@@ -82,6 +82,7 @@ public slots:
     void setSleepTime(int xTime);
     void setSleepTimerEnabled(bool xEnabled);
     void updateMediaStatus(QMediaPlayer::MediaStatus xStatus);
+    void updateSeekable(bool xSeekable);
 
 signals:
     void progressChanged();
@@ -103,6 +104,7 @@ public slots:
     qint64 mProgress = 0;
     int mSleepTime = 3600000; // 1hr
     bool mSleepTimeEnabled = false;
+    bool mChangingBook = false;
     QTimer * mTimer = nullptr;
     explicit Player(QMediaPlayer *parent = nullptr);
 };

diff --git a/src/qml/LibraryPage.qml b/src/qml/LibraryPage.qml
@@ -61,7 +61,7 @@ Page {
 
             Rectangle {
                 id: background
-                color: ListView.isCurrentItem? Style.library.color_highlight : Style.library.color_background // TODO: model.isCurrentItem for active item
+                color: model.isCurrentItem? Style.library.color_highlight : Style.library.color_background
                 radius: Style.library.radius_background
                 implicitHeight: library_title.height + library_artist.height + Style.library.margin * 3
                 implicitWidth: library_list.width