Don't crash when wrong sdl driver was selected by user (needs MLT patch):

[kdenlive] / src / trackview.h

diff --git a/src/trackview.h b/src/trackview.h
index 4c76dbb5849bc38e6c583c12174e11f8a0828e8c..16a3975d39ec88da37c48ac02def6c9782e85025 100644 (file)
--- a/src/trackview.h
+++ b/src/trackview.h
@@ -45,8 +45,8 @@ class TrackView : public QWidget
     Q_OBJECT
 
 public:
-    explicit TrackView(KdenliveDoc *doc, QWidget *parent = 0);
-
+    explicit TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent = 0);
+    virtual ~ TrackView();
     void setEditMode(const QString & editMode);
     const QString & editMode() const;
     QGraphicsScene *projectScene();
@@ -61,12 +61,12 @@ public:
 
 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;
@@ -76,27 +76,25 @@ private:
     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, 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);