Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv20767
Modified Files:
Track.cpp Track.h Menus.cpp ShuttleGui.cpp ShuttleGui.h
Project.cpp
Log Message:
ExportMultiple redone to support centralizing format types within Export. (And
I went overboard again... :-))
Removed format settings from preferences.
Index: Track.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Track.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Track.cpp 4 Mar 2007 07:21:52 -0000 1.36
+++ Track.cpp 8 Apr 2007 09:11:25 -0000 1.37
@@ -139,9 +139,12 @@
return NULL;
}
-Track *TrackListIterator::First()
+Track *TrackListIterator::First(TrackList * val)
{
- if( l== NULL )
+ if (val != NULL)
+ l = val;
+
+ if (l == NULL)
return NULL;
cur = l->head;
Index: Track.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Track.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- Track.h 4 Mar 2007 07:21:52 -0000 1.36
+++ Track.h 8 Apr 2007 09:11:25 -0000 1.37
@@ -161,10 +161,10 @@
class TrackListIterator {
public:
- TrackListIterator(TrackList * val);
+ TrackListIterator(TrackList * val = NULL);
// Iterate functions
- Track *First();
+ Track *First(TrackList * val = NULL);
Track *Next(bool SkipLinked = false);
Track *RemoveCurrent(); // returns next
Index: ShuttleGui.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/ShuttleGui.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ShuttleGui.h 17 Mar 2007 20:28:34 -0000 1.17
+++ ShuttleGui.h 8 Apr 2007 09:11:26 -0000 1.18
@@ -171,12 +171,12 @@
const int Default,
const wxArrayString & Choices,
const wxArrayInt & TranslatedChoices);
- void TieTextBox(
+ wxTextCtrl * TieTextBox(
const wxString &Prompt,
const wxString &SettingName,
const wxString &Default,
const int nChars);
- void TieTextBox(
+ wxTextCtrl * TieTextBox(
const wxString & Prompt,
const wxString & SettingName,
const double & Default,
Index: ShuttleGui.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/ShuttleGui.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ShuttleGui.cpp 17 Mar 2007 20:28:34 -0000 1.26
+++ ShuttleGui.cpp 8 Apr 2007 09:11:26 -0000 1.27
@@ -1308,33 +1308,39 @@
/// Variant of the standard TieTextBox which does the two step exchange
/// between gui and stack variable and stack variable and shuttle.
-void ShuttleGuiBase::TieTextBox(
+wxTextCtrl * ShuttleGuiBase::TieTextBox(
const wxString & Prompt,
const wxString & SettingName,
const wxString & Default,
const int nChars)
{
+ wxTextCtrl * pText=(wxTextCtrl*)NULL;
+
wxString Temp = Default;
WrappedType WrappedRef( Temp );
if( DoStep(1) ) DoDataShuttle( SettingName, WrappedRef );
- if( DoStep(2) ) TieTextBox( Prompt, WrappedRef, nChars );
+ if( DoStep(2) ) pText = TieTextBox( Prompt, WrappedRef, nChars );
if( DoStep(3) ) DoDataShuttle( SettingName, WrappedRef );
+ return pText;
}
/// Variant of the standard TieTextBox which does the two step exchange
/// between gui and stack variable and stack variable and shuttle.
/// This one does it for double values...
-void ShuttleGuiBase::TieTextBox(
+wxTextCtrl * ShuttleGuiBase::TieTextBox(
const wxString & Prompt,
const wxString & SettingName,
const double & Default,
const int nChars)
{
+ wxTextCtrl * pText=(wxTextCtrl*)NULL;
+
double Temp = Default;
WrappedType WrappedRef( Temp );
if( DoStep(1) ) DoDataShuttle( SettingName, WrappedRef );
- if( DoStep(2) ) TieTextBox( Prompt, WrappedRef, nChars );
+ if( DoStep(2) ) pText = TieTextBox( Prompt, WrappedRef, nChars );
if( DoStep(3) ) DoDataShuttle( SettingName, WrappedRef );
+ return pText;
}
/// Variant of the standard TieChoice which does the two step exchange
Index: Project.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Project.cpp,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -d -r1.299 -r1.300
--- Project.cpp 6 Apr 2007 10:25:47 -0000 1.299
+++ Project.cpp 8 Apr 2007 09:11:26 -0000 1.300
@@ -2088,9 +2088,9 @@
// and just work with .Wav, so does an export on a save.
if( mCleanSpeechMode )
{
- Export e(this);
+ Export e;
double endTime = mTracks->GetEndTime();
- bool flag = e.Process(false, 0.0, endTime);
+ bool flag = e.Process(this, false, 0.0, endTime);
return flag;
}
Index: Menus.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Menus.cpp,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -d -r1.302 -r1.303
--- Menus.cpp 6 Apr 2007 10:25:47 -0000 1.302
+++ Menus.cpp 8 Apr 2007 09:11:25 -0000 1.303
@@ -2176,21 +2176,23 @@
void AudacityProject::OnExport()
{
- Export e(this);
+ Export e;
- e.Process(false, 0.0, mTracks->GetEndTime());
+ e.Process(this, false, 0.0, mTracks->GetEndTime());
}
void AudacityProject::OnExportSelection()
{
- Export e(this);
+ Export e;
- e.Process(true, mViewInfo.sel0, mViewInfo.sel1);
+ e.Process(this, true, mViewInfo.sel0, mViewInfo.sel1);
}
void AudacityProject::OnExportMultiple()
{
- ::ExportMultiple(this);
+ ExportMultiple em(this);
+
+ em.ShowModal();
}
void AudacityProject::OnPreferences()
-------------------------------------------------------------------------
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
