#include <KDebug>
#include <KStandardDirs>
#include <KMessageBox>
-#include <KLocale>
+#include <KLocalizedString>
#include <KTemporaryFile>
#include <QTimer>
#include <QString>
#include <QApplication>
#include <QThread>
+#include <QTimer>
#include <cstdlib>
#include <cstdarg>
MltDeviceCapture::MltDeviceCapture(QString profile, VideoSurface *surface, QWidget *parent) :
- AbstractRender(Kdenlive::recordMonitor, parent),
+ AbstractRender(Kdenlive::RecordMonitor, parent),
doCapture(0),
sendFrameForAnalysis(false),
processingImage(false),
{
m_captureDisplayWidget = surface;
analyseAudio = KdenliveSettings::monitor_audio();
- if (profile.isEmpty()) profile = KdenliveSettings::current_profile();
+ if (profile.isEmpty())
+ profile = KdenliveSettings::current_profile();
buildConsumer(profile);
connect(this, SIGNAL(unblockPreview()), this, SLOT(slotPreparePreview()));
m_droppedFramesTimer.setSingleShot(false);
}
*/
- mlt_image_format format = mlt_image_rgb24a;
+ mlt_image_format format = mlt_image_rgb24;
int width = 0;
int height = 0;
const uchar* image = frame.get_image(format, width, height);
- QImage qimage(width, height, QImage::Format_ARGB32_Premultiplied);
- memcpy(qimage.bits(), image, width * height * 4);
- emit frameUpdated(qimage.rgbSwapped());
+ QImage qimage(width, height, QImage::Format_RGB888);
+ //QImage qimage(width, height, QImage::Format_ARGB32_Premultiplied);
+ memcpy(qimage.bits(), image, width * height * 3);
+ emit frameUpdated(qimage);
}
void MltDeviceCapture::showFrame(Mlt::Frame& frame)
QStringList paramList = params.split(' ', QString::SkipEmptyParts);
char *tmp2;
- for (int i = 0; i < paramList.count(); i++) {
+ for (int i = 0; i < paramList.count(); ++i) {
tmp = qstrdup(paramList.at(i).section('=', 0, 0).toUtf8().constData());
QString value = paramList.at(i).section('=', 1, 1);
if (value == "%threads") value = QString::number(QThread::idealThreadCount());
//delete clip;
}
-void MltDeviceCapture::setOverlayEffect(const QString &tag, QStringList parameters)
+void MltDeviceCapture::setOverlayEffect(const QString &tag, const QStringList ¶meters)
{
if (m_mltProducer == NULL || !m_mltProducer->is_valid()) return;
Mlt::Service service(m_mltProducer->parent().get_service());
}
+
+#include "mltdevicecapture.moc"