diff options
| author | q5sys <jt@ixsystems.com> | 2017-10-03 15:26:14 -0400 |
|---|---|---|
| committer | q5sys <jt@ixsystems.com> | 2017-10-03 15:26:14 -0400 |
| commit | 31bcc76104f1b2bb6b392835d216e56dadc3a9c4 (patch) | |
| tree | d994a0885195a8cf139c6304e8aceb5dcdd6a611 /src-qt5/desktop-utils/lumina-fm/Browser.h | |
| parent | Revert "rework video thumbnail code" (diff) | |
| parent | Added experimental video thumbnails in lumina-fm and fileinfo (diff) | |
| download | lumina-31bcc76104f1b2bb6b392835d216e56dadc3a9c4.tar.gz lumina-31bcc76104f1b2bb6b392835d216e56dadc3a9c4.tar.bz2 lumina-31bcc76104f1b2bb6b392835d216e56dadc3a9c4.zip | |
Merge branch 'master' of http://github.com/trueos/lumina
Diffstat (limited to 'src-qt5/desktop-utils/lumina-fm/Browser.h')
| -rw-r--r-- | src-qt5/desktop-utils/lumina-fm/Browser.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src-qt5/desktop-utils/lumina-fm/Browser.h b/src-qt5/desktop-utils/lumina-fm/Browser.h index 94f6ba3f..7ccb5199 100644 --- a/src-qt5/desktop-utils/lumina-fm/Browser.h +++ b/src-qt5/desktop-utils/lumina-fm/Browser.h @@ -15,6 +15,8 @@ #include <QIcon> //#include <QFutureWatcher> +#include <QMediaPlayer> +#include <LVideoSurface.h> #include <LuminaXDG.h> /*class FileItem{ public: @@ -43,8 +45,9 @@ public: private: QString currentDir; QFileSystemWatcher *watcher; + //QImage videoFrame; bool showHidden, showThumbs; - QStringList imageFormats, oldFiles; + QStringList imageFormats, videoFormats, oldFiles; QHash<QString, QIcon> mimeIcons; //cache for quickly re-using QIcons void loadItem(QString info, Browser *obj); //this is the main loader class - multiple instances each run in a separate thread @@ -53,7 +56,8 @@ private: private slots: void fileChanged(QString); //tied into the watcher - for file change notifications void dirChanged(QString); // tied into the watcher - for new/removed files in the current dir - + //void captureFrame(QImage); + //void stopVideo(QMediaPlayer*, QMediaPlayer::MediaStatus); void futureFinished(QString, QImage); public slots: @@ -70,6 +74,8 @@ signals: //Internal signal for the alternate threads void threadDone(QString, QImage); + + //void frameChanged(); }; #endif |