]> git.sesse.net Git - kdenlive/commitdiff
Allow user to bypass available codec detection
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Fri, 5 Oct 2012 06:50:54 +0000 (08:50 +0200)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Fri, 5 Oct 2012 06:50:54 +0000 (08:50 +0200)
src/kdenlivesettings.kcfg
src/renderwidget.cpp
src/widgets/configmisc_ui.ui

index 516d42a81a7bd4e1ada3ea239e8e86d1a1b162c9..96a4f57f48eefabadc62ce5e059e6c4c73bc4576 100644 (file)
       <default>false</default>
     </entry>
 
+    <entry name="bypasscodeccheck" type="Bool">
+      <label>Ignore libav / ffmpeg codec checking.</label>
+      <default>false</default>
+    </entry>
+
     <entry name="title_duration" type="String">
       <label>Default title clip duration.</label>
       <default>00:00:05:00</default>
index 538483459558b5e4dc34825f16dd102fdfa56c56..35e408143c390f41e81c79033e825d84915ac4a0 100644 (file)
@@ -1241,9 +1241,14 @@ void RenderWidget::refreshView()
     KIcon brokenIcon("dialog-close");
     KIcon warningIcon("dialog-warning");
 
-    const QStringList formatsList = KdenliveSettings::supportedformats();
-    const QStringList vcodecsList = KdenliveSettings::videocodecs();
-    const QStringList acodecsList = KdenliveSettings::audiocodecs();
+    QStringList formatsList;
+    QStringList vcodecsList;
+    QStringList acodecsList;
+    if (!KdenliveSettings::bypasscodeccheck()) {
+       formatsList= KdenliveSettings::supportedformats();
+       vcodecsList = KdenliveSettings::videocodecs();
+       acodecsList = KdenliveSettings::audiocodecs();
+    }
 
     KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window);
     const QColor disabled = scheme.foreground(KColorScheme::InactiveText).color();
@@ -1894,7 +1899,7 @@ void RenderWidget::parseScriptFiles()
             QTextStream stream(&file);
             while (!stream.atEnd()) {
                 QString line = stream.readLine();
-                kDebug()<<"# :"<<line;
+                //kDebug()<<"# :"<<line;
                 if (line.startsWith("TARGET=")) {
                     target = line.section("TARGET=\"", 1);
                     target = target.section('"', 0, 0);
@@ -1909,7 +1914,7 @@ void RenderWidget::parseScriptFiles()
             file.close();
         }
         if (target.isEmpty()) continue;
-        kDebug()<<"ScRIPT RENDERER: "<<renderer<<"\n++++++++++++++++++++++++++";
+        //kDebug()<<"ScRIPT RENDERER: "<<renderer<<"\n++++++++++++++++++++++++++";
         item = new QTreeWidgetItem(m_view.scripts_list, QStringList() << QString() << scriptpath.fileName());
         if (!renderer.isEmpty() && renderer.contains('/') && !QFile::exists(renderer)) {
             item->setIcon(0, KIcon("dialog-cancel"));
index 8f151efd5caf1962caa4cdc66580496574e1fb6c..a4dbf7b8aec5bfd25323886e7e3f2a8f167b83a5 100644 (file)
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>380</width>
-    <height>345</height>
+    <height>395</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_4">
    <property name="topMargin">
     <number>0</number>
    </property>
+   <item row="5" column="0">
+    <widget class="QCheckBox" name="kcfg_on_monitor_effects">
+     <property name="text">
+      <string>Use on-monitor effects</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="0">
+    <widget class="QCheckBox" name="kcfg_disable_effect_parameters">
+     <property name="text">
+      <string>Disable parameters when the effect is disabled</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QCheckBox" name="kcfg_checkfirstprojectclip">
+     <property name="text">
+      <string>Check if first added clip matches project profile</string>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="0" colspan="3">
     <widget class="QCheckBox" name="kcfg_openlastproject">
      <property name="text">
      </property>
     </widget>
    </item>
-   <item row="9" column="0" colspan="3">
+   <item row="8" column="0">
+    <widget class="QCheckBox" name="kcfg_automultistreams">
+     <property name="text">
+      <string>Automatically import all streams in multi stream clips</string>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="0">
+    <widget class="QCheckBox" name="kcfg_autoimagesequence">
+     <property name="text">
+      <string>Automatically import image sequences</string>
+     </property>
+    </widget>
+   </item>
+   <item row="12" column="0">
+    <widget class="QCheckBox" name="kcfg_autoimagetransparency">
+     <property name="text">
+      <string>Transparent background for imported images</string>
+     </property>
+    </widget>
+   </item>
+   <item row="13" column="0" colspan="3">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="4" column="0" colspan="2">
+    <widget class="QCheckBox" name="kcfg_usekuiserver">
+     <property name="text">
+      <string>Use KDE job tracking for render jobs</string>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="0" colspan="3">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Default Durations</string>
      </layout>
     </widget>
    </item>
-   <item row="12" column="0" colspan="3">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="10" column="0">
-    <widget class="QCheckBox" name="kcfg_autoimagesequence">
-     <property name="text">
-      <string>Automatically import image sequences</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="2">
-    <widget class="QCheckBox" name="kcfg_checkfirstprojectclip">
-     <property name="text">
-      <string>Check if first added clip matches project profile</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0">
-    <widget class="QCheckBox" name="kcfg_on_monitor_effects">
-     <property name="text">
-      <string>Use on-monitor effects</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="0">
-    <widget class="QCheckBox" name="kcfg_autoimagetransparency">
-     <property name="text">
-      <string>Transparent background for imported images</string>
-     </property>
-    </widget>
-   </item>
    <item row="6" column="0">
     <widget class="QCheckBox" name="kcfg_projectloading_avformatnovalidate">
      <property name="text">
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="3">
-    <widget class="QCheckBox" name="kcfg_crashrecovery">
-     <property name="text">
-      <string>Crash recovery (automatic backup)</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0" colspan="2">
-    <widget class="QCheckBox" name="kcfg_usekuiserver">
-     <property name="text">
-      <string>Use KDE job tracking for render jobs</string>
-     </property>
-    </widget>
-   </item>
    <item row="3" column="0" colspan="3">
     <widget class="QCheckBox" name="kcfg_activatetabs">
      <property name="text">
      </property>
     </widget>
    </item>
-   <item row="7" column="0">
-    <widget class="QCheckBox" name="kcfg_disable_effect_parameters">
+   <item row="2" column="0" colspan="3">
+    <widget class="QCheckBox" name="kcfg_crashrecovery">
      <property name="text">
-      <string>Disable parameters when the effect is disabled</string>
+      <string>Crash recovery (automatic backup)</string>
      </property>
     </widget>
    </item>
-   <item row="8" column="0">
-    <widget class="QCheckBox" name="kcfg_automultistreams">
+   <item row="9" column="0">
+    <widget class="QCheckBox" name="kcfg_bypasscodeccheck">
      <property name="text">
-      <string>Automatically import all streams in multi stream clips</string>
+      <string>Bypass codec verification</string>
      </property>
     </widget>
    </item>