X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkdenlivesettings.kcfg;h=6f046430ea0f79522e61576792a608bd788de33b;hb=ecda842bf2b632f75198d6cf0fac1fcb5ef862ad;hp=8e0dc584d1ab861794fe2900c7f7f0dac9a00ea6;hpb=ade7290445e275aca81bb280012a0b3c90b7f959;p=kdenlive

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index 8e0dc584..6f046430 100644
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -114,12 +114,17 @@
     
     <entry name="proxyextension" type="String">
       <label>File extension for proxy clips.</label>
-      <default>avi</default>
+      <default>ts</default>
+    </entry>
+    
+    <entry name="proxy_profile" type="UInt">
+      <label>default v4l encoding profile.</label>
+      <default>0</default>
     </entry>
     
     <entry name="proxyparams" type="String">
       <label>Proxy clips transcoding parameters.</label>
-      <default>-f avi -acodec libmp3lame -ac 2 -ab 92k -ar 48000 -vcodec mpeg2video -g 5 -deinterlace -s 480x270 -b 150k</default>
+      <default>-f mpegts -acodec libmp3lame -ac 2 -ab 92k -ar 48000 -vcodec mpeg2video -g 5 -deinterlace -s 480x270 -b 150k</default>
     </entry>
 
   </group>
@@ -216,7 +221,7 @@
       <label>Use Blackmagic device for video out.</label>
       <default>false</default>
     </entry>
-    <entry name="blackmagic_output_device" type="UInt">
+    <entry name="blackmagic_output_device" type="Int">
       <label>Blackmagic video output device.</label>
       <default>0</default>
     </entry>
@@ -312,64 +317,44 @@
       <default>0</default>
     </entry>
 
-    <entry name="video4vformat" type="String">
-      <label>Default video4linux capture format.</label>
-      <default>video4linux2</default>
-    </entry>
-
     <entry name="video4vdevice" type="String">
       <label>Default video4linux capture format.</label>
       <default>/dev/video0</default>
     </entry>
 
-    <entry name="video4vcodec" type="String">
-      <label>Default video4linux video codec.</label>
-      <default>mjpeg</default>
+    <entry name="v4l_alsadevice" type="UInt">
+      <label>Audio device for v4l capture.</label>
+      <default></default>
     </entry>
 
-    <entry name="video4acodec" type="String">
-      <label>Default video4linux audio codec.</label>
-      <default>mp2</default>
+    <entry name="v4l_alsadevicename" type="String">
+      <label>Audio device for v4l capture.</label>
+      <default>hw:0,0</default>
     </entry>
 
-    <entry name="video4container" type="String">
+    <entry name="v4l_parameters" type="String">
       <label>Default video4linux format.</label>
-      <default>avi</default>
+      <default>f=mpeg acodec=mp2 ab=128k ar=48000 vcodec=mpeg2video minrate=0 b=4000k</default>
     </entry>
 
-    <entry name="video4extension" type="String">
+    <entry name="v4l_extension" type="String">
       <label>Default video4linux file extension.</label>
-      <default>avi</default>
-    </entry>
-
-    <entry name="video4aformat" type="String">
-      <label>Default video4linux capture format.</label>
-      <default>oss</default>
-    </entry>
-
-    <entry name="video4adevice" type="String">
-      <label>Default video4linux capture format.</label>
-      <default>/dev/dsp</default>
-    </entry>
-
-    <entry name="video4size" type="String">
-      <label>Default video4linux capture format.</label>
-      <default>320x240</default>
+      <default>mpg</default>
     </entry>
 
-    <entry name="video4rate" type="Int">
-      <label>Default video4linux capture format.</label>
-      <default>15</default>
+    <entry name="v4l_format" type="UInt">
+      <label>Selected capture format.</label>
+      <default>0</default>
     </entry>
 
-    <entry name="video4capture" type="String">
-      <label>ffmpeg arguments for video capture.</label>
-      <default></default>
+    <entry name="v4l_captureaudio" type="Bool">
+      <label>Should we also capture audio.</label>
+      <default>false</default>
     </entry>
-
-    <entry name="video4encoding" type="String">
-      <label>ffmpeg encoding arguments.</label>
-      <default>-qscale 1 -ab 224k</default>
+    
+    <entry name="v4l_profile" type="UInt">
+      <label>default v4l encoding profile.</label>
+      <default>0</default>
     </entry>
 
     <entry name="rmd_capture_audio" type="Bool">
@@ -502,25 +487,30 @@
       <default></default>
     </entry>
     
-    <entry name="hdmi_capturedevice" type="Int">
+    <entry name="decklink_capturedevice" type="UInt">
       <label>default HDMI capture device.</label>
       <default>0</default>
     </entry>
-
-    <entry name="hdmi_capturemode" type="Int">
-      <label>default HDMI capture mode.</label>
+    
+    <entry name="decklink_profile" type="UInt">
+      <label>default HDMI encoding profile.</label>
       <default>0</default>
     </entry>
 
-    <entry name="hdmifilename" type="String">
+    <entry name="decklink_filename" 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>
+  
+  <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>
+  </entry>
+
+  <entry name="decklink_extension" type="String">
+      <label>Default Decklink capture file extension.</label>
+      <default>mpg</default>
+  </entry>
   </group>
 
   <group name="shuttle">
@@ -746,7 +736,7 @@
       <default>10</default>
     </entry>
     
-    <entry name="blitzeffect" type="Int">
+    <entry name="stopmotioneffect" type="Int">
       <label>Effect applied to stopmotion frame overlay.</label>
       <default>0</default>
     </entry>
@@ -775,6 +765,11 @@
       <label>Display audio levels.</label>
       <default>true</default>
     </entry>
+    
+    <entry name="recording_preview" type="UInt">
+      <label>Should we display video frames while capturing.</label>
+      <default>0</default>
+    </entry>
 
   </group>