Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv28845/src

Modified Files:
        BatchCommands.cpp BatchProcessDialog.cpp 
Log Message:
Removed the need for an Import in a chain - handled by the dialog.

Index: BatchProcessDialog.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/BatchProcessDialog.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- BatchProcessDialog.cpp      15 Oct 2006 06:39:31 -0000      1.15
+++ BatchProcessDialog.cpp      16 Oct 2006 21:36:08 -0000      1.16
@@ -280,7 +280,10 @@
       mList->SetItemImage(i, 1, 1);
       mList->EnsureVisible(i);
 
-      if (!mBatchCommands.ApplyChain(files[i])) {
+      project->OnRemoveTracks();
+      project->Import(files[i]);
+      project->OnSelectAll();
+      if (!mBatchCommands.ApplyChain()) {
          break;
       }
 
@@ -288,6 +291,7 @@
          break;
       }
    }
+   project->OnRemoveTracks();
 
    EndModal(true);
 }

Index: BatchCommands.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/BatchCommands.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- BatchCommands.cpp   15 Oct 2006 05:22:40 -0000      1.25
+++ BatchCommands.cpp   16 Oct 2006 21:36:08 -0000      1.26
@@ -229,7 +229,6 @@
 // Commands (at least currently) don't.  Messy.
 
 /* i18n-hint: Effect name translations must agree with those used elsewhere, 
or batch won't find them */
-   AddToChain( wxT("Import") );
    AddToChain(   _("Stereo To Mono") );
    AddToChain(   _("Normalize") );
    AddToChain( wxT("Save Hq Master1") );
@@ -244,7 +243,6 @@
 {
    ResetChain();
  
-   AddToChain( wxT("Import") );
    AddToChain(   _("Normalize") );
    AddToChain( wxT("ExportMp3") );
 }
@@ -457,9 +455,7 @@
    if( command == wxT("No Action")){
       return true;
    } else if (!mFileName.IsEmpty() && command == wxT("Import") ){
-      project->OnRemoveTracks();
-      project->Import(mFileName);
-      project->OnSelectAll();
+      // historically this was in use, now ignored if there
       return true;
    } else if (command == wxT("Save Hq Master1")){
       filename.Replace(wxT("cleaned/"), wxT("cleaned/MasterBefore_"), false);


-------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs

Reply via email to