Update of /cvsroot/audacity/audacity-src/src/toolbars
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv10517/toolbars
Modified Files:
ControlToolBar.cpp
Log Message:
Fix cut preview
Index: ControlToolBar.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/toolbars/ControlToolBar.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ControlToolBar.cpp 6 Nov 2006 11:18:39 -0000 1.5
+++ ControlToolBar.cpp 6 Nov 2006 12:13:31 -0000 1.6
@@ -426,9 +426,6 @@
if (cutpreview && t0==t1)
return; /* msmeyer: makes no sense */
- if (cutpreview && !mCutPreviewTracks)
- return; /* no tracks selected, cannot preview */
-
mStop->Enable();
mRewind->Disable();
mBatch->Disable();
@@ -496,10 +493,20 @@
double tcp0 = t0-beforeLen;
double tcp1 = (t1+afterLen) - (t1-t0);
SetupCutPreviewTracks(tcp0, t0, t1, tcp1);
- token = gAudioIO->StartStream(
- mCutPreviewTracks->GetWaveTrackArray(false),
- WaveTrackArray(), NULL, p->GetRate(), tcp0, tcp1, p, false,
- t0, t1-t0);
+ if (mCutPreviewTracks)
+ {
+ token = gAudioIO->StartStream(
+ mCutPreviewTracks->GetWaveTrackArray(false),
+ WaveTrackArray(), NULL, p->GetRate(), tcp0, tcp1, p, false,
+ t0, t1-t0);
+ } else
+ {
+ // Cannot create cut preview tracks, clean up and exit
+ SetPlay(false);
+ SetStop(false);
+ SetRecord(false);
+ return;
+ }
} else {
token = gAudioIO->StartStream(t->GetWaveTrackArray(false),
WaveTrackArray(), t->GetTimeTrack(),
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
