X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipproperties.cpp;h=923fdfb7037af70386914c863686692c99c2a2c8;hb=4664de14c0240086ced95c4ff9e4c1101a60051d;hp=4bb88abacfcae6d396b50e90b8add37246115a49;hpb=12ec352602795fa2970c71fccab4bad309d817ea;p=kdenlive diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp index 4bb88aba..923fdfb7 100644 --- a/src/clipproperties.cpp +++ b/src/clipproperties.cpp @@ -17,29 +17,31 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include + +#include "clipproperties.h" +#include "kdenlivesettings.h" +#include "kthumb.h" +#include "markerdialog.h" #include #include #include -#include "kdenlivesettings.h" -#include "clipproperties.h" -#include "kthumb.h" -#include "markerdialog.h" +#include -#define VIDEOTAB 0 -#define AUDIOTAB 1 -#define COLORTAB 2 -#define SLIDETAB 3 -#define IMAGETAB 4 -#define MARKERTAB 5 -#define ADVANCEDTAB 6 +static const int VIDEOTAB = 0; +static const int AUDIOTAB = 1; +static const int COLORTAB = 2; +static const int SLIDETAB = 3; +static const int IMAGETAB = 4; +static const int MARKERTAB = 5; +static const int METATAB = 6; +static const int ADVANCEDTAB = 7; -#define TYPE_JPEG 0 -#define TYPE_PNG 1 -#define TYPE_BMP 2 -#define TYPE_GIF 3 +static const int TYPE_JPEG = 0; +static const int TYPE_PNG = 1; +static const int TYPE_BMP = 2; +static const int TYPE_GIF = 3; ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidget * parent): QDialog(parent), m_tc(tc), m_clip(clip), m_fps(fps), m_clipNeedsRefresh(false), m_count(0) { setFont(KGlobalSettings::toolBarFont()); @@ -49,6 +51,53 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg m_view.clip_description->setText(m_clip->description()); QMap props = m_clip->properties(); + if (props.contains("force_aspect_ratio") && props.value("force_aspect_ratio").toDouble() > 0) { + m_view.clip_force_ar->setChecked(true); + m_view.clip_ar->setEnabled(true); + m_view.clip_ar->setValue(props.value("force_aspect_ratio").toDouble()); + } + + if (props.contains("threads") && props.value("threads").toInt() != 1) { + m_view.clip_force_threads->setChecked(true); + m_view.clip_threads->setEnabled(true); + m_view.clip_threads->setValue(props.value("threads").toInt()); + } + + if (props.contains("video_index") && props.value("video_index").toInt() != 0) { + m_view.clip_force_vindex->setChecked(true); + m_view.clip_vindex->setEnabled(true); + m_view.clip_vindex->setValue(props.value("video_index").toInt()); + } + + if (props.contains("audio_index") && props.value("audio_index").toInt() != 0) { + m_view.clip_force_aindex->setChecked(true); + m_view.clip_aindex->setEnabled(true); + m_view.clip_aindex->setValue(props.value("audio_index").toInt()); + } + + if (props.contains("audio_max")) { + m_view.clip_aindex->setMaximum(props.value("audio_max").toInt()); + } + + if (props.contains("video_max")) { + m_view.clip_vindex->setMaximum(props.value("video_max").toInt()); + } + + // Check for Metadata + QMap meta = m_clip->metadata(); + QMap::const_iterator i = meta.constBegin(); + while (i != meta.constEnd()) { + QTreeWidgetItem *metaitem = new QTreeWidgetItem(m_view.metadata_list); + metaitem->setText(0, i.key()); //i18n(i.key().section('.', 2, 3).toUtf8().data())); + metaitem->setText(1, i.value()); + ++i; + } + + connect(m_view.clip_force_ar, SIGNAL(toggled(bool)), m_view.clip_ar, SLOT(setEnabled(bool))); + connect(m_view.clip_force_threads, SIGNAL(toggled(bool)), m_view.clip_threads, SLOT(setEnabled(bool))); + connect(m_view.clip_force_vindex, SIGNAL(toggled(bool)), m_view.clip_vindex, SLOT(setEnabled(bool))); + connect(m_view.clip_force_aindex, SIGNAL(toggled(bool)), m_view.clip_aindex, SLOT(setEnabled(bool))); + if (props.contains("audiocodec")) m_view.clip_acodec->setText(props.value("audiocodec")); if (props.contains("frequency")) @@ -57,6 +106,14 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg m_view.clip_channels->setText(props.value("channels")); CLIPTYPE t = m_clip->clipType(); + if (t != AUDIO && t != AV) { + m_view.clip_force_aindex->setEnabled(false); + } + + if (t != VIDEO && t != AV) { + m_view.clip_force_vindex->setEnabled(false); + } + if (t == IMAGE) { m_view.tabWidget->removeTab(SLIDETAB); m_view.tabWidget->removeTab(COLORTAB); @@ -68,14 +125,16 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg m_view.image_transparency->setChecked(props.value("transparency").toInt()); } else if (t == COLOR) { m_view.clip_path->setEnabled(false); + m_view.tabWidget->removeTab(METATAB); m_view.tabWidget->removeTab(IMAGETAB); m_view.tabWidget->removeTab(SLIDETAB); m_view.tabWidget->removeTab(AUDIOTAB); m_view.tabWidget->removeTab(VIDEOTAB); m_view.clip_thumb->setHidden(true); - m_view.clip_color->setColor(QColor("#" + props.value("colour").right(8).left(6))); + m_view.clip_color->setColor(QColor('#' + props.value("colour").right(8).left(6))); } else if (t == SLIDESHOW) { m_view.clip_path->setText(url.directory()); + m_view.tabWidget->removeTab(METATAB); m_view.tabWidget->removeTab(IMAGETAB); m_view.tabWidget->removeTab(COLORTAB); m_view.tabWidget->removeTab(AUDIOTAB); @@ -95,27 +154,38 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg m_view.luma_duration->setText(tc.getTimecodeFromFrames(props.value("luma_duration").toInt())); QString lumaFile = props.value("luma_file"); + + // Check for Kdenlive installed luma files + QStringList filters; + filters << "*.pgm" << "*.png"; + + QStringList customLumas = KGlobal::dirs()->findDirs("appdata", "lumas"); + foreach(const QString &folder, customLumas) { + QStringList filesnames = QDir(folder).entryList(filters, QDir::Files); + foreach(const QString &fname, filesnames) { + m_view.luma_file->addItem(KIcon(folder + '/' + fname), fname, folder + '/' + fname); + } + } + + // Check for MLT lumas QString profilePath = KdenliveSettings::mltpath(); - profilePath = profilePath.section('/', 0, -3); - profilePath += "/lumas/PAL/"; - - QDir dir(profilePath); - QStringList filter; - filter << "*.pgm"; - const QStringList result = dir.entryList(filter, QDir::Files); - QStringList imagefiles; - QStringList imagenamelist; - int current; - foreach(const QString file, result) { - m_view.luma_file->addItem(KIcon(profilePath + file), file, profilePath + file); - if (!lumaFile.isEmpty() && lumaFile == QString(profilePath + file)) - current = m_view.luma_file->count() - 1; + QString folder = profilePath.section('/', 0, -3); + folder.append("/lumas/PAL"); // TODO: cleanup the PAL / NTSC mess in luma files + QDir lumafolder(folder); + QStringList filesnames = lumafolder.entryList(filters, QDir::Files); + foreach(const QString &fname, filesnames) { + m_view.luma_file->addItem(KIcon(folder + '/' + fname), fname, folder + '/' + fname); } + slotEnableLuma(m_view.slide_fade->isChecked()); + slotEnableLumaFile(m_view.slide_luma->isChecked()); + if (!lumaFile.isEmpty()) { m_view.slide_luma->setChecked(true); - m_view.luma_file->setCurrentIndex(current); - } + m_view.luma_file->setCurrentIndex(m_view.luma_file->findData(lumaFile)); + } else m_view.luma_file->setEnabled(false); + connect(m_view.slide_fade, SIGNAL(stateChanged(int)), this, SLOT(slotEnableLuma(int))); + connect(m_view.slide_luma, SIGNAL(stateChanged(int)), this, SLOT(slotEnableLumaFile(int))); connect(m_view.image_type, SIGNAL(currentIndexChanged(int)), this, SLOT(parseFolder())); } else if (t != AUDIO) { @@ -141,11 +211,12 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg m_view.tabWidget->removeTab(VIDEOTAB); m_view.clip_thumb->setHidden(true); } - if (t != IMAGE && t != COLOR && t != TEXT) m_view.clip_duration->setReadOnly(true); KFileItem f(KFileItem::Unknown, KFileItem::Unknown, url, true); m_view.clip_filesize->setText(KIO::convertSize(f.size())); m_view.clip_duration->setText(tc.getTimecode(m_clip->duration(), m_fps)); + if (t != IMAGE && t != COLOR && t != TEXT) m_view.clip_duration->setReadOnly(true); + else connect(m_view.clip_duration, SIGNAL(editingFinished()), this, SLOT(slotCheckMaxLength())); // markers m_view.marker_new->setIcon(KIcon("document-new")); @@ -164,6 +235,26 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg adjustSize(); } +void ClipProperties::slotEnableLuma(int state) { + bool enable = false; + if (state == Qt::Checked) enable = true; + m_view.luma_duration->setEnabled(enable); + m_view.slide_luma->setEnabled(enable); + if (enable) { + m_view.luma_file->setEnabled(m_view.slide_luma->isChecked()); + } else m_view.luma_file->setEnabled(false); + m_view.label_softness->setEnabled(m_view.slide_luma->isChecked() && enable); + m_view.luma_softness->setEnabled(m_view.label_softness->isEnabled()); +} + +void ClipProperties::slotEnableLumaFile(int state) { + bool enable = false; + if (state == Qt::Checked) enable = true; + m_view.luma_file->setEnabled(enable); + m_view.luma_softness->setEnabled(enable); + m_view.label_softness->setEnabled(enable); +} + void ClipProperties::slotFillMarkersList() { m_view.markers_list->clear(); QList < CommentedTime > marks = m_clip->commentedSnapMarkers(); @@ -177,10 +268,9 @@ void ClipProperties::slotFillMarkersList() { void ClipProperties::slotAddMarker() { CommentedTime marker(GenTime(), i18n("Marker")); - MarkerDialog d(m_clip, marker, m_tc, this); + MarkerDialog d(m_clip, marker, m_tc, i18n("Add Marker"), this); if (d.exec() == QDialog::Accepted) { - int id = m_clip->getId(); - emit addMarker(id, d.newMarker().time(), d.newMarker().comment()); + emit addMarker(m_clip->getId(), d.newMarker().time(), d.newMarker().comment()); } QTimer::singleShot(500, this, SLOT(slotFillMarkersList())); } @@ -189,10 +279,9 @@ void ClipProperties::slotEditMarker() { QList < CommentedTime > marks = m_clip->commentedSnapMarkers(); int pos = m_view.markers_list->currentIndex().row(); if (pos < 0 || pos > marks.count() - 1) return; - MarkerDialog d(m_clip, marks.at(pos), m_tc, this); + MarkerDialog d(m_clip, marks.at(pos), m_tc, i18n("Edit Marker"), this); if (d.exec() == QDialog::Accepted) { - int id = m_clip->getId(); - emit addMarker(id, d.newMarker().time(), d.newMarker().comment()); + emit addMarker(m_clip->getId(), d.newMarker().time(), d.newMarker().comment()); } QTimer::singleShot(500, this, SLOT(slotFillMarkersList())); } @@ -201,36 +290,82 @@ void ClipProperties::slotDeleteMarker() { QList < CommentedTime > marks = m_clip->commentedSnapMarkers(); int pos = m_view.markers_list->currentIndex().row(); if (pos < 0 || pos > marks.count() - 1) return; - int id = m_clip->getId(); - emit addMarker(id, marks.at(pos).time(), QString()); + emit addMarker(m_clip->getId(), marks.at(pos).time(), QString()); QTimer::singleShot(500, this, SLOT(slotFillMarkersList())); } -int ClipProperties::clipId() const { +const QString &ClipProperties::clipId() const { return m_clip->getId(); } QMap ClipProperties::properties() { QMap props; - props["description"] = m_view.clip_description->text(); CLIPTYPE t = m_clip->clipType(); + QMap old_props = m_clip->properties(); + + if (old_props.value("description") != m_view.clip_description->text()) + props["description"] = m_view.clip_description->text(); + + double aspect = m_view.clip_ar->value(); + if (m_view.clip_force_ar->isChecked()) { + if (aspect != old_props.value("force_aspect_ratio").toDouble()) { + props["force_aspect_ratio"] = QString::number(aspect); + m_clipNeedsRefresh = true; + } + } else if (old_props.contains("force_aspect_ratio")) { + props["force_aspect_ratio"].clear(); + m_clipNeedsRefresh = true; + } + + int threads = m_view.clip_threads->value(); + if (m_view.clip_force_threads->isChecked()) { + if (threads != old_props.value("threads").toInt()) { + props["threads"] = QString::number(threads); + } + } else if (old_props.contains("threads")) { + props["threads"].clear(); + } + + int vindex = m_view.clip_vindex->value(); + if (m_view.clip_force_vindex->isChecked()) { + if (vindex != old_props.value("video_index").toInt()) { + props["video_index"] = QString::number(vindex); + } + } else if (old_props.contains("video_index")) { + props["video_index"].clear(); + } + + int aindex = m_view.clip_aindex->value(); + if (m_view.clip_force_aindex->isChecked()) { + if (aindex != old_props.value("audio_index").toInt()) { + props["audio_index"] = QString::number(aindex); + } + } else if (old_props.contains("audio_index")) { + props["audio_index"].clear(); + } + if (t == COLOR) { - QMap old_props = m_clip->properties(); QString new_color = m_view.clip_color->color().name(); - if (new_color != QString("#" + old_props.value("colour").right(8).left(6))) { + if (new_color != QString('#' + old_props.value("colour").right(8).left(6))) { m_clipNeedsRefresh = true; props["colour"] = "0x" + new_color.right(6) + "ff"; } + int duration = m_tc.getFrameCount(m_view.clip_duration->text(), m_fps); + if (duration != m_clip->duration().frames(m_fps)) { + props["out"] = QString::number(duration); + } } else if (t == IMAGE) { - QMap old_props = m_clip->properties(); if ((int) m_view.image_transparency->isChecked() != old_props.value("transparency").toInt()) { props["transparency"] = QString::number((int)m_view.image_transparency->isChecked()); m_clipNeedsRefresh = true; } + int duration = m_tc.getFrameCount(m_view.clip_duration->text(), m_fps); + if (duration != m_clip->duration().frames(m_fps)) { + props["out"] = QString::number(duration); + } } else if (t == SLIDESHOW) { - QMap old_props = m_clip->properties(); QString value = QString::number((int) m_view.slide_loop->isChecked()); if (old_props.value("loop") != value) props["loop"] = value; value = QString::number((int) m_view.slide_fade->isChecked()); @@ -283,8 +418,8 @@ QMap ClipProperties::properties() { props["luma_file"] = lumaFile; } } else { - if (old_props.value("luma_file") != QString()) { - props["luma_file"] = QString(); + if (!old_props.value("luma_file").isEmpty()) { + props["luma_file"].clear(); } } @@ -315,7 +450,9 @@ void ClipProperties::parseFolder() { extension = "/.all.gif"; break; default: - filters << "*.jpg" << "*.jpeg"; + filters << "*.jpg"; + // TODO: improve jpeg image detection with extension like jpeg, requires change in MLT image producers + // << "*.jpeg"; extension = "/.all.jpg"; break; } @@ -332,6 +469,13 @@ void ClipProperties::parseFolder() { m_view.clip_thumb->setPixmap(pix); } +void ClipProperties::slotCheckMaxLength() { + int duration = m_tc.getFrameCount(m_view.clip_duration->text(), m_fps); + if (duration > m_clip->maxDuration().frames(m_fps)) { + m_view.clip_duration->setText(m_tc.getTimecode(m_clip->maxDuration(), m_fps)); + } +} + #include "clipproperties.moc"