Clean up the Code

src/gridlogic.cxx

@@ -101,7 +101,7 @@ void GridLogic::launchScene( int scene )
 					lc->queueStop();
 					jack->getControllerUpdater()->setSceneState( t, s, lc->getState() );
 				} else if ( lc->somethingQueued() ) {
-					lc->neutralize();
+					lc->resetQueues();
 					jack->getControllerUpdater()->setSceneState( t, s, lc->getState() );
 				}
 			}
@@ -181,10 +181,10 @@ void GridLogic::pressed( int track, int scene )
 
 		// don't re-trigger if already playing!
 		if ( s == STATE_STOP_QUEUED && lc->playing() )
-			lc->neutralize();
+			lc->resetQueues();
 
 		if ( s == STATE_RECORD_QUEUED )
-			lc->neutralize();
+			lc->resetQueues();
 	}
 
 	// check state of new clip, if getQueuePlay() == true, queueStop() all other scenes
@@ -196,7 +196,7 @@ void GridLogic::pressed( int track, int scene )
 				//LUPPP_NOTE("netralizing & qStop on scene %i due to press on %i", i, scene );
 				LooperClip* ilc = jack->getLooper( track )->getClip( i );
 
-				ilc->neutralize();
+				ilc->resetQueues();
 				ilc->queueStop();
 				jack->getControllerUpdater()->setSceneState(track, i, ilc->getState() );
 			}

src/looperclip.cxx

@@ -117,10 +117,6 @@ void LooperClip::load( AudioBuffer* ab )
 
 	_buffer = ab;
 
-	_playhead = 0;
-	_barsPlayed = 0;
-	jack->getControllerUpdater()->setTrackSceneProgress(track, scene, 0);
-
 	// set the endpoint to the buffer's size
 	_recordhead = _buffer->getSize();
 
@@ -182,6 +178,7 @@ void LooperClip::recieveSaveBuffer( AudioBuffer* saveBuffer )
 
 void LooperClip::setPlayHead(float ph)
 {
+	// TODO set _barsPlayed correctly, is this a good idea to allow playhead setting from outside?
 	if(!_recording&&_playing) {
 		_playhead = ph;
 		jack->getControllerUpdater()->setTrackSceneProgress(track, scene, getProgress() );
@@ -263,11 +260,6 @@ long LooperClip::getBufferLenght()
 
 long LooperClip::getActualAudioLength()
 {
-	char cbuffer [50];
-//    sprintf (cbuffer, "LooperClip recordhead %f,audioFrames %d \n",_recordhead,(int)_buffer->getAudioFrames());
-//    EventGuiPrint e( cbuffer );
-//    writeToGuiRingbuffer( &e );
-//    printf(cbuffer);
 	return _buffer->getAudioFrames();
 }
 
@@ -286,20 +278,15 @@ void LooperClip::bar()
 	}
 
 	// FIXME assumes 4 beats in a bar
-	if ( _playing && _barsPlayed >= getBeats() / 4) {
+	if ( _playing && _barsPlayed >= getBeats() / 4 || _playhead >= _recordhead) {
+		_barsPlayed = 0;
+		_playhead = 0;
 #ifdef DEBUG_TIME
 			cout << "reset: " << _playhead << " - " << _barsPlayed << "\n";
 #endif
-		_barsPlayed = 0;
-		_playhead = 0;
 	}
 
-	if ( _playhead >= _recordhead ) {
-		_playhead = 0.f;
-		_barsPlayed = 0;
-	}
-
-	if ( _queuePlay && _loaded ) {
+	if ( _queuePlay ) {
 		setPlaying();
 	}
 	else if (_queueStop && _loaded)
@@ -310,16 +297,9 @@ void LooperClip::bar()
 	{
 		setRecording();
 	} 
-	else if ( _queuePlay ) 
-	{
-		// clip was queued, but there's nothing loaded
-		// TODO manage this with Function
-		_queuePlay = false;
-	}
 }
 
-// TODO rename to resetQueues()
-void LooperClip::neutralize()
+void LooperClip::resetQueues()
 {
 	_queuePlay   = false;
 	_queueRecord = false;
@@ -377,6 +357,7 @@ void LooperClip::setRecording()
 
 void LooperClip::setPlaying() 
 {
+	if ( _loaded ) {
 		_loaded 	= true;
 		_playing    = true;
 		_recording  = false;
@@ -389,11 +370,14 @@ void LooperClip::setPlaying()
 		_playhead 	= 0;
 
 		jack->getControllerUpdater()->setSceneState(track, scene, GridLogic::STATE_PLAYING );
+	} else {
+		resetQueues();
+	}
 }
 
 void LooperClip::setStopped()
 {
-	_loaded		= true;
+	if ( _loaded ) {
 		_playing    = false;
 		_recording  = false;
 
@@ -407,6 +391,9 @@ void LooperClip::setStopped()
 		// set "progress" to zero, as we're stopped!
 		jack->getControllerUpdater()->setTrackSceneProgress(track, scene, 0 );
 		jack->getControllerUpdater()->setSceneState(track, scene, GridLogic::STATE_STOPPED );
+	} else {
+		resetQueues();
+	}
 }
 
 GridLogic::State LooperClip::getState()

src/looperclip.hxx

@@ -92,7 +92,7 @@ public:
 	void setRecording();
 	void setStopped();
 
-	void  neutralize(); // removes all play || record states if on
+	void  resetQueues(); // removes all queued States
 	bool  somethingQueued(); // returns true if any state is queued
 
 	/// set buffer state