Update of /cvsroot/audacity/audacity-src/src/export
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv13346
Modified Files:
ExportFLAC.cpp ExportOGG.cpp
Log Message:
Add missing display of metadata editor for OGG and FLAC exports
Index: ExportOGG.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/export/ExportOGG.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ExportOGG.cpp 7 May 2007 00:59:16 -0000 1.31
+++ ExportOGG.cpp 1 Jun 2007 04:24:05 -0000 1.32
@@ -201,7 +201,15 @@
vorbis_encode_init_vbr(&info, numChannels, int(rate + 0.5), quality);
// Retrieve tags
- project->GetTags()->ExportOGGTags(&comment);
+ Tags *tags = project->GetTags();
+ if (tags->IsEmpty() && project->GetShowId3Dialog()) {
+ if (!tags->ShowEditDialog(project,
+ _("Edit the metadata for the OGG file"),
+ true)) {
+ return false; // user selected "cancel"
+ }
+ }
+ tags->ExportOGGTags(&comment);
// Set up analysis state and auxiliary encoding storage
vorbis_analysis_init(&dsp, &info);
Index: ExportFLAC.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/export/ExportFLAC.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ExportFLAC.cpp 7 May 2007 00:59:16 -0000 1.13
+++ ExportFLAC.cpp 1 Jun 2007 04:24:04 -0000 1.14
@@ -220,8 +220,6 @@
wxLogNull logNo; // temporarily disable wxWindows error messages
bool cancelling = false;
- Tags *tags = project->GetTags();
-
int levelPref;
gPrefs->Read(wxT("/FileFormats/FLACLevel"), &levelPref, 5);
@@ -233,6 +231,15 @@
encoder->set_channels(numChannels);
encoder->set_sample_rate(int(rate + 0.5));
+ // Retrieve tags
+ Tags *tags = project->GetTags();
+ if (tags->IsEmpty() && project->GetShowId3Dialog()) {
+ if (!tags->ShowEditDialog(project,
+ _("Edit the metadata for the FLAC file"),
+ true)) {
+ return false; // user selected "cancel"
+ }
+ }
tags->ExportFLACTags(encoder);
sampleFormat format;
-------------------------------------------------------------------------
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
