New upstream version 3.4.2

[minitube] / src / ytvideo.h

diff --git a/src/ytvideo.h b/src/ytvideo.h
index 9f18e43c3094c9238396380caa4058d645bba072..4c47c81f3eed9e200e25921d8939e2a6e81bc8c1 100644 (file)
--- a/src/ytvideo.h
+++ b/src/ytvideo.h
@@ -14,19 +14,20 @@ public:
     int getDefinitionCode() const { return definitionCode; }
 
 signals:
-    void gotStreamUrl(const QUrl &streamUrl);
+    void gotStreamUrl(const QString &videoUrl, const QString &audioUrl);
     void errorStreamUrl(const QString &message);
 
 private slots:
     void gotVideoInfo(const QByteArray &bytes);
-    void errorVideoInfo(const QString &message);
+    void emitError(const QString &message);
     void scrapeWebPage(const QByteArray &bytes);
     void parseJsPlayer(const QByteArray &bytes);
-    void parseDashManifest(const QByteArray &bytes);
 
 private:
     void getVideoInfo();
-    void parseFmtUrlMap(const QString &fmtUrlMap, bool fromWebPage = false);
+    void parseFmtUrlMap(const QString &fmtUrlMap);
+    void loadWebPage();
+    void loadEmbedPage();
     void captureFunction(const QString &name, const QString &js);
     void captureObject(const QString &name, const QString &js);
     QString decryptSignature(const QString &s);
@@ -36,8 +37,6 @@ private:
     QUrl m_streamUrl;
     int definitionCode;
     bool loadingStreamUrl;
-    // current index for the elTypes list
-    // needed to iterate on elTypes
     int elIndex;
     bool ageGate;
     QString videoToken;
@@ -47,6 +46,8 @@ private:
     QHash<QString, QString> sigObjects;
     QString dashManifestUrl;
     QString jsPlayer;
+    QMap<int, QString> urlMap;
+    bool webPageLoaded = false;
 };
 
 #endif // YTVIDEO_H