[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive/Applications/16.04] src: Fix error in detection of libfaac and libvorbis
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2016-03-31 12:36:29
Message-ID: E1albpt-0002wu-O1 () scm ! kde ! org
[Download RAW message or body]

Git commit ef8821f7f95d3001e6175de46aec048ea880ce38 by Jean-Baptiste Mardelle.
Committed on 31/03/2016 at 12:36.
Pushed by mardelle into branch 'Applications/16.04'.

Fix error in detection of libfaac and libvorbis

M  +2    -2    src/dialogs/renderwidget.cpp
M  +13   -3    src/dialogs/wizard.cpp
M  +2    -2    src/kdenlivesettings.kcfg

http://commits.kde.org/kdenlive/ef8821f7f95d3001e6175de46aec048ea880ce38

diff --git a/src/dialogs/renderwidget.cpp b/src/dialogs/renderwidget.cpp
index 524d2e0..7a069ce 100644
--- a/src/dialogs/renderwidget.cpp
+++ b/src/dialogs/renderwidget.cpp
@@ -1850,7 +1850,7 @@ void RenderWidget::parseFile(const QString &exportFile, bool \
editable)  
             if (replaceVorbisCodec && \
params.contains(QStringLiteral("acodec=vorbis"))) {  // replace vorbis with libvorbis
-                params = params.replace(QLatin1String("vorbis"), \
QLatin1String("libvorbis")); +                params = \
params.replace(QLatin1String("=vorbis"), QLatin1String("=libvorbis"));  }
             if (replaceLibfaacCodec && \
params.contains(QStringLiteral("acodec=aac"))) {  // replace libfaac with aac
@@ -1953,7 +1953,7 @@ void RenderWidget::parseFile(const QString &exportFile, bool \
editable)  
             if (replaceVorbisCodec && \
params.contains(QStringLiteral("acodec=vorbis"))) {  // replace vorbis with libvorbis
-                params = params.replace(QLatin1String("vorbis"), \
QLatin1String("libvorbis")); +                params = \
params.replace(QLatin1String("=vorbis"), QLatin1String("=libvorbis"));  }
             if (replaceLibfaacCodec && \
params.contains(QStringLiteral("acodec=aac"))) {  // replace libfaac with aac
diff --git a/src/dialogs/wizard.cpp b/src/dialogs/wizard.cpp
index f85dd92..7534e63 100644
--- a/src/dialogs/wizard.cpp
+++ b/src/dialogs/wizard.cpp
@@ -410,7 +410,7 @@ void Wizard::checkMissingCodecs()
     if (acodecsList.contains(QStringLiteral("libvorbis"))) replaceVorbisCodec = \
true;  bool replaceLibfaacCodec = false;
     if (!acodecsList.contains(QStringLiteral("aac")) && \
                acodecsList.contains(QStringLiteral("libfaac"))) replaceLibfaacCodec \
                = true;
-    
+
     QString exportFolder = \
QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/export/";  QDir \
directory = QDir(exportFolder);  QStringList filter;
@@ -442,8 +442,18 @@ void Wizard::checkMissingCodecs()
     }
     requiredACodecs.removeDuplicates();
     requiredVCodecs.removeDuplicates();
-    if (replaceVorbisCodec) \
requiredACodecs.replaceInStrings(QStringLiteral("vorbis"), \
                QStringLiteral("libvorbis"));
-    if (replaceLibfaacCodec) requiredACodecs.replaceInStrings(QStringLiteral("aac"), \
QStringLiteral("libfaac")); +    if (replaceVorbisCodec)  {
+        int ix = requiredACodecs.indexOf(QStringLiteral("vorbis"));
+        if (ix > -1) {
+            requiredACodecs.replace(ix, QStringLiteral("libvorbis"));
+        }
+    }
+    if (replaceLibfaacCodec) {
+        int ix = requiredACodecs.indexOf(QStringLiteral("aac"));
+        if (ix > -1) {
+            requiredACodecs.replace(ix, QStringLiteral("libfaac"));
+        }
+    }
 
     for (int i = 0; i < acodecsList.count(); ++i)
         requiredACodecs.removeAll(acodecsList.at(i));
diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index 3d9089e..2488dcd 100644
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -677,12 +677,12 @@
 
     <entry name="displayClipMonitorInfo" type="Int">
       <label>Show overlay info on monitor (in / out points, markers,...).</label>
-      <default>0x13</default>
+      <default>0x15</default>
     </entry>
 
     <entry name="displayProjectMonitorInfo" type="Int">
       <label>Show overlay info on monitor (in / out points, markers,...).</label>
-      <default>0x03</default>
+      <default>0x05</default>
     </entry>
 
     <entry name="displayAudioOverlay" type="Bool">


[prev in list] [next in list] [prev in thread] [next in thread]