Add splitting to all types of clips

include/AutomationClipView.h

@@ -75,6 +75,7 @@ protected slots:
 
 	QStaticText m_staticTextName;
 	void scaleTimemapToFit( float oldMin, float oldMax );
+	bool splitClip(const TimePos pos) override;
 } ;
 
 

include/ClipView.h

@@ -244,8 +244,13 @@ protected slots:
 	TimePos draggedClipPos( QMouseEvent * me );
 	int knifeMarkerPos( QMouseEvent * me );
 	void setColor(const std::optional<QColor>& color);
-	//! Return true iff the clip could be split. Currently only implemented for samples
-	virtual bool splitClip( const TimePos pos ){ return false; };
+
+	/**
+	* Split this Clip into two clips
+	* @param pos the position of the split, relative to the start of the clip
+	* @return true iff the clip could be split
+	*/
+	virtual bool splitClip(const TimePos pos) = 0;
 	void updateCursor(QMouseEvent * me);
 } ;
 

include/MidiClipView.h

@@ -103,6 +103,8 @@ protected slots:
 	QStaticText m_staticTextName;
 
 	bool m_legacySEPattern;
+
+	bool splitClip(const TimePos pos) override;
 } ;
 
 

include/PatternClipView.h

@@ -65,6 +65,8 @@ protected slots:
 	QPixmap m_paintPixmap;
 
 	QStaticText m_staticTextName;
+
+	bool splitClip(const TimePos pos) override;
 } ;
 
 

src/core/AutomationClip.cpp

@@ -87,7 +87,10 @@ AutomationClip::AutomationClip( const AutomationClip & _clip_to_copy ) :
 	m_autoTrack( _clip_to_copy.m_autoTrack ),
 	m_objects( _clip_to_copy.m_objects ),
 	m_tension( _clip_to_copy.m_tension ),
-	m_progressionType( _clip_to_copy.m_progressionType )
+	m_progressionType(_clip_to_copy.m_progressionType),
+	m_dragging(false),
+	m_isRecording(_clip_to_copy.m_isRecording),
+	m_lastRecordedValue(0)
 {
 	// Locks the mutex of the copied AutomationClip to make sure it
 	// doesn't change while it's being copied

src/gui/clips/AutomationClipView.cpp

@@ -37,6 +37,8 @@
 #include "StringPairDrag.h"
 #include "TextFloat.h"
 #include "Track.h"
+#include "TrackContainerView.h"
+#include "TrackView.h"
 
 #include "Engine.h"
 
@@ -209,6 +211,8 @@ void AutomationClipView::constructContextMenu( QMenu * _cm )
 
 void AutomationClipView::mouseDoubleClickEvent( QMouseEvent * me )
 {
+	if (m_trackView->trackContainerView()->knifeMode()) { return; }
+
 	if(me->button() != Qt::LeftButton)
 	{
 		me->ignore();
@@ -390,6 +394,11 @@ void AutomationClipView::paintEvent( QPaintEvent * )
 		p.drawPixmap( spacing, height() - ( size + spacing ),
 			embed::getIconPixmap( "muted", size, size ) );
 	}
+
+	if (m_marker)
+	{
+		p.drawLine(m_markerPos, rect().bottom(), m_markerPos, rect().top());
+	}
 
 	p.end();
 
@@ -487,4 +496,48 @@ void AutomationClipView::scaleTimemapToFit( float oldMin, float oldMax )
 }
 
 
+
+
+bool AutomationClipView::splitClip(const TimePos pos)
+{
+	setMarkerEnabled(false);
+
+	const TimePos splitPos = m_initialClipPos + pos;
+
+	// Don't split if we slid off the Clip or if we're on the clip's start/end
+	// Cutting at exactly the start/end position would create a zero length
+	// clip (bad), and a clip the same length as the original one (pointless).
+	if (splitPos <= m_initialClipPos || splitPos >= m_initialClipEnd) { return false; }
+
+	m_clip->getTrack()->addJournalCheckPoint();
+	m_clip->getTrack()->saveJournallingState(false);
+
+	auto rightClip = new AutomationClip(*m_clip);
+	auto leftClip = new AutomationClip(*m_clip);
+
+	rightClip->clear();
+	leftClip->removeNodes(splitPos, m_initialClipEnd);
+
+	for (auto it = m_clip->getTimeMap().begin(); it != m_clip->getTimeMap().end(); ++it)
+	{
+		if (POS(it) >= pos)
+		{
+			rightClip->putValues(POS(it) - pos, INVAL(it), OUTVAL(it), false);
+		}
+	}
+	rightClip->putValue(0, m_clip->valueAt(pos));
+	leftClip->putValue(pos, m_clip->valueAt(pos));
+
+	leftClip->movePosition(m_initialClipPos);
+	leftClip->changeLength(splitPos - m_initialClipPos);
+
+	rightClip->movePosition(splitPos);
+	rightClip->changeLength(m_initialClipEnd - splitPos);
+
+	remove();
+
+	m_clip->getTrack()->restoreJournallingState();
+	return true;
+}
+
 } // namespace lmms::gui

src/gui/clips/ClipView.cpp

@@ -502,7 +502,7 @@ void ClipView::updateCursor(QMouseEvent * me)
 		setCursor(Qt::SizeHorCursor);
 	}
 	// If we are in the middle on knife mode, use the knife cursor
-	else if (sClip && m_trackView->trackContainerView()->knifeMode() && !isSelected())
+	else if (m_trackView->trackContainerView()->knifeMode() && !isSelected())
 	{
 		setCursor(m_cursorKnife);
 	}
@@ -633,7 +633,7 @@ void ClipView::mousePressEvent( QMouseEvent * me )
 		auto pClip = dynamic_cast<PatternClip*>(m_clip);
 		const bool knifeMode = m_trackView->trackContainerView()->knifeMode();
 
-		if ( me->modifiers() & Qt::ControlModifier && !(sClip && knifeMode) )
+		if (me->modifiers() & Qt::ControlModifier && !knifeMode)
 		{
 			if( isSelected() )
 			{
@@ -665,7 +665,7 @@ void ClipView::mousePressEvent( QMouseEvent * me )
 				setInitialPos( me->pos() );
 				setInitialOffsets();
 
-				if( m_clip->getAutoResize() )
+				if (m_clip->getAutoResize() && !knifeMode)
 				{	// Always move clips that can't be manually resized
 					m_action = Action::Move;
 					setCursor( Qt::SizeAllCursor );
@@ -680,7 +680,7 @@ void ClipView::mousePressEvent( QMouseEvent * me )
 					m_action = Action::ResizeLeft;
 					setCursor( Qt::SizeHorCursor );
 				}
-				else if( sClip && knifeMode )
+				else if (knifeMode)
 				{
 					m_action = Action::Split;
 					setCursor( m_cursorKnife );
@@ -743,12 +743,8 @@ void ClipView::mousePressEvent( QMouseEvent * me )
 		if (m_action == Action::Split)
 		{
 			m_action = Action::None;
-			auto sClip = dynamic_cast<SampleClip*>(m_clip);
-			if (sClip)
-			{
-				setMarkerEnabled( false );
-				update();
-			}
+			setMarkerEnabled(false);
+			update();
 		}
 	}
 	else if( me->button() == Qt::MiddleButton )
@@ -984,11 +980,8 @@ void ClipView::mouseMoveEvent( QMouseEvent * me )
 	}
 	else if( m_action == Action::Split )
 	{
-		auto sClip = dynamic_cast<SampleClip*>(m_clip);
-		if (sClip) {
-			setCursor( m_cursorKnife );
-			setMarkerPos( knifeMarkerPos( me ) );
-		}
+		setCursor(m_cursorKnife);
+		setMarkerPos(knifeMarkerPos(me));
 		update();
 	}
 	// None of the actions above, we will just handle the cursor

src/gui/clips/MidiClipView.cpp

@@ -41,6 +41,7 @@
 #include "MidiClip.h"
 #include "PianoRoll.h"
 #include "RenameDialog.h"
+#include "TrackContainerView.h"
 #include "TrackView.h"
 
 namespace lmms::gui
@@ -299,6 +300,8 @@ void MidiClipView::mousePressEvent( QMouseEvent * _me )
 
 void MidiClipView::mouseDoubleClickEvent(QMouseEvent *_me)
 {
+	if (m_trackView->trackContainerView()->knifeMode()) { return; }
+
 	if( _me->button() != Qt::LeftButton )
 	{
 		_me->ignore();
@@ -670,9 +673,65 @@ void MidiClipView::paintEvent( QPaintEvent * )
 		p.drawPixmap( spacing, height() - ( size + spacing ),
 			embed::getIconPixmap( "muted", size, size ) );
 	}
+
+	if (m_marker)
+	{
+		p.drawLine(m_markerPos, rect().bottom(), m_markerPos, rect().top());
+	}
 
 	painter.drawPixmap( 0, 0, m_paintPixmap );
 }
 
 
+
+
+bool MidiClipView::splitClip(const TimePos pos)
+{
+	setMarkerEnabled(false);
+
+	const TimePos splitPos = m_initialClipPos + pos;
+
+	// Don't split if we slid off the Clip or if we're on the clip's start/end
+	// Cutting at exactly the start/end position would create a zero length
+	// clip (bad), and a clip the same length as the original one (pointless).
+	if (splitPos <= m_initialClipPos || splitPos >= m_initialClipEnd) { return false; }
+
+	m_clip->getTrack()->addJournalCheckPoint();
+	m_clip->getTrack()->saveJournallingState(false);
+
+	auto leftClip = new MidiClip(m_clip->instrumentTrack());
+	auto rightClip = new MidiClip(m_clip->instrumentTrack());
+
+	for (Note const* note : m_clip->m_notes)
+	{
+		if (note->pos() >= pos)
+		{
+			auto movedNote = Note{*note};
+			movedNote.setPos(note->pos() - pos);
+			rightClip->addNote(movedNote, false);
+		}
+	}
+
+	for (Note const* note : m_clip->m_notes)
+	{
+		if (note->pos() < pos)
+		{
+			leftClip->addNote(*note, false);
+		}
+	}
+
+	leftClip->movePosition(m_initialClipPos);
+	leftClip->updateLength();
+
+	rightClip->movePosition(splitPos);
+	rightClip->updateLength();
+
+	remove();
+
+	m_clip->getTrack()->restoreJournallingState();
+	return true;
+}
+
+
+
 } // namespace lmms::gui

src/gui/clips/PatternClipView.cpp

@@ -34,6 +34,8 @@
 #include "PatternClip.h"
 #include "PatternStore.h"
 #include "RenameDialog.h"
+#include "TrackContainerView.h"
+#include "TrackView.h"
 
 namespace lmms::gui
 {
@@ -70,6 +72,8 @@ void PatternClipView::constructContextMenu(QMenu* _cm)
 
 void PatternClipView::mouseDoubleClickEvent(QMouseEvent*)
 {
+	if (m_trackView->trackContainerView()->knifeMode()) { return; }
+
 	openInPatternEditor();
 }
 
@@ -155,6 +159,11 @@ void PatternClipView::paintEvent(QPaintEvent*)
 			embed::getIconPixmap( "muted", size, size ) );
 	}
 
+	if (m_marker)
+	{
+		p.drawLine(m_markerPos, rect().bottom(), m_markerPos, rect().top());
+	}
+
 	p.end();
 
 	painter.drawPixmap( 0, 0, m_paintPixmap );
@@ -196,4 +205,32 @@ void PatternClipView::update()
 }
 
 
+
+
+bool PatternClipView::splitClip(const TimePos pos)
+{
+	setMarkerEnabled(false);
+
+	const TimePos splitPos = m_initialClipPos + pos;
+
+	// Don't split if we slid off the Clip or if we're on the clip's start/end
+	// Cutting at exactly the start/end position would create a zero length
+	// clip (bad), and a clip the same length as the original one (pointless).
+	if (splitPos <= m_initialClipPos || splitPos >= m_initialClipEnd) { return false; }
+
+	m_patternClip->getTrack()->addJournalCheckPoint();
+	m_patternClip->getTrack()->saveJournallingState(false);
+
+	auto rightClip = new PatternClip(m_patternClip->getTrack());
+
+	m_patternClip->changeLength(splitPos - m_initialClipPos);
+
+	rightClip->movePosition(splitPos);
+	rightClip->changeLength(m_initialClipEnd - splitPos);
+	rightClip->setStartTimeOffset(m_patternClip->startTimeOffset() - m_patternClip->length());
+
+	m_patternClip->getTrack()->restoreJournallingState();
+	return true;
+}
+
 } // namespace lmms::gui