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

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/05/17 18:10:28

Modified files:
        src/traverso   : ExportWidget.cpp 

Log message:
        fix windows drive detection, make drive descriptions include device 
names/numbers

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

Patches:
Index: ExportWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- ExportWidget.cpp    16 May 2007 00:00:04 -0000      1.34
+++ ExportWidget.cpp    17 May 2007 18:10:28 -0000      1.35
@@ -382,7 +382,11 @@
        
        m_writingState = QUERY_DEVICE;
        cdDeviceComboBox->clear();
+#if defined (Q_WS_WIN)
+       m_burnprocess->start(CDRDAO_BIN, QStringList() << "scanbus");
+#else
        m_burnprocess->start(CDRDAO_BIN, QStringList() << "drive-info");
+#endif
 }
 
 void ExportWidget::unlock_device()
@@ -631,7 +635,7 @@
                char buf[1024];
                while(m_burnprocess->readLine(buf, sizeof(buf)) != -1) {
                        QString data = QString(buf);
-                       printf("%s\n", QS_C(data));
+                       //printf("%s\n", QS_C(data));
                        if (data.contains("trying to open")) {
                                update_cdburn_status(tr("Trying to access CD 
Writer ..."), NORMAL_MESSAGE);
                                return;
@@ -641,7 +645,7 @@
                                return;
                        }
 #if defined (Q_WS_WIN)
-                       if (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
@@ -649,12 +653,13 @@
                                QStringList strlist = 
QString(data).split(QRegExp("\\s+"));
                                for (int i=1; i<strlist.size(); ++i) {
                                        QString token = strlist.at(i);
-                                       if (!token.contains("Rev:")) {
-                                               deviceName += token + " ";
-                                       } else {
+                                       if (token.contains("Rev:")) {
                                                break;
+                                       } else if (token != ":") {
+                                               deviceName += token + " ";
                                        }
                                }
+                               deviceName += "(" + strlist.at(0) + ")";
                                QString device = strlist.at(0);
                                device = device.remove(":");
                                cdDeviceComboBox->addItem(deviceName, device);