<parameter type="geometry" name="geometry" default="50%,50%:50%x50%" fixed="1" opacity="false">
<name>Geometry</name>
</parameter>
- <parameter type="constant" name="macroblock_width" max="100" min="1" default="16" suffix="pixels">
+ <parameter type="constant" name="motion_est.macroblock_width" max="100" min="1" default="16" suffix="pixels">
<name>Macroblock width</name>
</parameter>
- <parameter type="constant" name="macroblock_height" max="100" min="1" default="16" suffix="pixels">
+ <parameter type="constant" name="motion_est.macroblock_height" max="100" min="1" default="16" suffix="pixels">
<name>Macroblock height</name>
</parameter>
- <parameter type="bool" name="denoise" default="0">
+ <parameter type="constant" name="motion_est.limit_x" max="500" min="1" default="64" suffix="pixels">
+ <name>Maximum x distance</name>
+ </parameter>
+ <parameter type="constant" name="motion_est.limit_y" max="500" min="1" default="64" suffix="pixels">
+ <name>Maximum y distance</name>
+ </parameter>
+ <parameter type="bool" name="motion_est.denoise" default="0">
<name>Denoise</name>
</parameter>
<parameter type="bool" name="debug" default="0">
<parameter type="bool" name="obscure" default="1">
<name>Obscure</name>
</parameter>
- <parameter type="filterjob" filtertag="autotrack_rectangle" filterparams="_serialize=1 motion_vector_list=0 %params" consumer="null" consumerparams="all=1 terminate_on_pause=1" finalfilter="autotrack_rectangle" extraparams="key:motion_vector_list projecttreefilter storedata">
+ <parameter type="filterjob" filtertag="autotrack_rectangle" filterparams="_serialize=1 motion_vector_list=0 %params" consumer="null" consumerparams="all=1 terminate_on_pause=1">
+ <jobparam name="storedata" />
+ <jobparam name="projecttreefilter" />
+ <jobparam name="key">motion_vector_list</jobparam>
+ <jobparam name="finalfilter">autotrack_rectangle</jobparam>
+ <jobparam name="displaydataname">Motion vectors</jobparam>
<name>Analyse</name>
</parameter>
</effect>
<parameter type="double" name="gain" max="50" min="-50" default="5.00" decimals="2">
<name>Gain</name>
</parameter>
- <parameter type="filterjob" filtertag="sox:analysis" filterparams="" consumer="null" consumerparams="video_off=1 all=1 terminate_on_pause=1" extraparams="key:gain" finalfilter="sox_gain">
+ <parameter type="filterjob" filtertag="sox:analysis" filterparams="" consumer="null" consumerparams="video_off=1 all=1 terminate_on_pause=1">
+ <jobparam name="key">gain</jobparam>
+ <jobparam name="finalfilter">sox_gain</jobparam>
<name>Normalize</name>
</parameter>
</effect>
int sample = (int)((frame - (int)(frame)) * 20); // AUDIO_FRAME_SIZE
if (frame < 0 || sample < 0 || sample > 19)
continue;
- QMap<int, QByteArray> frame_channel_data = baseClip()->m_audioFrameCache[(int)frame];
+ QMap<int, QByteArray> frame_channel_data = baseClip()->audioFrameCache[(int)frame];
for (int channel = 0; channel < channels && frame_channel_data[channel].size() > 0; channel++) {
#include "abstractclipitem.h"
#include "abstractgroupitem.h"
#include "titledocument.h"
+#include "subprojectitem.h"
#include "kthumb.h"
#include <mlt++/Mlt.h>
QMap<QString, int>::const_iterator i;
int max;
int done = 0;
+ int thumbType = 0; // 0 = timeline thumb, 1 = project clip zone thumb, 2 = clip properties thumb
+
while (!m_requestedThumbs.isEmpty() && !m_abortThumb) {
m_thumbsMutex.lock();
i = m_requestedThumbs.constBegin();
m_processingThumbId = i.key();
QList<int> values = m_requestedThumbs.values(m_processingThumbId);
m_requestedThumbs.remove(m_processingThumbId);
+ if (m_processingThumbId.startsWith("?")) {
+ // if id starts with ?, it means the request comes from a clip property widget
+ thumbType = 2;
+ m_processingThumbId.remove(0, 1);
+ }
+ if (m_processingThumbId.startsWith("#")) {
+ // if id starts with #, it means the request comes from project tree
+ thumbType = 1;
+ m_processingThumbId.remove(0, 1);
+ }
m_thumbsMutex.unlock();
qSort(values);
DocClipBase *clip = getClipById(m_processingThumbId);
if (!clip) continue;
max = m_requestedThumbs.size() + values.count();
+ int pos;
while (!values.isEmpty() && clip->thumbProducer() && !m_abortThumb) {
- clip->thumbProducer()->getThumb(values.takeFirst());
+ pos = values.takeFirst();
+ switch (thumbType) {
+ case 1:
+ clip->thumbProducer()->getGenericThumb(pos, SubProjectItem::itemDefaultHeight(), thumbType);
+ break;
+ case 2:
+ clip->thumbProducer()->getGenericThumb(pos, 180, thumbType);
+ break;
+ default:
+ clip->thumbProducer()->getThumb(pos);
+ }
done++;
if (max > 3) emit displayMessage(i18n("Loading thumbnails"), 100 * done / max);
}
return volumeMatch;
}
-
+void ClipManager::projectTreeThumbReady(const QString &id, int frame, QImage img, int type)
+{
+ switch (type) {
+ case 2:
+ emit gotClipPropertyThumbnail(id, img);
+ break;
+ default:
+ emit thumbReady(id, frame, img);
+ }
+}
void requestThumbs(const QString id, QList <int> frames);
/** @brief remove a clip id from the queue list. */
void stopThumbs(const QString &id);
+ void projectTreeThumbReady(const QString &id, int frame, QImage img, int type);
#if KDE_IS_VERSION(4,5,0)
KImageCache* pixmapCache;
QString m_processingAudioThumbId;
/** @brief The list of removable drives. */
QList<SolidVolumeInfo> m_removableVolumes;
+
+ QPoint m_projectTreeThumbSize;
/** @brief Get a list of drives, to check if we have files on removable media. */
void listRemovableVolumes();
void availableClip(const QString &);
void checkAllClips(bool displayRatioChanged, bool fpsChanged, QStringList brokenClips);
void displayMessage(const QString &, int);
+ void thumbReady(const QString &id, int, QImage);
+ void gotClipPropertyThumbnail(const QString &id, QImage);
};
#endif
if (props.contains("colorspace"))
new QTreeWidgetItem(m_view.clip_vproperties, QStringList() << i18n("Colorspace") << ProfilesDialog::getColorspaceDescription(props.value("colorspace").toInt()));
-
- int width = 180.0 * KdenliveSettings::project_display_ratio();
- if (width % 2 == 1) width++;
- QPixmap pix = m_clip->thumbProducer()->getImage(url, m_clip->getClipThumbFrame(), width, 180);
- QPixmap framedPix(pix.width(), pix.height());
- framedPix.fill(Qt::transparent);
- QPainter p(&framedPix);
- p.setRenderHint(QPainter::Antialiasing, true);
- QPainterPath path;
- path.addRoundedRect(0.5, 0.5, framedPix.width() - 1, framedPix.height() - 1, 4, 4);
- p.setClipPath(path);
- p.drawPixmap(0, 0, pix);
- p.end();
-
- m_view.clip_thumb->setPixmap(framedPix);
+ m_view.clip_thumb->setMinimumSize(180 * KdenliveSettings::project_display_ratio(), 180);
+
if (t == IMAGE || t == VIDEO || t == PLAYLIST) m_view.tabWidget->removeTab(AUDIOTAB);
} else {
m_view.tabWidget->removeTab(IMAGETAB);
if (del2) delete del2;
}
+void ClipProperties::slotGotThumbnail(const QString &id, QImage img)
+{
+ if (id != m_clip->getId()) return;
+ QPixmap framedPix(img.width(), img.height());
+ framedPix.fill(Qt::transparent);
+ QPainter p(&framedPix);
+ p.setRenderHint(QPainter::Antialiasing, true);
+ QPainterPath path;
+ path.addRoundedRect(0.5, 0.5, framedPix.width() - 1, framedPix.height() - 1, 4, 4);
+ p.setClipPath(path);
+ p.drawImage(0, 0, img);
+ p.end();
+ m_view.clip_thumb->setPixmap(framedPix);
+}
+
void ClipProperties::slotApplyProperties()
{
if (m_clip != NULL) {
void slotSaveMarkers();
void slotLoadMarkers();
void slotDeleteAnalysis();
+ void slotGotThumbnail(const QString &id, QImage img);
private:
Ui::ClipProperties_UI m_view;
m_lastSeekPosition(SEEK_INACTIVE),
m_clickedGuide(-1),
m_rate(-1),
- m_mouseMove(NO_MOVE)
+ m_mouseMove(NO_MOVE),
+ m_cursorColor(palette().text())
{
setFont(KGlobalSettings::toolBarFont());
QFontMetricsF fontMetrics(font());
update(min * m_factor - m_offset - 2, 0, (max - min) * m_factor + 4, height());
} else {
- int pos = (int)((event->x() + offset()));
+ int pos = (int)((event->x() + m_offset));
+ if (m_cursorColor == palette().text() && qAbs(pos - m_view->cursorPos() * m_factor) < 7) {
+ // Mouse is over cursor
+ m_cursorColor = palette().highlight();
+ update(m_view->cursorPos() * m_factor - m_offset - 10, 0, 20, height());
+ }
+ else if (m_cursorColor == palette().highlight() && qAbs(pos - m_view->cursorPos() * m_factor) >= 7) {
+ m_cursorColor = palette().text();
+ update(m_view->cursorPos() * m_factor - m_offset - 10, 0, 20, height());
+ }
+
if (event->y() <= 10) setCursor(Qt::ArrowCursor);
else if (qAbs(pos - m_zoneStart * m_factor) < 4) {
setCursor(KCursor("left_side", Qt::SizeHorCursor));
}
+// virtual
+void CustomRuler::leaveEvent(QEvent * event)
+{
+ QWidget::leaveEvent(event);
+ if (m_cursorColor == palette().highlight()) {
+ m_cursorColor = palette().text();
+ update();
+ }
+}
+
// virtual
void CustomRuler::wheelEvent(QWheelEvent * e)
{
max = qMax(max, m_lastSeekPosition);
}
}
- update(min * m_factor - offset() - 6, BIG_MARK_X, (max - min) * m_factor + 14, MAX_HEIGHT - BIG_MARK_X);
+ update(min * m_factor - m_offset - 6, BIG_MARK_X, (max - min) * m_factor + 14, MAX_HEIGHT - BIG_MARK_X);
}
void CustomRuler::updateRuler()
const int value = m_view->cursorPos() * m_factor - m_offset;
QPolygon pa(3);
pa.setPoints(3, value - 6, BIG_MARK_X, value + 6, BIG_MARK_X, value, MAX_HEIGHT - 1);
- p.setBrush(palette().text());
+ p.setBrush(m_cursorColor);
p.setPen(Qt::NoPen);
p.drawPolygon(pa);
virtual void mousePressEvent(QMouseEvent * event);
virtual void mouseReleaseEvent(QMouseEvent * event);
virtual void mouseMoveEvent(QMouseEvent * event);
+ virtual void leaveEvent(QEvent * event);
private:
Timecode m_timecode;
int m_zoneStart;
int m_zoneEnd;
int m_duration;
- QColor m_bgColor;
- QColor m_cursorColor;
QColor m_zoneColor;
double m_textSpacing;
double m_factor;
int m_startRate;
MOUSE_MOVE m_mouseMove;
QMenu *m_goMenu;
+ QBrush m_cursorColor;
public slots:
groupSelectedItems(true);
} else if (items.count() == 1) {
m_dragItem = static_cast <AbstractClipItem *>(items.at(0));
- emit clipItemSelected((ClipItem*)m_dragItem, false);
+ emit clipItemSelected((ClipItem*) m_dragItem, false);
}
event->setDropAction(Qt::MoveAction);
event->accept();
}
-void CustomTrackView::slotGotFilterJobResults(const QString &/*id*/, int startPos, int track, const QString &filter, stringMap filterParams, QStringList extra)
+void CustomTrackView::slotGotFilterJobResults(const QString &/*id*/, int startPos, int track, stringMap filterParams, stringMap extra)
{
ClipItem *clip = getClipItemAt(GenTime(startPos, m_document->fps()), track);
if (clip == NULL) {
- emit displayMessage(i18n("Cannot find clip for effect update %1.", filter), ErrorMessage);
+ emit displayMessage(i18n("Cannot find clip for effect update %1.", extra.value("finalfilter")), ErrorMessage);
return;
}
QDomElement newEffect;
QDomElement effect = clip->getEffectAtIndex(clip->selectedEffectIndex());
- if (effect.attribute("id") == filter) {
+ if (effect.attribute("id") == extra.value("finalfilter")) {
newEffect = effect.cloneNode().toElement();
QMap<QString, QString>::const_iterator i = filterParams.constBegin();
while (i != filterParams.constEnd()) {
* @param resetThumbs Should we recreate the timeline thumbnails. */
void slotRefreshThumbs(const QString &id, bool resetThumbs);
/** @brief A Filter job producer results. */
- void slotGotFilterJobResults(const QString &id, int startPos, int track, const QString &filter, stringMap filterParams, QStringList extra);
+ void slotGotFilterJobResults(const QString &id, int startPos, int track, stringMap filterParams, stringMap extra);
signals:
DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QString &id) :
QObject(),
- m_audioFrameCache(),
+ lastSeekPosition(0),
+ audioFrameCache(),
m_refcount(0),
m_baseTrackProducers(),
m_videoTrackProducers(),
void DocClipBase::slotClearAudioCache()
{
- m_audioFrameCache.clear();
+ audioFrameCache.clear();
m_audioThumbCreated = false;
}
void DocClipBase::updateAudioThumbnail(const audioByteArray& data)
{
//kDebug() << "CLIPBASE RECIEDVED AUDIO DATA*********************************************";
- m_audioFrameCache = data;
+ audioFrameCache = data;
m_audioThumbCreated = true;
emit gotAudioData();
}
void DocClipBase::setAnalysisData(const QString &name, const QString &data)
{
if (data.isEmpty()) m_analysisdata.remove(name);
- else m_analysisdata.insert(name, data);
+ else {
+ if (m_analysisdata.contains(name)) {
+ int i = 1;
+ QString newname = name + " " + QString::number(i);
+ while (m_analysisdata.contains(newname)) {
+ i++;
+ newname = name + " " + QString::number(i);
+ }
+ m_analysisdata.insert(newname, data);
+ }
+ else m_analysisdata.insert(name, data);
+ }
}
QMap <QString, QString> DocClipBase::analysisData() const
/** Returns the thumbnail producer used by this clip */
KThumb *thumbProducer();
- /** Cache for every audio Frame with 10 Bytes */
- /** format is frame -> channel ->bytes */
- QMap<int, QMap<int, QByteArray> > m_audioFrameCache;
-
/** Free cache data */
void slotClearAudioCache();
QString getClipHash() const;
bool getAudioThumbs();
void setAnalysisData(const QString &name, const QString &data);
QMap <QString, QString> analysisData() const;
+ int lastSeekPosition;
+ /** Cache for every audio Frame with 10 Bytes */
+ /** format is frame -> channel ->bytes */
+ QMap<int, QMap<int, QByteArray> > audioFrameCache;
private: // Private attributes
-
/** The number of times this clip is used in the project - the number of references to this clip
* that exist. */
uint m_refcount;
stream.appendChild(spu);
spu.setAttribute("force", "yes");
spu.setAttribute("start", "00:00:00.00");
- spu.setAttribute("image", temp1.fileName());
+ //spu.setAttribute("image", temp1.fileName());
spu.setAttribute("select", temp2.fileName());
spu.setAttribute("highlight", temp3.fileName());
/*spu.setAttribute("autoorder", "rows");*/
#include <KDebug>
#include <KColorScheme>
+
+#if KDE_IS_VERSION(4,6,0)
+#include <QGraphicsDropShadowEffect>
+#endif
+
+
#include "kthumb.h"
DvdWizardMenu::DvdWizardMenu(const QString &profile, QWidget *parent) :
QWizardPage(parent),
m_color(NULL),
- m_safeRect(NULL)
+ m_safeRect(NULL),
+ m_finalSize(720, 576)
{
m_view.setupUi(this);
m_view.play_text->setText(i18n("Play"));
m_safeRect->setPen(pen);
m_safeRect->setZValue(5);
m_scene->addItem(m_safeRect);
-
checkBackgroundType(0);
-
// create menu button
DvdButton *button = new DvdButton(m_view.play_text->text());
QFont font = m_view.font_family->currentFont();
font.setPixelSize(m_view.font_size->value());
- font.setStyleStrategy(QFont::NoAntialias);
+ //font.setStyleStrategy(QFont::NoAntialias);
+#if KDE_IS_VERSION(4,6,0)
+ if (m_view.use_shadow->isChecked()) {
+ QGraphicsDropShadowEffect *shadow = new QGraphicsDropShadowEffect(this);
+ shadow->setBlurRadius(7);
+ shadow->setOffset(4, 4);
+ button->setGraphicsEffect(shadow);
+ }
+ connect(m_view.use_shadow, SIGNAL(stateChanged(int)), this, SLOT(slotEnableShadows(int)));
+#elif KDE_IS_VERSION(4,6,0)
+ m_view.use_shadow->setHidden(true);
+#endif
button->setFont(font);
button->setDefaultTextColor(m_view.text_color->color());
button->setZValue(4);
delete m_scene;
}
-// virtual
+void DvdWizardMenu::slotEnableShadows(int enable)
+{
+#if KDE_IS_VERSION(4,6,0)
+ QList<QGraphicsItem *> list = m_scene->items();
+ for (int i = 0; i < list.count(); i++) {
+ if (list.at(i)->type() == QGraphicsItem::UserType + 1) {
+ if (enable) {
+ QGraphicsDropShadowEffect *shadow = new QGraphicsDropShadowEffect(this);
+ shadow->setBlurRadius(7);
+ shadow->setOffset(4, 4);
+ list.at(i)->setGraphicsEffect(shadow);
+ }
+ else list.at(i)->setGraphicsEffect(NULL);
+ }
+ }
+#endif
+}
+// virtual
bool DvdWizardMenu::isComplete() const
{
m_view.error_message->setHidden(true);
DvdButton *button = new DvdButton(m_view.play_text->text());
QFont font = m_view.font_family->currentFont();
font.setPixelSize(m_view.font_size->value());
- font.setStyleStrategy(QFont::NoAntialias);
+#if KDE_IS_VERSION(4,6,0)
+ if (m_view.use_shadow->isChecked()) {
+ QGraphicsDropShadowEffect *shadow = new QGraphicsDropShadowEffect(this);
+ shadow->setBlurRadius(7);
+ shadow->setOffset(4, 4);
+ button->setGraphicsEffect(shadow);
+ }
+#endif
+ //font.setStyleStrategy(QFont::NoAntialias);
button->setFont(font);
- button->setDefaultTextColor(m_view.text_color->color());
button->setZValue(4);
QRectF r = button->sceneBoundingRect();
m_scene->addItem(button);
+ updateColor(m_view.text_color->color());
button->setPos((m_width - r.width()) / 2, (m_height - r.height()) / 2);
button->setSelected(true);
}
{
m_isPal = isPal;
if (isPal == false) {
- m_width = 720;
+ m_finalSize = QSize(720, 480);
+ m_width = 640;
m_height = 480;
} else {
- m_width = 720;
+ m_finalSize = QSize(720, 576);
+ m_width = 768;
m_height = 576;
}
updatePreview();
button->setPlainText(m_view.play_text->text());
QFont font = m_view.font_family->currentFont();
font.setPixelSize(m_view.font_size->value());
- font.setStyleStrategy(QFont::NoAntialias);
+ //font.setStyleStrategy(QFont::NoAntialias);
button->setFont(font);
button->setDefaultTextColor(m_view.text_color->color());
}
m_view.menu_preview->viewport()->update();
}
+void DvdWizardMenu::prepareUnderLines()
+{
+ QList<QGraphicsItem *> list = m_scene->items();
+ for (int i = 0; i < list.count(); i++) {
+ if (list.at(i)->type() == QGraphicsItem::UserType + 1) {
+ QRectF r = list.at(i)->sceneBoundingRect();
+ int bottom = r.bottom() - 1;
+ if (bottom % 2 == 1) bottom = bottom - 1;
+ int underlineHeight = r.height() / 10;
+ if (underlineHeight % 2 == 1) underlineHeight = underlineHeight - 1;
+ underlineHeight = qMin(underlineHeight, 10);
+ underlineHeight = qMax(underlineHeight, 2);
+ r.setTop(bottom - underlineHeight);
+ r.adjust(2, 0, -2, 0);
+ QGraphicsRectItem *underline = new QGraphicsRectItem(r);
+ underline->setData(Qt::UserRole, QString("underline"));
+ m_scene->addItem(underline);
+ list.at(i)->setVisible(false);
+ }
+ }
+}
+
+void DvdWizardMenu::resetUnderLines()
+{
+ QList<QGraphicsItem *> list = m_scene->items();
+ QList<QGraphicsItem *> toDelete;
+ for (int i = 0; i < list.count(); i++) {
+ if (list.at(i)->data(Qt::UserRole).toString() == "underline") {
+ toDelete.append(list.at(i));
+ }
+ if (list.at(i)->type() == QGraphicsItem::UserType + 1) {
+ list.at(i)->setVisible(true);
+ }
+ }
+ while (!toDelete.isEmpty()) {
+ QGraphicsItem *item = toDelete.takeFirst();
+ delete item;
+ }
+}
+
+void DvdWizardMenu::updateUnderlineColor(QColor c)
+{
+ QList<QGraphicsItem *> list = m_scene->items();
+ for (int i = 0; i < list.count(); i++) {
+ if (list.at(i)->data(Qt::UserRole).toString() == "underline") {
+ QGraphicsRectItem *underline = static_cast < QGraphicsRectItem* >(list.at(i));
+ underline->setPen(Qt::NoPen);
+ c.setAlpha(150);
+ underline->setBrush(c);
+ }
+ }
+}
+
+
void DvdWizardMenu::updateColor(QColor c)
{
DvdButton *button = NULL;
if (m_safeRect->scene() != 0) m_scene->removeItem(m_safeRect);
if (m_color->scene() != 0) m_scene->removeItem(m_color);
if (m_background->scene() != 0) m_scene->removeItem(m_background);
+ prepareUnderLines();
#if QT_VERSION >= 0x040800
- QImage img(m_width, m_height, QImage::Format_ARGB32);
+ QImage img(m_finalSize.width(), m_finalSize.height(), QImage::Format_ARGB32);
img.fill(Qt::transparent);
- updateColor(m_view.text_color->color());
+ updateUnderlineColor(m_view.text_color->color());
#else
- QImage img(m_width, m_height, QImage::Format_Mono);
+ QImage img(m_finalSize.width(), m_finalSize.height(), QImage::Format_Mono);
img.fill(Qt::white);
- updateColor(Qt::black);
+ updateUnderlineColor(Qt::black);
#endif
QPainter p(&img);
- p.setRenderHints(QPainter::Antialiasing, false);
- p.setRenderHints(QPainter::TextAntialiasing, false);
- m_scene->render(&p, QRectF(0, 0, m_width, m_height));
+ //p.setRenderHints(QPainter::Antialiasing, false);
+ //p.setRenderHints(QPainter::TextAntialiasing, false);
+ m_scene->render(&p, QRectF(0, 0, m_finalSize.width(), m_finalSize.height()), QRectF(0, 0, m_width, m_height), Qt::IgnoreAspectRatio);
p.end();
#if QT_VERSION >= 0x040800
#elif QT_VERSION >= 0x040600
#if QT_VERSION >= 0x040800
img.fill(Qt::transparent);
- updateColor(m_view.highlighted_color->color());
+ updateUnderlineColor(m_view.highlighted_color->color());
#else
img.fill(Qt::white);
#endif
p.begin(&img);
- p.setRenderHints(QPainter::Antialiasing, false);
- p.setRenderHints(QPainter::TextAntialiasing, false);
- m_scene->render(&p, QRectF(0, 0, m_width, m_height));
+ //p.setRenderHints(QPainter::Antialiasing, false);
+ //p.setRenderHints(QPainter::TextAntialiasing, false);
+ m_scene->render(&p, QRectF(0, 0, m_finalSize.width(), m_finalSize.height()), QRectF(0, 0, m_width, m_height), Qt::IgnoreAspectRatio);
p.end();
#if QT_VERSION >= 0x040800
#elif QT_VERSION >= 0x040600
#if QT_VERSION >= 0x040800
img.fill(Qt::transparent);
- updateColor(m_view.selected_color->color());
+ updateUnderlineColor(m_view.selected_color->color());
#else
img.fill(Qt::white);
#endif
p.begin(&img);
- p.setRenderHints(QPainter::Antialiasing, false);
- p.setRenderHints(QPainter::TextAntialiasing, false);
- m_scene->render(&p, QRectF(0, 0, m_width, m_height));
+ //p.setRenderHints(QPainter::Antialiasing, false);
+ //p.setRenderHints(QPainter::TextAntialiasing, false);
+ m_scene->render(&p, QRectF(0, 0, m_finalSize.width(), m_finalSize.height()), QRectF(0, 0, m_width, m_height), Qt::IgnoreAspectRatio);
p.end();
#if QT_VERSION >= 0x040800
#elif QT_VERSION >= 0x040600
img.setNumColors(4);
#endif
img.save(img2);
- updateColor();
-
+ resetUnderLines();
m_scene->addItem(m_safeRect);
m_scene->addItem(m_color);
if (m_view.background_list->currentIndex() > 0) m_scene->addItem(m_background);
void DvdWizardMenu::createBackgroundImage(const QString &overlayMenu, const QString &img1)
{
- QImage img;
+ m_scene->clearSelection();
+ if (m_safeRect->scene() != 0) m_scene->removeItem(m_safeRect);
+ QImage img(m_width, m_height, QImage::Format_ARGB32);
+ updateColor(m_view.text_color->color());
+ QPainter p(&img);
+ p.setRenderHints(QPainter::Antialiasing, true);
+ p.setRenderHints(QPainter::TextAntialiasing, true);
+ m_scene->render(&p, QRectF(0, 0, img.width(), img.height()));
+ p.end();
+ img.save(img1);
+ m_scene->addItem(m_safeRect);
+ return;
+
+
+ /*QImage img;
if (m_view.background_list->currentIndex() == 0) {
// color background
if (m_isPal)
QRectF src(0, 0, menu.width(), menu.height());
p.drawImage(target, menu, src);
p.end();
- img.save(img1);
+ img.save(img1);*/
}
bool DvdWizardMenu::createMenu() const
{
QMap <QString, QRect> info;
QList<QGraphicsItem *> list = m_scene->items();
+ double ratio = (double) m_finalSize.width() / m_width;
for (int i = 0; i < list.count(); i++) {
if (list.at(i)->type() == QGraphicsItem::UserType + 1) {
DvdButton *button = static_cast < DvdButton* >(list.at(i));
- QRect r = list.at(i)->sceneBoundingRect().toRect();
- // Make sure y1 is not odd (requested by spumux)
- if (r.height() % 2 == 1) r.setHeight(r.height() + 1);
- if (r.y() % 2 == 1) r.setY(r.y() - 1);
+ QRectF r = button->sceneBoundingRect();
+ QRect adjustedRect(r.x() * ratio, r.y(), r.width() * ratio, r.height());
+ // Make sure y1 is not odd (requested by spumux)
+ if (adjustedRect.height() % 2 == 1) adjustedRect.setHeight(adjustedRect.height() + 1);
+ if (adjustedRect.y() % 2 == 1) adjustedRect.setY(adjustedRect.y() - 1);
QString command = button->command();
if (button->backMenu()) command.prepend("g1 = 999;");
- info.insertMulti(command, r);
+ info.insertMulti(command, adjustedRect);
}
}
return info;
xml.setAttribute("text_color", m_view.text_color->color().name());
xml.setAttribute("selected_color", m_view.selected_color->color().name());
xml.setAttribute("highlighted_color", m_view.highlighted_color->color().name());
+ xml.setAttribute("text_shadow", (int) m_view.use_shadow->isChecked());
QList<QGraphicsItem *> list = m_scene->items();
int buttonCount = 0;
m_view.selected_color->setColor(xml.attribute("selected_color"));
m_view.highlighted_color->setColor(xml.attribute("highlighted_color"));
+ m_view.use_shadow->setChecked(xml.attribute("text_shadow").toInt());
+
QDomNodeList buttons = xml.elementsByTagName("button");
kDebug() << "// LOADING MENU 2" << buttons.count();
DvdButton *button = new DvdButton(e.attribute("text"));
QFont font(e.attribute("font_family"));
font.setPixelSize(e.attribute("font_size").toInt());
- font.setStyleStrategy(QFont::NoAntialias);
+#if KDE_IS_VERSION(4,6,0)
+ if (m_view.use_shadow->isChecked()) {
+ QGraphicsDropShadowEffect *shadow = new QGraphicsDropShadowEffect(this);
+ shadow->setBlurRadius(7);
+ shadow->setOffset(4, 4);
+ button->setGraphicsEffect(shadow);
+ }
+#endif
+
+ //font.setStyleStrategy(QFont::NoAntialias);
button->setFont(font);
button->setTarget(e.attribute("target").toInt(), e.attribute("command"));
button->setBackMenu(e.attribute("backtomenu").toInt());
void changeProfile(bool isPal);
QDomElement toXml() const;
void loadXml(QDomElement xml);
+ void prepareUnderLines();
+ void resetUnderLines();
private:
Ui::DvdWizardMenu_UI m_view;
QGraphicsRectItem *m_safeRect;
int m_width;
int m_height;
+ QSize m_finalSize;
#if KDE_IS_VERSION(4,7,0)
KMessageWidget *m_menuMessage;
#endif
void deleteButton();
void updateColor();
void updateColor(QColor c);
+ void updateUnderlineColor(QColor c);
void setBackToMenu(bool backToMenu);
void slotZoom();
void slotUnZoom();
+ void slotEnableShadows(int enable);
};
#endif
}
connect (m_paramWidget, SIGNAL(parameterChanged(const QDomElement, const QDomElement, int)), this, SIGNAL(parameterChanged(const QDomElement, const QDomElement, int)));
- connect(m_paramWidget, SIGNAL(startFilterJob(QString,QString,QString,QString,QString,QStringList)), this, SIGNAL(startFilterJob(QString,QString,QString,QString,QString,QStringList)));
+ connect(m_paramWidget, SIGNAL(startFilterJob(QString,QString,QString,QString,const QMap <QString, QString>)), this, SIGNAL(startFilterJob(QString,QString,QString,QString,const QMap <QString, QString>)));
connect (this, SIGNAL(syncEffectsPos(int)), m_paramWidget, SIGNAL(syncEffectsPos(int)));
connect (m_paramWidget, SIGNAL(checkMonitorPosition(int)), this, SIGNAL(checkMonitorPosition(int)));
void checkMonitorPosition(int);
void seekTimeline(int);
/** @brief Start an MLT filter job on this clip. */
- void startFilterJob(QString filterName, QString filterParams, QString finalFilterName, QString consumer, QString consumerParams, QStringList extraParams);
+ void startFilterJob(QString filterName, QString filterParams, QString consumer, QString consumerParams, const QMap <QString, QString>extraParams);
/** @brief An effect was reset, trigger param reload. */
void resetEffect(int ix);
/** @brief Ask for creation of a group. */
// Check drag & drop
currentEffect->installEventFilter( this );
connect(currentEffect, SIGNAL(parameterChanged(const QDomElement, const QDomElement, int)), this , SLOT(slotUpdateEffectParams(const QDomElement, const QDomElement, int)));
- connect(currentEffect, SIGNAL(startFilterJob(QString,QString,QString,QString,QString,QStringList)), this , SLOT(slotStartFilterJob(QString,QString,QString,QString,QString,QStringList)));
+ connect(currentEffect, SIGNAL(startFilterJob(QString,QString,QString,QString,const QMap <QString, QString>)), this , SLOT(slotStartFilterJob(QString,QString,QString,QString,const QMap <QString, QString>)));
connect(currentEffect, SIGNAL(deleteEffect(const QDomElement)), this , SLOT(slotDeleteEffect(const QDomElement)));
connect(currentEffect, SIGNAL(reloadEffects()), this , SIGNAL(reloadEffects()));
connect(currentEffect, SIGNAL(resetEffect(int)), this , SLOT(slotResetEffect(int)));
else emit changeEffectPosition(m_clipref, -1, indexes, endPos);
}
-void EffectStackView2::slotStartFilterJob(const QString&filterName, const QString&filterParams, const QString&finalFilterName, const QString&consumer, const QString&consumerParams, const QStringList &extraParams)
+void EffectStackView2::slotStartFilterJob(const QString&filterName, const QString&filterParams, const QString&consumer, const QString&consumerParams, const QMap <QString, QString> &extraParams)
{
if (!m_clipref) return;
- emit startFilterJob(m_clipref->info(), m_clipref->clipProducer(), filterName, filterParams, finalFilterName, consumer, consumerParams, extraParams);
+ emit startFilterJob(m_clipref->info(), m_clipref->clipProducer(), filterName, filterParams, consumer, consumerParams, extraParams);
}
void EffectStackView2::slotResetEffect(int ix)
void slotSetCurrentEffect(int ix);
/** @brief Triggers a filter job on this clip. */
- void slotStartFilterJob(const QString&filterName, const QString&filterParams, const QString&finalFilterName, const QString&consumer, const QString&consumerParams, const QStringList &extraParams);
+ void slotStartFilterJob(const QString&filterName, const QString&filterParams, const QString&consumer, const QString&consumerParams, const QMap <QString, QString> &extraParams);
/** @brief Reset an effect to its default values. */
void slotResetEffect(int ix);
void updateClipRegion(ClipItem*, int, QString);
void displayMessage(const QString&, int);
void showComments(bool show);
- void startFilterJob(ItemInfo info, const QString &clipId, const QString &filterName, const QString &filterParams, const QString&finalFilterName, const QString &consumer, const QString &consumerParams, const QStringList &extraParams);
+ void startFilterJob(ItemInfo info, const QString &clipId, const QString &filterName, const QString &filterParams, const QString &consumer, const QString &consumerParams, const QMap<QString, QString> &extraParams);
void addEffect(ClipItem*,QDomElement);
void importClipKeyframes(GRAPHICSRECTITEM = AVWIDGET);
};
paramData.append(parameters.at(j).name()+"="+parameters.at(j).value()+" ");
filterparams.replace("%params", paramData);
}
- QStringList extra = pa.attribute("extraparams").split(' ', QString::SkipEmptyParts);
- emit startFilterJob(pa.attribute("filtertag"), filterparams, pa.attribute("finalfilter"), pa.attribute("consumer"), pa.attribute("consumerparams"), extra);
+ QMap <QString, QString> extraParams;
+ QDomNodeList jobparams = pa.elementsByTagName("jobparam");
+ for (int j = 0; j < jobparams.count(); j++) {
+ QDomElement e = jobparams.item(j).toElement();
+ extraParams.insert(e.attribute("name"), e.text().toUtf8());
+ }
+ emit startFilterJob(pa.attribute("filtertag"), filterparams, pa.attribute("consumer"), pa.attribute("consumerparams"), extraParams);
kDebug()<<" - - -PROPS:\n"<<pa.attribute("filtertag")<<"-"<< filterparams<<"-"<< pa.attribute("consumer")<<"-"<< pa.attribute("consumerparams")<<"-"<< pa.attribute("extraparams");
break;
}
void seekTimeline(int);
void showComments(bool);
/** @brief Start an MLT filter job on this clip. */
- void startFilterJob(QString filterName, QString filterParams, QString finalFilterName, QString consumer, QString consumerParams, QStringList extra);
+ void startFilterJob(QString filterName, QString filterParams, QString consumer, QString consumerParams, const QMap <QString, QString>extra);
/** @brief Request import of keyframes from clip data. */
void importClipKeyframes();
};
if (m_producer) m_clipManager->stopThumbs(m_id);
m_intraFramesQueue.clear();
m_intra.waitForFinished();
- m_mutex.lock();
+ QMutexLocker lock(&m_mutex);
m_producer = producer;
// FIXME: the profile() call leaks an object, but trying to free
// it leads to a double-free in Profile::~Profile()
m_dar = profile->dar();
m_ratio = (double) profile->width() / profile->height();
}
- m_mutex.unlock();
}
void KThumb::clearProducer()
const int theight = KdenliveSettings::trackheight();
const int swidth = (int)(theight * m_ratio + 0.5);
const int dwidth = (int)(theight * m_dar + 0.5);
-
QImage img = getProducerFrame(frame, swidth, dwidth, theight);
emit thumbReady(frame, img);
}
+void KThumb::getGenericThumb(int frame, int height, int type)
+{
+ const int swidth = (int)(height * m_ratio + 0.5);
+ const int dwidth = (int)(height * m_dar + 0.5);
+ QImage img = getProducerFrame(frame, swidth, dwidth, height);
+ m_clipManager->projectTreeThumbReady(m_id, frame, img, type);
+}
+
QImage KThumb::extractImage(int frame, int width, int height)
{
if (m_producer == NULL) {
Mlt::Profile profile(KdenliveSettings::current_profile().toUtf8().constData());
QPixmap pix(width, height);
if (url.isEmpty()) return pix;
-
- //"<mlt><playlist><producer resource=\"" + url.path() + "\" /></playlist></mlt>");
- //Mlt::Producer producer(profile, "xml-string", tmp);
Mlt::Producer *producer = new Mlt::Producer(profile, url.path().toUtf8().constData());
double swidth = (double) profile.width() / profile.height();
pix = QPixmap::fromImage(getFrame(producer, frame, (int) (height * swidth + 0.5), width, height));
p.fill(QColor(Qt::black).rgb());
return p;
}
- m_mutex.lock();
+ QMutexLocker lock(&m_mutex);
m_producer->seek(framepos);
Mlt::Frame *frame = m_producer->get_frame();
+ frame->set("rescale.interp", "nearest");
+ frame->set("deinterlace_method", "onefield");
+ frame->set("top_field_first", -1 );
QImage p = getFrame(frame, frameWidth, displayWidth, height);
delete frame;
- m_mutex.unlock();
return p;
}
producer->seek(framepos);
Mlt::Frame *frame = producer->get_frame();
+ frame->set("rescale.interp", "nearest");
+ frame->set("deinterlace_method", "onefield");
+ frame->set("top_field_first", -1 );
QImage p = getFrame(frame, frameWidth, displayWidth, height);
delete frame;
return p;
p.fill(QColor(Qt::red).rgb());
return p;
}
-
+
int ow = frameWidth;
int oh = height;
mlt_image_format format = mlt_image_rgb24a;
- frame->set("rescale.interp", "nearest");
- frame->set("deinterlace_method", "onefield");
- frame->set("top_field_first", -1 );
//frame->set("progressive", "1");
if (ow % 2 == 1) ow++;
- const uchar* imagedata = frame->get_image(format, ow, oh);
QImage image(ow, oh, QImage::Format_ARGB32_Premultiplied);
+ const uchar* imagedata = frame->get_image(format, ow, oh);
memcpy(image.bits(), imagedata, ow * oh * 4);//.byteCount());
//const uchar* imagedata = frame->get_image(format, ow, oh);
QImage findCachedThumb(const QString &path);
#endif
void getThumb(int frame);
+ void getGenericThumb(int frame, int height, int type);
public slots:
void updateClipUrl(KUrl url, const QString &hash);
m_effectStack = new EffectStackView2(m_projectMonitor);
m_effectStackDock->setWidget(m_effectStack);
addDockWidget(Qt::TopDockWidgetArea, m_effectStackDock);
- connect(m_effectStack, SIGNAL(startFilterJob(ItemInfo, const QString&,const QString&,const QString&,const QString&,const QString&,const QString&,const QStringList&)), m_projectList, SLOT(slotStartFilterJob(ItemInfo, const QString&,const QString&,const QString&,const QString&,const QString&,const QString&,const QStringList&)));
+ connect(m_effectStack, SIGNAL(startFilterJob(ItemInfo, const QString&,const QString&,const QString&,const QString&,const QString&,const QMap <QString, QString>&)), m_projectList, SLOT(slotStartFilterJob(ItemInfo, const QString&,const QString&,const QString&,const QString&,const QString&,const QMap <QString, QString>&)));
m_transitionConfigDock = new QDockWidget(i18n("Transition"), this);
m_transitionConfigDock->setObjectName("transition");
break;
}
}
+ slotTimelineClipSelected(NULL, false);
m_clipMonitor->slotSetClipProducer(NULL);
m_projectList->slotResetProjectList();
m_timelineArea->removeTab(m_timelineArea->indexOf(w));
disconnect(m_activeTimeline->projectView(), SIGNAL(playMonitor()), m_projectMonitor, SLOT(slotPlay()));
disconnect(m_activeTimeline->projectView(), SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType)));
disconnect(m_activeTimeline->projectView(), SIGNAL(showClipFrame(DocClipBase *, QPoint, bool, const int)), m_clipMonitor, SLOT(slotSetClipProducer(DocClipBase *, QPoint, bool, const int)));
- disconnect(m_projectList, SIGNAL(gotFilterJobResults(const QString &, int, int, const QString &, stringMap,QStringList)), m_activeTimeline->projectView(), SLOT(slotGotFilterJobResults(const QString &, int, int, const QString &, stringMap,QStringList)));
+ disconnect(m_projectList, SIGNAL(gotFilterJobResults(const QString &, int, int, stringMap,stringMap)), m_activeTimeline->projectView(), SLOT(slotGotFilterJobResults(const QString &, int, int, stringMap, stringMap)));
disconnect(m_activeTimeline, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(slotActivateMonitor()));
disconnect(m_activeTimeline, SIGNAL(configTrack(int)), this, SLOT(slotConfigTrack(int)));
connect(trackView->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_projectMonitor, SLOT(slotSetSelectedClip(Transition*)));
- connect(m_projectList, SIGNAL(gotFilterJobResults(const QString &, int, int, const QString &, stringMap,QStringList)), trackView->projectView(), SLOT(slotGotFilterJobResults(const QString &, int, int, const QString &, stringMap,QStringList)));
+ connect(m_projectList, SIGNAL(gotFilterJobResults(const QString &, int, int, stringMap,stringMap)), trackView->projectView(), SLOT(slotGotFilterJobResults(const QString &, int, int, stringMap,stringMap)));
connect(m_projectList, SIGNAL(addMarkers(const QString &, QList <CommentedTime>)), trackView->projectView(), SLOT(slotAddClipMarker(const QString &, QList <CommentedTime>)));
// any type of clip but a title
ClipProperties *dia = new ClipProperties(clip, m_activeDocument->timecode(), m_activeDocument->fps(), this);
+
+ if (clip->clipType() == AV || clip->clipType() == VIDEO || clip->clipType() == PLAYLIST) {
+ // request clip thumbnails
+ m_activeDocument->clipManager()->requestThumbs(QString('?' + clip->getId()), QList<int>() << clip->getClipThumbFrame());
+ connect(m_activeDocument->clipManager(), SIGNAL(gotClipPropertyThumbnail(const QString&,QImage)), dia, SLOT(slotGotThumbnail(const QString&,QImage)));
+ }
+
connect(dia, SIGNAL(addMarkers(const QString &, QList <CommentedTime>)), m_activeTimeline->projectView(), SLOT(slotAddClipMarker(const QString &, QList <CommentedTime>)));
connect(dia, SIGNAL(deleteAnalysis(QString,QString)), m_activeTimeline->projectView(), SLOT(slotAddClipExtraData(QString,QString)));
connect(m_activeTimeline->projectView(), SIGNAL(updateClipMarkers(DocClipBase *)), dia, SLOT(slotFillMarkersList(DocClipBase *)));
{
if (render == NULL) return;
if (clip == NULL && m_currentClip != NULL) {
+ m_currentClip->lastSeekPosition = render->seekFramePosition();
kDebug()<<"// SETTING NULL CLIP MONITOR";
m_currentClip = NULL;
m_length = -1;
}
if (clip != m_currentClip || forceUpdate) {
+ if (m_currentClip) m_currentClip->lastSeekPosition = render->seekFramePosition();
m_currentClip = clip;
+ if (position == -1) position = clip->lastSeekPosition;
if (m_currentClip) slotActivateMonitor();
updateMarkers(clip);
Mlt::Producer *prod = NULL;
QList <CutZoneInfo> cuts = clip->cutZones();
if (!cuts.isEmpty()) {
for (int i = 0; i < cuts.count(); i++) {
- SubProjectItem *sub = new SubProjectItem(item, cuts.at(i).zone.x(), cuts.at(i).zone.y(), cuts.at(i).description);
+ SubProjectItem *sub = new SubProjectItem(m_render->dar(), item, cuts.at(i).zone.x(), cuts.at(i).zone.y(), cuts.at(i).description);
if (!clip->getClipHash().isEmpty()) {
QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + '#' + QString::number(cuts.at(i).zone.x()) + ".png";
if (QFile::exists(cachedPixmap)) {
connect(m_doc->clipManager(), SIGNAL(missingClip(const QString &)), this, SLOT(slotMissingClip(const QString &)));
connect(m_doc->clipManager(), SIGNAL(availableClip(const QString &)), this, SLOT(slotAvailableClip(const QString &)));
connect(m_doc->clipManager(), SIGNAL(checkAllClips(bool, bool, QStringList)), this, SLOT(updateAllClips(bool, bool, QStringList)));
+ connect(m_doc->clipManager(), SIGNAL(thumbReady(const QString &, int, QImage)), this, SLOT(slotSetThumbnail(const QString &, int, QImage)));
+}
+
+void ProjectList::slotSetThumbnail(const QString &id, int framePos, QImage img)
+{
+ QString fullid = id + '#' + QString::number(framePos);
+ ProjectItem *pItem = NULL;
+ QTreeWidgetItem *item = getAnyItemById(fullid);
+ if (item && item->parent()) pItem = static_cast <ProjectItem *>(item->parent());
+ if (!item && framePos == 0) pItem = getItemById(id);
+ if (!item && !pItem) return;
+ if (item) item->setData(0, Qt::DecorationRole, QPixmap::fromImage(img));
+ else if (pItem) pItem->setData(0, Qt::DecorationRole, QPixmap::fromImage(img));
+ if (pItem) {
+ QString hash = pItem->getClipHash();
+ if (!hash.isEmpty()) m_doc->cacheImage(hash + '#' + QString::number(framePos), img);
+ }
}
QList <DocClipBase*> ProjectList::documentClipList() const
DocClipBase *base = clip->referencedClip();
base->addCutZone(in, out);
monitorItemEditing(false);
- SubProjectItem *sub = new SubProjectItem(clip, in, out, desc);
+ SubProjectItem *sub = new SubProjectItem(m_render->dar(), clip, in, out, desc);
if (newItem && desc.isEmpty() && !m_listView->isColumnHidden(1)) {
if (!clip->isExpanded())
clip->setExpanded(true);
m_listView->scrollToItem(sub);
m_listView->editItem(sub, 1);
}
- QImage img = clip->referencedClip()->extractImage(in, (int)(sub->sizeHint(0).height() * m_render->dar()), sub->sizeHint(0).height() - 2);
- sub->setData(0, Qt::DecorationRole, QPixmap::fromImage(img));
- QString hash = clip->getClipHash();
- if (!hash.isEmpty()) m_doc->cacheImage(hash + '#' + QString::number(in), img);
+ m_doc->clipManager()->requestThumbs(QString('#' + id), QList <int>() << in);
monitorItemEditing(true);
}
emit projectModified();
MeltJob *jb = static_cast<MeltJob *> (job);
jb->setProducer(currentClip->getProducer(), currentClip->fileURL());
if (jb->isProjectFilter())
- connect(job, SIGNAL(gotFilterJobResults(QString,int, int, QString,stringMap,QStringList)), this, SLOT(slotGotFilterJobResults(QString,int, int, QString,stringMap,QStringList)));
+ connect(job, SIGNAL(gotFilterJobResults(QString,int, int, stringMap,stringMap)), this, SLOT(slotGotFilterJobResults(QString,int, int,stringMap,stringMap)));
else
- connect(job, SIGNAL(gotFilterJobResults(QString,int, int, QString,stringMap,QStringList)), this, SIGNAL(gotFilterJobResults(QString,int, int, QString,stringMap,QStringList)));
+ connect(job, SIGNAL(gotFilterJobResults(QString,int, int, stringMap,stringMap)), this, SIGNAL(gotFilterJobResults(QString,int, int,stringMap,stringMap)));
}
job->startJob();
if (job->jobStatus == JOBDONE) {
}
}
-void ProjectList::slotStartFilterJob(ItemInfo info, const QString&id, const QString&filterName, const QString&filterParams, const QString&finalFilterName, const QString&consumer, const QString&consumerParams, const QStringList &extraParams)
+void ProjectList::slotStartFilterJob(ItemInfo info, const QString&id, const QString&filterName, const QString&filterParams, const QString&consumer, const QString&consumerParams, const QMap <QString, QString> &extraParams)
{
ProjectItem *item = getItemById(id);
if (!item) return;
QStringList jobParams;
jobParams << QString::number(info.cropStart.frames(m_fps)) << QString::number((info.cropStart + info.cropDuration).frames(m_fps));
- jobParams << QString() << filterName << filterParams << consumer << consumerParams << QString::number(info.startPos.frames(m_fps)) << QString::number(info.track) << finalFilterName;
+ jobParams << QString() << filterName << filterParams << consumer << consumerParams << QString::number(info.startPos.frames(m_fps)) << QString::number(info.track);
MeltJob *job = new MeltJob(item->clipType(), id, jobParams, extraParams);
if (job->isExclusive() && hasPendingJob(item, job->jobType)) {
delete job;
return;
}
- job->description = i18n("Filter %1", finalFilterName);
+ job->description = i18n("Filter %1", extraParams.value("finalfilter"));
m_jobList.append(job);
setJobStatus(item, job->jobType, JOBWAITING, 0, job->statusMessage());
slotCheckJobProcess();
jobParams << filterName << "bounding=\"25%x25%:25%x25\" shot_change_list=0";
// Consumer
jobParams << "null" << "all=1 terminate_on_pause=1 real_time=-1";
- QStringList extraParams;
- extraParams << "key:shot_change_list";
- extraParams << "projecttreefilter";
+ QMap <QString, QString> extraParams;
+ extraParams.insert("key", "shot_change_list");
+ extraParams.insert("projecttreefilter", "1");
if (ui.add_markers->isChecked()) {
// We want to create markers
- extraParams << QString("addmarkers:%1").arg(ui.marker_type->currentIndex());
+ extraParams.insert("addmarkers", QString::number(ui.marker_type->currentIndex()));
}
if (ui.cut_scenes->isChecked()) {
// We want to cut scenes
- extraParams << "cutscenes";
+ extraParams.insert("cutscenes", "1");
}
delete d;
processClipJob(ids, QString(), false, jobParams, i18n("Auto split"), extraParams);
else {
QPointer<ClipStabilize> d = new ClipStabilize(destination, ids.count(), filterName);
if (d->exec() == QDialog::Accepted) {
- QStringList extraParams;
- extraParams << "producer_profile";
+ QMap <QString, QString> extraParams;
+ extraParams.insert("producer_profile", "1");
processClipJob(ids, d->destination(), d->autoAddClip(), d->params(), d->desc(), extraParams);
}
delete d;
}
}
-void ProjectList::processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description, QStringList extraParams)
+void ProjectList::processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description, QMap <QString, QString> extraParams)
{
QStringList preParams;
// in and out
m_errorLog.clear();
}
-void ProjectList::slotGotFilterJobResults(QString id, int , int , QString filter, stringMap results, QStringList extra)
+void ProjectList::slotGotFilterJobResults(QString id, int , int , stringMap results, stringMap filterInfo)
{
+ // Currently, only the first value of results is used
+ kDebug()<<"// FILTER RES:\n"<<filterInfo<<"\n--------------\n"<<results;
ProjectItem *clip = getItemById(id);
if (!clip) return;
// Check for return value
- QString returnKey;
int markersType = -1;
- for (int i = 0; i < extra.count(); i++) {
- if (extra.at(i).startsWith("key:"))
- returnKey = extra.at(i).section(':', 1);
- if (extra.at(i).startsWith("addmarkers:")) {
- markersType = extra.at(i).section(':', 1).toInt();
- }
- }
- if (returnKey.isEmpty()) {
- emit displayMessage(i18n("No data returned from clip analysis"), ErrorMessage);
- return;
- }
- QStringList returnData = results.value(returnKey).split(';', QString::SkipEmptyParts);
- if (returnData.isEmpty()) {
+ if (filterInfo.contains("addmarkers")) markersType = filterInfo.value("addmarkers").toInt();
+ if (results.isEmpty()) {
emit displayMessage(i18n("No data returned from clip analysis"), ErrorMessage);
return;
}
emit displayMessage(i18n("Processing data analysis"), InformationMessage);
bool dataProcessed = false;
- if (extra.contains("cutscenes")) {
+ QString key = filterInfo.value("key");
+ QStringList value = results.value(key).split(';', QString::SkipEmptyParts);
+ kDebug()<<"// RESULT; "<<key<<" = "<<value;
+ if (filterInfo.contains("cutscenes")) {
// Check if we want to cut scenes from returned data
dataProcessed = true;
int cutPos = 0;
QUndoCommand *command = new QUndoCommand();
command->setText(i18n("Auto Split Clip"));
- foreach (QString pos, returnData) {
+ foreach (QString pos, value) {
if (!pos.contains("=")) continue;
int newPos = pos.section("=", 0, 0).toInt();
// Don't use scenes shorter than 1 second
command->setText(i18n("Add Markers"));
QList <CommentedTime> markersList;
int index = 1;
- foreach (QString pos, returnData) {
+ foreach (QString pos, value) {
if (!pos.contains("=")) continue;
int newPos = pos.section("=", 0, 0).toInt();
// Don't use scenes shorter than 1 second
}
emit addMarkers(id, markersList);
}
- if (!dataProcessed || extra.contains("storedata")) {
+ if (!dataProcessed || filterInfo.contains("storedata")) {
// Store returned data as clip extra data
-
- clip->referencedClip()->setAnalysisData(i18n("Motion vectors"), results.value(returnKey));
+ clip->referencedClip()->setAnalysisData(filterInfo.contains("displaydataname") ? filterInfo.value("displaydataname") : key, results.value(key));
emit updateAnalysisData(clip->referencedClip());
}
}
+
#include "projectlist.moc"
/** @brief Start transcoding selected clips. */
void slotTranscodeClipJob(const QString &condition, QString params, QString desc);
/** @brief Start an MLT process job. */
- void slotStartFilterJob(ItemInfo, const QString&,const QString&,const QString&,const QString&,const QString&,const QString&,const QStringList&);
+ void slotStartFilterJob(ItemInfo, const QString&,const QString&,const QString&,const QString&,const QString&,const QMap <QString, QString>&);
+ void slotSetThumbnail(const QString &id, int framePos, QImage img);
private:
/** @brief Get the list of job names for current clip. */
QStringList getPendingJobs(const QString &id);
/** @brief Start an MLT process job. */
- void processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description, QStringList extraParams = QStringList());
+ void processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description, QMap <QString, QString>extraParams = QMap <QString, QString>());
private slots:
void slotClipSelected();
/** @brief close warning info passive popup. */
void slotClosePopup();
/** @brief process clip job result. */
- void slotGotFilterJobResults(QString ,int , int, QString, stringMap, QStringList);
+ void slotGotFilterJobResults(QString ,int , int, stringMap, stringMap);
signals:
void clipSelected(DocClipBase *, QPoint zone = QPoint(), bool forceUpdate = false);
void gotProxy(const QString);
void checkJobProcess();
/** @brief A Filter Job produced results, send them back to the clip. */
- void gotFilterJobResults(const QString &id, int startPos, int track, const QString &filterName, stringMap params, QStringList extre);
+ void gotFilterJobResults(const QString &id, int startPos, int track, stringMap params, stringMap extra);
void pauseMonitor();
void updateAnalysisData(DocClipBase *);
void addMarkers(const QString &, QList <CommentedTime>);
self->emitFrameNumber();
}
-MeltJob::MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters, QStringList extraParams) : AbstractClipJob(MLTJOB, cType, id, parameters),
+MeltJob::MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters, QMap <QString, QString>extraParams) : AbstractClipJob(MLTJOB, cType, id, parameters),
addClipToProject(0),
m_producer(NULL),
m_profile(NULL),
if (!m_params.isEmpty()) startPos = m_params.takeFirst().toInt();
int track = -1;
if (!m_params.isEmpty()) track = m_params.takeFirst().toInt();
- QString finalFilter;
- if (!m_params.isEmpty()) finalFilter = m_params.takeFirst();
- else finalFilter = filter;
-
- // Check if we want to return analysis data
- QString properties;
- for (int i = 0; i < m_extra.count(); i++) {
- if (m_extra.at(i).startsWith("key:")) {
- properties = m_extra.at(i).section(':', 1);
- break;
- }
- }
-
+ if (!m_extra.contains("finalfilter")) m_extra.insert("finalfilter", filter);
if (out != -1 && out <= in) {
m_errorMessage.append(i18n("Clip zone undefined (%1 - %2).", in, out));
prod = tmp->cut(in, out);
delete tmp;
}
- if (m_extra.contains("prducer_profile")) {
+ if (m_extra.contains("producer_profile")) {
m_profile->from_producer(*prod);
m_profile->set_explicit(true);
}
}
m_consumer->stop();
- QStringList wanted = properties.split(',', QString::SkipEmptyParts);
- stringMap jobResults;
- foreach(const QString &key, wanted) {
- QString value = mltFilter.get(key.toUtf8().constData());
- jobResults.insert(key, value);
- }
- if (!jobResults.isEmpty() && jobStatus != JOBABORTED) emit gotFilterJobResults(m_clipId, startPos, track, finalFilter, jobResults, m_extra);
+ QMap <QString, QString> jobResults;
+ if (m_extra.contains("key"))
+ jobResults.insert(m_extra.value("key"), mltFilter.get(m_extra.value("key").toUtf8().constData()));
+ if (!jobResults.isEmpty() && jobStatus != JOBABORTED) emit gotFilterJobResults(m_clipId, startPos, track, jobResults, m_extra);
setStatus(JOBDONE);
delete m_consumer;
delete prod;
Q_OBJECT
public:
- MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters, QStringList extraParams = QStringList());
+ MeltJob(CLIPTYPE cType, const QString &id, QStringList parameters, QMap <QString, QString> extraParams = QMap <QString, QString>());
virtual ~ MeltJob();
const QString destination() const;
void startJob();
QString m_dest;
QString m_url;
int m_length;
- QStringList m_extra;
+ QMap <QString, QString> m_extra;
signals:
- void gotFilterJobResults(const QString &id, int startPos, int track, const QString &filterName, stringMap params, QStringList extraParam);
+ void gotFilterJobResults(const QString &id, int startPos, int track, stringMap result, stringMap extra);
};
#endif
render_process_args << "consumer:" + (scriptExport ? "$SOURCE" : playlistPath);
else
render_process_args << (scriptExport ? "$SOURCE" : playlistPath);
+
render_process_args << (scriptExport ? "$TARGET" : KUrl(dest).url());
render_process_args << paramsList;
,m_manager(manager)
,m_render(render)
,m_lastSeekPosition(SEEK_INACTIVE)
+ ,m_cursorColor(palette().text())
{
m_zoneStart = 10;
m_zoneEnd = 60;
}
}
+// virtual
+void SmallRuler::leaveEvent(QEvent * event)
+{
+ QWidget::leaveEvent(event);
+ if (m_cursorColor == palette().highlight()) {
+ m_cursorColor = palette().text();
+ update();
+ }
+}
// virtual
void SmallRuler::mouseMoveEvent(QMouseEvent * event)
{
+ QWidget::mouseMoveEvent(event);
const int pos = event->x() / m_scale;
if (event->buttons() & Qt::LeftButton) {
m_render->seekToFrame(pos);
update();
}
else {
+ if (m_cursorColor == palette().text() && qAbs(pos - m_cursorFramePosition) * m_scale < 7) {
+ // Mouse is over cursor
+ m_cursorColor = palette().highlight();
+ update();
+ }
+ else if (m_cursorColor == palette().highlight() && qAbs(pos - m_cursorFramePosition) * m_scale >= 7) {
+ m_cursorColor = palette().text();
+ update();
+ }
if (qAbs((pos - m_zoneStart) * m_scale) < 4) {
setToolTip(i18n("Zone start: %1", m_manager->timecode().getTimecodeFromFrames(m_zoneStart)));
} else if (qAbs((pos - m_zoneEnd) * m_scale) < 4) {
// draw pointer
QPolygon pa(3);
pa.setPoints(3, cursorPos - 6, 10, cursorPos + 6, 10, cursorPos/*+0*/, 4);
- p.setBrush(palette().text());
+ p.setBrush(m_cursorColor);
p.setPen(Qt::NoPen);
p.drawPolygon(pa);
protected:
virtual void paintEvent(QPaintEvent *e);
virtual void resizeEvent(QResizeEvent *);
+ virtual void leaveEvent(QEvent * event);
private:
int m_cursorPosition;
MonitorManager *m_manager;
Render *m_render;
int m_lastSeekPosition;
+ QBrush m_cursorColor;
void updatePixmap();
public slots:
#include "kdenlivesettings.h"
#include "docclipbase.h"
+
#include <KDebug>
#include <KLocale>
#include <KIcon>
const int DurationRole = Qt::UserRole + 1;
+const int itemHeight = 30;
-SubProjectItem::SubProjectItem(QTreeWidgetItem * parent, int in, int out, QString description) :
+SubProjectItem::SubProjectItem(double display_ratio, QTreeWidgetItem * parent, int in, int out, QString description) :
QTreeWidgetItem(parent, PROJECTSUBCLIPTYPE), m_in(in), m_out(out), m_description(description)
{
- setSizeHint(0, QSize(65, 30));
+ setSizeHint(0, QSize((int) (itemHeight * display_ratio) + 2, itemHeight + 2));
setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled);
QString name = Timecode::getStringTimecode(in, KdenliveSettings::project_fps());
setText(0, name);
setText(1, description);
GenTime duration = GenTime(out - in, KdenliveSettings::project_fps());
if (duration != GenTime()) setData(0, DurationRole, Timecode::getEasyTimecode(duration, KdenliveSettings::project_fps()));
+ QPixmap pix((int) (itemHeight * display_ratio), itemHeight);
+ pix.fill(Qt::gray);
+ setData(0, Qt::DecorationRole, pix);
//setFlags(Qt::NoItemFlags);
//kDebug() << "Constructed with clipId: " << m_clipId;
}
return 0;
}
+//static
+int SubProjectItem::itemDefaultHeight()
+{
+ return itemHeight;
+}
+
QDomElement SubProjectItem::toXml() const
{
//return m_clip->toXML();
class SubProjectItem : public QTreeWidgetItem
{
public:
- SubProjectItem(QTreeWidgetItem * parent, int in, int out, QString description = QString());
+ SubProjectItem(double display_ratio, QTreeWidgetItem * parent, int in, int out, QString description = QString());
virtual ~SubProjectItem();
QDomElement toXml() const;
int numReferences() const;
void setZone(QPoint p);
QString description() const;
void setDescription(QString desc);
+ static int itemDefaultHeight();
/** Make sure folders appear on top of the tree widget */
virtual bool operator<(const QTreeWidgetItem &other)const {
/***************************************************************************
- effecstackedit.h - description
+ effecstackedit.cpp - description
-------------------
begin : Mar 15 2008
copyright : (C) 2008 by Marco Gittler
QDomElement e = m_usedTransition->toXML().cloneNode().toElement();
if (reinit) {
// Reset the transition parameters to the default one
+ disconnect(m_effectEdit->monitor(), SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int)));
QDomElement newTransition = MainWindow::transitions.getEffectByName(transitionList->currentText()).cloneNode().toElement();
slotUpdateEffectParams(e, newTransition);
m_effectEdit->transferParamDesc(newTransition, m_usedTransition->info(), false);
+ if (m_effectEdit->needsMonitorEffectScene())
+ connect(m_effectEdit->monitor(), SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int)));
} else if (!updateCurrent) {
// Transition changed, update parameters dialog
//slotUpdateEffectParams(e, e);
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="4">
<widget class="QLabel" name="clip_thumb">
- <property name="text">
- <string>Image preview</string>
- </property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<rect>
<x>0</x>
<y>0</y>
- <width>335</width>
- <height>371</height>
+ <width>439</width>
+ <height>368</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_5">
</property>
</widget>
</item>
- <item row="0" column="1" colspan="2">
+ <item row="0" column="1">
<widget class="KLineEdit" name="play_text"/>
</item>
- <item row="0" column="3">
+ <item row="0" column="2">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Target</string>
</property>
</widget>
</item>
- <item row="0" column="4">
+ <item row="0" column="3">
<widget class="KComboBox" name="target_list">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
</property>
</widget>
</item>
+ <item row="0" column="4" colspan="3">
+ <widget class="QCheckBox" name="back_to_menu">
+ <property name="text">
+ <string>Back to menu</string>
+ </property>
+ </widget>
+ </item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
</property>
</widget>
</item>
- <item row="1" column="2" colspan="4">
+ <item row="1" column="2" colspan="3">
<widget class="QFontComboBox" name="font_family"/>
</item>
- <item row="2" column="0" colspan="2">
- <widget class="QLabel" name="label_5">
+ <item row="1" column="5">
+ <widget class="KColorButton" name="text_color">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="color">
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="6">
+ <widget class="QCheckBox" name="use_shadow">
<property name="text">
- <string>Button colors</string>
+ <string>Shadow</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
</property>
</widget>
</item>
- <item row="2" column="2" colspan="4">
+ <item row="2" column="0" colspan="7">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="KColorButton" name="text_color">
+ <widget class="QLabel" name="label_2">
<property name="text">
- <string/>
+ <string>Underline</string>
</property>
+ </widget>
+ </item>
+ <item>
+ <widget class="KColorButton" name="highlighted_color">
<property name="color">
<color>
<red>255</red>
- <green>255</green>
- <blue>255</blue>
+ <green>85</green>
+ <blue>0</blue>
</color>
</property>
</widget>
</widget>
</item>
<item>
- <widget class="KColorButton" name="highlighted_color">
- <property name="color">
- <color>
- <red>255</red>
- <green>85</green>
- <blue>0</blue>
- </color>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- </widget>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
</item>
</layout>
</item>
- <item row="0" column="5">
- <widget class="QCheckBox" name="back_to_menu">
- <property name="text">
- <string>Back to menu</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
</widget>
<customwidgets>
<customwidget>
- <class>KIntSpinBox</class>
- <extends>QSpinBox</extends>
- <header>knuminput.h</header>
+ <class>KColorButton</class>
+ <extends>QPushButton</extends>
+ <header>kcolorbutton.h</header>
</customwidget>
<customwidget>
- <class>KUrlRequester</class>
- <extends>QFrame</extends>
- <header>kurlrequester.h</header>
+ <class>KComboBox</class>
+ <extends>QComboBox</extends>
+ <header>kcombobox.h</header>
</customwidget>
<customwidget>
<class>KLineEdit</class>
<header>klineedit.h</header>
</customwidget>
<customwidget>
- <class>KComboBox</class>
- <extends>QComboBox</extends>
- <header>kcombobox.h</header>
+ <class>KIntSpinBox</class>
+ <extends>QSpinBox</extends>
+ <header>knuminput.h</header>
</customwidget>
<customwidget>
- <class>KColorButton</class>
- <extends>QPushButton</extends>
- <header>kcolorbutton.h</header>
+ <class>KUrlRequester</class>
+ <extends>QFrame</extends>
+ <header>kurlrequester.h</header>
</customwidget>
</customwidgets>
<resources/>
projects / kdenlive / commitdiff