X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftrackview.h;h=345190c575df6624f1224b6e874e2fc14e2c7e8b;hb=e1984120c805806cba78941ec08839285c3b2591;hp=2f01be7e1a6fb77945d9f968010a41888df22f46;hpb=06fabc683a3bddc60ba59573a62458ca4f6a0ef6;p=kdenlive

diff --git a/src/trackview.h b/src/trackview.h
index 2f01be7e..345190c5 100644
--- a/src/trackview.h
+++ b/src/trackview.h
@@ -28,8 +28,9 @@
 #include <QGraphicsScene>
 #include <QGraphicsLineItem>
 #include <QDomElement>
-#define FRAME_SIZE 90
 
+
+#include "customtrackscene.h"
 #include "ui_timeline_ui.h"
 
 class ClipItem;
@@ -37,15 +38,15 @@ class Transition;
 class CustomTrackView;
 class KdenliveDoc;
 class CustomRuler;
+class DocClipBase;
 
-class TrackView : public QWidget {
+class TrackView : public QWidget
+{
     Q_OBJECT
 
 public:
-    TrackView(KdenliveDoc *doc, QWidget *parent = 0);
+    explicit TrackView(KdenliveDoc *doc, QWidget *parent = 0);
 
-    const double zoomFactor() const;
-    const int mapLocalToValue(int x) const;
     void setEditMode(const QString & editMode);
     const QString & editMode() const;
     QGraphicsScene *projectScene();
@@ -56,46 +57,46 @@ 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;
+    Ui::TimeLine_UI m_view;
     CustomRuler *m_ruler;
     CustomTrackView *m_trackview;
+    QList <QString> m_invalidProducers;
     double m_scale;
     int m_projectTracks;
     QString m_editMode;
-    QGraphicsScene *m_scene;
-    uint m_currentZoom;
+    CustomTrackScene *m_scene;
 
     KdenliveDoc *m_doc;
-    QVBoxLayout *m_tracksLayout;
     QVBoxLayout *m_headersLayout;
-    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, bool locked);
+    DocClipBase *getMissingProducer(const QString id) const;
 
 private slots:
     void setCursorPos(int pos);
     void moveCursorPos(int pos);
-    void slotClipItemSelected(ClipItem*);
-    void slotTransitionItemSelected(Transition*);
+    void slotTransitionItemSelected(Transition*, QPoint p, bool update);
     void slotRebuildTrackHeaders();
+    void slotChangeTrackLock(int ix, bool lock);
 
 signals:
     void mousePosition(int);
     void cursorMoved();
-    void clipItemSelected(ClipItem*);
-    void transitionItemSelected(Transition*);
+    void transitionItemSelected(Transition*, QPoint, bool);
+    void zoneMoved(int, int);
+    void insertTrack(int);
+    void deleteTrack(int);
+    void changeTrack(int);
 };
 
 #endif