From: Ed Rogalsky <ed.rogalsky@googlemail.com>
Date: Mon, 5 Nov 2012 06:44:39 +0000 (+0100)
Subject: Merge branch 'master' into feature/pkey
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=563a57ad4786d528755a99973cf3bffbdce96bcf;hp=-c;p=kdenlive

Merge branch 'master' into feature/pkey
---

563a57ad4786d528755a99973cf3bffbdce96bcf
diff --combined src/customtrackview.cpp
index 166990f4,fbb9a020..6e9706fe
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@@ -405,15 -405,6 +405,15 @@@ void CustomTrackView::slotCheckPosition
      }
  }
  
 +void CustomTrackView::slotAlignPlayheadToMousePos()
 +{
 +	/* get curser point ref in screen coord */
 +	QPoint ps = QCursor::pos();
 +	/* get xPos in scene coord */
 +	int mappedXPos = qMax((int)(mapToScene(mapFromGlobal(ps)).x() + 0.5), 0);
 +	/* move playhead to new xPos*/
 +	seekCursorPos(mappedXPos);
 +}
  
  // virtual
  void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
@@@ -459,7 -450,7 +459,7 @@@
                      if (parent)
                          parent->resizeStart((int)(snappedPos - m_dragItemInfo.startPos.frames(m_document->fps())));
                  } else {
-                     m_dragItem->resizeStart((int)(snappedPos));
+                     m_dragItem->resizeStart((int)(snappedPos), true, false);
                  }
                  QString crop = m_document->timecode().getDisplayTimecode(m_dragItem->cropStart(), KdenliveSettings::frametimecode());
                  QString duration = m_document->timecode().getDisplayTimecode(m_dragItem->cropDuration(), KdenliveSettings::frametimecode());
@@@ -472,7 -463,7 +472,7 @@@
                      if (parent)
                          parent->resizeEnd((int)(snappedPos - m_dragItemInfo.endPos.frames(m_document->fps())));
                  } else {
-                     m_dragItem->resizeEnd((int)(snappedPos));
+                     m_dragItem->resizeEnd((int)(snappedPos), false);
                  }
                  QString duration = m_document->timecode().getDisplayTimecode(m_dragItem->cropDuration(), KdenliveSettings::frametimecode());
                  QString offset = m_document->timecode().getDisplayTimecode(m_dragItem->cropDuration() - m_dragItemInfo.cropDuration, KdenliveSettings::frametimecode());
@@@ -2770,7 -2761,9 +2770,9 @@@ void CustomTrackView::adjustTimelineCli
                          new RazorClipCommand(this, clipInfo, info.startPos, false, command);
                          new ResizeClipCommand(this, dupInfo, newdupInfo, false, false, command);
                          ClipItem *dup = cutClip(clipInfo, info.startPos, true, false);
-                         if (dup) dup->resizeStart(info.endPos.frames(m_document->fps()));
+                         if (dup) {
+ 			    dup->resizeStart(info.endPos.frames(m_document->fps()));
+ 			}
                      } else {
                          ItemInfo newclipInfo = clip->info();
                          newclipInfo.endPos = info.startPos;
@@@ -3943,6 -3936,7 +3945,7 @@@ void CustomTrackView::mouseReleaseEvent
              }
          } else {
              prepareResizeClipStart(m_dragItem, m_dragItemInfo, m_dragItem->startPos().frames(m_document->fps()));
+ 	    if (m_dragItem->type() == AVWIDGET) static_cast <ClipItem*>(m_dragItem)->slotUpdateRange();
          }
      } else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) {
          // resize end
@@@ -3968,6 -3962,7 +3971,7 @@@
              }
          } else {
              prepareResizeClipEnd(m_dragItem, m_dragItemInfo, m_dragItem->endPos().frames(m_document->fps()));
+ 	    if (m_dragItem->type() == AVWIDGET) static_cast <ClipItem*>(m_dragItem)->slotUpdateRange();
          }
      } else if (m_operationMode == FADEIN) {
          // resize fade in effect
@@@ -4881,8 -4876,9 +4885,9 @@@ void CustomTrackView::resizeClip(const 
          ItemInfo clipinfo = item->info();
          clipinfo.track = m_document->tracksCount() - clipinfo.track;
          bool success = m_document->renderer()->mltResizeClipStart(clipinfo, end.startPos - clipinfo.startPos);
-         if (success)
+         if (success) {
              item->resizeStart((int) end.startPos.frames(m_document->fps()));
+ 	}
          else
              emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
      } else {