Changeset 2444

Timestamp:

01/22/12 02:03:21 (16 months ago)

Author:

wolke

Message:

bugfix against ticket 131 "the export song function don't support bpm changes in timeline"

tempo changing without use of rubberband batch processor is now possible.
the rubberband batch processor is not fast enough here. so i decide to disable them on audio export.

Location:

trunk/src

Files:

• core/src/IO/DiskWriterDriver.h (modified) (2 diffs)
• core/src/IO/disk_writer_driver.cpp (modified) (3 diffs)
• core/src/hydrogen.cpp (modified) (2 diffs)
• gui/src/ExportSongDialog.cpp (modified) (1 diff)

trunk/src/core/src/IO/DiskWriterDriver.h

@@ -61 +61 @@
         
                 void write( float* buffer_L, float* buffer_R, unsigned int bufferSize );
-        
+
+                void audioEngine_process_checkBPMChanged();
+
                 unsigned getBufferSize() {
                         return m_nBufferSize;
@@ -82 +84 @@
         private:
 
+
 };
 

trunk/src/core/src/IO/disk_writer_driver.cpp

@@ -40 +40 @@
     Object* __object = ( Object* )param;
         DiskWriterDriver *pDriver = ( DiskWriterDriver* )param;
+        pDriver->setBpm( Hydrogen::get_instance()->getSong()->__bpm );
+        pDriver->audioEngine_process_checkBPMChanged();
         __INFOLOG( "DiskWriterDriver thread start" );
 
@@ -131 +133 @@
 
 
-        //calculate exact song length in frames (no loops).
+        Hydrogen* engine = Hydrogen::get_instance();
+
         std::vector<PatternList*> *pPatternColumns = Hydrogen::get_instance()->getSong()->get_pattern_group_vector();
         int nColumns = pPatternColumns->size();
 
         int nPatternSize;
-        int nSongSize = 0;
-        for ( int i = 0; i < nColumns; ++i ) {
-                PatternList *pColumn = ( *pPatternColumns )[ i ];
+        int validBpm = Hydrogen::get_instance()->getSong()->__bpm;
+        float ticksize = 0;
+        for ( int patternposition = 0; patternposition < nColumns; ++patternposition ) {
+                PatternList *pColumn = ( *pPatternColumns )[ patternposition ];
                 if ( pColumn->size() != 0 ) {
                         nPatternSize = pColumn->get( 0 )->get_length();
                 } else {
                         nPatternSize = MAX_NOTES;
-                }
-                nSongSize += nPatternSize;
-        }
-
-        float ticksize = pDriver->m_nSampleRate * 60.0 /  Hydrogen::get_instance()->getSong()->__bpm / 192 *4;
-         //here we have the song length in frames dependent from bpm and samplerate
-        unsigned songLengthInFrames = ticksize * nSongSize;
-
-        unsigned frameNumber = 0;
-        int lastRun = 0;
-        while ( frameNumber < songLengthInFrames ) {
-
-                int usedBuffer = pDriver->m_nBufferSize;
-
-                //this will calculate the the size from -last- (end of song) used frame buffer,
-                //which is mostly smaller than pDriver->m_nBufferSize
-                if( songLengthInFrames - frameNumber <  pDriver->m_nBufferSize ){
-                        lastRun = songLengthInFrames - frameNumber;
-                        usedBuffer = lastRun;
-                };
-
-                frameNumber += usedBuffer;
-                int ret = pDriver->m_processCallback( usedBuffer, NULL );
-
-                for ( unsigned i = 0; i < usedBuffer; i++ ) {
-                        if(pData_L[i] > 1){
-                                pData[i * 2] = 1;
-                        }
-                        else if(pData_L[i] < -1){
-                                pData[i * 2] = -1;
-                        }else
-                        { 
-                                pData[i * 2] = pData_L[i];
-                        }
-
-                        if(pData_R[i] > 1){
-                                pData[i * 2 + 1] = 1;
-                        }
-                        else if(pData_R[i] < -1){
-                                pData[i * 2 + 1] = -1;
-                        }else
-                        { 
-                                pData[i * 2 + 1] = pData_R[i];
-                        }
-                }
-                int res = sf_writef_float( m_file, pData, usedBuffer );
-                if ( res != ( int )usedBuffer ) {
-                        __ERRORLOG( "Error during sf_write_float" );
-                }
-
-                float fPercent = ( float ) frameNumber / ( float )songLengthInFrames * 100.0;
-                EventQueue::get_instance()->push_event( EVENT_PROGRESS, ( int )fPercent );
-//              frameNuber += lastrun;
-        }
+                }
+
+                ticksize = pDriver->m_nSampleRate * 60.0 /  Hydrogen::get_instance()->getSong()->__bpm / Hydrogen::get_instance()->getSong()->__resolution;
+                // check pattern bpm if timeline bpm is in use
+                if(Preferences::get_instance()->__usetimeline){
+                        if( engine->m_timelinevector.size() >= 1 ){
+
+                                for ( int t = 0; t < engine->m_timelinevector.size(); t++){
+                                        if(engine->m_timelinevector[t].m_htimelinebeat == patternposition && engine->m_timelinevector[t].m_htimelinebpm != validBpm){
+                                                validBpm =  engine->m_timelinevector[t].m_htimelinebpm;
+                                        }
+
+                                }
+                        }
+                        pDriver->setBpm(validBpm);
+                        ticksize = pDriver->m_nSampleRate * 60.0 / validBpm / Hydrogen::get_instance()->getSong()->__resolution;
+                        pDriver->audioEngine_process_checkBPMChanged();
+                        Hydrogen::get_instance()->setPatternPos(patternposition );
+
+                }
+                else
+                {
+                        ticksize = pDriver->m_nSampleRate * 60.0 /  Hydrogen::get_instance()->getSong()->__bpm / Hydrogen::get_instance()->getSong()->__resolution;
+                        //pDriver->m_transport.m_nTickSize = ticksize;
+                }
+
+
+                 //here we have the song length in frames dependent from bpm and samplerate
+                unsigned patternLengthInFrames = ticksize * nPatternSize;
+        
+                unsigned frameNumber = 0;
+                int lastRun = 0;
+                while ( frameNumber < patternLengthInFrames ) {
+        
+                        int usedBuffer = pDriver->m_nBufferSize;
+        
+                        //this will calculate the the size from -last- (end of song) used frame buffer,
+                        //which is mostly smaller than pDriver->m_nBufferSize
+                        if( patternLengthInFrames - frameNumber <  pDriver->m_nBufferSize ){
+                                lastRun = patternLengthInFrames - frameNumber;
+                                usedBuffer = lastRun;
+                        };
+        
+                        frameNumber += usedBuffer;
+                        int ret = pDriver->m_processCallback( usedBuffer, NULL );
+        
+                        for ( unsigned i = 0; i < usedBuffer; i++ ) {
+                                if(pData_L[i] > 1){
+                                        pData[i * 2] = 1;
+                                }
+                                else if(pData_L[i] < -1){
+                                        pData[i * 2] = -1;
+                                }else
+                                {
+                                        pData[i * 2] = pData_L[i];
+                                }
+        
+                                if(pData_R[i] > 1){
+                                        pData[i * 2 + 1] = 1;
+                                }
+                                else if(pData_R[i] < -1){
+                                        pData[i * 2 + 1] = -1;
+                                }else
+                                {
+                                        pData[i * 2 + 1] = pData_R[i];
+                                }
+                        }
+                        int res = sf_writef_float( m_file, pData, usedBuffer );
+                        if ( res != ( int )usedBuffer ) {
+                                __ERRORLOG( "Error during sf_write_float" );
+                        }
+                }
+
+                // this progress bar methode is not exact but ok enough to give users a usable visible progress feedback
+                float fPercent = ( float )(patternposition +1) / ( float )nColumns * 100.0;
+                EventQueue::get_instance()->push_event( EVENT_PROGRESS, ( int )fPercent );
+        }
 
         delete[] pData;
@@ -321 +348 @@
 }
 
+void DiskWriterDriver::audioEngine_process_checkBPMChanged()
+{
+        float fNewTickSize =
+                        getSampleRate() * 60.0
+                        / Hydrogen::get_instance()->getSong()->__bpm
+                        / Hydrogen::get_instance()->getSong()->__resolution;
+
+        if ( fNewTickSize != m_transport.m_nTickSize ) {
+                // cerco di convertire ...
+                float fTickNumber =
+                                ( float )m_transport.m_nFrames
+                                / ( float )m_transport.m_nTickSize;
+
+                m_transport.m_nTickSize = fNewTickSize;
+
+                if ( m_transport.m_nTickSize == 0 ) {
+                        return;
+                }
+                long long nNewFrames = ( long long )( fTickNumber * fNewTickSize );
+                // update frame position
+                m_transport.m_nFrames = nNewFrames;
+
+                // currently unuseble here
+                //EventQueue::get_instance()->push_event( EVENT_RECALCULATERUBBERBAND, -1);
+        }
+}
 
 };

trunk/src/core/src/hydrogen.cpp

@@ -493 +493 @@
                         }
 #endif
-                        EventQueue::get_instance()->push_event( EVENT_RECALCULATERUBBERBAND, -1);
+                        EventQueue::get_instance()->push_event( EVENT_RECALCULATERUBBERBAND, -1);
                 }
         }
@@ -2385 +2385 @@
         // reset
         m_pAudioDriver->m_transport.m_nFrames = 0;      // reset total frames
-        m_pAudioDriver->setBpm( m_pSong->__bpm );
+        //m_pAudioDriver->setBpm( m_pSong->__bpm );
         m_nSongPos = 0;
         m_nPatternTickPosition = 0;

trunk/src/gui/src/ExportSongDialog.cpp

@@ -163 +163 @@
         
         std::vector<Hydrogen::HTimelineVector> timelineVector = engine->m_timelinevector; 
-        if( timelineVector.size() > 0 ){ 
+/*      if( timelineVector.size() > 0 ){
                 int res = QMessageBox::information( this, "Hydrogen", tr( "This version of hydrogen is not able to export songs with tempo changes. If you proceed, the song will be exported without tempo changes."), QMessageBox::Yes | QMessageBox::No | QMessageBox::YesToAll); 
                 if (res == QMessageBox::No ) return; 
                 if (res == QMessageBox::YesToAll ) Preferences::get_instance()->setShowExportWarning(true);
         } 
-
+*/
         /* 0: Export to single track
         *  1: Export to multiple tracks