From a9898601d8a1851a969303523c66e5adaa6f0a82 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Tue, 13 Mar 2012 15:04:04 -0500 Subject: [PATCH] Fix reference of /tmp/kde-jmp -> /tmp/tde-jmp to avoid potential conflicts with KDE4. This partially resolves bug report 813. --- libk9copy/k9mp4enc.cpp | 2 +- src/k9redirect.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libk9copy/k9mp4enc.cpp b/libk9copy/k9mp4enc.cpp index 301747c..e29f206 100644 --- a/libk9copy/k9mp4enc.cpp +++ b/libk9copy/k9mp4enc.cpp @@ -213,7 +213,7 @@ void k9MP4Enc::execute ( k9DVDTitle *_title ) m_process=new k9Process ( this,0 ); m_process->setUseShell ( true ); *m_process << "k9copy" << "--play" << "--endsector" << TQString::number ( endSector ) ; - *m_process << "--inject" << injectName; //"/tmp/kde-jmp/inject"; + *m_process << "--inject" << injectName; //"/tmp/tde-jmp/inject"; *m_process << "--input" << "'"+m_device+"'"; *m_process << "--dvdtitle" << TQString::number ( _title->getnumTitle() ); diff --git a/src/k9redirect.cpp b/src/k9redirect.cpp index 3076556..fda674b 100644 --- a/src/k9redirect.cpp +++ b/src/k9redirect.cpp @@ -24,12 +24,12 @@ void k9Redirect::execute() { KProcess *p=new KProcess(); *p << "mencoder"; *p << "-oac" << "lavc" << "-ovc" << "lavc" << "-of" << "mpeg"; - *p << "-mpegopts" << "format=dvd" << "-vf" << "scale=720:576,harddup" << "-srate" << "48000" << "-af" << "lavcresample=48000" << "-lavcopts" << "vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=5000:keyint=15:acodec=ac3:abitrate=192:aspect=16/9" << "-ofps" << "25" << "-o" << "/tmp/kde-jmp/k9copy/tmp.mpeg" << "-ss" << "00:00:00.000" << "-endpos" << "00:00:57.360" << "-really-quiet" << "/home/jmp/t.avi"; + *p << "-mpegopts" << "format=dvd" << "-vf" << "scale=720:576,harddup" << "-srate" << "48000" << "-af" << "lavcresample=48000" << "-lavcopts" << "vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=5000:keyint=15:acodec=ac3:abitrate=192:aspect=16/9" << "-ofps" << "25" << "-o" << "/tmp/tde-jmp/k9copy/tmp.mpeg" << "-ss" << "00:00:00.000" << "-endpos" << "00:00:57.360" << "-really-quiet" << "/home/jmp/t.avi"; p->start(KProcess::NotifyOnExit); p->wait(); - TQFile f("/tmp/kde-jmp/k9copy/tmp.mpeg"); + TQFile f("/tmp/tde-jmp/k9copy/tmp.mpeg"); TQFile fout; f.open(IO_ReadOnly ); fout.open(IO_WriteOnly,stdout);