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

[Nicola Doebelin]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Nicola Doebelin <n_doebelin>    07/05/18 11:35:48

Modified files:
        src/traverso   : ExportWidget.cpp 

Log message:
        Changes to make cdrdao burning work on OSÂ X

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

Patches:
Index: ExportWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- ExportWidget.cpp    17 May 2007 18:10:28 -0000      1.35
+++ ExportWidget.cpp    18 May 2007 11:35:48 -0000      1.36
@@ -34,6 +34,8 @@
 
 #if defined (Q_WS_WIN)
 #define CDRDAO_BIN     "cdrdao.exe"
+#elif defined (OSX_BUILD)
+#define CDRDAO_BIN "/opt/local/bin/cdrdao"
 #else
 #define CDRDAO_BIN     "cdrdao"
 #endif
@@ -384,6 +386,8 @@
        cdDeviceComboBox->clear();
 #if defined (Q_WS_WIN)
        m_burnprocess->start(CDRDAO_BIN, QStringList() << "scanbus");
+#elif defined (OSX_BUILD)
+       // not possible to query devices on os x, workaround is included
 #else
        m_burnprocess->start(CDRDAO_BIN, QStringList() << "drive-info");
 #endif
@@ -565,6 +569,9 @@
        }
                
        QString device = cdDeviceComboBox->itemData(index).toString();
+#if defined (OSX_BUILD)
+       device = cdDeviceComboBox->currentText();
+#endif
        
        QStringList arguments;
        arguments << "write" << "--device" << device << "-n" << "--eject" << 
"--driver" << "generic-mmc";
@@ -578,7 +585,6 @@
        }
        
        arguments << m_exportSpec->tocFileName;
-       
        m_burnprocess->start(CDRDAO_BIN, arguments);
 }
 
@@ -666,6 +672,14 @@
                        }
                }
                
+#if defined (OSX_BUILD)
+               cdDeviceComboBox->clear();
+               cdDeviceComboBox->addItem("IODVDServices");
+               cdDeviceComboBox->addItem("IODVDServices/2");
+               cdDeviceComboBox->addItem("IOCompactDiscServices");
+               cdDeviceComboBox->addItem("IOCompactDiscServices/2");
+#endif
+               
                update_cdburn_status(tr("Information"), NORMAL_MESSAGE);
                
                return;