<default>0</default>
</entry>
+ <entry name="v4l_capturevideo" type="Bool">
+ <label>Should we capture video.</label>
+ <default>true</default>
+ </entry>
+
<entry name="v4l_captureaudio" type="Bool">
<label>Should we also capture audio.</label>
<default>false</default>
}
connect(m_configCapture.kcfg_detectedv4ldevices, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdatev4lDevice()));
connect(m_configCapture.kcfg_v4l_format, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdatev4lCaptureProfile()));
- connect(m_configCapture.kcfg_v4l_captureaudio, SIGNAL(toggled(bool)), m_configCapture.kcfg_v4l_alsadevice, SLOT(setEnabled(bool)));
connect(m_configCapture.config_v4l, SIGNAL(clicked()), this, SLOT(slotEditVideo4LinuxProfile()));
slotUpdatev4lDevice();
}
if (line.contains("capture")) {
deviceId = line.section(':', 0, 0);
- m_configCapture.kcfg_rmd_alsa_device->addItem(line.section(':', 1, 1), "plughw:" + QString::number(deviceId.section('-', 0, 0).toInt()) + ',' + QString::number(deviceId.section('-', 1, 1).toInt()));
- m_configCapture.kcfg_v4l_alsadevice->addItem(line.section(':', 1, 1), "hw:" + QString::number(deviceId.section('-', 0, 0).toInt()) + ',' + QString::number(deviceId.section('-', 1, 1).toInt()));
+ m_configCapture.kcfg_rmd_alsa_device->addItem(line.section(':', 1, 1).simplified(), "plughw:" + QString::number(deviceId.section('-', 0, 0).toInt()) + ',' + QString::number(deviceId.section('-', 1, 1).toInt()));
+ m_configCapture.kcfg_v4l_alsadevice->addItem(line.section(':', 1, 1).simplified(), "hw:" + QString::number(deviceId.section('-', 0, 0).toInt()) + ',' + QString::number(deviceId.section('-', 1, 1).toInt()));
}
}
file.close();
if (!data.startsWith(" ") && data.count(':') > 1) {
QString card = data.section(':', 0, 0).section(' ', -1);
QString device = data.section(':', 1, 1).section(' ', -1);
- m_configSdl.kcfg_audio_device->addItem(data.section(':', -1), "plughw:" + card + ',' + device);
- m_configCapture.kcfg_rmd_alsa_device->addItem(data.section(':', -1), "plughw:" + card + ',' + device);
- m_configCapture.kcfg_v4l_alsadevice->addItem(data.section(':', -1), "hw:" + card + ',' + device);
+ m_configSdl.kcfg_audio_device->addItem(data.section(':', -1).simplified(), "plughw:" + card + ',' + device);
+ m_configCapture.kcfg_rmd_alsa_device->addItem(data.section(':', -1).simplified(), "plughw:" + card + ',' + device);
+ m_configCapture.kcfg_v4l_alsadevice->addItem(data.section(':', -1).simplified(), "hw:" + card + ',' + device);
}
}
}
m_recAction = toolbar->addAction(KIcon("media-record"), i18n("Record"));
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 KSelectAction(i18n("Preview Settings"), this);
+ m_previewSettings->addAction(i18n("Quick preview"));
+ m_previewSettings->addAction(i18n("Full preview"));
+ m_previewSettings->addAction(i18n("No preview"));
+ rec_options->setMenu(menu);
+ menu->addAction(m_previewSettings);
toolbar->addSeparator();
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->setCurrentItem(KdenliveSettings::recording_preview());
+ connect(m_previewSettings, SIGNAL(triggered(int)), this, SLOT(slotChangeRecordingPreview(int)));
}
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);
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();
}
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;
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()) {
+ 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")) {
}
}
- if (m_captureDevice->slotStartCapture(v4lparameters, m_captureFile.path(), playlist, recording_preview->currentIndex())) {
+ if (m_captureDevice->slotStartCapture(v4lparameters, m_captureFile.path(), playlist, m_previewSettings->currentItem())) {
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..."));
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->currentItem(), 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..."));
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);
- 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_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 (KdenliveSettings::v4l_captureaudio()) {
+ 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\">");
- playlist.append("<track producer=\"playlist0\"/>");
- if (KdenliveSettings::v4l_captureaudio()) playlist.append("<track producer=\"playlist1\"/>");
+ if (rec_video->isChecked()) playlist.append("<track producer=\"playlist0\"/>");
+ if (rec_audio->isChecked()) playlist.append("<track producer=\"playlist1\"/>");
playlist.append("</tractor></mlt>");
return playlist;
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();
}
#include <KIcon>
#include <KAction>
+#include <KSelectAction>
#include <KRestrictedLine>
#include <KDateTime>
#include <kdeversion.h>
MonitorManager *m_manager;
MltDeviceCapture *m_captureDevice;
VideoPreviewContainer *m_videoBox;
+ QAction *m_addCapturedClip;
+ KSelectAction *m_previewSettings;
+
bool m_analyse;
void checkDeviceAvailability();
QPixmap mergeSideBySide(const QPixmap& pix, const QString &txt);
<x>0</x>
<y>0</y>
<width>405</width>
- <height>545</height>
+ <height>595</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_8">
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
- <string>Video4Linux</string>
+ <string>FFmpeg</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0" colspan="2">
+ <item row="1" column="0" colspan="2">
<widget class="QLabel" name="label_30">
<property name="text">
<string>Detected devices</string>
</property>
</widget>
</item>
- <item row="0" column="4" colspan="4">
+ <item row="1" column="4" colspan="4">
<widget class="KComboBox" name="kcfg_detectedv4ldevices"/>
</item>
- <item row="1" column="0" colspan="2">
+ <item row="2" column="0" colspan="2">
<widget class="QLabel" name="label_14">
<property name="text">
<string>Video device</string>
</property>
</widget>
</item>
- <item row="1" column="4" colspan="4">
+ <item row="2" column="4" colspan="4">
<widget class="KLineEdit" name="kcfg_video4vdevice">
<property name="text">
<string/>
</property>
</widget>
</item>
- <item row="2" column="0" colspan="2">
+ <item row="3" column="0" colspan="2">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Capture format</string>
</property>
</widget>
</item>
- <item row="2" column="4" colspan="4">
+ <item row="3" column="4" colspan="4">
<widget class="KComboBox" name="kcfg_v4l_format"/>
</item>
- <item row="3" column="0">
+ <item row="4" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Size:</string>
</property>
</widget>
</item>
- <item row="3" column="4" colspan="4">
+ <item row="4" column="4" colspan="4">
<widget class="QLabel" name="p_size">
<property name="text">
<string>720x576</string>
</property>
</widget>
</item>
- <item row="4" column="0" colspan="2">
+ <item row="5" column="0" colspan="2">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Frame rate:</string>
</property>
</widget>
</item>
- <item row="4" column="4" colspan="4">
+ <item row="5" column="4" colspan="4">
<widget class="QLabel" name="p_fps">
<property name="text">
<string>25/1</string>
</property>
</widget>
</item>
- <item row="5" column="0" colspan="2">
+ <item row="6" column="0" colspan="2">
<widget class="QLabel" name="label_23">
<property name="text">
<string>Pixel aspect ratio:</string>
</property>
</widget>
</item>
- <item row="5" column="4" colspan="4">
+ <item row="6" column="4" colspan="4">
<widget class="QLabel" name="p_aspect">
<property name="text">
<string>59/54</string>
</property>
</widget>
</item>
- <item row="6" column="0" colspan="3">
+ <item row="7" column="0" colspan="3">
<widget class="QLabel" name="label_31">
<property name="text">
<string>Display aspect ratio:</string>
</property>
</widget>
</item>
- <item row="6" column="4" colspan="4">
+ <item row="7" column="4" colspan="4">
<widget class="QLabel" name="p_display">
<property name="text">
<string>4/3</string>
</property>
</widget>
</item>
- <item row="7" column="0" colspan="2">
+ <item row="8" column="0" colspan="2">
<widget class="QLabel" name="label_32">
<property name="text">
<string>Colorspace</string>
</property>
</widget>
</item>
- <item row="7" column="4" colspan="4">
+ <item row="8" column="4" colspan="4">
<widget class="QLabel" name="p_colorspace">
<property name="text">
<string/>
</property>
</widget>
</item>
- <item row="8" column="0" colspan="2">
+ <item row="9" column="0" colspan="2">
<widget class="QLabel" name="p_progressive">
<property name="text">
<string>Interlaced</string>
</property>
</widget>
</item>
- <item row="8" column="4" colspan="2">
+ <item row="9" column="4" colspan="2">
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</spacer>
</item>
- <item row="8" column="6" colspan="2">
+ <item row="9" column="6" colspan="2">
<widget class="QPushButton" name="config_v4l">
<property name="text">
<string>Edit</string>
</property>
</widget>
</item>
- <item row="9" column="0" rowspan="4" colspan="8">
+ <item row="10" column="0" rowspan="4" colspan="8">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
- <item row="13" column="0" colspan="4">
+ <item row="14" column="0" colspan="8">
<widget class="QCheckBox" name="kcfg_v4l_captureaudio">
<property name="text">
<string>Capture audio (ALSA)</string>
</property>
</widget>
</item>
- <item row="14" column="0" colspan="8">
+ <item row="17" column="0" colspan="8">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
- <item row="15" column="0" colspan="2">
+ <item row="18" column="0" colspan="2">
<widget class="QLabel" name="label_24">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
</property>
</widget>
</item>
- <item row="15" column="4">
+ <item row="18" column="4">
<widget class="KComboBox" name="kcfg_v4l_profile">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
</property>
</widget>
</item>
- <item row="17" column="0" colspan="8">
+ <item row="20" column="0" colspan="8">
<widget class="QPlainTextEdit" name="v4l_parameters">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
</property>
</widget>
</item>
- <item row="18" column="1" colspan="4">
+ <item row="21" column="1" colspan="4">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</spacer>
</item>
- <item row="13" column="4" colspan="4">
- <widget class="KComboBox" name="kcfg_v4l_alsadevice">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="15" column="7">
+ <item row="18" column="7">
<widget class="QToolButton" name="v4l_manageprofile">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
- <item row="15" column="6">
+ <item row="18" column="6">
<widget class="QToolButton" name="v4l_showprofileinfo">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
+ <item row="15" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Device</string>
+ </property>
+ </widget>
+ </item>
+ <item row="15" column="4" colspan="4">
+ <widget class="KComboBox" name="kcfg_v4l_alsadevice">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0" colspan="8">
+ <widget class="QCheckBox" name="kcfg_v4l_capturevideo">
+ <property name="text">
+ <string>Capture video (Video4Linux2)</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<widget class="QWidget" name="tab_3">
</layout>
</widget>
<customwidgets>
- <customwidget>
- <class>KIntSpinBox</class>
- <extends>QSpinBox</extends>
- <header>knuminput.h</header>
- </customwidget>
<customwidget>
<class>KDoubleNumInput</class>
<extends>QWidget</extends>
<header>knuminput.h</header>
</customwidget>
+ <customwidget>
+ <class>KComboBox</class>
+ <extends>QComboBox</extends>
+ <header>kcombobox.h</header>
+ </customwidget>
<customwidget>
<class>KLineEdit</class>
<extends>QLineEdit</extends>
<header>klineedit.h</header>
</customwidget>
<customwidget>
- <class>KComboBox</class>
- <extends>QComboBox</extends>
- <header>kcombobox.h</header>
+ <class>KIntSpinBox</class>
+ <extends>QSpinBox</extends>
+ <header>knuminput.h</header>
</customwidget>
<customwidget>
<class>KIntNumInput</class>
<rect>
<x>0</x>
<y>0</y>
- <width>291</width>
- <height>184</height>
+ <width>285</width>
+ <height>157</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>0</number>
</property>
- <item row="0" column="0" colspan="4">
+ <item row="0" column="0" colspan="6">
<widget class="QLabel" name="video_frame">
<property name="text">
<string>Not connected</string>
</property>
</widget>
</item>
- <item row="1" column="0" colspan="4">
+ <item row="1" column="0" colspan="6">
<widget class="QFrame" name="control_frame_firewire">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
</property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QCheckBox" name="autoaddbox">
- <property name="text">
- <string>Auto add</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="3">
+ <item row="2" column="5">
<widget class="KComboBox" name="device_selector">
<item>
<property name="text">
</item>
<item>
<property name="text">
- <string>Video4Linux</string>
+ <string>FFmpeg</string>
</property>
</item>
<item>
</item>
</widget>
</item>
- <item row="2" column="2">
+ <item row="2" column="4">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</spacer>
</item>
<item row="2" column="1">
- <widget class="QComboBox" name="recording_preview">
- <item>
- <property name="text">
- <string>Quick preview</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Full preview</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>No preview</string>
- </property>
- </item>
+ <widget class="QCheckBox" name="rec_video">
+ <property name="text">
+ <string>Video</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2">
+ <widget class="QCheckBox" name="rec_audio">
+ <property name="text">
+ <string>Audio</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QToolButton" name="rec_options">
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="popupMode">
+ <enum>QToolButton::InstantPopup</enum>
+ </property>
+ <property name="autoRaise">
+ <bool>true</bool>
+ </property>
</widget>
</item>
</layout>