Changeset 582

Timestamp:

10/20/08 20:32:45 (3 months ago)

Author:

wolke

Message:

add new noteoff type off note

Files:

• branches/new_fx_rack_and_sample_fun/data/hydrogen.default.conf (modified) (1 diff)
• branches/new_fx_rack_and_sample_fun/gui/src/AudioFileBrowser/AudioFileBrowser.cpp (modified) (1 diff)
• branches/new_fx_rack_and_sample_fun/gui/src/PatternEditor/DrumPatternEditor.cpp (modified) (6 diffs)
• branches/new_fx_rack_and_sample_fun/gui/src/PatternEditor/NotePropertiesRuler.cpp (modified) (2 diffs)
• branches/new_fx_rack_and_sample_fun/libs/hydrogen/include/hydrogen/Preferences.h (modified) (1 diff)
• branches/new_fx_rack_and_sample_fun/libs/hydrogen/include/hydrogen/note.h (modified) (2 diffs)
• branches/new_fx_rack_and_sample_fun/libs/hydrogen/src/hydrogen.cpp (modified) (1 diff)
• branches/new_fx_rack_and_sample_fun/libs/hydrogen/src/note.cpp (modified) (3 diffs)
• branches/new_fx_rack_and_sample_fun/libs/hydrogen/src/preferences.cpp (modified) (2 diffs)

branches/new_fx_rack_and_sample_fun/data/hydrogen.default.conf

@@ -182 +182 @@
-                                <textColor>40,40,40</textColor>
-                                <noteColor>40,40,40</noteColor>
-
+
-                                <lineColor>65,65,65</lineColor>
-                                <line1Color>75,75,75</line1Color>

branches/new_fx_rack_and_sample_fun/gui/src/AudioFileBrowser/AudioFileBrowser.cpp

@@ -53 +53 @@
-
-        model = new QDirModel();
-| QDir::Hidden 
+
-        model->setNameFilters( QStringList() << "*.wav" << "*.WAV" << "*.flac"<< "*.FLAC" << "*.aiff" << "*.AIFF"<< "*.au" << "*.AU" );
-        model->setSorting( QDir::DirsFirst |QDir::Name );

branches/new_fx_rack_and_sample_fun/gui/src/PatternEditor/DrumPatternEditor.cpp

@@ -185 +185 @@
-                        const int nLength = -1;
-                        const float fPitch = 0.0f;
-
+
+
-                        m_pPattern->note_map.insert( std::make_pair( nPosition, pNote ) );
-
@@ -225 +226 @@
-                                        break;
-                                }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-                // potrei essere sulla coda di una nota precedente..
@@ -282 +303 @@
-
-        if (m_bRightBtnPressed && m_pDraggedNote ) {
+                if ( m_pDraggedNote->get_noteoff() ) return;
-                int nTickColumn = getColumn( ev );
-
@@ -391 +413 @@
-        static const UIStyle *pStyle = Preferences::getInstance()->getDefaultUIStyle();
-        static const QColor noteColor( pStyle->m_patternEditor_noteColor.getRed(), pStyle->m_patternEditor_noteColor.getGreen(), pStyle->m_patternEditor_noteColor.getBlue() );
+        static const QColor noteoffColor( pStyle->m_patternEditor_noteoffColor.getRed(), pStyle->m_patternEditor_noteoffColor.getGreen(), pStyle->m_patternEditor_noteoffColor.getBlue() );
-
-        p.setRenderHint( QPainter::Antialiasing );
@@ -412 +435 @@
-        p.setPen( noteColor );
-
-
+&& note->get_noteoff() == false 
-                uint x_pos = 20 + (pos * m_nGridWidth);// - m_nGridWidth / 2.0;
-
@@ -433 +456 @@
-                p.drawLine(x_pos - 1, y_pos + 3, x_pos, y_pos + 4);
-        }
+        else if ( note->get_lenght() == 1 && note->get_noteoff() == true ){
+                p.setPen( noteoffColor );
+                uint x_pos = 20 + (pos * m_nGridWidth);// - m_nGridWidth / 2.0;
+
+                uint y_pos = ( nInstrument * m_nGridHeight) + (m_nGridHeight / 2) - 3;
+
+                // draw the "dot"
+                p.drawLine(x_pos, y_pos, x_pos + 5, y_pos + 5);         // A
+                p.drawLine(x_pos, y_pos, x_pos - 5, y_pos + 5);         // B
+                p.drawLine(x_pos, y_pos + 8, x_pos + 5, y_pos + 5);     // C
+                p.drawLine(x_pos - 5, y_pos + 5, x_pos, y_pos + 8);     // D
+
+                p.drawLine(x_pos, y_pos + 3, x_pos + 4, y_pos + 5);
+                p.drawLine(x_pos, y_pos + 3, x_pos - 4, y_pos + 5);
+                p.drawLine(x_pos, y_pos + 7, x_pos + 4, y_pos + 5);
+                p.drawLine(x_pos - 4, y_pos + 5, x_pos, y_pos + 7);
+
+                p.drawLine(x_pos, y_pos + 4, x_pos + 3, y_pos + 5);
+                p.drawLine(x_pos, y_pos + 4, x_pos - 3, y_pos + 5);
+                p.drawLine(x_pos, y_pos + 6, x_pos + 3, y_pos + 5);
+                p.drawLine(x_pos - 3, y_pos + 5, x_pos, y_pos + 6);             
+
+
+        }               
-        else {
-                uint x = 20 + (pos * m_nGridWidth);

branches/new_fx_rack_and_sample_fun/gui/src/PatternEditor/NotePropertiesRuler.cpp

@@ -120 +120 @@
-                }
-
-
+&& !pNote->get_noteoff() 
-                        pNote->set_velocity( val );
-
@@ -210 +210 @@
-                        continue;
-                }
-
+&& !pNote->get_noteoff() 
-                        float val = pNote->get_velocity() + delta;
-                        if (val > 1.0) {

branches/new_fx_rack_and_sample_fun/libs/hydrogen/include/hydrogen/Preferences.h

@@ -111 +111 @@
-        H2RGBColor m_patternEditor_textColor;
-        H2RGBColor m_patternEditor_noteColor;
+        H2RGBColor m_patternEditor_noteoffColor;
-        H2RGBColor m_patternEditor_lineColor;
-        H2RGBColor m_patternEditor_line1Color;

branches/new_fx_rack_and_sample_fun/libs/hydrogen/include/hydrogen/note.h

@@ -200 +200 @@
-        }
-
+        void set_noteoff( bool noteOff ) {
+                __noteoff = noteOff;
+        }
+        float get_noteoff() const {
+                return __noteoff;
+        }
+
+        
+
-
-private:
@@ -208 +217 @@
-        float __pan_r;                  ///< Pan of the note (right volume) [0..1]
-        float __leadlag;                ///< Lead or lag offset of the note
+        bool __noteoff;                 ///< note type
-
-        int __lenght;

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

@@ -543 +543 @@
-
-                        // aggiungo la nota alla lista di note da eseguire
+                        if ( pNote->get_noteoff() ){
+                                AudioEngine::get_instance()->get_sampler()->note_off( pNote );
+                        }
-                        AudioEngine::get_instance()->get_sampler()->note_on( pNote );
-
+
-                        m_songNoteQueue.pop(); // rimuovo la nota dalla lista di note
-                        pNote->get_instrument()->dequeue();

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

@@ -54 +54 @@
-                , __velocity( velocity )
-                , __leadlag( 0.0 )
+                , __noteoff( false)
-{
-        set_pan_l( fPan_L );
@@ -76 +77 @@
-        set_lenght(     pNote->get_lenght()     );
-        set_pitch(      pNote->get_pitch()      );
+        set_noteoff(    pNote->get_noteoff()    );
-        m_noteKey       =       pNote->m_noteKey;
-        m_fCutoff       =       pNote->m_fCutoff;
@@ -128 +130 @@
-void Note::dumpInfo()
-{
-
++ "\t noteoff: " + to_string( get_noteoff() ) 
-}
-

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

@@ -1010 +1010 @@
-        LocalFileMng::writeXmlString( &patternEditorNode, "textColor", m_pDefaultUIStyle->m_patternEditor_textColor.toStringFmt() );
-        LocalFileMng::writeXmlString( &patternEditorNode, "noteColor", m_pDefaultUIStyle->m_patternEditor_noteColor.toStringFmt() );
+
+        if (m_pDefaultUIStyle->m_patternEditor_noteoffColor.toStringFmt() == "-1,-1,-1" ){
+                m_pDefaultUIStyle->m_patternEditor_noteoffColor = H2RGBColor( "100, 100, 200" );
+        }
+        LocalFileMng::writeXmlString( &patternEditorNode, "noteoffColor", m_pDefaultUIStyle->m_patternEditor_noteoffColor.toStringFmt() );
+
-        LocalFileMng::writeXmlString( &patternEditorNode, "lineColor", m_pDefaultUIStyle->m_patternEditor_lineColor.toStringFmt() );
-        LocalFileMng::writeXmlString( &patternEditorNode, "line1Color", m_pDefaultUIStyle->m_patternEditor_line1Color.toStringFmt() );
@@ -1046 +1052 @@
-                m_pDefaultUIStyle->m_patternEditor_textColor = H2RGBColor( LocalFileMng::readXmlString( pPatternEditorNode, "textColor", m_pDefaultUIStyle->m_patternEditor_textColor.toStringFmt() ) );
-                m_pDefaultUIStyle->m_patternEditor_noteColor = H2RGBColor( LocalFileMng::readXmlString( pPatternEditorNode, "noteColor", m_pDefaultUIStyle->m_patternEditor_noteColor.toStringFmt() ) );
+                m_pDefaultUIStyle->m_patternEditor_noteoffColor = H2RGBColor( LocalFileMng::readXmlString( pPatternEditorNode, "noteoffColor", m_pDefaultUIStyle->m_patternEditor_noteoffColor.toStringFmt() ) );
-                m_pDefaultUIStyle->m_patternEditor_lineColor = H2RGBColor( LocalFileMng::readXmlString( pPatternEditorNode, "lineColor", m_pDefaultUIStyle->m_patternEditor_lineColor.toStringFmt() ) );
-                m_pDefaultUIStyle->m_patternEditor_line1Color = H2RGBColor( LocalFileMng::readXmlString( pPatternEditorNode, "line1Color", m_pDefaultUIStyle->m_patternEditor_line1Color.toStringFmt() ) );