traverso-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Traverso-commit] traverso/src core/Song.cpp traverso/widgets/Inf...


From: Remon Sijrier
Subject: [Traverso-commit] traverso/src core/Song.cpp traverso/widgets/Inf...
Date: Thu, 24 May 2007 13:45:51 +0000

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/05/24 13:45:51

Modified files:
        src/core       : Song.cpp 
        src/traverso/widgets: InfoWidgets.cpp InfoWidgets.h 

Log message:
        * changed behavior of recording button, it always starts recording now.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.106&r2=1.107
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.h?cvsroot=traverso&r1=1.15&r2=1.16

Patches:
Index: core/Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- core/Song.cpp       24 May 2007 13:11:37 -0000      1.106
+++ core/Song.cpp       24 May 2007 13:45:50 -0000      1.107
@@ -654,6 +654,10 @@
        
        CommandGroup* group = 0;
        
+       if (is_transporting() && m_recording) {
+               set_recording(false);
+       }
+       
        if (m_transport) {
                m_stopTransport = true;
        } else {

Index: traverso/widgets/InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- traverso/widgets/InfoWidgets.cpp    24 May 2007 13:11:39 -0000      1.32
+++ traverso/widgets/InfoWidgets.cpp    24 May 2007 13:45:51 -0000      1.33
@@ -545,8 +545,7 @@
        
        m_record = new QToolButton(this);
        m_recAction = new QAction(tr("Record"), this);
-       m_recAction->setCheckable(true);
-       m_recAction->setToolTip(tr("Toggle recording state on/off"));
+       m_recAction->setToolTip(tr("Start - Stop recording"));
        m_record->setDefaultAction(m_recAction);
        m_record->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
        
@@ -594,7 +593,7 @@
        connect(m_followAct, SIGNAL(triggered(bool)), this, 
SLOT(follow_state_changed(bool)));
        connect(&config(), SIGNAL(configChanged()), this, 
SLOT(update_follow_state()));
        connect(m_effectButton, SIGNAL(clicked()), this, 
SLOT(effect_button_clicked()));
-       connect(m_recAction, SIGNAL(triggered(bool)), this, 
SLOT(recording_button_state_changed(bool)));
+       connect(m_record, SIGNAL(clicked()), this, 
SLOT(recording_button_clicked()));
        
        update_follow_state();
 }
@@ -682,23 +681,27 @@
        }
 }
 
-void SongInfo::recording_button_state_changed(bool state)
+void SongInfo::recording_button_clicked()
 {
-       m_song->set_recording(state);
-       if (state) {
-               m_recAction->setIcon(find_pixmap(":/redled-16"));
-       } else {
+       Command* cmd;
+       if (m_song->is_transporting()) {
+               cmd = m_song->go();
                m_recAction->setIcon(find_pixmap(":/redledinactive-16"));
+       } else {
+               cmd = m_song->go_and_record();
+               m_recAction->setIcon(find_pixmap(":/redled-16"));
+       }
+       
+       if (cmd) {
+               Command::process_command(cmd);
        }
 }
 
 void SongInfo::update_recording_state()
 {
        if (m_song->is_recording()) {
-               m_recAction->setChecked(true);
                m_recAction->setIcon(find_pixmap(":/redled-16"));
        } else {
-               m_recAction->setChecked(false);
                m_recAction->setIcon(find_pixmap(":/redledinactive-16"));
        }
 }

Index: traverso/widgets/InfoWidgets.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- traverso/widgets/InfoWidgets.h      24 May 2007 13:11:39 -0000      1.15
+++ traverso/widgets/InfoWidgets.h      24 May 2007 13:45:51 -0000      1.16
@@ -192,7 +192,7 @@
        void update_effects_state();
        void follow_state_changed(bool state);
        void effect_button_clicked();
-       void recording_button_state_changed(bool state);
+       void recording_button_clicked();
        void update_recording_state();
        void song_selector_song_added(Song* song);
        void song_selector_song_removed(Song* song);




reply via email to

[Prev in Thread] Current Thread [Next in Thread]