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

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/05/15 00:14:06

Modified files:
        src/traverso   : ExportWidget.cpp 

Log message:
        * improved error detection 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.cpp?cvsroot=traverso&r1=1.26&r2=1.27

Patches:
Index: ExportWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- ExportWidget.cpp    14 May 2007 23:43:50 -0000      1.26
+++ ExportWidget.cpp    15 May 2007 00:14:05 -0000      1.27
@@ -535,20 +535,21 @@
                QMessageBox::information( 0, tr("No Burn Device"), 
                                          tr("No burn Device available!"),
                                             QMessageBox::Ok);
+               m_writingState = NO_STATE;
                return;
        }
                
        QString device = cdDeviceComboBox->itemData(index).toString();
        
        QStringList arguments;
-       arguments << "write" << "--device" << device << "-n" << "--eject" << 
"--driver" << "generic-mmc:0x00010000";
+       arguments << "write" << "--device" << device << "-n" << "--eject" << 
"--driver" << "generic-mmc";
        
        if (speedComboBox->currentIndex() != 0) {
                arguments << "--speed" << 
speedComboBox->currentText().remove("x");
        }
        
        if (simulateCheckBox->isChecked()) {
-               arguments <<"--simulate";
+               arguments << "--simulate";
        }
        
        arguments << m_exportSpec->tocFileName;
@@ -602,9 +603,18 @@
        if (m_writingState == QUERY_DEVICE) {
                char buf[1024];
                while(m_burnprocess->readLine(buf, sizeof(buf)) != -1) {
-                       QByteArray data = QByteArray(buf);
+                       QString data = QString(buf);
+                       printf("%s\n", QS_C(data));
+                       if (data.contains("trying to open")) {
+                               update_cdburn_status(tr("Trying to access CD 
Writer ..."), NORMAL_MESSAGE);
+                               return;
+                       }
+                       if (data.contains("Cannot open") || 
data.contains("Cannot setup")) {
+                               update_cdburn_status(tr("Cannot access CD 
Writer, is it in use ?"), ERROR_MESSAGE);
+                               return;
+                       }
 #if defined (Q_WS_WIN)
-                       if 
(QString(data).contains(QRegExp("[0-9],[0-9],[0-9]:"))) {
+                       if (data.contains(QRegExp("[0-9],[0-9],[0-9]:"))) {
 #else
                        if (data.contains("/dev/")) {
 #endif
@@ -623,6 +633,9 @@
                                cdDeviceComboBox->addItem(deviceName, device);
                        }
                }
+               
+               update_cdburn_status(tr("Information"), NORMAL_MESSAGE);
+               
                return;
        }