[Audacity-cvs] audacity-src/src Menus.cpp, 1.524, 1.525 Project.cpp, 1.453, 1.454

[Michael Chinen]

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

Modified Files:
        Menus.cpp Project.cpp 
Log Message:
checking in fix for OD P3

Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -d -r1.453 -r1.454
--- Project.cpp 12 Sep 2009 06:05:41 -0000      1.453
+++ Project.cpp 19 Sep 2009 00:03:57 -0000      1.454
@@ -394,12 +394,17 @@
       //sort by OD non OD.  load Non OD first so user can start editing asap.
       wxArrayString sortednames(filenames);
       
-      sortednames.Sort(CompareODFileName);
+      ODManager::Pause();
+      
+      sortednames.Sort(CompareNoCaseFileName);
       for (unsigned int i = 0; i < sortednames.GetCount(); i++) {
          
          mProject->Import(sortednames[i]);
       }
       mProject->HandleResize(); // Adjust scrollers for new track sizes.
+      
+      ODManager::Resume();
+      
       return true;
    }
 
@@ -2056,7 +2061,8 @@
    //sort selected files by OD status.  
    //For the open menu we load OD first so user can edit asap.
    //first sort selectedFiles.
-   selectedFiles.Sort(CompareODFirstFileName);
+   selectedFiles.Sort(CompareNoCaseFileName);
+   ODManager::Pause();
 
    for (size_t ff = 0; ff < selectedFiles.GetCount(); ff++) {
       wxString fileName = selectedFiles[ff];
@@ -2101,6 +2107,9 @@
       // and it's okay to open a new project inside this window.
       proj->OpenFile(fileName);
    }
+   
+   ODManager::Resume();
+
 }
 
 bool AudacityProject::WarnOfLegacyFile( )

Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.524
retrieving revision 1.525
diff -u -d -r1.524 -r1.525
--- Menus.cpp   12 Sep 2009 06:05:41 -0000      1.524
+++ Menus.cpp   19 Sep 2009 00:03:57 -0000      1.525
@@ -4320,7 +4320,7 @@
    gPrefs->Write(wxT("/NewImportingSession"), true);
    //sort selected files by OD status.  Load non OD first so user can edit 
asap.
    //first sort selectedFiles.
-   selectedFiles.Sort(CompareODFileName);
+   selectedFiles.Sort(CompareNoCaseFileName);
    
    for (size_t ff = 0; ff < selectedFiles.GetCount(); ff++) {
       wxString fileName = selectedFiles[ff];


------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs