Changeset 127 for smplayer/vendor/current/src/findsubtitles

Timestamp:

Mar 29, 2012, 3:09:42 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update to latest svn

Location:

smplayer/vendor/current/src/findsubtitles

Files:

• findsubtitles.pro (modified) (2 diffs)
• findsubtitleswindow.cpp (modified) (2 diffs)
• osparser.cpp (modified) (2 diffs)
• osparser.h (modified) (1 diff)
• simplehttp.cpp (deleted)
• simplehttp.h (deleted)

smplayer/vendor/current/src/findsubtitles/findsubtitles.pro

@@ -11 +11 @@
 HEADERS += simplehttp.h \
            osparser.h \
+           ../filehash.h \
            ../lineedit_with_icon.h \
            ../filechooser.h \
@@ -19 +20 @@
 SOURCES += simplehttp.cpp \
            osparser.cpp \
+           ../filehash.cpp \
            ../lineedit_with_icon.cpp \
            ../filechooser.cpp \

smplayer/vendor/current/src/findsubtitles/findsubtitleswindow.cpp

@@ -21 +21 @@
 #include "simplehttp.h"
 #include "osparser.h"
+#include "filehash.h"
 #include "languages.h"
 #include <QStandardItemModel>
@@ -244 +245 @@
         table->setRowCount(0);
 
-        QString hash = OSParser::calculateHash(filename);
+        QString hash = FileHash::calculateHash(filename);
         if (hash.isEmpty()) {
                 qWarning("FindSubtitlesWindow::setMovie: hash invalid. Doing nothing.");

smplayer/vendor/current/src/findsubtitles/osparser.cpp

@@ -19 +19 @@
 #include "osparser.h"
 #include <QDomDocument>
-#include <QFile>
-#include <QDataStream>
+//#include <QFile>
+//#include <QDataStream>
 
 OSParser::OSParser() {
@@ -81 +81 @@
 }
 
-// From the patch by Kamil Dziobek turbos11(at)gmail.com
-// (c) Kamil Dziobek turbos11(at)gmail.com | BSD or GPL or public domain
-QString OSParser::calculateHash(QString filename) {
-        QFile file(filename);
-
-        if (!file.exists()) {
-                qWarning("OSParser:calculateHash: error hashing file. File doesn't exist.");
-                return QString();
-        }
-
-        file.open(QIODevice::ReadOnly);
-        QDataStream in(&file);
-        in.setByteOrder(QDataStream::LittleEndian);
-        quint64 size=file.size ();
-        quint64 hash=size; 
-        quint64 a;
-        for(int i = 0; i < 8192; i++) {
-                in >> a ; hash += a;
-        };
-        file.seek(size-65536);
-        for(int i = 0; i < 8192; i++) {
-                in >> a ; hash += a;
-        };
-
-        QString hexhash = QString("%1").arg(hash, 16, 16, QChar('0'));
-
-        return hexhash;
-}
-

smplayer/vendor/current/src/findsubtitles/osparser.h

@@ -41 +41 @@
         QList<OSSubtitle> subtitleList() { return s_list; };
 
-        static QString calculateHash(QString filename);
-
 protected:
         QDomDocument dom_document;