From fc55ba253fa7aff2678e8212799e5db85f847b8a Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Mon, 20 Jul 2009 21:08:51 +0000 Subject: [PATCH] Undo files that should not have been part of last commit svn path=/trunk/kdenlive/; revision=3744 --- src/cliptranscode.cpp | 16 ++++------------ src/cliptranscode.h | 5 +---- src/initeffects.cpp | 2 +- src/kdenlivesettings.kcfg | 10 +++++----- src/kdenlivetranscodingrc | 2 +- src/mainwindow.cpp | 2 +- src/timecode.h | 4 ++-- 7 files changed, 15 insertions(+), 26 deletions(-) diff --git a/src/cliptranscode.cpp b/src/cliptranscode.cpp index e2211d94..3386edf6 100644 --- a/src/cliptranscode.cpp +++ b/src/cliptranscode.cpp @@ -23,11 +23,10 @@ #include #include #include -#include -ClipTranscode::ClipTranscode(KUrl::List urls, const QString ¶ms, MltVideoProfile profile, QWidget * parent) : - QDialog(parent), m_urls(urls), m_profile(profile) +ClipTranscode::ClipTranscode(KUrl::List urls, const QString ¶ms, 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 ¶ms, 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 ¶ms, 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 a9d21022..e46fc53a 100644 --- a/src/cliptranscode.h +++ b/src/cliptranscode.h @@ -22,7 +22,6 @@ #define CLIPTRANSCODE_H -#include "definitions.h" #include "ui_cliptranscode_ui.h" #include @@ -34,7 +33,7 @@ class ClipTranscode : public QDialog Q_OBJECT public: - ClipTranscode(KUrl::List urls, const QString ¶ms, MltVideoProfile profile, QWidget * parent = 0); + ClipTranscode(KUrl::List urls, const QString ¶ms, 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 c5157ec3..e13b63c5 100644 --- 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 bfc2b57a..693a449d 100644 --- a/src/kdenlivesettings.kcfg +++ b/src/kdenlivesettings.kcfg @@ -102,11 +102,6 @@ - - - - - @@ -437,6 +432,11 @@ true + + + + + diff --git a/src/kdenlivetranscodingrc b/src/kdenlivetranscodingrc index 922ab775..51594904 100644 --- 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 6fe15337..43d32f02 100644 --- 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 28ccb625..e4b32548 100644 --- a/src/timecode.h +++ b/src/timecode.h @@ -17,10 +17,10 @@ #ifndef TIMECODE_H #define TIMECODE_H -#include "gentime.h" - #include +#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. -- 2.39.5