#include "kthumb.h"
#include "markerdialog.h"
-#define VIDEOTAB 0
-#define AUDIOTAB 1
-#define COLORTAB 2
-#define SLIDETAB 3
-#define ADVANCEDTAB 4
-
-#define TYPE_JPEG 0
-#define TYPE_PNG 1
-#define TYPE_BMP 2
-#define TYPE_GIF 3
+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 ADVANCEDTAB = 6;
+
+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());
m_view.clip_description->setText(m_clip->description());
QMap <QString, QString> 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());
+ }
+
+ 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"))
m_view.clip_channels->setText(props.value("channels"));
CLIPTYPE t = m_clip->clipType();
- if (t == COLOR) {
+ 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);
+ m_view.tabWidget->removeTab(AUDIOTAB);
+ m_view.tabWidget->removeTab(VIDEOTAB);
+ if (props.contains("frame_size"))
+ m_view.image_size->setText(props.value("frame_size"));
+ if (props.contains("transparency"))
+ m_view.image_transparency->setChecked(props.value("transparency").toInt());
+ } else if (t == COLOR) {
m_view.clip_path->setEnabled(false);
+ m_view.tabWidget->removeTab(IMAGETAB);
m_view.tabWidget->removeTab(SLIDETAB);
m_view.tabWidget->removeTab(AUDIOTAB);
m_view.tabWidget->removeTab(VIDEOTAB);
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(IMAGETAB);
m_view.tabWidget->removeTab(COLORTAB);
m_view.tabWidget->removeTab(AUDIOTAB);
m_view.tabWidget->removeTab(VIDEOTAB);
profilePath += "/lumas/PAL/";
QDir dir(profilePath);
- QStringList result = dir.entryList(QDir::Files);
+ QStringList filter;
+ filter << "*.pgm";
+ const QStringList result = dir.entryList(filter, QDir::Files);
QStringList imagefiles;
QStringList imagenamelist;
int current;
- foreach(QString file, result) {
- if (file.endsWith(".pgm")) {
- 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;
- }
+ 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;
}
if (!lumaFile.isEmpty()) {
connect(m_view.image_type, SIGNAL(currentIndexChanged(int)), this, SLOT(parseFolder()));
} else if (t != AUDIO) {
+ m_view.tabWidget->removeTab(IMAGETAB);
m_view.tabWidget->removeTab(SLIDETAB);
m_view.tabWidget->removeTab(COLORTAB);
if (props.contains("frame_size"))
m_view.clip_thumb->setPixmap(pix);
if (t == IMAGE || t == VIDEO) m_view.tabWidget->removeTab(AUDIOTAB);
} else {
+ m_view.tabWidget->removeTab(IMAGETAB);
m_view.tabWidget->removeTab(SLIDETAB);
m_view.tabWidget->removeTab(COLORTAB);
m_view.tabWidget->removeTab(VIDEOTAB);
CommentedTime marker(GenTime(), i18n("Marker"));
MarkerDialog d(m_clip, marker, m_tc, 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()));
}
if (pos < 0 || pos > marks.count() - 1) return;
MarkerDialog d(m_clip, marks.at(pos), m_tc, 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()));
}
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 <QString, QString> ClipProperties::properties() {
QMap <QString, QString> props;
- props["description"] = m_view.clip_description->text();
CLIPTYPE t = m_clip->clipType();
+ QMap <QString, QString> 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"] = QString();
+ 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"] = QString();
+ }
+
+ 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"] = QString();
+ }
+
+ 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"] = QString();
+ }
+
if (t == COLOR) {
- QMap <QString, QString> 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))) {
m_clipNeedsRefresh = true;
props["colour"] = "0x" + new_color.right(6) + "ff";
}
+ } else if (t == IMAGE) {
+ 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;
+ }
} else if (t == SLIDESHOW) {
- QMap <QString, QString> 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());
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;
}
m_view.slide_info->setText(i18n("%1 images found", m_count));
QDomElement xml = m_clip->toXML();
xml.setAttribute("resource", m_view.clip_path->text() + extension);
- QPixmap pix = m_clip->thumbProducer()->getImage(xml, 1, 240, 180);
+ QPixmap pix = m_clip->thumbProducer()->getImage(KUrl(m_view.clip_path->text() + extension), 1, 240, 180);
QMap <QString, QString> props = m_clip->properties();
m_view.clip_duration->setText(m_tc.getTimecodeFromFrames(props.value("ttl").toInt() * m_count));
m_view.clip_thumb->setPixmap(pix);
projects / kdenlive / blobdiff