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

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/05/25 12:21:20

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

Log message:
        better record button behavior (I think)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.109&r2=1.110
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.35&r2=1.36

Patches:
Index: core/Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- core/Song.cpp       25 May 2007 10:58:01 -0000      1.109
+++ core/Song.cpp       25 May 2007 12:21:20 -0000      1.110
@@ -639,18 +639,22 @@
 
 Command* Song::go_and_record()
 {
+       if (!is_recording() && !is_transporting()) {
        if (!any_track_armed()) {
                info().critical(tr("No Tracks armed to record too!"));
                return 0;
        }
+       }
        
        if ( ! is_transporting() && ! m_recording) {
                set_recording(true);
+               return go();
        } else if (is_transporting() && m_recording) {
                set_recording(false);
+               return go();
        }
        
-       return go();
+       return 0;
 }
 
 Command* Song::go()

Index: traverso/widgets/InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- traverso/widgets/InfoWidgets.cpp    25 May 2007 10:58:01 -0000      1.35
+++ traverso/widgets/InfoWidgets.cpp    25 May 2007 12:21:20 -0000      1.36
@@ -683,18 +683,7 @@
 
 void SongInfo::recording_button_clicked()
 {
-       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();
-               if (cmd) {
-                       m_recAction->setIcon(find_pixmap(":/redled-16"));
-               }
-
-       }
-       
+       Command* cmd = m_song->go_and_record();
        if (cmd) {
                Command::process_command(cmd);
        }