* internal rework: switch clip id's from integer to string

[kdenlive] / src / renderer.cpp

diff --git a/src/renderer.cpp b/src/renderer.cpp
index c413b93199072452055038f065fdce58f30b15a8..a024bdf5fffe40a0d87bc18bc33e82651244d2cc 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -80,7 +80,6 @@ Render::Render(const QString & rendererName, int winid, int extid, QWidget *pare
 
     m_externalwinid = extid;
     m_winid = winid;
-    m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
     Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "colour", "black");
     m_mltProducer = producer;
     if (m_blackClip) delete m_blackClip;
@@ -112,12 +111,25 @@ void Render::buildConsumer() {
     tmp = decodedString(KdenliveSettings::current_profile());
     m_mltProfile = new Mlt::Profile(tmp);
     delete[] tmp;
+
+
+    QString videoDriver = KdenliveSettings::videodrivername();
+    if (!videoDriver.isEmpty()) {
+        if (videoDriver == "x11_noaccel") {
+            setenv("SDL_VIDEO_YUV_HWACCEL", "0", 1);
+            videoDriver = "x11";
+        } else {
+            unsetenv("SDL_VIDEO_YUV_HWACCEL");
+        }
+    }
+
     m_mltConsumer = new Mlt::Consumer(*m_mltProfile , "sdl_preview");
     m_mltConsumer->set("resize", 1);
     m_mltConsumer->set("window_id", m_winid);
     m_mltConsumer->set("terminate_on_pause", 1);
     m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
     m_mltConsumer->set("rescale", "nearest");
+
     QString audioDevice = KdenliveSettings::audiodevicename();
     if (!audioDevice.isEmpty()) {
         tmp = decodedString(audioDevice);
@@ -125,17 +137,10 @@ void Render::buildConsumer() {
         delete[] tmp;
     }
 
-    QString videoDriver = KdenliveSettings::videodrivername();
     if (!videoDriver.isEmpty()) {
-        if (videoDriver == "x11_noaccel") {
-            setenv("SDL_VIDEO_YUV_HWACCEL", "0", 1);
-            m_mltConsumer->set("video_driver", "x11");
-        } else {
-            unsetenv("SDL_VIDEO_YUV_HWACCEL");
-            tmp = decodedString(videoDriver);
-            m_mltConsumer->set("video_driver", tmp);
-            delete[] tmp;
-        }
+        tmp = decodedString(videoDriver);
+        m_mltConsumer->set("video_driver", tmp);
+        delete[] tmp;
     }
 
     QString audioDriver = KdenliveSettings::audiodrivername();
@@ -153,6 +158,11 @@ void Render::buildConsumer() {
 
 int Render::resetProfile() {
     if (!m_mltConsumer) return 0;
+    QString currentProfile = getenv("MLT_PROFILE");
+    if (currentProfile == KdenliveSettings::current_profile()) {
+        kDebug() << "reset to same profile, nothing to do";
+        return 1;
+    }
     if (m_isSplitView) slotSplitView(false);
     if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
     m_mltConsumer->purge();
@@ -449,7 +459,7 @@ void Render::slotSplitView(bool doit) {
     }
 }
 
-void Render::getFileProperties(const QDomElement &xml, int clipId) {
+void Render::getFileProperties(const QDomElement &xml, const QString &clipId) {
     int height = 50;
     int width = (int)(height  * m_mltProfile->dar());
     QMap < QString, QString > filePropertyMap;
@@ -484,7 +494,9 @@ void Render::getFileProperties(const QDomElement &xml, int clipId) {
         emit removeInvalidClip(clipId);
         return;
     }
-    producer->set("id", clipId);
+    char *tmp = decodedString(clipId);
+    producer->set("id", tmp);
+    delete[] tmp;
     int frameNumber = xml.attribute("thumbnail", "0").toInt();
     if (frameNumber != 0) producer->seek(frameNumber);
     mlt_properties properties = MLT_PRODUCER_PROPERTIES(producer->get_producer());
@@ -1078,7 +1090,7 @@ const QString & Render::rendererName() const {
 
 
 void Render::emitFrameNumber(double position) {
-    if (m_generateScenelist) return;
+    //if (m_generateScenelist) return;
     m_framePosition = position;
     emit rendererPosition((int) position);
     //if (qApp->activeWindow()) QApplication::postEvent(qApp->activeWindow(), new PositionChangeEvent( GenTime((int) position, m_fps), m_monitorId));
@@ -1445,7 +1457,7 @@ bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool do
 }
 
 
-bool Render::mltAddEffect(int track, GenTime position, QMap <QString, QString> args, bool doRefresh) {
+bool Render::mltAddEffect(int track, GenTime position, QHash <QString, QString> args, bool doRefresh) {
 
     Mlt::Service service(m_mltProducer->parent().get_service());
 
@@ -1465,7 +1477,7 @@ bool Render::mltAddEffect(int track, GenTime position, QMap <QString, QString> a
     if (tag.startsWith("ladspa")) tag = "ladspa";
     char *filterTag = decodedString(tag);
     char *filterId = decodedString(args.value("id"));
-    QMap<QString, QString>::Iterator it;
+    QHash<QString, QString>::Iterator it;
     QString kfr = args.value("keyframes");
 
     if (!kfr.isEmpty()) {
@@ -1538,10 +1550,10 @@ bool Render::mltAddEffect(int track, GenTime position, QMap <QString, QString> a
     return true;
 }
 
-bool Render::mltEditEffect(int track, GenTime position, QMap <QString, QString> args) {
+bool Render::mltEditEffect(int track, GenTime position, QHash <QString, QString> args) {
     QString index = args.value("kdenlive_ix");
     QString tag =  args.value("tag");
-    QMap<QString, QString>::Iterator it = args.begin();
+    QHash<QString, QString>::Iterator it = args.begin();
     if (!args.value("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle") {
         // This is a keyframe effect, to edit it, we remove it and re-add it.
         mltRemoveEffect(track, position, index);
@@ -1776,6 +1788,7 @@ void Render::mltChangeTrackState(int track, bool mute, bool blind) {
 }
 
 bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) {
+    //kDebug() << "////////  RSIZING CLIP from: "<<info.startPos.frames(25)<<" to "<<diff.frames(25);
     Mlt::Service service(m_mltProducer->parent().get_service());
     int moveFrame = (int) diff.frames(m_fps);
     Mlt::Tractor tractor(service);
@@ -1785,6 +1798,7 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) {
         kDebug() << "////////  ERROR RSIZING BLANK CLIP!!!!!!!!!!!";
         return false;
     }
+    mlt_service_lock(service.get_service());
     int clipIndex = trackPlaylist.get_clip_index_at(info.startPos.frames(m_fps));
     /*int previousStart = trackPlaylist.clip_start(clipIndex);
     int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;*/
@@ -1792,9 +1806,10 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) {
     Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
     if (clip == NULL) {
         kDebug() << "////////  ERROR RSIZING NULL CLIP!!!!!!!!!!!";
+        mlt_service_unlock(service.get_service());
         return false;
     }
-    m_mltConsumer->set("refresh", 0);
+    //m_mltConsumer->set("refresh", 0);
     int previousStart = clip->get_in();
     int previousDuration = trackPlaylist.clip_length(clipIndex) - 1;
     m_isBlocked = true;
@@ -1823,7 +1838,8 @@ bool Render::mltResizeClipStart(ItemInfo info, GenTime diff) {
         mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt());
     }
     m_isBlocked = false;
-    m_mltConsumer->set("refresh", 1);
+    //m_mltConsumer->set("refresh", 1);
+    mlt_service_unlock(service.get_service());
     return true;
 }
 
@@ -1844,6 +1860,7 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn
     Mlt::Producer trackProducer(tractor.track(startTrack));
     Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
     int clipIndex = trackPlaylist.get_clip_index_at(moveStart + 1);
+    kDebug() << "//////  LOOKING FOR CLIP TO MOVE, INDEX: " << clipIndex;
     bool checkLength = false;
     if (endTrack == startTrack) {
         //mlt_service_lock(service.get_service());