X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frecmonitor.cpp;h=d8d2bd2d5eaf0a021ec8cef0ab98572d5d598d92;hb=5d4746e4c3e8665de83e6d281dcd08a46cd22c31;hp=3530422514ab60bd096fd3d20b2f1ebd61cad682;hpb=dc7a5edefeb3962f28b487dc236be8ecaab19137;p=kdenlive diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp index 35304225..d8d2bd2d 100644 --- a/src/recmonitor.cpp +++ b/src/recmonitor.cpp @@ -28,7 +28,7 @@ #include "profilesdialog.h" #include -#include +#include #include #include #include @@ -36,11 +36,13 @@ #include #include #include + #include #include #include #include #include +#include RecMonitor::RecMonitor(Kdenlive::MONITORID name, MonitorManager *manager, QWidget *parent) : @@ -56,7 +58,6 @@ RecMonitor::RecMonitor(Kdenlive::MONITORID name, MonitorManager *manager, QWidge //video_frame->setAttribute(Qt::WA_PaintOnScreen); device_selector->setCurrentIndex(KdenliveSettings::defaultcapture()); connect(device_selector, SIGNAL(currentIndexChanged(int)), this, SLOT(slotVideoDeviceChanged(int))); - // Video widget holder QVBoxLayout *l = new QVBoxLayout; l->setContentsMargins(0, 0, 0, 0); @@ -66,8 +67,8 @@ RecMonitor::RecMonitor(Kdenlive::MONITORID name, MonitorManager *manager, QWidge createVideoSurface(); QToolBar *toolbar = new QToolBar(this); - QHBoxLayout *layout = new QHBoxLayout; - layout->setContentsMargins(0, 0, 0, 0); + QHBoxLayout *hlayout = new QHBoxLayout; + hlayout->setContentsMargins(0, 0, 0, 0); m_playIcon = KIcon("media-playback-start"); m_pauseIcon = KIcon("media-playback-pause"); @@ -103,7 +104,6 @@ RecMonitor::RecMonitor(Kdenlive::MONITORID name, MonitorManager *manager, QWidge m_previewSettings = new QAction(i18n("Recording Preview"), this); m_previewSettings->setCheckable(true); - rec_options->setMenu(menu); menu->addAction(m_previewSettings); @@ -113,30 +113,30 @@ RecMonitor::RecMonitor(Kdenlive::MONITORID name, MonitorManager *manager, QWidge connect(configAction, SIGNAL(triggered()), this, SLOT(slotConfigure())); configAction->setCheckable(false); - layout->addWidget(toolbar); - layout->addWidget(&m_logger); - layout->addWidget(&m_dvinfo); + hlayout->addWidget(toolbar); + hlayout->addWidget(&m_logger); + hlayout->addWidget(&m_dvinfo); m_logger.setMaxCount(10); m_logger.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); m_logger.setFrame(false); //m_logger.setInsertPolicy(QComboBox::InsertAtTop); - + m_freeSpace = new KCapacityBar(KCapacityBar::DrawTextInline, this); m_freeSpace->setMaximumWidth(150); QFontMetricsF fontMetrics(font()); m_freeSpace->setMaximumHeight(fontMetrics.height() * 1.2); slotUpdateFreeSpace(); - layout->addWidget(m_freeSpace); + hlayout->addWidget(m_freeSpace); connect(&m_spaceTimer, SIGNAL(timeout()), this, SLOT(slotUpdateFreeSpace())); m_spaceTimer.setInterval(30000); m_spaceTimer.setSingleShot(false); - control_frame_firewire->setLayout(layout); + control_frame_firewire->setLayout(hlayout); m_displayProcess = new QProcess; m_captureProcess = new QProcess; connect(m_captureProcess, SIGNAL(stateChanged(QProcess::ProcessState)), this, SLOT(slotProcessStatus(QProcess::ProcessState))); - connect(m_captureProcess, SIGNAL(readyReadStandardError()), this, SLOT(slotReadDvgrabInfo())); + connect(m_captureProcess, SIGNAL(readyReadStandardError()), this, SLOT(slotReadProcessInfo())); QString videoDriver = KdenliveSettings::videodrivername(); #if QT_VERSION >= 0x040600 @@ -164,6 +164,13 @@ RecMonitor::RecMonitor(Kdenlive::MONITORID name, MonitorManager *manager, QWidge setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 1); kDebug() << "/////// BUILDING MONITOR, ID: " << videoSurface->winId(); +#if KDE_IS_VERSION(4,7,0) + m_infoMessage = new KMessageWidget; + QVBoxLayout *s = static_cast (layout()); + s->insertWidget(1, m_infoMessage); + m_infoMessage->hide(); +#endif + slotVideoDeviceChanged(device_selector->currentIndex()); m_previewSettings->setChecked(KdenliveSettings::enable_recording_preview()); connect(m_previewSettings, SIGNAL(triggered(bool)), this, SLOT(slotChangeRecordingPreview(bool))); @@ -174,7 +181,7 @@ RecMonitor::~RecMonitor() m_spaceTimer.stop(); delete m_captureProcess; delete m_displayProcess; - if (m_captureDevice) delete m_captureDevice; + delete m_captureDevice; } void RecMonitor::mouseDoubleClickEvent(QMouseEvent * event) @@ -192,6 +199,8 @@ void RecMonitor::slotSwitchFullScreen() void RecMonitor::stop() { + // Special case: when recording audio only, do not stop so that we can do voiceover. + if (device_selector->currentIndex() == SCREENGRAB || (device_selector->currentIndex() == VIDEO4LINUX && !rec_video->isChecked())) return; slotStopCapture(); } @@ -224,8 +233,18 @@ void RecMonitor::slotVideoDeviceChanged(int ix) { QString capturefile; QString capturename; +#if KDE_IS_VERSION(4,7,0) + if (m_infoMessage->isVisible()) { +#if KDE_IS_VERSION(4,10,0) + m_infoMessage->animatedHide(); +#else + QTimer::singleShot(0, m_infoMessage, SLOT(animatedHide())); +#endif + } +#endif m_previewSettings->setEnabled(ix == VIDEO4LINUX || ix == BLACKMAGIC); control_frame->setVisible(ix == VIDEO4LINUX); + m_playAction->setVisible(ix != SCREENGRAB); m_fwdAction->setVisible(ix == FIREWIRE); m_discAction->setVisible(ix == FIREWIRE); m_rewAction->setVisible(ix == FIREWIRE); @@ -249,12 +268,23 @@ void RecMonitor::slotVideoDeviceChanged(int ix) m_fwdAction->setEnabled(false); m_stopAction->setEnabled(false); m_playAction->setEnabled(false); - if (KdenliveSettings::rmd_path().isEmpty()) { - QString rmdpath = KStandardDirs::findExe("recordmydesktop"); - if (rmdpath.isEmpty()) 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()) 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", m_capturePath))); + if (KdenliveSettings::ffmpegpath().isEmpty()) { + QString exepath = KStandardDirs::findExe("ffmpeg"); + if (exepath.isEmpty()) { + // Check for libav version + exepath = KStandardDirs::findExe("avconv"); + } + if (exepath.isEmpty()) showWarningMessage(i18n("ffmpeg or avconv not found,\n please install it for screen grabs")); + else KdenliveSettings::setFfmpegpath(exepath); + } + if (!KdenliveSettings::ffmpegpath().isEmpty()) { + if (!Render::checkX11Grab()) { + // FFmpeg does not support screen grab + showWarningMessage(i18n("Your FFmpeg / Libav installation\n does not support screen grab")); + m_recAction->setEnabled(false); + } + else 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", m_capturePath))); + } //video_frame->setText(i18n("Press record button\nto start screen capture")); break; case VIDEO4LINUX: @@ -283,7 +313,9 @@ void RecMonitor::slotVideoDeviceChanged(int ix) // Check that dvgab is available if (KdenliveSettings::dvgrab_path().isEmpty()) { QString dvgrabpath = KStandardDirs::findExe("dvgrab"); - if (dvgrabpath.isEmpty()) video_frame->setPixmap(mergeSideBySide(KIcon("dialog-warning").pixmap(QSize(50, 50)), i18n("dvgrab utility not found,\n please install it for firewire capture"))); + if (dvgrabpath.isEmpty()) { + showWarningMessage(i18n("dvgrab utility not found,\n please install it for firewire capture")); + } else KdenliveSettings::setDvgrab_path(dvgrabpath); } else { // Show capture info @@ -386,6 +418,7 @@ void RecMonitor::slotStopCapture() if (!m_isCapturing && !m_isPlaying) return; videoBox->setHidden(true); control_frame->setEnabled(true); + slotActivateMonitor(); switch (device_selector->currentIndex()) { case FIREWIRE: m_captureProcess->write("\e", 2); @@ -393,10 +426,8 @@ void RecMonitor::slotStopCapture() m_isPlaying = false; break; case SCREENGRAB: - m_captureProcess->write("q\n", 3); - m_captureProcess->terminate(); - video_frame->setText(i18n("Encoding captured video...")); - QTimer::singleShot(1000, m_captureProcess, SLOT(kill())); + m_captureProcess->terminate(); + QTimer::singleShot(1500, m_captureProcess, SLOT(kill())); break; case VIDEO4LINUX: case BLACKMAGIC: @@ -548,8 +579,7 @@ void RecMonitor::slotStartPreview(bool play) void RecMonitor::slotRecord() { - control_frame->setEnabled(false); - + m_error.clear(); if (m_captureProcess->state() == QProcess::NotRunning && device_selector->currentIndex() == FIREWIRE) { slotStartPreview(); } @@ -568,7 +598,9 @@ void RecMonitor::slotRecord() m_logger.clear(); m_recAction->setChecked(true); QString extension = "mpg"; - if (device_selector->currentIndex() == SCREENGRAB) extension = "ogv"; //KdenliveSettings::screengrabextension(); + if (device_selector->currentIndex() == SCREENGRAB) { + extension = KdenliveSettings::grab_extension(); + } else if (device_selector->currentIndex() == VIDEO4LINUX) { // TODO: when recording audio only, allow configuration? if (!rec_video->isChecked()) extension = "wav"; @@ -580,7 +612,7 @@ void RecMonitor::slotRecord() while (QFile::exists(path)) { QString num = QString::number(i).rightJustified(4, '0', false); path = KUrl(m_capturePath).path(KUrl::AddTrailingSlash) + "capture" + num + '.' + extension; - i++; + ++i; } m_captureFile = KUrl(path); @@ -589,15 +621,18 @@ void RecMonitor::slotRecord() QString args; QString playlist; QString v4lparameters; + QStringList grabParameters; MltVideoProfile profile; bool showPreview; bool isXml; + QString captureSize; + QRect screenSize = QApplication::desktop()->screenGeometry(); QString capturename = KdenliveSettings::dvgrabfilename(); if (capturename.isEmpty()) capturename = "capture"; switch (device_selector->currentIndex()) { case VIDEO4LINUX: - slotActivateMonitor(); + if (rec_video->isChecked()) slotActivateMonitor(); path = KStandardDirs::locateLocal("appdata", "profiles/video4linux"); profile = ProfilesDialog::getVideoProfile(path); //m_videoBox->setRatio((double) profile.display_aspect_num / profile.display_aspect_den); @@ -647,6 +682,7 @@ void RecMonitor::slotRecord() m_recAction->setEnabled(false); m_stopAction->setEnabled(true); m_previewSettings->setEnabled(false); + control_frame->setEnabled(false); } else { video_frame->setText(i18n("Failed to start Video4Linux,\ncheck your parameters...")); @@ -684,24 +720,29 @@ void RecMonitor::slotRecord() break; case SCREENGRAB: - switch (KdenliveSettings::rmd_capture_type()) { - case 0: - // Full screen capture, nothing special to do - break; - default: + m_captureArgs << "-f" << "x11grab"; + if (KdenliveSettings::grab_follow_mouse()) m_captureArgs << "-follow_mouse" << "centered"; + if (!KdenliveSettings::grab_hide_frame()) m_captureArgs << "-show_region" << "1"; + if (KdenliveSettings::grab_capture_type() == 0) { + // Full screen capture + captureSize = ":0.0"; + m_captureArgs << "-s" << QString::number(screenSize.width()) + "x" + QString::number(screenSize.height()); + } else { // 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"; - } - break; + m_captureArgs << "-s" << QString::number(KdenliveSettings::grab_width()) + "x" + QString::number(KdenliveSettings::grab_height()); + captureSize = ":" + QString::number(KdenliveSettings::grab_offsetx()) + "." + QString::number(KdenliveSettings::grab_offsetx()); } - if (KdenliveSettings::rmd_hide_mouse()) m_captureArgs << "--no-cursor"; + // fps + m_captureArgs << "-r" << QString::number(KdenliveSettings::grab_fps()); + if (KdenliveSettings::grab_hide_mouse()) captureSize.append("+nomouse"); + m_captureArgs << "-i" << captureSize; + grabParameters = KdenliveSettings::grab_parameters().simplified().split(" "); + m_captureArgs << grabParameters; + m_captureArgs << path; + m_isCapturing = true; - if (KdenliveSettings::rmd_capture_audio()) { + m_recAction->setEnabled(false); + /*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()) { @@ -718,15 +759,14 @@ void RecMonitor::slotRecord() 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 << "--v_bitrate" << QString::number(KdenliveSettings::rmd_bitrate()); - m_captureArgs << "--v_quality" << QString::number(KdenliveSettings::rmd_quality()); - 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; + } else m_captureArgs << "--no-sound";*/ + + m_captureProcess->start(KdenliveSettings::ffmpegpath(), m_captureArgs); + if (!m_captureProcess->waitForStarted()) { + // Problem launching capture app + showWarningMessage(i18n("Failed to start the capture application:\n%1", KdenliveSettings::ffmpegpath())); + } + //kDebug() << "// Screen grab params: " << m_captureArgs; break; default: break; @@ -747,7 +787,36 @@ void RecMonitor::slotRecord() } } -const QString RecMonitor::getV4lXmlPlaylist(MltVideoProfile profile, bool *isXml) + +void RecMonitor::showWarningMessage(const QString &text, bool logAction) +{ +#if KDE_IS_VERSION(4,7,0) + m_infoMessage->setText(text); + m_infoMessage->setMessageType(KMessageWidget::Warning); + if (logAction) { + QAction *manualAction = new QAction(i18n("Show log"), this); + connect(manualAction, SIGNAL(triggered()), this, SLOT(slotShowLog())); + m_infoMessage->addAction(manualAction); + } +#if KDE_IS_VERSION(4,10,0) + if (isVisible()) + m_infoMessage->animatedShow(); +#else + QTimer::singleShot(0, m_infoMessage, SLOT(animatedShow())); +#endif +#else + if (!logAction) { + video_frame->setPixmap(mergeSideBySide(KIcon("dialog-warning").pixmap(QSize(50, 50)), text)); + + } + else { + video_frame->setText(QString("" + text + "
" + i18n("Show log") + "")); + connect(video_frame, SIGNAL(linkActivated(QString)), this, SLOT(slotShowLog())); + } +#endif +} + +const QString RecMonitor::getV4lXmlPlaylist(const MltVideoProfile &profile, bool *isXml) { QString playlist; if (rec_video->isChecked() && rec_audio->isChecked()) { @@ -824,19 +893,23 @@ void RecMonitor::slotProcessStatus(QProcess::ProcessState status) m_fwdAction->setEnabled(false); m_recAction->setEnabled(false); } + else { + m_recAction->setEnabled(true); + } m_isPlaying = false; m_playAction->setIcon(m_playIcon); m_recAction->setChecked(false); m_stopAction->setEnabled(false); device_selector->setEnabled(true); if (m_captureProcess && m_captureProcess->exitStatus() == QProcess::CrashExit) { - video_frame->setText(i18n("Capture crashed, please check your parameters")); + showWarningMessage(i18n("Capture crashed, please check your parameters"), true); } else { if (device_selector->currentIndex() != SCREENGRAB) { video_frame->setText(i18n("Not connected")); } else { - if (m_captureProcess->exitCode() != 0) { - video_frame->setText(i18n("Capture crashed, please check your parameters\nRecordMyDesktop exit code: %1", QString::number(m_captureProcess->exitCode()))); + int code = m_captureProcess->exitCode(); + if (code != 0 && code != 255) { + showWarningMessage(i18n("Capture crashed, please check your parameters"), true); } else { 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", m_capturePath))); } @@ -848,7 +921,7 @@ void RecMonitor::slotProcessStatus(QProcess::ProcessState status) // update free space info slotUpdateFreeSpace(); } else { - if (device_selector->currentIndex() != SCREENGRAB) m_stopAction->setEnabled(true); + if (device_selector->currentIndex()) m_stopAction->setEnabled(true); device_selector->setEnabled(false); } } @@ -897,7 +970,7 @@ void RecMonitor::manageCapturedFiles() kDebug() << "Found : " << capturedFiles.count() << " new capture files"; kDebug() << capturedFiles; - if (capturedFiles.count() > 0) { + if (!capturedFiles.isEmpty()) { QPointer d = new ManageCapturesDialog(capturedFiles, this); if (d->exec() == QDialog::Accepted) { emit addProjectClipList(d->importFiles()); @@ -937,12 +1010,22 @@ void RecMonitor::slotPlay() else slotStartPreview(true);*/ } -void RecMonitor::slotReadDvgrabInfo() +void RecMonitor::slotReadProcessInfo() { QString data = m_captureProcess->readAllStandardError().simplified(); - data = data.section('"', 2, 2).simplified(); - m_dvinfo.setText(data.left(11)); - m_dvinfo.updateGeometry(); + if (device_selector->currentIndex() == SCREENGRAB) { + m_error.append(data + "\n"); + } + else if (device_selector->currentIndex() == FIREWIRE) { + data = data.section('"', 2, 2).simplified(); + m_dvinfo.setText(data.left(11)); + m_dvinfo.updateGeometry(); + } +} + +void RecMonitor::slotShowLog() +{ + KMessageBox::information(this, m_error); } AbstractRender *RecMonitor::abstractRender()