X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftrackview.h;h=7002e10f72d28cb05f8f5eef96793dfdbe98ab79;hb=2b46b701a1a20a5daa519e6201e051fabca198ad;hp=1e537714e9ba93cc7da4ec39d8876b25c9d15c71;hpb=62f7974e0759e81f0855a15055bd066e4d6c5e2f;p=kdenlive

diff --git a/src/trackview.h b/src/trackview.h
index 1e537714..7002e10f 100644
--- a/src/trackview.h
+++ b/src/trackview.h
@@ -29,7 +29,6 @@
 #include <QGraphicsLineItem>
 #include <QDomElement>
 
-#define FRAME_SIZE 90
 
 #include "customtrackscene.h"
 #include "ui_timeline_ui.h"
@@ -39,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);
-
-    const double zoomFactor() const;
-    const int mapLocalToValue(int x) const;
+    explicit TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent = 0);
+    virtual ~ TrackView();
     void setEditMode(const QString & editMode);
     const QString & editMode() const;
     QGraphicsScene *projectScene();
@@ -56,49 +55,51 @@ public:
     int tracksNumber() const;
     KdenliveDoc *document();
     void refresh() ;
+    void updateProjectFps();
     int outPoint() const;
     int inPoint() const;
     int fitZoom() const;
 
 public slots:
     void slotDeleteClip(const QString &clipId);
-    void slotChangeZoom(int factor);
+    void slotChangeZoom(int horizontal, int vertical = -1);
     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;
     CustomTrackScene *m_scene;
 
     KdenliveDoc *m_doc;
-    QVBoxLayout *m_tracksLayout;
+    int m_verticalZoom;
     QVBoxLayout *m_headersLayout;
-    QScrollArea *m_scrollArea;
-    QFrame *m_scrollBox;
-    QVBoxLayout *m_tracksAreaLayout;
     QString m_documentErrors;
     void parseDocument(QDomDocument doc);
-    int slotAddProjectTrack(int ix, QDomElement xml);
+    int slotAddProjectTrack(int ix, QDomElement xml, bool locked);
+    DocClipBase *getMissingProducer(const QString id) const;
+    void adjustTrackHeaders();
 
 private slots:
     void setCursorPos(int pos);
     void moveCursorPos(int pos);
-    void slotTransitionItemSelected(Transition*, bool update);
     void slotRebuildTrackHeaders();
-
+    void slotChangeTrackLock(int ix, bool lock);
+    void slotVerticalZoomDown();
+    void slotVerticalZoomUp();
 
 signals:
     void mousePosition(int);
     void cursorMoved();
-    void transitionItemSelected(Transition*, bool);
     void zoneMoved(int, int);
     void insertTrack(int);
     void deleteTrack(int);
+    void changeTrack(int);
 };
 
 #endif