insert & move timeline clips

[kdenlive] / src / monitor.cpp

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 29e04eb77f00af1f9ead24492b1f4acbda53539c..3d70ff0153a0a15facfca0476341ec8dd47c9c8a 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -55,6 +55,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
   connect(render, SIGNAL(playListDuration(int)), this, SLOT(adjustRulerSize(int)));
   connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int)));
   connect(render, SIGNAL(rendererStopped(int)), this, SLOT(rendererStopped(int)));
+  if (name != "clip") connect(render, SIGNAL(rendererPosition(int)), this, SIGNAL(renderPosition(int)));
   //render->createVideoXWindow(ui.video_frame->winId(), -1);
   int width = m_ruler->width();
   m_ruler->setLength(width);
@@ -84,6 +85,7 @@ void Monitor::slotSeek(int pos)
   int realPos = ((double) pos) / m_scale;
   render->seekToFrame(realPos);
   m_position = realPos;
+  emit renderPosition(m_position);
   ui.monitor_time->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
 }
 
@@ -188,13 +190,6 @@ void Monitor::refreshMonitor(bool visible)
   if (visible && render) render->askForRefresh();
 }
 
-void Monitor::slotOpen()
-{
-  if ( render == NULL ) return;
-  render->mltInsertClip(2, GenTime(1, 25), QString("<westley><producer mlt_service=\"colour\" colour=\"red\" in=\"1\" out=\"30\" /></westley>"));
-  render->mltInsertClip(2, GenTime(0, 25), QString("<westley><producer mlt_service=\"avformat\" resource=\"/home/one/.vids/clip3e.mpg\" in=\"1\" out=\"300\" /></westley>"));
-}
-
 void Monitor::slotPlay()
 {
   if ( render == NULL ) return;