Changeset 614

Timestamp:

11/02/08 14:57:04 (2 months ago)

Author:

wolke

Message:

some changes

Files:

• branches/new_fx_rack_and_sample_fun/gui/src/HydrogenApp.cpp (modified) (1 diff)
• branches/new_fx_rack_and_sample_fun/gui/src/HydrogenApp.h (modified) (1 diff)
• branches/new_fx_rack_and_sample_fun/gui/src/InstrumentEditor/InstrumentEditorPanel.cpp (modified) (2 diffs)
• branches/new_fx_rack_and_sample_fun/gui/src/InstrumentEditor/InstrumentEditorPanel.h (modified) (2 diffs)
• branches/new_fx_rack_and_sample_fun/gui/src/SampleEditor/SampleEditor.cpp (modified) (8 diffs)
• branches/new_fx_rack_and_sample_fun/gui/src/SampleEditor/SampleEditor.h (modified) (3 diffs)

branches/new_fx_rack_and_sample_fun/gui/src/HydrogenApp.cpp

@@ -322 +322 @@
-
-
-* 
+ *
-{
-        if ( m_pSampleEditor ){

branches/new_fx_rack_and_sample_fun/gui/src/HydrogenApp.h

@@ -74 +74 @@
-                void showAudioEngineInfoForm();
-                void showPlaylistDialog();
-* 
+ *
-
-                Mixer* getMixer() {     return m_pMixer;        }

branches/new_fx_rack_and_sample_fun/gui/src/InstrumentEditor/InstrumentEditorPanel.cpp

@@ -59 +59 @@
-
-        this->setLayout( vbox );
+        m_player = 0;
-}
-
@@ -73 +74 @@
-{
-        m_pInstrumentEditor->selectLayer( nLayer );
+        m_player = nLayer;
-}
-
-
+
+

branches/new_fx_rack_and_sample_fun/gui/src/InstrumentEditor/InstrumentEditorPanel.h

@@ -39 +39 @@
-
-                void selectLayer( int nLayer );
+                
+                int getselectedLayer() {
+                        return m_player;
+                }
+
-        private:
-                static InstrumentEditorPanel* m_pInstance;
@@ -44 +49 @@
-
-                InstrumentEditorPanel( QWidget *pParent );
+                int m_player;
+                
-};
-

branches/new_fx_rack_and_sample_fun/gui/src/SampleEditor/SampleEditor.cpp

@@ -24 +24 @@
-#include "../HydrogenApp.h"
-#include "InstrumentEditor/InstrumentEditor.h"
+#include "InstrumentEditor/InstrumentEditorPanel.h"
-#include "../widgets/Button.h"
-
@@ -35 +36 @@
-#include <hydrogen/sample.h>
-#include <hydrogen/audio_engine.h>
+#include <hydrogen/hydrogen.h>
-
-#include <QModelIndex>
@@ -122 +124 @@
-        connect( LoopFrameSpinBox, SIGNAL( valueChanged( int ) ), this, SLOT( valueChangedLoopFrameSpinBox(int) ) );
-        connect( EndFrameSpinBox, SIGNAL( valueChanged( int ) ), this, SLOT( valueChangedEndFrameSpinBox(int) ) );
+
-}
-
@@ -200 +203 @@
-
-
+
-void SampleEditor::mouseReleaseEvent(QMouseEvent *ev)
-{
-
-}
+
+
-
-void SampleEditor::returnAllMainWaveDisplayValues()
@@ -220 +226 @@
-        m_ponewayEnd = true;
-}
+
-
-
@@ -257 +264 @@
-
-
+
-void SampleEditor::valueChangedEndFrameSpinBox( int )
-{
@@ -273 +281 @@
-
-
+
-void SampleEditor::on_verticalzoomSlider_valueChanged( int value )
-{
@@ -278 +287 @@
-        m_pSampleAdjustView->setDetailSamplePosition( m_pdetailframe, m_pzoomfactor, m_plineColor );
-}
+
+
+
+void SampleEditor::on_PlayPushButton_clicked()
+{
+                const int selectedlayer = InstrumentEditorPanel::getInstance()->getselectedLayer();
+                const float pan_L = 0.5f;
+                const float pan_R = 0.5f;
+                const int nLength = -1;
+                const float fPitch = 0.0f;
+                Song *pSong = Hydrogen::get_instance()->getSong();
+                
+                Instrument *pInstr = pSong->get_instrument_list()->get( Hydrogen::get_instance()->getSelectedInstrumentNumber() );
+                
+                Note *pNote = new Note( pInstr, 0, pInstr->get_layer( selectedlayer )->get_end_velocity() - 0.01, pan_L, pan_R, nLength, fPitch);
+                AudioEngine::get_instance()->get_sampler()->note_on(pNote);     
+}

branches/new_fx_rack_and_sample_fun/gui/src/SampleEditor/SampleEditor.h

@@ -50 +50 @@
-        public:
-                
-* 
+ *
-                ~SampleEditor();
-
@@ -67 +67 @@
-                void valueChangedEndFrameSpinBox( int );
-                void on_verticalzoomSlider_valueChanged ( int value );
+                void on_PlayPushButton_clicked();
-
-        private:
@@ -78 +79 @@
-*/              
-        QString m_samplename;
-* 
+ *
-
-        bool m_sample_is_modified;      ///< true if sample is modified