Changeset 533

Timestamp:

09/29/08 01:34:32 (2 months ago)

Author:

gabriel

Message:

Merge rev 414:428 from trunk

Conflicts:

libs/hydrogen/src/hydrogen.cpp

Files:

• branches/jackMidi/gui/src/HydrogenApp.cpp (modified) (1 diff)
• branches/jackMidi/gui/src/MainForm.cpp (modified) (5 diffs)
• branches/jackMidi/gui/src/Mixer/Mixer.cpp (modified) (1 diff)
• branches/jackMidi/gui/src/Mixer/Mixer.h (modified) (1 diff)
• branches/jackMidi/gui/src/PatternEditor/DrumPatternEditor.cpp (modified) (1 diff)
• branches/jackMidi/gui/src/PatternEditor/PatternEditorInstrumentList.cpp (modified) (5 diffs)
• branches/jackMidi/gui/src/PatternEditor/PatternEditorInstrumentList.h (modified) (1 diff)
• branches/jackMidi/gui/src/SongEditor/SongEditor.cpp (modified) (2 diffs)
• branches/jackMidi/gui/src/SoundLibrary/SoundLibraryImportDialog.cpp (modified) (2 diffs)
• branches/jackMidi/gui/src/SoundLibrary/SoundLibraryPanel.cpp (modified) (10 diffs)
• branches/jackMidi/gui/src/SoundLibrary/SoundLibraryPanel.h (modified) (3 diffs)
• branches/jackMidi/gui/src/SoundLibrary/SoundLibraryPropertiesDialog.cpp (modified) (1 diff)
• branches/jackMidi/libs/hydrogen/include/hydrogen/Pattern.h (modified) (2 diffs)
• branches/jackMidi/libs/hydrogen/include/hydrogen/Song.h (modified) (1 diff)
• branches/jackMidi/libs/hydrogen/include/hydrogen/hydrogen.h (modified) (3 diffs)
• branches/jackMidi/libs/hydrogen/include/hydrogen/instrument.h (modified) (19 diffs)
• branches/jackMidi/libs/hydrogen/src/hydrogen.cpp (modified) (17 diffs)
• branches/jackMidi/libs/hydrogen/src/instrument.cpp (modified) (5 diffs)
• branches/jackMidi/libs/hydrogen/src/local_file_mgr.cpp (modified) (1 diff)
• branches/jackMidi/libs/hydrogen/src/pattern.cpp (modified) (2 diffs)
• branches/jackMidi/libs/hydrogen/src/sample.cpp (modified) (6 diffs)
• branches/jackMidi/libs/hydrogen/src/sampler/sampler.cpp (modified) (7 diffs)
• branches/jackMidi/libs/hydrogen/src/song.cpp (modified) (1 diff)

branches/jackMidi/gui/src/HydrogenApp.cpp

@@ -351 +351 @@
-void HydrogenApp::onEventQueueTimer()
-{
+        // use the timer to do schedule instrument slaughter;
-        EventQueue *pQueue = EventQueue::get_instance();
-

branches/jackMidi/gui/src/MainForm.cpp

@@ -496 +496 @@
-        h2app->setStatusBarMessage( trUtf8("Song saved."), 10000 );
-        //update SoundlibraryPanel
+        HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->test_expandedItems();
-        HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->updateDrumkitList();
-}
@@ -536 +537 @@
-        }
-        //update SoundlibraryPanel
+        HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->test_expandedItems();
-        HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->updateDrumkitList();
-}
@@ -622 +624 @@
-        
-        //update SoundlibraryPanel
+        HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->test_expandedItems();
-        HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->updateDrumkitList();
-}
@@ -921 +924 @@
-void MainForm::action_instruments_importLibrary()
-{
-  
-  
+       
+       
-}
-
@@ -929 +932 @@
-void MainForm::action_instruments_saveLibrary()
-{
-  
-  
-
-  
+       
+       
+
+       
-}
-

branches/jackMidi/gui/src/Mixer/Mixer.cpp

@@ -247 +247 @@
-void Mixer::soloClicked(uint nLine)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-void Mixer::noteOnClicked( MixerLine* ref )

branches/jackMidi/gui/src/Mixer/Mixer.h

@@ -52 +52 @@
-                void resizeEvent ( QResizeEvent *ev );
-                void soloClicked(uint nLine);
+                bool isSoloClicked(uint nLine);
-
-                void getPeaksInMixerLine( uint nMixerLine, float& fPeak_L, float& fPeak_R );

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

@@ -193 +193 @@
-                                Note *pNote2 = new Note( pSelectedInstrument, 0, fVelocity, fPan_L, fPan_R, nLength, fPitch);
-                                AudioEngine::get_instance()->get_sampler()->note_on(pNote2);
-//                              pSelectedInstrument->enqueue();
-                        }
-                }

branches/jackMidi/gui/src/PatternEditor/PatternEditorInstrumentList.cpp

@@ -139 +139 @@
-
-
+void InstrumentLine::setSoloed( bool soloed )
+{
+        m_pSoloBtn->setPressed( soloed );
+}
+
+
-
-void InstrumentLine::muteClicked()
@@ -213 +219 @@
-        Instrument *pSelectedInstrument = H->getSong()->get_instrument_list()->get( nSelectedInstrument );
-        
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        // this will force an update...
@@ -361 +368 @@
-{
-        Hydrogen *pEngine = Hydrogen::get_instance();
+        pEngine->removeInstrument( m_nInstrumentNumber, false );
-        
-        AudioEngine::get_instance()->lock("InstrumentLine::functionDeleteInstrument");
-        Instrument *pInstr = pEngine->getSong()->get_instrument_list()->get( m_nInstrumentNumber ); 
-
-        // if the instrument was the last on the instruments list, select the next-last 
-        if ( m_nInstrumentNumber >= (int)pEngine->getSong()->get_instrument_list()->get_size() -1 ) { 
-                Hydrogen::get_instance()->setSelectedInstrumentNumber(std::max(0, m_nInstrumentNumber - 1) ); 
-        } 
-
-        // delete the instrument from the instruments list 
-        pEngine->getSong()->get_instrument_list()->del( m_nInstrumentNumber ); 
-        pEngine->getSong()->__is_modified = true; 
-
-
-        // delete all the notes using this instrument 
-        PatternList* pPatternList = pEngine->getSong()->get_pattern_list(); 
-        for ( int nPattern = 0; nPattern < (int)pPatternList->get_size(); ++nPattern ) { 
-                H2Core::Pattern *pPattern = pPatternList->get( nPattern ); 
-
-                std::multimap <int, Note*>::iterator pos; 
-                for ( pos = pPattern->note_map.begin(); pos != pPattern->note_map.end(); ++pos ) { 
-                Note *pNote = pos->second; 
-                        assert( pNote ); 
-                        if ( pNote->get_instrument() == pInstr ) { 
-                                delete pNote; 
-                                pPattern->note_map.erase( pos ); 
-                        } 
-                } 
-        } 
-
-        // stop all notes playing 
-        AudioEngine::get_instance()->get_sampler()->stop_playing_notes(); 
-
-        delete pInstr; 
-
-#ifdef JACK_SUPPORT
-        pEngine->renameJackPorts();
-#endif
-        AudioEngine::get_instance()->unlock();
-
-        // this will force an update... 
-        EventQueue::get_instance()->push_event( EVENT_SELECTED_INSTRUMENT_CHANGED, -1 ); 
-}
-
@@ -517 +489 @@
-        Song *pSong = pEngine->getSong();
-        InstrumentList *pInstrList = pSong->get_instrument_list();
+        Mixer * mixer = HydrogenApp::getInstance()->getMixer();
-
-        unsigned nSelectedInstr = pEngine->getSelectedInstrumentNumber();
@@ -551 +524 @@
-                        pLine->setSelected( nInstr == nSelectedInstr );
-                        pLine->setMuted( pInstr->is_muted() );
+                        if ( mixer ) {
+                                pLine->setSoloed( mixer->isSoloClicked( nInstr ) );
+                        }
-
-                }

branches/jackMidi/gui/src/PatternEditor/PatternEditorInstrumentList.h

@@ -53 +53 @@
-                void setNumber(int nIndex);
-                void setMuted(bool isMuted);
+                void setSoloed( bool soloed );
-
-        private slots:

branches/jackMidi/gui/src/SongEditor/SongEditor.cpp

@@ -993 +993 @@
-        int err = fileMng.savePattern( song , nSelectedPattern, patternname, realpatternname, 1 );
-        if ( err != 0 ) {
-
+
+
+
+
+
+
+
+
+
-        }
-
@@ -1001 +1009 @@
-        usleep ( 10000 );
-#endif 
+        HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->test_expandedItems();
-        HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->updateDrumkitList();
-}

branches/jackMidi/gui/src/SoundLibrary/SoundLibraryImportDialog.cpp

@@ -403 +403 @@
-
-                        // update the drumkit list
+                        HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->test_expandedItems();
-                        HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->updateDrumkitList();
-                        updateSoundLibraryList();
@@ -448 +449 @@
-                QMessageBox::information( this, "Hydrogen", QString( trUtf8( "SoundLibrary imported in %1" ).arg( dataDir )  ) );
-                // update the drumkit list
+                HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->test_expandedItems();
-                HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->updateDrumkitList();
-                setCursor( QCursor( Qt::ArrowCursor ) );

branches/jackMidi/gui/src/SoundLibrary/SoundLibraryPanel.cpp

@@ -79 +79 @@
-        m_pPatternMenu->addSeparator();
-        m_pPatternMenu->addAction( trUtf8( "Load" ), this, SLOT( on_patternLoadAction() ) );
+        m_pPatternMenu->addAction( trUtf8( "Delete" ), this, SLOT( on_patternDeleteAction() ) );
-
-        m_pPatternMenuList = new QMenu( this );
@@ -103 +104 @@
-        this->setLayout( pVBox );
-
+        expandpatternlist = false;
+        expandsongslist = false;
+
-        updateDrumkitList();
-}
@@ -138 +142 @@
-                m_pSongItem->setText( 0, trUtf8( "Songs" ) );
-                m_pSongItem->setToolTip( 0, "double click to expand the list" );
+                m_pSoundLibraryTree->setItemExpanded( m_pSongItem, expandsongslist );
-
-                for (uint i = 0; i < songList.size(); i++) 
@@ -159 +164 @@
-                m_pPatternItem->setText( 0, trUtf8( "Patterns" ) );
-                m_pPatternItem->setToolTip( 0, "double click to expand the list" );
-
+
+
-//this is to push the mng.getPatternList in all patterns/drumkit dirs
-                for (uint i = 0; i < patternDirList.size(); ++i) {
@@ -406 +412 @@
-                
-                        QString patternName = m_pSoundLibraryTree->currentItem()->text( 0 ) + ".h2pattern";
+                        QString drumkitname = m_pSoundLibraryTree->currentItem()->toolTip ( 0 );
-                        
-                        QString sDirectory = "";
@@ -420 +427 @@
-                        for (uint i = 0; i < allPatternDirList.size(); ++i) {
-                                QString testName = allPatternDirList[i];
-
+ && testName.contains( drumkitname )
-                
-                                        sDirectory = allPatternDirList[i];
@@ -535 +542 @@
-
-        Drumkit::removeDrumkit( sSoundLibrary );
-
-HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->
+
+
-}
-
@@ -655 +662 @@
-
-        QString patternName = m_pSoundLibraryTree->currentItem()->text( 0 ) + ".h2pattern";
+        QString drumkitname = m_pSoundLibraryTree->currentItem()->toolTip ( 0 );
-        Hydrogen *engine = Hydrogen::get_instance();
-        Song *song = engine->getSong();
@@ -672 +680 @@
-        for (uint i = 0; i < allPatternDirList.size(); ++i) {
-                QString testName = allPatternDirList[i];
-
-
-
-
+
+
-                } 
-        }
@@ -695 +701 @@
-}
-
+
+void SoundLibraryPanel::on_patternDeleteAction()
+{
+        LocalFileMng mng;
+
+        QString patternName = m_pSoundLibraryTree->currentItem()->text( 0 ) + ".h2pattern";
+        QString drumkitname = m_pSoundLibraryTree->currentItem()->toolTip ( 0 );
+        
+        QString sDirectory = "";
+
+        std::vector<QString> patternDirList = mng.getPatternDirList();
+
+                for (uint i = 0; i < patternDirList.size(); ++i) {
+                        QString absPath =  patternDirList[i];
+                        mng.getPatternList( absPath );
+                }
+
+        std::vector<QString> allPatternDirList = mng.getallPatternList();
+
+        for (uint i = 0; i < allPatternDirList.size(); ++i) {
+                QString testName = allPatternDirList[i];
+                if( testName.contains( patternName ) && testName.contains( drumkitname )){
+                        sDirectory = allPatternDirList[i];              
+                } 
+        }
+
+        int res = QMessageBox::information( this, "Hydrogen", tr( "Warning, the selected pattern will be deleted from disk.\nAre you sure?"), tr("&Ok"), tr("&Cancel"), 0, 1 );
+        if ( res == 1 ) {
+                return;
+        }
+
+        QFile rmfile(sDirectory );
+        bool err = rmfile.remove();
+        if ( err == false )
+        {
+                _ERRORLOG ( "Error removing the pattern" );
+        }
+
+        test_expandedItems();
+        updateDrumkitList();
+}
+
+
+void SoundLibraryPanel::test_expandedItems()
+{
+        expandsongslist = m_pSoundLibraryTree->isItemExpanded( m_pSongItem );
+        expandpatternlist = m_pSoundLibraryTree->isItemExpanded( m_pPatternItem );
+}

branches/jackMidi/gui/src/SoundLibrary/SoundLibraryPanel.h

@@ -45 +45 @@
-
-                void updateDrumkitList();
-
+
-
-        private slots:
@@ -61 +61 @@
-                void on_songLoadAction();
-                void on_patternLoadAction();
+                void on_patternDeleteAction();
-
-        private:
@@ -81 +82 @@
-                std::vector<H2Core::Drumkit*> m_systemDrumkitInfoList;
-                std::vector<H2Core::Drumkit*> m_userDrumkitInfoList;
+                bool expandpatternlist;
+                bool expandsongslist;
+        
-
-

branches/jackMidi/gui/src/SoundLibrary/SoundLibraryPropertiesDialog.cpp

@@ -133 +133 @@
-        //reload if necessary
-        if ( reload == true ){
+                HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->test_expandedItems();
-                HydrogenApp::getInstance()->getInstrumentRack()->getSoundLibraryPanel()->updateDrumkitList();
-        }

branches/jackMidi/libs/hydrogen/include/hydrogen/Pattern.h

@@ -31 +31 @@
-
-class Note;
+class Instrument;
-
-///
@@ -42 +43 @@
-        Pattern( const QString& name, const QString& category, unsigned lenght = MAX_NOTES );
-        ~Pattern();
+
+        /**
+          Delete notes that pertain to instrument I.
+          The function is thread safe (it locks the audio data while deleting notes)
+        */
+        void purge_instrument( Instrument * I );
+        
+        /**
+          Check if there are any notes pertaining to I
+        */
+        bool references_instrument( Instrument * I );
-        
-        static Pattern* get_empty_pattern();

branches/jackMidi/libs/hydrogen/include/hydrogen/Song.h

@@ -79 +79 @@
-        Song( const QString& name, const QString& author, float bpm, float volume );
-        ~Song();
+        
+        /**
+          Remove all the notes in the song that play on instrument I.
+          The function is real-time safe (it locks the audio data while deleting notes)
+        */
+        void purge_instrument( Instrument* I );
-
-        void set_volume( float volume ) {

branches/jackMidi/libs/hydrogen/include/hydrogen/hydrogen.h

@@ -120 +120 @@
-
-        int loadDrumkit( Drumkit *drumkitInfo );
-
+
+
+
+
-
-        //return the name of the current drumkit
@@ -191 +194 @@
-        void setNewBpmJTM( float bpmJTM);
-        void ComputeHumantimeFrames(uint32_t nFrames);
+        
+        void kill_instruments();
-
-private:
@@ -201 +206 @@
-        Song::SongMode m_oldEngineMode;
-        bool m_bOldLoopEnabled;
+        std::list<Instrument*> instrument_death_row; /// Deleting instruments too soon leads to potential crashes.
-};
-

branches/jackMidi/libs/hydrogen/include/hydrogen/instrument.h

@@ -27 +27 @@
-#include <hydrogen/globals.h>
-#include <hydrogen/Object.h>
+#include <cassert>
-
-namespace H2Core
@@ -104 +105 @@
-        );
-        
+        /// create a new object without anything in it.
+        static Instrument * create_empty();
-        ~Instrument();
-
+        /// creates a new object; loads samples from drumkit/instrument.
-        static Instrument* load_instrument(
-            const QString& drumkit_name,
@@ -111 +115 @@
-        );
-        
+        /// loads state _and_ samples into an Instrument from a `placeholder` instrument
+        /// (i.e. an Instrument that has everything but the actal samples.)
+        void load_from_placeholder( Instrument* placeholder, bool is_live = true );
+        
+        /// loads instrument from path into a `live` Instrument object.
+        void load_from_name(
+            const QString& drumkit_name,
+            const QString& instrument_name,
+            bool is_live = true
+        );
-
-        /**
-        \brief Returns a layer in the list
-         */
-
+inline 
-
-        /**
@@ -133 +147 @@
-                __id = id;
-        }
-
+inline 
-                return __id;
-        }
@@ -145 +159 @@
-                __mute_group = group;
-        }
-
+line in
-                return __mute_group;
-        }
@@ -152 +166 @@
-                __muted = muted;
-        }
-
+inline 
-                return __muted;
-        }
-
-
+inline 
-                return __pan_l;
-        }
@@ -163 +177 @@
-        }
-
-
+inline 
-                return __pan_r;
-        }
@@ -170 +184 @@
-        }
-
-
+inline 
-                return __gain;
-        }
@@ -177 +191 @@
-        }
-
-
+inline 
-                return __volume;
-        }
@@ -184 +198 @@
-        }
-
-
+inline 
-                return __filter_active;
-        }
@@ -191 +205 @@
-        }
-
-
+inline 
-                return __filter_resonance;
-        }
@@ -198 +212 @@
-        }
-
-
+inline 
-                return __filter_cutoff;
-        }
@@ -205 +219 @@
-        }
-
-
+inline 
-                return __peak_l;
-        }
@@ -212 +226 @@
-        }
-
-
+inline 
-                return __peak_r;
-        }
@@ -219 +233 @@
-        }
-
-
+inline 
-                return __fx_level[index];
-        }
@@ -226 +240 @@
-        }
-
-
+inline 
-                return __random_pitch_factor;
-        }
@@ -240 +254 @@
-        }
-
-
+inline 
-                return __active;
-        }
@@ -247 +261 @@
-        }
-
-
+inline 
-                return __soloed;
-        }
@@ -253 +267 @@
-                __soloed = soloed;
-        }
+        inline void enqueue() {
+                __queued++;
+        }
+        inline void dequeue() {
+                assert( __queued > 0 );
+                __queued--;
+        }
+        inline int is_queued() {
+                return __queued;
+        }
-
-private:
+        int __queued;
-        InstrumentLayer* __layer_list[MAX_LAYERS];
-        ADSR* __adsr;

branches/jackMidi/libs/hydrogen/src/hydrogen.cpp

@@ -289 +289 @@
-        AudioEngine::get_instance()->get_sampler()->stop_playing_notes();
-
-
-        // delete all copied notes in the song notes queue
-        while ( !m_songNoteQueue.empty() ) {
+                m_songNoteQueue.top()->get_instrument()->dequeue();
-                delete m_songNoteQueue.top();
-                m_songNoteQueue.pop();
@@ -395 +395 @@
-        // delete all copied notes in the song notes queue
-        while(!m_songNoteQueue.empty()){
+                m_songNoteQueue.top()->get_instrument()->dequeue();
-                delete m_songNoteQueue.top();
-                m_songNoteQueue.pop();
@@ -522 +523 @@
-                        
-                        m_songNoteQueue.pop();                  // rimuovo la nota dalla lista di note
-
+
-                        // raise noteOn event
-                        int nInstrument = m_pSong->get_instrument_list()->get_pos( pNote->get_instrument() );
@@ -624 +625 @@
-
-        while (!m_songNoteQueue.empty()) {       // delete all copied notes in the song notes queue
+                m_songNoteQueue.top()->get_instrument()->dequeue();
-                delete m_songNoteQueue.top();
-                m_songNoteQueue.pop();
@@ -1037 +1039 @@
-                                // printf ("tick=%d  pos=%d\n", tick, note->getPosition());
-                                m_midiNoteQueue.pop_front();
+                                note->get_instrument()->enqueue();
-                                m_songNoteQueue.push( note );
-                        } else {
@@ -1178 +1181 @@
-
-                                Note *pMetronomeNote = new Note( m_pMetronomeInstrument, tick, fVelocity, 0.5, 0.5, -1, fPitch );
+                                m_pMetronomeInstrument->enqueue();
-                                m_songNoteQueue.push( pMetronomeNote );
-                        }
@@ -1220 +1224 @@
-
-                                                pCopiedNote->m_nHumanizeDelay = nOffset;        // humanize time
+                                                pNote->get_instrument()->enqueue();
-                                                m_songNoteQueue.push( pCopiedNote );
-                                                //pCopiedNote->dumpInfo();
@@ -1654 +1659 @@
-        audioEngine_stopAudioDrivers();
-        audioEngine_destroy();
+        kill_instruments();
-        instance = NULL;
-}
@@ -2078 +2084 @@
-int Hydrogen::loadDrumkit( Drumkit *drumkitInfo )
-{
-_
+
-        m_currentDrumkit = drumkitInfo->getName();
-        LocalFileMng fileMng;
@@ -2122 +2128 @@
-                        assert( pInstr );
-                } else {
-
-
+
+
+
-                        songInstrList->add( pInstr );
-
+// 
-                }
-
@@ -2133 +2140 @@
-                
-                // creo i nuovi layer in base al nuovo strumento
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-