Merge branch 'master' into next

[kdenlive] / src / kdenlivesettingsdialog.h

diff --git a/src/kdenlivesettingsdialog.h b/src/kdenlivesettingsdialog.h
index e305d8701a78d176f433b760fff7e8152870fd45..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();
@@ -71,6 +71,11 @@ private slots:
     void slotUpdateHDMIModes();
     void slotUpdatev4lDevice();
     void slotUpdatev4lCaptureProfile();
+    void slotManageEncodingProfile();
+    void slotUpdateDecklinkProfile(int ix = 0);
+    void slotUpdateProxyProfile(int ix = 0);
+    void slotUpdateV4lProfile(int ix = 0);
+    void slotEditVideo4LinuxProfile();
 
 private:
     KPageWidgetItem *m_page1;
@@ -101,6 +106,7 @@ private:
     void saveTranscodeProfiles();
     void loadCurrentV4lProfileInfo();
     void saveCurrentV4lProfile();
+    void loadEncodingProfiles();
 
 signals:
     void customChanged();