Changeset 494

Timestamp:

09/17/08 16:50:19 (5 years ago)

Author:

wolke

Message:

do some secure checks and change the preview length to sample length.

Location:

branches/audiofilebrowser

Files:

• gui/src/AudioFileBrowser/AudioFileBrowser.cpp (modified) (4 diffs)
• gui/src/SoundLibrary/FileBrowser.cpp (modified) (1 diff)
• libs/hydrogen/include/hydrogen/sampler/Sampler.h (modified) (1 diff)
• libs/hydrogen/src/sampler/sampler.cpp (modified) (2 diffs)

branches/audiofilebrowser/gui/src/AudioFileBrowser/AudioFileBrowser.cpp

@@ -64 +64 @@
         tree->resize( 799, 310 );
         tree->header()->resizeSection( 0, 405 );
+        tree->setAlternatingRowColors( true );
         tree->setRootIndex( model->index( Preferences::getInstance()->__lastsampleDirectory ) );
 
@@ -157 +158 @@
                                 qsec.sprintf( "%2.2f", sec );
                                 m_pLengthLable->setText( trUtf8( "Samplelength: " ) + qsec + trUtf8( " s" ) );
-
-                                //second part of check prevent left sample objects into memory
-                                if (playSamplescheckBox->isChecked() && AudioEngine::get_instance()->get_sampler()->get_playing_notes_number() == 0 ){
-                                        AudioEngine::get_instance()->get_sampler()->preview_sample(pNewSample);
-                                }else{
-                                        delete pNewSample;
+                                
+                                delete pNewSample;
+                                m_psamplefilename = path2;
+
+                                
+                                if (playSamplescheckBox->isChecked()){
+                                        if ( sec <= 600.00){
+                                                on_m_pPlayBtn_clicked();
+                                        }else
+                                        {
+                                                QMessageBox::information ( this, "Hydrogen", trUtf8( "No clicking audio preview for samples longer than 10 minutes!" )  );
+                                        }
                                 }
 
@@ -168 +175 @@
                                 m_pPlayBtn->setEnabled( true );
                                 openBTN->setEnabled( true );
-                                m_psamplefilename = path2;
+
                         }
                 
@@ -193 +200 @@
         Sample *pNewSample = Sample::load( m_psamplefilename );
         if ( pNewSample ){
-                AudioEngine::get_instance()->get_sampler()->preview_sample( pNewSample );
-                }
-}
+                int length = ( ( pNewSample->get_n_frames() / pNewSample->get_sample_rate() + 1) * 100 );
+                AudioEngine::get_instance()->get_sampler()->preview_sample( pNewSample, length );
+        }
+}
+
 
 

branches/audiofilebrowser/gui/src/SoundLibrary/FileBrowser.cpp

@@ -229 +229 @@
                                 if (pNewSample) {
                                         updateFileInfo( fileInfo.absoluteFilePath(), pNewSample->get_sample_rate(), pNewSample->get_size() );
-                                        AudioEngine::get_instance()->get_sampler()->preview_sample(pNewSample);
+                                        AudioEngine::get_instance()->get_sampler()->preview_sample(pNewSample, 192);
                                 }
                         }

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

@@ -68 +68 @@
         }
 
-        void preview_sample( Sample* sample );
+        void preview_sample( Sample* sample, int length );
         void preview_instrument( Instrument* instr );
 

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

@@ -692 +692 @@
 
 /// Preview, uses only the first layer
-void Sampler::preview_sample( Sample* sample )
+void Sampler::preview_sample( Sample* sample, int length )
 {
         AudioEngine::get_instance()->lock( "Sampler::previewSample" );
@@ -700 +700 @@
         Sample *pOldSample = pLayer->get_sample();
         pLayer->set_sample( sample );
-        delete pOldSample;
-
-        Note *previewNote = new Note( __preview_instrument, 0, 1.0, 0.5, 0.5, MAX_NOTES, 0 );
+
+        Note *previewNote = new Note( __preview_instrument, 0, 1.0, 0.5, 0.5, length, 0 );
 
         stop_playing_notes( __preview_instrument );
         note_on( previewNote );
+        delete pOldSample;
 
         AudioEngine::get_instance()->unlock();