Cleanup last commit and some real mess in profile switching

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

diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp
index f38a210a0d93f45603b61e06759a5d55eb79d891..0800fe95a31a5b1a439cc9df3d032063b8a14d8d 100644 (file)
--- a/src/monitormanager.cpp
+++ b/src/monitormanager.cpp
@@ -139,11 +139,6 @@ 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 d543839b177ca82be59265ac6f5188ca5cd237aa..b619faeb704f574b1752e9d221bf9e48047e4eef 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -63,6 +63,7 @@ Render::Render(const QString & rendererName, int winid, int extid, QWidget *pare
     connect(osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout()));
 
     m_osdProfile =   KStandardDirs::locate("data", "kdenlive/profiles/metadata.properties");
+
     buildConsumer();
 
     Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "colour", "black");
@@ -93,7 +94,9 @@ void Render::closeMlt() {
 
 void Render::buildConsumer() {
     char *tmp;
-    tmp = decodedString(KdenliveSettings::current_profile());
+    m_activeProfile = KdenliveSettings::current_profile();
+    tmp = decodedString(m_activeProfile);
+    setenv("MLT_PROFILE", tmp, 1);
     m_mltProfile = new Mlt::Profile(tmp);
     delete[] tmp;
 
@@ -144,12 +147,11 @@ void Render::buildConsumer() {
 
 int Render::resetProfile() {
     if (!m_mltConsumer) return 0;
-    QString currentProfile = getenv("MLT_PROFILE");
-    if (currentProfile == KdenliveSettings::current_profile()) {
+    if (m_activeProfile == KdenliveSettings::current_profile()) {
         kDebug() << "reset to same profile, nothing to do";
         return 1;
     }
-    kDebug() << "// RESETTING PROFILE FROM: " << currentProfile << " TO: " << KdenliveSettings::current_profile();
+    kDebug() << "// RESETTING PROFILE FROM: " << m_activeProfile << " TO: " << KdenliveSettings::current_profile();
     if (m_isSplitView) slotSplitView(false);
     if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
     m_mltConsumer->purge();
@@ -162,22 +164,24 @@ int Render::resetProfile() {
         delete m_mltProducer;
     }
     m_mltProducer = NULL;
-    if (m_mltProfile) delete m_mltProfile;
-    m_mltProfile = NULL;
+
+    //WARNING: Trying to delete the profile will crash when trying to display a clip afterwards...
+    /*if (m_mltProfile) delete m_mltProfile;
+    m_mltProfile = NULL;*/
+
     buildConsumer();
 
     //kDebug() << "//RESET WITHSCENE: " << scene;
     setSceneList(scene, pos);
 
-    char *tmp = decodedString(scene);
+    /*char *tmp = decodedString(scene);
     Mlt::Producer *producer = new Mlt::Producer(*m_mltProfile , "westley-xml", tmp);
     delete[] tmp;
     m_mltProducer = producer;
-    if (m_blackClip) delete m_blackClip;
     m_blackClip = new Mlt::Producer(*m_mltProfile , "colour", "black");
     m_mltProducer->optimise();
     m_mltProducer->set_speed(0);
-    connectPlaylist();
+    connectPlaylist();*/
 
     //delete m_mltProfile;
     // mlt_properties properties = MLT_CONSUMER_PROPERTIES(m_mltConsumer->get_consumer());

diff --git a/src/renderer.h b/src/renderer.h
index 98b109c259f38e02ee4de57d10a5292a967cde62..c301d72849dc6e504434687b474be4d949323ee5 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -206,6 +206,7 @@ private:   // Private attributes & methods
     Mlt::Producer *m_blackClip;
     /** Holds the path to on screen display profile */
     QString m_osdProfile;
+    QString m_activeProfile;
 
     QTimer *refreshTimer;
     QTimer *osdTimer;