QVBoxLayout *l = new QVBoxLayout;
l->setContentsMargins(0, 0, 0, 0);
l->setSpacing(0);
- m_videoBox = new VideoContainer(this);
- l->addWidget(m_videoBox, 10);
+ l->addWidget(videoBox, 10);
video_frame->setLayout(l);
+ createVideoSurface();
QToolBar *toolbar = new QToolBar(this);
QHBoxLayout *layout = new QHBoxLayout;
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(m_videoBox->winId()));
+ env.insert("SDL_WINDOWID", QString::number(videoSurface->winId()));
if (!videoDriver.isEmpty()) {
if (videoDriver == "x11_noaccel") {
env.insert("SDL_VIDEO_YUV_HWACCEL", "0");
m_displayProcess->setProcessEnvironment(env);
#else
QStringList env = QProcess::systemEnvironment();
- env << "SDL_WINDOWID=" + QString::number(m_videoBox->winId());
+ env << "SDL_WINDOWID=" + QString::number(videoSurface->winId());
if (!videoDriver.isEmpty()) {
if (videoDriver == "x11_noaccel") {
env << "SDL_VIDEO_YUV_HWACCEL=0";
}
m_displayProcess->setEnvironment(env);
#endif
+
setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 1);
- kDebug() << "/////// BUILDING MONITOR, ID: " << m_videoBox->winId();
+ kDebug() << "/////// BUILDING MONITOR, ID: " << videoSurface->winId();
slotVideoDeviceChanged(device_selector->currentIndex());
m_previewSettings->setChecked(KdenliveSettings::enable_recording_preview());
connect(m_previewSettings, SIGNAL(triggered(bool)), this, SLOT(slotChangeRecordingPreview(bool)));
void RecMonitor::mouseDoubleClickEvent(QMouseEvent * event)
{
- if (!KdenliveSettings::openglmonitors() && m_videoBox && m_videoBox->isVisible()) {
- m_videoBox->switchFullScreen();
+ if (!KdenliveSettings::openglmonitors() && videoBox && videoBox->isVisible()) {
+ videoBox->switchFullScreen();
event->accept();
}
}
void RecMonitor::slotSwitchFullScreen()
{
- m_videoBox->switchFullScreen();
+ videoBox->switchFullScreen();
}
void RecMonitor::stop()
}
// 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);
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());
} 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;
{
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"));
{
// 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()) {
{
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);
}
return;
}
+ slotActivateMonitor();
if (m_isPlaying) return;
m_captureArgs.clear();
m_displayArgs.clear();
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()) {
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);
break;
case VIDEO4LINUX:
path = KStandardDirs::locateLocal("appdata", "profiles/video4linux");
- slotActivateMonitor();
buildMltDevice(path);
profile = ProfilesDialog::getVideoProfile(path);
producer = getV4lXmlPlaylist(profile);
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);
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);
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
}
if (!rec_video->isChecked()) showPreview = false;
if (m_captureDevice->slotStartCapture(v4lparameters, m_captureFile.path(), playlist, showPreview)) {
- m_videoBox->setHidden(false);
+ videoBox->setHidden(false);
m_isCapturing = true;
m_recAction->setEnabled(false);
m_stopAction->setEnabled(true);
}
else {
video_frame->setText(i18n("Failed to start Video4Linux,\ncheck your parameters..."));
- m_videoBox->setHidden(true);
+ videoBox->setHidden(true);
m_isCapturing = false;
}
break;
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()), m_previewSettings->isChecked(), false)) {
- m_videoBox->setHidden(false);
+ videoBox->setHidden(false);
m_isCapturing = true;
slotSetInfoMessage(i18n("Capturing to %1", m_captureFile.fileName()));
m_recAction->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;
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);
}
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 {
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)
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) {
kDebug() << capturedFiles;
if (capturedFiles.count() > 0) {
- ManageCapturesDialog *d = new ManageCapturesDialog(capturedFiles, this);
+ QPointer<ManageCapturesDialog> d = new ManageCapturesDialog(capturedFiles, this);
if (d->exec() == QDialog::Accepted) {
emit addProjectClipList(d->importFiles());
}
void RecMonitor::slotPlay()
{
- if (m_isPlaying) slotStopCapture();
- else slotStartPreview(true);
+ /*if (m_isPlaying) slotStopCapture();
+ else slotStartPreview(true);*/
}
void RecMonitor::slotReadDvgrabInfo()
{
if (m_captureDevice == NULL) {
m_monitorManager->updateScopeSource();
- m_captureDevice = new MltDeviceCapture(path, m_videoBox, this);
+ m_captureDevice = new MltDeviceCapture(path, videoSurface, this);
connect(m_captureDevice, SIGNAL(droppedFrames(int)), this, SLOT(slotDroppedFrames(int)));
m_captureDevice->sendFrameForAnalysis = m_analyse;
m_monitorManager->updateScopeSource();
KdenliveSettings::setEnable_recording_preview(enable);
}
-void RecMonitor::pause()
-{
- if (m_isCapturing) return;
- slotStopCapture();
- if (m_captureDevice) {
- m_monitorManager->clearScopeSource();
- delete m_captureDevice;
- m_captureDevice = NULL;
- }
-}
-
-void RecMonitor::unpause()
-{
- if (m_isCapturing) return;
- slotStartPreview(true);
-}
void RecMonitor::slotMouseSeek(int /*eventDelta*/, bool /*fast*/)
{
projects / kdenlive / blobdiff