diff framework/MainWindowBase.h @ 371:dfcc5b355f33

Merge from branch warnfix_no_size_t

--- a/framework/MainWindowBase.h	Tue Jun 03 11:03:09 2014 +0100
+++ b/framework/MainWindowBase.h	Wed Jun 18 13:51:38 2014 +0100
@@ -110,7 +110,11 @@
     virtual bool saveSessionTemplate(QString path);
 
     /// Implementation of FrameTimer interface method
-    virtual unsigned long getFrame() const;
+    virtual int getFrame() const;
+
+    void setDefaultFfwdRwdStep(RealTime step) {
+        m_defaultFfwdRwdStep = step;
+    }
 
 signals:
     // Used to toggle the availability of menu actions
@@ -152,6 +156,7 @@
     void canSelectPreviousLayer(bool);
     void canSelectNextLayer(bool);
     void canSave(bool);
+    void canSaveAs(bool);
     void hideSplash();
     void sessionLoaded();
     void audioFileLoaded();
@@ -207,14 +212,14 @@
     virtual void playSelectionToggled();
     virtual void playSoloToggled();
 
-    virtual void sampleRateMismatch(size_t, size_t, bool) = 0;
+    virtual void sampleRateMismatch(int, int, bool) = 0;
     virtual void audioOverloadPluginDisabled() = 0;
     virtual void audioTimeStretchMultiChannelDisabled() = 0;
 
-    virtual void playbackFrameChanged(unsigned long);
-    virtual void globalCentreFrameChanged(unsigned long);
-    virtual void viewCentreFrameChanged(View *, unsigned long);
-    virtual void viewZoomLevelChanged(View *, unsigned long, bool);
+    virtual void playbackFrameChanged(int);
+    virtual void globalCentreFrameChanged(int);
+    virtual void viewCentreFrameChanged(View *, int);
+    virtual void viewZoomLevelChanged(View *, int, bool);
     virtual void outputLevelsChanged(float, float) = 0;
 
     virtual void currentPaneChanged(Pane *);
@@ -234,10 +239,10 @@
     virtual void deleteSelected();
 
     virtual void insertInstant();
-    virtual void insertInstantAt(size_t);
+    virtual void insertInstantAt(int);
     virtual void insertInstantsAtBoundaries();
     virtual void insertItemAtSelection();
-    virtual void insertItemAt(size_t, size_t);
+    virtual void insertItemAt(int, int);
     virtual void renumberInstants();
 
     virtual void documentModified();
@@ -331,6 +336,8 @@
 
     bool                     m_initialDarkBackground;
 
+    RealTime                 m_defaultFfwdRwdStep;
+
     WaveFileModel *getMainModel();
     const WaveFileModel *getMainModel() const;
     void createDocument();