Changeset 1569

Timestamp:

02/26/10 21:54:51 (3 years ago)

Author:

wolke

Message:

fix the export audio file length bug

Location:

branches/0.9.4

Files:

• gui/src/ExportSongDialog.cpp (modified) (3 diffs)
• libs/hydrogen/include/hydrogen/hydrogen.h (modified) (1 diff)
• libs/hydrogen/src/IO/DiskWriterDriver.h (modified) (1 diff)
• libs/hydrogen/src/IO/disk_writer_driver.cpp (modified) (8 diffs)
• libs/hydrogen/src/hydrogen.cpp (modified) (4 diffs)

branches/0.9.4/gui/src/ExportSongDialog.cpp

@@ -108 +108 @@
         QString filename = exportNameTxt->text();
         m_bExporting = true;
-        Hydrogen::get_instance()->startExportSong( filename );
+        Hydrogen::get_instance()->startExportSong( filename , 44100, 16 );
 }
 
@@ -140 +140 @@
                 //INFOLOG("SONO A 100");
                 
-                Hydrogen::get_instance()->stopExportSong();
+                //Hydrogen::get_instance()->stopExportSong();
                 m_bExporting = false;
                 QFile check( exportNameTxt->text() );
@@ -146 +146 @@
                         QMessageBox::information( this, "Hydrogen", trUtf8("Export failed!") );
                 }
-                accept();
         }
 }

branches/0.9.4/libs/hydrogen/include/hydrogen/hydrogen.h

@@ -114 +114 @@
         void restartDrivers();
 
-        void startExportSong( const QString& filename );
+        void startExportSong( const QString& filename, int rate, int depth );
         void stopExportSong();
 

branches/0.9.4/libs/hydrogen/src/IO/DiskWriterDriver.h

@@ -41 +41 @@
 class DiskWriterDriver : public AudioOutput
 {
-public:
-        unsigned m_nSampleRate;
-        QString m_sFilename;
-        unsigned m_nBufferSize;
-        audioProcessCallback m_processCallback;
-        float* m_pOut_L;
-        float* m_pOut_R;
+        public:
 
-        DiskWriterDriver( audioProcessCallback processCallback, unsigned nSamplerate, const QString& sFilename );
-        ~DiskWriterDriver();
-
-        int init( unsigned nBufferSize );
-
-        int connect();
-        void disconnect();
-
-        void write( float* buffer_L, float* buffer_R, unsigned int bufferSize );
-
-        unsigned getBufferSize() {
-                return m_nBufferSize;
-        }
-
-        unsigned getSampleRate();
-        float* getOut_L() {
-                return m_pOut_L;
-        }
-        float* getOut_R() {
-                return m_pOut_R;
-        }
-
-        virtual void play();
-        virtual void stop();
-        virtual void locate( unsigned long nFrame );
-        virtual void updateTransportInfo();
-        virtual void setBpm( float fBPM );
-
-private:
+                unsigned m_nSampleRate;
+                QString m_sFilename;
+                unsigned m_nBufferSize;
+                int m_nSampleDepth;
+                audioProcessCallback m_processCallback;
+                float* m_pOut_L;
+                float* m_pOut_R;
+        
+                DiskWriterDriver( audioProcessCallback processCallback, unsigned nSamplerate, const QString& sFilename, int nSampleDepth );
+                ~DiskWriterDriver();
+        
+                int init( unsigned nBufferSize );
+        
+                int connect();
+                void disconnect();
+        
+                void write( float* buffer_L, float* buffer_R, unsigned int bufferSize );
+        
+                unsigned getBufferSize() {
+                        return m_nBufferSize;
+                }
+        
+                unsigned getSampleRate();
+                float* getOut_L() {
+                        return m_pOut_L;
+                }
+                float* getOut_R() {
+                        return m_pOut_R;
+                }
+        
+                virtual void play();
+                virtual void stop();
+                virtual void locate( unsigned long nFrame );
+                virtual void updateTransportInfo();
+                virtual void setBpm( float fBPM );
+        
+        private:
 
 };

branches/0.9.4/libs/hydrogen/src/IO/disk_writer_driver.cpp

@@ -25 +25 @@
 #include <hydrogen/event_queue.h>
 #include <hydrogen/hydrogen.h>
+#include <hydrogen/Pattern.h>
 
 #include <pthread.h>
@@ -41 +42 @@
         // always rolling, no user interaction
         pDriver->m_transport.m_status = TransportInfo::ROLLING;
-
 
         SF_INFO soundInfo;
@@ -47 +47 @@
 //      soundInfo.frames = -1;//getNFrames();           ///\todo: da terminare
         soundInfo.channels = 2;
-        soundInfo.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16;
+        //default format = waf 16bit
+        int sfformat = 0x010000;
+        int bits = 0x0002;
+
+        soundInfo.format =  sfformat|bits;
 
         if ( !sf_format_check( &soundInfo ) ) {
@@ -54 +58 @@
         }
 
-        SNDFILE* m_file = sf_open( pDriver->m_sFilename.toAscii(), SFM_WRITE, &soundInfo );
+
+        SNDFILE* m_file = sf_open( pDriver->m_sFilename.toLocal8Bit(), SFM_WRITE, &soundInfo );
 
         float *pData = new float[ pDriver->m_nBufferSize * 2 ]; // always stereo
@@ -61 +66 @@
         float *pData_R = pDriver->m_pOut_R;
 
-        while ( pDriver->m_processCallback( pDriver->m_nBufferSize, NULL ) == 0 ) {
-                // process...
-                for ( unsigned i = 0; i < pDriver->m_nBufferSize; i++ ) {
+
+        //calculate exaxt song frames.
+        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 ];
+                if ( pColumn->get_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;
+        unsigned songLengthinFrames = ticksize * nSongSize; 
+
+        unsigned frameNumber = 0;
+        int lastRun = 0;
+        while ( frameNumber < songLengthinFrames ) {
+
+                int usedBuffer = 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;
@@ -84 +121 @@
                         }
                 }
-                int res = sf_writef_float( m_file, pData, pDriver->m_nBufferSize );
-                if ( res != ( int )pDriver->m_nBufferSize ) {
+                int res = sf_writef_float( m_file, pData, usedBuffer );
+                if ( res != ( int )usedBuffer ) {
                         _ERRORLOG( "Error during sf_write_float" );
                 }
 
-                if ( ( pDriver->m_transport.m_nFrames % 65536 ) == 0 ) {
-                        int nPatterns = Hydrogen::get_instance()->getSong()->get_pattern_group_vector()->size();
-                        int nCurrentPatternPos = Hydrogen::get_instance()->getPatternPos();
-                        assert( nCurrentPatternPos != -1 );
-
-                        float fPercent = ( float ) nCurrentPatternPos / ( float )nPatterns * 100.0;
-                        EventQueue::get_instance()->push_event( EVENT_PROGRESS, ( int )fPercent );
-                        _INFOLOG( QString( "DiskWriterDriver: %1%, transport frames:%2" ).arg( fPercent ).arg( pDriver->m_transport.m_nFrames ) );
-                }
+                float fPercent = ( float ) frameNumber / ( float )songLengthinFrames * 100.0;
+                EventQueue::get_instance()->push_event( EVENT_PROGRESS, ( int )fPercent );
+//              frameNuber += lastrun;
         }
-        EventQueue::get_instance()->push_event( EVENT_PROGRESS, 100 );
 
         delete[] pData;
@@ -109 +139 @@
 
         pthread_exit( NULL );
+
+//      Hydrogen::get_instance()->stopExportSong();
         return NULL;
 }
@@ -115 +147 @@
 
 
-DiskWriterDriver::DiskWriterDriver( audioProcessCallback processCallback, unsigned nSamplerate, const QString& sFilename )
+DiskWriterDriver::DiskWriterDriver( audioProcessCallback processCallback, unsigned nSamplerate, const QString& sFilename, int nSampleDepth )
                 : AudioOutput( "DiskWriterDriver" )
                 , m_nSampleRate( nSamplerate )
                 , m_sFilename( sFilename )
+                , m_nSampleDepth ( nSampleDepth )
                 , m_processCallback( processCallback )
 {

branches/0.9.4/libs/hydrogen/src/hydrogen.cpp

@@ -2119 +2119 @@
 
 /// Export a song to a wav file, returns the elapsed time in mSec
-void Hydrogen::startExportSong( const QString& filename )
+void Hydrogen::startExportSong( const QString& filename, int rate, int depth )
 {
         if ( getState() == STATE_PLAYING ) {
                 sequencer_stop();
         }
+        AudioEngine::get_instance()->get_sampler()->stop_playing_notes();
         Preferences *pPref = Preferences::get_instance();
 
@@ -2130 +2131 @@
 
         m_pSong->set_mode( Song::SONG_MODE );
-        m_pSong->set_loop_enabled( false );
-        unsigned nSamplerate = m_pAudioDriver->getSampleRate();
-
+        m_pSong->set_loop_enabled( true );
+//      unsigned nSamplerate = m_pAudioDriver->getSampleRate();
+        unsigned nSamplerate = (unsigned)rate;
         // stop all audio drivers
         audioEngine_stopAudioDrivers();
@@ -2141 +2142 @@
 
 
-        m_pAudioDriver = new DiskWriterDriver( audioEngine_process, nSamplerate, filename );
-
-        AudioEngine::get_instance()->get_sampler()->stop_playing_notes();
-
+        m_pAudioDriver = new DiskWriterDriver( audioEngine_process, nSamplerate, filename, depth);
+
+        
         // reset
         m_pAudioDriver->m_transport.m_nFrames = 0;      // reset total frames
@@ -2204 +2204 @@
         }
 }
-