merge of previous commits

2018-12-13 14:31:25 +11:00
parent ac1cb9d14f 3e57e06542
commit 3eef432fb5
20 changed files with 223 additions and 77 deletions
@@ -33,10 +33,13 @@ public:
 	bool waveform;
 	Clip* waveform_clip;
 	FootageStream* waveform_ms;
+    double waveform_zoom;
+    int waveform_scroll;

    bool force_quit;
 public slots:
    void delete_function();
+    void set_waveform_scroll(int s);
 protected:
    void paintEvent(QPaintEvent *e);
 //    void resizeGL(int w, int h);