From: <j-...@us...> - 2008-03-16 00:37:33
|
Revision: 2062 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2062&view=rev Author: j-b-m Date: 2008-03-15 17:37:35 -0700 (Sat, 15 Mar 2008) Log Message: ----------- fix endless loop Modified Paths: -------------- branches/KDE4/src/recmonitor.cpp Modified: branches/KDE4/src/recmonitor.cpp =================================================================== --- branches/KDE4/src/recmonitor.cpp 2008-03-16 00:25:31 UTC (rev 2061) +++ branches/KDE4/src/recmonitor.cpp 2008-03-16 00:37:35 UTC (rev 2062) @@ -137,6 +137,7 @@ else if (i < 100) num.prepend("00"); else num.prepend("0"); path = KdenliveSettings::capturefolder() + "/capture" + num + ".mpg"; + i++; } m_captureFile = KUrl(path); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-04-11 12:39:35
|
Revision: 2161 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2161&view=rev Author: j-b-m Date: 2008-04-11 05:39:41 -0700 (Fri, 11 Apr 2008) Log Message: ----------- small cleanup Modified Paths: -------------- branches/KDE4/src/recmonitor.cpp Modified: branches/KDE4/src/recmonitor.cpp =================================================================== --- branches/KDE4/src/recmonitor.cpp 2008-04-06 18:25:36 UTC (rev 2160) +++ branches/KDE4/src/recmonitor.cpp 2008-04-11 12:39:41 UTC (rev 2161) @@ -270,10 +270,7 @@ QString path = KdenliveSettings::capturefolder() + "/capture0000.mpg"; int i = 1; while (QFile::exists(path)) { - QString num = QString::number(i); - if (i < 10) num.prepend("000"); - else if (i < 100) num.prepend("00"); - else num.prepend("0"); + QString num = QString::number(i).rightJustified(4, '0', false); path = KdenliveSettings::capturefolder() + "/capture" + num + ".mpg"; i++; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2008-06-25 20:52:11
|
Revision: 2277 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2277&view=rev Author: j-b-m Date: 2008-06-25 13:52:20 -0700 (Wed, 25 Jun 2008) Log Message: ----------- Screen grab fixes Modified Paths: -------------- branches/KDE4/src/recmonitor.cpp Modified: branches/KDE4/src/recmonitor.cpp =================================================================== --- branches/KDE4/src/recmonitor.cpp 2008-06-25 20:22:47 UTC (rev 2276) +++ branches/KDE4/src/recmonitor.cpp 2008-06-25 20:52:20 UTC (rev 2277) @@ -176,7 +176,7 @@ if (m_isCapturing && ui.autoaddbox->isChecked()) emit addProjectClip(m_captureFile); break; case SCREENGRAB: - captureProcess->kill(); + QTimer::singleShot(1000, captureProcess, SLOT(kill())); if (m_isCapturing && ui.autoaddbox->isChecked()) emit addProjectClip(m_captureFile); break; default: @@ -290,8 +290,9 @@ QTimer::singleShot(1000, this, SLOT(slotStartCapture())); break; case SCREENGRAB: - slotStopCapture(); - m_isCapturing = false; + captureProcess->write("q\n", 3); + // in case ffmpeg doesn't exit with the 'q' command, kill it one second later + QTimer::singleShot(1000, captureProcess, SLOT(kill())); break; } return; @@ -385,16 +386,19 @@ void RecMonitor::slotProcessStatus(QProcess::ProcessState status) { if (status == QProcess::NotRunning) { + if (m_isCapturing && ui.device_selector->currentIndex() == SCREENGRAB) { + if (ui.autoaddbox->isChecked()) emit addProjectClip(m_captureFile); + } m_isCapturing = false; m_isPlaying = false; m_playAction->setIcon(m_playIcon); m_recAction->setChecked(false); m_stopAction->setEnabled(false); ui.device_selector->setEnabled(true); - /*if (captureProcess && captureProcess->exitStatus() == QProcess::CrashExit) { + if (captureProcess && captureProcess->exitStatus() == QProcess::CrashExit) { ui.video_frame->setText(i18n("Capture crashed, please check your parameters")); } - else*/ ui.video_frame->setText(i18n("Not connected")); + else ui.video_frame->setText(i18n("Not connected")); } else { m_stopAction->setEnabled(true); ui.device_selector->setEnabled(false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |