Fix audio thumbs not displayed on project opening and abortion if audio thumbs creation

[kdenlive] / src / geometryval.h

diff --git a/src/geometryval.h b/src/geometryval.h
index 55bcc7115c98f3a3c83f2e07dd06196a6c18a5fd..243a09faf295181380bbd52ee8b76dcdafdb165b 100644 (file)
--- a/src/geometryval.h
+++ b/src/geometryval.h
@@ -22,6 +22,7 @@
 #include <QWidget>
 #include <QDomElement>
 #include <QGraphicsPathItem>
+#include <QGraphicsView>
 
 #include <mlt++/Mlt.h>
 
@@ -36,33 +37,36 @@ class QGraphicsRectItem;
 class QMouseEvent;
 
 
-class Geometryval : public QWidget
+class Geometryval : public QWidget, public Ui::Geometryval
 {
     Q_OBJECT
 public:
-    explicit Geometryval(const MltVideoProfile profile, QPoint frame_size, QWidget* parent = 0);
+    explicit Geometryval(const MltVideoProfile profile, QPoint frame_size, int startPoint = 0, QWidget* parent = 0);
     virtual ~Geometryval();
     QDomElement getParamDesc();
+    QString getValue() const;
     void setFrameSize(QPoint p);
 
 private:
-    Ui::Geometryval m_ui;
     MltVideoProfile m_profile;
+    int m_realWidth;
     GraphicsSceneRectMove *m_scene;
-    QDomElement m_param;
     QGraphicsRectItem *m_paramRect;
     Mlt::Geometry *m_geom;
     KeyframeHelper *m_helper;
     QGraphicsPathItem *m_path;
     QMenu *m_configMenu;
-    QMenu *m_scaleMenu;
-    QMenu *m_alignMenu;
     QAction *m_syncAction;
-    QAction *m_editGeom;
+    QAction *m_editOptions;
+    QAction *m_reset;
     bool m_fixedMode;
     QPoint m_frameSize;
     Ui::GeometryPosition_UI m_view;
     void updateTransitionPath();
+    double m_dar;
+    int m_startPoint;
+    QGraphicsView *m_sceneview;
+    bool keyframeSelected();
 
 public slots:
     void setupParam(const QDomElement, int, int);
@@ -71,26 +75,27 @@ private slots:
     void slotNextFrame();
     void slotPreviousFrame();
     void slotPositionChanged(int pos, bool seek = true);
-    void slotDeleteFrame();
-    void slotAddFrame();
+    void slotDeleteFrame(int pos = -1);
+    void slotAddFrame(int pos = -1);
     void slotUpdateTransitionProperties();
     void slotTransparencyChanged(int transp);
-    void slotResize50();
-    void slotResize100();
-    void slotResize200();
-    void slotResizeCustom();
+    void slotResizeCustom(int value);
     void slotResizeOriginal();
     void slotAlignRight();
     void slotAlignLeft();
     void slotAlignTop();
     void slotAlignBottom();
-    void slotAlignCenter();
     void slotAlignHCenter();
     void slotAlignVCenter();
     void slotSyncCursor();
-    void slotGeometry();
     void slotResetPosition();
     void slotKeyframeMoved(int);
+    void slotSwitchOptions();
+    void slotUpdateGeometry();
+    void slotGeometryX(int value);
+    void slotGeometryY(int value);
+    void slotGeometryWidth(int value);
+    void slotGeometryHeight(int value);
 
 signals:
     void parameterChanged();