Changeset 781

Timestamp:

02/10/09 12:49:42 (4 years ago)

Author:

wolke

Message:

apply rec. button patch from pablomme and merge 772:780 from trunk

Location:

branches/new_fx_rack_and_sample_fun

Files:

• . (modified) (1 prop)
• data/img/gray/playerControlPanel/background_Control.png (modified) (previous)
• data/img/gray/playerControlPanel/btn_rec_off.png (added)
• data/img/gray/playerControlPanel/btn_rec_on.png (added)
• data/img/gray/playerControlPanel/btn_rec_over.png (added)
• gui/src/PatternEditor/PatternEditorPanel.cpp (modified) (2 diffs)
• gui/src/PatternEditor/PatternEditorPanel.h (modified) (1 diff)
• gui/src/PlayerControl.cpp (modified) (8 diffs)
• gui/src/PlayerControl.h (modified) (2 diffs)
• libs/hydrogen/include/hydrogen/Preferences.h (modified) (1 diff)
• libs/hydrogen/src/hydrogen.cpp (modified) (2 diffs)
• libs/hydrogen/src/preferences.cpp (modified) (3 diffs)
• libs/hydrogen/src/sampler/sampler.cpp (modified) (1 diff)
• linux/debian/rules (modified) (1 diff)

branches/new_fx_rack_and_sample_fun/gui/src/PatternEditor/PatternEditorPanel.cpp

@@ -141 +141 @@
 
 
-//wolke some background images hear note rec quant
-//record midi/keyboard events
-        QComboBox *recordMidi = new QComboBox( NULL );
-        recordMidi->setFixedSize( 60, 20 );
-        recordMidi->move( 2, 1 );
-        recordMidi->addItem ( QString( "off" ));
-        recordMidi->addItem ( QString( "pattern" ));
-        recordMidi->addItem ( QString( "song" ));
-        recordMidi->setToolTip( trUtf8( "Record keyboard/midi events to Pattern or to Song" ) );
-        editor_top_hbox_2->addWidget( recordMidi );
-        bool recevent = pPref->getRecordEvents();
-        if ( recevent ) recordMidi->setCurrentIndex( 1 );
-        connect( recordMidi, SIGNAL( currentIndexChanged( int ) ), this, SLOT( selectRecord( int) ) );
-
-
-
         PixmapWidget *pRec = new PixmapWidget( NULL );
         pRec->setFixedSize( 110, 20 );
@@ -1011 +995 @@
 
 }
-
-void PatternEditorPanel::selectRecord( int index )
-{
-        Preferences *pref = ( Preferences::getInstance() );
-        switch ( index ){
-                case 0:
-                        {
-                        pref->setRecordEvents( false );
-                        ( HydrogenApp::getInstance() )->setScrollStatusBarMessage( trUtf8( "Record keyboard/midi events = Off" ), 2000 );
-                        break;
-                        }
-                case 1:
-                        {
-                        pref->setRecordEvents( true );
-                        HydrogenApp::getInstance()->setScrollStatusBarMessage( trUtf8( "Record keyboard/midi events = On, record into the selected pattern" ), 2000 );
-                        pref->__recordsong = false;
-                        break;
-                        }
-                case 2:
-                        {
-                        pref->setRecordEvents( true );
-                        HydrogenApp::getInstance()->setScrollStatusBarMessage( trUtf8( "Record keyboard/midi events = On, record into the whole song" ), 2000 );
-                        pref->__recordsong = true;
-                        break;
-                        }
-        }
-
-}
-

branches/new_fx_rack_and_sample_fun/gui/src/PatternEditor/PatternEditorPanel.h

@@ -98 +98 @@
                 void playselectedinstrument( QString text );
                 void rightclickSelect( QString text );
-                void selectRecord( int index );
 
         private:

branches/new_fx_rack_and_sample_fun/gui/src/PlayerControl.cpp

@@ -66 +66 @@
 // CONTROLS
         PixmapWidget *pControlsPanel = new PixmapWidget( NULL );
-        pControlsPanel->setFixedSize( 317, 43 );
+        pControlsPanel->setFixedSize( 344, 43 );
         pControlsPanel->setPixmap( "/playerControlPanel/background_Control.png" );
         hbox->addWidget( pControlsPanel );
@@ -98 +98 @@
         connect(m_pRwdBtn, SIGNAL(clicked(Button*)), this, SLOT(RewindBtnClicked(Button*)));
 
+        // Record button
+        m_pRecBtn = new ToggleButton(
+                        pControlsPanel,
+                        "/playerControlPanel/btn_rec_on.png",
+                        "/playerControlPanel/btn_rec_off.png",
+                        "/playerControlPanel/btn_rec_over.png",
+                        QSize(21, 15)
+        );
+        m_pRecBtn->move(195, 17);
+        m_pRecBtn->setPressed(false);
+        m_pRecBtn->setToolTip( trUtf8("Record") );
+        connect(m_pRecBtn, SIGNAL(clicked(Button*)), this, SLOT(recBtnClicked(Button*)));
+
         // Play button
         m_pPlayBtn = new ToggleButton(
@@ -106 +119 @@
                         QSize(26, 17)
         );
-        m_pPlayBtn->move(195, 17);
+        m_pPlayBtn->move(222, 17);
         m_pPlayBtn->setPressed(false);
         m_pPlayBtn->setToolTip( trUtf8("Play/ Pause") );
@@ -119 +132 @@
                         QSize(21, 15)
         );
-        m_pStopBtn->move(227, 17);
+        m_pStopBtn->move(254, 17);
         m_pStopBtn->setToolTip( trUtf8("Stop") );
         connect(m_pStopBtn, SIGNAL(clicked(Button*)), this, SLOT(stopBtnClicked(Button*)));
@@ -131 +144 @@
                         QSize(21, 15)
         );
-        m_pFfwdBtn->move(254, 17);
+        m_pFfwdBtn->move(281, 17);
         m_pFfwdBtn->setToolTip( trUtf8("Fast Forward") );
         connect(m_pFfwdBtn, SIGNAL(clicked(Button*)), this, SLOT(FFWDBtnClicked(Button*)));
@@ -143 +156 @@
                         QSize(21, 15)
         );
-        m_pSongLoopBtn->move(283, 17);
+        m_pSongLoopBtn->move(310, 17);
         m_pSongLoopBtn->setToolTip( trUtf8("Loop song") );
         connect( m_pSongLoopBtn, SIGNAL( clicked(Button*) ), this, SLOT( songLoopBtnClicked(Button*) ) );
@@ -464 +477 @@
         else {
                 m_pPlayBtn->setPressed(false);
+        }
+
+        if (pPref->getRecordEvents()) {
+                m_pRecBtn->setPressed(true);
+        }
+        else {
+                m_pRecBtn->setPressed(false);
         }
 
@@ -611 +631 @@
 
 
+/// Toggle record mode
+void PlayerControl::recBtnClicked(Button* ref) {
+        if ( m_pEngine->getState() != STATE_PLAYING ) {
+                if (ref->isPressed()) {
+                        Preferences::getInstance()->setRecordEvents(true);
+                        (HydrogenApp::getInstance())->setScrollStatusBarMessage(trUtf8("Record midi events = On" ), 2000 );
+                }
+                else {
+                        Preferences::getInstance()->setRecordEvents(false);
+                        (HydrogenApp::getInstance())->setScrollStatusBarMessage(trUtf8("Record midi events = Off" ), 2000 );
+                }
+        }
+}
+
 
 /// Start audio engine

branches/new_fx_rack_and_sample_fun/gui/src/PlayerControl.h

@@ -89 +89 @@
 
         private slots:
+                void recBtnClicked(Button* ref);
                 void playBtnClicked(Button* ref);
                 void stopBtnClicked(Button* ref);
@@ -124 +125 @@
 
                 Button *m_pRwdBtn;
+                ToggleButton *m_pRecBtn;
                 ToggleButton *m_pPlayBtn;
                 Button *m_pStopBtn;

branches/new_fx_rack_and_sample_fun/libs/hydrogen/include/hydrogen/Preferences.h

@@ -151 +151 @@
         bool __playselectedinstrument; // midi keys and keys play instrument or drumset
         bool __rightclickedpattereditor; //right click into pattern editor add note-off-note or edit note-length 
-        bool __recordsong;//  midi keys and keys can record m_playingpattern in songmode
 
 

branches/new_fx_rack_and_sample_fun/libs/hydrogen/src/hydrogen.cpp

@@ -1766 +1766 @@
 {
         m_pAudioDriver->stop();
+        Preferences::getInstance()->setRecordEvents(false);
 }
 
@@ -1832 +1833 @@
         unsigned int column = 0;
         unsigned int lookaheadTicks = m_nLookaheadFrames / m_pAudioDriver->m_transport.m_nTickSize;
-        if ( m_pSong->get_mode() == Song::SONG_MODE &&
-                        Preferences::getInstance()->__recordsong &&
+        if ( m_pSong->get_mode() == Song::SONG_MODE && pref->getRecordEvents() &&
                         m_audioEngineState == STATE_PLAYING ) {
 
-                // Song-record mode + song playback mode + actually playing
+                // Recording + song playback mode + actually playing
                 PatternList *pPatternList = m_pSong->get_pattern_list();
                 int ipattern = getPatternPos(); // playlist index

branches/new_fx_rack_and_sample_fun/libs/hydrogen/src/preferences.cpp

@@ -126 +126 @@
         __playselectedinstrument = false; // midi keyboard and keyboard play only selected instrument
         __rightclickedpattereditor = false; //right click into pattern editor add note-off-note or edit note-length
-        __recordsong = false;//  midi keys and keys can record m_playingpattern in songmode
+        recordEvents = false; // not recording by default
  
         loadPreferences( true );        // Global settings
@@ -239 +239 @@
 
                         hearNewNotes = LocalFileMng::readXmlBool( rootNode, "hearNewNotes", hearNewNotes );
-                        recordEvents = LocalFileMng::readXmlBool( rootNode, "recordEvents", recordEvents );
                         quantizeEvents = LocalFileMng::readXmlBool( rootNode, "quantizeEvents", quantizeEvents );
 
@@ -571 +570 @@
 
         // key/midi event prefs
-        LocalFileMng::writeXmlString( &rootNode, "recordEvents", recordEvents ? "true": "false" );
         LocalFileMng::writeXmlString( &rootNode, "quantizeEvents", quantizeEvents ? "true": "false" );
 

branches/new_fx_rack_and_sample_fun/libs/hydrogen/src/sampler/sampler.cpp

@@ -796 +796 @@
 
                 if ( mSong->get_mode() == Song::PATTERN_MODE ||
-                ( !Preferences::getInstance()->__recordsong && pEngine->getState() != STATE_PLAYING )){
+                ( pEngine->getState() != STATE_PLAYING )){
                         PatternList *pPatternList = mSong->get_pattern_list();
                         if ( ( selectedpattern != -1 )

branches/new_fx_rack_and_sample_fun/linux/debian/rules

@@ -29 +29 @@
         mkdir -p $(CURDIR)/debian/hydrogen/usr/bin
 
-        cd ..; scons --no-cache destdir=$(CURDIR)/debian/hydrogen/ prefix=/usr/ install
+        cd ..; scons --no-cache DESTDIR=$(CURDIR)/debian/hydrogen/ prefix=/usr/ install
 
         find $(CURDIR)/debian/hydrogen -name '.svn' | xargs rm -rf