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

Modified Files:
        Project.cpp 
Log Message:
applying ifdefs to ODDecodeFlac task dependancies.


Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.472
retrieving revision 1.473
diff -u -d -r1.472 -r1.473
--- Project.cpp 11 Nov 2009 08:39:20 -0000      1.472
+++ Project.cpp 11 Nov 2009 18:09:23 -0000      1.473
@@ -2498,16 +2498,20 @@
             while((odFlags|createdODTasks) != createdODTasks)
             {
                newTask=NULL;
+#ifdef EXPERIMENTAL_OD_FLAC
                if(!(createdODTasks&ODTask::eODFLAC) && odFlags & 
ODTask::eODFLAC) {
                   newTask= new ODDecodeFlacTask;
                   createdODTasks= createdODTasks | ODTask::eODFLAC;
                }
-               else if(!(createdODTasks&ODTask::eODPCMSummary) && odFlags & 
ODTask::eODPCMSummary) {
+               else 
+#endif
+               if(!(createdODTasks&ODTask::eODPCMSummary) && odFlags & 
ODTask::eODPCMSummary) {
                   newTask=new ODComputeSummaryTask;
                   createdODTasks= createdODTasks | ODTask::eODPCMSummary;
                }
                else {
                   printf("unrecognized OD Flag in blockfile.\n");
+                  //TODO:ODTODO: display to user.  This can happen when we 
build audacity on a system that doesnt have libFLAC
                   break;
                }
                if(newTask)


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs

Reply via email to