X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frecmonitor.cpp;h=2943e88fa215fbacf4a07f98940044d40cb3d0ea;hb=edf2e497b4361db1bce089b0ef58dd566bf1d997;hp=e823244f4d928a37ae55427302da1a86964e57f6;hpb=6d213ea2eb54855b035d2d8a9cb1c23e89f7ba3b;p=kdenlive diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp index e823244f..2943e88f 100644 --- a/src/recmonitor.cpp +++ b/src/recmonitor.cpp @@ -18,33 +18,39 @@ ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include +#include "recmonitor.h" +#include "gentime.h" +#include "kdenlivesettings.h" +#include "managecapturesdialog.h" #include #include +#include #include #include #include #include -#include "gentime.h" -#include "kdenlivesettings.h" -#include "managecapturesdialog.h" -#include "recmonitor.h" +#include +#include +#include +#include +#include + -RecMonitor::RecMonitor(QString name, QWidget *parent) - : QWidget(parent), m_name(name), m_isActive(false), m_isCapturing(false), m_isPlaying(false), m_didCapture(false) { - ui.setupUi(this); +RecMonitor::RecMonitor(QString name, QWidget *parent) : + QWidget(parent), + m_name(name), + m_isActive(false), + m_isCapturing(false), + m_didCapture(false), + m_isPlaying(false) +{ + m_ui.setupUi(this); - ui.video_frame->setAttribute(Qt::WA_PaintOnScreen); - ui.device_selector->setCurrentIndex(KdenliveSettings::defaultcapture()); - connect(ui.device_selector, SIGNAL(currentIndexChanged(int)), this, SLOT(slotVideoDeviceChanged(int))); + m_ui.video_frame->setAttribute(Qt::WA_PaintOnScreen); + m_ui.device_selector->setCurrentIndex(KdenliveSettings::defaultcapture()); + connect(m_ui.device_selector, SIGNAL(currentIndexChanged(int)), this, SLOT(slotVideoDeviceChanged(int))); @@ -80,43 +86,63 @@ RecMonitor::RecMonitor(QString name, QWidget *parent) configAction->setCheckable(false); layout->addWidget(toolbar); - ui.control_frame_firewire->setLayout(layout); + m_ui.control_frame_firewire->setLayout(layout); - slotVideoDeviceChanged(ui.device_selector->currentIndex()); - displayProcess = new QProcess; - captureProcess = new QProcess; + slotVideoDeviceChanged(m_ui.device_selector->currentIndex()); + m_displayProcess = new QProcess; + m_captureProcess = new QProcess; - connect(captureProcess, SIGNAL(stateChanged(QProcess::ProcessState)), this, SLOT(slotProcessStatus(QProcess::ProcessState))); + connect(m_captureProcess, SIGNAL(stateChanged(QProcess::ProcessState)), this, SLOT(slotProcessStatus(QProcess::ProcessState))); QStringList env = QProcess::systemEnvironment(); - env << "SDL_WINDOWID=" + QString::number(ui.video_frame->winId()); - displayProcess->setEnvironment(env); + env << "SDL_WINDOWID=" + QString::number(m_ui.video_frame->winId()); + + QString videoDriver = KdenliveSettings::videodrivername(); + if (!videoDriver.isEmpty()) { + if (videoDriver == "x11_noaccel") { + env << "SDL_VIDEO_YUV_HWACCEL=0"; + env << "SDL_VIDEODRIVER=x11"; + } else env << "SDL_VIDEODRIVER=" + videoDriver; + } + setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 1); + + m_displayProcess->setEnvironment(env); if (KdenliveSettings::video4capture().isEmpty()) { QString captureCommand; if (!KdenliveSettings::video4adevice().isEmpty()) captureCommand = "-f " + KdenliveSettings::video4aformat() + " -i " + KdenliveSettings::video4adevice(); - captureCommand += " -f " + KdenliveSettings::video4vformat() + " -s " + KdenliveSettings::video4size() + " -r " + QString::number(KdenliveSettings::video4rate()) + " -i " + KdenliveSettings::video4vdevice() + " -f " + KdenliveSettings::video4vencoding(); + captureCommand += " -f " + KdenliveSettings::video4vformat() + " -s " + KdenliveSettings::video4size() + " -r " + QString::number(KdenliveSettings::video4rate()) + " -i " + KdenliveSettings::video4vdevice(); KdenliveSettings::setVideo4capture(captureCommand); } - if (KdenliveSettings::video4playback().isEmpty()) { - QString playbackCommand; - playbackCommand = "-f " + KdenliveSettings::video4vencoding(); - KdenliveSettings::setVideo4playback(playbackCommand); - } - kDebug() << "/////// BUILDING MONITOR, ID: " << ui.video_frame->winId(); + kDebug() << "/////// BUILDING MONITOR, ID: " << m_ui.video_frame->winId(); +} + +RecMonitor::~RecMonitor() +{ + delete m_captureProcess; + delete m_displayProcess; } -QString RecMonitor::name() const { +QString RecMonitor::name() const +{ return m_name; } -void RecMonitor::slotConfigure() { - emit showConfigDialog(4, ui.device_selector->currentIndex()); +void RecMonitor::slotConfigure() +{ + emit showConfigDialog(4, m_ui.device_selector->currentIndex()); } -void RecMonitor::slotVideoDeviceChanged(int ix) { +void RecMonitor::slotUpdateCaptureFolder() +{ + if (m_captureProcess) m_captureProcess->setWorkingDirectory(KdenliveSettings::capturefolder()); + slotVideoDeviceChanged(m_ui.device_selector->currentIndex()); +} + +void RecMonitor::slotVideoDeviceChanged(int ix) +{ switch (ix) { case SCREENGRAB: m_discAction->setEnabled(false); @@ -125,8 +151,13 @@ void RecMonitor::slotVideoDeviceChanged(int ix) { m_recAction->setEnabled(true); m_stopAction->setEnabled(false); m_playAction->setEnabled(false); - ui.video_frame->setPixmap(mergeSideBySide(KIcon("video-display").pixmap(QSize(50, 50)), i18n("Press record button\nto start screen capture\nFiles will be saved in:\n%1", KdenliveSettings::capturefolder()))); - //ui.video_frame->setText(i18n("Press record button\nto start screen capture")); + if (KdenliveSettings::rmd_path().isEmpty()) { + QString rmdpath = KStandardDirs::findExe("recordmydesktop"); + if (rmdpath.isEmpty()) m_ui.video_frame->setPixmap(mergeSideBySide(KIcon("dialog-warning").pixmap(QSize(50, 50)), i18n("Recordmydesktop utility not found,\n please install it for screen grabs"))); + else KdenliveSettings::setRmd_path(rmdpath); + } + if (!KdenliveSettings::rmd_path().isEmpty()) m_ui.video_frame->setPixmap(mergeSideBySide(KIcon("video-display").pixmap(QSize(50, 50)), i18n("Press record button\nto start screen capture\nFiles will be saved in:\n%1", KdenliveSettings::capturefolder()))); + //m_ui.video_frame->setText(i18n("Press record button\nto start screen capture")); break; case VIDEO4LINUX: m_discAction->setEnabled(false); @@ -144,15 +175,22 @@ void RecMonitor::slotVideoDeviceChanged(int ix) { m_playAction->setEnabled(false); m_rewAction->setEnabled(false); m_fwdAction->setEnabled(false); - //ui.video_frame->setText(i18n("Plug your camcorder and\npress connect button\nto initialize connection")); - ui.video_frame->setPixmap(mergeSideBySide(KIcon("network-connect").pixmap(QSize(50, 50)), i18n("Plug your camcorder and\npress connect button\nto initialize connection\nFiles will be saved in:\n%1", KdenliveSettings::capturefolder()))); + //m_ui.video_frame->setText(i18n("Plug your camcorder and\npress connect button\nto initialize connection")); + if (KdenliveSettings::dvgrab_path().isEmpty()) { + QString dvgrabpath = KStandardDirs::findExe("dvgrab"); + if (dvgrabpath.isEmpty()) m_ui.video_frame->setPixmap(mergeSideBySide(KIcon("dialog-warning").pixmap(QSize(50, 50)), i18n("dvgrab utility not found,\n please install it for firewire capture"))); + else KdenliveSettings::setDvgrab_path(dvgrabpath); + } + + if (!KdenliveSettings::dvgrab_path().isEmpty()) m_ui.video_frame->setPixmap(mergeSideBySide(KIcon("network-connect").pixmap(QSize(50, 50)), i18n("Plug your camcorder and\npress connect button\nto initialize connection\nFiles will be saved in:\n%1", KdenliveSettings::capturefolder()))); break; } } -QPixmap RecMonitor::mergeSideBySide(const QPixmap& pix, const QString txt) { +QPixmap RecMonitor::mergeSideBySide(const QPixmap& pix, const QString txt) +{ QPainter p; - QRect r = p.fontMetrics().boundingRect(QRect(0, 0, ui.video_frame->width(), ui.video_frame->height()), Qt::AlignLeft, txt); + QRect r = QApplication::fontMetrics().boundingRect(QRect(0, 0, m_ui.video_frame->width(), m_ui.video_frame->height()), Qt::AlignLeft, txt); int strWidth = r.width(); int strHeight = r.height(); int pixWidth = pix.width(); @@ -167,18 +205,20 @@ QPixmap RecMonitor::mergeSideBySide(const QPixmap& pix, const QString txt) { } -void RecMonitor::checkDeviceAvailability() { +void RecMonitor::checkDeviceAvailability() +{ if (!KIO::NetAccess::exists(KUrl(KdenliveSettings::video4vdevice()), KIO::NetAccess::SourceSide , this)) { m_playAction->setEnabled(false); m_recAction->setEnabled(false); - ui.video_frame->setPixmap(mergeSideBySide(KIcon("camera-web").pixmap(QSize(50, 50)), i18n("Cannot read from device %1\nPlease check drivers and access rights.", KdenliveSettings::video4vdevice()))); - //ui.video_frame->setText(i18n("Cannot read from device %1\nPlease check drivers and access rights.", KdenliveSettings::video4vdevice())); - } else //ui.video_frame->setText(i18n("Press play or record button\nto start video capture")); - ui.video_frame->setPixmap(mergeSideBySide(KIcon("camera-web").pixmap(QSize(50, 50)), i18n("Press play or record button\nto start video capture\nFiles will be saved in:\n%1", KdenliveSettings::capturefolder()))); + m_ui.video_frame->setPixmap(mergeSideBySide(KIcon("camera-web").pixmap(QSize(50, 50)), i18n("Cannot read from device %1\nPlease check drivers and access rights.", KdenliveSettings::video4vdevice()))); + //m_ui.video_frame->setText(i18n("Cannot read from device %1\nPlease check drivers and access rights.", KdenliveSettings::video4vdevice())); + } else //m_ui.video_frame->setText(i18n("Press play or record button\nto start video capture")); + m_ui.video_frame->setPixmap(mergeSideBySide(KIcon("camera-web").pixmap(QSize(50, 50)), i18n("Press play or record button\nto start video capture\nFiles will be saved in:\n%1", KdenliveSettings::capturefolder()))); } -void RecMonitor::slotDisconnect() { - if (captureProcess->state() == QProcess::NotRunning) { +void RecMonitor::slotDisconnect() +{ + if (m_captureProcess->state() == QProcess::NotRunning) { m_captureTime = KDateTime::currentLocalDateTime(); kDebug() << "CURRENT TIME: " << m_captureTime.toString(); m_didCapture = false; @@ -191,44 +231,48 @@ void RecMonitor::slotDisconnect() { m_rewAction->setEnabled(true); m_fwdAction->setEnabled(true); } else { - captureProcess->write("q", 1); - QTimer::singleShot(1000, captureProcess, SLOT(kill())); + m_captureProcess->write("q", 1); + QTimer::singleShot(1000, m_captureProcess, SLOT(kill())); if (m_didCapture) manageCapturedFiles(); m_didCapture = false; } } -void RecMonitor::slotRewind() { - captureProcess->write("a", 1); +void RecMonitor::slotRewind() +{ + m_captureProcess->write("a", 1); } -void RecMonitor::slotForward() { - captureProcess->write("z", 1); +void RecMonitor::slotForward() +{ + m_captureProcess->write("z", 1); } -void RecMonitor::slotStopCapture() { +void RecMonitor::slotStopCapture() +{ // stop capture - switch (ui.device_selector->currentIndex()) { + switch (m_ui.device_selector->currentIndex()) { case FIREWIRE: - captureProcess->write("\e", 2); + m_captureProcess->write("\e", 2); m_playAction->setIcon(m_playIcon); m_isPlaying = false; break; case VIDEO4LINUX: - captureProcess->write("q\n", 3); - QTimer::singleShot(1000, captureProcess, SLOT(kill())); + m_captureProcess->write("q\n", 3); + QTimer::singleShot(1000, m_captureProcess, SLOT(kill())); break; case SCREENGRAB: - captureProcess->write("q\n", 3); - QTimer::singleShot(1000, captureProcess, SLOT(kill())); + m_captureProcess->write("q\n", 3); + QTimer::singleShot(1000, m_captureProcess, SLOT(kill())); break; default: break; } } -void RecMonitor::slotStartCapture(bool play) { +void RecMonitor::slotStartCapture(bool play) +{ /* *captureProcess<<"dvgrab"; @@ -260,23 +304,23 @@ void RecMonitor::slotStartCapture(bool play) { captureArgs<<"--format"<<"hdv"<<"-i"<<"capture"<<"-"; QStringList displayArgs; - displayArgs<<"-f"<<"mpegts"<<"-x"<width())<<"-y"<height())<<"-"; + displayArgs<<"-f"<<"mpegts"<<"-x"<width())<<"-y"<height())<<"-"; captureProcess->setStandardOutputProcess(displayProcess); - ui.video_frame->setScaledContents(false); + m_ui.video_frame->setScaledContents(false); captureProcess->start("dvgrab",captureArgs); displayProcess->start("ffplay", displayArgs);*/ - if (captureProcess->state() != QProcess::NotRunning) { - if (ui.device_selector->currentIndex() == FIREWIRE) { + if (m_captureProcess->state() != QProcess::NotRunning) { + if (m_ui.device_selector->currentIndex() == FIREWIRE) { if (m_isPlaying) { - captureProcess->write("k", 1); + m_captureProcess->write("k", 1); //captureProcess->write("\e", 2); m_playAction->setIcon(m_playIcon); m_isPlaying = false; } else { - captureProcess->write("p", 1); + m_captureProcess->write("p", 1); m_playAction->setIcon(m_pauseIcon); m_isPlaying = true; } @@ -287,7 +331,7 @@ void RecMonitor::slotStartCapture(bool play) { m_displayArgs.clear(); m_isPlaying = false; - switch (ui.device_selector->currentIndex()) { + switch (m_ui.device_selector->currentIndex()) { case FIREWIRE: switch (KdenliveSettings::firewireformat()) { case 0: @@ -314,72 +358,79 @@ void RecMonitor::slotStartCapture(bool play) { if (KdenliveSettings::firewireautosplit()) m_captureArgs << "--autosplit"; if (KdenliveSettings::firewiretimestamp()) m_captureArgs << "--timestamp"; m_captureArgs << "-i" << "capture" << "-"; - m_displayArgs << "-x" << QString::number(ui.video_frame->width()) << "-y" << QString::number(ui.video_frame->height()) << "-"; + m_displayArgs << "-x" << QString::number(m_ui.video_frame->width()) << "-y" << QString::number(m_ui.video_frame->height()) << "-"; - captureProcess->setStandardOutputProcess(displayProcess); - captureProcess->setWorkingDirectory(KdenliveSettings::capturefolder()); - captureProcess->start("dvgrab", m_captureArgs); - if (play) captureProcess->write(" ", 1); + m_captureProcess->setStandardOutputProcess(m_displayProcess); + m_captureProcess->setWorkingDirectory(KdenliveSettings::capturefolder()); + kDebug() << "Capture: Running dvgrab " << m_captureArgs.join(" "); + m_captureProcess->start(KdenliveSettings::dvgrab_path(), m_captureArgs); + if (play) m_captureProcess->write(" ", 1); m_discAction->setEnabled(true); break; case VIDEO4LINUX: - m_captureArgs << KdenliveSettings::video4capture().simplified().split(' ') << "-"; - m_displayArgs << KdenliveSettings::video4playback().simplified().split(' ') << "-x" << QString::number(ui.video_frame->width()) << "-y" << QString::number(ui.video_frame->height()) << "-"; - captureProcess->setStandardOutputProcess(displayProcess); - captureProcess->start("ffmpeg", m_captureArgs); + m_captureArgs << KdenliveSettings::video4capture().simplified().split(' ') << KdenliveSettings::video4encoding().simplified().split(' ') << "-f" << "mpegts" << "-vcodec" << "mpeg4" << "-acodec" << "mp2" << "-"; + m_displayArgs << "-f" << "mpegts" << "-x" << QString::number(m_ui.video_frame->width()) << "-y" << QString::number(m_ui.video_frame->height()) << "-"; + m_captureProcess->setStandardOutputProcess(m_displayProcess); + kDebug() << "Capture: Running ffmpeg " << m_captureArgs.join(" "); + m_captureProcess->start("ffmpeg", m_captureArgs); break; default: break; } - if (ui.device_selector->currentIndex() != SCREENGRAB) { - displayProcess->start("ffplay", m_displayArgs); - ui.video_frame->setText(i18n("Initialising...")); + if (m_ui.device_selector->currentIndex() != SCREENGRAB) { + kDebug() << "Capture: Running ffplay " << m_displayArgs.join(" "); + m_displayProcess->start("ffplay", m_displayArgs); + m_ui.video_frame->setText(i18n("Initialising...")); } else { // do something when starting screen grab } } -void RecMonitor::slotRecord() { - if (captureProcess->state() == QProcess::NotRunning && ui.device_selector->currentIndex() == FIREWIRE) { +void RecMonitor::slotRecord() +{ + if (m_captureProcess->state() == QProcess::NotRunning && m_ui.device_selector->currentIndex() == FIREWIRE) { slotStartCapture(); } if (m_isCapturing) { - switch (ui.device_selector->currentIndex()) { + switch (m_ui.device_selector->currentIndex()) { case FIREWIRE: - captureProcess->write("\e", 2); + m_captureProcess->write("\e", 2); m_playAction->setIcon(m_playIcon); m_isCapturing = false; m_isPlaying = false; m_recAction->setChecked(false); break; case VIDEO4LINUX: + m_captureProcess->terminate(); slotStopCapture(); //m_isCapturing = false; QTimer::singleShot(1000, this, SLOT(slotStartCapture())); break; case SCREENGRAB: - captureProcess->write("q\n", 3); + //captureProcess->write("q\n", 3); + m_captureProcess->terminate(); + m_ui.video_frame->setText(i18n("Encoding captured video...")); // in case ffmpeg doesn't exit with the 'q' command, kill it one second later - QTimer::singleShot(1000, captureProcess, SLOT(kill())); + //QTimer::singleShot(1000, captureProcess, SLOT(kill())); break; } return; - } else if (ui.device_selector->currentIndex() == FIREWIRE) { + } else if (m_ui.device_selector->currentIndex() == FIREWIRE) { m_isCapturing = true; m_didCapture = true; - captureProcess->write("c\n", 3); + m_captureProcess->write("c\n", 3); return; } - if (captureProcess->state() == QProcess::NotRunning) { + if (m_captureProcess->state() == QProcess::NotRunning) { m_recAction->setChecked(true); - QString extension = "mpg"; - if (ui.device_selector->currentIndex() == SCREENGRAB) extension = KdenliveSettings::screengrabextension(); + QString extension = "mp4"; + if (m_ui.device_selector->currentIndex() == SCREENGRAB) extension = "ogv"; //KdenliveSettings::screengrabextension(); QString path = KdenliveSettings::capturefolder() + "/capture0000." + extension; int i = 1; while (QFile::exists(path)) { QString num = QString::number(i).rightJustified(4, '0', false); - path = KdenliveSettings::capturefolder() + "/capture" + num + "." + extension; + path = KdenliveSettings::capturefolder() + "/capture" + num + '.' + extension; i++; } @@ -389,56 +440,79 @@ void RecMonitor::slotRecord() { m_displayArgs.clear(); QString args; - switch (ui.device_selector->currentIndex()) { + switch (m_ui.device_selector->currentIndex()) { case FIREWIRE: m_captureArgs << "--format" << "hdv" << "-i" << "capture" << "-"; - m_displayArgs << "-f" << "mpegts" << "-x" << QString::number(ui.video_frame->width()) << "-y" << QString::number(ui.video_frame->height()) << "-"; - captureProcess->setStandardOutputProcess(displayProcess); - captureProcess->start("dvgrab", m_captureArgs); + m_displayArgs << "-f" << "mpegts" << "-x" << QString::number(m_ui.video_frame->width()) << "-y" << QString::number(m_ui.video_frame->height()) << "-"; + m_captureProcess->setStandardOutputProcess(m_displayProcess); + kDebug() << "Capture: Running dvgrab " << m_captureArgs.join(" "); + m_captureProcess->start(KdenliveSettings::dvgrab_path(), m_captureArgs); break; case VIDEO4LINUX: - m_captureArgs << KdenliveSettings::video4capture().simplified().split(' ') << "-y" << m_captureFile.path() << "-f" << KdenliveSettings::video4vencoding() << "-"; - m_displayArgs << KdenliveSettings::video4playback().simplified().split(' ') << "-x" << QString::number(ui.video_frame->width()) << "-y" << QString::number(ui.video_frame->height()) << "-"; - captureProcess->setStandardOutputProcess(displayProcess); - captureProcess->start("ffmpeg", m_captureArgs); + m_captureArgs << KdenliveSettings::video4capture().simplified().split(' ') << KdenliveSettings::video4encoding().simplified().split(' ') << "-vcodec" << "mpeg4" << "-acodec" << "mp2" << "-y" << m_captureFile.path() << "-f" << "mpegts" << "-vcodec" << "mpeg4" << "-acodec" << "mp2" << "-"; + m_displayArgs << "-f" << "mpegts" << "-x" << QString::number(m_ui.video_frame->width()) << "-y" << QString::number(m_ui.video_frame->height()) << "-"; + m_captureProcess->setStandardOutputProcess(m_displayProcess); + kDebug() << "Capture: Running ffmpeg " << m_captureArgs.join(" "); + m_captureProcess->start("ffmpeg", m_captureArgs); break; case SCREENGRAB: - if (KdenliveSettings::fullscreengrab()) { - const QRect rect = QApplication::desktop()->screenGeometry(); - args = KdenliveSettings::screengrabcapture().replace("%size", QString::number(rect.width()) + "x" + QString::number(rect.height())).replace("%offset", QString()); - kDebug() << "// capture params: " << args; - if (KdenliveSettings::screengrabenableaudio()) { - // also capture audio - m_captureArgs << KdenliveSettings::screengrabaudiocapture().simplified().split(' '); + switch (KdenliveSettings::rmd_capture_type()) { + case 0: + // Full screen capture, nothing special to do + break; + default: + // Region capture + m_captureArgs << "-width" << QString::number(KdenliveSettings::rmd_width()) << "-height" << QString::number(KdenliveSettings::rmd_height()); + if (!KdenliveSettings::rmd_follow_mouse()) { + m_captureArgs << "-x" << QString::number(KdenliveSettings::rmd_offsetx()) << "-y" << QString::number(KdenliveSettings::rmd_offsety()); + } else { + m_captureArgs << "--follow-mouse"; + if (KdenliveSettings::rmd_hide_frame()) m_captureArgs << "--no-frame"; } - m_captureArgs << args.simplified().split(' ') << KdenliveSettings::screengrabencoding().simplified().split(' ') << m_captureFile.path(); - ui.video_frame->setText(i18n("Capturing...")); - m_isCapturing = true; - captureProcess->start("ffmpeg", m_captureArgs); - } else { - ui.video_frame->setText(i18n("Select region...")); - rgnGrab = new RegionGrabber(); - connect(rgnGrab, SIGNAL(regionGrabbed(const QRect&)), SLOT(slotStartGrab(const QRect &))); + break; } + m_isCapturing = true; + if (KdenliveSettings::rmd_capture_audio()) { + m_captureArgs << "-freq" << KdenliveSettings::rmd_freq(); + m_captureArgs << "-channels" << QString::number(KdenliveSettings::rmd_audio_channels()); + if (KdenliveSettings::rmd_use_jack()) { + m_captureArgs << "-use-jack" << KdenliveSettings::rmd_jackports(); + if (KdenliveSettings::rmd_jack_buffer() > 0.0) + m_captureArgs << "-ring-buffer-size" << QString::number(KdenliveSettings::rmd_jack_buffer()); + } else { + if (!KdenliveSettings::rmd_alsadevicename().isEmpty()) + m_captureArgs << "-device" << KdenliveSettings::rmd_alsadevicename(); + if (KdenliveSettings::rmd_alsa_buffer() > 0) + m_captureArgs << "-buffer-size" << QString::number(KdenliveSettings::rmd_alsa_buffer()); + } + } else m_captureArgs << "--no-sound"; + + if (KdenliveSettings::rmd_fullshots()) m_captureArgs << "--full-shots"; + m_captureArgs << "-workdir" << KdenliveSettings::currenttmpfolder(); + m_captureArgs << "-fps" << QString::number(KdenliveSettings::rmd_fps()) << "-o" << m_captureFile.path(); + m_captureProcess->start(KdenliveSettings::rmd_path(), m_captureArgs); + kDebug() << "// RecordMyDesktop params: " << m_captureArgs; break; default: break; } - //ui.video_frame->setScaledContents(false); - if (ui.device_selector->currentIndex() != SCREENGRAB) { + + if (m_ui.device_selector->currentIndex() != SCREENGRAB) { m_isCapturing = true; - displayProcess->start("ffplay", m_displayArgs); - ui.video_frame->setText(i18n("Initialising...")); + kDebug() << "Capture: Running ffplay " << m_displayArgs.join(" "); + m_displayProcess->start("ffplay", m_displayArgs); + m_ui.video_frame->setText(i18n("Initialising...")); } } else { // stop capture - displayProcess->kill(); - captureProcess->kill(); + m_displayProcess->kill(); + //captureProcess->kill(); QTimer::singleShot(1000, this, SLOT(slotRecord())); } } +/* void RecMonitor::slotStartGrab(const QRect &rect) { rgnGrab->deleteLater(); QApplication::restoreOverrideCursor(); @@ -449,23 +523,31 @@ void RecMonitor::slotStartGrab(const QRect &rect) { if (width % 2 != 0) width--; if (height % 2 != 0) height--; QString args = KdenliveSettings::screengrabcapture().replace("%size", QString::number(width) + "x" + QString::number(height)).replace("%offset", "+" + QString::number(rect.x()) + "," + QString::number(rect.y())); - kDebug() << "// capture params: " << args; if (KdenliveSettings::screengrabenableaudio()) { // also capture audio - m_captureArgs << KdenliveSettings::screengrabaudiocapture().simplified().split(' '); + if (KdenliveSettings::useosscapture()) m_captureArgs << KdenliveSettings::screengrabosscapture().simplified().split(' '); + else m_captureArgs << KdenliveSettings::screengrabalsacapture2().simplified().split(' '); } m_captureArgs << args.simplified().split(' ') << KdenliveSettings::screengrabencoding().simplified().split(' ') << m_captureFile.path(); m_isCapturing = true; - ui.video_frame->setText(i18n("Capturing...")); + m_ui.video_frame->setText(i18n("Capturing...")); + if (KdenliveSettings::screengrabenableaudio() && !KdenliveSettings::useosscapture()) { + QStringList alsaArgs = KdenliveSettings::screengrabalsacapture().simplified().split(' '); + alsaProcess->setStandardOutputProcess(captureProcess); + kDebug() << "Capture: Running arecord " << alsaArgs.join(" "); + alsaProcess->start("arecord", alsaArgs); + } + kDebug() << "Capture: Running ffmpeg " << m_captureArgs.join(" "); captureProcess->start("ffmpeg", m_captureArgs); -} +}*/ -void RecMonitor::slotProcessStatus(QProcess::ProcessState status) { +void RecMonitor::slotProcessStatus(QProcess::ProcessState status) +{ if (status == QProcess::NotRunning) { - displayProcess->kill(); - if (m_isCapturing && ui.device_selector->currentIndex() != FIREWIRE) - if (ui.autoaddbox->isChecked() && QFile::exists(m_captureFile.path())) emit addProjectClip(m_captureFile); - if (ui.device_selector->currentIndex() == FIREWIRE) { + m_displayProcess->kill(); + if (m_isCapturing && m_ui.device_selector->currentIndex() != FIREWIRE) + if (m_ui.autoaddbox->isChecked() && QFile::exists(m_captureFile.path())) emit addProjectClip(m_captureFile); + if (m_ui.device_selector->currentIndex() == FIREWIRE) { m_discAction->setIcon(KIcon("network-connect")); m_discAction->setText(i18n("Connect")); m_playAction->setEnabled(false); @@ -477,20 +559,22 @@ void RecMonitor::slotProcessStatus(QProcess::ProcessState status) { m_playAction->setIcon(m_playIcon); m_recAction->setChecked(false); m_stopAction->setEnabled(false); - ui.device_selector->setEnabled(true); - if (captureProcess && captureProcess->exitStatus() == QProcess::CrashExit) { - ui.video_frame->setText(i18n("Capture crashed, please check your parameters")); + m_ui.device_selector->setEnabled(true); + if (m_captureProcess && m_captureProcess->exitStatus() == QProcess::CrashExit) { + m_ui.video_frame->setText(i18n("Capture crashed, please check your parameters")); } else { - ui.video_frame->setText(i18n("Not connected")); + if (m_ui.device_selector->currentIndex() != SCREENGRAB) m_ui.video_frame->setText(i18n("Not connected")); + else m_ui.video_frame->setPixmap(mergeSideBySide(KIcon("video-display").pixmap(QSize(50, 50)), i18n("Press record button\nto start screen capture\nFiles will be saved in:\n%1", KdenliveSettings::capturefolder()))); } m_isCapturing = false; } else { - if (ui.device_selector->currentIndex() != SCREENGRAB) m_stopAction->setEnabled(true); - ui.device_selector->setEnabled(false); + if (m_ui.device_selector->currentIndex() != SCREENGRAB) m_stopAction->setEnabled(true); + m_ui.device_selector->setEnabled(false); } } -void RecMonitor::manageCapturedFiles() { +void RecMonitor::manageCapturedFiles() +{ QString extension; switch (KdenliveSettings::firewireformat()) { case 0: @@ -507,9 +591,9 @@ void RecMonitor::manageCapturedFiles() { QDir dir(KdenliveSettings::capturefolder()); QStringList filters; filters << "capture*" + extension; - QStringList result = dir.entryList(filters, QDir::Files, QDir::Time); + const QStringList result = dir.entryList(filters, QDir::Files, QDir::Time); KUrl::List capturedFiles; - foreach(QString name, result) { + foreach(const QString &name, result) { KUrl url = KUrl(dir.filePath(name)); if (KIO::NetAccess::exists(url, KIO::NetAccess::SourceSide, this)) { KFileItem file(KFileItem::Unknown, KFileItem::Unknown, url, true); @@ -523,7 +607,7 @@ void RecMonitor::manageCapturedFiles() { ManageCapturesDialog *d = new ManageCapturesDialog(capturedFiles, this); if (d->exec() == QDialog::Accepted) { capturedFiles = d->importFiles(); - foreach(KUrl url, capturedFiles) { + foreach(const KUrl &url, capturedFiles) { emit addProjectClip(url); } } @@ -532,32 +616,38 @@ void RecMonitor::manageCapturedFiles() { } // virtual -void RecMonitor::mousePressEvent(QMouseEvent * event) { +void RecMonitor::mousePressEvent(QMouseEvent * /*event*/) +{ slotPlay(); } -void RecMonitor::activateRecMonitor() { +void RecMonitor::activateRecMonitor() +{ //if (!m_isActive) m_monitorManager->activateRecMonitor(m_name); } -void RecMonitor::stop() { +void RecMonitor::stop() +{ m_isActive = false; } -void RecMonitor::start() { +void RecMonitor::start() +{ m_isActive = true; } -void RecMonitor::refreshRecMonitor(bool visible) { +void RecMonitor::refreshRecMonitor(bool visible) +{ if (visible) { //if (!m_isActive) m_monitorManager->activateRecMonitor(m_name); } } -void RecMonitor::slotPlay() { +void RecMonitor::slotPlay() +{ //if (!m_isActive) m_monitorManager->activateRecMonitor(m_name);