Changeset 1464

Timestamp:

12/02/09 03:02:10 (4 years ago)

Author:

wolke

Message:

create a play/stop toggle button to toggle sample preview

Files:

• trunk/gui/src/SampleEditor/SampleEditor.cpp (modified) (13 diffs)

trunk/gui/src/SampleEditor/SampleEditor.cpp

@@ -159 +159 @@
 {
         Hydrogen *pEngine = Hydrogen::get_instance();
-        H2Core::Instrument *m_pInstrument = NULL;
+        H2Core::Instrument *pInstrument = NULL;
         Sample* pSample = NULL;
         Song *pSong = Hydrogen::get_instance()->getSong();
@@ -170 +170 @@
 
                 if (nInstr == -1) {
-                        m_pInstrument = NULL;
+                        pInstrument = NULL;
                 }
                 else {
-                        m_pInstrument = pInstrList->get( nInstr );
-                        //INFOLOG( "new instr: " + m_pInstrument->m_sName );
-                }
-        }
-        H2Core::InstrumentLayer *pLayer = m_pInstrument->get_layer( m_pSelectedLayer );
+                        pInstrument = pInstrList->get( nInstr );
+                        //INFOLOG( "new instr: " + pInstrument->m_sName );
+                }
+        }
+        H2Core::InstrumentLayer *pLayer = pInstrument->get_layer( m_pSelectedLayer );
         if ( pLayer ) {
                 pSample = pLayer->get_sample();
@@ -293 +293 @@
 void SampleEditor::openDisplays()
 {
-        H2Core::Instrument *m_pInstrument = NULL;
+        H2Core::Instrument *pInstrument = NULL;
         Song *pSong = Hydrogen::get_instance()->getSong();
         if (pSong != NULL) {
@@ -303 +303 @@
 
                 if (nInstr == -1) {
-                        m_pInstrument = NULL;
+                        pInstrument = NULL;
                 }
                 else {
-                        m_pInstrument = pInstrList->get( nInstr );
-                        //INFOLOG( "new instr: " + m_pInstrument->m_sName );
+                        pInstrument = pInstrList->get( nInstr );
+                        //INFOLOG( "new instr: " + pInstrument->m_sName );
                 }
         }
@@ -390 +390 @@
                 AudioEngine::get_instance()->lock( RIGHT_HERE );
 
-                H2Core::Instrument *m_pInstrument = NULL;
+                H2Core::Instrument *pInstrument = NULL;
                 Song *pSong = Hydrogen::get_instance()->getSong();
                 if (pSong != NULL) {
@@ -400 +400 @@
         
                         if (nInstr == -1) {
-                                m_pInstrument = NULL;
+                                pInstrument = NULL;
                         }
                         else {
-                                m_pInstrument = pInstrList->get( nInstr );
+                                pInstrument = pInstrList->get( nInstr );
                         }
                 }
         
-                H2Core::InstrumentLayer *pLayer = m_pInstrument->get_layer( m_pSelectedLayer );
+                H2Core::InstrumentLayer *pLayer = pInstrument->get_layer( m_pSelectedLayer );
 
                 Sample *oldSample = pLayer->get_sample();
@@ -536 +536 @@
 void SampleEditor::on_PlayPushButton_clicked()
 {
-
+        if (PlayPushButton->text() == "Stop" ){
+                testpTimer();
+                return;
+        }
         const int selectedlayer = InstrumentEditorPanel::get_instance()->getselectedLayer();
         const float pan_L = 0.5f;
@@ -574 +577 @@
         }
         m_pTargetDisplayTimer->start(40);       // update ruler at 25 fps
+        PlayPushButton->setText( QString( "Stop") ); 
         
 }
@@ -581 +585 @@
 void SampleEditor::on_PlayOrigPushButton_clicked()
 {
+        if (PlayOrigPushButton->text() == "Stop" ){
+                testpTimer();
+                return;
+        }
         Sample *pNewSample = Sample::load( m_samplename );
         if ( pNewSample ){
@@ -592 +600 @@
         m_pTimer->start(40);    // update ruler at 25 fps       
         m_prealtimeframeend = Hydrogen::get_instance()->getRealtimeFrames() + m_pslframes;
+        PlayOrigPushButton->setText( QString( "Stop") ); 
 }
 
@@ -613 +622 @@
                 m_pMainSampleWaveDisplay->paintLocatorEvent( -1 , false);
                 m_pTimer->stop();
+                PlayPushButton->setText( QString("&Play") );
+                PlayOrigPushButton->setText( QString( "P&lay original sample") ); 
                 m_pPlayButton = false;
         }
@@ -636 +647 @@
                 m_pTargetSampleView->paintLocatorEventTargetDisplay( -1 , false);
                 m_pTargetDisplayTimer->stop();
-//              m_pPlayButton = false;
+                PlayPushButton->setText(QString( "&Play") );
+                PlayOrigPushButton->setText( QString( "P&lay original sample") ); 
+                m_pPlayButton = false;
         }
 }
@@ -901 +914 @@
 void SampleEditor::testpTimer()
 {
-        if ( m_pTimer->isActive() ){
+        if ( m_pTimer->isActive() || m_pTargetDisplayTimer->isActive() ){
                 m_pMainSampleWaveDisplay->paintLocatorEvent( -1 , false);
                 m_pTimer->stop();
+                m_pTargetDisplayTimer->stop();
+                PlayPushButton->setText( QString( "&Play" ) );
+                PlayOrigPushButton->setText( QString( "P&lay original sample") ); 
                 AudioEngine::get_instance()->get_sampler()->stop_playing_notes();
                 m_pPlayButton = false;