mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-11 01:45:20 +00:00
Code Issues Projects Releases Wiki Activity

almost correct mutex locking on projectm resets

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@817 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
w1z7ard
2008-02-11 13:41:44 +00:00
parent 72be1afadb
commit 98257a10d3
7 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/qprojectM/QProjectM_MainWindow.cpp
View File

@ -70,7 +70,7 @@ class PlaylistWriteFunctor {
};
QProjectM_MainWindow::QProjectM_MainWindow ( const std::string & config_file )
QProjectM_MainWindow::QProjectM_MainWindow ( const std::string & config_file, QMutex * audioMutex)
:m_QPresetFileDialog ( new QPresetFileDialog ( this ) ), m_QPlaylistFileDialog ( new QPlaylistFileDialog ( this ) ),
oldPresetIndex ( -1 ), playlistModel(0), configDialog(0), _menuVisible(true)
{
@ -79,7 +79,7 @@ QProjectM_MainWindow::QProjectM_MainWindow ( const std::string & config_file )
ui = new Ui::QProjectM_MainWindow();
ui->setupUi ( this );
m_QProjectMWidget = new QProjectMWidget ( config_file, this );
m_QProjectMWidget = new QProjectMWidget ( config_file, this, audioMutex);
m_timer = new QTimer ( this );
connect ( m_timer, SIGNAL ( timeout() ), m_QProjectMWidget, SLOT ( updateGL() ) );
@ -220,9 +220,13 @@ void QProjectM_MainWindow::postProjectM_Initialize()
ui->tableView->setModel ( playlistModel );
/// @bug only do this at startup?
refreshPlaylist();
static bool firstOfRefreshPlaylist = true;
if (firstOfRefreshPlaylist) {
refreshPlaylist();
firstOfRefreshPlaylist = false;
}
if (!configDialog) {
configDialog = new QProjectMConfigDialog(m_QProjectMWidget->configFile(), m_QProjectMWidget, this);