From ac1c9314ad62440160cee114013d56e97ca85a44 Mon Sep 17 00:00:00 2001
From: Aleksei Kanash <sc.kanash.aleksei@gmail.com>
Date: Thu, 16 Aug 2012 11:57:28 +0300
Subject: [PATCH] Fixed adding of found audio files to document. Improved
 recognition of song's title. Some code removed from header.

---
 src/board/UBBoardController.cpp    |  2 +-
 src/domain/UBGraphicsMediaItem.cpp | 12 ++++++++++++
 src/domain/UBGraphicsMediaItem.h   | 11 +----------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp
index 25416aa5..525b7e5d 100644
--- a/src/board/UBBoardController.cpp
+++ b/src/board/UBBoardController.cpp
@@ -1102,7 +1102,7 @@ UBItem *UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QStri
             QUuid uuid = QUuid::createUuid();
 
             QUrl url = QUrl::fromLocalFile(UBPersistenceManager::persistenceManager()
-                ->addVideoFileToDocument(selectedDocument(), sourceUrl, pData, uuid));
+                ->addAudioFileToDocument(selectedDocument(), sourceUrl, pData, uuid));
 
             audioMediaItem = mActiveScene->addMedia(url, false, pPos);
 
diff --git a/src/domain/UBGraphicsMediaItem.cpp b/src/domain/UBGraphicsMediaItem.cpp
index 8e2778e5..b02c89b4 100644
--- a/src/domain/UBGraphicsMediaItem.cpp
+++ b/src/domain/UBGraphicsMediaItem.cpp
@@ -178,6 +178,18 @@ QVariant UBGraphicsMediaItem::itemChange(GraphicsItemChange change, const QVaria
     return UBGraphicsProxyWidget::itemChange(change, value);
 }
 
+
+void UBGraphicsMediaItem::setSourceUrl(const QUrl &pSourceUrl)
+{
+    UBAudioPresentationWidget* pAudioWidget = dynamic_cast<UBAudioPresentationWidget*>(mAudioWidget);
+    if (pAudioWidget)
+    {
+        pAudioWidget->setTitle(UBFileSystemUtils::lastPathComponent(pSourceUrl.toString()));
+    }
+
+    UBItem::setSourceUrl(pSourceUrl);
+}
+
 void UBGraphicsMediaItem::clearSource()
 {
     QString path = mediaFileUrl().toLocalFile();
diff --git a/src/domain/UBGraphicsMediaItem.h b/src/domain/UBGraphicsMediaItem.h
index 1ab0870d..308fbea9 100644
--- a/src/domain/UBGraphicsMediaItem.h
+++ b/src/domain/UBGraphicsMediaItem.h
@@ -97,16 +97,7 @@ public:
 
     virtual void copyItemParameters(UBItem *copy) const;
 
-    virtual void setSourceUrl(const QUrl &pSourceUrl)
-    {
-        UBAudioPresentationWidget* pAudioWidget = dynamic_cast<UBAudioPresentationWidget*>(mAudioWidget);
-        if (pAudioWidget)
-        {
-            pAudioWidget->setTitle(UBFileSystemUtils::lastPathComponent(pSourceUrl.toLocalFile()));
-        }
-
-        UBItem::setSourceUrl(pSourceUrl);
-    }
+    virtual void setSourceUrl(const QUrl &pSourceUrl);
 
 public slots: