Changeset 824

Timestamp:

02/21/09 00:05:30 (4 years ago)

Author:

gabriel@…

Message:

Merge rev 580:592 from trunk

Location:

branches/jackMidi/gui/src

Files:

• AudioFileBrowser/AudioFileBrowser.cpp (modified) (17 diffs)
• AudioFileBrowser/AudioFileBrowser.h (modified) (2 diffs)
• AudioFileBrowser/AudioFileBrowser_UI.ui (modified) (4 diffs)
• InstrumentEditor/InstrumentEditor.cpp (modified) (4 diffs)

branches/jackMidi/gui/src/AudioFileBrowser/AudioFileBrowser.cpp

@@ -20 +20 @@
  *
  */
-
 
 #include "AudioFileBrowser.h"
@@ -34 +33 @@
 #include <hydrogen/audio_engine.h>
 
+#include <QModelIndex>
 #include <QTreeWidget>
 #include <QMessageBox>
@@ -44 +44 @@
                 , Object ( "AudioFileBrowser" )
 {
-
         setupUi ( this );
         INFOLOG ( "INIT" );
@@ -50 +49 @@
         setFixedSize ( width(), height() );
         installEventFilter( this );
-
 
         model = new QDirModel();
@@ -68 +66 @@
         tree->setAlternatingRowColors( true );
         tree->setRootIndex( model->index( Preferences::getInstance()->__lastsampleDirectory ) );
-
+        
         pathLineEdit->setText( Preferences::getInstance()->__lastsampleDirectory );
         m_psamplefilename = ""; 
-        m_pselectedFile << "false" << "false" << "";
+        m_pselectedFile << "false" << "false";
 
         sEmptySampleFilename = DataPath::get_data_path() + "/emptySample.wav";
@@ -82 +80 @@
 
         connect( tree, SIGNAL( clicked( const QModelIndex&) ), SLOT( clicked( const QModelIndex& ) ) );
-        connect( pathLineEdit, SIGNAL( returnPressed() ), SLOT( updateModelIndex() ) );
-        
+        connect( pathLineEdit, SIGNAL( returnPressed() ), SLOT( updateModelIndex() ) ); 
 }
 
@@ -94 +91 @@
         INFOLOG ( "DESTROY" );
 }
+
+
+
+void AudioFileBrowser::keyPressEvent (QKeyEvent *ev)
+{
+        if( ev->modifiers()==Qt::ControlModifier ){
+                tree->setSelectionMode( QAbstractItemView::MultiSelection );
+                openBTN->setEnabled( true );
+        }       
+}
+
+
+
+void AudioFileBrowser::keyReleaseEvent (QKeyEvent *ev)
+{
+        tree->setSelectionMode( QAbstractItemView::SingleSelection );
+}
+
 
 
@@ -113 +128 @@
 }
 
+
+
 void AudioFileBrowser::clicked( const QModelIndex& index )
 {
@@ -142 +159 @@
         pathLineEdit->setText( onlypath );
 
+        QApplication::setOverrideCursor(Qt::WaitCursor);
 
         if      (
@@ -154 +172 @@
                 ) {
 
-
                         Sample *pNewSample = Sample::load( path2 );
+
                         if ( pNewSample ) {
                                 m_pNBytesLable->setText( trUtf8( "Size: %1 bytes" ).arg( pNewSample->get_size() / 2 ) );
@@ -167 +185 @@
                                 m_psamplefilename = path2;
 
-                                
+                                m_pSampleWaveDisplay->updateDisplay( path2 );
+                                m_pPlayBtn->setEnabled( true );
+                                openBTN->setEnabled( true );
+
+                                //important this will only working correct if m_pSampleWaveDisplay->updateDisplay( file )
+                                //is ready with painting the wav file. else the playing sample get crackled sound!!
                                 if (playSamplescheckBox->isChecked()){
                                         if ( sec <= 600.00){
@@ -176 +199 @@
                                         }
                                 }
-
-                                m_pSampleWaveDisplay->updateDisplay( path2 );
-                                m_pPlayBtn->setEnabled( true );
-                                openBTN->setEnabled( true );
-
                         }
                 
@@ -195 +213 @@
                         m_psamplefilename = "";
                 }
+        QApplication::restoreOverrideCursor();
 }
 
@@ -213 +232 @@
 
 
+
 void AudioFileBrowser::on_m_pStopBtn_clicked()
 {
@@ -227 +247 @@
         m_pselectedFile << "false" << "false" << "";
         reject();
-
 }
 
@@ -234 +253 @@
 void AudioFileBrowser::on_openBTN_clicked()
 {
-        if      (
-                ( ( filelineedit->text().endsWith( ".wav" ) ) ||
-                ( filelineedit->text().endsWith( ".WAV" ) ) ||
-                ( filelineedit->text().endsWith( ".au" ) ) ||
-                ( filelineedit->text().endsWith( ".AU" ) ) ||
-                ( filelineedit->text().endsWith( ".aiff" ) ) ||
-                ( filelineedit->text().endsWith( ".AIFF" ) ) ||
-                ( filelineedit->text().endsWith( ".flac" ) ) ||
-                ( filelineedit->text().endsWith( ".FLAC" ) ) ) &&
-                ( QFile( filelineedit->text() ).exists() == true )
-                ) {             
-                        m_pselectedFile[2] = filelineedit->text();
-                        
-                }else
-                {
-                        m_pselectedFile << "false" << "false" << "";
+        if( tree->selectionModel()->selectedIndexes().size() / 4 > 0){
+
+                QList<QModelIndex>::iterator i;
+                QList<QModelIndex> list = tree->selectionModel()->selectedIndexes();    
+
+                for (i = list.begin(); i != list.end(); ++i){
+                        QString path2 = (*i).data().toString();
+                        if      (
+                        ( path2.endsWith( ".wav" ) ) ||
+                        ( path2.endsWith( ".WAV" ) ) ||
+                        ( path2.endsWith( ".au" ) ) ||
+                        ( path2.endsWith( ".AU" ) ) ||
+                        ( path2.endsWith( ".aiff" ) ) ||
+                        ( path2.endsWith( ".AIFF" ) ) ||
+                        ( path2.endsWith( ".flac" ) ) ||
+                        ( path2.endsWith( ".FLAC" ) )
+                        ) {
+                                QString path = pathLineEdit->text();
+                                QString act_filename = path + path2;
+                                m_pselectedFile << act_filename ;
+                
+                        }
+                        ++i;++i;++i;
                 }
+        }
         Preferences::getInstance()->__lastsampleDirectory = pathLineEdit->text();
         accept();
@@ -305 +332 @@
         tree->collapse( model->index( updir  ) );
 }
+
+
+
+void AudioFileBrowser::on_hiddenCB_clicked()
+{
+        if ( hiddenCB->isChecked() ){
+                model->setFilter( QDir::AllDirs | QDir::AllEntries | QDir::NoDotAndDotDot | QDir::Hidden );
+        }else
+        {
+                model->setFilter( QDir::AllDirs | QDir::AllEntries | QDir::NoDotAndDotDot );
+                tree->setRootIndex( model->index( pathLineEdit->text() ) );
+        }
+}

branches/jackMidi/gui/src/AudioFileBrowser/AudioFileBrowser.h

@@ -62 +62 @@
                 void on_m_pPathUptoolButton_clicked();
                 void on_playSamplescheckBox_clicked();
+                void on_hiddenCB_clicked();
+                
+                virtual void keyPressEvent (QKeyEvent *ev);
+                virtual void keyReleaseEvent (QKeyEvent *ev);
 
 
@@ -68 +72 @@
                 QString m_psamplefilename;
                 QStringList m_pselectedFile;
+                
                 QDirModel *model;
                 QTreeView *tree;
+                QModelIndex __index;
+
+
                 SampleWaveDisplay *m_pSampleWaveDisplay;
                 QString sEmptySampleFilename;
                 QStringList filters;
-                QModelIndex __index;
+                
 
 

branches/jackMidi/gui/src/AudioFileBrowser/AudioFileBrowser_UI.ui

@@ -90 +90 @@
      <x>10</x>
      <y>530</y>
-     <width>271</width>
+     <width>216</width>
      <height>21</height>
     </rect>
@@ -110 +110 @@
     <item>
      <widget class="QLineEdit" name="pathLineEdit" />
+    </item>
+    <item>
+     <widget class="QRadioButton" name="hiddenCB" >
+      <property name="toolTip" >
+       <string>View hidden folders</string>
+      </property>
+      <property name="text" >
+       <string/>
+      </property>
+     </widget>
     </item>
     <item>
@@ -231 +241 @@
  <tabstops>
   <tabstop>pathLineEdit</tabstop>
+  <tabstop>hiddenCB</tabstop>
   <tabstop>m_pPathUptoolButton</tabstop>
   <tabstop>m_pPathHometoolButton</tabstop>
@@ -239 +250 @@
   <tabstop>useNameCheckBox</tabstop>
   <tabstop>playSamplescheckBox</tabstop>
+  <tabstop>autoVelCheckBox</tabstop>
   <tabstop>openBTN</tabstop>
   <tabstop>cancelBTN</tabstop>

branches/jackMidi/gui/src/InstrumentEditor/InstrumentEditor.cpp

@@ -499 +499 @@
         delete fb;
 
+        if ( filename[2] == "") return;
+
         bool fnc = false;       
         if ( filename[0] ==  "true" ){
@@ -504 +506 @@
         }
 
-        if (filename[2] != "") {
-
-                Sample *newSample = Sample::load( filename[2] );
-
-                H2Core::Instrument *pInstr = NULL;
-
-                AudioEngine::get_instance()->lock( "InstrumentPropertiesDialog::browseBtnClicked" );
-                Song *song = engine->getSong();
-                InstrumentList *instrList = song->get_instrument_list();
-                pInstr = instrList->get( engine->getSelectedInstrumentNumber() );
-
-                H2Core::InstrumentLayer *pLayer = pInstr->get_layer( m_nSelectedLayer );
-                if (pLayer != NULL) {
-                        // delete old sample
-                        Sample *oldSample = pLayer->get_sample();
-                        delete oldSample;
-
-                        // insert new sample from newInstrument
-                        pLayer->set_sample( newSample );
-                }
-                else {
-                        pLayer = new H2Core::InstrumentLayer(newSample);
-                        pInstr->set_layer( pLayer, m_nSelectedLayer );
-                }
-
-                if ( fnc ){
-                        QString newfilename = filename[2].section( '/', -1 );
-                                newfilename.replace( "." + newfilename.section( '.', -1 ), "");
-                        m_pInstrument->set_name( newfilename );
-                }
-
-                //set automatic velocity
-                if ( filename[1] ==  "true" ){
-                        setAutoVelocity();
-                }
-
-                pInstr->set_drumkit_name( "" );   // external sample, no drumkit info
-
-                AudioEngine::get_instance()->unlock();
+        //use auto velocity if we want to work with multiple filenames
+        if ( filename.size() > 3) filename[1] = "true";
+
+        int selectedLayer =  m_nSelectedLayer;
+        
+        
+
+        if (filename.size() > 2) {
+                
+                for(int i=2;i < filename.size();++i) 
+                {
+                        if( i-2 >= MAX_LAYERS ) break;
+
+                        Sample *newSample = Sample::load( filename[i] );
+        
+                        H2Core::Instrument *pInstr = NULL;
+        
+                        AudioEngine::get_instance()->lock( "InstrumentPropertiesDialog::browseBtnClicked" );
+                        Song *song = engine->getSong();
+                        InstrumentList *instrList = song->get_instrument_list();
+                        pInstr = instrList->get( engine->getSelectedInstrumentNumber() );
+        
+                        /* 
+                                if we're using multiple layers, we start inserting the first layer 
+                                at m_nSelectedLayer and the next layer at m_nSelectedLayer+1
+                        */
+                        
+                        selectedLayer = m_nSelectedLayer + i - 2;
+
+                        
+                        H2Core::InstrumentLayer *pLayer = pInstr->get_layer( selectedLayer );
+                        if (pLayer != NULL) {
+                                // delete old sample
+                                Sample *oldSample = pLayer->get_sample();
+                                delete oldSample;
+        
+                                // insert new sample from newInstrument
+                                pLayer->set_sample( newSample );
+                        }
+                        else {
+                                pLayer = new H2Core::InstrumentLayer(newSample);
+                                pInstr->set_layer( pLayer, selectedLayer );
+                        }
+        
+                        if ( fnc ){
+                                QString newfilename = filename[i].section( '/', -1 );
+                                        newfilename.replace( "." + newfilename.section( '.', -1 ), "");
+                                m_pInstrument->set_name( newfilename );
+                        }
+        
+                        //set automatic velocity
+                        if ( filename[1] ==  "true" ){
+                                setAutoVelocity();
+                        }
+        
+                        pInstr->set_drumkit_name( "" );   // external sample, no drumkit info
+        
+                        AudioEngine::get_instance()->unlock();
+
+                }
         }
 
@@ -552 +575 @@
 void InstrumentEditor::setAutoVelocity()
 {
-        int layerinuse[ MAX_LAYERS - 1 ] = {0};
+        int layerinuse[ MAX_LAYERS ] = {0};
         int layers = 0;
-        for ( int i = 0; i < MAX_LAYERS - 1; i++ ) {
+        for ( int i = 0; i < MAX_LAYERS ; i++ ) {
                 InstrumentLayer *pLayers = m_pInstrument->get_layer( i );
                 if ( pLayers ) {
@@ -564 +587 @@
         float velocityrange = 1.0 / layers;
 
-        for ( int i = 0; i < MAX_LAYERS - 1; i++ ) {
+        for ( int i = 0; i < MAX_LAYERS ; i++ ) {
                 if ( layerinuse[i] == i ){
                         layers--;