Add dvd export profile (problem with 16:9 ratio still pending), some export fixes.

svn path=/branches/KDE4/; revision=2306

diff --git a/export/profiles.xml b/export/profiles.xml
index 9075ba744396d367fae58f74f07252fc4933ba04..ffdcd27a3cfaa8001a871d21f0b0c173873a6bf1 100644 (file)
--- a/export/profiles.xml
+++ b/export/profiles.xml
@@ -18,6 +18,14 @@
     <profile name="NTSC AVI DV50" standard="NTSC" extension="avi" args="f=avi vcodec=dvvideo ildct=1 pix_fmt=yuv422p s=720x480 profile=dv_ntsc" />
 </group>
 
+<group name="DVD" renderer="avformat" type="av">
+    <profile name="PAL 4:3 vob" standard="PAL" extension="vob" args="f=dvd vcodec=mpeg2video acodec=ac3 b=5000k maxrate=8000000 minrate=0 bufsize=1835008 mux_packet_s=2048 mux_rate=10080000 ab=192000 ar=48000 s=720x576 g=15 me_range=63 ildct=1 ilme=1 profile=dv_pal" />
+    <profile name="PAL 16:9 vob" standard="PAL" extension="vob" args="f=dvd vcodec=mpeg2video acodec=ac3 b=5000k maxrate=8000000 minrate=0 bufsize=1835008 mux_packet_s=2048 mux_rate=10080000 ab=192000 ar=48000 g=15 me_range=63 ildct=1 ilme=1 profile=dv_pal_wide " />    
+        
+    <profile name="NTSC 4:3 vob" standard="NTSC" extension="vob" args="f=dvd vcodec=mpeg2video acodec=ac3 s=720x480 b=6000k maxrate=9000000 minrate=0 bufsize=1835008 mux_packet_s=2048 mux_rate=10080000 ab=192000 ar=48000 g=18 me_range=63 ildct=1 ilme=1 profile=dv_ntsc" />
+    <profile name="NTSC 16:9 vob" standard="NTSC" extension="vob" args="f=dvd vcodec=mpeg2video acodec=ac3 s=720x480 b=6000k maxrate=9000000 minrate=0 bufsize=1835008 mux_packet_s=2048 mux_rate=10080000 ab=192000 ar=48000 g=18 me_range=63 ildct=1 ilme=1 profile=dv_ntsc_wide" />
+</group>
+
 <group name="Mpeg" renderer="avformat" type="av">
     <profile name="160x120" extension="mpeg" args="f=mpeg minrate=0 b=400k ab=128000 ar=32000 s=160x120 progressive=1" />
     <profile name="240x180" extension="mpeg" args="f=mpeg minrate=0 b=500k ab=128000 ar=44100 s=240x180 progressive=1" />

diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp
index b6f2694838123f8bfee9df35dd46b82f18893ca9..df71e590eb360ae09880b3e0d29b4ac652ce321a 100644 (file)
--- a/renderer/renderjob.cpp
+++ b/renderer/renderjob.cpp
@@ -33,9 +33,10 @@ RenderJob::RenderJob(bool erase, QString renderer, QString profile, QString rend
     m_erase = erase;
     m_renderProcess = new QProcess;
     m_prog = renderer;
-    m_args << "-profile" << profile << scenelist;
+    m_args << scenelist;
     if (in != -1) m_args << "in=" + QString::number(in);
     if (out != -1) m_args << "out=" + QString::number(out);
+    m_args << "-profile" << profile;
     m_args << "-consumer" << rendermodule + ":" + m_dest << "progress=1" << args;
     connect(m_renderProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotIsOver(int, QProcess::ExitStatus)));
     connect(m_renderProcess, SIGNAL(readyReadStandardError()), this, SLOT(receivedStderr()));

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index d7107d1a5c2039dd08a03b8c870e84479b184844..e48e413e84bf0628be61360787c9c1700ff3f1a6 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -884,7 +884,7 @@ void MainWindow::slotDoRender(const QString &dest, const QString &render, const
             videoPlayer = KdenliveSettings::defaultplayerapp();
             if (videoPlayer.isEmpty()) KMessageBox::sorry(this, i18n("Cannot play video after rendering because the default video player application is not set.\nPlease define it in Kdenlive settings dialog."));
         }
-        args << "inigo" << m_activeDocument->profilePath() << render << videoPlayer << temp.fileName() << dest << avformat_args;
+        args << KdenliveSettings::rendererpath() << m_activeDocument->profilePath() << render << videoPlayer << temp.fileName() << dest << avformat_args;
         QProcess::startDetached("kdenlive_render", args);
     }
 }