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

Modified Files:
        Menus.h Menus.cpp 
Log Message:
Added "Split New" to bring back the 1.2.x series Split behavior.

Index: Menus.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.h,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- Menus.h     19 Oct 2006 10:42:46 -0000      1.93
+++ Menus.h     17 Nov 2006 05:09:24 -0000      1.94
@@ -169,6 +169,7 @@
 void OnSilence();
 
 void OnSplit();
+void OnSplitNew();
 void OnSplitLabelsToTracks();
 void OnJoin();
 void OnDisjoin();

Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -d -r1.290 -r1.291
--- Menus.cpp   5 Nov 2006 04:38:36 -0000       1.290
+++ Menus.cpp   17 Nov 2006 05:09:24 -0000      1.291
@@ -422,6 +422,11 @@
       AudioIONotBusyFlag | WaveTracksSelectedFlag,
       AudioIONotBusyFlag | WaveTracksSelectedFlag);
 
+   c->AddItem(wxT("SplitNew"),      _("Split Ne&w\tShift+Ctrl+I"),       
FN(OnSplitNew));
+   c->SetCommandFlags(wxT("SplitNew"),
+      AudioIONotBusyFlag | WaveTracksSelectedFlag,
+      AudioIONotBusyFlag | WaveTracksSelectedFlag);
+
    c->AddItem(wxT("Join"),           _("&Join\tCtrl+J"),                  
FN(OnJoin));
    c->AddItem(wxT("Disjoin"),        _("Disj&oin\tCtrl+Alt+J"),                
       FN(OnDisjoin));
    
@@ -2987,6 +2992,50 @@
 #endif
 }
 
+void AudacityProject::OnSplitNew()
+{
+   TrackListIterator iter(mTracks);
+   Track *n = iter.First();
+   Track *dest;
+
+   TrackList newTracks;
+
+   n = iter.First();
+   while (n) {
+      if (n->GetSelected()) {
+         dest = NULL;
+         if (n->GetKind() == Track::Wave)
+         {
+            ((WaveTrack*)n)->SplitCut(mViewInfo.sel0, mViewInfo.sel1, &dest);
+         } else
+         {
+            n->Cut(mViewInfo.sel0, mViewInfo.sel1, &dest);
+         }
+         if (dest) {
+            dest->SetChannel(n->GetChannel());
+            dest->SetTeamed(n->GetTeamed()); // do first
+            dest->SetLinked(n->GetLinked());
+            dest->SetName(n->GetName());
+            dest->SetOffset(wxMax(mViewInfo.sel0, n->GetOffset()));
+            newTracks.Add(dest);
+         }
+      }
+      n = iter.Next();
+   }
+
+   TrackListIterator nIter(&newTracks);
+   n = nIter.First();
+   while (n) {
+      mTracks->Add(n);
+      n = nIter.Next();
+   }
+
+   PushState(_("Split to new track"), _("Split New"));
+
+   RedrawProject();
+}
+
+
 void AudacityProject::OnSplitLabelsToTracks()
 {
    TrackListIterator iter(mTracks);


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs

Reply via email to