Merge branch 'master' of git://anongit.kde.org/kdenlive

[kdenlive] / src / kdenlivesettingsdialog.h

diff --git a/src/kdenlivesettingsdialog.h b/src/kdenlivesettingsdialog.h
index 7692fc07c90a0e4c0a824dfdf8b2db7776945029..8c01c3fbb915f710a29cef91e29d928bb753c9c1 100644 (file)
--- a/src/kdenlivesettingsdialog.h
+++ b/src/kdenlivesettingsdialog.h
@@ -53,10 +53,10 @@ protected slots:
 
 private slots:
     void slotUpdateDisplay();
-#ifndef NO_JOGSHUTTLE
+#ifdef USE_JOGSHUTTLE
     void slotCheckShuttle(int state = 0);
     void slotUpdateShuttleDevice(int ix = 0);
-#endif /* NO_JOGSHUTTLE */
+#endif
     void slotEditImageApplication();
     void slotEditAudioApplication();
     void slotEditVideoApplication();
@@ -75,6 +75,7 @@ private slots:
     void slotUpdateDecklinkProfile(int ix = 0);
     void slotUpdateProxyProfile(int ix = 0);
     void slotUpdateV4lProfile(int ix = 0);
+    void slotEditVideo4LinuxProfile();
 
 private:
     KPageWidgetItem *m_page1;