***************************************************************************/
#include "stopmotion.h"
-#include "blackmagic/devices.h"
#ifdef USE_V4L
#include "v4l/v4lcapture.h"
#endif
{
}
-void MyLabel::setImage(QImage img)
+void MyLabel::setImage(const QImage& img)
{
m_img = img;
}
//virtual
void MyLabel::wheelEvent(QWheelEvent* event)
{
- if (event->delta() > 0) emit seek(true);
- else emit seek(false);
+ if (event->delta() > 0)
+ emit seek(true);
+ else
+ emit seek(false);
}
//virtual
}
-StopmotionMonitor::StopmotionMonitor(QWidget *parent) :
- AbstractMonitor(parent),
+StopmotionMonitor::StopmotionMonitor(MonitorManager *manager, QWidget *parent) :
+ AbstractMonitor(Kdenlive::stopmotionMonitor, manager, parent),
m_captureDevice(NULL)
{
+ createVideoSurface();
}
StopmotionMonitor::~StopmotionMonitor()
{
}
+void StopmotionMonitor::slotSwitchFullScreen()
+{
+}
+
void StopmotionMonitor::setRender(MltDeviceCapture *render)
{
m_captureDevice = render;
return m_captureDevice;
}
-const QString StopmotionMonitor::name() const
+Kdenlive::MONITORID StopmotionMonitor::id() const
{
- return QString("stopmotion");
+ return Kdenlive::stopmotionMonitor;
}
{
}
-StopmotionWidget::StopmotionWidget(MonitorManager *manager, KUrl projectFolder, QList< QAction* > actions, QWidget* parent) :
+void StopmotionMonitor::slotPlay()
+{
+}
+
+void StopmotionMonitor::slotMouseSeek(int /*eventDelta*/, bool /*fast*/)
+{
+}
+
+StopmotionWidget::StopmotionWidget(MonitorManager *manager, const KUrl &projectFolder, const QList<QAction *> &actions, QWidget* parent) :
QDialog(parent)
- , Ui::Stopmotion_UI()
- , m_projectFolder(projectFolder)
- , m_captureDevice(NULL)
- , m_sequenceFrame(0)
- , m_animatedIndex(-1)
- , m_animate(false)
- , m_manager(manager)
- , m_monitor(new StopmotionMonitor(this))
+ , Ui::Stopmotion_UI()
+ , m_projectFolder(projectFolder)
+ , m_captureDevice(NULL)
+ , m_sequenceFrame(0)
+ , m_animatedIndex(-1)
+ , m_animate(false)
+ , m_manager(manager)
+ , m_monitor(new StopmotionMonitor(manager, this))
{
//setAttribute(Qt::WA_DeleteOnClose);
//HACK: the monitor widget is hidden, it is just used to control the capturedevice from monitormanager
effectsMenu->addAction(invertEffect);
effectsMenu->addAction(thresEffect);
QList <QAction*> list = effectsMenu->actions();
- for (int i = 0; i < list.count(); i++) {
+ for (int i = 0; i < list.count(); ++i) {
list.at(i)->setCheckable(true);
if (list.at(i)->data().toInt() == m_effectIndex) {
list.at(i)->setChecked(true);
config_button->setIcon(KIcon("configure"));
config_button->setMenu(confMenu);
- connect(sequence_name, SIGNAL(textChanged(const QString&)), this, SLOT(sequenceNameChanged(const QString&)));
+ connect(sequence_name, SIGNAL(textChanged(QString)), this, SLOT(sequenceNameChanged(QString)));
connect(sequence_name, SIGNAL(currentIndexChanged(int)), live_button, SLOT(setFocus()));
// Video widget holder
QVBoxLayout *layout = new QVBoxLayout;
layout->setContentsMargins(0, 0, 0, 0);
layout->setSpacing(0);
- m_videoBox = new VideoPreviewContainer();
- m_videoBox->setContentsMargins(0, 0, 0, 0);
- m_videoBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- //m_videoBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
- m_videoBox->setLineWidth(4);
- layout->addWidget(m_videoBox);
+ m_monitor->videoBox->setLineWidth(4);
+ layout->addWidget(m_monitor->videoBox);
-
- if (BMInterface::getBlackMagicDeviceList(capture_device)) {
+ if (KdenliveSettings::decklink_device_found()) {
// Found a BlackMagic device
}
+
if (QFile::exists(KdenliveSettings::video4vdevice())) {
#ifdef USE_V4L
// Video 4 Linux device detection
- for (int i = 0; i < 10; i++) {
+ for (int i = 0; i < 10; ++i) {
QString path = "/dev/video" + QString::number(i);
if (QFile::exists(path)) {
QStringList deviceInfo = V4lCaptureHandler::getDeviceName(path);
connect(capture_device, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateDeviceHandler()));
/*if (m_bmCapture) {
- connect(m_bmCapture, SIGNAL(frameSaved(const QString &)), this, SLOT(slotNewThumb(const QString &)));
+ connect(m_bmCapture, SIGNAL(frameSaved(QString)), this, SLOT(slotNewThumb(QString)));
connect(m_bmCapture, SIGNAL(gotFrame(QImage)), this, SIGNAL(gotFrame(QImage)));
} else live_button->setEnabled(false);*/
profilePath = KdenliveSettings::current_profile();
}
- m_captureDevice = new MltDeviceCapture(profilePath, m_videoBox, this);
+ m_captureDevice = new MltDeviceCapture(profilePath, m_monitor->videoSurface, this);
m_captureDevice->sendFrameForAnalysis = KdenliveSettings::analyse_stopmotion();
m_monitor->setRender(m_captureDevice);
- connect(m_captureDevice, SIGNAL(frameSaved(const QString &)), this, SLOT(slotNewThumb(const QString &)));
+ connect(m_captureDevice, SIGNAL(frameSaved(QString)), this, SLOT(slotNewThumb(QString)));
live_button->setChecked(false);
button_addsequence->setEnabled(false);
connect(preview_button, SIGNAL(clicked(bool)), this, SLOT(slotPlayPreview(bool)));
connect(frame_list, SIGNAL(currentRowChanged(int)), this, SLOT(slotShowSelectedFrame()));
connect(frame_list, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(slotShowSelectedFrame()));
- connect(this, SIGNAL(doCreateThumbs(QImage, int)), this, SLOT(slotCreateThumbs(QImage, int)));
+ connect(this, SIGNAL(doCreateThumbs(QImage,int)), this, SLOT(slotCreateThumbs(QImage,int)));
frame_list->addAction(removeCurrent);
frame_list->setContextMenuPolicy(Qt::ActionsContextMenu);
#endif
} else {
m_bmCapture = new BmdCaptureHandler(m_layout);
- if (m_bmCapture) connect(m_bmCapture, SIGNAL(gotMessage(const QString&)), this, SLOT(slotGotHDMIMessage(const QString&)));
+ if (m_bmCapture) connect(m_bmCapture, SIGNAL(gotMessage(QString)), this, SLOT(slotGotHDMIMessage(QString)));
}
live_button->setEnabled(m_bmCapture != NULL);
m_layout->addWidget(m_frame_preview);*/
//dir.setNameFilters(filters);
QStringList sequences = dir.entryList(filters, QDir::Files, QDir::Name);
//kDebug()<<"PF: "<<<<", sm: "<<sequences;
- foreach(QString sequencename, sequences) {
- sequence_name->addItem(sequencename.section("_", 0, -2));
+ foreach(const QString &sequencename, sequences) {
+ sequence_name->addItem(sequencename.section('_', 0, -2));
}
}
{
setUpdatesEnabled(false);
slotLive(!live_button->isChecked());
- /*if (m_frame_preview->isHidden()) {
- //if (m_bmCapture) m_bmCapture->hidePreview(true);
- m_videoBox->setHidden(true);
- m_frame_preview->setHidden(false);
- } else {
- m_frame_preview->setHidden(true);
- //if (m_bmCapture) m_bmCapture->hidePreview(false);
- m_videoBox->setHidden(false);
- capture_button->setEnabled(true);
- }*/
setUpdatesEnabled(true);
}
capture_button->setEnabled(false);
if (isOn) {
m_frame_preview->setHidden(true);
- m_videoBox->setHidden(false);
+ m_monitor->videoBox->setHidden(false);
QLocale locale;
MltVideoProfile profile;
}
if (m_captureDevice == NULL) {
- m_captureDevice = new MltDeviceCapture(profilePath, m_videoBox, this);
+ m_captureDevice = new MltDeviceCapture(profilePath, m_monitor->videoSurface, this);
m_captureDevice->sendFrameForAnalysis = KdenliveSettings::analyse_stopmotion();
m_monitor->setRender(m_captureDevice);
- connect(m_captureDevice, SIGNAL(frameSaved(const QString &)), this, SLOT(slotNewThumb(const QString &)));
+ connect(m_captureDevice, SIGNAL(frameSaved(QString)), this, SLOT(slotNewThumb(QString)));
}
- m_manager->activateMonitor("stopmotion");
+ m_manager->activateMonitor(Kdenlive::stopmotionMonitor);
QString producer = createProducer(profile, service, resource);
if (m_captureDevice->slotStartPreview(producer, true)) {
if (m_showOverlay->isChecked()) {
live_button->setChecked(false);
if (m_captureDevice) {
m_captureDevice->stop();
- m_videoBox->setHidden(true);
+ m_monitor->videoBox->setHidden(true);
log_box->insertItem(-1, i18n("Stopped"));
log_box->setCurrentIndex(0);
//delete m_captureDevice;
void StopmotionWidget::sequenceNameChanged(const QString& name)
{
// Get rid of frames from previous sequence
- disconnect(this, SIGNAL(doCreateThumbs(QImage, int)), this, SLOT(slotCreateThumbs(QImage, int)));
+ disconnect(this, SIGNAL(doCreateThumbs(QImage,int)), this, SLOT(slotCreateThumbs(QImage,int)));
m_filesList.clear();
m_future.waitForFinished();
frame_list->clear();
m_sequenceFrame = m_filesList.isEmpty() ? 0 : SlideshowClip::getFrameNumberFromPath(m_filesList.last()) + 1;
if (!m_filesList.isEmpty()) {
m_sequenceName = sequence_name->currentText();
- connect(this, SIGNAL(doCreateThumbs(QImage, int)), this, SLOT(slotCreateThumbs(QImage, int)));
+ connect(this, SIGNAL(doCreateThumbs(QImage,int)), this, SLOT(slotCreateThumbs(QImage,int)));
m_future = QtConcurrent::run(this, &StopmotionWidget::slotPrepareThumbs);
button_addsequence->setEnabled(true);
} else {
// new sequence
- connect(this, SIGNAL(doCreateThumbs(QImage, int)), this, SLOT(slotCreateThumbs(QImage, int)));
+ connect(this, SIGNAL(doCreateThumbs(QImage,int)), this, SLOT(slotCreateThumbs(QImage,int)));
button_addsequence->setEnabled(false);
}
capture_button->setEnabled(live_button->isChecked());
}
-void StopmotionWidget::slotCreateThumbs(QImage img, int ix)
+void StopmotionWidget::slotCreateThumbs(const QImage &img, int ix)
{
if (img.isNull()) {
m_future = QtConcurrent::run(this, &StopmotionWidget::slotPrepareThumbs);
QString StopmotionWidget::getPathForFrame(int ix, QString seqName)
{
- if (seqName.isEmpty()) seqName = m_sequenceName;
- return m_projectFolder.path(KUrl::AddTrailingSlash) + seqName + "_" + QString::number(ix).rightJustified(4, '0', false) + ".png";
+ if (seqName.isEmpty())
+ seqName = m_sequenceName;
+ return m_projectFolder.path(KUrl::AddTrailingSlash) + seqName + QLatin1Char('_') + QString::number(ix).rightJustified(4, '0', false) + QLatin1String(".png");
}
void StopmotionWidget::slotShowFrame(const QString& path)
capture_button->setEnabled(false);
slotLive(false);
if (!img.isNull()) {
- //m_videoBox->setHidden(true);
-
m_frame_preview->setImage(img);
m_frame_preview->setHidden(false);
m_frame_preview->update();
{
frame_list->blockSignals(true);
QListWidgetItem* item = getFrameFromIndex(ix);
- if (!item) return;
+ if (!item)
+ return;
frame_list->setCurrentItem(item);
frame_list->blockSignals(false);
}
{
if (frame_list->currentItem() == NULL) return;
QString path = frame_list->currentItem()->toolTip();
- if (KMessageBox::questionYesNo(this, i18n("Delete frame %1 from disk?", path), i18n("Delete Frame")) != KMessageBox::Yes) return;
+ if (KMessageBox::questionYesNo(this, i18n("Delete frame %1 from disk?", path), i18n("Delete Frame")) != KMessageBox::Yes)
+ return;
+
QFile f(path);
if (f.remove()) {
QListWidgetItem* item = frame_list->takeItem(frame_list->currentRow());
void StopmotionWidget::slotSwitchMirror(bool isOn)
{
//KdenliveSettings::setAnalyse_stopmotion(isOn);
- if (m_captureDevice) m_captureDevice->mirror(isOn);
+ if (m_captureDevice)
+ m_captureDevice->mirror(isOn);
}
-const QString StopmotionWidget::createProducer(MltVideoProfile profile, const QString &service, const QString &resource)
+
+const QString StopmotionWidget::createProducer(const MltVideoProfile &profile, const QString &service, const QString &resource)
{
Q_UNUSED(profile)
+
+#include "stopmotion.moc"
projects / kdenlive / blobdiff