{
// detect if the producer has finished playing. Is there a better way to do it?
if (self->m_isBlocked) return;
- if (mlt_properties_get_double(MLT_FRAME_PROPERTIES(frame_ptr), "_speed") == 0.0) {
+ Mlt::Frame frame(frame_ptr);
+#ifdef Q_WS_MAC
+ self->showFrame(frame);
+#endif
+ if (frame.get_double("_speed") == 0.0) {
self->emitConsumerStopped();
} else {
self->emitFrameNumber(mlt_frame_get_position(frame_ptr));
m_name(rendererName),
m_mltConsumer(NULL),
m_mltProducer(NULL),
+ m_mltProfile(NULL),
m_framePosition(0),
m_isZoneMode(false),
m_isLoopMode(false),
m_isSplitView(false),
m_blackClip(NULL),
m_winid(winid)
+#ifdef Q_WS_MAC
+ , m_glWidget(0)
+#endif
{
kDebug() << "////////// USING PROFILE: " << (char*)KdenliveSettings::current_profile().toUtf8().data();
{
//delete m_osdTimer;
if (m_mltProducer) {
- Mlt::Service service(m_mltProducer->get_service());
+ Mlt::Service service(m_mltProducer->parent().get_service());
+ mlt_service_lock(service.get_service());
+
if (service.type() == tractor_type) {
Mlt::Tractor tractor(service);
- int trackNb = tractor.count();
+ Mlt::Field *field = tractor.field();
+ mlt_service nextservice = mlt_service_get_producer(service.get_service());
+ mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
+ QString mlt_type = mlt_properties_get(properties, "mlt_type");
+ QString resource = mlt_properties_get(properties, "mlt_service");
+ // Delete all transitions
+ while (mlt_type == "transition") {
+ mlt_field_disconnect_service(field->get_field(), nextservice);
+ nextservice = mlt_service_producer(nextservice);
+ if (nextservice == NULL) break;
+ properties = MLT_SERVICE_PROPERTIES(nextservice);
+ mlt_type = mlt_properties_get(properties, "mlt_type");
+ resource = mlt_properties_get(properties, "mlt_service");
+ }
+ int trackNb = tractor.count();
while (trackNb > 0) {
Mlt::Producer trackProducer(tractor.track(trackNb - 1));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- trackPlaylist.clear();
+ if (trackPlaylist.type() == playlist_type) trackPlaylist.clear();
trackNb--;
}
}
+ mlt_service_unlock(service.get_service());
}
kDebug() << "// // // CLOSE RENDERER " << m_name;
delete m_blackClip;
m_blackClip = NULL;
+ //TODO: uncomment following line when everything is clean
+ //if (m_mltProfile) delete m_mltProfile;
m_mltProfile = new Mlt::Profile(tmp);
delete[] tmp;
}
setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 1);
+#ifdef Q_WS_MAC
+ m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_audio");
+ m_mltConsumer->set("preview_off", 1);
+ m_mltConsumer->set("preview_format", mlt_image_rgb24a);
+#else
m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_preview");
+#endif
m_mltConsumer->set("resize", 1);
m_mltConsumer->set("window_id", m_winid);
m_mltConsumer->set("terminate_on_pause", 1);
}
m_mltProducer = NULL;
- if (m_mltProfile) delete m_mltProfile;
- m_mltProfile = NULL;
-
buildConsumer();
//kDebug() << "//RESET WITHSCENE: " << scene;
}
}
-void Render::getFileProperties(const QDomElement &xml, const QString &clipId, bool replaceProducer)
+void Render::getFileProperties(const QDomElement xml, const QString &clipId, bool replaceProducer)
{
KUrl url = KUrl(xml.attribute("resource", QString()));
Mlt::Producer *producer = NULL;
+ //kDebug() << "PROFILE WIDT: "<< xml.attribute("mlt_service") << ": "<< m_mltProfile->width() << "\n...................\n\n";
/*if (xml.attribute("type").toInt() == TEXT && !QFile::exists(url.path())) {
emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer);
return;
if (m_winid == -1) return -1;
m_isBlocked = true;
int error;
- qDeleteAll(m_slowmotionProducers.values());
- m_slowmotionProducers.clear();
//kWarning() << "////// RENDER, SET SCENE LIST: " << playlist;
if (!m_mltConsumer->is_stopped()) {
m_mltConsumer->stop();
- //m_mltConsumer->set("refresh", 0);
}
+ m_mltConsumer->set("refresh", 0);
if (m_mltProducer) {
m_mltProducer->set_speed(0);
//if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo);
- Mlt::Service service(m_mltProducer->get_service());
+ Mlt::Service service(m_mltProducer->parent().get_service());
+ mlt_service_lock(service.get_service());
+
if (service.type() == tractor_type) {
Mlt::Tractor tractor(service);
+ Mlt::Field *field = tractor.field();
+ mlt_service nextservice = mlt_service_get_producer(service.get_service());
+ mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
+ QString mlt_type = mlt_properties_get(properties, "mlt_type");
+ QString resource = mlt_properties_get(properties, "mlt_service");
+ // Delete all transitions
+ while (mlt_type == "transition") {
+ mlt_field_disconnect_service(field->get_field(), nextservice);
+ nextservice = mlt_service_producer(nextservice);
+ if (nextservice == NULL) break;
+ properties = MLT_SERVICE_PROPERTIES(nextservice);
+ mlt_type = mlt_properties_get(properties, "mlt_type");
+ resource = mlt_properties_get(properties, "mlt_service");
+ }
+
int trackNb = tractor.count();
while (trackNb > 0) {
Mlt::Producer trackProducer(tractor.track(trackNb - 1));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- trackPlaylist.clear();
+ if (trackPlaylist.type() == playlist_type) trackPlaylist.clear();
trackNb--;
}
}
+ mlt_service_unlock(service.get_service());
+
+ qDeleteAll(m_slowmotionProducers.values());
+ m_slowmotionProducers.clear();
delete m_mltProducer;
m_mltProducer = NULL;
//if (notify) QApplication::postEvent(qApp->activeWindow(), new UrlEvent(url, 10003));
}
+#ifdef Q_WS_MAC
+void Render::showFrame(Mlt::Frame& frame)
+{
+ mlt_image_format format = mlt_image_rgb24a;
+ int width = 0;
+ int height = 0;
+ const uchar* image = frame.get_image(format, width, height);
+ QImage qimage(width, height, QImage::Format_ARGB32);
+ memcpy(qimage.scanLine(0), image, width * height * 4);
+ emit showImageSignal(qimage);
+}
+#endif
+
/** MLT PLAYLIST DIRECT MANIPULATON **/
//kDebug()<<"//// Deleting at: "<< (int) position.frames(m_fps) <<" --------------------------------------";
m_isBlocked = true;
Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex);
- delete clip;
+ if (clip) delete clip;
trackPlaylist.consolidate_blanks(0);
/*if (QString(clip.parent().get("transparency")).toInt() == 1)
mltDeleteTransparency((int) position.frames(m_fps), track, QString(clip.parent().get("id")).toInt());*/
fileConsumer.start();
}
-QList <Mlt::Producer *> Render::producersList()
+const QList <Mlt::Producer *> Render::producersList()
{
QList <Mlt::Producer *> prods;
if (m_mltProducer == NULL) return prods;
//kDebug() << "/////////// RESULT SCENE: \n" << doc.toString();
setSceneList(doc.toString(), m_framePosition);
- if (m_mltProducer != NULL) {
- Mlt::Producer parentProd(m_mltProducer->parent());
- if (parentProd.get_producer() != NULL) {
- Mlt::Service service(parentProd.get_service());
- if (service.type() == tractor_type) {
- Mlt::Tractor tractor(service);
- mltCheckLength(&tractor);
+ /* if (m_mltProducer != NULL) {
+ Mlt::Producer parentProd(m_mltProducer->parent());
+ if (parentProd.get_producer() != NULL) {
+ Mlt::Service service(parentProd.get_service());
+ if (service.type() == tractor_type) {
+ Mlt::Tractor tractor(service);
+ mltCheckLength(&tractor);
+ }
}
- }
- }
+ }*/
}
projects / kdenlive / blobdiff