X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fvideo.h;h=723be191d592764c0f6667d6431254dd4a59a96a;hb=434d88418722fd7717038e44bd74271ca1d92771;hp=f612d90879bd93f6b2c9cf4fce107d9a8e880c97;hpb=7ca7741e1eb9bc70617fbb4207738e291218c495;p=minitube

diff --git a/src/video.h b/src/video.h
index f612d90..723be19 100644
--- a/src/video.h
+++ b/src/video.h
@@ -21,130 +21,110 @@ $END_LICENSE */
 #ifndef VIDEO_H
 #define VIDEO_H
 
+#include <QtCore>
 #include <QtGui>
-#if QT_VERSION >= 0x050000
-#include <QtWidgets>
-#endif
-#include <QtNetwork>
 
-class VideoDefinition;
+class YTVideo;
 
 class Video : public QObject {
-
     Q_OBJECT
 
 public:
     Video();
-    Video* clone();
+    ~Video();
+    Video *clone();
 
-    enum License {
-        LicenseYouTube = 1,
-        LicenseCC
-    };
+    enum License { LicenseYouTube = 1, LicenseCC };
+    Q_ENUM(License)
 
-    const QString &title() const { return m_title; }
-    void setTitle(const QString &value) { m_title = value; }
+    const QString &getTitle() const { return title; }
+    void setTitle(const QString &value) { title = value; }
 
-    const QString &description() const { return m_description; }
-    void setDescription(const QString &value) { m_description = value; }
+    const QString &getDescription() const { return description; }
+    void setDescription(const QString &value) { description = value; }
 
-    const QString &channelTitle() const { return m_channelTitle; }
-    void setChannelTitle(const QString &value) { m_channelTitle = value; }
+    const QString &getChannelTitle() const { return channelTitle; }
+    void setChannelTitle(const QString &value) { channelTitle = value; }
 
-    const QString &channelId() const { return m_channelId; }
-    void setChannelId(const QString &value ) { m_channelId = value; }
+    const QString &getChannelId() const { return channelId; }
+    void setChannelId(const QString &value) { channelId = value; }
 
-    const QString &webpage();
+    const QString &getWebpage();
     void setWebpage(const QString &value);
 
     void loadThumbnail();
-    const QPixmap &thumbnail() const { return m_thumbnail; }
+    const QPixmap &getThumbnail() const { return thumbnail; }
 
-    const QString &thumbnailUrl() { return m_thumbnailUrl; }
-    void setThumbnailUrl(const QString &value) { m_thumbnailUrl = value; }
+    const QString &getThumbnailUrl() const { return thumbnailUrl; }
+    void setThumbnailUrl(const QString &value) { thumbnailUrl = value; }
 
-    const QString &mediumThumbnailUrl() { return m_mediumThumbnailUrl; }
-    void setMediumThumbnailUrl(const QString &value) { m_mediumThumbnailUrl = value; }
+    const QString &getMediumThumbnailUrl() const { return mediumThumbnailUrl; }
+    void setMediumThumbnailUrl(const QString &value) { mediumThumbnailUrl = value; }
 
-    const QString &largeThumbnailUrl() { return m_largeThumbnailUrl; }
-    void setLargeThumbnailUrl(const QString &value) { m_largeThumbnailUrl = value; }
+    const QString &getLargeThumbnailUrl() const { return largeThumbnailUrl; }
+    void setLargeThumbnailUrl(const QString &value) { largeThumbnailUrl = value; }
 
-    int duration() const { return m_duration; }
-    void setDuration(int value) { m_duration = value; }
-    QString formattedDuration() const;
+    int getDuration() const { return duration; }
+    void setDuration(int value);
+    const QString &getFormattedDuration() const { return formattedDuration; }
 
-    int viewCount() const { return m_viewCount; }
-    void setViewCount(int viewCount) { m_viewCount = viewCount; }
+    int getViewCount() const { return viewCount; }
+    void setViewCount(int value);
+    const QString &getFormattedViewCount() const { return formattedViewCount; }
 
-    const QDateTime &published() const { return m_published; }
-    void setPublished(const QDateTime &value) { m_published = value; }
+    const QDateTime &getPublished() const { return published; }
+    void setPublished(const QDateTime &value);
+    const QString &getFormattedPublished() const { return formattedPublished; }
 
     int getDefinitionCode() const { return definitionCode; }
 
     void loadStreamUrl();
-    const QUrl &getStreamUrl() { return m_streamUrl; }
+    const QString &getStreamUrl() { return streamUrl; }
+    bool isLoadingStreamUrl() const { return ytVideo != nullptr; }
+    void abortLoadStreamUrl();
 
-    void setId(const QString &value) { videoId = value; }
-    const QString &id() const { return videoId; }
+    const QString &getId() const { return id; }
+    void setId(const QString &value) { id = value; }
 
-    void setLicense(License value) { m_license = value; }
-    License license() const { return m_license; }
+    License getLicense() const { return license; }
+    void setLicense(License value) { license = value; }
 
 signals:
     void gotThumbnail();
     void gotMediumThumbnail(const QByteArray &bytes);
     void gotLargeThumbnail(const QByteArray &bytes);
-    void gotStreamUrl(const QUrl &streamUrl);
+    void gotStreamUrl(const QString &videoUrl, const QString &audioUrl);
     void errorStreamUrl(const QString &message);
 
 private slots:
     void setThumbnail(const QByteArray &bytes);
-    void gotVideoInfo(const QByteArray &bytes);
-    void errorVideoInfo(QNetworkReply *reply);
-    void scrapeWebPage(const QByteArray &bytes);
-    void parseJsPlayer(const QByteArray &bytes);
-    void parseDashManifest(const QByteArray &bytes);
+    void streamUrlLoaded(const QString &streamUrl, const QString &audioUrl);
 
 private:
-    void getVideoInfo();
-    void parseFmtUrlMap(const QString &fmtUrlMap, bool fromWebPage = false);
-    void captureFunction(const QString &name, const QString &js);
-    void captureObject(const QString &name, const QString &js);
-    QString decryptSignature(const QString &s);
-    void saveDefinitionForUrl(const QString &url, const VideoDefinition &definition);
-
-    QString m_title;
-    QString m_description;
-    QString m_channelTitle;
-    QString m_channelId;
-    QString m_webpage;
-    QUrl m_streamUrl;
-    QPixmap m_thumbnail;
-    QString m_thumbnailUrl;
-    QString m_mediumThumbnailUrl;
-    QString m_largeThumbnailUrl;
-    int m_duration;
-    QDateTime m_published;
-    int m_viewCount;
-    License m_license;
-    QString videoId;
-    QString videoToken;
+    QString title;
+    QString description;
+    QString channelTitle;
+    QString channelId;
+    QString webpage;
+    QString streamUrl;
+    QPixmap thumbnail;
+    QString thumbnailUrl;
+    QString mediumThumbnailUrl;
+    QString largeThumbnailUrl;
+    int duration;
+    QString formattedDuration;
+
+    QDateTime published;
+    QString formattedPublished;
+    int viewCount;
+    QString formattedViewCount;
+    License license;
+    QString id;
     int definitionCode;
 
-    // current index for the elTypes list
-    // needed to iterate on elTypes
-    int elIndex;
-    bool ageGate;
-    
-    bool loadingStreamUrl;
     bool loadingThumbnail;
 
-    QString fmtUrlMap;
-    QString sigFuncName;
-    QHash<QString, QString> sigFunctions;
-    QHash<QString, QString> sigObjects;
-
-    QString dashManifestUrl;
+    YTVideo *ytVideo;
 };
 
 // This is required in order to use QPointer<Video> as a QVariant