aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Mardelle <[email protected]>2015-04-19 09:14:51 +0200
committerJean-Baptiste Mardelle <[email protected]>2015-04-19 09:14:51 +0200
commitd4c660aa2d795069d29b88f0c407653fcc734171 (patch)
tree3fbde787a6e8c15a42b68088e817924815bde2f2
parentf1ec99858e06877c2b5d595decbc7c32fca36ab2 (diff)
Fix compilation
-rw-r--r--src/bin/bin.cpp2
-rw-r--r--src/bin/projectclip.cpp4
-rw-r--r--src/bin/projectclip.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/bin.cpp b/src/bin/bin.cpp
index fd22042..b1ca1bb 100644
--- a/src/bin/bin.cpp
+++ b/src/bin/bin.cpp
@@ -1178,7 +1178,7 @@ void Bin::slotProducerReady(requestClipInfo info, ClipController *controller)
if (groupId.toInt() >= m_folderCounter) m_folderCounter = groupId.toInt() + 1;
}
else parentFolder = m_rootFolder;
- ProjectClip *newItem = new ProjectClip(info.clipId, controller, parentFolder);
+ ProjectClip *newItem = new ProjectClip(info.clipId, m_blankThumb, controller, parentFolder);
if (info.clipId.toInt() >= m_clipCounter) m_clipCounter = info.clipId.toInt() + 1;
}
emit producerReady(info.clipId);
diff --git a/src/bin/projectclip.cpp b/src/bin/projectclip.cpp
index 7ce2ea2..6ec4550 100644
--- a/src/bin/projectclip.cpp
+++ b/src/bin/projectclip.cpp
@@ -38,14 +38,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
-ProjectClip::ProjectClip(const QString &id, ClipController *controller, ProjectFolder* parent) :
+ProjectClip::ProjectClip(const QString &id, QIcon thumb, ClipController *controller, ProjectFolder* parent) :
AbstractProjectItem(AbstractProjectItem::ClipItem, id, parent)
, m_controller(controller)
, audioFrameCache()
, m_audioThumbCreated(false)
{
m_clipStatus = StatusReady;
- m_thumbnail = bin()->defaultPixmap();
+ m_thumbnail = thumb;
m_name = m_controller->clipName();
m_duration = m_controller->getStringDuration();
getFileHash();
diff --git a/src/bin/projectclip.h b/src/bin/projectclip.h
index 364beb6..11a92ed 100644
--- a/src/bin/projectclip.h
+++ b/src/bin/projectclip.h
@@ -57,7 +57,7 @@ public:
/**
* @brief Constructor; used when loading a project and the producer is already available.
*/
- ProjectClip(const QString &id, ClipController *controller, ProjectFolder* parent);
+ ProjectClip(const QString &id, QIcon thumb, ClipController *controller, ProjectFolder* parent);
/**
* @brief Constructor.
* @param description element describing the clip; the "id" attribute and "resource" property are used