Changeset 647

Timestamp:

11/14/08 21:26:12 (2 months ago)

Author:

wolke

Message:

fix segfault into Wave Display

Files:

• branches/new_fx_rack_and_sample_fun/gui/src/SampleEditor/MainSampleWaveDisplay.cpp (modified) (2 diffs)
• branches/new_fx_rack_and_sample_fun/gui/src/SampleEditor/MainSampleWaveDisplay.h (modified) (1 diff)
• branches/new_fx_rack_and_sample_fun/gui/src/SampleEditor/SampleEditor.cpp (modified) (3 diffs)
• branches/new_fx_rack_and_sample_fun/libs/hydrogen/src/IO/midi_input.cpp (modified) (3 diffs)
• branches/new_fx_rack_and_sample_fun/libs/hydrogen/src/sampler/sampler.cpp (modified) (2 diffs)

branches/new_fx_rack_and_sample_fun/gui/src/SampleEditor/MainSampleWaveDisplay.cpp

@@ -148 +148 @@
-
-
-QString
+const QString&
-{
-
-        Sample *pNewSample = Sample::load( filename );
-
+
-        if ( pNewSample ) {
-
@@ -165 +165 @@
-
-                float *pSampleDatal = pNewSample->get_data_l();
-
-
+
+
+
-                int nVall;
+                int nValr;
+                int newVall = 0;
+                int newValr = 0;
-                for ( int i = 0; i < width(); ++i ){
-                        for ( int j = 0; j < nScaleFactor; ++j ) {
-                                if ( j < nSampleLenght ) {
-
-
+
+
+
+
+
+
+
+
+
+
+
-                                }
-                                ++nSamplePos;
-                        }
-                        m_pPeakDatal[ i ] = nVall;
-                }
-
-                float *pSampleDatar = pNewSample->get_data_r();
-
-                nSamplePos = 0;
-                int nValr;
-                for ( int i = 0; i < width(); ++i ){
-                        for ( int j = 0; j < nScaleFactor; ++j ) {
-                                if ( j < nSampleLenght ) {
-                                        int newValr = (int)( pSampleDatar[ nSamplePos ] * fGain );
-                                        nValr = newValr;
-                                }
-                                ++nSamplePos;
-                        }
-                        m_pPeakDatar[ i ] = nValr;
-                }
-        }
-        delete pNewSample;
+        pNewSample = NULL;
-        update();
-

branches/new_fx_rack_and_sample_fun/gui/src/SampleEditor/MainSampleWaveDisplay.h

@@ -37 +37 @@
-                ~MainSampleWaveDisplay();
-
-QString
+const QString&
-                void updateDisplayPointer();
-

branches/new_fx_rack_and_sample_fun/gui/src/SampleEditor/SampleEditor.cpp

@@ -49 +49 @@
-                : QDialog ( pParent )
-                , Object ( "SampleEditor" )
-tru
+fals
-                , m_pSamplefromFile ( NULL )
-                , m_pSelectedLayer ( nSelectedLayer )
@@ -232 +232 @@
-
-// wavedisplays
+        AudioEngine::get_instance()->get_sampler()->stop_playing_notes();
-        m_divider = m_pSamplefromFile->get_n_frames() / 574.0F;
-        m_pMainSampleWaveDisplay = new MainSampleWaveDisplay( mainSampleview );
-pSamplefromFile->get_filename()
+samplename
-        m_pMainSampleWaveDisplay->move( 1, 1 );
-
-        m_pSampleAdjustView = new DetailWaveDisplay( mainSampleAdjustView );
-pSamplefromFile->get_filename()
+samplename
-        m_pSampleAdjustView->move( 1, 1 );
-
@@ -643 +644 @@
-void SampleEditor::on_LoopCountSpinBox_valueChanged( int )
-{
+        if ( m_pslframes > Hydrogen::get_instance()->getAudioOutput()->getSampleRate() * 60 ){
+                AudioEngine::get_instance()->get_sampler()->stop_playing_notes();
+                m_pMainSampleWaveDisplay->paintLocatorEvent( -1 , false);
+                m_pTimer->stop();
+                m_pPlayButton = false;
+        }
-        m_repeats = LoopCountSpinBox->value() ;
-        m_pSampleEditorStatus = false;
-        setSamplelengthFrames();
+        if ( m_pslframes > Hydrogen::get_instance()->getAudioOutput()->getSampleRate() * 60 * 30){ // >30 min
+                LoopCountSpinBox->setMaximum(LoopCountSpinBox->value() -1);     
+        }
+        
-}
-

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

@@ -156 +156 @@
-void MidiInput::handleNoteOnMessage( const MidiMessage& msg )
-{
-
+//
-
-
@@ -195 +195 @@
-                if ( bPatternSelect ) {
-                        int patternNumber = nNote - 36;
-
+//
-
-                        pEngine->sequencer_setNextPattern( patternNumber, false, false );
@@ -220 +220 @@
-void MidiInput::handleNoteOffMessage( const MidiMessage& msg )
-{
-
+//
-        if ( Preferences::getInstance()->m_bMidiNoteOffIgnore ) {
-                return;

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

@@ -787 +787 @@
-                {
-                        std::vector<PatternList*> *pColumns = mSong->get_pattern_group_vector();
-
+//
-                        int pos = pEngine->getPatternPos() +1;
-                        for ( int i = 0; i < pos; ++i ) {
@@ -809 +809 @@
-                                                if ( pNote!=NULL ) {
-                                                        if( !Preferences::getInstance()->__playselectedinstrument ){
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                                                }       
-                                                        }