mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

* Initialize queue early in TomahawkWindow and don't store it as a member.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-09-01 02:59:54 +02:00
parent cc059ac141
commit 28342ba811
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tomahawk/TomahawkWindow.cpp
View File

@@ -115,6 +115,10 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128x128.png" ) ); setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128x128.png" ) );
new ViewManager( this ); new ViewManager( this );
QueueView* queueView = new QueueView();
ViewManager::instance()->setQueue( queueView );
AudioEngine::instance()->setQueue( queueView->trackView()->proxyModel()->playlistInterface() );
m_audioControls = new AudioControls( this ); m_audioControls = new AudioControls( this );
ui->setupUi( this ); ui->setupUi( this );
@@ -431,10 +435,6 @@ TomahawkWindow::setupSideBar()
m_jobsModel->setJobModel( sourceModel ); m_jobsModel->setJobModel( sourceModel );
jobsView->setModel( m_jobsModel ); jobsView->setModel( m_jobsModel );
m_queueView = new QueueView();
ViewManager::instance()->setQueue( m_queueView );
AudioEngine::instance()->setQueue( m_queueView->trackView()->proxyModel()->playlistInterface() );
m_sidebar->addWidget( m_sourcetree ); m_sidebar->addWidget( m_sourcetree );
m_sidebar->addWidget( jobsView ); m_sidebar->addWidget( jobsView );

3
src/tomahawk/TomahawkWindow.h
View File

@@ -60,7 +60,6 @@ class MusicScanner;
class AudioControls; class AudioControls;
class TomahawkTrayIcon; class TomahawkTrayIcon;
class PlaylistModel; class PlaylistModel;
class QueueView;
class AnimatedSplitter; class AnimatedSplitter;
class AccountsToolButton; class AccountsToolButton;
@@ -182,8 +181,6 @@ private:
TomahawkTrayIcon* m_trayIcon; TomahawkTrayIcon* m_trayIcon;
SourceTreeView* m_sourcetree; SourceTreeView* m_sourcetree;
QPushButton* m_statusButton; QPushButton* m_statusButton;
QPushButton* m_queueButton;
QueueView* m_queueView;
AnimatedSplitter* m_sidebar; AnimatedSplitter* m_sidebar;
JobStatusSortModel* m_jobsModel; JobStatusSortModel* m_jobsModel;