Changeset 605

Timestamp:

10/30/08 12:40:42 (5 years ago)

Author:

wolke

Message:

add new sampleeditor files

Location:

branches/new_fx_rack_and_sample_fun/gui/src

Files:

• HydrogenApp.cpp (modified) (7 diffs)
• HydrogenApp.h (modified) (5 diffs)
• InstrumentEditor/InstrumentEditor.cpp (modified) (2 diffs)
• InstrumentEditor/InstrumentEditor.h (modified) (1 diff)
• SampleEditor/SampleEditor.cpp (added)
• SampleEditor/SampleEditor.h (added)
• SampleEditor/SampleEditor_UI.ui (added)

branches/new_fx_rack_and_sample_fun/gui/src/HydrogenApp.cpp

@@ -38 +38 @@
 #include "SongEditor/SongEditorPanel.h"
 #include "PlaylistEditor/PlaylistDialog.h"
-//#include "AudioFileBrowser/AudioFileBrowser.h"
+#include "SampleEditor/SampleEditor.h"
 
 #include "Mixer/Mixer.h"
@@ -66 +66 @@
  , m_pPlayerControl( NULL )
  , m_pPlaylistDialog( NULL )
-// , m_pAudioFileBrowser( NULL )
+ , m_pSampleEditor( NULL )
 
 {
@@ -100 +100 @@
         }
         
-         m_pPlaylistDialog = new PlaylistDialog( 0 );
-//       m_pAudioFileBrowser = new AudioFileBrowser( 0 );
+        m_pPlaylistDialog = new PlaylistDialog( 0 );
+//      m_pSampleEditor = new SampleEditor( 0 );
         
         showInfoSplash();       // First time information
@@ -117 +117 @@
         delete m_pMixer;
         delete m_pPlaylistDialog;
-//      delete m_pAudioFileBrowser;
+        delete m_pSampleEditor;
 
         Hydrogen *engine = Hydrogen::get_instance();
@@ -132 +132 @@
         }
         #endif
+
+        
 }
 
@@ -250 +252 @@
 }
 
+
+
 void HydrogenApp::setSong(Song* song)
 {
@@ -316 +320 @@
 }
 
-//void HydrogenApp::showAudioFileBrowser()
-//{
-//      m_pAudioFileBrowser->hide();
-//      m_pAudioFileBrowser->show();
-//}
+
+
+void HydrogenApp::showSampleEditor( QString name )
+{
+        if ( m_pSampleEditor ){
+                if ( m_pSampleEditor->m_pSampleEditorStatus == false ){
+                        m_pSampleEditor->show();
+                        bool close = m_pSampleEditor->getCloseQuestion();
+                        if ( close ){
+                                delete m_pSampleEditor;
+                        }else
+                        {
+                                return;
+                        }
+                }else
+                {
+                        delete m_pSampleEditor;
+                }
+        }
+        
+        m_pSampleEditor = new SampleEditor( 0 );
+        m_pSampleEditor->show();
+        m_pSampleEditor->setSampleName( name );
+}
+
+
 
 void HydrogenApp::showInfoSplash()

branches/new_fx_rack_and_sample_fun/gui/src/HydrogenApp.h

@@ -54 +54 @@
 class InstrumentRack;
 class PlaylistDialog;
-//class AudioFileBrowser;
+class SampleEditor;
 
 class HydrogenApp : public QObject, public Object
@@ -73 +73 @@
                 void showAudioEngineInfoForm();
                 void showPlaylistDialog();
-//              void showAudioFileBrowser();
+                void showSampleEditor( QString name );
 
                 Mixer* getMixer() {     return m_pMixer;        }
@@ -80 +80 @@
                 AudioEngineInfoForm* getAudioEngineInfoForm() { return m_pAudioEngineInfoForm;  }
                 PlaylistDialog* getPlayListDialog() {   return m_pPlaylistDialog;       }
-//              AudioFileBrowser* getAudioFileBrowser() {  return m_pAudioFileBrowser;  }
+                SampleEditor* getSampleEditor() {  return m_pSampleEditor;      }
                 SimpleHTMLBrowser* getHelpBrowser() {   return m_pHelpBrowser;  }
                 PatternEditorPanel* getPatternEditorPanel() {   return m_pPatternEditorPanel;   }
@@ -108 +108 @@
                 LadspaFXProperties *m_pLadspaFXProperties[MAX_FX];
 #endif
-
                 MainForm *m_pMainForm;
                 Mixer *m_pMixer;
@@ -119 +118 @@
                 PlayerControl *m_pPlayerControl;
                 PlaylistDialog *m_pPlaylistDialog;
-//              AudioFileBrowser *m_pAudioFileBrowser;
+                SampleEditor *m_pSampleEditor;
 
                 QTimer *m_pEventQueueTimer;

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

@@ -216 +216 @@
         );
 
+        m_pSamleEditorBtn = new Button(
+                        m_pLayerProp,
+                        "/instrumentEditor/deleteLayer_on.png",
+                        "/instrumentEditor/deleteLayer_off.png",
+                        "/instrumentEditor/deleteLayer_over.png",
+                        QSize( 60, 13 )
+        );
+
+
+
         m_pLoadLayerBtn->move( 48, 267 );
         m_pRemoveLayerBtn->move( 145, 267 );
+        m_pSamleEditorBtn->move( 200, 267 );
 
         connect( m_pLoadLayerBtn, SIGNAL( clicked(Button*) ), this, SLOT( buttonClicked(Button*) ) );
         connect( m_pRemoveLayerBtn, SIGNAL( clicked(Button*) ), this, SLOT( buttonClicked(Button*) ) );
-
+        connect( m_pSamleEditorBtn, SIGNAL( clicked(Button*) ), this, SLOT( buttonClicked(Button*) ) );
         // Layer gain
         m_pLayerGainLCD = new LCDDisplay( m_pLayerProp, LCDDigit::SMALL_BLUE, 4 );
@@ -476 +487 @@
                 m_pLayerPreview->updateAll();
         }
+        else if ( pButton == m_pSamleEditorBtn ){
+                if ( m_pInstrument ) {
+                        H2Core::InstrumentLayer *pLayer = m_pInstrument->get_layer( m_nSelectedLayer );
+                        if ( pLayer ) {
+                                QString name = pLayer->get_sample()->get_filename();
+                                HydrogenApp::getInstance()->showSampleEditor( name );
+                        }
+                }
+                
+        }
         else {
                 ERRORLOG( "[buttonClicked] unhandled button" );

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

@@ -121 +121 @@
                 Button *m_pLoadLayerBtn;
                 Button *m_pRemoveLayerBtn;
+                Button *m_pSamleEditorBtn;
                 //~ Layer properties