void Monitor::slotZoneMoved(int start, int end)
{
m_ruler->setZone(start, end);
- checkOverlay();
setClipZone(m_ruler->zone());
+ checkOverlay();
}
void Monitor::slotSetZoneStart()
{
m_ruler->setZoneStart();
emit zoneUpdated(m_ruler->zone());
- checkOverlay();
setClipZone(m_ruler->zone());
+ checkOverlay();
}
void Monitor::slotSetZoneEnd()
{
m_ruler->setZoneEnd();
emit zoneUpdated(m_ruler->zone());
- checkOverlay();
setClipZone(m_ruler->zone());
+ checkOverlay();
}
// virtual
{
if (m_overlay == NULL) return;
QString overlayText;
- int pos = render->seekFramePosition();
+ int pos = m_timePos->getValue();//render->seekFramePosition();
QPoint zone = m_ruler->zone();
if (pos == zone.x())
overlayText = i18n("In Point");
slotActivateMonitor();
if (speed == 0) {
double currentspeed = render->playSpeed();
- if (currentspeed >= 0) render->play(-2);
- else render->play(currentspeed * 2);
+ if (currentspeed >= 0) render->play(-1);
+ else switch((int) currentspeed) {
+ case -1:
+ render->play(-2);
+ break;
+ case -2:
+ render->play(-3);
+ break;
+ case -3:
+ render->play(-5);
+ break;
+ default:
+ render->play(-8);
+ }
} else render->play(speed);
//m_playAction->setChecked(true);
m_playAction->setIcon(m_pauseIcon);
slotActivateMonitor();
if (speed == 0) {
double currentspeed = render->playSpeed();
- if (currentspeed <= 1) render->play(2);
- else render->play(currentspeed * 2);
+ if (currentspeed <= 0) render->play(1);
+ else switch((int) currentspeed) {
+ case 1:
+ render->play(2);
+ break;
+ case 2:
+ render->play(3);
+ break;
+ case 3:
+ render->play(5);
+ break;
+ default:
+ render->play(8);
+ }
} else render->play(speed);
//m_playAction->setChecked(true);
m_playAction->setIcon(m_pauseIcon);
void Monitor::seekCursor(int pos)
{
if (m_ruler->slotNewValue(pos)) {
- checkOverlay();
m_timePos->setValue(pos);
+ checkOverlay();
}
}
void Monitor::rendererStopped(int pos)
{
if (m_ruler->slotNewValue(pos)) {
- checkOverlay();
m_timePos->setValue(pos);
+ checkOverlay();
}
m_playAction->setIcon(m_playIcon);
}
{
if (render == NULL) return;
slotActivateMonitor();
- if (render->playSpeed() == 0.0) {
+ if (render->isPlaying()) {
+ m_playAction->setIcon(m_playIcon);
+ render->switchPlay(false);
+ }
+ else {
m_playAction->setIcon(m_pauseIcon);
render->switchPlay(true);
- } else {
- m_playAction->setIcon(m_playIcon);
- render->switchPlay(false);
}
m_ruler->refreshRuler();
}
setBackgroundRole(QPalette::Base);
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
setCursor(Qt::PointingHandCursor);
+
}
// virtual
void Overlay::setOverlayText(const QString &text, bool isZone)
{
if (text.isEmpty()) {
- QPalette p;
+ /*QPalette p;
p.setColor(QPalette::Base, KdenliveSettings::window_background());
setPalette(p);
setText(QString());
- repaint();
+ repaint();*/
setHidden(true);
return;
}