Changeset 1468 for trunk/libs/hydrogen/src/IO/disk_writer_driver.cpp

Timestamp:

12/05/09 20:07:29 (3 years ago)

Author:

wolke

Message:

small codecleanup

Files:

• trunk/libs/hydrogen/src/IO/disk_writer_driver.cpp (modified) (2 diffs)

trunk/libs/hydrogen/src/IO/disk_writer_driver.cpp

@@ -134 +134 @@
         unsigned songLengthinFrames = ticksize * nSongSize; 
 
-        unsigned frameNuber = 0;
-        int lastrun = 0;
-        while ( frameNuber < songLengthinFrames ) {
-
-                int usedbuffer = pDriver->m_nBufferSize;
-
-                if( songLengthinFrames - frameNuber <  pDriver->m_nBufferSize){
-                        lastrun = songLengthinFrames - frameNuber;
-                        usedbuffer = lastrun;
-                        _ERRORLOG(QString("framenuber %1 lastrun: %2").arg(frameNuber).arg(lastrun));
+        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;
                 };
-                frameNuber += usedbuffer;
-                int ret = pDriver->m_processCallback( usedbuffer, NULL );
-
-                for ( unsigned i = 0; i < usedbuffer; i++ ) {
+
+                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;
@@ -169 +169 @@
                         }
                 }
-                int res = sf_writef_float( m_file, pData, usedbuffer );
-                if ( res != ( int )usedbuffer ) {
+                int res = sf_writef_float( m_file, pData, usedBuffer );
+                if ( res != ( int )usedBuffer ) {
                         _ERRORLOG( "Error during sf_write_float" );
                 }
 
-                float fPercent = ( float ) frameNuber / ( float )songLengthinFrames * 100.0;
+                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;
         pData = NULL;