From a5ddf353ef63b4b8fbf171f27c1c6e7c768bd156 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Tue, 14 Apr 2009 21:08:22 +0000 Subject: [PATCH] reindent svn path=/trunk/kdenlive/; revision=3302 --- src/customruler.cpp | 31 ++++++++++++++----------------- src/docclipbase.cpp | 4 ++-- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/customruler.cpp b/src/customruler.cpp index 045a2be0..6be30fb6 100644 --- a/src/customruler.cpp +++ b/src/customruler.cpp @@ -191,20 +191,17 @@ void CustomRuler::setPixelPerMark(double rate) m_scale = 1.0 / (double) scale; double fend = m_scale * littleMarkDistance; if (rate > 8) { - mediumMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 60; - bigMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 300; - } - else if (rate > 6) { - mediumMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 10; - bigMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 30; - } - else if (rate > 3) { - mediumMarkDistance = (double) FRAME_SIZE * m_timecode.fps(); - bigMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 5; - } - else { - mediumMarkDistance = (double) FRAME_SIZE * m_timecode.fps(); - bigMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 60; + mediumMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 60; + bigMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 300; + } else if (rate > 6) { + mediumMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 10; + bigMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 30; + } else if (rate > 3) { + mediumMarkDistance = (double) FRAME_SIZE * m_timecode.fps(); + bigMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 5; + } else { + mediumMarkDistance = (double) FRAME_SIZE * m_timecode.fps(); + bigMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 60; } switch ((int) rate) { case 0: @@ -290,21 +287,21 @@ void CustomRuler::paintEvent(QPaintEvent *e) // draw the little marks fend = m_scale * littleMarkDistance; if (fend > 5) for (f = offsetmin - m_offset; f < offsetmax - m_offset; f += fend) - p.drawLine((int)f, LITTLE_MARK_X1, (int)f, LITTLE_MARK_X2); + p.drawLine((int)f, LITTLE_MARK_X1, (int)f, LITTLE_MARK_X2); offsetmin = (e->rect().left() + m_offset) / mediumMarkDistance; offsetmin = offsetmin * mediumMarkDistance; // draw medium marks fend = m_scale * mediumMarkDistance; if (fend > 5) for (f = offsetmin - m_offset - fend; f < offsetmax - m_offset + fend; f += fend) - p.drawLine((int)f, MIDDLE_MARK_X1, (int)f, MIDDLE_MARK_X2); + p.drawLine((int)f, MIDDLE_MARK_X1, (int)f, MIDDLE_MARK_X2); offsetmin = (e->rect().left() + m_offset) / bigMarkDistance; offsetmin = offsetmin * bigMarkDistance; // draw big marks fend = m_scale * bigMarkDistance; if (fend > 5) for (f = offsetmin - m_offset; f < offsetmax - m_offset; f += fend) - p.drawLine((int)f, BIG_MARK_X1, (int)f, BIG_MARK_X2); + p.drawLine((int)f, BIG_MARK_X1, (int)f, BIG_MARK_X2); // draw zone cursors int off = offset(); diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp index 2ceaac6c..181a4d91 100644 --- a/src/docclipbase.cpp +++ b/src/docclipbase.cpp @@ -517,8 +517,8 @@ Mlt::Producer *DocClipBase::producer(int track) if (i >= m_baseTrackProducers.count()) return NULL; m_baseTrackProducers[track] = new Mlt::Producer(*m_baseTrackProducers.at(i)->profile(), m_baseTrackProducers.at(i)->get("resource")); - // special case for placeholder clips - if (m_baseTrackProducers[track] == NULL) return NULL; + // special case for placeholder clips + if (m_baseTrackProducers[track] == NULL) return NULL; if (m_properties.contains("force_aspect_ratio")) m_baseTrackProducers[track]->set("force_aspect_ratio", m_properties.value("force_aspect_ratio").toDouble()); if (m_properties.contains("threads")) m_baseTrackProducers[track]->set("threads", m_properties.value("threads").toInt()); -- 2.39.2