Fix proxy and various other things when using libav instead of ffmpeg

[kdenlive] / src / kdenlivesettings.kcfg

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index 6f046430ea0f79522e61576792a608bd788de33b..0a3bbaa50e7fc3ff2427ae5aa8306f2824b61b0a 100644 (file)
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -114,17 +114,17 @@
     
     <entry name="proxyextension" type="String">
       <label>File extension for proxy clips.</label>
-      <default>ts</default>
+      <default></default>
     </entry>
     
     <entry name="proxy_profile" type="UInt">
-      <label>default v4l encoding profile.</label>
+      <label>default proxy encoding profile.</label>
       <default>0</default>
     </entry>
     
     <entry name="proxyparams" type="String">
       <label>Proxy clips transcoding parameters.</label>
-      <default>-f mpegts -acodec libmp3lame -ac 2 -ab 92k -ar 48000 -vcodec mpeg2video -g 5 -deinterlace -s 480x270 -b 150k</default>
+      <default></default>
     </entry>
 
   </group>
@@ -243,11 +243,26 @@
       <default></default>
     </entry>
 
+    <entry name="ffmpegpath" type="Path">
+      <label>FFmpeg / Libav binary path.</label>
+      <default></default>
+    </entry>
+
+    <entry name="ffplaypath" type="Path">
+      <label>FFplay / avplay binary path.</label>
+      <default></default>
+    </entry>
+    
     <entry name="mltthreads" type="Int">
       <label>Mlt processing thread count.</label>
       <default>1</default>
     </entry>
 
+    <entry name="proxythreads" type="Int">
+      <label>Proxy creation processing thread count.</label>
+      <default>2</default>
+    </entry>
+
     <entry name="encodethreads" type="Int">
       <label>FFmpeg encoding thread count.</label>
       <default>1</default>
@@ -334,12 +349,12 @@
 
     <entry name="v4l_parameters" type="String">
       <label>Default video4linux format.</label>
-      <default>f=mpeg acodec=mp2 ab=128k ar=48000 vcodec=mpeg2video minrate=0 b=4000k</default>
+      <default></default>
     </entry>
 
     <entry name="v4l_extension" type="String">
       <label>Default video4linux file extension.</label>
-      <default>mpg</default>
+      <default></default>
     </entry>
 
     <entry name="v4l_format" type="UInt">
@@ -347,6 +362,11 @@
       <default>0</default>
     </entry>
 
+    <entry name="v4l_capturevideo" type="Bool">
+      <label>Should we capture video.</label>
+      <default>true</default>
+    </entry>
+    
     <entry name="v4l_captureaudio" type="Bool">
       <label>Should we also capture audio.</label>
       <default>false</default>
@@ -486,6 +506,11 @@
       <label>Additionnal dvgrab parameters.</label>
       <default></default>
     </entry>
+
+    <entry name="decklink_device_found" type="Bool">
+      <label>Enable Blackmagic decklink support.</label>
+      <default>true</default>
+    </entry>
     
     <entry name="decklink_capturedevice" type="UInt">
       <label>default HDMI capture device.</label>
@@ -504,12 +529,12 @@
   
   <entry name="decklink_parameters" type="String">
       <label>Default Decklink encoding parameters.</label>
-      <default>vcodec=mpeg2video qscale=10 acodec=mp2 ac=2 ab=128k ar=48000 threads=%threads</default>
+      <default></default>
   </entry>
 
   <entry name="decklink_extension" type="String">
       <label>Default Decklink capture file extension.</label>
-      <default>mpg</default>
+      <default></default>
   </entry>
   </group>
 
@@ -586,6 +611,11 @@
       <label>Show ratings in project tree view.</label>
       <default>false</default>
     </entry>
+    
+    <entry name="showdatecolumn" type="Bool">
+      <label>Show dates in project tree view.</label>
+      <default>false</default>
+    </entry>
 
     <entry name="frametimecode" type="Bool">
       <label>Show timecodes as frame number instead of hh:mm:ss:ff.</label>
@@ -621,6 +651,11 @@
       <label>Show overlay info on monitor (in / out points, markers,...).</label>
       <default>true</default>
     </entry>
+    
+    <entry name="showOnMonitorScene" type="Bool">
+      <label>Show on monitor adjustable effect parameter (geometry, ..).</label>
+      <default>true</default>
+    </entry>
 
     <entry name="autoaudiodrivername" type="String">
       <label>Audio driver selected automatically.</label>
@@ -766,9 +801,14 @@
       <default>true</default>
     </entry>
     
-    <entry name="recording_preview" type="UInt">
+    <entry name="enable_recording_preview" type="Bool">
       <label>Should we display video frames while capturing.</label>
-      <default>0</default>
+      <default>true</default>
+    </entry>
+    
+    <entry name="add_clip_cut" type="Bool">
+      <label>Add cutted clips to project after transcoding.</label>
+      <default>true</default>
     </entry>
 
   </group>