use more forward decl. to have no unneeded recompiling

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

diff --git a/src/addclipcommand.cpp b/src/addclipcommand.cpp
index 7566bf76b6ed4003a18d16c2027048582854e48f..e1e5ca736d12cd7e8a32aa910556e075becba8e5 100644 (file)
--- a/src/addclipcommand.cpp
+++ b/src/addclipcommand.cpp
@@ -20,6 +20,7 @@
 #include <KLocale>
 
 #include "addclipcommand.h"
+#include "kdenlivedoc.h"
 
 AddClipCommand::AddClipCommand(KdenliveDoc *doc, const QDomElement &xml, const uint id, bool doIt)
         : m_doc(doc), m_xml(xml), m_id(id), m_doIt(doIt) {

diff --git a/src/addclipcommand.h b/src/addclipcommand.h
index 37ee141fc08293f808a2d22732d448f25ff35249..d5d51e025920ffd447695431b0f2033e8c20d872 100644 (file)
--- a/src/addclipcommand.h
+++ b/src/addclipcommand.h
@@ -23,8 +23,9 @@
 
 #include <QUndoCommand>
 #include <KDebug>
+#include <QDomElement>
 
-#include "kdenlivedoc.h"
+class KdenliveDoc;
 
 class AddClipCommand : public QUndoCommand {
 public:

diff --git a/src/addeffectcommand.cpp b/src/addeffectcommand.cpp
index 1f8fac4ef43b3cf3965a68deccd6f053b8fd3231..cceed84386343ce6572e9a948acd7242ee8e9698 100644 (file)
--- a/src/addeffectcommand.cpp
+++ b/src/addeffectcommand.cpp
@@ -20,6 +20,7 @@
 #include <KLocale>
 
 #include "addeffectcommand.h"
+#include "customtrackview.h"
 
 AddEffectCommand::AddEffectCommand(CustomTrackView *view, const int track, GenTime pos, QDomElement effect, bool doIt)
         : m_view(view), m_track(track), m_pos(pos), m_effect(effect), m_doIt(doIt) {

diff --git a/src/addeffectcommand.h b/src/addeffectcommand.h
index a62f7a81f347ca8d10b8987d73671ef73c46201c..6f1fbfca24ef6f80dd0c06fd55bd3d4cb94709d2 100644 (file)
--- a/src/addeffectcommand.h
+++ b/src/addeffectcommand.h
@@ -23,8 +23,10 @@
 
 #include <QUndoCommand>
 #include <KDebug>
+#include <QDomElement>
+#include "gentime.h"
 
-#include "customtrackview.h"
+class CustomTrackView;
 
 class AddEffectCommand : public QUndoCommand {
 public:

diff --git a/src/addtimelineclipcommand.cpp b/src/addtimelineclipcommand.cpp
index fdb32bfff2e77faa6fa9a78df87c489784db46ca..1ef0e60a2e2c5beb55f98a8f2615d591371a9568 100644 (file)
--- a/src/addtimelineclipcommand.cpp
+++ b/src/addtimelineclipcommand.cpp
@@ -20,6 +20,7 @@
 #include <KLocale>
 
 #include "addtimelineclipcommand.h"
+#include "customtrackview.h"
 
 AddTimelineClipCommand::AddTimelineClipCommand(CustomTrackView *view, QDomElement xml, int clipId, int track, GenTime startpos, QRectF rect, GenTime duration, bool doIt, bool doRemove)
         : m_view(view), m_xml(xml), m_clipId(clipId), m_clipTrack(track), m_clipPos(startpos), m_clipRect(rect), m_clipDuration(duration), m_doIt(doIt), m_remove(doRemove) {

diff --git a/src/addtimelineclipcommand.h b/src/addtimelineclipcommand.h
index 4e030285bb4875f25f0d1982eb12b05a25e7d7ca..8c060c1c992efc9ed9cf0f491c3beea2632b751c 100644 (file)
--- a/src/addtimelineclipcommand.h
+++ b/src/addtimelineclipcommand.h
@@ -24,12 +24,12 @@
 #include <QUndoCommand>
 #include <QGraphicsView>
 #include <QPointF>
-
+#include <QDomElement>
 #include <KDebug>
 
 #include "gentime.h"
-#include "projectlist.h"
-#include "customtrackview.h"
+
+class CustomTrackView;
 
 class AddTimelineClipCommand : public QUndoCommand {
 public:

diff --git a/src/addtransitioncommand.cpp b/src/addtransitioncommand.cpp
index 65bb145d0c87813aabbfa9817f624de6a90dbffa..54250d280e31538227e51d921bb822b5d10fb324 100644 (file)
--- a/src/addtransitioncommand.cpp
+++ b/src/addtransitioncommand.cpp
@@ -17,6 +17,7 @@
 #include <KLocale>
 
 #include "addtransitioncommand.h"
+#include "customtrackview.h"
 
 AddTransitionCommand::AddTransitionCommand(CustomTrackView *view, int track, QDomElement xml, GenTime pos, bool doIt) : m_view(view), m_track(track), m_xml(xml), m_pos(pos), m_doIt(doIt) {
     if (m_doIt) setText(i18n("Add transition to clip"));

diff --git a/src/addtransitioncommand.h b/src/addtransitioncommand.h
index eb01870171713f28f3d94647cc280bd6f1167778..dfa07f70595c5184bfdb865325fffb69f9f7cec3 100644 (file)
--- a/src/addtransitioncommand.h
+++ b/src/addtransitioncommand.h
@@ -21,12 +21,13 @@
 #include <QUndoCommand>
 #include <QGraphicsView>
 #include <QPointF>
-
+#include <QDomElement>
 #include <KDebug>
 
 #include "gentime.h"
-#include "projectlist.h"
-#include "customtrackview.h"
+
+class CustomTrackView;
+
 
 class AddTransitionCommand : public QUndoCommand {
 public:

diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index 8eb1abda39dd93ad87cf507784c8734080ac78fc..7050d013ccbdb36ccea630d7335128787e384aa2 100644 (file)
--- a/src/clipitem.cpp
+++ b/src/clipitem.cpp
@@ -35,8 +35,11 @@
 #include "clipitem.h"
 #include "customtrackview.h"
 #include "renderer.h"
+#include "docclipbase.h"
+#include "transition.h"
 #include "events.h"
 #include "kdenlivesettings.h"
+#include "kthumb.h"
 
 ClipItem::ClipItem(DocClipBase *clip, int track, GenTime startpos, const QRectF & rect, GenTime duration, double fps)
         : AbstractClipItem(rect), m_clip(clip), m_resizeMode(NONE), m_grabPoint(0), m_maxTrack(0), m_hasThumbs(false), startThumbTimer(NULL), endThumbTimer(NULL), m_effectsCounter(1), audioThumbWasDrawn(false), m_opacity(1.0), m_timeLine(0), m_thumbsRequested(0), m_hover(false) {

diff --git a/src/clipitem.h b/src/clipitem.h
index a61cecee406cd8f7782c1c30cfa0bb2d0c4f3951..efbbd144380ece7f0bf71216011d151d78a9c3cb 100644 (file)
--- a/src/clipitem.h
+++ b/src/clipitem.h
@@ -29,11 +29,11 @@
 #include "definitions.h"
 #include "gentime.h"
 #include "effectslist.h"
-#include "docclipbase.h"
-#include "kthumb.h"
-#include "transition.h"
 #include "abstractclipitem.h"
 
+class DocClipBase;
+class Transition;
+
 class ClipItem : public AbstractClipItem {
     Q_OBJECT
 

diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp
index 8eff513a9c2ae297d4097965d1993246e6a3690c..b8ec826338299dbcea35db22443ba077bd75171c 100644 (file)
--- a/src/clipmanager.cpp
+++ b/src/clipmanager.cpp
@@ -23,6 +23,7 @@
 #include "kdenlivesettings.h"
 #include "clipmanager.h"
 #include "docclipbase.h"
+#include "kdenlivedoc.h"
 
 ClipManager::ClipManager(KdenliveDoc *doc): m_doc(doc) {
     m_clipIdCounter = 1;

diff --git a/src/complexparameter.h b/src/complexparameter.h
index 50eec4dbdcb422938ef03eab79ea4c58bda96d24..6ecf0eaf705b94d74b2b7b456be11869bfbb7619 100644 (file)
--- a/src/complexparameter.h
+++ b/src/complexparameter.h
@@ -21,9 +21,9 @@
 #include <KIcon>
 
 #include "ui_keyframewidget_ui.h"
-#include "clipitem.h"
-class EffectsList;
 
+class EffectsList;
+class ClipItem;
 
 class ComplexParameter : public QWidget {
     Q_OBJECT

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 035a1e1a2b50e9cf6f9b0d668476ecd4ab9a5c1c..3d8a68d5b59f7b4fdcee63fd68537731829c80fc 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -29,6 +29,7 @@
 #include <KCursor>
 
 #include "customtrackview.h"
+#include "docclipbase.h"
 #include "clipitem.h"
 #include "definitions.h"
 #include "moveclipcommand.h"
@@ -40,7 +41,9 @@
 #include "edittransitioncommand.h"
 #include "kdenlivesettings.h"
 #include "transition.h"
-
+#include "clipitem.h"
+#include "customtrackview.h"
+#include "clipmanager.h"
 //TODO:
 // disable animation if user asked it in KDE's global settings
 // http://lists.kde.org/?l=kde-commits&m=120398724717624&w=2
@@ -560,7 +563,7 @@ void CustomTrackView::addTransition(int startTrack, GenTime startPos , QDomEleme
            )
             map[attribs.item(i).nodeName()] = attribs.item(i).nodeValue();
     }
-
+    map["resource"] = "%luma12.pgm";
     kDebug() << "---- ADDING transition " << e.attribute("type") << ", on tracks " << m_tracksList.count() - e.attribute("transition_track").toInt() << " / " << getPreviousVideoTrack(e.attribute("transition_track").toInt());
     m_document->renderer()->mltAddTransition(e.attribute("type"), getPreviousVideoTrack(e.attribute("transition_track").toInt()), m_tracksList.count() - e.attribute("transition_track").toInt() ,
             GenTime(e.attribute("start").toInt(), m_document->renderer()->fps()),

diff --git a/src/customtrackview.h b/src/customtrackview.h
index f9861aa8336a8a35607108eed226b21dd3f0012a..fe5003f5dbd926c779504e7ce8b094e15ff38b92 100644 (file)
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -29,9 +29,10 @@
 #include <KUndoStack>
 
 #include "kdenlivedoc.h"
-#include "clipitem.h"
-
 
+class ClipItem;
+class AbstractClipItem;
+class Transition;
 
 class CustomTrackView : public QGraphicsView {
     Q_OBJECT

diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp
index 8befddb227a5dd22d39e431affe4d0134a1bf8b7..2c4501a4524d03cce4820d757821cc791b4298e2 100644 (file)
--- a/src/docclipbase.cpp
+++ b/src/docclipbase.cpp
@@ -19,6 +19,8 @@
 
 #include "kdenlivesettings.h"
 #include "docclipbase.h"
+#include "kthumb.h"
+#include "clipmanager.h"
 
 DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, uint id):
         m_xml(xml), m_id(id), m_description(""), m_refcount(0), m_projectThumbFrame(0), m_audioThumbCreated(false), m_duration(GenTime()), m_thumbProd(NULL), m_audioTimer(NULL) {

diff --git a/src/docclipbase.h b/src/docclipbase.h
index 0654a58b1d40da3c0d96ee9a7b1f7921026d5a52..159b20a611c2b293f12c1e5aa8359bbd329978be 100644 (file)
--- a/src/docclipbase.h
+++ b/src/docclipbase.h
@@ -31,9 +31,7 @@
 #include <klocale.h>
 
 #include "gentime.h"
-#include "clipmanager.h"
 #include "definitions.h"
-#include "kthumb.h"
 
 /*
 class DocTrackBase;
@@ -42,6 +40,8 @@ class DocClipTextFile;
 class DocClipVirtual;
 class EffectDescriptionList;*/
 class KdenliveDoc;
+class KThumb;
+class ClipManager;
 
 class CommentedTime {
 public:

diff --git a/src/editeffectcommand.cpp b/src/editeffectcommand.cpp
index 679cf75bfa3ed4aa5f3ddb889fc54294ab4ef0f6..c55aeb43127908d71f838472eb1a0840585ef6bf 100644 (file)
--- a/src/editeffectcommand.cpp
+++ b/src/editeffectcommand.cpp
@@ -20,6 +20,7 @@
 #include <KLocale>
 
 #include "editeffectcommand.h"
+#include "customtrackview.h"
 
 EditEffectCommand::EditEffectCommand(CustomTrackView *view, const int track, GenTime pos, QDomElement oldeffect, QDomElement effect, bool doIt)
         : m_view(view), m_track(track), m_pos(pos), m_oldeffect(oldeffect), m_doIt(doIt) {

diff --git a/src/editeffectcommand.h b/src/editeffectcommand.h
index 902011ababec91b855c533b0ec230331cf426aae..369868349ed27a07043fa0914b12f2aa206ace78 100644 (file)
--- a/src/editeffectcommand.h
+++ b/src/editeffectcommand.h
@@ -23,8 +23,10 @@
 
 #include <QUndoCommand>
 #include <KDebug>
+#include <gentime.h>
+#include <QDomElement>
 
-#include "customtrackview.h"
+class CustomTrackView;
 
 class EditEffectCommand : public QUndoCommand {
 public:

diff --git a/src/edittransitioncommand.cpp b/src/edittransitioncommand.cpp
index bfd062de9a4aa2f5acd5a496ad48625184aca1ad..0708d33e3d4a8f55e4532db173d431f3aecf5d23 100644 (file)
--- a/src/edittransitioncommand.cpp
+++ b/src/edittransitioncommand.cpp
@@ -17,6 +17,7 @@
 #include <KLocale>
 
 #include "edittransitioncommand.h"
+#include "customtrackview.h"
 
 EditTransitionCommand::EditTransitionCommand(CustomTrackView *view, const int track, GenTime pos, QDomElement oldeffect, QDomElement effect, bool doIt)
         : m_view(view), m_track(track), m_pos(pos), m_oldeffect(oldeffect), m_doIt(doIt) {
@@ -48,7 +49,7 @@ void EditTransitionCommand::undo() {
 }
 // virtual
 void EditTransitionCommand::redo() {
-    m_view->updateTransition(m_track, m_pos,m_oldeffect, m_effect);
+    m_view->updateTransition(m_track, m_pos, m_oldeffect, m_effect);
 }
 
 #include "editeffectcommand.moc"

diff --git a/src/edittransitioncommand.h b/src/edittransitioncommand.h
index 3fbacb3a36286200f49791b3947c2d99a9567dcc..0a6c16d8552b048a69992ee89a1cbbf7242dca26 100644 (file)
--- a/src/edittransitioncommand.h
+++ b/src/edittransitioncommand.h
@@ -20,8 +20,10 @@
 
 #include <QUndoCommand>
 #include <KDebug>
+#include <QDomElement>
+#include "gentime.h"
 
-#include "customtrackview.h"
+class CustomTrackView;
 
 class EditTransitionCommand : public QUndoCommand {
 public:

diff --git a/src/effectslistview.cpp b/src/effectslistview.cpp
index 727cfbb0dfcdfebe47f8905fe2431248da0874fc..df10a61eaca2023f4cb0f720d48c26a5d8e0a658 100644 (file)
--- a/src/effectslistview.cpp
+++ b/src/effectslistview.cpp
@@ -22,6 +22,8 @@
 #include <KLocale>
 
 #include "effectslistview.h"
+#include "effectslistwidget.h"
+#include "effectslist.h"
 
 EffectsListView::EffectsListView(EffectsList *audioEffectList, EffectsList *videoEffectList, EffectsList *customEffectList, QWidget *parent)
         : QWidget(parent) {

diff --git a/src/effectslistview.h b/src/effectslistview.h
index 84eed84f0de26e40926148c380e9130cd554effa..599a0ae54de1f592caab04602939cb9a9dc08e82 100644 (file)
--- a/src/effectslistview.h
+++ b/src/effectslistview.h
@@ -24,9 +24,12 @@
 #include <KIcon>
 
 #include "ui_effectlist_ui.h"
-#include "effectslistwidget.h"
 #include "gentime.h"
-#include "effectslist.h"
+#include <QDomElement>
+
+class EffectsList;
+class EffectsListWidget;
+class KListWidget;
 
 class EffectsListView : public QWidget {
     Q_OBJECT

diff --git a/src/effectslistwidget.cpp b/src/effectslistwidget.cpp
index ed76f14cfb39f6be5d6448f3a6e88c7e3011baae..7eb9f4f8805b6422d3605395cefbe81b5fe8bebd 100644 (file)
--- a/src/effectslistwidget.cpp
+++ b/src/effectslistwidget.cpp
@@ -23,6 +23,7 @@
 #include "KDebug"
 
 #include "effectslistwidget.h"
+#include "effectslist.h"
 
 #define EFFECT_VIDEO 1
 #define EFFECT_AUDIO 2

diff --git a/src/effectslistwidget.h b/src/effectslistwidget.h
index 317b8c7d55db080750578a730c6abcae2c786791..0635075e059af3b97a801c58be2d52dbef19a598 100644 (file)
--- a/src/effectslistwidget.h
+++ b/src/effectslistwidget.h
@@ -22,7 +22,9 @@
 #define EFFECTLISTWIDGET_H
 
 #include <KListWidget>
-#include "effectslist.h"
+#include <QDomElement>
+
+class EffectsList;
 
 class EffectsListWidget : public KListWidget {
     Q_OBJECT

diff --git a/src/effectstackview.h b/src/effectstackview.h
index 63f74544a5b3c1572380235197f5113d13bbf0c5..dc14ace586210b3d4c68437d4fb6d3a75b39f058 100644 (file)
--- a/src/effectstackview.h
+++ b/src/effectstackview.h
@@ -18,11 +18,10 @@
 #ifndef EFFECTSTACKVIEW_H
 #define EFFECTSTACKVIEW_H
 
-#include "clipitem.h"
 #include "ui_effectstack_ui.h"
 #include "effectstackedit.h"
 class EffectsList;
-
+class ClipItem;
 
 class EffectStackView : public QWidget {
     Q_OBJECT

diff --git a/src/initeffects.cpp b/src/initeffects.cpp
index 7dab6c211e420f3f4fd8be33a3b9d16b0b0915dc..e574dc9b14948d257735ae8052486b187d958ede 100644 (file)
--- a/src/initeffects.cpp
+++ b/src/initeffects.cpp
@@ -27,6 +27,8 @@
 #include <KStandardDirs>
 
 #include "initeffects.h"
+#include "kdenlivesettings.h"
+#include "effectslist.h"
 
 initEffects::initEffects() {
 }
@@ -405,6 +407,8 @@ QDomDocument initEffects::createDescriptionFromMlt(Mlt::Repository* repository,
 void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList* transitions, QStringList names) {
     foreach(QString name, names) {
         QDomDocument ret;
+
+
         Mlt::Properties *metadata = repository->metadata(transition_type, name.toAscii().data());
         //kDebug() << filtername;
         if (metadata && metadata->is_valid()) {
@@ -417,9 +421,11 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList*
                 ktrans.appendChild(tname);
             }
             transitions->append(ret.documentElement());
-            kDebug() << ret.toString();
+            //kDebug() << ret.toString();
         } else {
+
             if (name == "luma") {
+
                 QDomDocument ret;
                 QDomElement ktrans = ret.createElement("ktransition");
                 ret.appendChild(ktrans);
@@ -436,6 +442,18 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList*
                 QDomElement tname1 = ret.createElement("name");
                 tname1.appendChild(ret1.createTextNode("Lumafile"));
                 ktrans1.appendChild(tname1);
+
+                QString path(mlt_environment("MLT_DATA"));
+                path.append("/lumas/").append(mlt_environment("MLT_NORMALISATION"));
+                Mlt::Properties entries;
+                mlt_properties_dir_list(entries.get_properties(), path.toAscii().data(), "*.*", 1);
+                kDebug() << path << entries.count();
+                for (int i = 0;i < entries.count();i++) {
+                    kDebug() << "luma:" << entries.get(i);
+                }
+
+
+
                 transitions->append(ret1.documentElement());
             } else if (name == "composite") {
                 QDomDocument ret;

diff --git a/src/initeffects.h b/src/initeffects.h
index a91a892d29087f929db86eb316f8a62381d29d9e..70826343faebcab910262ced66f2b071e90f8a77 100644 (file)
--- a/src/initeffects.h
+++ b/src/initeffects.h
@@ -19,16 +19,16 @@
 #define InitEffects_H
 
 #include <klocale.h>
-
+#include <QDomDocument>
 #include <mlt++/Mlt.h>
 
-#include "kdenlivesettings.h"
-#include "effectslist.h"
 
 /**Init the MLT effects
   *@author Jean-Baptiste Mardelle
   */
 
+class EffectsList;
+
 class initEffects {
 public:
     initEffects();

diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp
index f9a358ddd67411f060035d1d3a340133131af671..64ce8e170f5b8c44da0e254efb50aaf5813adc45 100644 (file)
--- a/src/kdenlivedoc.cpp
+++ b/src/kdenlivedoc.cpp
@@ -29,6 +29,8 @@
 #include "docclipbase.h"
 #include "profilesdialog.h"
 #include "kdenlivesettings.h"
+#include "renderer.h"
+#include "clipmanager.h"
 
 KdenliveDoc::KdenliveDoc(const KUrl &url, MltVideoProfile profile, QUndoGroup *undoGroup, QWidget *parent): QObject(parent), m_render(NULL), m_url(url), m_profile(profile), m_fps((double)profile.frame_rate_num / profile.frame_rate_den), m_width(profile.width), m_height(profile.height), m_commandStack(new KUndoStack(undoGroup)), m_modified(false) {
     m_clipManager = new ClipManager(this);

diff --git a/src/kdenlivedoc.h b/src/kdenlivedoc.h
index 6c6f783f94b84c159054937075627cb7a87ea4c0..8f278302d71c539d606d8f3a1a81380abb15f745 100644 (file)
--- a/src/kdenlivedoc.h
+++ b/src/kdenlivedoc.h
@@ -33,10 +33,12 @@
 
 #include "gentime.h"
 #include "timecode.h"
-#include "renderer.h"
-#include "clipmanager.h"
 #include "definitions.h"
 
+class Render;
+class ClipManager;
+class DocClipBase;
+
 class KdenliveDoc: public QObject {
 Q_OBJECT public:
 

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 8097be716aac75cef53b3d564c3ad0533f8b2dba..1cc5120cbc6cf6a69acbaa5c2bc78e61f25c66d3 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -57,6 +57,19 @@
 #include "projectsettings.h"
 #include "events.h"
 #include "renderjob.h"
+#include "clipmanager.h"
+#include "projectlist.h"
+#include "monitor.h"
+#include "recmonitor.h"
+#include "monitormanager.h"
+#include "kdenlivedoc.h"
+#include "trackview.h"
+#include "customtrackview.h"
+#include "effectslistview.h"
+#include "effectstackview.h"
+#include "transitionsettings.h"
+#include "renderwidget.h"
+#include "jogshuttle.h"
 
 #define ID_STATUS_MSG 1
 #define ID_EDITMODE_MSG 2

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 74b8895b327498061ce6143ffc4fcc38d18ac5ab..e2627d6e11913e5815ac8143a60b173cf29ae65a 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -35,20 +35,21 @@
 #include <KRecentFilesAction>
 #include <KComboBox>
 
-#include "projectlist.h"
-#include "monitor.h"
-#include "recmonitor.h"
-#include "monitormanager.h"
-#include "kdenlivedoc.h"
-#include "trackview.h"
-#include "customtrackview.h"
-#include "effectslist.h"
-#include "effectslistview.h"
-#include "effectstackview.h"
-#include "transitionsettings.h"
 #include "ui_timelinebuttons_ui.h"
-#include "renderwidget.h"
-#include "jogshuttle.h"
+#include "effectslist.h"
+#include "gentime.h"
+class KdenliveDoc;
+class TrackView;
+class MonitorManager;
+class ProjectList;
+class EffectsListView;
+class EffectStackView;
+class TransitionSettings;
+class Monitor;
+class RecMonitor;
+class CustomTrackView;
+class RenderWidget;
+class JogShuttle;
 
 class MainWindow : public KXmlGuiWindow {
     Q_OBJECT

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index b5e71a15213954e66bffe95ddda397e6369bc537..eca0ae6a000ee944cf75300542d9623e2a8b3e46 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -43,7 +43,7 @@
 
 #include "definitions.h"
 #include "titlewidget.h"
-
+#include "clipmanager.h"
 #include <QtGui>
 
 ProjectList::ProjectList(QWidget *parent)

diff --git a/src/renderer.cpp b/src/renderer.cpp
index e82b516057ab95405fe957eafb8e848e43cdd3a6..9acef7efabb154f0596ca8478e9cb67405344fff 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -1407,6 +1407,7 @@ void Render::mltDeleteTransition(QString tag, int a_track, int b_track, GenTime
 
     replaceTimelineTractor(newTractor);
     m_mltProducer->seek(old_position);
+
     refresh();
 
 }
@@ -1442,18 +1443,19 @@ void Render::mltAddTransition(QString tag, int a_track, int b_track, GenTime in,
     field->plant_transition(transition, a_track, b_track);
     delete[] transId;
     m_isBlocked = false;
+    mltSavePlaylist();
     refresh();
 }
 
 void Render::mltSavePlaylist() {
     kWarning() << "// UPDATING PLAYLIST TO DISK++++++++++++++++";
-    Mlt::Consumer *fileConsumer = new Mlt::Consumer(*m_mltProfile, "westley");
-    fileConsumer->set("resource", "/tmp/playlist.westley");
+    Mlt::Consumer fileConsumer(*m_mltProfile, "westley");
+    fileConsumer.set("resource", "/tmp/playlist.westley");
 
     Mlt::Service service(m_mltProducer->get_service());
 
-    fileConsumer->connect(service);
-    fileConsumer->start();
+    fileConsumer.connect(service);
+    fileConsumer.start();
 
 }
 

diff --git a/src/trackview.cpp b/src/trackview.cpp
index 89c43e0d38ea52f061d2d477d7c9fce605f39bf7..7dc5f14669f149bafed8a93e73bbe4f2343af05e 100644 (file)
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -29,6 +29,7 @@
 #include "trackview.h"
 #include "clipitem.h"
 #include "kdenlivesettings.h"
+#include "clipmanager.h"
 
 TrackView::TrackView(KdenliveDoc *doc, QWidget *parent)
         : QWidget(parent), m_doc(doc), m_scale(1.0), m_projectTracks(0), m_currentZoom(4) {