diff options
author | ZackaryWelch <welch.zackary@gmail.com> | 2017-10-21 17:48:29 -0400 |
---|---|---|
committer | ZackaryWelch <welch.zackary@gmail.com> | 2017-10-21 17:48:29 -0400 |
commit | 3a38773ce20620610e87c84c40ebfd6d2f478203 (patch) | |
tree | ae1ab2c3aaf3f1fb69aebb901ae2895cba109a07 /src-qt5/desktop-utils/lumina-fm/Browser.cpp | |
parent | Add a semi-functional "VideoItemWidget" class to lumina-fm sources (not tied ... (diff) | |
download | lumina-3a38773ce20620610e87c84c40ebfd6d2f478203.tar.gz lumina-3a38773ce20620610e87c84c40ebfd6d2f478203.tar.bz2 lumina-3a38773ce20620610e87c84c40ebfd6d2f478203.zip |
Finished video thumbnails and roll over playback for lumina-fm and
lumina-fileinfo
Diffstat (limited to 'src-qt5/desktop-utils/lumina-fm/Browser.cpp')
-rw-r--r-- | src-qt5/desktop-utils/lumina-fm/Browser.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src-qt5/desktop-utils/lumina-fm/Browser.cpp b/src-qt5/desktop-utils/lumina-fm/Browser.cpp index a68b8580..10c2567b 100644 --- a/src-qt5/desktop-utils/lumina-fm/Browser.cpp +++ b/src-qt5/desktop-utils/lumina-fm/Browser.cpp @@ -20,7 +20,6 @@ Browser::Browser(QObject *parent) : QObject(parent){ showHidden = false; showThumbs = false; imageFormats = LUtils::imageExtensions(false); //lowercase suffixes - videoFormats = LUtils::videoExtensions(); //lowercase suffixes //connect(surface, SIGNAL(frameReceived(QImage)), this, SLOT(captureFrame(QImage))); //connect(player, &QMediaPlayer::mediaStatusChanged, this, [&]{ stopVideo(player, player->mediaStatus()); }); connect(this, SIGNAL(threadDone(QString, QImage)), this, SLOT(futureFinished(QString, QImage))); //will always be between different threads @@ -109,7 +108,7 @@ void Browser::futureFinished(QString name, QImage icon){ if(!icon.isNull() && showThumbs){ QPixmap pix = QPixmap::fromImage(icon); ico->addPixmap(pix); - }else if(info->isVideo() && showThumbs) { + /*}else if(info->isVideo() && showThumbs) { if(videoImages.find(name) == videoImages.end()) { LVideoLabel *mediaLabel = new LVideoLabel(name); while(mediaLabel->pixmap()->isNull()) { QCoreApplication::processEvents(QEventLoop::AllEvents, 50); } @@ -118,7 +117,7 @@ void Browser::futureFinished(QString name, QImage icon){ delete mediaLabel; }else{ ico->addPixmap(videoImages[name]); - } + }*/ }else{ ico = loadIcon(info->iconfile()); } @@ -134,7 +133,7 @@ void Browser::loadDirectory(QString dir, bool force){ //qDebug() << "Load Directory" << dir; bool dirupdate = true; if(currentDir != dir){ //let the main widget know to clear all current items (completely different dir) - videoImages.clear(); + //videoImages.clear(); oldFiles.clear(); lastcheck = QDateTime(); //null time emit clearItems(); |