--- a/edmain.h	Thu Oct 18 20:08:59 2012 +0300
+++ b/edmain.h	Thu Oct 18 20:10:13 2012 +0300
@@ -20,6 +20,8 @@
 #define CTRL_ICON_SIZE   32
 
 #include "edtlobj.h"
+#include "edview.h"
+#include "edwaveform.h"
 #include <QDebug>
 #include <QFile>
 #include <QApplication>
@@ -30,7 +32,7 @@
 #include <QSlider>
 #include <QMessageBox>
 #include <QCheckBox>
-
+#include <QScrollBar>
 
 class DemoEditor : public QMainWindow
 {
@@ -67,6 +69,11 @@
     QAction *menuActUndo, *menuActRedo, *menuActOpen, *menuActSave, *menuActSaveAs;
 //    QAction *menuActCut, *menuActCopy, *menuActPaste, *menuActDelete;
     QActionGroup *actGroupControls;
+    QScrollBar *timelineScrollBar;
+    WaveformView *timelineWaveform;
+    DemoView *demoView;
+    
+    
 
     QAction * createToolButton(QActionGroup *group, QString name, QIcon icon, QString statustip, QVariant data);
     QAction * createMenuAction(QString name, const QKeySequence &shortcut, QString tooltip);
@@ -80,6 +87,7 @@
     void closeEvent(QCloseEvent *event);
     void createMainGUI();
     void updateMenuStates();
+    void updateTimelineView();
 
     int initEffectsAndResources();
     void shutdownEffectsAndResources();