X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fkdenlivesettings.kcfg;h=c0609add3b9642c5957c0a5af4f6237ebc82f7fd;hb=b691c7f8faddc1d7f2bf6acdba5cee879e810548;hp=6c2d17e976f396175f31e2a5beead71578af16c8;hpb=6e4e0674068d82fd7c5e2fc96cad92014cbb1721;p=kdenlive

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index 6c2d17e9..c0609add 100644
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -59,6 +59,11 @@
       <label>Use on-monitor effects.</label>
       <default>true</default>
     </entry>
+    
+    <entry name="disable_effect_parameters" type="Bool">
+      <label>Disable parameters when the effect is disabled.</label>
+      <default>true</default>
+    </entry>
   </group>
 
   <group name="project">
@@ -166,11 +171,15 @@
       <default>100</default>
     </entry>
 
-    <entry name="dropbframes" type="Bool">
-      <label>Drop B Frames on H.264 clips for faster playback (For monitor preview only).</label>
+    <entry name="external_display" type="Bool">
+      <label>Use Blackmagic device for video out.</label>
       <default>false</default>
     </entry>
-  </group>
+    <entry name="blackmagic_output_device" type="UInt">
+      <label>Blackmagic video output device.</label>
+      <default>0</default>
+    </entry>
+</group>
 
   <group name="env">
     <entry name="activate_nepomuk" type="Bool">
@@ -247,6 +256,11 @@
       <default>false</default>
     </entry>
 
+    <entry name="detectedv4ldevices" type="UInt">
+      <label>Detected v4l devices.</label>
+      <default>0</default>
+    </entry>
+
     <entry name="video4vformat" type="String">
       <label>Default video4linux capture format.</label>
       <default>video4linux2</default>
@@ -259,7 +273,7 @@
 
     <entry name="video4vcodec" type="String">
       <label>Default video4linux video codec.</label>
-      <default>mpeg4</default>
+      <default>mjpeg</default>
     </entry>
 
     <entry name="video4acodec" type="String">
@@ -269,12 +283,12 @@
 
     <entry name="video4container" type="String">
       <label>Default video4linux format.</label>
-      <default>mpegts</default>
+      <default>avi</default>
     </entry>
 
     <entry name="video4extension" type="String">
       <label>Default video4linux file extension.</label>
-      <default>mp4</default>
+      <default>avi</default>
     </entry>
 
     <entry name="video4aformat" type="String">
@@ -436,6 +450,26 @@
       <label>Additionnal dvgrab parameters.</label>
       <default></default>
     </entry>
+    
+    <entry name="hdmi_capturedevice" type="Int">
+      <label>default HDMI capture device.</label>
+      <default>0</default>
+    </entry>
+
+    <entry name="hdmi_capturemode" type="Int">
+      <label>default HDMI capture mode.</label>
+      <default>0</default>
+    </entry>
+
+    <entry name="hdmifilename" type="String">
+      <label>default HDMI capture filename.</label>
+      <default>capture</default>
+    </entry>
+
+    <entry name="hdmicaptureaudio" type="Bool">
+      <label>Should we capture HDMI audio.</label>
+      <default>true</default>
+    </entry>
   </group>
 
   <group name="shuttle">
@@ -449,29 +483,9 @@
       <default></default>
     </entry>
 
-    <entry name="shuttle1" type="UInt">
-      <label>Action for shuttle button 1.</label>
-      <default>1</default>
-    </entry>
-
-    <entry name="shuttle2" type="UInt">
-      <label>Action for shuttle button 2.</label>
-      <default>2</default>
-    </entry>
-
-    <entry name="shuttle3" type="UInt">
-      <label>Action for shuttle button 3.</label>
-      <default>0</default>
-    </entry>
-
-    <entry name="shuttle4" type="UInt">
-      <label>Action for shuttle button 4.</label>
-      <default>0</default>
-    </entry>
-
-    <entry name="shuttle5" type="UInt">
-      <label>Action for shuttle button 5.</label>
-      <default>0</default>
+    <entry name="shuttlebuttons" type="String">
+      <label>JogShuttle button to actions mappings.</label>
+      <default></default>
     </entry>
   </group>
 
@@ -613,28 +627,41 @@
       <label>Update parameters while monitor scene changes.</label>
       <default>false</default>
     </entry>
-
-    <entry name="hdmicapturedevice" type="Int">
-      <label>default HDMI capture device.</label>
-      <default>0</default>
+    <entry name="analyse_stopmotion" type="Bool">
+      <label>Send stopmotion frames to scopes for live analysis.</label>
+      <default>false</default>
     </entry>
 
-    <entry name="hdmicapturemode" type="Int">
-      <label>default HDMI capture mode.</label>
+    <entry name="showstopmotionthumbs" type="Bool">
+      <label>Show sequence thumbnails in stopmotion widget.</label>
+      <default>true</default>
+    </entry> 
+    
+    <entry name="captureinterval" type="Int">
+      <label>Interval between each capture (in seconds).</label>
+      <default>5</default>
+    </entry> 
+
+    <entry name="blitzeffect" type="Int">
+      <label>Effect applied to stopmotion frame overlay.</label>
       <default>0</default>
     </entry>
 
-    <entry name="hdmifilename" type="String">
-      <label>default HDMI capture filename.</label>
-      <default>capture</default>
+    <entry name="onmonitoreffects_cornersshowlines" type="Bool">
+      <label>Connect the corners in the widget for the c0rners effect with lines.</label>
+      <default>false</default>
+    </entry>
+    
+    <entry name="projectloading_avformatnovalidate" type="Bool">
+      <label>Do not validate the video files when loading a project for the sake of speed.</label>
+      <default>false</default>
     </entry>
 
-    <entry name="hdmicaptureaudio" type="Bool">
-      <label>Should we capture HDMI audio.</label>
+    <entry name="monitor_audio" type="Bool">
+      <label>Display audio levels.</label>
       <default>true</default>
     </entry>
-    
-    
+
   </group>
 
 </kcfg>