Differential D12789 Diff 34326 src/elisaapplication.cpp

Changeset View

Standalone View

View Options

src/elisaapplication.cpp

Show All 23 Lines
24#include "models/allalbumsproxymodel.h" 24​#include "models/allalbumsproxymodel.h"
25#include "models/alltracksproxymodel.h" 25​#include "models/alltracksproxymodel.h"
26#include "models/allartistsproxymodel.h" 26​#include "models/allartistsproxymodel.h"
27#include "models/singleartistproxymodel.h" 27​#include "models/singleartistproxymodel.h"
28#include "models/singlealbumproxymodel.h" 28​#include "models/singlealbumproxymodel.h"
29#include "mediaplaylist.h" 29​#include "mediaplaylist.h"
30#include "audiowrapper.h" 30​#include "audiowrapper.h"
31#include "manageaudioplayer.h" 31​#include "manageaudioplayer.h"
32​#include "managemediaplayercontrol.h"
33​#include "manageheaderbar.h"
32 34​
33#include "elisa_settings.h" 35​#include "elisa_settings.h"
34#include <KConfigCore/KAuthorized> 36​#include <KConfigCore/KAuthorized>
35 37​
36#if defined KF5ConfigWidgets_FOUND && KF5ConfigWidgets_FOUND 38​#if defined KF5ConfigWidgets_FOUND && KF5ConfigWidgets_FOUND
37#include <KConfigWidgets/KStandardAction> 39​#include <KConfigWidgets/KStandardAction>
38#endif 40​#endif
39 41​
▲ Show 20 Lines • Show All 61 Lines • ▼ Show 20 Line(s)89#endif
101 std::unique_ptr<SingleAlbumProxyModel> mSingleAlbumProxyModel; 103​ std::unique_ptr<SingleAlbumProxyModel> mSingleAlbumProxyModel;
102 104​
103 std::unique_ptr<MediaPlayList> mMediaPlayList; 105​ std::unique_ptr<MediaPlayList> mMediaPlayList;
104 106​
105 std::unique_ptr<AudioWrapper> mAudioWrapper; 107​ std::unique_ptr<AudioWrapper> mAudioWrapper;
106 108​
107 std::unique_ptr<ManageAudioPlayer> mAudioControl; 109​ std::unique_ptr<ManageAudioPlayer> mAudioControl;
108 110​
111​ std::unique_ptr<ManageMediaPlayerControl> mPlayerControl;
112​
113​ std::unique_ptr<ManageHeaderBar> mManageHeaderBar;
114​
109}; 115​};
110 116​
111ElisaApplication::ElisaApplication(QObject *parent) : QObject(parent), d(std::make_unique<ElisaApplicationPrivate>(this)) 117​ElisaApplication::ElisaApplication(QObject *parent) : QObject(parent), d(std::make_unique<ElisaApplicationPrivate>(this))
112{ 118​{
113} 119​}
114 120​
115ElisaApplication::~ElisaApplication() 121​ElisaApplication::~ElisaApplication()
116= default; 122​= default;
▲ Show 20 Lines • Show All 149 Lines • ▼ Show 20 Line(s)263 for (const auto &oneFile : filesList) {
266 } 272​ }
267 } 273​ }
268 274​
269 return filesToOpen; 275​ return filesToOpen;
270} 276​}
271 277​
272void ElisaApplication::initialize() 278​void ElisaApplication::initialize()
273{ 279​{
280​ initializeModels();
281​ initializePlayer();
282​}
283​
284​void ElisaApplication::initializeModels()
285​{
274 d->mMusicManager = std::make_unique<MusicListenersManager>(); 286​ d->mMusicManager = std::make_unique<MusicListenersManager>();
275 Q_EMIT musicManagerChanged(); 287​ Q_EMIT musicManagerChanged();
276 d->mAllAlbumsProxyModel = std::make_unique<AllAlbumsProxyModel>(); 288​ d->mAllAlbumsProxyModel = std::make_unique<AllAlbumsProxyModel>();
277 Q_EMIT allAlbumsProxyModelChanged(); 289​ Q_EMIT allAlbumsProxyModelChanged();
278 d->mAllArtistsProxyModel = std::make_unique<AllArtistsProxyModel>(); 290​ d->mAllArtistsProxyModel = std::make_unique<AllArtistsProxyModel>();
279 Q_EMIT allArtistsProxyModelChanged(); 291​ Q_EMIT allArtistsProxyModelChanged();
280 d->mAllTracksProxyModel = std::make_unique<AllTracksProxyModel>(); 292​ d->mAllTracksProxyModel = std::make_unique<AllTracksProxyModel>();
281 Q_EMIT allTracksProxyModelChanged(); 293​ Q_EMIT allTracksProxyModelChanged();
282 d->mSingleArtistProxyModel = std::make_unique<SingleArtistProxyModel>(); 294​ d->mSingleArtistProxyModel = std::make_unique<SingleArtistProxyModel>();
283 Q_EMIT singleArtistProxyModelChanged(); 295​ Q_EMIT singleArtistProxyModelChanged();
284 d->mSingleAlbumProxyModel = std::make_unique<SingleAlbumProxyModel>(); 296​ d->mSingleAlbumProxyModel = std::make_unique<SingleAlbumProxyModel>();
285 Q_EMIT singleAlbumProxyModelChanged(); 297​ Q_EMIT singleAlbumProxyModelChanged();
286 d->mMediaPlayList = std::make_unique<MediaPlayList>(); 298​ d->mMediaPlayList = std::make_unique<MediaPlayList>();
287 Q_EMIT mediaPlayListChanged(); 299​ Q_EMIT mediaPlayListChanged();
288 d->mAudioWrapper = std::make_unique<AudioWrapper>(); ​
289 Q_EMIT audioPlayerChanged(); ​
290 d->mAudioControl = std::make_unique<ManageAudioPlayer>(); ​
291 Q_EMIT audioControlChanged(); ​
292 300​
293 d->mMusicManager->setElisaApplication(this); 301​ d->mMusicManager->setElisaApplication(this);
294 302​
295 d->mMediaPlayList->setMusicListenersManager(d->mMusicManager.get()); 303​ d->mMediaPlayList->setMusicListenersManager(d->mMusicManager.get());
296 QObject::connect(this, &ElisaApplication::enqueue, d->mMediaPlayList.get(), &MediaPlayList::enqueueAndPlay); 304​ QObject::connect(this, &ElisaApplication::enqueue, d->mMediaPlayList.get(), &MediaPlayList::enqueueAndPlay);
297 305​
298 d->mAllAlbumsProxyModel->setSourceModel(d->mMusicManager->allAlbumsModel()); 306​ d->mAllAlbumsProxyModel->setSourceModel(d->mMusicManager->allAlbumsModel());
299 d->mAllArtistsProxyModel->setSourceModel(d->mMusicManager->allArtistsModel()); 307​ d->mAllArtistsProxyModel->setSourceModel(d->mMusicManager->allArtistsModel());
Show All 19 Lines326 d->mMediaPlayList.get(), static_cast<void (MediaPlayList::*)(const QList<MusicAlbum> &,
319 ElisaUtils::PlayListEnqueueMode, 327​ ElisaUtils::PlayListEnqueueMode,
320 ElisaUtils::PlayListEnqueueTriggerPlay)>(&MediaPlayList::enqueue)); 328​ ElisaUtils::PlayListEnqueueTriggerPlay)>(&MediaPlayList::enqueue));
321 329​
322 QObject::connect(d->mSingleAlbumProxyModel.get(), &SingleAlbumProxyModel::trackToEnqueue, 330​ QObject::connect(d->mSingleAlbumProxyModel.get(), &SingleAlbumProxyModel::trackToEnqueue,
323 d->mMediaPlayList.get(), static_cast<void (MediaPlayList::*)(const QList<MusicAudioTrack> &, 331​ d->mMediaPlayList.get(), static_cast<void (MediaPlayList::*)(const QList<MusicAudioTrack> &,
324 ElisaUtils::PlayListEnqueueMode, 332​ ElisaUtils::PlayListEnqueueMode,
325 ElisaUtils::PlayListEnqueueTriggerPlay)>(&MediaPlayList::enqueue)); 333​ ElisaUtils::PlayListEnqueueTriggerPlay)>(&MediaPlayList::enqueue));
326 334​
335​}
336​
337​void ElisaApplication::initializePlayer()
338​{
339​ d->mAudioWrapper = std::make_unique<AudioWrapper>();
340​ Q_EMIT audioPlayerChanged();
341​ d->mAudioControl = std::make_unique<ManageAudioPlayer>();
342​ Q_EMIT audioControlChanged();
343​ d->mPlayerControl = std::make_unique<ManageMediaPlayerControl>();
344​ Q_EMIT playerControlChanged();
345​ d->mManageHeaderBar = std::make_unique<ManageHeaderBar>();
346​ Q_EMIT manageHeaderBarChanged();
347​
327 d->mAudioControl->setAlbumNameRole(MediaPlayList::AlbumRole); 348​ d->mAudioControl->setAlbumNameRole(MediaPlayList::AlbumRole);
328 d->mAudioControl->setArtistNameRole(MediaPlayList::ArtistRole); 349​ d->mAudioControl->setArtistNameRole(MediaPlayList::ArtistRole);
329 d->mAudioControl->setTitleRole(MediaPlayList::TitleRole); 350​ d->mAudioControl->setTitleRole(MediaPlayList::TitleRole);
330 d->mAudioControl->setUrlRole(MediaPlayList::ResourceRole); 351​ d->mAudioControl->setUrlRole(MediaPlayList::ResourceRole);
331 d->mAudioControl->setIsPlayingRole(MediaPlayList::IsPlayingRole); 352​ d->mAudioControl->setIsPlayingRole(MediaPlayList::IsPlayingRole);
332 d->mAudioControl->setPlayListModel(d->mMediaPlayList.get()); 353​ d->mAudioControl->setPlayListModel(d->mMediaPlayList.get());
333 d->mAudioControl->setCurrentTrack(d->mMediaPlayList->currentTrack()); ​
334 ​
335 ​
336 d->mAudioWrapper->setSource(d->mAudioControl->playerSource()); ​
337 354​
338 QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::playerPlay, d->mAudioWrapper.get(), &AudioWrapper::play); 355​ QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::playerPlay, d->mAudioWrapper.get(), &AudioWrapper::play);
339 QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::playerPause, d->mAudioWrapper.get(), &AudioWrapper::pause); 356​ QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::playerPause, d->mAudioWrapper.get(), &AudioWrapper::pause);
340 QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::playerStop, d->mAudioWrapper.get(), &AudioWrapper::stop); 357​ QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::playerStop, d->mAudioWrapper.get(), &AudioWrapper::stop);
341 QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::seek, d->mAudioWrapper.get(), &AudioWrapper::seek); 358​ QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::seek, d->mAudioWrapper.get(), &AudioWrapper::seek);
342 QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::skipNextTrack, d->mMediaPlayList.get(), &MediaPlayList::skipNextTrack); 359​ QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::skipNextTrack, d->mMediaPlayList.get(), &MediaPlayList::skipNextTrack);
343 QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::sourceInError, d->mMediaPlayList.get(), &MediaPlayList::trackInError); 360​ QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::sourceInError, d->mMediaPlayList.get(), &MediaPlayList::trackInError);
344 QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::sourceInError, d->mMusicManager.get(), &MusicListenersManager::playBackError); 361​ QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::sourceInError, d->mMusicManager.get(), &MusicListenersManager::playBackError);
345 QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::playerSourceChanged, d->mAudioWrapper.get(), &AudioWrapper::setSource); 362​ QObject::connect(d->mAudioControl.get(), &ManageAudioPlayer::playerSourceChanged, d->mAudioWrapper.get(), &AudioWrapper::setSource);
346 363​
347 QObject::connect(d->mMediaPlayList.get(), &MediaPlayList::ensurePlay, d->mAudioControl.get(), &ManageAudioPlayer::ensurePlay); 364​ QObject::connect(d->mMediaPlayList.get(), &MediaPlayList::ensurePlay, d->mAudioControl.get(), &ManageAudioPlayer::ensurePlay);
348 QObject::connect(d->mMediaPlayList.get(), &MediaPlayList::playListFinished, d->mAudioControl.get(), &ManageAudioPlayer::playListFinished); 365​ QObject::connect(d->mMediaPlayList.get(), &MediaPlayList::playListFinished, d->mAudioControl.get(), &ManageAudioPlayer::playListFinished);
349 QObject::connect(d->mMediaPlayList.get(), &MediaPlayList::currentTrackChanged, d->mAudioControl.get(), &ManageAudioPlayer::setCurrentTrack); 366​ QObject::connect(d->mMediaPlayList.get(), &MediaPlayList::currentTrackChanged, d->mAudioControl.get(), &ManageAudioPlayer::setCurrentTrack);
350 367​
351 QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::playbackStateChanged, d->mAudioControl.get(), &ManageAudioPlayer::setPlayerPlaybackState); 368​ QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::playbackStateChanged, d->mAudioControl.get(), &ManageAudioPlayer::setPlayerPlaybackState);
352 QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::statusChanged, d->mAudioControl.get(), &ManageAudioPlayer::setPlayerStatus); 369​ QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::statusChanged, d->mAudioControl.get(), &ManageAudioPlayer::setPlayerStatus);
353 QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::errorChanged, d->mAudioControl.get(), &ManageAudioPlayer::setPlayerError); 370​ QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::errorChanged, d->mAudioControl.get(), &ManageAudioPlayer::setPlayerError);
354 QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::durationChanged, d->mAudioControl.get(), &ManageAudioPlayer::setAudioDuration); 371​ QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::durationChanged, d->mAudioControl.get(), &ManageAudioPlayer::setAudioDuration);
355 QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::seekableChanged, d->mAudioControl.get(), &ManageAudioPlayer::setPlayerIsSeekable); 372​ QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::seekableChanged, d->mAudioControl.get(), &ManageAudioPlayer::setPlayerIsSeekable);
356 QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::positionChanged, d->mAudioControl.get(), &ManageAudioPlayer::setPlayerPosition); 373​ QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::positionChanged, d->mAudioControl.get(), &ManageAudioPlayer::setPlayerPosition);
357 374​
375​ d->mPlayerControl->setPlayListModel(d->mMediaPlayList.get());
376​ QObject::connect(d->mMediaPlayList.get(), &MediaPlayList::currentTrackChanged, d->mPlayerControl.get(), &ManageMediaPlayerControl::setCurrentTrack);
377​ QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::playing, d->mPlayerControl.get(), &ManageMediaPlayerControl::playerPlaying);
378​ QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::paused, d->mPlayerControl.get(), &ManageMediaPlayerControl::playerPaused);
379​ QObject::connect(d->mAudioWrapper.get(), &AudioWrapper::stopped, d->mPlayerControl.get(), &ManageMediaPlayerControl::playerStopped);
380​
381​ d->mManageHeaderBar->setTitleRole(MediaPlayList::TitleRole);
382​ d->mManageHeaderBar->setAlbumRole(MediaPlayList::AlbumRole);
383​ d->mManageHeaderBar->setArtistRole(MediaPlayList::ArtistRole);
384​ d->mManageHeaderBar->setImageRole(MediaPlayList::ImageRole);
385​ d->mManageHeaderBar->setIsValidRole(MediaPlayList::IsValidRole);
386​ d->mManageHeaderBar->setPlayListModel(d->mMediaPlayList.get());
387​ QObject::connect(d->mMediaPlayList.get(), &MediaPlayList::currentTrackChanged, d->mManageHeaderBar.get(), &ManageHeaderBar::setCurrentTrack);
388​
358 if (!d->mArguments.isEmpty()) { 389​ if (!d->mArguments.isEmpty()) {
359 Q_EMIT enqueue(d->mArguments); 390​ Q_EMIT enqueue(d->mArguments);
360 } 391​ }
361} 392​}
362 393​
363QAction * ElisaApplication::action(const QString& name) 394​QAction * ElisaApplication::action(const QString& name)
364{ 395​{
365#if defined KF5XmlGui_FOUND && KF5XmlGui_FOUND 396​#if defined KF5XmlGui_FOUND && KF5XmlGui_FOUND
▲ Show 20 Lines • Show All 62 Lines • ▼ Show 20 Line(s)458{
428 return d->mAudioWrapper.get(); 459​ return d->mAudioWrapper.get();
429} 460​}
430 461​
431ManageAudioPlayer *ElisaApplication::audioControl() const 462​ManageAudioPlayer *ElisaApplication::audioControl() const
432{ 463​{
433 return d->mAudioControl.get(); 464​ return d->mAudioControl.get();
434} 465​}
435 466​
467​ManageMediaPlayerControl *ElisaApplication::playerControl() const
468​{
469​ return d->mPlayerControl.get();
470​}
471​
472​ManageHeaderBar *ElisaApplication::manageHeaderBar() const
473​{
474​ return d->mManageHeaderBar.get();
475​}
476​
436#include "moc_elisaapplication.cpp" 477​#include "moc_elisaapplication.cpp"