Allow SampleTCOs/Sample Clips to be reversed

include/SampleTrack.h

@@ -94,6 +94,7 @@ public slots:
 
 signals:
 	void sampleChanged();
+	void wasReversed();
 
 } ;
 
@@ -109,6 +110,7 @@ class SampleTCOView : public TrackContentObjectView
 
 public slots:
 	void updateSample();
+	void reverseSample();
 
 
 

src/core/SampleBuffer.cpp

@@ -296,75 +296,43 @@ void SampleBuffer::update( bool _keep_settings )
 }
 
 
-void SampleBuffer::convertIntToFloat ( int_sample_t * & _ibuf, f_cnt_t _frames, int _channels)
+void SampleBuffer::convertIntToFloat (int_sample_t * & ibuf, f_cnt_t frames, int channels)
 {
-	// following code transforms int-samples into
-	// float-samples and does amplifying & reversing
+	// following code transforms int-samples into float-samples and does amplifying & reversing
 	const float fac = 1 / OUTPUT_SAMPLE_MULTIPLIER;
-	m_data = MM_ALLOC( sampleFrame, _frames );
-	const int ch = ( _channels > 1 ) ? 1 : 0;
+	m_data = MM_ALLOC(sampleFrame, frames);
+	const int ch = (channels > 1) ? 1 : 0;
 
-	// if reversing is on, we also reverse when
-	// scaling
-	if( m_reversed )
+	// if reversing is on, we also reverse when scaling
+	bool isReversed = m_reversed;
+	int idx = isReversed ? (frames - 1) * channels : 0;
+	for (f_cnt_t frame = 0; frame < frames; ++frame)
 	{
-		int idx = ( _frames - 1 ) * _channels;
-		for( f_cnt_t frame = 0; frame < _frames;
-						++frame )
-		{
-			m_data[frame][0] = _ibuf[idx+0] * fac;
-			m_data[frame][1] = _ibuf[idx+ch] * fac;
-			idx -= _channels;
-		}
-	}
-	else
-	{
-		int idx = 0;
-		for( f_cnt_t frame = 0; frame < _frames;
-						++frame )
-		{
-			m_data[frame][0] = _ibuf[idx+0] * fac;
-			m_data[frame][1] = _ibuf[idx+ch] * fac;
-			idx += _channels;
-		}
+		m_data[frame][0] = ibuf[idx+0] * fac;
+		m_data[frame][1] = ibuf[idx+ch] * fac;
+		idx += isReversed ? -channels : channels;
 	}
 
-	delete[] _ibuf;
+	delete[] ibuf;
 }
 
-void SampleBuffer::directFloatWrite ( sample_t * & _fbuf, f_cnt_t _frames, int _channels)
-
+void SampleBuffer::directFloatWrite (sample_t * & fbuf, f_cnt_t frames, int channels)
 {
 
-	m_data = MM_ALLOC( sampleFrame, _frames );
-	const int ch = ( _channels > 1 ) ? 1 : 0;
+	m_data = MM_ALLOC(sampleFrame, frames);
+	const int ch = (channels > 1) ? 1 : 0;
 
-	// if reversing is on, we also reverse when
-	// scaling
-	if( m_reversed )
+	// if reversing is on, we also reverse when scaling
+	bool isReversed = m_reversed;
+	int idx = isReversed ? (frames - 1) * channels : 0;
+	for (f_cnt_t frame = 0; frame < frames; ++frame)
 	{
-		int idx = ( _frames - 1 ) * _channels;
-		for( f_cnt_t frame = 0; frame < _frames;
-						++frame )
-		{
-			m_data[frame][0] = _fbuf[idx+0];
-			m_data[frame][1] = _fbuf[idx+ch];
-			idx -= _channels;
-		}
-	}
-	else
-	{
-		int idx = 0;
-		for( f_cnt_t frame = 0; frame < _frames;
-						++frame )
-		{
-			m_data[frame][0] = _fbuf[idx+0];
-			m_data[frame][1] = _fbuf[idx+ch];
-			idx += _channels;
-		}
+		m_data[frame][0] = fbuf[idx+0];
+		m_data[frame][1] = fbuf[idx+ch];
+		idx += isReversed ? -channels : channels;
 	}
 
-	delete[] _fbuf;
+	delete[] fbuf;
 }
 
 
@@ -957,12 +925,18 @@ void SampleBuffer::visualize( QPainter & _p, const QRect & _dr,
 	const int xb = _dr.x();
 	const int first = focus_on_range ? _from_frame : 0;
 	const int last = focus_on_range ? _to_frame : m_frames;
-	for( int frame = first; frame < last; frame += fpp )
-	{
-		l[n] = QPointF( xb + ( (frame - first) * double( w ) / nb_frames ),
-			( yb - ( m_data[frame][0] * y_space * m_amplification ) ) );
-		r[n] = QPointF( xb + ( (frame - first) * double( w ) / nb_frames ),
-			( yb - ( m_data[frame][1] * y_space * m_amplification ) ) );
+
+	const bool isReversed = m_reversed;
+
+	auto startFrame = isReversed ? last : first;
+	auto count = (last - first) / fpp + 1;
+	auto step = isReversed ? -fpp : fpp;
+	for (int frame = startFrame, i = 0; i < count; frame += step, i++)
+	{
+		l[n] = QPointF (xb + ((frame - first) * double(w) / nb_frames),
+			(yb - (m_data[frame][0] * y_space * m_amplification)));
+		r[n] = QPointF (xb + ((frame - first) * double(w) / nb_frames),
+			(yb - (m_data[frame][1] * y_space * m_amplification)));
 		++n;
 	}
 	_p.setRenderHint( QPainter::Antialiasing );

src/tracks/SampleTrack.cpp

@@ -280,6 +280,10 @@ void SampleTCO::saveSettings( QDomDocument & _doc, QDomElement & _this )
 	{
 		_this.setAttribute( "color", color().name() );
 	}
+	if(m_sampleBuffer->reversed())
+	{
+		_this.setAttribute("reversed", "true");
+	}
 	// TODO: start- and end-frame
 }
 
@@ -310,11 +314,18 @@ void SampleTCO::loadSettings( const QDomElement & _this )
 		useCustomClipColor( true );
 		setColor( _this.attribute( "color" ) );
 	}
+
+	if(_this.hasAttribute("reversed"))
+	{
+		m_sampleBuffer->setReversed(true);
+		emit wasReversed();		// tell SampleTCOView to update the view
+	}
 }
 
 
 
 
+
 TrackContentObjectView * SampleTCO::createView( TrackView * _tv )
 {
 	return new SampleTCOView( this, _tv );
@@ -335,6 +346,9 @@ SampleTCOView::SampleTCOView( SampleTCO * _tco, TrackView * _tv ) :
 	connect( m_tco, SIGNAL( sampleChanged() ),
 			this, SLOT( updateSample() ) );
 
+	connect(m_tco, SIGNAL(wasReversed()),
+			this, SLOT(update()));
+
 	setStyle( QApplication::style() );
 }
 
@@ -408,6 +422,9 @@ void SampleTCOView::contextMenuEvent( QContextMenuEvent * _cme )
 				tr( "Set/clear record" ),
 						m_tco, SLOT( toggleRecord() ) );*/
 
+	contextMenu.addAction(embed::getIconPixmap("flip_x"),
+			tr("Reverse sample"), this, SLOT(reverseSample()));
+
 	contextMenu.addSeparator();
 
 	contextMenu.addAction( embed::getIconPixmap( "colorize" ),
@@ -625,6 +642,16 @@ void SampleTCOView::paintEvent( QPaintEvent * pe )
 
 
 
+void SampleTCOView::reverseSample()
+{
+	m_tco->sampleBuffer()->setReversed(!m_tco->sampleBuffer()->reversed());
+	Engine::getSong()->setModified();
+	update();
+}
+
+
+
+
 
 
 SampleTrack::SampleTrack(TrackContainer* tc) :