[Traverso-commit] traverso/src/core AudioClip.cpp InputEngine.cpp

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/04/10 17:13:01

Modified files:
        src/core       : AudioClip.cpp InputEngine.cpp 

Log message:
        small cleanup

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.cpp?cvsroot=traverso&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/InputEngine.cpp?cvsroot=traverso&r1=1.42&r2=1.43

Patches:
Index: AudioClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- AudioClip.cpp       2 Apr 2007 21:05:43 -0000       1.72
+++ AudioClip.cpp       10 Apr 2007 17:13:01 -0000      1.73
@@ -383,36 +383,32 @@
                return -1;      // Channel doesn't exist!!
        }
 
-       bool showdebug = false;
 
-       if ( ((m_song->get_transport_frame() < (548864 + 3000))) && (channel == 
0)) {
-//             showdebug = true;
-       }
+// #define debug
 
-       if (showdebug) {
+#if defined (debug)
                printf("%s\n", m_name.toAscii().data());
                printf("trackStartFrame is %d\n", trackStartFrame);
                printf("trackEndFrame is %d\n", trackEndFrame);
                printf("song->transport is %d\n", 
m_song->get_transport_frame());
                printf("diff trackEndFrame, song->transport is %d\n", 
(int)trackEndFrame - m_song->get_transport_frame());
                printf("diff trackStartFrame, song->transport is %d\n", 
(int)trackStartFrame - m_song->get_transport_frame());
-       }
+               printf("clip trackEndFrame - song->transport_frame is %d\n", 
trackEndFrame - m_song->get_transport_frame());
+#endif
 
        nframes_t mix_pos;
 
-       if (showdebug) printf("clip trackEndFrame - song->transport_frame is 
%d\n", trackEndFrame - m_song->get_transport_frame());
 
        if ( (trackStartFrame <= (m_song->get_transport_frame())) && 
(trackEndFrame > (m_song->get_transport_frame())) ) {
                mix_pos = m_song->get_transport_frame() - trackStartFrame + 
sourceStartFrame;
-               if (showdebug) {
+#if defined (debug)
                        printf("mix_pos is %d\n", mix_pos);
-               }
+#endif
        } else {
-               if (showdebug) {
+#if defined (debug)
                        printf("Not processing this Clip\n\n");
                        printf("END %s\n\n", m_name.toAscii().data());
-               }
-
+#endif
                return 0;
        }
 
@@ -431,10 +427,10 @@
                read_frames = m_readSource->file_read(channel, mixdown, 
mix_pos, nframes);
        }
 
-       if (showdebug) {
+#if defined (debug)
                printf("read frames is %d\n", read_frames);
                printf("END %s\n\n", m_name.toAscii().data());
-       }
+#endif
 
 
        if (read_frames == 0) {
@@ -454,6 +450,8 @@
        }
 
 
+
+
        return 1;
 }
 

Index: InputEngine.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/InputEngine.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- InputEngine.cpp     4 Apr 2007 12:08:57 -0000       1.42
+++ InputEngine.cpp     10 Apr 2007 17:13:01 -0000      1.43
@@ -468,10 +468,11 @@
 
 void InputEngine::set_jogging(bool jog)
 {
-       if (jog)
+       if (jog) {
                cpointer().grab_mouse();
-       else
+       } else {
                cpointer().release_mouse();
+       }
 
        isJogging = jog;
 }