From 2dedab44127668658a45b04d53383311976b45ea Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Mon, 14 May 2012 21:43:44 +0200
Subject: [PATCH] Audio align is not experimental anymore

---
 src/kdenlivesettings.kcfg        |  5 -----
 src/mainwindow.cpp               |  6 ++----
 src/widgets/configtimeline_ui.ui | 12 ++----------
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index ea681bce..92c47373 100644
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -155,11 +155,6 @@
       <default>true</default>
     </entry>
 
-    <entry name="enableaudioalign" type="Bool">
-      <label>Enable automatic audio alignment (experimental)</label>
-      <default>false</default>
-    </entry>
-
     <entry name="verticalzoom" type="Bool">
       <label>Vertical drag in timeline ruler zooms.</label>
       <default>false</default>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 49536501..3bcb4b79 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -547,10 +547,8 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString &
     m_timelineContextClipMenu->addAction(actionCollection()->action("group_clip"));
     m_timelineContextClipMenu->addAction(actionCollection()->action("ungroup_clip"));
     m_timelineContextClipMenu->addAction(actionCollection()->action("split_audio"));
-    if (KdenliveSettings::enableaudioalign()) {
-        m_timelineContextClipMenu->addAction(actionCollection()->action("set_audio_align_ref"));
-        m_timelineContextClipMenu->addAction(actionCollection()->action("align_audio"));
-    }
+    m_timelineContextClipMenu->addAction(actionCollection()->action("set_audio_align_ref"));
+    m_timelineContextClipMenu->addAction(actionCollection()->action("align_audio"));
     m_timelineContextClipMenu->addSeparator();
     m_timelineContextClipMenu->addAction(actionCollection()->action("cut_timeline_clip"));
     m_timelineContextClipMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Copy)));
diff --git a/src/widgets/configtimeline_ui.ui b/src/widgets/configtimeline_ui.ui
index b692361f..33d42221 100644
--- a/src/widgets/configtimeline_ui.ui
+++ b/src/widgets/configtimeline_ui.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>348</width>
-    <height>268</height>
+    <width>281</width>
+    <height>222</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -113,14 +113,6 @@
      </item>
     </layout>
    </item>
-   <item>
-    <widget class="QCheckBox" name="kcfg_enableaudioalign">
-     <property name="text">
-      <string>Enable Audio Alignment (experimental!)
-Requires restart.</string>
-     </property>
-    </widget>
-   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
-- 
2.39.2