|
|
@ -934,7 +934,6 @@ void UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QString |
|
|
|
|
|
|
|
|
|
|
|
QUrl url = QUrl::fromLocalFile(UBPersistenceManager::persistenceManager() |
|
|
|
QUrl url = QUrl::fromLocalFile(UBPersistenceManager::persistenceManager() |
|
|
|
->addAudioFileToDocument(mActiveDocument, sourceUrl, pData, uuid)); |
|
|
|
->addAudioFileToDocument(mActiveDocument, sourceUrl, pData, uuid)); |
|
|
|
|
|
|
|
|
|
|
|
audioItem = mActiveScene->addAudio(url, false, pPos); |
|
|
|
audioItem = mActiveScene->addAudio(url, false, pPos); |
|
|
|
|
|
|
|
|
|
|
|
audioItem->setSourceUrl(sourceUrl); |
|
|
|
audioItem->setSourceUrl(sourceUrl); |
|
|
@ -1779,13 +1778,8 @@ UBGraphicsAudioItem* UBBoardController::addAudio(const QUrl& pSourceUrl, bool st |
|
|
|
QUuid uuid = QUuid::createUuid(); |
|
|
|
QUuid uuid = QUuid::createUuid(); |
|
|
|
QUrl concreteUrl = pSourceUrl; |
|
|
|
QUrl concreteUrl = pSourceUrl; |
|
|
|
|
|
|
|
|
|
|
|
#ifdef Q_WS_X11 |
|
|
|
|
|
|
|
concreteUrl = QUrl::fromLocalFile(mActiveDocument->persistencePath() + "/" + UBPersistenceManager::persistenceManager() |
|
|
|
|
|
|
|
->addAudioFileToDocument(mActiveDocument, pSourceUrl.toLocalFile(), uuid)); |
|
|
|
|
|
|
|
#else |
|
|
|
|
|
|
|
concreteUrl = QUrl::fromLocalFile(UBPersistenceManager::persistenceManager() |
|
|
|
concreteUrl = QUrl::fromLocalFile(UBPersistenceManager::persistenceManager() |
|
|
|
->addAudioFileToDocument(mActiveDocument, pSourceUrl.toLocalFile(), uuid)); |
|
|
|
->addAudioFileToDocument(mActiveDocument, pSourceUrl.toLocalFile(), uuid)); |
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
UBGraphicsAudioItem* vi = mActiveScene->addAudio(concreteUrl, startPlay, pos); |
|
|
|
UBGraphicsAudioItem* vi = mActiveScene->addAudio(concreteUrl, startPlay, pos); |
|
|
|
mActiveDocument->setMetaData(UBSettings::documentUpdatedAt, UBStringUtils::toUtcIsoDateTime(QDateTime::currentDateTime())); |
|
|
|
mActiveDocument->setMetaData(UBSettings::documentUpdatedAt, UBStringUtils::toUtcIsoDateTime(QDateTime::currentDateTime())); |
|
|
|