Rename HDMI to Blackmagic in capture settings since Blackmagic cards can capture...

svn path=/trunk/kdenlive/; revision=5046

diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp
index d917731d6da91dab7ba6a4e688716748212de9e9..fda324f66d1dfb0b8015a8d5fddcfa4483f3aabc 100644 (file)
--- a/src/recmonitor.cpp
+++ b/src/recmonitor.cpp
@@ -52,7 +52,7 @@ RecMonitor::RecMonitor(QString name, QWidget *parent) :
     m_didCapture(false),
     m_isPlaying(false),
     m_bmCapture(NULL),
-    m_hdmiCapturing(false)
+    m_blackmagicCapturing(false)
 {
     setupUi(this);
 
@@ -185,10 +185,10 @@ void RecMonitor::slotVideoDeviceChanged(int ix)
 {
     QString capturefile;
     QString capturename;
-    m_fwdAction->setVisible(ix != HDMI);
-    m_discAction->setVisible(ix != HDMI);
-    m_rewAction->setVisible(ix != HDMI);
-    m_logger.setVisible(ix == HDMI);
+    m_fwdAction->setVisible(ix != BLACKMAGIC);
+    m_discAction->setVisible(ix != BLACKMAGIC);
+    m_rewAction->setVisible(ix != BLACKMAGIC);
+    m_logger.setVisible(ix == BLACKMAGIC);
     switch (ix) {
     case SCREENGRAB:
         m_discAction->setEnabled(false);
@@ -214,8 +214,8 @@ void RecMonitor::slotVideoDeviceChanged(int ix)
         m_playAction->setEnabled(true);
         checkDeviceAvailability();
         break;
-    case HDMI:
-       createHDMIDevice();
+    case BLACKMAGIC:
+       createBlackmagicDevice();
         m_recAction->setEnabled(false);
         m_stopAction->setEnabled(false);
         m_playAction->setEnabled(true);
@@ -269,24 +269,24 @@ void RecMonitor::slotVideoDeviceChanged(int ix)
     }
 }
 
-void RecMonitor::createHDMIDevice()
+void RecMonitor::createBlackmagicDevice()
 {
        //video_capture->setVisible(true);
        if (m_bmCapture == NULL) {
            QVBoxLayout *lay = new QVBoxLayout;
            m_bmCapture = new BmdCaptureHandler(lay);
-           connect(m_bmCapture, SIGNAL(gotTimeCode(ulong)), this, SLOT(slotGotHDMIFrameNumber(ulong)));
-           connect(m_bmCapture, SIGNAL(gotMessage(const QString &)), this, SLOT(slotGotHDMIMessage(const QString &)));
+           connect(m_bmCapture, SIGNAL(gotTimeCode(ulong)), this, SLOT(slotGotBlackMagicFrameNumber(ulong)));
+           connect(m_bmCapture, SIGNAL(gotMessage(const QString &)), this, SLOT(slotGotBlackmagicMessage(const QString &)));
            video_capture->setLayout(lay);
        }
 }
 
-void RecMonitor::slotGotHDMIFrameNumber(ulong ix)
+void RecMonitor::slotGotBlackmagicFrameNumber(ulong ix)
 {
     m_dvinfo.setText(QString::number(ix));
 }
 
-void RecMonitor::slotGotHDMIMessage(const QString &message)
+void RecMonitor::slotGotBlackmagicMessage(const QString &message)
 {
     m_logger.insertItem(0, message);
 }
@@ -367,7 +367,7 @@ void RecMonitor::slotStopCapture()
         m_captureProcess->write("q\n", 3);
         QTimer::singleShot(1000, m_captureProcess, SLOT(kill()));
         break;
-    case HDMI:
+    case BLACKMAGIC:
        video_capture->setHidden(true);
        video_frame->setHidden(false);
        m_bmCapture->stopPreview();
@@ -453,7 +453,7 @@ void RecMonitor::slotStartCapture(bool play)
         kDebug() << "Capture: Running ffmpeg " << m_captureArgs.join(" ");
         m_captureProcess->start("ffmpeg", m_captureArgs);
         break;
-    case HDMI:
+    case BLACKMAGIC:
        video_capture->setVisible(true);
        video_frame->setHidden(true);
        m_bmCapture->startPreview(KdenliveSettings::hdmi_capturedevice(), KdenliveSettings::hdmi_capturemode());
@@ -476,11 +476,11 @@ void RecMonitor::slotStartCapture(bool play)
 
 void RecMonitor::slotRecord()
 {
-    if (device_selector->currentIndex() == HDMI) {
-       if (m_hdmiCapturing) {
+    if (device_selector->currentIndex() == BLACKMAGIC) {
+       if (m_blackmagicCapturing) {
            // We are capturing, stop it
            m_bmCapture->stopCapture();
-           m_hdmiCapturing = false;
+           m_blackmagicCapturing = false;
        }
        else {
            // Start capture, get capture filename first
@@ -488,7 +488,7 @@ void RecMonitor::slotRecord()
            if (!path.endsWith("/")) path.append("/");
            path.append(KdenliveSettings::hdmifilename());
            m_bmCapture->startCapture(path);
-           m_hdmiCapturing = true;
+           m_blackmagicCapturing = true;
        }
        return;
     }

diff --git a/src/recmonitor.h b/src/recmonitor.h
index f819c0769cbb51beed777cd6f9c24062dd69ec27..79befd52336e2ba931917ddc05068c8e0602bdfc 100644 (file)
--- a/src/recmonitor.h
+++ b/src/recmonitor.h
@@ -55,7 +55,7 @@ public:
 
     QString name() const;
 
-    enum CAPTUREDEVICE {FIREWIRE = 0, VIDEO4LINUX = 1, SCREENGRAB = 2, HDMI = 3};
+    enum CAPTUREDEVICE {FIREWIRE = 0, VIDEO4LINUX = 1, SCREENGRAB = 2, BLACKMAGIC = 3};
 
 protected:
     virtual void mousePressEvent(QMouseEvent * event);
@@ -68,7 +68,7 @@ private:
     QLabel m_dvinfo;
     
     /** @brief Keeps a brief (max ten items) history of warning or error messages
-     *         (currently only used for HDMI). */
+     *         (currently only used for BLACKMAGIC). */
     KComboBox m_logger;
     QString m_capturePath;
 
@@ -99,9 +99,9 @@ private:
     QPixmap mergeSideBySide(const QPixmap& pix, const QString txt);
     void manageCapturedFiles();
     CaptureHandler *m_bmCapture;
-    /** @brief Indicates whether we are currently capturing from HDMI. */
-    bool m_hdmiCapturing;
-    void createHDMIDevice();
+    /** @brief Indicates whether we are currently capturing from BLACKMAGIC. */
+    bool m_blackmagicCapturing;
+    void createBlackmagicDevice();
 
 private slots:
     void slotStartCapture(bool play = true);
@@ -116,8 +116,8 @@ private slots:
     void slotConfigure();
     void slotReadDvgrabInfo();
     void slotUpdateFreeSpace();
-    void slotGotHDMIFrameNumber(ulong ix);
-    void slotGotHDMIMessage(const QString &message);
+    void slotGotBlackmagicFrameNumber(ulong ix);
+    void slotGotBlackmagicMessage(const QString &message);
 
 public slots:
     void refreshRecMonitor(bool visible);

diff --git a/src/widgets/configcapture_ui.ui b/src/widgets/configcapture_ui.ui
index b8657a80a2afac1b576aa91feeffc2feef685234..402c4076d0985d1180f2ff6ebf350b756cedde64 100644 (file)
--- a/src/widgets/configcapture_ui.ui
+++ b/src/widgets/configcapture_ui.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>409</width>
-    <height>460</height>
+    <height>470</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_8">
@@ -38,12 +38,12 @@
      </item>
      <item>
       <property name="text">
-       <string>Screen Grab</string>
+       <string>Screen grab</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>HDMI</string>
+       <string>Blackmagic card</string>
       </property>
      </item>
     </widget>
@@ -803,7 +803,7 @@
      </widget>
      <widget class="QWidget" name="tab_4">
       <attribute name="title">
-       <string>HDMI</string>
+       <string>Blackmagic</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_10">
        <item row="0" column="0">

diff --git a/src/widgets/recmonitor_ui.ui b/src/widgets/recmonitor_ui.ui
index 7e9ff137d9e20db70288c5b7a0236480f9975aad..3de6baac953a07d154d4f7126ebd94bab051e6aa 100644 (file)
--- a/src/widgets/recmonitor_ui.ui
+++ b/src/widgets/recmonitor_ui.ui
@@ -100,7 +100,7 @@
      </item>
      <item>
       <property name="text">
-       <string>HDMI</string>
+       <string>Blackmagic card</string>
       </property>
      </item>
     </widget>