summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
61a82c2)
* Proxy clip: do not fetch properties of the proxy (frame size, ...), use the one from original clip
svn path=/trunk/kdenlive/; revision=5406
void GeometryWidget::slotAdjustToFrameSize()
{
if (m_frameSize == QPoint()) m_frameSize = QPoint(m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
void GeometryWidget::slotAdjustToFrameSize()
{
if (m_frameSize == QPoint()) m_frameSize = QPoint(m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
- m_spinWidth->setValue(m_frameSize.x());
+ m_spinWidth->setValue((int) (m_frameSize.x() / m_monitor->render->sar() + 0.5));
m_spinHeight->setValue(m_frameSize.y());
}
void GeometryWidget::slotFitToWidth()
{
if (m_frameSize == QPoint()) m_frameSize = QPoint(m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
m_spinHeight->setValue(m_frameSize.y());
}
void GeometryWidget::slotFitToWidth()
{
if (m_frameSize == QPoint()) m_frameSize = QPoint(m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
- double factor = (double) m_monitor->render->frameRenderWidth() / m_frameSize.x();
- m_spinHeight->setValue(m_frameSize.y() * factor);
+ double factor = (double) m_monitor->render->frameRenderWidth() / m_frameSize.x() * m_monitor->render->sar();
+ m_spinHeight->setValue((int) (m_frameSize.y() * factor + 0.5));
m_spinWidth->setValue(m_monitor->render->frameRenderWidth());
}
void GeometryWidget::slotFitToHeight()
{
if (m_frameSize == QPoint()) m_frameSize = QPoint(m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
m_spinWidth->setValue(m_monitor->render->frameRenderWidth());
}
void GeometryWidget::slotFitToHeight()
{
if (m_frameSize == QPoint()) m_frameSize = QPoint(m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
- double factor = m_monitor->render->renderHeight() / m_frameSize.y();
+ double factor = (double) m_monitor->render->renderHeight() / m_frameSize.y();
m_spinHeight->setValue(m_monitor->render->renderHeight());
m_spinHeight->setValue(m_monitor->render->renderHeight());
- m_spinWidth->setValue(m_frameSize.x() * factor);
+ m_spinWidth->setValue((int) (m_frameSize.x() / m_monitor->render->sar() * factor + 0.5));
}
#include "geometrywidget.moc"
}
#include "geometrywidget.moc"
return m_mltProfile->dar();
}
return m_mltProfile->dar();
}
+double Render::sar() const
+{
+ return m_mltProfile->sar();
+}
void Render::slotSplitView(bool doit)
{
void Render::slotSplitView(bool doit)
{
if (xml.hasAttribute("templatetext"))
producer->set("templatetext", xml.attribute("templatetext").toUtf8().constData());
if (xml.hasAttribute("templatetext"))
producer->set("templatetext", xml.attribute("templatetext").toUtf8().constData());
- if (!replaceProducer && xml.hasAttribute("file_hash")) {
+ if ((!replaceProducer && xml.hasAttribute("file_hash")) || xml.hasAttribute("proxy")) {
// Clip already has all properties
emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer, selectClip);
return;
// Clip already has all properties
emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer, selectClip);
return;
/** @brief Returns display aspect ratio. */
double dar() const;
/** @brief Returns display aspect ratio. */
double dar() const;
+ /** @brief Returns sample aspect ratio. */
+ double sar() const;
/*
* Playlist manipulation.
/*
* Playlist manipulation.