Changeset 709

Timestamp:

01/02/09 01:53:39 (4 years ago)

Author:

wolke

Message:

merge 707:708 from trunk

Location:

branches/new_fx_rack_and_sample_fun

Files:

• . (modified) (1 prop)
• libs/hydrogen/include/hydrogen/action.h (modified) (2 diffs)
• libs/hydrogen/include/hydrogen/note.h (modified) (2 diffs)
• libs/hydrogen/include/hydrogen/sampler/Sampler.h (modified) (1 diff)
• libs/hydrogen/src/action.cpp (modified) (4 diffs)
• libs/hydrogen/src/hydrogen.cpp (modified) (2 diffs)
• libs/hydrogen/src/sampler/sampler.cpp (modified) (9 diffs)

branches/new_fx_rack_and_sample_fun/libs/hydrogen/include/hydrogen/action.h

@@ -32 +32 @@
         public:
                 Action( QString );
+                        
+                void setParameter1( QString text ){
+                        parameter1 = text;
+                }
                 
-                QString getType();
+                void setParameter2( QString text ){
+                        parameter2 = text;
+                }
                 
-                void setParameter1( QString );
-                void setParameter2( QString );
+                QString getParameter1(){
+                        return parameter1;
+                }
+                
+                QString getParameter2(){
+                        return parameter2;
+                }
 
-                QString getParameter1();
-                QString getParameter2();
+                QString getType(){
+                        return type;
+                }
+                
+
 
         private:
@@ -59 +73 @@
 
         public:
-                static ActionManager* getInstance();
-
                 bool handleAction( Action * );
                 
-                QStringList getActionList();
-                QStringList getEventList();
+                static ActionManager* getInstance();
+                
+                QStringList getActionList(){
+                        return actionList;
+                }
+                
+                QStringList getEventList(){
+                        return eventList;
+                }
 
                 ActionManager();

branches/new_fx_rack_and_sample_fun/libs/hydrogen/include/hydrogen/note.h

@@ -153 +153 @@
         void set_pan_l( float pan ) {
                 if ( pan > 0.5 ) {
-                        INFOLOG( "Pan R > 0.5" );
+//                      INFOLOG( "Pan R > 0.5" );
                         pan = 0.5;
                 }
@@ -164 +164 @@
         void set_pan_r( float pan ) {
                 if ( pan > 0.5 ) {
-                        INFOLOG( "Pan R > 0.5" );
+//                      INFOLOG( "Pan R > 0.5" );
                         pan = 0.5;
                 }

branches/new_fx_rack_and_sample_fun/libs/hydrogen/include/hydrogen/sampler/Sampler.h

@@ -93 +93 @@
 #endif
 
-        bool fade_note_out;
 
         unsigned __render_note( Note* pNote, unsigned nBufferSize, Song* pSong );

branches/new_fx_rack_and_sample_fun/libs/hydrogen/src/action.cpp

@@ -40 +40 @@
 
 /* Class Action */
-
-QString Action::getType(){
-        return type;
-}
-
-
-
-void Action::setParameter1( QString text ){
-        parameter1 = text;
-}
-
-void Action::setParameter2( QString text ){
-        parameter2 = text;
-}
-
-QString Action::getParameter1(){
-        return parameter1;
-}
-
-QString Action::getParameter2(){
-        return parameter2;
-}
-
 Action::Action( QString s ) : Object( "Action" ) {
         type = s;
@@ -71 +48 @@
 
 /* Class ActionManager */
-
 
 ActionManager::ActionManager() : Object( "ActionManager" ) {
@@ -125 +101 @@
 }
 
-
-/// Return an instance of ActionManager
 ActionManager* ActionManager::getInstance()
 {
@@ -132 +106 @@
                 instance = new ActionManager();
         }
-        
+                        
         return instance;
-}
-
-QStringList ActionManager::getActionList(){
-        return actionList;
-}
-
-QStringList ActionManager::getEventList(){
-        return eventList;
 }
 

branches/new_fx_rack_and_sample_fun/libs/hydrogen/src/hydrogen.cpp

@@ -1411 +1411 @@
 void audioEngine_noteOff( Note *note )
 {
+/*
         if ( note == NULL )     {
                 _ERRORLOG( "Error, note == NULL" );
@@ -1429 +1430 @@
         AudioEngine::get_instance()->unlock();
         delete note;
+*/
 }
 

branches/new_fx_rack_and_sample_fun/libs/hydrogen/src/sampler/sampler.cpp

@@ -76 +76 @@
         __preview_instrument->set_layer( new InstrumentLayer( Sample::load( sEmptySampleFilename ) ), 0 );
 
-        fade_note_out = false;
 }
 
@@ -405 +404 @@
                 if(steps > nBufferSize) steps = nBufferSize - 1;
         float substract = fadeout / steps;
+        bool fade_note_out = false;
         
         for ( int nBufferPos = nInitialBufferPos; nBufferPos < nTimes; ++nBufferPos ) {
@@ -413 +413 @@
                 }
 
-                fADSRValue = pNote->m_adsr.get_value( 1 );
-                fVal_L = pSample_data_L[ nSamplePos ] * fADSRValue;
-                fVal_R = pSample_data_R[ nSamplePos ] * fADSRValue;
-
-                // Low pass resonant filter
-                if ( bUseLPF ) {
-                        pNote->m_fBandPassFilterBuffer_L = fResonance * pNote->m_fBandPassFilterBuffer_L + fCutoff * ( fVal_L - pNote->m_fLowPassFilterBuffer_L );
-                        pNote->m_fLowPassFilterBuffer_L += fCutoff * pNote->m_fBandPassFilterBuffer_L;
-                        fVal_L = pNote->m_fLowPassFilterBuffer_L;
-
-                        pNote->m_fBandPassFilterBuffer_R = fResonance * pNote->m_fBandPassFilterBuffer_R + fCutoff * ( fVal_R - pNote->m_fLowPassFilterBuffer_R );
-                        pNote->m_fLowPassFilterBuffer_R += fCutoff * pNote->m_fBandPassFilterBuffer_R;
-                        fVal_R = pNote->m_fLowPassFilterBuffer_R;
-                }
-
                 if ( __stop_notes_intrument_ids_queue.size() >0 ){
                         //ERRORLOG(QString("noteoff-queue: %1, fade_note_out: %2").arg(__stop_notes_intrument_ids_queue.size()).arg(fade_note_out));
                         for ( unsigned i = 0; i < __stop_notes_intrument_ids_queue.size(); ) {
                                 QString id = __stop_notes_intrument_ids_queue[ i ];
-                                //assert( id );
                                 if ( pNote->get_instrument()->get_id() == id ) {
                                         fade_note_out = true;
@@ -456 +440 @@
                 }
 
+                fADSRValue = pNote->m_adsr.get_value( 1 );
+                fVal_L = pSample_data_L[ nSamplePos ] * fADSRValue * fadeout;
+                fVal_R = pSample_data_R[ nSamplePos ] * fADSRValue * fadeout;
+
+                // Low pass resonant filter
+                if ( bUseLPF ) {
+                        pNote->m_fBandPassFilterBuffer_L = fResonance * pNote->m_fBandPassFilterBuffer_L + fCutoff * ( fVal_L - pNote->m_fLowPassFilterBuffer_L );
+                        pNote->m_fLowPassFilterBuffer_L += fCutoff * pNote->m_fBandPassFilterBuffer_L;
+                        fVal_L = pNote->m_fLowPassFilterBuffer_L;
+
+                        pNote->m_fBandPassFilterBuffer_R = fResonance * pNote->m_fBandPassFilterBuffer_R + fCutoff * ( fVal_R - pNote->m_fLowPassFilterBuffer_R );
+                        pNote->m_fLowPassFilterBuffer_R += fCutoff * pNote->m_fBandPassFilterBuffer_R;
+                        fVal_R = pNote->m_fLowPassFilterBuffer_R;
+                }
+
 #ifdef JACK_SUPPORT
                 if ( __audio_output->has_track_outs()
@@ -461 +460 @@
                         assert( __track_out_L[ nInstrument ] );
                         assert( __track_out_R[ nInstrument ] );
-                        __track_out_L[ nInstrument ][nBufferPos] += fVal_L * cost_track_L * fadeout;
-                        __track_out_R[ nInstrument ][nBufferPos] += fVal_R * cost_track_R * fadeout;
+                        __track_out_L[ nInstrument ][nBufferPos] += fVal_L * cost_track_L;
+                        __track_out_R[ nInstrument ][nBufferPos] += fVal_R * cost_track_R;
                 }
 #endif
 
-                fVal_L = fVal_L * cost_L * fadeout;
-                fVal_R = fVal_R * cost_R * fadeout;
+                fVal_L = fVal_L * cost_L;
+                fVal_R = fVal_R * cost_R;
 
                 // update instr peak
@@ -594 +593 @@
         float fadeout = 1.0F;
         int steps = __audio_output->getSampleRate() / 100; // 1/100 sec
-                if(steps > nBufferSize) steps = nBufferSize - 1;
+        if(steps > nBufferSize) steps = nBufferSize - 1;
         float substract = fadeout / steps;
+        bool fade_note_out = false;
 
         for ( int nBufferPos = nInitialBufferPos; nBufferPos < nTimes; ++nBufferPos ) {
@@ -612 +612 @@
                         fVal_L = linear_interpolation( pSample_data_L[nSamplePos], pSample_data_L[nSamplePos + 1], fDiff );
                         fVal_R = linear_interpolation( pSample_data_R[nSamplePos], pSample_data_R[nSamplePos + 1], fDiff );
-                }
-
-                // ADSR envelope
-                fADSRValue = pNote->m_adsr.get_value( fStep );
-                fVal_L = fVal_L * fADSRValue;
-                fVal_R = fVal_R * fADSRValue;
-
-                // Low pass resonant filter
-                if ( bUseLPF ) {
-                        pNote->m_fBandPassFilterBuffer_L = fResonance * pNote->m_fBandPassFilterBuffer_L + fCutoff * ( fVal_L - pNote->m_fLowPassFilterBuffer_L );
-                        pNote->m_fLowPassFilterBuffer_L += fCutoff * pNote->m_fBandPassFilterBuffer_L;
-                        fVal_L = pNote->m_fLowPassFilterBuffer_L;
-
-                        pNote->m_fBandPassFilterBuffer_R = fResonance * pNote->m_fBandPassFilterBuffer_R + fCutoff * ( fVal_R - pNote->m_fLowPassFilterBuffer_R );
-                        pNote->m_fLowPassFilterBuffer_R += fCutoff * pNote->m_fBandPassFilterBuffer_R;
-                        fVal_R = pNote->m_fLowPassFilterBuffer_R;
                 }
 
@@ -659 +643 @@
                 }
 
+                // ADSR envelope
+                fADSRValue = pNote->m_adsr.get_value( fStep );
+                fVal_L = fVal_L * fADSRValue * fadeout;
+                fVal_R = fVal_R * fADSRValue * fadeout;
+
+                // Low pass resonant filter
+                if ( bUseLPF ) {
+                        pNote->m_fBandPassFilterBuffer_L = fResonance * pNote->m_fBandPassFilterBuffer_L + fCutoff * ( fVal_L - pNote->m_fLowPassFilterBuffer_L );
+                        pNote->m_fLowPassFilterBuffer_L += fCutoff * pNote->m_fBandPassFilterBuffer_L;
+                        fVal_L = pNote->m_fLowPassFilterBuffer_L;
+
+                        pNote->m_fBandPassFilterBuffer_R = fResonance * pNote->m_fBandPassFilterBuffer_R + fCutoff * ( fVal_R - pNote->m_fLowPassFilterBuffer_R );
+                        pNote->m_fLowPassFilterBuffer_R += fCutoff * pNote->m_fBandPassFilterBuffer_R;
+                        fVal_R = pNote->m_fLowPassFilterBuffer_R;
+                }
+
 #ifdef JACK_SUPPORT
                 if ( __audio_output->has_track_outs()
@@ -664 +664 @@
                         assert( __track_out_L[ nInstrument ] );
                         assert( __track_out_R[ nInstrument ] );
-                        __track_out_L[ nInstrument ][nBufferPos] += (fVal_L * cost_track_L * fadeout);
-                        __track_out_R[ nInstrument ][nBufferPos] += (fVal_R * cost_track_R * fadeout);
+                        __track_out_L[ nInstrument ][nBufferPos] += (fVal_L * cost_track_L);
+                        __track_out_R[ nInstrument ][nBufferPos] += (fVal_R * cost_track_R);
                 }
 #endif
 
-                fVal_L = fVal_L * cost_L * fadeout;
-                fVal_R = fVal_R * cost_R * fadeout;
+                fVal_L = fVal_L * cost_L;
+                fVal_R = fVal_R * cost_R;
 
                 // update instr peak