diff --git a/src/mpris2/mpris2.h b/src/mpris2/mpris2.h --- a/src/mpris2/mpris2.h +++ b/src/mpris2/mpris2.h @@ -47,16 +47,11 @@ WRITE setPlayerName NOTIFY playerNameChanged) - Q_PROPERTY(QAbstractItemModel* playListModel + Q_PROPERTY(MediaPlayList* playListModel READ playListModel WRITE setPlayListModel NOTIFY playListModelChanged) - Q_PROPERTY(MediaPlayList* playListControler - READ playListControler - WRITE setPlayListControler - NOTIFY playListControlerChanged) - Q_PROPERTY(ManageAudioPlayer* audioPlayerManager READ audioPlayerManager WRITE setAudioPlayerManager @@ -83,9 +78,7 @@ QString playerName() const; - QAbstractItemModel* playListModel() const; - - MediaPlayList* playListControler() const; + MediaPlayList* playListModel() const; ManageAudioPlayer* audioPlayerManager() const; @@ -99,9 +92,7 @@ void setPlayerName(const QString &playerName); - void setPlayListModel(QAbstractItemModel* playListModel); - - void setPlayListControler(MediaPlayList* playListControler); + void setPlayListModel(MediaPlayList* playListModel); void setAudioPlayerManager(ManageAudioPlayer* audioPlayerManager); @@ -118,8 +109,6 @@ void playListModelChanged(); - void playListControlerChanged(); - void audioPlayerManagerChanged(); void manageMediaPlayerControlChanged(); @@ -135,8 +124,7 @@ std::unique_ptr m_mp2; std::unique_ptr m_mp2p; QString m_playerName; - QAbstractItemModel* m_playListModel = nullptr; - MediaPlayList* m_playListControler = nullptr; + MediaPlayList* m_playListModel = nullptr; ManageAudioPlayer* m_manageAudioPlayer = nullptr; ManageMediaPlayerControl* m_manageMediaPlayerControl = nullptr; ManageHeaderBar* m_manageHeaderBar = nullptr; diff --git a/src/mpris2/mpris2.cpp b/src/mpris2/mpris2.cpp --- a/src/mpris2/mpris2.cpp +++ b/src/mpris2/mpris2.cpp @@ -60,7 +60,7 @@ if (success) { m_mp2 = std::make_unique(this); - m_mp2p = std::make_unique(m_playListControler, m_manageAudioPlayer, m_manageMediaPlayerControl, m_manageHeaderBar, m_audioPlayer, this); + m_mp2p = std::make_unique(m_playListModel, m_manageAudioPlayer, m_manageMediaPlayerControl, m_manageHeaderBar, m_audioPlayer, this); QDBusConnection::sessionBus().registerObject(QStringLiteral("/org/mpris/MediaPlayer2"), this, QDBusConnection::ExportAdaptors); @@ -76,16 +76,11 @@ return m_playerName; } -QAbstractItemModel *Mpris2::playListModel() const +MediaPlayList *Mpris2::playListModel() const { return m_playListModel; } -MediaPlayList *Mpris2::playListControler() const -{ - return m_playListControler; -} - ManageAudioPlayer *Mpris2::audioPlayerManager() const { return m_manageAudioPlayer; @@ -114,58 +109,41 @@ m_playerName = playerName; - if (m_playListModel && m_playListControler && m_manageAudioPlayer && m_manageMediaPlayerControl && m_manageHeaderBar && m_audioPlayer && !m_playerName.isEmpty()) { + if (m_playListModel && m_manageAudioPlayer && m_manageMediaPlayerControl && m_manageHeaderBar && m_audioPlayer && !m_playerName.isEmpty()) { if (!m_mp2) { initDBusService(); } } emit playerNameChanged(); } -void Mpris2::setPlayListModel(QAbstractItemModel *playListModel) +void Mpris2::setPlayListModel(MediaPlayList *playListModel) { if (m_playListModel == playListModel) { return; } m_playListModel = playListModel; - if (m_playListModel && m_playListControler && m_manageAudioPlayer && m_manageMediaPlayerControl && m_manageHeaderBar && m_audioPlayer && !m_playerName.isEmpty()) { + if (m_playListModel && m_manageAudioPlayer && m_manageMediaPlayerControl && m_manageHeaderBar && m_audioPlayer && !m_playerName.isEmpty()) { if (!m_mp2) { initDBusService(); } } emit playListModelChanged(); } -void Mpris2::setPlayListControler(MediaPlayList *playListControler) -{ - if (m_playListControler == playListControler) { - return; - } - - m_playListControler = playListControler; - - if (m_playListModel && m_playListControler && m_manageAudioPlayer && m_manageMediaPlayerControl && m_manageHeaderBar && m_audioPlayer && !m_playerName.isEmpty()) { - if (!m_mp2) { - initDBusService(); - } - } - - emit playListControlerChanged(); -} - void Mpris2::setAudioPlayerManager(ManageAudioPlayer *manageAudioPlayer) { if (m_manageAudioPlayer == manageAudioPlayer) { return; } m_manageAudioPlayer = manageAudioPlayer; - if (m_playListModel && m_playListControler && m_manageAudioPlayer && m_manageMediaPlayerControl && m_manageHeaderBar && m_audioPlayer && !m_playerName.isEmpty()) { + if (m_playListModel && m_manageAudioPlayer && m_manageMediaPlayerControl && m_manageHeaderBar && m_audioPlayer && !m_playerName.isEmpty()) { if (!m_mp2) { initDBusService(); } @@ -182,7 +160,7 @@ m_manageMediaPlayerControl = manageMediaPlayerControl; - if (m_playListModel && m_playListControler && m_manageAudioPlayer && m_manageMediaPlayerControl && m_manageHeaderBar && m_audioPlayer && !m_playerName.isEmpty()) { + if (m_playListModel && m_manageAudioPlayer && m_manageMediaPlayerControl && m_manageHeaderBar && m_audioPlayer && !m_playerName.isEmpty()) { if (!m_mp2) { initDBusService(); } @@ -198,7 +176,7 @@ m_manageHeaderBar = manageHeaderBar; - if (m_playListModel && m_playListControler && m_manageAudioPlayer && m_manageMediaPlayerControl && m_manageHeaderBar && m_audioPlayer && !m_playerName.isEmpty()) { + if (m_playListModel && m_manageAudioPlayer && m_manageMediaPlayerControl && m_manageHeaderBar && m_audioPlayer && !m_playerName.isEmpty()) { if (!m_mp2) { initDBusService(); } @@ -214,7 +192,7 @@ m_audioPlayer = audioPlayer; - if (m_playListModel && m_playListControler && m_manageAudioPlayer && m_manageMediaPlayerControl && m_manageHeaderBar && m_audioPlayer && !m_playerName.isEmpty()) { + if (m_playListModel && m_manageAudioPlayer && m_manageMediaPlayerControl && m_manageHeaderBar && m_audioPlayer && !m_playerName.isEmpty()) { if (!m_mp2) { initDBusService(); } diff --git a/src/qml/ElisaMainWindow.qml b/src/qml/ElisaMainWindow.qml --- a/src/qml/ElisaMainWindow.qml +++ b/src/qml/ElisaMainWindow.qml @@ -92,8 +92,6 @@ property var playListState - property var playListControlerState - property var audioPlayerState property double playControlItemVolume : 100.0 @@ -116,7 +114,6 @@ persistentSettings.height = mainWindow.height; persistentSettings.playListState = elisa.mediaPlayList.persistentState; - persistentSettings.playListControlerState = elisa.mediaPlayList.persistentState; persistentSettings.audioPlayerState = elisa.audioControl.persistentState persistentSettings.playControlItemVolume = headerBar.playerControl.volume @@ -135,7 +132,6 @@ id: platformInterface playListModel: elisa.mediaPlayList - playListControler: elisa.mediaPlayList audioPlayerManager: elisa.audioControl player: elisa.audioPlayer headerBarManager: myHeaderBarManager diff --git a/src/qml/PlatformIntegration.qml b/src/qml/PlatformIntegration.qml --- a/src/qml/PlatformIntegration.qml +++ b/src/qml/PlatformIntegration.qml @@ -24,7 +24,6 @@ id: rootItem property alias playListModel: mpris2Interface.playListModel - property alias playListControler: mpris2Interface.playListControler property alias audioPlayerManager: mpris2Interface.audioPlayerManager property alias player: mpris2Interface.audioPlayer property alias headerBarManager: mpris2Interface.headerBarManager