[Traverso-commit] traverso/src core/Export.cpp core/Export.h core...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/11/22 15:07:02

Modified files:
        src/core       : Export.cpp Export.h Project.cpp 
        src/traverso/dialogs: CDWritingDialog.cpp 
        src/traverso   : Interface.cpp 
        src/traverso/ui: CDWritingDialog.ui 

Log message:
        * Explicitely set the ExportSpecification for the export thread!
        * Make it impossible to show both export and cd burning dialogs at the 
same time
        * add some command line debug output

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Export.cpp?cvsroot=traverso&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Export.h?cvsroot=traverso&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Project.cpp?cvsroot=traverso&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/CDWritingDialog.cpp?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.108&r2=1.109
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/CDWritingDialog.ui?cvsroot=traverso&r1=1.2&r2=1.3

Patches:
Index: core/Export.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Export.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- core/Export.cpp     22 Oct 2007 18:44:00 -0000      1.14
+++ core/Export.cpp     22 Nov 2007 15:07:01 -0000      1.15
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
  
-    $Id: Export.cpp,v 1.14 2007/10/22 18:44:00 r_sijrier Exp $
+    $Id: Export.cpp,v 1.15 2007/11/22 15:07:01 r_sijrier Exp $
 */
 
 #include "Export.h"
@@ -27,14 +27,19 @@
 // in case we run with memory leak detection enabled!
 #include "Debugger.h"
 
-ExportThread::ExportThread(Project* project, ExportSpecification* 
specification)
+ExportThread::ExportThread(Project* project)
        : QThread(project)
 {
         m_project = project;
-        m_spec  = specification;
-       specification->thread = this;
 }
 
+void ExportThread::set_specification(ExportSpecification * spec)
+{
+       m_spec  = spec;
+       m_spec->thread = this;
+}
+
+
 void ExportThread::run( )
 {
         m_project->start_export(m_spec);
@@ -137,5 +142,3 @@
 
        return 1;
 }
-
-//eof

Index: core/Export.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Export.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- core/Export.h       12 Oct 2007 10:06:30 -0000      1.16
+++ core/Export.h       22 Nov 2007 15:07:01 -0000      1.17
@@ -17,7 +17,7 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: Export.h,v 1.16 2007/10/12 10:06:30 r_sijrier Exp $
+$Id: Export.h,v 1.17 2007/11/22 15:07:01 r_sijrier Exp $
 */
 
 #ifndef EXPORT_H
@@ -98,8 +98,8 @@
 {
        Q_OBJECT
 
-       public:
-               ExportThread(Project* project, ExportSpecification* spec);
+public:
+       ExportThread(Project* project);
                ~ExportThread()
                {}
 
@@ -107,8 +107,9 @@
                void sleep_for(uint msecs) {
                        msleep(msecs);
                }
+       void set_specification(ExportSpecification* spec);
 
-       private:
+private:
                Project*                m_project;
                ExportSpecification*    m_spec;
 };

Index: core/Project.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Project.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- core/Project.cpp    5 Nov 2007 15:49:30 -0000       1.62
+++ core/Project.cpp    22 Nov 2007 15:07:02 -0000      1.63
@@ -512,8 +512,10 @@
 
 int Project::export_project(ExportSpecification* spec)
 {
+       PENTER;
+       
        if (!m_exportThread) {
-               m_exportThread = new ExportThread(this, spec);
+               m_exportThread = new ExportThread(this);
        }
        
        if (m_exportThread->isRunning()) {
@@ -526,6 +528,7 @@
        spec->stop = false;
        spec->breakout = false;
 
+       m_exportThread->set_specification(spec);
        m_exportThread->start();
 
        return 0;

Index: traverso/dialogs/CDWritingDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/CDWritingDialog.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- traverso/dialogs/CDWritingDialog.cpp        5 Nov 2007 15:53:03 -0000       
1.4
+++ traverso/dialogs/CDWritingDialog.cpp        22 Nov 2007 15:07:02 -0000      
1.5
@@ -105,6 +105,7 @@
 void CDWritingDialog::set_project(Project * project)
 {
        m_project = project;
+       
        if (! m_project) {
                info().information(tr("No project loaded, to write a project to 
CD, load it first!"));
                setEnabled(false);
@@ -228,6 +229,8 @@
 
 void CDWritingDialog::cdrdao_process_finished(int exitcode, 
QProcess::ExitStatus exitstatus)
 {
+       PENTER;
+       
        Q_UNUSED(exitcode);
        
        if (exitstatus == QProcess::CrashExit) {

Index: traverso/Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- traverso/Interface.cpp      19 Nov 2007 11:18:54 -0000      1.108
+++ traverso/Interface.cpp      22 Nov 2007 15:07:02 -0000      1.109
@@ -361,25 +361,35 @@
 
 Command * Interface::show_export_widget( )
 {
+       if (m_cdWritingDialog && !m_cdWritingDialog->isHidden()) {
+               return 0;
+       }
+       
        if (! m_exportDialog) {
                m_exportDialog = new ExportDialog(this);
        }
+       
        if (m_exportDialog->isHidden()) {
-//             m_exportDialog->set_was_closed();
                m_exportDialog->show();
        }
+       
        return (Command*) 0;
 }
 
 Command * Interface::show_cd_writing_dialog( )
 {
+       if (m_exportDialog && !m_exportDialog->isHidden()) {
+               return 0;
+       }
+       
        if (! m_cdWritingDialog) {
                m_cdWritingDialog = new CDWritingDialog(this);
        }
+       
        if (m_cdWritingDialog->isHidden()) {
-//             m_exportDialog->set_was_closed();
                m_cdWritingDialog->show();
        }
+       
        return (Command*) 0;
 }
 

Index: traverso/ui/CDWritingDialog.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/CDWritingDialog.ui,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- traverso/ui/CDWritingDialog.ui      17 Oct 2007 19:12:29 -0000      1.2
+++ traverso/ui/CDWritingDialog.ui      22 Nov 2007 15:07:02 -0000      1.3
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>357</width>
-    <height>416</height>
+    <height>403</height>
    </rect>
   </property>
   <property name="windowTitle" >