Changeset 170 for smplayer/trunk/src/youtube/retrieveyoutubeurl.h

Timestamp:

Oct 9, 2014, 2:54:21 PM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: updated trunk to 14.9.0

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/youtube/retrieveyoutubeurl.h (modified) (7 diffs)

smplayer/trunk/src/youtube/retrieveyoutubeurl.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -25 +25 @@
 
 #define YT_GET_VIDEOINFO
+//#define YT_DASH_SUPPORT
 
 class RetrieveYoutubeUrl : public QObject
@@ -32 +33 @@
 public:
         enum Quality { FLV_240p = 5, MP4_360p = 18, MP4_720p = 22, FLV_360p = 34,
-                   FLV_480p = 35, MP4_1080p = 37, WEBM_360p = 43, 
-                   WEBM_480p = 44, WEBM_720p = 45, WEBM_1080p = 46 };
+                   FLV_480p = 35, MP4_1080p = 37, WEBM_360p = 43,
+                   WEBM_480p = 44, WEBM_720p = 45, WEBM_1080p = 46,
+                   DASH_AUDIO_MP4_48 = 139, DASH_AUDIO_MP4_128 = 140, DASH_AUDIO_MP4_256 = 141,
+                   DASH_AUDIO_WEBM_128 = 171, DASH_AUDIO_WEBM_192 = 172,
+                   DASH_VIDEO_1080p = 137, DASH_VIDEO_720p = 136,
+                   DASH_VIDEO_480p = 135, DASH_VIDEO_360p = 134,
+                   DASH_VIDEO_240p = 133 };
 
         RetrieveYoutubeUrl( QObject* parent = 0 );
@@ -50 +56 @@
         QString findPreferredUrl();
 
+#ifdef YT_DASH_SUPPORT
+        static QString findBestAudio(const QMap<int, QString>& urlMap);
+#endif
+
         QString urlTitle() { return url_title; }
         QString latestPreferredUrl() { return latest_preferred_url; }
@@ -57 +67 @@
         QString fullUrl(const QString & url);
 
+        static void setUseHttpsMain(bool b) { use_https_main = b; };
+        static void setUseHttpsVi(bool b) { use_https_vi = b; };
+        static bool useHttpsMain() { return use_https_main; };
+        static bool useHttpsVi() { return use_https_vi; };
+
 signals:
         void gotUrls(const QMap<int, QString>&);
         void gotPreferredUrl(const QString &);
         void gotEmptyList();
+#ifdef YT_GET_VIDEOINFO
+        void gotVideoInfo(const QMap<int, QString>&, QString, QString);
+#endif
 
         void connecting(QString host);
@@ -73 +91 @@
         void gotVideoInfoResponse();
         void parseVideoInfo(QByteArray text);
-        void fetchVideoInfoPage();
+        void fetchVideoInfoPage(QString url = QString::null);
 #endif
 
@@ -88 +106 @@
         Quality preferred_quality;
         static QString user_agent;
+        static bool use_https_main;
+        static bool use_https_vi;
 
 #ifdef YT_GET_VIDEOINFO