X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frecmonitor.cpp;h=d2e78941dbd737bf81e21c44971a476885f1b4c3;hb=e5d7ec0b184543b85c9671d6ef072c1cb4437bb6;hp=41ea6501b2f9f362eedc7561a31fa769ea833cdc;hpb=21b8b0afba36af9eea67dde87be0bf46fb26fcdf;p=kdenlive diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp index 41ea6501..d2e78941 100644 --- a/src/recmonitor.cpp +++ b/src/recmonitor.cpp @@ -35,11 +35,7 @@ #include #include #include - -#if KDE_IS_VERSION(4,2,0) #include -#endif - #include #include #include @@ -47,19 +43,17 @@ #include -RecMonitor::RecMonitor(QString name, MonitorManager *manager, QWidget *parent) : - AbstractMonitor(parent), - m_name(name), +RecMonitor::RecMonitor(Kdenlive::MONITORID name, MonitorManager *manager, QWidget *parent) : + AbstractMonitor(name, manager, parent), m_isCapturing(false), m_didCapture(false), m_isPlaying(false), - m_manager(manager), m_captureDevice(NULL), m_analyse(false) { setupUi(this); - video_frame->setAttribute(Qt::WA_PaintOnScreen); + //video_frame->setAttribute(Qt::WA_PaintOnScreen); device_selector->setCurrentIndex(KdenliveSettings::defaultcapture()); connect(device_selector, SIGNAL(currentIndexChanged(int)), this, SLOT(slotVideoDeviceChanged(int))); @@ -67,11 +61,9 @@ RecMonitor::RecMonitor(QString name, MonitorManager *manager, QWidget *parent) : QVBoxLayout *l = new QVBoxLayout; l->setContentsMargins(0, 0, 0, 0); l->setSpacing(0); - m_videoBox = new VideoPreviewContainer(); - m_videoBox->setContentsMargins(0, 0, 0, 0); - m_videoBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); - l->addWidget(m_videoBox); + l->addWidget(videoBox, 10); video_frame->setLayout(l); + createVideoSurface(); QToolBar *toolbar = new QToolBar(this); QHBoxLayout *layout = new QHBoxLayout; @@ -98,6 +90,23 @@ RecMonitor::RecMonitor(QString name, MonitorManager *manager, QWidget *parent) : connect(m_recAction, SIGNAL(triggered()), this, SLOT(slotRecord())); m_recAction->setCheckable(true); + rec_options->setIcon(KIcon("system-run")); + QMenu *menu = new QMenu(this); + m_addCapturedClip = new QAction(i18n("Add Captured File to Project"), this); + m_addCapturedClip->setCheckable(true); + m_addCapturedClip->setChecked(true); + menu->addAction(m_addCapturedClip); + + rec_audio->setChecked(KdenliveSettings::v4l_captureaudio()); + rec_video->setChecked(KdenliveSettings::v4l_capturevideo()); + + m_previewSettings = new QAction(i18n("Recording Preview"), this); + m_previewSettings->setCheckable(true); + + + rec_options->setMenu(menu); + menu->addAction(m_previewSettings); + toolbar->addSeparator(); QAction *configAction = toolbar->addAction(KIcon("configure"), i18n("Configure")); @@ -112,7 +121,6 @@ RecMonitor::RecMonitor(QString name, MonitorManager *manager, QWidget *parent) : m_logger.setFrame(false); //m_logger.setInsertPolicy(QComboBox::InsertAtTop); -#if KDE_IS_VERSION(4,2,0) m_freeSpace = new KCapacityBar(KCapacityBar::DrawTextInline, this); m_freeSpace->setMaximumWidth(150); QFontMetricsF fontMetrics(font()); @@ -122,7 +130,6 @@ RecMonitor::RecMonitor(QString name, MonitorManager *manager, QWidget *parent) : connect(&m_spaceTimer, SIGNAL(timeout()), this, SLOT(slotUpdateFreeSpace())); m_spaceTimer.setInterval(30000); m_spaceTimer.setSingleShot(false); -#endif control_frame_firewire->setLayout(layout); m_displayProcess = new QProcess; @@ -130,12 +137,11 @@ RecMonitor::RecMonitor(QString name, MonitorManager *manager, QWidget *parent) : connect(m_captureProcess, SIGNAL(stateChanged(QProcess::ProcessState)), this, SLOT(slotProcessStatus(QProcess::ProcessState))); connect(m_captureProcess, SIGNAL(readyReadStandardError()), this, SLOT(slotReadDvgrabInfo())); - QString videoDriver = KdenliveSettings::videodrivername(); #if QT_VERSION >= 0x040600 QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); - env.insert("SDL_WINDOWID", QString::number(video_frame->winId())); + env.insert("SDL_WINDOWID", QString::number(videoSurface->winId())); if (!videoDriver.isEmpty()) { if (videoDriver == "x11_noaccel") { env.insert("SDL_VIDEO_YUV_HWACCEL", "0"); @@ -145,7 +151,7 @@ RecMonitor::RecMonitor(QString name, MonitorManager *manager, QWidget *parent) : m_displayProcess->setProcessEnvironment(env); #else QStringList env = QProcess::systemEnvironment(); - env << "SDL_WINDOWID=" + QString::number(video_frame->winId()); + env << "SDL_WINDOWID=" + QString::number(videoSurface->winId()); if (!videoDriver.isEmpty()) { if (videoDriver == "x11_noaccel") { env << "SDL_VIDEO_YUV_HWACCEL=0"; @@ -154,28 +160,34 @@ RecMonitor::RecMonitor(QString name, MonitorManager *manager, QWidget *parent) : } m_displayProcess->setEnvironment(env); #endif + setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 1); - kDebug() << "/////// BUILDING MONITOR, ID: " << video_frame->winId(); + kDebug() << "/////// BUILDING MONITOR, ID: " << videoSurface->winId(); slotVideoDeviceChanged(device_selector->currentIndex()); - recording_preview->setToolTip(i18n("Capture preview settings")); - recording_preview->setCurrentIndex(KdenliveSettings::recording_preview()); - connect(recording_preview, SIGNAL(currentIndexChanged(int)), this, SLOT(slotChangeRecordingPreview(int))); + m_previewSettings->setChecked(KdenliveSettings::enable_recording_preview()); + connect(m_previewSettings, SIGNAL(triggered(bool)), this, SLOT(slotChangeRecordingPreview(bool))); } RecMonitor::~RecMonitor() { -#if KDE_IS_VERSION(4,2,0) m_spaceTimer.stop(); -#endif delete m_captureProcess; delete m_displayProcess; if (m_captureDevice) delete m_captureDevice; } -const QString RecMonitor::name() const +void RecMonitor::mouseDoubleClickEvent(QMouseEvent * event) +{ + if (!KdenliveSettings::openglmonitors() && videoBox && videoBox->isVisible()) { + videoBox->switchFullScreen(); + event->accept(); + } +} + +void RecMonitor::slotSwitchFullScreen() { - return m_name; + videoBox->switchFullScreen(); } void RecMonitor::stop() @@ -185,6 +197,7 @@ void RecMonitor::stop() void RecMonitor::start() { + //slotStartPreview(true); } void RecMonitor::slotConfigure() @@ -192,7 +205,7 @@ void RecMonitor::slotConfigure() emit showConfigDialog(4, device_selector->currentIndex()); } -void RecMonitor::slotUpdateCaptureFolder(const QString currentProjectFolder) +void RecMonitor::slotUpdateCaptureFolder(const QString ¤tProjectFolder) { if (KdenliveSettings::capturetoprojectfolder()) m_capturePath = currentProjectFolder; else m_capturePath = KdenliveSettings::capturefolder(); @@ -203,17 +216,17 @@ void RecMonitor::slotUpdateCaptureFolder(const QString currentProjectFolder) else KMessageBox::information(this, i18n("You need to stop capture before your changes can be applied"), i18n("Capturing")); } else slotVideoDeviceChanged(device_selector->currentIndex()); -#if KDE_IS_VERSION(4,2,0) // update free space info slotUpdateFreeSpace(); -#endif } void RecMonitor::slotVideoDeviceChanged(int ix) { QString capturefile; QString capturename; - recording_preview->setHidden(ix != VIDEO4LINUX && ix != BLACKMAGIC); + m_previewSettings->setEnabled(ix == VIDEO4LINUX || ix == BLACKMAGIC); + rec_audio->setVisible(ix == VIDEO4LINUX); + rec_video->setVisible(ix == VIDEO4LINUX); m_fwdAction->setVisible(ix == FIREWIRE); m_discAction->setVisible(ix == FIREWIRE); m_rewAction->setVisible(ix == FIREWIRE); @@ -221,15 +234,15 @@ void RecMonitor::slotVideoDeviceChanged(int ix) m_logger.setVisible(ix == BLACKMAGIC); if (m_captureDevice) { // MLT capture still running, abort + m_monitorManager->clearScopeSource(); m_captureDevice->stop(); delete m_captureDevice; m_captureDevice = NULL; - m_manager->clearScopeSource(); } // The m_videoBox container has to be shown once before the MLT consumer is build, or preview will fail - m_videoBox->setHidden(ix != VIDEO4LINUX && ix != BLACKMAGIC); - m_videoBox->setHidden(true); + videoBox->setHidden(ix != VIDEO4LINUX && ix != BLACKMAGIC); + videoBox->setHidden(true); switch (ix) { case SCREENGRAB: m_discAction->setEnabled(false); @@ -254,7 +267,7 @@ void RecMonitor::slotVideoDeviceChanged(int ix) m_stopAction->setEnabled(false); m_playAction->setEnabled(true); capturefile = m_capturePath; - if (!capturefile.endsWith("/")) capturefile.append("/"); + if (!capturefile.endsWith('/')) capturefile.append('/'); capturename = KdenliveSettings::decklink_filename(); capturename.append("xxx."); capturename.append(KdenliveSettings::decklink_extension()); @@ -276,7 +289,7 @@ void RecMonitor::slotVideoDeviceChanged(int ix) } else { // Show capture info capturefile = m_capturePath; - if (!capturefile.endsWith("/")) capturefile.append("/"); + if (!capturefile.endsWith('/')) capturefile.append('/'); capturename = KdenliveSettings::dvgrabfilename(); if (capturename.isEmpty()) capturename = "capture"; QString extension; @@ -305,7 +318,7 @@ void RecMonitor::slotSetInfoMessage(const QString &message) m_logger.insertItem(0, message); } -QPixmap RecMonitor::mergeSideBySide(const QPixmap& pix, const QString txt) +QPixmap RecMonitor::mergeSideBySide(const QPixmap& pix, const QString &txt) { QPainter p; QRect r = QApplication::fontMetrics().boundingRect(QRect(0, 0, video_frame->width(), video_frame->height()), Qt::AlignLeft, txt); @@ -339,7 +352,7 @@ void RecMonitor::slotDisconnect() { if (m_captureProcess->state() == QProcess::NotRunning) { m_captureTime = KDateTime::currentLocalDateTime(); - kDebug() << "CURRENT TIME: " << m_captureTime.toString(); + kDebug() << "CURRENT TIME: " << m_captureTime.toString(); m_didCapture = false; slotStartPreview(false); m_discAction->setIcon(KIcon("network-disconnect")); @@ -371,7 +384,9 @@ void RecMonitor::slotStopCapture() { // stop capture if (!m_isCapturing && !m_isPlaying) return; - m_videoBox->setHidden(true); + videoBox->setHidden(true); + rec_audio->setEnabled(true); + rec_video->setEnabled(true); switch (device_selector->currentIndex()) { case FIREWIRE: m_captureProcess->write("\e", 2); @@ -389,7 +404,7 @@ void RecMonitor::slotStopCapture() if (m_captureDevice) { m_captureDevice->stop(); } - recording_preview->setEnabled(true); + m_previewSettings->setEnabled(true); m_isCapturing = false; m_isPlaying = false; m_playAction->setEnabled(true); @@ -398,7 +413,7 @@ void RecMonitor::slotStopCapture() slotSetInfoMessage(i18n("Capture stopped")); m_isCapturing = false; m_recAction->setChecked(false); - if (autoaddbox->isChecked() && !m_captureFile.isEmpty() && QFile::exists(m_captureFile.path())) { + if (m_addCapturedClip->isChecked() && !m_captureFile.isEmpty() && QFile::exists(m_captureFile.path())) { emit addProjectClip(m_captureFile); m_captureFile.clear(); } @@ -412,6 +427,7 @@ void RecMonitor::slotStartPreview(bool play) { if (m_captureProcess->state() != QProcess::NotRunning) { if (device_selector->currentIndex() == FIREWIRE) { + videoBox->setHidden(false); if (m_isPlaying) { m_captureProcess->write("k", 1); //captureProcess->write("\e", 2); @@ -425,6 +441,8 @@ void RecMonitor::slotStartPreview(bool play) } return; } + slotActivateMonitor(); + if (m_isPlaying) return; m_captureArgs.clear(); m_displayArgs.clear(); m_isPlaying = false; @@ -432,9 +450,9 @@ void RecMonitor::slotStartPreview(bool play) QString path; MltVideoProfile profile; QString producer; - QStringList dvargs = KdenliveSettings::dvgrabextra().simplified().split(" ", QString::SkipEmptyParts); + QStringList dvargs = KdenliveSettings::dvgrabextra().simplified().split(' ', QString::SkipEmptyParts); int ix = device_selector->currentIndex(); - m_videoBox->setHidden(ix != VIDEO4LINUX && ix != BLACKMAGIC); + videoBox->setHidden(ix != VIDEO4LINUX && ix != BLACKMAGIC && ix != FIREWIRE); switch (ix) { case FIREWIRE: switch (KdenliveSettings::firewireformat()) { @@ -468,7 +486,7 @@ void RecMonitor::slotStartPreview(bool play) if (capturename.isEmpty()) capturename = "capture"; m_captureArgs << capturename << "-"; - m_displayArgs << "-x" << QString::number(video_frame->width()) << "-y" << QString::number(video_frame->height()) << "-"; + m_displayArgs << "-x" << QString::number(video_frame->width()) << "-y" << QString::number(video_frame->height()) << "-noframedrop" << "-"; m_captureProcess->setStandardOutputProcess(m_displayProcess); m_captureProcess->setWorkingDirectory(m_capturePath); @@ -480,33 +498,33 @@ void RecMonitor::slotStartPreview(bool play) break; case VIDEO4LINUX: path = KStandardDirs::locateLocal("appdata", "profiles/video4linux"); - m_manager->activateMonitor("record"); buildMltDevice(path); profile = ProfilesDialog::getVideoProfile(path); - producer = QString("avformat-novalidate:video4linux2:%1?width:%2&height:%3&frame_rate:%4").arg(KdenliveSettings::video4vdevice()).arg(profile.width).arg(profile.height).arg((double) profile.frame_rate_num / profile.frame_rate_den); - if (!m_captureDevice->slotStartPreview(producer)) { + producer = getV4lXmlPlaylist(profile); + + //producer = QString("avformat-novalidate:video4linux2:%1?width:%2&height:%3&frame_rate:%4").arg(KdenliveSettings::video4vdevice()).arg(profile.width).arg(profile.height).arg((double) profile.frame_rate_num / profile.frame_rate_den); + if (!m_captureDevice->slotStartPreview(producer, true)) { // v4l capture failed to start video_frame->setText(i18n("Failed to start Video4Linux,\ncheck your parameters...")); - m_videoBox->setHidden(true); - + videoBox->setHidden(true); + } else { m_playAction->setEnabled(false); m_stopAction->setEnabled(true); m_isPlaying = true; } - + break; case BLACKMAGIC: path = KdenliveSettings::current_profile(); - m_manager->activateMonitor("record"); + slotActivateMonitor(); buildMltDevice(path); - profile = ProfilesDialog::getVideoProfile(path); producer = QString("decklink:%1").arg(KdenliveSettings::decklink_capturedevice()); if (!m_captureDevice->slotStartPreview(producer)) { // v4l capture failed to start video_frame->setText(i18n("Failed to start Decklink,\ncheck your parameters...")); - m_videoBox->setHidden(true); - + videoBox->setHidden(true); + } else { m_playAction->setEnabled(false); m_stopAction->setEnabled(true); @@ -517,10 +535,13 @@ void RecMonitor::slotStartPreview(bool play) break; } + rec_audio->setEnabled(false); + rec_video->setEnabled(false); + if (device_selector->currentIndex() == FIREWIRE) { kDebug() << "Capture: Running ffplay " << m_displayArgs.join(" "); - m_displayProcess->start("ffplay", m_displayArgs); - video_frame->setText(i18n("Initialising...")); + m_displayProcess->start(KdenliveSettings::ffplaypath(), m_displayArgs); + //video_frame->setText(i18n("Initialising...")); } else { // do something when starting screen grab } @@ -528,6 +549,9 @@ void RecMonitor::slotStartPreview(bool play) void RecMonitor::slotRecord() { + rec_audio->setEnabled(false); + rec_video->setEnabled(false); + if (m_captureProcess->state() == QProcess::NotRunning && device_selector->currentIndex() == FIREWIRE) { slotStartPreview(); } @@ -539,9 +563,7 @@ void RecMonitor::slotRecord() m_isCapturing = true; m_didCapture = true; m_captureProcess->write("c\n", 3); -#if KDE_IS_VERSION(4,2,0) m_spaceTimer.start(); -#endif return; } if (m_captureProcess->state() == QProcess::NotRunning) { @@ -549,7 +571,11 @@ void RecMonitor::slotRecord() m_recAction->setChecked(true); QString extension = "mpg"; if (device_selector->currentIndex() == SCREENGRAB) extension = "ogv"; //KdenliveSettings::screengrabextension(); - else if (device_selector->currentIndex() == VIDEO4LINUX) extension = KdenliveSettings::v4l_extension(); + else if (device_selector->currentIndex() == VIDEO4LINUX) { + // TODO: when recording audio only, allow configuration? + if (!rec_video->isChecked()) extension = "wav"; + else extension = KdenliveSettings::v4l_extension(); + } else if (device_selector->currentIndex() == BLACKMAGIC) extension = KdenliveSettings::decklink_extension(); QString path = KUrl(m_capturePath).path(KUrl::AddTrailingSlash) + "capture0000." + extension; int i = 1; @@ -566,24 +592,26 @@ void RecMonitor::slotRecord() QString playlist; QString v4lparameters; MltVideoProfile profile; + bool showPreview; QString capturename = KdenliveSettings::dvgrabfilename(); if (capturename.isEmpty()) capturename = "capture"; switch (device_selector->currentIndex()) { case VIDEO4LINUX: + slotActivateMonitor(); path = KStandardDirs::locateLocal("appdata", "profiles/video4linux"); profile = ProfilesDialog::getVideoProfile(path); - m_videoBox->setRatio((double) profile.display_aspect_num / profile.display_aspect_den); + //m_videoBox->setRatio((double) profile.display_aspect_num / profile.display_aspect_den); buildMltDevice(path); - playlist = QString("producer100000pausevideo4linux2:%1?width:%2&height:%3&frame_rate:%4avformat-novalidate").arg(KdenliveSettings::video4vdevice()).arg(profile.width).arg(profile.height).arg((double) profile.frame_rate_num / profile.frame_rate_den); + playlist = getV4lXmlPlaylist(profile); v4lparameters = KdenliveSettings::v4l_parameters(); + // TODO: when recording audio only, allow param configuration? + if (!rec_video->isChecked()) v4lparameters.clear(); + // Add alsa audio capture - if (KdenliveSettings::v4l_captureaudio()) { - playlist.append(QString("producer100000pausealsa:%50-1avformat").arg(KdenliveSettings::v4l_alsadevicename())); - } - else { + if (!rec_audio->isChecked()) { // if we do not want audio, make sure that we don't have audio encoding parameters // this is required otherwise the MLT avformat consumer will not close properly if (v4lparameters.contains("acodec")) { @@ -610,58 +638,49 @@ void RecMonitor::slotRecord() v4lparameters = QString(v4lparameters.section("acodec", 0, 0) + "an=1 " + endParam).simplified(); } } - - - playlist.append(""); - playlist.append(""); + showPreview = m_previewSettings->isChecked(); + if (!rec_video->isChecked()) showPreview = false; - // Audio mix - if (KdenliveSettings::v4l_captureaudio()) { - playlist.append(""); - playlist.append("01transitionmix"); - } - - playlist.append(""); - - if (m_captureDevice->slotStartCapture(v4lparameters, m_captureFile.path(), playlist, recording_preview->currentIndex())) { - m_videoBox->setHidden(false); + if (m_captureDevice->slotStartCapture(v4lparameters, m_captureFile.path(), playlist, showPreview)) { + videoBox->setHidden(false); m_isCapturing = true; m_recAction->setEnabled(false); m_stopAction->setEnabled(true); - recording_preview->setEnabled(false); + m_previewSettings->setEnabled(false); } else { - video_frame->setText(i18n("Failed to start Video4Linux,\ncheck your parameters...")); - m_videoBox->setHidden(true); + video_frame->setText(i18n("Failed to start Video4Linux,\ncheck your parameters...")); + videoBox->setHidden(true); m_isCapturing = false; } break; - + case BLACKMAGIC: + slotActivateMonitor(); path = KdenliveSettings::current_profile(); profile = ProfilesDialog::getVideoProfile(path); - m_videoBox->setRatio((double) profile.display_aspect_num / profile.display_aspect_den); + //m_videoBox->setRatio((double) profile.display_aspect_num / profile.display_aspect_den); buildMltDevice(path); - + playlist = QString("producer100000pause%1decklink").arg(KdenliveSettings::decklink_capturedevice()); - if (m_captureDevice->slotStartCapture(KdenliveSettings::decklink_parameters(), m_captureFile.path(), QString("decklink:%1").arg(KdenliveSettings::decklink_capturedevice()), recording_preview->currentIndex(), false)) { - m_videoBox->setHidden(false); + if (m_captureDevice->slotStartCapture(KdenliveSettings::decklink_parameters(), m_captureFile.path(), QString("decklink:%1").arg(KdenliveSettings::decklink_capturedevice()), m_previewSettings->isChecked(), false)) { + videoBox->setHidden(false); m_isCapturing = true; slotSetInfoMessage(i18n("Capturing to %1", m_captureFile.fileName())); m_recAction->setEnabled(false); m_stopAction->setEnabled(true); - recording_preview->setEnabled(false); + m_previewSettings->setEnabled(false); } else { video_frame->setText(i18n("Failed to start Decklink,\ncheck your parameters...")); slotSetInfoMessage(i18n("Failed to start capture")); - m_videoBox->setHidden(true); + videoBox->setHidden(true); m_isCapturing = false; } break; - + case SCREENGRAB: switch (KdenliveSettings::rmd_capture_type()) { case 0: @@ -685,7 +704,7 @@ void RecMonitor::slotRecord() m_captureArgs << "--channels" << QString::number(KdenliveSettings::rmd_audio_channels()); if (KdenliveSettings::rmd_use_jack()) { m_captureArgs << "--use-jack"; - QStringList ports = KdenliveSettings::rmd_jackports().split(" ", QString::SkipEmptyParts); + QStringList ports = KdenliveSettings::rmd_jackports().split(' ', QString::SkipEmptyParts); for (int i = 0; i < ports.count(); ++i) { m_captureArgs << ports.at(i); } @@ -715,7 +734,7 @@ void RecMonitor::slotRecord() if (device_selector->currentIndex() == FIREWIRE) { m_isCapturing = true; kDebug() << "Capture: Running ffplay " << m_displayArgs.join(" "); - m_displayProcess->start("ffplay", m_displayArgs); + m_displayProcess->start(KdenliveSettings::ffplaypath(), m_displayArgs); video_frame->setText(i18n("Initialising...")); } } else { @@ -726,6 +745,25 @@ void RecMonitor::slotRecord() } } +const QString RecMonitor::getV4lXmlPlaylist(MltVideoProfile profile) { + + QString playlist = QString("").arg(profile.width).arg(profile.height).arg(profile.progressive).arg(profile.sample_aspect_num).arg(profile.sample_aspect_den).arg(profile.display_aspect_num).arg(profile.display_aspect_den).arg(profile.frame_rate_num).arg(profile.frame_rate_den).arg(profile.colorspace); + + if (rec_video->isChecked()) { + playlist.append(QString("producer1000000loopvideo4linux2:%1?width:%2&height:%3&frame_rate:%4avformat-novalidate").arg(KdenliveSettings::video4vdevice()).arg(profile.width).arg(profile.height).arg((double) profile.frame_rate_num / profile.frame_rate_den)); + } + + if (rec_audio->isChecked()) { + playlist.append(QString("producer1000000loopalsa:%50-1avformat-novalidate").arg(KdenliveSettings::v4l_alsadevicename())); + } + playlist.append(""); + if (rec_video->isChecked()) playlist.append(""); + if (rec_audio->isChecked()) playlist.append(""); + playlist.append(""); + + return playlist; +} + /* void RecMonitor::slotStartGrab(const QRect &rect) { rgnGrab->deleteLater(); @@ -752,7 +790,7 @@ void RecMonitor::slotStartGrab(const QRect &rect) { alsaProcess->start("arecord", alsaArgs); } kDebug() << "Capture: Running ffmpeg " << m_captureArgs.join(" "); - captureProcess->start("ffmpeg", m_captureArgs); + captureProcess->start(KdenliveSettings::ffmpegpath(), m_captureArgs); }*/ void RecMonitor::slotProcessStatus(QProcess::ProcessState status) @@ -760,7 +798,7 @@ void RecMonitor::slotProcessStatus(QProcess::ProcessState status) if (status == QProcess::NotRunning) { m_displayProcess->kill(); if (m_isCapturing && device_selector->currentIndex() != FIREWIRE) - if (autoaddbox->isChecked() && !m_captureFile.isEmpty() && QFile::exists(m_captureFile.path())) { + if (m_addCapturedClip->isChecked() && !m_captureFile.isEmpty() && QFile::exists(m_captureFile.path())) { emit addProjectClip(m_captureFile); m_captureFile.clear(); } @@ -792,12 +830,9 @@ void RecMonitor::slotProcessStatus(QProcess::ProcessState status) } m_isCapturing = false; -#if KDE_IS_VERSION(4,2,0) m_spaceTimer.stop(); // update free space info slotUpdateFreeSpace(); -#endif - } else { if (device_selector->currentIndex() != SCREENGRAB) m_stopAction->setEnabled(true); device_selector->setEnabled(false); @@ -823,64 +858,69 @@ void RecMonitor::manageCapturedFiles() QStringList filters; QString capturename = KdenliveSettings::dvgrabfilename(); if (capturename.isEmpty()) capturename = "capture"; - filters << capturename + "*" + extension; + filters << capturename + '*' + extension; const QStringList result = dir.entryList(filters, QDir::Files, QDir::Time); KUrl::List capturedFiles; 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); - if (file.time(KFileItem::ModificationTime) > m_captureTime) capturedFiles.append(url); + if (file.time(KFileItem::ModificationTime) > m_captureTime) { + // The file was captured in the last batch + if (url.fileName().contains(':')) { + // Several dvgrab options (--timecode,...) use : in the file name, which is + // not supported by MLT, so rename them + QString newUrl = url.directory(KUrl::AppendTrailingSlash) + url.fileName().replace(':', '_'); + if (QFile::rename(url.path(), newUrl)) { + url = KUrl(newUrl); + } + + } + capturedFiles.append(url); + } } } kDebug() << "Found : " << capturedFiles.count() << " new capture files"; kDebug() << capturedFiles; if (capturedFiles.count() > 0) { - ManageCapturesDialog *d = new ManageCapturesDialog(capturedFiles, this); + QPointer d = new ManageCapturesDialog(capturedFiles, this); if (d->exec() == QDialog::Accepted) { - capturedFiles = d->importFiles(); - foreach(const KUrl & url, capturedFiles) { - emit addProjectClip(url); - } + emit addProjectClipList(d->importFiles()); } delete d; } } // virtual -void RecMonitor::mousePressEvent(QMouseEvent * /*event*/) +void RecMonitor::mousePressEvent(QMouseEvent *event) { -#if KDE_IS_VERSION(4,2,0) if (m_freeSpace->underMouse()) slotUpdateFreeSpace(); -#endif + else QWidget::mousePressEvent(event);//m_videoBox->mousePressEvent(event); } void RecMonitor::slotUpdateFreeSpace() { -#if KDE_IS_VERSION(4,2,0) KDiskFreeSpaceInfo info = KDiskFreeSpaceInfo::freeSpaceInfo(m_capturePath); - if (info.isValid()) { + if (info.isValid() && info.size() > 0) { m_freeSpace->setValue(100 * info.used() / info.size()); m_freeSpace->setText(i18n("Free space: %1", KIO::convertSize(info.available()))); m_freeSpace->update(); } -#endif } void RecMonitor::refreshRecMonitor(bool visible) { if (visible) { - //if (!m_isActive) m_monitorManager->activateRecMonitor(m_name); + //if (!m_isActive) activateMonitor(); } } void RecMonitor::slotPlay() { - - //if (!m_isActive) m_monitorManager->activateRecMonitor(m_name); - + /*if (m_isPlaying) slotStopCapture(); + else slotStartPreview(true);*/ } void RecMonitor::slotReadDvgrabInfo() @@ -911,17 +951,24 @@ void RecMonitor::slotDroppedFrames(int dropped) void RecMonitor::buildMltDevice(const QString &path) { if (m_captureDevice == NULL) { - m_captureDevice = new MltDeviceCapture(path, m_videoBox, this); + m_monitorManager->updateScopeSource(); + m_captureDevice = new MltDeviceCapture(path, videoSurface, this); connect(m_captureDevice, SIGNAL(droppedFrames(int)), this, SLOT(slotDroppedFrames(int))); m_captureDevice->sendFrameForAnalysis = m_analyse; - m_manager->updateScopeSource(); + m_monitorManager->updateScopeSource(); } } -void RecMonitor::slotChangeRecordingPreview(int ix) +void RecMonitor::slotChangeRecordingPreview(bool enable) { - KdenliveSettings::setRecording_preview(ix); + KdenliveSettings::setEnable_recording_preview(enable); } + +void RecMonitor::slotMouseSeek(int /*eventDelta*/, bool /*fast*/) +{ +} + + #include "recmonitor.moc"