Changeset 546

Timestamp:

10/05/08 04:37:29 (2 months ago)

Author:

wolke

Message:

add a new checkbox to set automatic velocity if a new layer will create

Files:

• branches/audiofilebrowser/gui/src/AudioFileBrowser/AudioFileBrowser.cpp (modified) (4 diffs)
• branches/audiofilebrowser/gui/src/AudioFileBrowser/AudioFileBrowser.h (modified) (2 diffs)
• branches/audiofilebrowser/gui/src/AudioFileBrowser/AudioFileBrowser_UI.ui (modified) (1 diff)
• branches/audiofilebrowser/gui/src/InstrumentEditor/InstrumentEditor.cpp (modified) (4 diffs)
• branches/audiofilebrowser/gui/src/InstrumentEditor/InstrumentEditor.h (modified) (1 diff)

branches/audiofilebrowser/gui/src/AudioFileBrowser/AudioFileBrowser.cpp

@@ -71 +71 @@
-        pathLineEdit->setText( Preferences::getInstance()->__lastsampleDirectory );
-        m_psamplefilename = ""; 
-=
+<< "false" << "false" <<
-
-        sEmptySampleFilename = DataPath::get_data_path() + "/emptySample.wav";
@@ -225 +225 @@
-{
-        Preferences::getInstance()->__lastsampleDirectory = pathLineEdit->text();
-=
+<< "false" << "false" <<
-        reject();
-
@@ -245 +245 @@
-                ( QFile( filelineedit->text() ).exists() == true )
-                ) {             
-
+[2]
-                        
-                }else
-                {
-=
+<< "false" << "false" <<
-                }
-        Preferences::getInstance()->__lastsampleDirectory = pathLineEdit->text();
@@ -264 +264 @@
-
-
-
+List
-{
-        if ( useNameCheckBox->isChecked() ){
-
+
+
+
+
-        }
-        return m_pselectedFile;

branches/audiofilebrowser/gui/src/AudioFileBrowser/AudioFileBrowser.h

@@ -47 +47 @@
-                AudioFileBrowser( QWidget* pParent );
-                ~AudioFileBrowser();
-
+List
-                QString setDir( QString dir );
-
@@ -67 +67 @@
-                InstrumentEditor* m_pInstrumentEditor;
-                QString m_psamplefilename;
-
+List
-                QDirModel *model;
-                QTreeView *tree;

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

@@ -210 +210 @@
-   <property name="text" >
-    <string>&amp;Stop</string>
+   </property>
+  </widget>
+  <widget class="QCheckBox" name="autoVelCheckBox" >
+   <property name="geometry" >
+    <rect>
+     <x>360</x>
+     <y>530</y>
+     <width>171</width>
+     <height>21</height>
+    </rect>
+   </property>
+   <property name="toolTip" >
+    <string>Be careful, this change all Layer velocity settings </string>
+   </property>
+   <property name="text" >
+    <string>Set automatic velocity</string>
-   </property>
-  </widget>

branches/audiofilebrowser/gui/src/InstrumentEditor/InstrumentEditor.cpp

@@ -486 +486 @@
-
-        Hydrogen *engine = Hydrogen::get_instance();
-//      MainForm *pMainForm = HydrogenApp::getInstance()->getMainForm();
-
-
-        AudioFileBrowser *fb = new AudioFileBrowser( NULL );
-
+
+
-
-        if (fb->exec() == QDialog::Accepted) {
@@ -499 +498 @@
-
-        bool fnc = false;       
-.endsWith( "___trUe" )
+[0] ==  "true" 
-                fnc = true;
-
-
-
-
-
-
+
+
+
+
+
-
-                H2Core::Instrument *pInstr = NULL;
@@ -530 +528 @@
-
-                if ( fnc ){
-
+[2]
-                                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
-
@@ -542 +545 @@
-        selectedInstrumentChangedEvent();    // update all
-        m_pLayerPreview->updateAll();
+}
+
+
+void InstrumentEditor::setAutoVelocity()
+{
+        int layerinuse[ MAX_LAYERS - 1 ] = {0};
+        int layers = 0;
+        for ( int i = 0; i < MAX_LAYERS - 1; i++ ) {
+                InstrumentLayer *pLayers = m_pInstrument->get_layer( i );
+                if ( pLayers ) {
+                        layers++;
+                        layerinuse[i] = i;
+                }
+        }
+
+        float velocityrange = 1.0 / layers;
+
+        for ( int i = 0; i < MAX_LAYERS - 1; i++ ) {
+                if ( layerinuse[i] == i ){
+                        layers--;
+                        InstrumentLayer *pLayer = m_pInstrument->get_layer( i );
+                        if ( pLayer ) {
+                                pLayer->set_start_velocity( layers * velocityrange);
+                                pLayer->set_end_velocity( layers * velocityrange + velocityrange );
+                        }
+                }
+        }
-}
-

branches/audiofilebrowser/gui/src/InstrumentEditor/InstrumentEditor.h

@@ -128 +128 @@
-
-                void loadLayer();
+                void setAutoVelocity();
-};
-