Mercurial > hg > sonic-visualiser
comparison main/main.cpp @ 844:ce4d9e149086
Use openPath instead of open() when opening local file or URL (for progress indicator). I think I didn't realise this distinction between the two functions, which formerly were both named open().
author | Chris Cannam |
---|---|
date | Tue, 09 Sep 2014 16:33:52 +0100 |
parents | 7374badd5f9e |
children | 62198dde171e |
comparison
equal
deleted
inserted
replaced
843:d12d4c11a55b | 844:ce4d9e149086 |
---|---|
510 status = MainWindow::FileOpenSucceeded; | 510 status = MainWindow::FileOpenSucceeded; |
511 } | 511 } |
512 } | 512 } |
513 if (status != MainWindow::FileOpenSucceeded) { | 513 if (status != MainWindow::FileOpenSucceeded) { |
514 if (!haveMainModel) { | 514 if (!haveMainModel) { |
515 status = m_mainWindow->open(path, MainWindow::ReplaceSession); | 515 status = m_mainWindow->openPath(path, MainWindow::ReplaceSession); |
516 if (status == MainWindow::FileOpenSucceeded) { | 516 if (status == MainWindow::FileOpenSucceeded) { |
517 haveMainModel = true; | 517 haveMainModel = true; |
518 } | 518 } |
519 } else { | 519 } else { |
520 if (haveSession && !havePriorCommandLineModel) { | 520 if (haveSession && !havePriorCommandLineModel) { |
521 status = m_mainWindow->open(path, MainWindow::AskUser); | 521 status = m_mainWindow->openPath(path, MainWindow::AskUser); |
522 if (status == MainWindow::FileOpenSucceeded) { | 522 if (status == MainWindow::FileOpenSucceeded) { |
523 havePriorCommandLineModel = true; | 523 havePriorCommandLineModel = true; |
524 } | 524 } |
525 } else { | 525 } else { |
526 status = m_mainWindow->open(path, MainWindow::CreateAdditionalModel); | 526 status = m_mainWindow->openPath(path, MainWindow::CreateAdditionalModel); |
527 } | 527 } |
528 } | 528 } |
529 } | 529 } |
530 if (status == MainWindow::FileOpenFailed) { | 530 if (status == MainWindow::FileOpenFailed) { |
531 if (splash) splash->hide(); | 531 if (splash) splash->hide(); |