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

[Nicola Doebelin]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Nicola Doebelin <n_doebelin>    07/05/31 19:46:23

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

Log message:
        some changes to cd-burning on OSÂ X

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.cpp?cvsroot=traverso&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.h?cvsroot=traverso&r1=1.11&r2=1.12

Patches:
Index: ExportWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- ExportWidget.cpp    31 May 2007 11:53:03 -0000      1.43
+++ ExportWidget.cpp    31 May 2007 19:46:23 -0000      1.44
@@ -27,6 +27,7 @@
 #include <QFileDialog>
 #include <QByteArray>
 #include <QMessageBox>
+#include <QDebug>
 
 #include "Export.h"
 #include "Config.h"
@@ -35,13 +36,10 @@
 
 #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
 
-
 // Always put me below _all_ includes, this is needed
 // in case we run with memory leak detection enabled!
 #include "Debugger.h"
@@ -389,8 +387,12 @@
 
 #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
+#elif defined (Q_WS_MAC)
+       cdDeviceComboBox->clear();
+       cdDeviceComboBox->addItem("IODVDServices");
+       cdDeviceComboBox->addItem("IODVDServices/2");
+       cdDeviceComboBox->addItem("IOCompactDiscServices");
+       cdDeviceComboBox->addItem("IOCompactDiscServices/2");
 #else
        m_burnprocess->start(CDRDAO_BIN, QStringList() << "drive-info");
 #endif
@@ -408,11 +410,15 @@
                return;
        }
                
-       QString device = cdDeviceComboBox->itemData(index).toString();
+       QString device = get_device(index);
        
        QStringList args;
        args  << "unlock" << "--device" << device;
+#if defined (Q_WS_MAC)
+       m_burnprocess->start(qApp->applicationDirPath() + "/cdrdao", args);
+#else
        m_burnprocess->start(CDRDAO_BIN, args);
+#endif
 }
 
 
@@ -577,11 +583,7 @@
                return;
        }
                
-       QString device = cdDeviceComboBox->itemData(index).toString();
-#if defined (OSX_BUILD)
-       device = cdDeviceComboBox->currentText();
-#endif
-
+       QString device = get_device(index);
        QStringList arguments;
        arguments << "write" << "--device" << device << "-n" << "--eject" << 
"--driver" << "generic-mmc";
        
@@ -594,7 +596,11 @@
        }
        
        arguments << m_exportSpec->tocFileName;
+#if defined (Q_WS_MAC)
+       m_burnprocess->start(qApp->applicationDirPath() + "/cdrdao", arguments);
+#else
        m_burnprocess->start(CDRDAO_BIN, arguments);
+#endif
 }
 
 void ExportWidget::cd_export_finished()
@@ -682,13 +688,6 @@
                        }
                }
                
-#if defined (OSX_BUILD)
-               cdDeviceComboBox->clear();
-               cdDeviceComboBox->addItem("IODVDServices");
-               cdDeviceComboBox->addItem("IODVDServices/2");
-               cdDeviceComboBox->addItem("IOCompactDiscServices");
-               cdDeviceComboBox->addItem("IOCompactDiscServices/2");
-#endif
                QString cdrdaoDrive = config().get_property("Cdrdao", "drive", 
"").toString();
                if (cdrdaoDrive != "") {
                        int index = cdDeviceComboBox->findData(cdrdaoDrive);
@@ -830,3 +829,11 @@
        m_wasClosed = true;
 }
 
+QString ExportWidget::get_device(int index)
+{
+       #if defined (Q_WS_MAC)
+               return cdDeviceComboBox->currentText();
+       #else
+               return cdDeviceComboBox->itemData(index).toString();
+       #endif
+}

Index: ExportWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ExportWidget.h      23 May 2007 17:51:45 -0000      1.11
+++ ExportWidget.h      31 May 2007 19:46:23 -0000      1.12
@@ -74,6 +74,7 @@
        
        int m_writingState;
        bool m_wasClosed;
+       QString get_device(int index);
 
 private slots:
        void set_project(Project* project);