Undo files that should not have been part of last commit

svn path=/trunk/kdenlive/; revision=3744

diff --git a/src/cliptranscode.cpp b/src/cliptranscode.cpp
index e2211d94d9a9d528a928074949745c8b4e067106..3386edf6981f1d771dcacad9d049d1b4025ef784 100644 (file)
--- a/src/cliptranscode.cpp
+++ b/src/cliptranscode.cpp
@@ -23,11 +23,10 @@
 #include <KDebug>
 #include <KGlobalSettings>
 #include <KMessageBox>
-#include <KFileDialog>
 
 
-ClipTranscode::ClipTranscode(KUrl::List urls, const QString &params, MltVideoProfile profile, QWidget * parent) :
-        QDialog(parent), m_urls(urls), m_profile(profile)
+ClipTranscode::ClipTranscode(KUrl::List urls, const QString &params, QWidget * parent) :
+        QDialog(parent), m_urls(urls)
 {
     setFont(KGlobalSettings::toolBarFont());
     m_view.setupUi(this);
@@ -40,8 +39,6 @@ ClipTranscode::ClipTranscode(KUrl::List urls, const QString &params, MltVideoPro
         KUrl dest(newFile);
         m_view.source_url->setUrl(m_urls.at(0));
         m_view.dest_url->setUrl(dest);
-        m_view.dest_url->setMode(KFile::File);
-        m_view.dest_url->fileDialog()->setOperationMode(KFileDialog::Saving);
         m_view.urls_list->setHidden(true);
         connect(m_view.source_url, SIGNAL(textChanged(const QString &)), this, SLOT(slotUpdateParams()));
     } else {
@@ -55,7 +52,7 @@ ClipTranscode::ClipTranscode(KUrl::List urls, const QString &params, MltVideoPro
     if (!params.isEmpty()) {
         m_view.label_profile->setHidden(true);
         m_view.profile_list->setHidden(true);
-        m_view.params->setPlainText(prepareParams(params));
+        m_view.params->setPlainText(params.simplified());
     } else {
         // load Profiles
         KSharedConfigPtr config = KSharedConfig::openConfig("kdenlivetranscodingrc");
@@ -152,7 +149,7 @@ void ClipTranscode::slotUpdateParams(int ix)
     QString fileName = m_view.source_url->url().path();
     if (ix != -1) {
         QString params = m_view.profile_list->itemData(ix).toString();
-        m_view.params->setPlainText(prepareParams(params));
+        m_view.params->setPlainText(params.simplified());
     }
 
     QString newFile = m_view.params->toPlainText().simplified().section(' ', -1).replace("%1", fileName);
@@ -160,11 +157,6 @@ void ClipTranscode::slotUpdateParams(int ix)
 
 }
 
-QString ClipTranscode::prepareParams(QString params)
-{
-    return "-s " + QString::number(m_profile.width) + 'x' + QString::number(m_profile.height) + " -r " + QString::number((double) m_profile.frame_rate_num / m_profile.frame_rate_den) + ' ' + params.simplified();
-}
-
 #include "cliptranscode.moc"
 
 

diff --git a/src/cliptranscode.h b/src/cliptranscode.h
index a9d21022e9cfa88fde751aedf4458613e11d6059..e46fc53a000f7377bc33bd2246110d90495203b2 100644 (file)
--- a/src/cliptranscode.h
+++ b/src/cliptranscode.h
@@ -22,7 +22,6 @@
 #define CLIPTRANSCODE_H
 
 
-#include "definitions.h"
 #include "ui_cliptranscode_ui.h"
 
 #include <KUrl>
@@ -34,7 +33,7 @@ class ClipTranscode : public QDialog
     Q_OBJECT
 
 public:
-    ClipTranscode(KUrl::List urls, const QString &params, MltVideoProfile profile, QWidget * parent = 0);
+    ClipTranscode(KUrl::List urls, const QString &params, QWidget * parent = 0);
     ~ClipTranscode();
 
 
@@ -48,8 +47,6 @@ private:
     Ui::ClipTranscode_UI m_view;
     QProcess m_transcodeProcess;
     KUrl::List m_urls;
-    MltVideoProfile m_profile;
-    QString prepareParams(QString params);
 
 signals:
     void addClip(KUrl url);

diff --git a/src/initeffects.cpp b/src/initeffects.cpp
index c5157ec3ccc04859bfa0e590554638f4f2fe41b1..e13b63c571177eed536a75808c5e9db945390870 100644 (file)
--- a/src/initeffects.cpp
+++ b/src/initeffects.cpp
@@ -673,7 +673,7 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList*
             }
 
             if (name == "luma") {
-                ktrans.setAttribute("id", "luma");
+                ktrans.setAttribute("id", name);
                 tname.appendChild(ret.createTextNode("Wipe"));
                 desc.appendChild(ret.createTextNode("Applies a stationary transition between the current and next frames"));
 

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index bfc2b57adc97bdfd294469deddd3107f058b64b1..693a449d8dc05432172daef641606fd6bfba13e9 100644 (file)
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -102,11 +102,6 @@
       <default></default>
     </entry>
 
-    <entry name="autoaudiodrivername" type="String">
-      <label>Audio driver selected automatically.</label>
-      <default></default>
-    </entry>
-
     <entry name="videodrivername" type="String">
       <label>Video driver used for output.</label>
       <default></default>
@@ -437,6 +432,11 @@
       <default>true</default>
     </entry>
 
+    <entry name="autoaudiodrivername" type="String">
+      <label>Audio driver selected automatically.</label>
+      <default></default>
+    </entry>
+
     <entry name="audiocodecs" type="StringList">
       <label>Available avformat audio codecs.</label>
       <default></default>

diff --git a/src/kdenlivetranscodingrc b/src/kdenlivetranscodingrc
index 922ab7755c59ae5e86965cdd2f8d0bb13fec7407..5159490428ed1bd13c614a68934d11bf5051f062 100644 (file)
--- a/src/kdenlivetranscodingrc
+++ b/src/kdenlivetranscodingrc
@@ -1,2 +1,2 @@
 [Transcoding]
-DNxHD HQ=-b 220000k -threads 2 -vcodec dnxhd -acodec copy %1.mov
+DNxHD 1920x1080=-s 1920x1080 -r pal -b 220000k -threads 2 -vcodec dnxhd -acodec copy %1.mov

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 6fe15337650e5e536723d4ebde2c144d7995145d..43d32f02eec08cf3c388f7e14321f0755424ea48 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2694,7 +2694,7 @@ void MainWindow::slotTranscode(KUrl::List urls)
         params = action->data().toString();
     }
     if (urls.isEmpty()) return;
-    ClipTranscode *d = new ClipTranscode(urls, params, m_activeDocument->mltProfile());
+    ClipTranscode *d = new ClipTranscode(urls, params);
     connect(d, SIGNAL(addClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl)));
     d->show();
     //QProcess::startDetached("ffmpeg", parameters);

diff --git a/src/timecode.h b/src/timecode.h
index 28ccb625d4e8de961a9a20c07dace76c994cba2a..e4b32548e275886573e9d7025000df5e70e20fe3 100644 (file)
--- a/src/timecode.h
+++ b/src/timecode.h
@@ -17,10 +17,10 @@
 #ifndef TIMECODE_H
 #define TIMECODE_H
 
-#include "gentime.h"
-
 #include <qstring.h>
 
+#include "gentime.h"
+
 /**
 Handles the conversion of a GenTime into a nicely formatted string, taking into account things such as drop frame if necessary. Handles multiple formats, such as HH:MM:SS:FF, HH:MM:SS:F, All Frames, All Seconds, etc.