[Traverso-commit] traverso/src core/Song.cpp traverso/ExportWidge...

[Nicola Doebelin]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Nicola Doebelin <n_doebelin>    07/05/11 19:04:45

Modified files:
        src/core       : Song.cpp 
        src/traverso   : ExportWidget.cpp 

Log message:
        Custom pre-gap support in cdrdao export
        Small fixes in ExportWidget

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.cpp?cvsroot=traverso&r1=1.22&r2=1.23

Patches:
Index: core/Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- core/Song.cpp       11 May 2007 11:16:32 -0000      1.94
+++ core/Song.cpp       11 May 2007 19:04:45 -0000      1.95
@@ -935,18 +935,25 @@
                output += "      SONGWRITER \"" + startmarker->get_songwriter() 
+ "\"\n";
                output += "      MESSAGE \"" + startmarker->get_message() + 
"\"\n    }\n  }\n";
 
-               //Â add a standard pregap if requested, but only if it is the 
first track
-               if (pregap && (i == 0)) {
+               //Â add some stuff only required for the first track (e.g. 
pre-gap)
+               if (i == 0) {
+                       start = 
cd_to_frame(frame_to_cd(startmarker->get_when(), m_project->get_rate()), 
m_project->get_rate());
+
+                       if (pregap) {
+                               if (start == 0) {
+                                       // standard pregap, because we have a 
track marker at the beginning
                        output += "  PREGAP 00:02:00\n";
+                               } else {
+                                       // no track marker at the beginning, 
thus use the part from 0 to the first
+                                       //Â track marker for the pregap
+                                       output += "  START " + 
frame_to_cd(start, m_project->get_rate()) + "\n";
+                                       start = 0;
+                               }
                }
 
-               if (i == 0) {
-                       start = 
cd_to_frame(frame_to_cd(startmarker->get_when(), m_project->get_rate()), 
m_project->get_rate());
-                       // I thought some cd players required a 2-second PREGAP 
on the first track?
-                       // FIXME: Uncomment, remove, or make configurable in 
the Export dialog.
-                       // output += "  PREGAP 0:02:00\n";
                }
 
+
                nframes_t end = cd_to_frame(frame_to_cd(endmarker->get_when(), 
m_project->get_rate()), m_project->get_rate());
                nframes_t length = end - start;
 

Index: traverso/ExportWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- traverso/ExportWidget.cpp   11 May 2007 11:16:32 -0000      1.22
+++ traverso/ExportWidget.cpp   11 May 2007 19:04:45 -0000      1.23
@@ -76,7 +76,7 @@
        audioTypeComboBox->insertItem(0, "WAV");
        audioTypeComboBox->insertItem(1, "AIFF");
        audioTypeComboBox->insertItem(2, "FLAC");
-       audioTypeComboBox->insertItem(3, "CD image (cdrdao)");
+//     audioTypeComboBox->insertItem(3, "CD image (cdrdao)");
 
        bitdepthComboBox->setCurrentIndex(0);
 
@@ -552,6 +552,10 @@
        
        arguments << m_exportSpec->tocFileName;
        
+       if (m_writingState == BURNING) {
+               update_cdburn_status(tr("Waiting for CD-Writer..."), 
NORMAL_MESSAGE);
+       }
+
        m_burnprocess->start(CDRDAO_BIN, arguments);
 }