Fix tracks issues (load & save of tracks with hidden audio or video), also fix

[kdenlive] / src / trackview.h

diff --git a/src/trackview.h b/src/trackview.h
index 2f01be7e1a6fb77945d9f968010a41888df22f46..1e537714e9ba93cc7da4ec39d8876b25c9d15c71 100644 (file)
--- a/src/trackview.h
+++ b/src/trackview.h
@@ -28,8 +28,10 @@
 #include <QGraphicsScene>
 #include <QGraphicsLineItem>
 #include <QDomElement>
+
 #define FRAME_SIZE 90
 
+#include "customtrackscene.h"
 #include "ui_timeline_ui.h"
 
 class ClipItem;
@@ -56,13 +58,13 @@ public:
     void refresh() ;
     int outPoint() const;
     int inPoint() const;
-    int currentZoom() const;
     int fitZoom() const;
 
 public slots:
-    void slotDeleteClip(int clipId);
+    void slotDeleteClip(const QString &clipId);
     void slotChangeZoom(int factor);
     void setDuration(int dur);
+    void slotSetZone(QPoint p);
 
 private:
     Ui::TimeLine_UI *view;
@@ -71,8 +73,7 @@ private:
     double m_scale;
     int m_projectTracks;
     QString m_editMode;
-    QGraphicsScene *m_scene;
-    uint m_currentZoom;
+    CustomTrackScene *m_scene;
 
     KdenliveDoc *m_doc;
     QVBoxLayout *m_tracksLayout;
@@ -80,22 +81,24 @@ private:
     QScrollArea *m_scrollArea;
     QFrame *m_scrollBox;
     QVBoxLayout *m_tracksAreaLayout;
+    QString m_documentErrors;
     void parseDocument(QDomDocument doc);
-    int slotAddAudioTrack(int ix, QDomElement xml);
-    int slotAddVideoTrack(int ix, QDomElement xml);
+    int slotAddProjectTrack(int ix, QDomElement xml);
 
 private slots:
     void setCursorPos(int pos);
     void moveCursorPos(int pos);
-    void slotClipItemSelected(ClipItem*);
-    void slotTransitionItemSelected(Transition*);
+    void slotTransitionItemSelected(Transition*, bool update);
     void slotRebuildTrackHeaders();
 
+
 signals:
     void mousePosition(int);
     void cursorMoved();
-    void clipItemSelected(ClipItem*);
-    void transitionItemSelected(Transition*);
+    void transitionItemSelected(Transition*, bool);
+    void zoneMoved(int, int);
+    void insertTrack(int);
+    void deleteTrack(int);
 };
 
 #endif