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"));
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();
kDebug() << "/////// BUILDING MONITOR, ID: " << video_frame->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()
{
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);
// stop capture
if (!m_isCapturing && !m_isPlaying) return;
m_videoBox->setHidden(true);
+ rec_audio->setEnabled(true);
+ rec_video->setEnabled(true);
switch (device_selector->currentIndex()) {
case FIREWIRE:
m_captureProcess->write("\e", 2);
if (m_captureDevice) {
m_captureDevice->stop();
}
- recording_preview->setEnabled(true);
+ m_previewSettings->setEnabled(true);
m_isCapturing = false;
m_isPlaying = false;
m_playAction->setEnabled(true);
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();
}
break;
case VIDEO4LINUX:
path = KStandardDirs::locateLocal("appdata", "profiles/video4linux");
- m_manager->activateMonitor("record");
+ m_manager->activateMonitor(Kdenlive::recordMonitor);
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);
-
+
} else {
m_playAction->setEnabled(false);
m_stopAction->setEnabled(true);
m_isPlaying = true;
}
-
+
break;
case BLACKMAGIC:
path = KdenliveSettings::current_profile();
- m_manager->activateMonitor("record");
+ m_manager->activateMonitor(Kdenlive::recordMonitor);
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);
-
+
} else {
m_playAction->setEnabled(false);
m_stopAction->setEnabled(true);
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);
void RecMonitor::slotRecord()
{
+ rec_audio->setEnabled(false);
+ rec_video->setEnabled(false);
+
if (m_captureProcess->state() == QProcess::NotRunning && device_selector->currentIndex() == FIREWIRE) {
slotStartPreview();
}
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;
QString playlist;
QString v4lparameters;
MltVideoProfile profile;
+ bool showPreview;
QString capturename = KdenliveSettings::dvgrabfilename();
if (capturename.isEmpty()) capturename = "capture";
switch (device_selector->currentIndex()) {
case VIDEO4LINUX:
+ m_manager->activateMonitor(Kdenlive::recordMonitor);
path = KStandardDirs::locateLocal("appdata", "profiles/video4linux");
profile = ProfilesDialog::getVideoProfile(path);
m_videoBox->setRatio((double) profile.display_aspect_num / profile.display_aspect_den);
buildMltDevice(path);
- playlist = QString("<mlt title=\"capture\"><producer id=\"producer0\" in=\"0\" out=\"99999\"><property name=\"mlt_type\">producer</property><property name=\"length\">100000</property><property name=\"eof\">pause</property><property name=\"resource\">video4linux2:%1?width:%2&height:%3&frame_rate:%4</property><property name=\"mlt_service\">avformat-novalidate</property></producer><playlist id=\"playlist0\"><entry producer=\"producer0\" in=\"0\" out=\"99999\"/></playlist>").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("<producer id=\"producer1\" in=\"0\" out=\"99999\"><property name=\"mlt_type\">producer</property><property name=\"length\">100000</property><property name=\"eof\">pause</property><property name=\"resource\">alsa:%5</property><property name=\"audio_index\">0</property><property name=\"video_index\">-1</property><property name=\"mlt_service\">avformat</property></producer><playlist id=\"playlist1\"><entry producer=\"producer1\" in=\"0\" out=\"99999\"/></playlist>").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")) {
v4lparameters = QString(v4lparameters.section("acodec", 0, 0) + "an=1 " + endParam).simplified();
}
}
-
-
- playlist.append("<tractor id=\"tractor0\" title=\"video0\" global_feed=\"1\" in=\"0\" out=\"99999\">");
-
- playlist.append("<track producer=\"playlist0\"/>");
-
- // Audio mix
- if (KdenliveSettings::v4l_captureaudio()) {
- playlist.append("<track producer=\"playlist1\"/>");
- playlist.append("<transition id=\"transition0\" in=\"0\" out=\"0\"><property name=\"a_track\">0</property><property name=\"b_track\">1</property><property name=\"mlt_type\">transition</property><property name=\"mlt_service\">mix</property></transition>");
- }
- playlist.append("</tractor></mlt>");
+ showPreview = m_previewSettings->isChecked();
+ if (!rec_video->isChecked()) showPreview = false;
- if (m_captureDevice->slotStartCapture(v4lparameters, m_captureFile.path(), playlist, recording_preview->currentIndex())) {
+ if (m_captureDevice->slotStartCapture(v4lparameters, m_captureFile.path(), playlist, showPreview)) {
m_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..."));
+ video_frame->setText(i18n("Failed to start Video4Linux,\ncheck your parameters..."));
m_videoBox->setHidden(true);
m_isCapturing = false;
}
break;
-
+
case BLACKMAGIC:
+ m_manager->activateMonitor(Kdenlive::recordMonitor);
path = KdenliveSettings::current_profile();
profile = ProfilesDialog::getVideoProfile(path);
m_videoBox->setRatio((double) profile.display_aspect_num / profile.display_aspect_den);
buildMltDevice(path);
-
+
playlist = QString("<producer id=\"producer0\" in=\"0\" out=\"99999\"><property name=\"mlt_type\">producer</property><property name=\"length\">100000</property><property name=\"eof\">pause</property><property name=\"resource\">%1</property><property name=\"mlt_service\">decklink</property></producer>").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)) {
+ if (m_captureDevice->slotStartCapture(KdenliveSettings::decklink_parameters(), m_captureFile.path(), QString("decklink:%1").arg(KdenliveSettings::decklink_capturedevice()), m_previewSettings->isChecked(), false)) {
m_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..."));
m_isCapturing = false;
}
break;
-
+
case SCREENGRAB:
switch (KdenliveSettings::rmd_capture_type()) {
case 0:
}
}
+const QString RecMonitor::getV4lXmlPlaylist(MltVideoProfile profile) {
+
+ QString playlist = QString("<mlt title=\"capture\" LC_NUMERIC=\"C\"><profile description=\"v4l\" width=\"%1\" height=\"%2\" progressive=\"%3\" sample_aspect_num=\"%4\" sample_aspect_den=\"%5\" display_aspect_num=\"%6\" display_aspect_den=\"%7\" frame_rate_num=\"%8\" frame_rate_den=\"%9\" colorspace=\"%10\"/>").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("<producer id=\"producer0\" in=\"0\" out=\"999999\"><property name=\"mlt_type\">producer</property><property name=\"length\">1000000</property><property name=\"eof\">loop</property><property name=\"resource\">video4linux2:%1?width:%2&height:%3&frame_rate:%4</property><property name=\"mlt_service\">avformat-novalidate</property></producer><playlist id=\"playlist0\"><entry producer=\"producer0\" in=\"0\" out=\"999999\"/></playlist>").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("<producer id=\"producer1\" in=\"0\" out=\"999999\"><property name=\"mlt_type\">producer</property><property name=\"length\">1000000</property><property name=\"eof\">loop</property><property name=\"resource\">alsa:%5</property><property name=\"audio_index\">0</property><property name=\"video_index\">-1</property><property name=\"mlt_service\">avformat-novalidate</property></producer><playlist id=\"playlist1\"><entry producer=\"producer1\" in=\"0\" out=\"999999\"/></playlist>").arg(KdenliveSettings::v4l_alsadevicename()));
+ }
+ playlist.append("<tractor id=\"tractor0\" title=\"video0\" global_feed=\"1\" in=\"0\" out=\"999999\">");
+ if (rec_video->isChecked()) playlist.append("<track producer=\"playlist0\"/>");
+ if (rec_audio->isChecked()) playlist.append("<track producer=\"playlist1\"/>");
+ playlist.append("</tractor></mlt>");
+
+ return playlist;
+}
+
/*
void RecMonitor::slotStartGrab(const QRect &rect) {
rgnGrab->deleteLater();
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();
}
if (QFile::rename(url.path(), newUrl)) {
url = KUrl(newUrl);
}
-
+
}
capturedFiles.append(url);
}
}
}
-void RecMonitor::slotChangeRecordingPreview(int ix)
+void RecMonitor::slotChangeRecordingPreview(bool enable)
{
- KdenliveSettings::setRecording_preview(ix);
+ KdenliveSettings::setEnable_recording_preview(enable);
}
#include "recmonitor.moc"
projects / kdenlive / blobdiff