Fix initializing of project monitor aspect (previously did not change from 4:3 to...

svn path=/branches/KDE4/; revision=2882

diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp
index 8788f385f335f8e3adb595aae1fc92966c712410..f38a210a0d93f45603b61e06759a5d55eb79d891 100644 (file)
--- a/src/monitormanager.cpp
+++ b/src/monitormanager.cpp
@@ -21,9 +21,11 @@
 #include <QObject>
 #include <QTimer>
 
-#include "monitormanager.h"
 #include <mlt++/Mlt.h>
 
+#include "monitormanager.h"
+#include "kdenlivesettings.h"
+
 MonitorManager::MonitorManager(QWidget *parent)
         : QObject(parent) {
 }
@@ -137,6 +139,11 @@ void MonitorManager::slotResetProfiles() {
     m_clipMonitor->resetProfile();
     activateMonitor("project");
     m_projectMonitor->resetProfile();
+    char *tmp;
+    tmp = (char *) qstrdup(QString(KdenliveSettings::current_profile()).toUtf8().data());
+    setenv("MLT_PROFILE", tmp, 1);
+    delete[] tmp;
+
     //m_projectMonitor->refreshMonitor(true);
 }
 

diff --git a/src/renderer.cpp b/src/renderer.cpp
index d13619554574520e535fd07877366b0ae87f8176..d543839b177ca82be59265ac6f5188ca5cd237aa 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -95,10 +95,8 @@ void Render::buildConsumer() {
     char *tmp;
     tmp = decodedString(KdenliveSettings::current_profile());
     m_mltProfile = new Mlt::Profile(tmp);
-    setenv("MLT_PROFILE", tmp, 1);
     delete[] tmp;
 
-
     QString videoDriver = KdenliveSettings::videodrivername();
     if (!videoDriver.isEmpty()) {
         if (videoDriver == "x11_noaccel") {
@@ -114,7 +112,7 @@ void Render::buildConsumer() {
     m_mltConsumer->set("resize", 1);
     m_mltConsumer->set("window_id", m_winid);
     m_mltConsumer->set("terminate_on_pause", 1);
-    //m_mltConsumer->set("fullscreen", 1);
+
     m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
     m_mltConsumer->set("rescale", "nearest");