Changeset 1089 for branches/transport_redesign_2/gui/src/PlayerControl.cpp

Timestamp:

04/28/09 03:10:44 (4 years ago)

Author:

gabriel@…

Message:

Implement the Jack Time Master EventListener? and UI links.

Files:

• branches/transport_redesign_2/gui/src/PlayerControl.cpp (modified) (3 diffs)

branches/transport_redesign_2/gui/src/PlayerControl.cpp

@@ -43 +43 @@
 #include <hydrogen/IO/JackOutput.h>
 #include <hydrogen/Preferences.h>
+#include <hydrogen/JackTimeMasterEvents.h>
 using namespace H2Core;
 
@@ -834 +835 @@
 
 
+void PlayerControl::jackTimeMasterEvent( int data )
+{
+        switch( data ) {
+        case JACK_TIME_MASTER_NOW:
+                m_pJackMasterBtn->setPressed(true);
+                break;
+        case JACK_TIME_MASTER_NO_MORE:
+                m_pJackMasterBtn->setPressed(false);
+                break;
+        }
+}
+
 //jack time master
 void PlayerControl::jackMasterBtnClicked( Button* )
@@ -840 +853 @@
         Preferences *pPref = Preferences::getInstance();
 
+        // This function just manipulates Hydrogen.
+        // The widget updates itself by the EventListener
         if (m_pJackMasterBtn->isPressed()) {
-                AudioEngine::get_instance()->lock( "PlayerControl::jackMasterBtnClicked" );
+                // Set as time master.
+                Hydrogen::get_instance()->setJackTimeMaster(false);
                 pPref->m_bJackMasterMode = Preferences::USE_JACK_TIME_MASTER;
-                AudioEngine::get_instance()->unlock();
-                (HydrogenApp::getInstance())->setStatusBarMessage(trUtf8(" Jack-Time-Master mode = On"), 5000);
-                Hydrogen::get_instance()->setJackTimeMaster(false);
-                
-        }
-        else {
-                AudioEngine::get_instance()->lock( "PlayerControl::jackMasterBtnClicked" );
+                HydrogenApp::getInstance()->setStatusBarMessage(trUtf8(" Jack-Time-Master mode = On"), 5000);
+        }
+        else {
+                // Clear time master.
                 pPref->m_bJackMasterMode = Preferences::NO_JACK_TIME_MASTER;
-                AudioEngine::get_instance()->unlock();
                 (HydrogenApp::getInstance())->setStatusBarMessage(trUtf8(" Jack-Time-Master mode = Off"), 5000);
-                //m_pControlsBBTPanel->hide();
                 Hydrogen::get_instance()->clearJackTimeMaster();
         }