Update of /cvsroot/audacity/audacity-src/src/toolbars
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14734/src/toolbars

Modified Files:
        ControlToolBar.cpp 
Log Message:
Convert Andy Coder's "seek behind cursor" patch to an experimental feature as 
it causes some display and playback sync problems.

Index: ControlToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/ControlToolBar.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- ControlToolBar.cpp  1 Apr 2009 04:38:17 -0000       1.37
+++ ControlToolBar.cpp  26 May 2009 08:43:27 -0000      1.38
@@ -439,8 +439,10 @@
    }
 
    double maxofmins,minofmaxs;
+#if defined(EXPERIMENTAL_SEEK_BEHIND_CURSOR)
    double init_seek = 0.0;
-   
+#endif 
+ 
    // JS: clarified how the final play region is computed;
    if (t1 == t0) {
       // msmeyer: When playing looped, we play the whole file, if
@@ -456,10 +458,12 @@
          else if (t0 > t->GetEndTime()) {
             t0 = t->GetEndTime();
          }
+#if defined(EXPERIMENTAL_SEEK_BEHIND_CURSOR)
          else {
             init_seek = t0;         //AC: init_seek is where playback will 
'start'
             t0 = t->GetStartTime();
          }
+#endif
       }
       
       // always play to end
@@ -539,8 +543,10 @@
          success = true;
          p->SetAudioIOToken(token);
          mBusyProject = p;
+#if defined(EXPERIMENTAL_SEEK_BEHIND_CURSOR)
          //AC: If init_seek was set, now's the time to make it happen.
          gAudioIO->SeekStream(init_seek);
+#endif
          SetVUMeters(p);
       }
       else {


------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, & 
iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://www.creativitycat.com 
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs

Reply via email to