Mercurial > hg > dmlib

diff edmain.h @ 391:28a74940f2b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More work on the editor.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 19 Oct 2012 04:30:24 +0300
parents e5220ff48bc8
children 5137db55f00b
line wrap: on
line diff
--- a/edmain.h	Fri Oct 19 04:30:01 2012 +0300
+++ b/edmain.h	Fri Oct 19 04:30:24 2012 +0300
@@ -63,6 +63,9 @@
     void performRedo();
 
     void actionControlChanged(QAction *);
+    void actionTimelineScrollChanged(int);
+    void actionOffsetChanged(float);
+    void actionTimeChanged(float);
 
 private:
     QTableView *effectTable;
@@ -70,8 +73,8 @@
 //    QAction *menuActCut, *menuActCopy, *menuActPaste, *menuActDelete;
     QActionGroup *actGroupControls;
     QScrollBar *timelineScrollBar;
-    WaveformView *timelineWaveform;
-    DemoView *demoView;
+    WaveTrackView *timelineAudioTrack;
+    GLDemoView *demoView;
     
     
 
@@ -94,7 +97,9 @@
     int reopenResources();
     int loadResources();
     bool initializeVideo();
-    
+
+    int getAudioTrackDuration();
+    int getTimelineDuration();    
 
     void createNewFile();
     void readFromFile(QString filename);
@@ -102,6 +107,10 @@
 
 
     bool changed, initSDL;
+    float currViewScale;
+    int currViewOffset;
+    int currFrameTime;
+
     TimelineObject *tl;
     DMEngineData engine;