Fix crash in DVD Wizard

[kdenlive] / src / recmonitor.h

diff --git a/src/recmonitor.h b/src/recmonitor.h
index 855acb13b5c04c5f63bfbbc10333606987d69043..f216a1134fa9214ee6a2522fd6491830bf68ebe1 100644 (file)
--- a/src/recmonitor.h
+++ b/src/recmonitor.h
@@ -21,6 +21,8 @@
 #ifndef RECMONITOR_H
 #define RECMONITOR_H
 
+#include "ui_recmonitor_ui.h"
+
 #include <QToolBar>
 #include <QTimer>
 #include <QProcess>
@@ -30,16 +32,18 @@
 #include <KAction>
 #include <KRestrictedLine>
 #include <KDateTime>
+#include <kdeversion.h>
 
-#include "ui_recmonitor_ui.h"
-#include "smallruler.h"
-#include "regiongrabber.h"
+#if KDE_IS_VERSION(4,2,0)
+#include <kcapacitybar.h>
+#endif
 
-class RecMonitor : public QWidget {
+class RecMonitor : public QWidget, public Ui::RecMonitor_UI
+{
     Q_OBJECT
 
 public:
-    RecMonitor(QString name, QWidget *parent = 0);
+    explicit RecMonitor(QString name, QWidget *parent = 0);
     virtual ~RecMonitor();
 
     QString name() const;
@@ -50,21 +54,22 @@ protected:
     virtual void mousePressEvent(QMouseEvent * event);
 
 private:
-    Ui::RecMonitor_UI ui;
-    QString m_tmpFolder;
     QString m_name;
-    RegionGrabber *rgnGrab;
     bool m_isActive;
     KDateTime m_captureTime;
+    QLabel m_dvinfo;
+
+#if KDE_IS_VERSION(4,2,0)
+    KCapacityBar *m_freeSpace;
+    QTimer m_spaceTimer;
+#endif
 
     KUrl m_captureFile;
     KIcon m_playIcon;
     KIcon m_pauseIcon;
 
-    QProcess *captureProcess;
-    QProcess *displayProcess;
-    QProcess *alsaProcess;
-    QTimer *m_initTimer;
+    QProcess *m_captureProcess;
+    QProcess *m_displayProcess;
     bool m_isCapturing;
     /** did the user capture something ? */
     bool m_didCapture;
@@ -90,8 +95,10 @@ private slots:
     void slotRewind();
     void slotForward();
     void slotDisconnect();
-    void slotStartGrab(const QRect &rect);
+    //void slotStartGrab(const QRect &rect);
     void slotConfigure();
+    void slotReadDvgrabInfo();
+    void slotUpdateFreeSpace();
 
 public slots:
     void refreshRecMonitor(bool visible);
@@ -99,6 +106,7 @@ public slots:
     void start();
     void activateRecMonitor();
     void slotPlay();
+    void slotUpdateCaptureFolder();
 
 signals:
     void renderPosition(int);