Changeset 2234

Timestamp:

06/26/11 23:09:19 (2 years ago)

Author:

wolke

Message:

fix broken sampleeditor visual ratio-meter.

Location:

branches/undo/src

Files:

• core/include/hydrogen/globals.h (modified) (1 diff)
• gui/src/SampleEditor/SampleEditor.cpp (modified) (4 diffs)
• gui/src/SampleEditor/SampleEditor.h (modified) (1 diff)

branches/undo/src/core/include/hydrogen/globals.h

@@ -25 +25 @@
 #define MAX_INSTRUMENTS         1000
 
-#define MAX_NOTES                       192
+#define MAX_NOTES               192
 
 #define MAX_LAYERS              16
 
-#define MAX_FX                          4
+#define MAX_FX                  4
 
-#define MAX_BUFFER_SIZE             8192
+#define MAX_BUFFER_SIZE         8192
 
 #define MIDI_OUT_NOTE_MIN       0

branches/undo/src/gui/src/SampleEditor/SampleEditor.cpp

@@ -73 +73 @@
         m_pslframes = 0;
         m_pPositionsRulerPath = NULL;
-        m_pPlayButton = false;
-        m_pratio = 1.0;
+        m_pPlayButton = false;
+        m_pratio = 1.0f;
         __rubberband.c_settings = 4;
 
@@ -532 +532 @@
         //calculate the new rubberband sample length
         if( __rubberband.use ){
-                m_prealtimeframeendfortarget = Hydrogen::get_instance()->getRealtimeFrames() + (m_pslframes * m_pratio + 0.1);
+                m_prealtimeframeendfortarget = Hydrogen::get_instance()->getRealtimeFrames() + (m_pslframes * m_pratio + 0.1);
         }else
         {
@@ -595 +595 @@
         unsigned targetsamplelength;
         if( __rubberband.use ){
-                targetsamplelength =  m_pslframes * m_pratio + 0.1;
+                targetsamplelength =  m_pslframes * m_pratio + 0.1;
         }else
         {
@@ -802 +802 @@
 void SampleEditor::checkRatioSettings()
 {
-        //my personal ratio quality settings
-        //ratios < 0.1 || > 3.0 are bad (red) or experimental sounds
-        //ratios > 0.1 - 0.5 || > 2.0 are middle (yellow)
-        //ratios < 0.5 || < 2.0 are good (green)
-
-        bool is_green = false;
-        //green ratio
-        if( (m_pratio >= 0.5) && (m_pratio <= 2.0) ){
-                rubberComboBox->setStyleSheet("QComboBox { background-color: green; }");
-                is_green = true;
-        }
-        //yellow ratio
-        if( ( (m_pratio > 0.1) || ( m_pratio <=  3.0 ) )&& (!is_green)){
-                rubberComboBox->setStyleSheet("QComboBox { background-color: yellow; }");
-        }
-        //red ratio
-        if( ( m_pratio <= 0.1 ) || ( m_pratio > 3.0 ) && (!is_green) ){
-                rubberComboBox->setStyleSheet("QComboBox { background-color: red; }");
-        }
-        QString text = QString( " RB-Ratio = %1").arg(m_pratio);
-        ratiolabel->setText( text );
-
-        //no rubberband = default
-        if( !__rubberband.use ){
-                rubberComboBox->setStyleSheet("QComboBox { background-color: 58, 62, 72; }");
-                ratiolabel->setText( "" );
-        }
+        //calculate ration
+        double durationtime = 60.0 / Hydrogen::get_instance()->getNewBpmJTM() * __rubberband.divider;
+        double induration = (double) m_pslframes / (double) m_pSamplerate;
+        if (induration != 0.0) m_pratio = durationtime / induration;
+
+        //my personal ratio quality settings
+        //ratios < 0.1 || > 3.0 are bad (red) or experimental sounds
+        //ratios > 0.1 - 0.5 || > 2.0 are middle (yellow)
+        //ratios < 0.5 || < 2.0 are good (green)
+
+        bool is_green = false;
+        //green ratio
+        if( (m_pratio >= 0.5) && (m_pratio <= 2.0) ){
+            rubberComboBox->setStyleSheet("QComboBox { background-color: green; }");
+            is_green = true;
+        }
+        //yellow ratio
+        if( ( (m_pratio > 0.1) || ( m_pratio <=  3.0 ) )&& (!is_green)){
+            rubberComboBox->setStyleSheet("QComboBox { background-color: yellow; }");
+        }
+        //red ratio
+        if( ( m_pratio <= 0.1 ) || ( m_pratio > 3.0 ) && (!is_green) ){
+            rubberComboBox->setStyleSheet("QComboBox { background-color: red; }");
+        }
+        QString text = QString( " RB-Ratio = %1").arg(m_pratio);
+        ratiolabel->setText( text );
+
+        //no rubberband = default
+        if( !__rubberband.use ){
+            rubberComboBox->setStyleSheet("QComboBox { background-color: 58, 62, 72; }");
+            ratiolabel->setText( "" );
+        }
 }
 

branches/undo/src/gui/src/SampleEditor/SampleEditor.h

@@ -120 +120 @@
                 QTimer *m_pTargetDisplayTimer;
                 unsigned *m_pPositionsRulerPath;
-                bool m_pPlayButton;
-                float m_pratio;
-        H2Core::Sample::Loops __loops;
-        H2Core::Sample::Rubberband __rubberband;
+                bool m_pPlayButton;
+                float m_pratio;
+                H2Core::Sample::Loops __loops;
+                H2Core::Sample::Rubberband __rubberband;