From: <j-...@us...> - 2010-01-30 14:34:44
|
Revision: 4254 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4254&view=rev Author: j-b-m Date: 2010-01-30 14:34:37 +0000 (Sat, 30 Jan 2010) Log Message: ----------- Fix failure in dvd wizard Modified Paths: -------------- trunk/kdenlive/src/dvdwizard.cpp trunk/kdenlive/src/dvdwizard.h Modified: trunk/kdenlive/src/dvdwizard.cpp =================================================================== --- trunk/kdenlive/src/dvdwizard.cpp 2010-01-30 12:51:37 UTC (rev 4253) +++ trunk/kdenlive/src/dvdwizard.cpp 2010-01-30 14:34:37 UTC (rev 4254) @@ -116,6 +116,7 @@ DvdWizard::~DvdWizard() { m_authorFile.remove(); + m_menuFile.remove(); blockSignals(true); delete m_burnMenu; if (m_dvdauthor) { @@ -182,9 +183,10 @@ //temp6.setAutoRemove(false); temp6.open(); - KTemporaryFile menuFile; - menuFile.setSuffix(".mpg"); - menuFile.open(); + m_menuFile.close(); + m_menuFile.setSuffix(".mpg"); + m_menuFile.setAutoRemove(false); + m_menuFile.open(); m_authorFile.close(); m_authorFile.setSuffix(".xml"); @@ -310,13 +312,13 @@ QStringList args; args.append(temp6.fileName()); - kDebug() << "SPM ARGS: " << args << temp5.fileName() << menuFile.fileName(); + kDebug() << "SPM ARGS: " << args << temp5.fileName() << m_menuFile.fileName(); QProcess spumux; if (m_pageMenu->menuMovie()) spumux.setStandardInputFile(m_pageMenu->menuMoviePath()); else spumux.setStandardInputFile(temp5.fileName()); - spumux.setStandardOutputFile(menuFile.fileName()); + spumux.setStandardOutputFile(m_menuFile.fileName()); spumux.start("spumux", args); if (spumux.waitForFinished()) { m_status.error_log->append(spumux.readAllStandardError()); @@ -338,7 +340,7 @@ } spuitem->setIcon(KIcon("dialog-ok")); - kDebug() << "/// DONE: " << menuFile.fileName(); + kDebug() << "/// DONE: " << m_menuFile.fileName(); } // create dvdauthor xml @@ -392,7 +394,7 @@ pgc.appendChild(button); } QDomElement menuvob = dvddoc.createElement("vob"); - menuvob.setAttribute("file", menuFile.fileName()); + menuvob.setAttribute("file", m_menuFile.fileName()); menuvob.setAttribute("pause", "inf"); pgc.appendChild(menuvob); } Modified: trunk/kdenlive/src/dvdwizard.h =================================================================== --- trunk/kdenlive/src/dvdwizard.h 2010-01-30 12:51:37 UTC (rev 4253) +++ trunk/kdenlive/src/dvdwizard.h 2010-01-30 14:34:37 UTC (rev 4254) @@ -50,6 +50,7 @@ Ui::DvdWizardStatus_UI m_status; DvdWizardChapters *m_pageChapters; KTemporaryFile m_authorFile; + KTemporaryFile m_menuFile; QProcess *m_dvdauthor; QProcess *m_mkiso; QString m_creationLog; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |