Changeset 762

Timestamp:

02/02/09 02:35:26 (4 years ago)

Author:

wolke

Message:

merge rev 756:761 from trunk

Location:

branches/new_fx_rack_and_sample_fun

Files:

• . (modified) (1 prop)
• gui/src/PatternEditor/PatternEditorPanel.cpp (modified) (2 diffs)
• gui/src/PatternPropertiesDialog.cpp (modified) (2 diffs)
• gui/src/PatternPropertiesDialog.h (modified) (1 diff)
• gui/src/SongEditor/SongEditor.cpp (modified) (1 diff)
• gui/src/SongEditor/SongEditorPanel.cpp (modified) (1 diff)
• libs/hydrogen/src/hydrogen.cpp (modified) (1 diff)

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

@@ -837 +837 @@
         int nSelected = str.toInt();
 
+        if ( !m_pPattern ) {
+                return;
+        }
+
         if ( m_pPattern->get_lenght() == nEighth * nSelected ) {
                 // non e' necessario aggiornare
@@ -842 +846 @@
         }
 
-
-        if ( !m_pPattern ) {
-                return;
-        }
 
         if ( !m_bEnablePatternResize ) {

branches/new_fx_rack_and_sample_fun/gui/src/PatternPropertiesDialog.cpp

@@ -65 +65 @@
                 }
         }
+
+        defaultNameCheck( pattern->get_name() );
+        okBtn->setEnabled(true);
 }
 
@@ -107 +110 @@
 }
 
+void PatternPropertiesDialog::defaultNameCheck( QString pattName )
+{
+
+        PatternList *patternList = Hydrogen::get_instance()->getSong()->get_pattern_list();
+        
+        for (uint i = 0; i < patternList->get_size(); i++) {
+                if ( patternList->get(i)->get_name() == pattName) {
+                                patternNameTxt->setText( trUtf8( "%1#2").arg(patternList->get(i)->get_name()) );
+                }
+        }
+}
+
 
 bool PatternPropertiesDialog::nameCheck( QString pattName )

branches/new_fx_rack_and_sample_fun/gui/src/PatternPropertiesDialog.h

@@ -47 +47 @@
                 /// Does some name check
                 static bool nameCheck( QString );
+                void defaultNameCheck( QString );
 
         private slots:

branches/new_fx_rack_and_sample_fun/gui/src/SongEditor/SongEditor.cpp

@@ -1119 +1119 @@
         }
         else {
-                // there's no patterns..
-                pEngine->setSelectedPatternNumber( -1 );        // cosi' il pattern editor viene costretto ad aggiornarsi
+                // there's no patterns..        
+                Pattern *emptyPattern = Pattern::get_empty_pattern();
+                emptyPattern->set_name( trUtf8("Pattern 1") );
+                emptyPattern->set_category( trUtf8("not_categorized") );
+                pSongPatternList->add( emptyPattern );
+                pEngine->setSelectedPatternNumber( -1 );
+                pEngine->setSelectedPatternNumber( 0 );
         }
 

branches/new_fx_rack_and_sample_fun/gui/src/SongEditor/SongEditorPanel.cpp

@@ -339 +339 @@
         Song *song = engine->getSong();
         PatternList *patternList = song->get_pattern_list();
+        int emptyPatternNo = patternList->get_size() + 1;
 
         Pattern *emptyPattern = Pattern::get_empty_pattern();
-        emptyPattern->set_name( trUtf8("Pattern") );
+        emptyPattern->set_name( trUtf8("Pattern %1").arg(emptyPatternNo) );
         emptyPattern->set_category( trUtf8("not_categorized") );
 

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

@@ -2415 +2415 @@
         } else {
                 getSong()->purge_instrument( pInstr );
+        }
+
+        Song *pSong = getSong();
+        InstrumentList* pList = pSong->get_instrument_list();
+        if(pList->get_size()==1){
+                AudioEngine::get_instance()->lock("HYdrogen::removeInstrument remove last instrument");
+                Instrument* pInstr = pList->get( 0 );
+                pInstr->set_name( (QString( "Instrument 1" )) );
+                // remove all layers
+                for ( int nLayer = 0; nLayer < MAX_LAYERS; nLayer++ ) {
+                        InstrumentLayer* pLayer = pInstr->get_layer( nLayer );
+                        delete pLayer;
+                        pInstr->set_layer( NULL, nLayer );
+                }               
+        AudioEngine::get_instance()->unlock();
+        EventQueue::get_instance()->push_event( EVENT_SELECTED_INSTRUMENT_CHANGED, -1 );
+        INFOLOG("clear last instrument to empty instrument 1 instead delete the last instrument");
+        return;
         }