[Traverso-commit] traverso/src/traverso ExportWidget.cpp ExportWi...

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/06/29 22:15:18

Modified files:
        src/traverso   : ExportWidget.cpp ExportWidget.h 

Log message:
        Quick-fix for burning multiple single sheet CDs without restarting 
traverso

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.cpp?cvsroot=traverso&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.h?cvsroot=traverso&r1=1.12&r2=1.13

Patches:
Index: ExportWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- ExportWidget.cpp    5 Jun 2007 07:43:20 -0000       1.48
+++ ExportWidget.cpp    29 Jun 2007 22:15:18 -0000      1.49
@@ -124,6 +124,7 @@
        env << "LC_ALL=C";
        m_burnprocess->setEnvironment(env);
        m_writingState = NO_STATE;
+       m_lastSheetExported = -1;
        
        refreshButton->setIcon(QIcon(find_pixmap(":/refresh-16")));
        refreshButton->setMaximumHeight(26);
@@ -505,6 +506,11 @@
                return;
        }
        
+       // FIXME: We should instead check export wav file timestamps/revision 
numbers as a dirty test
+       if (! cdAllSongsButton->isChecked() && m_lastSheetExported != 
m_project->get_current_song_id()) {
+               m_exportSpec->renderfinished = false;
+       }
+       
        if (m_wasClosed && m_exportSpec->renderfinished && 
(m_exportSpec->allSongs == cdAllSongsButton->isChecked()) ) {
                
                if (QMessageBox::question(this, tr("Rerender CD content"), 
@@ -556,6 +562,7 @@
                
                disable_ui_interaction();
                m_project->export_project(m_exportSpec);
+               m_lastSheetExported = m_project->get_current_song_id();
        } else {
                if (cdDiskExportOnlyCheckBox->isChecked()) {
                        return;

Index: ExportWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- ExportWidget.h      31 May 2007 19:46:23 -0000      1.12
+++ ExportWidget.h      29 Jun 2007 22:15:18 -0000      1.13
@@ -73,6 +73,7 @@
        };
        
        int m_writingState;
+       int m_lastSheetExported;
        bool m_wasClosed;
        QString get_device(int index);