More smaller fixes which address compiler warnings..

hydrogen-music · May 17, 2020 · 580f91c · 580f91c
1 parent 01475bb
commit 580f91c
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 19 deletions.
diff --git a/src/core/src/hydrogen.cpp b/src/core/src/hydrogen.cpp
@@ -1015,9 +1015,9 @@ inline void audioEngine_process_playNotes( unsigned long nframes )
 
 
 			/*
-					  * Check if the current instrument has the property "Stop-Note" set.
-					  * If yes, a NoteOff note is generated automatically after each note.
-					  */
+			 * Check if the current instrument has the property "Stop-Note" set.
+			 * If yes, a NoteOff note is generated automatically after each note.
+			 */
 			Instrument * noteInstrument = pNote->get_instrument();
 			if ( noteInstrument->is_stop_notes() ){
 				Note *pOffNote = new Note( noteInstrument,

diff --git a/src/core/src/sampler/sampler.cpp b/src/core/src/sampler/sampler.cpp
@@ -281,10 +281,11 @@ bool Sampler::__render_note( Note* pNote, unsigned nBufferSize, Song* pSong )
 	for (std::vector<InstrumentComponent*>::iterator it = pInstr->get_components()->begin() ; it !=pInstr->get_components()->end(); ++it) {
 		nReturnValues[nReturnValueIndex] = false;
 		InstrumentComponent *pCompo = *it;
-		DrumkitComponent* pMainCompo = pEngine->getSong()->get_component( pCompo->get_drumkit_componentID() );
+		DrumkitComponent* pMainCompo = nullptr;
 
-		if( pNote->get_specific_compo_id() != -1 && pNote->get_specific_compo_id() != pCompo->get_drumkit_componentID() )
+		if( pNote->get_specific_compo_id() != -1 && pNote->get_specific_compo_id() != pCompo->get_drumkit_componentID() ) {
 			continue;
+		}
 
 		if(		pInstr->is_preview_instrument()
 			||	pInstr->is_metronome_instrument()){
@@ -426,7 +427,6 @@ bool Sampler::__render_note( Note* pNote, unsigned nBufferSize, Song* pSong )
 							// successful and assign the
 							// results.
 							if ( nearestLayer > -1 ){
-								InstrumentLayer *pLayer = pCompo->get_layer( nearestLayer );
 								pSelectedLayer->SelectedLayer = nearestLayer;
 
 								// No loop needed in here.
@@ -492,7 +492,10 @@ bool Sampler::__render_note( Note* pNote, unsigned nBufferSize, Song* pSong )
 							int nearestLayer = -1;
 							for ( unsigned nLayer = 0; nLayer < m_nMaxLayers; ++nLayer ){
 								InstrumentLayer *pLayer = pCompo->get_layer( nLayer );
-								if ( pLayer == nullptr ) continue;
+								if ( pLayer == nullptr ) {
+									continue;
+								}
+
 
 								if ( min( abs( pLayer->get_start_velocity() - pNote->get_velocity() ),
 									  abs( pLayer->get_start_velocity() - pNote->get_velocity() ) ) <
@@ -523,8 +526,9 @@ bool Sampler::__render_note( Note* pNote, unsigned nBufferSize, Song* pSong )
 						if( __foundSamples > 0 ) {
 							__roundRobinID = pInstr->get_id() * 10 + __roundRobinID;
 							int p_indexToUse = pSong->get_latest_round_robin(__roundRobinID)+1;
-							if( p_indexToUse > __foundSamples - 1)
+							if( p_indexToUse > __foundSamples - 1) {
 								p_indexToUse = 0;
+							}
 
 							pSong->set_latest_round_robin(__roundRobinID, p_indexToUse);
 							nAlreadySelectedLayer = __possibleIndex[p_indexToUse];
@@ -656,19 +660,24 @@ bool Sampler::__render_note( Note* pNote, unsigned nBufferSize, Song* pSong )
 		if( (int) pSelectedLayer->SamplePosition == 0  && !pInstr->is_muted() )
 		{
 			if( Hydrogen::get_instance()->getMidiOutput() != nullptr ){
-			Hydrogen::get_instance()->getMidiOutput()->handleQueueNote( pNote );
+				Hydrogen::get_instance()->getMidiOutput()->handleQueueNote( pNote );
 			}
 		}
 
-		if ( fTotalPitch == 0.0 && pSample->get_sample_rate() == audio_output->getSampleRate() ) // NO RESAMPLE
+		if ( fTotalPitch == 0.0 && pSample->get_sample_rate() == audio_output->getSampleRate() ) { // NO RESAMPLE
 			nReturnValues[nReturnValueIndex] = __render_note_no_resample( pSample, pNote, pSelectedLayer, pCompo, pMainCompo, nBufferSize, nInitialSilence, cost_L, cost_R, cost_track_L, cost_track_R, pSong );
-		else // RESAMPLE
+		}
+		else { // RESAMPLE
 			nReturnValues[nReturnValueIndex] = __render_note_resample( pSample, pNote, pSelectedLayer, pCompo, pMainCompo, nBufferSize, nInitialSilence, cost_L, cost_R, cost_track_L, cost_track_R, fLayerPitch, pSong );
+		}
 
 		nReturnValueIndex++;
 	}
-	for ( unsigned i = 0 ; i < pInstr->get_components()->size() ; i++ )
-		if ( !nReturnValues[i] ) return false;
+	for ( unsigned i = 0 ; i < pInstr->get_components()->size() ; i++ ) {
+		if ( !nReturnValues[i] ) {
+			return false;
+		}
+	}
 	return true;
 }
 
@@ -1342,8 +1351,9 @@ void Sampler::setPlayingNotelength( Instrument* instrument, unsigned long ticks,
 								&& pNote->get_position() == noteOnTick ) {
 									AudioEngine::get_instance()->lock( RIGHT_HERE );
 
-									if ( ticks >  patternsize )
+									if ( ticks >  patternsize ) {
 										ticks = patternsize - noteOnTick;
+									}
 									pNote->set_length( ticks );
 									Hydrogen::get_instance()->getSong()->set_is_modified( true );
 									AudioEngine::get_instance()->unlock(); // unlock the audio engine
@@ -1353,8 +1363,9 @@ void Sampler::setPlayingNotelength( Instrument* instrument, unsigned long ticks,
 								if ( pNote->get_instrument() == pEngine->getSong()->get_instrument_list()->get( pEngine->getSelectedInstrumentNumber())
 								&& pNote->get_position() == noteOnTick ) {
 									AudioEngine::get_instance()->lock( RIGHT_HERE );
-									if ( ticks >  patternsize )
+									if ( ticks >  patternsize ) {
 										ticks = patternsize - noteOnTick;
+									}
 									pNote->set_length( ticks );
 									Hydrogen::get_instance()->getSong()->set_is_modified( true );
 									AudioEngine::get_instance()->unlock(); // unlock the audio engine

diff --git a/src/gui/src/InstrumentEditor/LayerPreview.cpp b/src/gui/src/InstrumentEditor/LayerPreview.cpp
@@ -58,8 +58,10 @@ LayerPreview::LayerPreview( QWidget* pParent )
 	setMouseTracking( true );
 
 	int w = 276;
-	if( InstrumentComponent::getMaxLayers() > 16)
+	if( InstrumentComponent::getMaxLayers() > 16) {
 		w = 261;
+	}
+
 	int h = 20 + m_nLayerHeight * InstrumentComponent::getMaxLayers();
 	resize( w, h );
 
@@ -268,9 +270,9 @@ void LayerPreview::mousePressEvent(QMouseEvent *ev)
 	if ( ev->y() < 20 ) {
 		float fVelocity = (float)ev->x() / (float)width();
 
-		Note *note = new Note( m_pInstrument, nPosition, fVelocity, fPan_L, fPan_R, nLength, fPitch );
-		note->set_specific_compo_id( m_nSelectedComponent );
-		AudioEngine::get_instance()->get_sampler()->note_on(note);
+		Note * pNote = new Note( m_pInstrument, nPosition, fVelocity, fPan_L, fPan_R, nLength, fPitch );
+		pNote->set_specific_compo_id( m_nSelectedComponent );
+		AudioEngine::get_instance()->get_sampler()->note_on(pNote);
 
 		for ( int i = 0; i < InstrumentComponent::getMaxLayers(); i++ ) {
 			InstrumentComponent *pCompo = m_pInstrument->get_component(m_nSelectedComponent);