Fix frame cacheDir

Get rid of the cache file. Instead, generate the cache on startup. The
cache was never written since it was turned into a thread. Because of
that I wrote a cleanup function, but surprisingly it didn't have much
impact on the startup time, so I dropped the cache file.

Also, fix destructor of SmGlobals. Call deleteLater on all Q_OBJECTS,
and of course, some header cleanup.

1 files changed, 4 insertions, 4 deletions

diff --git a/framecache.h b/framecache.h
index 509fea6..867eda7 100644
--- a/framecache.h
+++ b/framecache.h
@@ -27,6 +27,9 @@ class FrameCache : public QObject {
         const QPixmap entry(const QString &sourcePath, const QString &when = QString());
         const QString entryPath(const QString &sourcePath, const QString &when);
 
+    public slots:
+        void rebuild();
+
     private:
         QHash<QPair<QString, QString>, QString> *mFrameCache;
         QQueue<QPair<QString, QString> > *mDataQueue;
@@ -45,9 +48,8 @@ class FrameCacheGenerator : public QThread {
         explicit FrameCacheGenerator(QObject *parent = 0);
         void init(QSemaphore *set, QSemaphore *get, QMutex *cachemx, QQueue<QPair<QString, QString> > *data, QHash<QPair<QString, QString>, QString> *cache);
         const QString cacheFile() const { return mCacheFile; }
-        qint32 magic() const { return mMagic; };
+        const QString cacheDir() const { return mCacheDir; }
         void readConfig();
-        void readCache();
 
     public slots:
         void run();
@@ -61,9 +63,7 @@ class FrameCacheGenerator : public QThread {
         QHash<QPair<QString, QString>, QString> *mFrameCache;
         QString mCacheDir;
         QString mCacheFile;
-        //QString mWhen;
         QString mFfMpegPath;
-        const qint32 mMagic;
         const QString mCacheSubDir;
         const QString mCacheFileName;