Merge branch 'master' of github.com:trueos/lumina

3 files changed, 6 insertions, 79 deletions

diff --git a/src-qt5/core/libLumina/LuminaSingleApplication.cpp b/src-qt5/core/libLumina/LuminaSingleApplication.cpp
index 86248666..6811d147 100644
--- a/src-qt5/core/libLumina/LuminaSingleApplication.cpp
+++ b/src-qt5/core/libLumina/LuminaSingleApplication.cpp
@@ -107,17 +107,17 @@ void LSingleApplication::PerformLockChecks(){
     QLocalSocket socket(this);
 	socket.connectToServer(cfile);
 	socket.waitForConnected();
-	if(!socket.isValid() || socket.state()!=QLocalSocket::ConnectedState){ 
+	if(!socket.isValid() || socket.state()!=QLocalSocket::ConnectedState){
 	  //error - could not forward info for some reason
 	  qDebug() << " - Could not connect to locking process: exiting...";
-		exit(1); 
-	} 
-	
-    qDebug() << " - Forwarding inputs to locking process and closing down this instance...";	
+		exit(1);
+	}
+
+    qDebug() << " - Forwarding inputs to locking process and closing down this instance...";
 	socket.write( inputlist.join("::::").toLocal8Bit() );
 	socket.waitForDisconnected(500); //max out at 1/2 second (only hits this if no inputs)
   }
-  
+
 }
 
 //New messages detected
diff --git a/src-qt5/desktop-utils/lumina-fm-dev/widgets/vidnail.cpp b/src-qt5/desktop-utils/lumina-fm-dev/widgets/vidnail.cpp
deleted file mode 100644
index e13894e1..00000000
--- a/src-qt5/desktop-utils/lumina-fm-dev/widgets/vidnail.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-//===========================================
-//  Lumina-DE source code
-//  Copyright (c) 2017, q5sys
-//  Available under the 3-clause BSD license
-//  See the LICENSE file for full details
-//===========================================
-#include "vidnail.h"
-
-VidNail::VidNail(QObject *parent) : QObject(parent){
-}
-
-VidNail::~VidNail(){
-}
diff --git a/src-qt5/desktop-utils/lumina-fm-dev/widgets/vidnail.h b/src-qt5/desktop-utils/lumina-fm-dev/widgets/vidnail.h
deleted file mode 100644
index 45b6ca58..00000000
--- a/src-qt5/desktop-utils/lumina-fm-dev/widgets/vidnail.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef VIDNAIL_H
-#define VIDNAIL_H
-
-extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-}
-
-class VidNail;
-
-struct vFrame {
-    vFrame() : *width(0), *height(0) {}
-    vFrame(int *width, int *height : width(width), height(height) {}
-    int *width;
-    int *height;
-};
-
-public:
-
-    QString getCodec();
-    void goto(int timeInSeconds);
-    void readVideoFrame();
-    void getScaledVideoFrame(int scaledSize, vFrame& vFrame);
-
-    int getWidth();
-    int getHeight();
-    int getLength();
-
-    void makeThumbnail(const QString& videoFile, QImage &image);
-    void setThumbnailSize(int size);
-    void setPercentage(int percent);
-    void setTime(const QString& Time);
-
-    void writeVidNail(vFrame& frame, QImage& image);
-
-
- private:
-
-    bool readVideoPacket();
-    bool getVideoPacket();
-    void scaleVideo(int scaledSize, int& scaledWidth, int& scaledHeight);
-    void createVFrame(AVFrame *vFrame, quint8 *frameBuffer, int width, int height);
-    void calculateDimensions(int size);
-    void generateThumbnail(const QString& videoFile, ImageWriter& imageWriter, QImage& image);
-    QString getMimeType(const QString& videoFile);
-    QString getExtension(const QString& videoFilename);
-
-
- private:
-     int                    videoStream;
-     AVFormatContext        *inputVideoFormatContext;
-     AVCodecContext         *inputvideoCodecContext;
-     AVCodec                *inputVideoCodec;
-     AVStream               *inputVideoStream;
-     AVFrame                *inputVideoFrame;
-     quint8                 *inputFrameBuffer;
-     AVPacket               *videoPacket;
-
-
-#endif // VIDNAIL_H