X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=gui%2Fretracer.h;h=af1a3d9f7b727b70f1173dcc058980bba590f6a6;hb=ebe01ce9942e570f23b40793e97cf02b6f3616ee;hp=ab9e5f3a1515ab1d85fe20f2fa339360dfc6da12;hpb=66dfdda1767b11e132c259adb6c1872dc2e1fff6;p=apitrace

diff --git a/gui/retracer.h b/gui/retracer.h
index ab9e5f3..af1a3d9 100644
--- a/gui/retracer.h
+++ b/gui/retracer.h
@@ -8,68 +8,8 @@
 #include <QProcess>
 
 class ApiTraceState;
-namespace QJson {
-    class Parser;
-}
 
-/* internal class used by the retracer to run
- * in the thread */
-class RetraceProcess : public QObject
-{
-    Q_OBJECT
-public:
-    RetraceProcess(QObject *parent=0);
-    ~RetraceProcess();
-
-    QProcess *process() const;
-
-    QString fileName() const;
-    void setFileName(const QString &name);
-
-    void setAPI(trace::API api);
-
-    bool isBenchmarking() const;
-    void setBenchmarking(bool bench);
-
-    bool isDoubleBuffered() const;
-    void setDoubleBuffered(bool db);
-
-    void setCaptureAtCallNumber(qlonglong num);
-    qlonglong captureAtCallNumber() const;
-
-    bool captureState() const;
-    void setCaptureState(bool enable);
-
-    bool captureThumbnails() const;
-    void setCaptureThumbnails(bool enable);
-
-public slots:
-    void start();
-    void terminate();
-
-signals:
-    void finished(const QString &output);
-    void error(const QString &msg);
-    void foundState(ApiTraceState *state);
-    void foundThumbnails(const QList<QImage> &thumbnails);
-    void retraceErrors(const QList<ApiTraceError> &errors);
-
-private slots:
-    void replayFinished(int exitCode, QProcess::ExitStatus exitStatus);
-    void replayError(QProcess::ProcessError err);
-
-private:
-    QString m_fileName;
-    trace::API m_api;
-    bool m_benchmarking;
-    bool m_doubleBuffered;
-    bool m_captureState;
-    bool m_captureThumbnails;
-    qlonglong m_captureCall;
-
-    QProcess *m_process;
-    QJson::Parser *m_jsonParser;
-};
+namespace trace { struct Profile; }
 
 class Retracer : public QThread
 {
@@ -88,6 +28,12 @@ public:
     bool isDoubleBuffered() const;
     void setDoubleBuffered(bool db);
 
+    bool isProfilingGpu() const;
+    bool isProfilingCpu() const;
+    bool isProfilingPixels() const;
+    bool isProfiling() const;
+    void setProfiling(bool gpu, bool cpu, bool pixels);
+
     void setCaptureAtCallNumber(qlonglong num);
     qlonglong captureAtCallNumber() const;
 
@@ -100,15 +46,14 @@ public:
 signals:
     void finished(const QString &output);
     void foundState(ApiTraceState *state);
-    void foundThumbnails(const QList<QImage> &humbnails);
+    void foundProfile(trace::Profile *profile);
+    void foundThumbnails(const QList<QImage> &thumbnails);
     void error(const QString &msg);
     void retraceErrors(const QList<ApiTraceError> &errors);
 
 protected:
     virtual void run();
 
-private slots:
-    void cleanup();
 private:
     QString m_fileName;
     trace::API m_api;
@@ -117,8 +62,9 @@ private:
     bool m_captureState;
     bool m_captureThumbnails;
     qlonglong m_captureCall;
-
-    QProcessEnvironment m_processEnvironment;
+    bool m_profileGpu;
+    bool m_profileCpu;
+    bool m_profilePixels;
 };
 
 #endif