X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fwizard.cpp;h=ed2ce32cdb797a299ae6fac53435117f06f4a00f;hb=e70837e38eb068a7ad169acd9d811fe1ec155963;hp=ad6a9e11061b81a77648189fe8a18cbab92dd23b;hpb=e2d9e6fe8472f8170c6bb7be61a2e781fefac9ff;p=kdenlive

diff --git a/src/wizard.cpp b/src/wizard.cpp
index ad6a9e11..ed2ce32c 100644
--- a/src/wizard.cpp
+++ b/src/wizard.cpp
@@ -123,6 +123,7 @@ Wizard::Wizard(bool upgrade, QWidget *parent) :
     slotCheckThumbs();
     addPage(page3);
 
+#ifndef Q_WS_MAC
     QWizardPage *page6 = new QWizardPage;
     page6->setTitle(i18n("Webcam"));
     m_capture.setupUi(page6);
@@ -131,7 +132,7 @@ Wizard::Wizard(bool upgrade, QWidget *parent) :
     m_capture.button_reload->setIcon(KIcon("view-refresh"));
 
     addPage(page6);
-
+#endif
 
     QWizardPage *page5 = new QWizardPage;
     page5->setTitle(i18n("Checking system"));
@@ -146,22 +147,19 @@ Wizard::Wizard(bool upgrade, QWidget *parent) :
 
 void Wizard::slotDetectWebcam()
 {
+#if !defined(Q_WS_MAC) && !defined(Q_OS_FREEBSD)
     m_capture.device_list->clear();
 
     // Video 4 Linux device detection
     V4lCaptureHandler v4l(NULL);
-    int width = 0;
-    int height = 0;
     for (int i = 0; i < 10; i++) {
         QString path = "/dev/video" + QString::number(i);
         if (QFile::exists(path)) {
-            QString deviceName = v4l.getDeviceName(path.toUtf8().constData(), &width, &height);
-            QString captureSize;
-            if (width > 0) captureSize = QString::number(width) + "x" + QString::number(height);
-            if (!deviceName.isEmpty()) {
-                QTreeWidgetItem *item = new QTreeWidgetItem(m_capture.device_list, QStringList() << deviceName << captureSize);
+            QStringList deviceInfo = v4l.getDeviceName(path.toUtf8().constData());
+            if (!deviceInfo.isEmpty()) {
+                QTreeWidgetItem *item = new QTreeWidgetItem(m_capture.device_list, QStringList() << deviceInfo.at(0) << "(" + deviceInfo.at(1) + ") " + deviceInfo.at(2));
                 item->setData(0, Qt::UserRole, path);
-                if (!captureSize.isEmpty()) item->setData(0, Qt::UserRole + 1, captureSize);
+                item->setData(0, Qt::UserRole + 1, deviceInfo.at(1));
             }
         }
     }
@@ -179,6 +177,7 @@ void Wizard::slotDetectWebcam()
         }
         if (!found) m_capture.device_list->setCurrentItem(m_capture.device_list->topLevelItem(0));
     } else m_capture.v4l_status->setText(i18n("No device found, plug your webcam and refresh."));
+#endif
 }
 
 void Wizard::slotUpdateCaptureParameters()
@@ -415,7 +414,13 @@ void Wizard::slotCheckPrograms()
             item->setIcon(0, m_okIcon);
         } else item->setIcon(0, m_badIcon);
     } else item->setIcon(0, m_okIcon);
-
+    
+    item = new QTreeWidgetItem(m_check.programList, QStringList() << QString() << i18n("xine"));
+    item->setData(1, Qt::UserRole, i18n("Required to preview your DVD"));
+    item->setSizeHint(0, itemSize);
+    if (KStandardDirs::findExe("xine").isEmpty()) item->setIcon(0, m_badIcon);
+    else item->setIcon(0, m_okIcon); 
+    
     // set up some default applications
     QString program;
     if (KdenliveSettings::defaultimageapp().isEmpty()) {