Update of /cvsroot/audacity/audacity-src/src/export
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29448
Modified Files:
ExportMultiple.cpp
Log Message:
Get rid of a couple of commits.
Index: ExportMultiple.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/export/ExportMultiple.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- ExportMultiple.cpp 17 Mar 2009 18:08:33 -0000 1.52
+++ ExportMultiple.cpp 23 Mar 2009 21:27:12 -0000 1.53
@@ -646,7 +646,7 @@
l++; // next label, count up one
}
- bool ok = true; // did it work?
+ int ok = eProgressSuccess; // did it work?
int count = 0; // count the number of sucessful runs
ExportKit activeSetting; // pointer to the settings in use for this export
/* Go round again and do the exporting (so this run is slow but
@@ -657,7 +657,7 @@
// Export it
ok = DoExport(channels, activeSetting.destfile, false, activeSetting.t0,
activeSetting.t1, activeSetting.filetags);
- if (!ok) {
+ if (ok != eProgressSuccess && ok != eProgressStopped) {
break;
}
}
@@ -670,7 +670,7 @@
_("Export Multiple"),
wxOK | wxCENTRE, this);
- return ok;
+ return (ok == eProgressSuccess || ok == eProgressStopped);
}
bool ExportMultiple::ExportMultipleByTrack(bool byName,
@@ -826,7 +826,7 @@
}
// Stop if an error occurred
- if (ok != eProgressSuccess) {
+ if (ok != eProgressSuccess && ok != eProgressStopped) {
break;
}
// increment export counter
@@ -852,8 +852,8 @@
count),
_("Export Multiple"),
wxOK | wxCENTRE, this);
-
- return ok;
+
+ return (ok == eProgressSuccess || ok == eProgressStopped);
}
int ExportMultiple::DoExport(int channels,
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
