Knife Tool for Sample Clips (Again)

data/themes/classic/style.css

@@ -564,10 +564,10 @@ FxLine {
 	color: #e0e0e0;
 	qproperty-backgroundActive: qlineargradient(spread:reflect, x1:0, y1:0, x2:1, y2:0,
 								stop:0 #7b838d, stop:1 #6b7581 );
-	qproperty-strokeOuterActive: rgb( 0, 0, 0 );	
-	qproperty-strokeOuterInactive: rgba( 0, 0, 0, 50 );	
-	qproperty-strokeInnerActive: rgba( 255, 255, 255, 100 );	
-	qproperty-strokeInnerInactive: rgba( 255, 255, 255, 50 );					
+	qproperty-strokeOuterActive: rgb( 0, 0, 0 );
+	qproperty-strokeOuterInactive: rgba( 0, 0, 0, 50 );
+	qproperty-strokeInnerActive: rgba( 255, 255, 255, 100 );
+	qproperty-strokeInnerInactive: rgba( 255, 255, 255, 50 );
 }
 
 /* persistent peak markers for fx peak meters */
@@ -624,7 +624,8 @@ TrackContentObjectView   {
 	qproperty-gradient: true; /* boolean property, set true to have a gradient */
 	/* finger tip offset of cursor */
 	qproperty-mouseHotspotHand: 3px 3px;
-
+	qproperty-mouseHotspotKnife: 0px 0px;
+
 	font-size: 11px;
 }
 

data/themes/default/style.css

@@ -662,7 +662,8 @@ TrackContentObjectView   {
 	qproperty-gradient: false; /* boolean property, set true to have a gradient */
 	/* finger tip offset of cursor */
 	qproperty-mouseHotspotHand: 7px 2px;
-
+	qproperty-mouseHotspotKnife: 0px 0px;
+
 	font-size: 11px;
 }
 

include/SampleBuffer.h

@@ -84,7 +84,7 @@ class LMMS_EXPORT SampleBuffer : public QObject, public sharedObject
 		{
 			m_isBackwards = _backwards;
 		}
-		
+
 		int interpolationMode() const
 		{
 			return m_interpolationMode;
@@ -109,6 +109,9 @@ class LMMS_EXPORT SampleBuffer : public QObject, public sharedObject
 	SampleBuffer( const QString & _audio_file, bool _is_base64_data = false );
 	SampleBuffer( const sampleFrame * _data, const f_cnt_t _frames );
 	explicit SampleBuffer( const f_cnt_t _frames );
+	SampleBuffer( const SampleBuffer& orig );
+
+	SampleBuffer& operator= ( const SampleBuffer& that );
 
 	virtual ~SampleBuffer();
 

include/SampleTrack.h

@@ -48,8 +48,12 @@ class SampleTCO : public TrackContentObject
 	mapPropertyFromModel(bool,isRecord,setRecord,m_recordModel);
 public:
 	SampleTCO( Track * _track );
+	SampleTCO( const SampleTCO& orig );
 	virtual ~SampleTCO();
 
+	//According to the Rule of Three we should have this
+	//SampleTCO& operator= ( const SampleTCO& that );
+
 	void changeLength( const MidiTime & _length ) override;
 	const QString & sampleFile() const;
 
@@ -74,6 +78,15 @@ class SampleTCO : public TrackContentObject
 	bool isPlaying() const;
 	void setIsPlaying(bool isPlaying);
 
+	void inline setMarkerPos( int x )
+	{
+		m_markerPos = x;
+	}
+	void inline setMarkerEnabled( bool e )
+	{
+		m_marker = e;
+	}
+
 public slots:
 	void setSampleBuffer( SampleBuffer* sb );
 	void setSampleFile( const QString & _sf );
@@ -88,6 +101,8 @@ public slots:
 	BoolModel m_recordModel;
 	bool m_isPlaying;
 
+	bool m_marker = false;
+	int m_markerPos = 0;
 
 	friend class SampleTCOView;
 

include/SongEditor.h

@@ -63,6 +63,7 @@ class SongEditor : public TrackContainerView
 	enum EditMode
 	{
 		DrawMode,
+		KnifeMode,
 		SelectMode
 	};
 
@@ -85,6 +86,7 @@ public slots:
 
 	void setEditMode( EditMode mode );
 	void setEditModeDraw();
+	void setEditModeKnife();
 	void setEditModeSelect();
 	void toggleProportionalSnap();
 
@@ -120,6 +122,7 @@ private slots:
 	void wheelEvent( QWheelEvent * we ) override;
 
 	bool allowRubberband() const override;
+	bool knifeMode() const override;
 
 	int trackIndexFromSelectionPoint(int yPos);
 	int indexOfTrackView(const TrackView* tv);
@@ -209,6 +212,7 @@ protected slots:
 
 	ActionGroup * m_editModeGroup;
 	QAction* m_drawModeAction;
+	QAction* m_knifeModeAction;
 	QAction* m_selectModeAction;
 	QAction* m_crtlAction;
 

include/Track.h

@@ -210,6 +210,7 @@ class TrackContentObjectView : public selectableObject, public ModelView
 	// We have to use a QSize here because using QPoint isn't supported.
 	// width -> x, height -> y
 	Q_PROPERTY( QSize mouseHotspotHand WRITE setMouseHotspotHand )
+	Q_PROPERTY( QSize mouseHotspotKnife WRITE setMouseHotspotKnife )
 
 public:
 	TrackContentObjectView( TrackContentObject * tco, TrackView * tv );
@@ -245,6 +246,7 @@ class TrackContentObjectView : public selectableObject, public ModelView
 	void setBBPatternBackground( const QColor & c );
 	void setGradient( const bool & b );
 	void setMouseHotspotHand(const QSize & s);
+	void setMouseHotspotKnife(const QSize & s);
 
 	// access needsUpdate member variable
 	bool needsUpdate();
@@ -295,6 +297,7 @@ protected slots:
 		MoveSelection,
 		Resize,
 		ResizeLeft,
+		Split,
 		CopySelection,
 		ToggleSelected
 	} ;
@@ -321,7 +324,10 @@ protected slots:
 	QColor m_textShadowColor;
 	QColor m_BBPatternBackground;
 	bool m_gradient;
-	QSize m_mouseHotspotHand; // QSize must be used because QPoint isn't supported by property system
+	QSize m_mouseHotspotHand; // QSize must be used because QPoint
+	QSize m_mouseHotspotKnife; // isn't supported by property system
+	QCursor m_cursorHand;
+	QCursor m_cursorKnife;
 	bool m_cursorSetYet;
 
 	bool m_needsUpdate;
@@ -335,7 +341,10 @@ protected slots:
 	void setInitialOffsets();
 
 	bool mouseMovedDistance( QMouseEvent * me, int distance );
+	bool unquantizedModHeld( QMouseEvent * me );
 	MidiTime draggedTCOPos( QMouseEvent * me );
+	int knifeMarkerPos( QMouseEvent * me );
+	MidiTime quantizeMarkerPos( MidiTime, bool shiftMode );
 } ;
 
 

include/TrackContainerView.h

@@ -77,6 +77,7 @@ class TrackContainerView : public QWidget, public ModelView,
 	const TrackView * trackViewAt( const int _y ) const;
 
 	virtual bool allowRubberband() const;
+	virtual bool knifeMode() const;
 
 	inline bool rubberBandActive() const
 	{

src/core/SampleBuffer.cpp

@@ -130,6 +130,54 @@ SampleBuffer::SampleBuffer( const f_cnt_t _frames )
 
 
 
+SampleBuffer::SampleBuffer( const SampleBuffer& orig ):
+	m_audioFile( orig.m_audioFile ),
+	m_origData( MM_ALLOC( sampleFrame, orig.m_origFrames ) ),
+	m_origFrames( orig.m_origFrames ),
+	m_data( MM_ALLOC( sampleFrame, orig.m_frames ) ),
+	m_frames( orig.m_frames ),
+	m_startFrame( orig.m_startFrame ),
+	m_endFrame( orig.m_endFrame ),
+	m_loopStartFrame( orig.m_loopStartFrame ),
+	m_loopEndFrame( orig.m_loopEndFrame ),
+	m_amplification( orig.m_amplification ),
+	m_reversed( orig.m_reversed ),
+	m_frequency( orig.m_frequency ),
+	m_sampleRate( orig.m_sampleRate )
+{
+	//Deep copy m_origData and m_data from original
+	memcpy( m_origData, orig.m_origData, m_origFrames * BYTES_PER_FRAME );
+	memcpy( m_data, orig.m_data, m_frames * BYTES_PER_FRAME );
+}
+
+
+
+
+SampleBuffer& SampleBuffer::operator=( const SampleBuffer& that )
+{
+	m_audioFile = that.m_audioFile;
+	m_origData = MM_ALLOC( sampleFrame, that.m_origFrames );
+	m_origFrames = that.m_origFrames;
+	m_data = MM_ALLOC( sampleFrame, that.m_frames );
+	m_frames = that.m_frames;
+	m_startFrame = that.m_startFrame;
+	m_endFrame = that.m_endFrame;
+	m_loopStartFrame = that.m_loopStartFrame;
+	m_loopEndFrame = that.m_loopEndFrame;
+	m_amplification = that.m_amplification;
+	m_reversed = that.m_reversed;
+	m_frequency = that.m_frequency;
+	m_sampleRate = that.m_sampleRate;
+	memcpy( m_origData, that.m_origData, m_origFrames * BYTES_PER_FRAME );
+	memcpy( m_data, that.m_data, m_frames * BYTES_PER_FRAME );
+	update();
+
+	return *this;
+}
+
+
+
+
 SampleBuffer::~SampleBuffer()
 {
 	MM_FREE( m_origData );
@@ -781,7 +829,7 @@ bool SampleBuffer::play( sampleFrame * _ab, handleState * _state,
 		}
 	}
 
-	if( tmp != NULL ) 
+	if( tmp != NULL )
 	{
 		MM_FREE( tmp );
 	}
@@ -1488,7 +1536,7 @@ SampleBuffer::handleState::handleState( bool _varying_pitch, int interpolation_m
 {
 	int error;
 	m_interpolationMode = interpolation_mode;
-	
+
 	if( ( m_resamplingData = src_new( interpolation_mode, DEFAULT_CHANNELS, &error ) ) == NULL )
 	{
 		qDebug( "Error: src_new() failed in sample_buffer.cpp!\n" );