Changeset 176 for smplayer/trunk/src/youtube/ytsig.cpp

Timestamp:

May 3, 2016, 5:25:45 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.4

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/youtube/ytsig.cpp (modified) (8 diffs)

smplayer/trunk/src/youtube/ytsig.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -18 +18 @@
 
 #include "ytsig.h"
+#include <QtScript>
 
-#ifdef YT_USE_SCRIPT
-#include <QtScript>
+QString YTSig::script_filename;
+
+QString YTSig::script;
+QString YTSig::default_script;
+
+QString YTSig::parsed_ts;
+
 
 QString YTSig::aclara(const QString & text, const QString & player, const QString & function_name) {
@@ -52 +58 @@
         }
 
-        //qDebug("YTSig::aclara: function_name: %s", function_name.toLatin1().constData());
+        //qDebug() << "YTSig::aclara: function_name:" << function_name;
 
         QScriptValue aclarar = engine.globalObject().property(fname);
@@ -60 +66 @@
 
         if (res.isEmpty()) {
-                qDebug("YTSig::aclara: signature length not supported: %d: %s", text.size(), text.toLatin1().constData());
+                qDebug() << "YTSig::aclara: signature length not supported:" << text.size() << ":" << text;
         }
 
@@ -67 +73 @@
 
 void YTSig::reloadScriptFile() {
-        qDebug("YTSig::reloadScriptFile: %s", script_file.toUtf8().constData());
+        qDebug() << "YTSig::reloadScriptFile:" << script_filename;
 
-        if (!QFile::exists(script_file)) {
-                qDebug("YTSig::reloadScriptFile: file doesn't exist.");
+        if (!QFile::exists(script_filename)) {
+                qDebug() << "YTSig::reloadScriptFile: file doesn't exist.";
                 return;
         }
 
-        QFile f(script_file);
+        QFile f(script_filename);
         f.open(QIODevice::ReadOnly);
         QByteArray bytes = f.readAll();
@@ -87 +93 @@
                 if (rx.indexIn(bytes)) {
                         QByteArray d = rx.cap(1).toLatin1();
-                        //qDebug("YTSig::reloadScriptFile: d: %s", d.constData());
+                        qDebug() << "YTSig::reloadScriptFile: d:" << d;
                         parsed_ts = QByteArray::fromBase64(d);
                 }
@@ -93 +99 @@
         }
 }
-
-QString YTSig::script;
-QString YTSig::script_file;
-
-QString YTSig::default_script;
-
-#else // YT_USE_SCRIPT
-
-#ifdef YTSIG_STATIC
-#include "ytsig_priv.cpp"
-#else
-QString YTSig::aclara(const QString & text, const QString & player, const QString & function_name) {
-        QString res;
-
-        int dot = text.indexOf('.');
-        qDebug("YTSig::aclara (2): length: %d (%d.%d)", text.size(), dot, text.size()-dot-1);
-
-        /*
-        qDebug("%d: orig: %s", text.size(), text.toLatin1().constData());
-        qDebug("%d: conv: %s", text.size(), res.toLatin1().constData());
-        */
-
-        return res;
-}
-#endif
-
-#endif // YT_USE_SCRIPT
 
 void YTSig::check(QString & u) {
@@ -127 +106 @@
 }
 
-QString YTSig::parsed_ts;