Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv28441
Modified Files:
Menus.cpp
Log Message:
Use Control toolbar play functions when using Transcription toolbar. (removes
unmaintained duplication)
Cleaned up Transcription toolbar a little (at least the used functions)
Transcription toolbar was allocating TimeTracks in wrong project
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -d -r1.306 -r1.307
--- Menus.cpp 21 Apr 2007 22:44:47 -0000 1.306
+++ Menus.cpp 25 Apr 2007 03:43:30 -0000 1.307
@@ -3485,7 +3485,7 @@
wxString path = gPrefs->Read(wxT("/DefaultOpenPath"),::wxGetCwd());
// TODO: Build the list of file types dynamically
-
+
FileDialog dlog(this, _("Select one or more audio files..."),
path, wxT(""),
GetImportFilesFilter(),
@@ -3942,45 +3942,22 @@
void AudacityProject::OnNewTimeTrack()
{
- TrackListIterator iter(mTracks);
- Track *t = iter.First();
- bool alreadyHaveTimeTrack = false;
-
- while (t)
- {
- if (t->GetKind() == Track::Time)
- {
- alreadyHaveTimeTrack = true;
- break;
- }
- t = iter.Next();
- }
-
- if( alreadyHaveTimeTrack )
- {
- wxString msg;
- msg.Printf(_("The version of Audacity you are using does not support
multiple time tracks."));
- wxMessageBox(msg);
- }
- else
- {
- TimeTrack *t = new TimeTrack(mDirManager);
+ if (mTracks->GetTimeTrack()) {
+ wxMessageBox(_("The version of Audacity you are using does not support
multiple time tracks."));
+ return;
+ }
- SelectNone();
- mTracks->AddToHead(t);
- t->SetSelected(true);
-
- PushState(_("Created new time track"), _("New Track"));
+ TimeTrack *t = new TimeTrack(mDirManager);
- /*
- TrackListIterator iter(mTracks);
- for( Track *tr = iter.First(); (tr); tr = iter.Next() )
- tr->SetTimeTrack( t );
- */
-
- RedrawProject();
- mTrackPanel->EnsureVisible(t);
- }
+ SelectNone();
+
+ mTracks->AddToHead(t);
+ t->SetSelected(true);
+
+ PushState(_("Created new time track"), _("New Track"));
+
+ RedrawProject();
+ mTrackPanel->EnsureVisible(t);
}
void AudacityProject::OnSmartRecord()
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
