Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv23535
Modified Files:
Prefs.h FileFormats.h Prefs.cpp FileFormats.cpp
Log Message:
Move WAV format options to Options dialog.
Index: FileFormats.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/FileFormats.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- FileFormats.cpp 18 Nov 2006 05:01:59 -0000 1.17
+++ FileFormats.cpp 14 Apr 2007 06:58:36 -0000 1.18
@@ -205,8 +205,9 @@
subtype == SF_FORMAT_PCM_32);
}
-void sf_get_all_extensions(wxArrayString &exts)
+wxArrayString sf_get_all_extensions()
{
+ wxArrayString exts;
SF_FORMAT_INFO format_info;
int count, k;
@@ -232,6 +233,8 @@
exts.Add(wxT("svx"));
exts.Add(wxT("svx8"));
exts.Add(wxT("sv16"));
+
+ return exts;
}
#ifdef __WXMAC__
Index: FileFormats.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/FileFormats.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- FileFormats.h 17 Sep 2006 01:03:25 -0000 1.11
+++ FileFormats.h 14 Apr 2007 06:58:36 -0000 1.12
@@ -9,6 +9,7 @@
**********************************************************************/
#include <wx/list.h>
+#include <wx/arrstr.h>
#include <wx/string.h>
#include "Audacity.h"
@@ -54,7 +55,7 @@
bool sf_subtype_more_than_16_bits(unsigned int format);
bool sf_subtype_is_integer(unsigned int format);
-void sf_get_all_extensions(wxArrayString &exts);
+wxArrayString sf_get_all_extensions();
//
// Mac OS 4-char type
Index: Prefs.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Prefs.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Prefs.h 19 Jul 2006 04:24:11 -0000 1.11
+++ Prefs.h 14 Apr 2007 06:58:36 -0000 1.12
@@ -39,10 +39,6 @@
extern int gMenusDirty;
-int ReadExportFormatPref();
-void WriteExportFormatPref(int format);
-
-
#endif
// Indentation settings for Vim and Emacs and unique identifier for Arch, a
Index: Prefs.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Prefs.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Prefs.cpp 10 Nov 2006 06:11:40 -0000 1.24
+++ Prefs.cpp 14 Apr 2007 06:58:36 -0000 1.25
@@ -206,17 +206,6 @@
}
}
-int ReadExportFormatPref()
-{
- return gPrefs->Read(wxT("/FileFormats/ExportFormat_SF1"),
- (long int)(SF_FORMAT_WAV | SF_FORMAT_PCM_16));
-}
-
-void WriteExportFormatPref(int format)
-{
- gPrefs->Write(wxT("/FileFormats/ExportFormat_SF1"), (long int)format);
-}
-
// Indentation settings for Vim and Emacs and unique identifier for Arch, a
// version control system. Please do not modify past this point.
//
-------------------------------------------------------------------------
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
