svn path=/trunk/kdenlive/; revision=5075
<entry name="video4vcodec" type="String">
<label>Default video4linux video codec.</label>
<entry name="video4vcodec" type="String">
<label>Default video4linux video codec.</label>
- <default>mpeg4</default>
+ <default>mjpeg</default>
</entry>
<entry name="video4acodec" type="String">
</entry>
<entry name="video4acodec" type="String">
<entry name="video4container" type="String">
<label>Default video4linux format.</label>
<entry name="video4container" type="String">
<label>Default video4linux format.</label>
- <default>mpegts</default>
</entry>
<entry name="video4extension" type="String">
<label>Default video4linux file extension.</label>
</entry>
<entry name="video4extension" type="String">
<label>Default video4linux file extension.</label>
</entry>
<entry name="video4aformat" type="String">
</entry>
<entry name="video4aformat" type="String">
if (!device.isEmpty()) m_configCapture.kcfg_video4vdevice->setText(device);
QString size = m_configCapture.kcfg_detectedv4ldevices->itemData(m_configCapture.kcfg_detectedv4ldevices->currentIndex(), Qt::UserRole + 1).toString();
if (!size.isEmpty()) m_configCapture.kcfg_video4size->setText(size);
if (!device.isEmpty()) m_configCapture.kcfg_video4vdevice->setText(device);
QString size = m_configCapture.kcfg_detectedv4ldevices->itemData(m_configCapture.kcfg_detectedv4ldevices->currentIndex(), Qt::UserRole + 1).toString();
if (!size.isEmpty()) m_configCapture.kcfg_video4size->setText(size);
+ rebuildVideo4Commands();
{
QString capturefile;
QString capturename;
{
QString capturefile;
QString capturename;
+ video_capture->setHidden(true);
+ video_frame->setHidden(false);
m_fwdAction->setVisible(ix != BLACKMAGIC);
m_discAction->setVisible(ix != BLACKMAGIC);
m_rewAction->setVisible(ix != BLACKMAGIC);
m_fwdAction->setVisible(ix != BLACKMAGIC);
m_discAction->setVisible(ix != BLACKMAGIC);
m_rewAction->setVisible(ix != BLACKMAGIC);
checkDeviceAvailability();
break;
case BLACKMAGIC:
checkDeviceAvailability();
break;
case BLACKMAGIC:
- createBlackmagicDevice();
+ createBlackmagicDevice();
m_recAction->setEnabled(false);
m_stopAction->setEnabled(false);
m_playAction->setEnabled(true);
m_recAction->setEnabled(false);
m_stopAction->setEnabled(false);
m_playAction->setEnabled(true);
- video_capture->setHidden(true);
- video_frame->setHidden(false);
- capturefile = m_capturePath;
+ capturefile = m_capturePath;
if (!capturefile.endsWith("/")) capturefile.append("/");
if (!capturefile.endsWith("/")) capturefile.append("/");
- capturename = KdenliveSettings::hdmifilename();
- capturename.append("xxx.raw");
- capturefile.append(capturename);
- video_frame->setPixmap(mergeSideBySide(KIcon("camera-photo").pixmap(QSize(50, 50)), i18n("Plug your camcorder and\npress play button\nto start preview.\nFiles will be saved in:\n%1", capturefile)));
- break;
+ capturename = KdenliveSettings::hdmifilename();
+ capturename.append("xxx.raw");
+ capturefile.append(capturename);
+ video_frame->setPixmap(mergeSideBySide(KIcon("camera-photo").pixmap(QSize(50, 50)), i18n("Plug your camcorder and\npress play button\nto start preview.\nFiles will be saved in:\n%1", capturefile)));
+ break;
default: // FIREWIRE
m_discAction->setEnabled(true);
m_recAction->setEnabled(false);
default: // FIREWIRE
m_discAction->setEnabled(true);
m_recAction->setEnabled(false);
void RecMonitor::createBlackmagicDevice()
{
void RecMonitor::createBlackmagicDevice()
{
- //video_capture->setVisible(true);
- if (m_bmCapture == NULL) {
- QVBoxLayout *lay = new QVBoxLayout;
- m_bmCapture = new BmdCaptureHandler(lay);
- connect(m_bmCapture, SIGNAL(gotTimeCode(ulong)), this, SLOT(slotGotBlackMagicFrameNumber(ulong)));
- connect(m_bmCapture, SIGNAL(gotMessage(const QString &)), this, SLOT(slotGotBlackmagicMessage(const QString &)));
- video_capture->setLayout(lay);
- }
+ //video_capture->setVisible(true);
+ if (m_bmCapture == NULL) {
+ QVBoxLayout *lay = new QVBoxLayout;
+ m_bmCapture = new BmdCaptureHandler(lay);
+ connect(m_bmCapture, SIGNAL(gotTimeCode(ulong)), this, SLOT(slotGotBlackMagicFrameNumber(ulong)));
+ connect(m_bmCapture, SIGNAL(gotMessage(const QString &)), this, SLOT(slotGotBlackmagicMessage(const QString &)));
+ video_capture->setLayout(lay);
+ }
}
void RecMonitor::slotGotBlackmagicFrameNumber(ulong ix)
}
void RecMonitor::slotGotBlackmagicFrameNumber(ulong ix)
void RecMonitor::slotStopCapture()
{
// stop capture
void RecMonitor::slotStopCapture()
{
// stop capture
+ video_capture->setHidden(true);
+ video_frame->setHidden(false);
switch (device_selector->currentIndex()) {
case FIREWIRE:
m_captureProcess->write("\e", 2);
switch (device_selector->currentIndex()) {
case FIREWIRE:
m_captureProcess->write("\e", 2);
QTimer::singleShot(1000, m_captureProcess, SLOT(kill()));
break;
case BLACKMAGIC:
QTimer::singleShot(1000, m_captureProcess, SLOT(kill()));
break;
case BLACKMAGIC:
- video_capture->setHidden(true);
- video_frame->setHidden(false);
- m_bmCapture->stopPreview();
- m_playAction->setEnabled(true);
- m_stopAction->setEnabled(false);
- m_recAction->setEnabled(false);
- break;
+ m_bmCapture->stopPreview();
+ m_playAction->setEnabled(true);
+ m_stopAction->setEnabled(false);
+ m_recAction->setEnabled(false);
+ break;
m_isPlaying = false;
QString capturename = KdenliveSettings::dvgrabfilename();
QStringList dvargs = KdenliveSettings::dvgrabextra().simplified().split(" ", QString::SkipEmptyParts);
m_isPlaying = false;
QString capturename = KdenliveSettings::dvgrabfilename();
QStringList dvargs = KdenliveSettings::dvgrabextra().simplified().split(" ", QString::SkipEmptyParts);
+ video_capture->setVisible(device_selector->currentIndex() == BLACKMAGIC);
+ video_frame->setHidden(device_selector->currentIndex() == BLACKMAGIC);
switch (device_selector->currentIndex()) {
case FIREWIRE:
switch (device_selector->currentIndex()) {
case FIREWIRE:
m_captureProcess->start("ffmpeg", m_captureArgs);
break;
case BLACKMAGIC:
m_captureProcess->start("ffmpeg", m_captureArgs);
break;
case BLACKMAGIC:
- video_capture->setVisible(true);
- video_frame->setHidden(true);
- m_bmCapture->startPreview(KdenliveSettings::hdmi_capturedevice(), KdenliveSettings::hdmi_capturemode());
- m_playAction->setEnabled(false);
- m_stopAction->setEnabled(true);
- m_recAction->setEnabled(true);
- break;
+ m_bmCapture->startPreview(KdenliveSettings::hdmi_capturedevice(), KdenliveSettings::hdmi_capturemode());
+ m_playAction->setEnabled(false);
+ m_stopAction->setEnabled(true);
+ m_recAction->setEnabled(true);
+ break;
void RecMonitor::slotRecord()
{
if (device_selector->currentIndex() == BLACKMAGIC) {
void RecMonitor::slotRecord()
{
if (device_selector->currentIndex() == BLACKMAGIC) {
- if (m_blackmagicCapturing) {
- // We are capturing, stop it
- m_bmCapture->stopCapture();
- m_blackmagicCapturing = false;
- }
- else {
- // Start capture, get capture filename first
- QString path = m_capturePath;
- if (!path.endsWith("/")) path.append("/");
- path.append(KdenliveSettings::hdmifilename());
- m_bmCapture->startCapture(path);
- m_blackmagicCapturing = true;
- }
- return;
+ if (m_blackmagicCapturing) {
+ // We are capturing, stop it
+ m_bmCapture->stopCapture();
+ m_blackmagicCapturing = false;
+ } else {
+ // Start capture, get capture filename first
+ QString path = m_capturePath;
+ if (!path.endsWith("/")) path.append("/");
+ path.append(KdenliveSettings::hdmifilename());
+ m_bmCapture->startCapture(path);
+ m_blackmagicCapturing = true;
+ }
+ return;
if (m_captureProcess->state() == QProcess::NotRunning && device_selector->currentIndex() == FIREWIRE) {
slotStartCapture();
}
if (m_captureProcess->state() == QProcess::NotRunning && device_selector->currentIndex() == FIREWIRE) {
slotStartCapture();
}
- <width>293</width>
- <height>250</height>
+ <width>210</width>
+ <height>152</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
</property>
<item row="0" column="0" colspan="3">
<widget class="QFrame" name="video_capture">
</property>
<item row="0" column="0" colspan="3">
<widget class="QFrame" name="video_capture">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
</property>
</widget>
</item>
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="1" column="0" colspan="3">
<widget class="QLabel" name="video_frame">
<widget class="QLabel" name="video_frame">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
<property name="text">
<string>Not connected</string>
</property>
<property name="text">
<string>Not connected</string>
</property>