Changeset 142 for smplayer/trunk/src/youtube

Timestamp:

May 27, 2013, 3:28:05 PM (12 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to 0.8.5

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/youtube/retrieveyoutubeurl.cpp (modified) (2 diffs)
• src/youtube/retrieveyoutubeurl.h (modified) (1 diff)

smplayer/trunk/src/youtube/retrieveyoutubeurl.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
     Copyright (C) 2010 Ori Rejwan
 
@@ -60 +60 @@
     htmlDecode(fmtArray);
     QStringList codeList = fmtArray.split(',');
-    QStringList::iterator stIt = codeList.begin();
     foreach(QString code, codeList)
     {
-        QUrl url(code);
-        int itag = url.queryItemValue("itag").toInt();
-        //qDebug("itag: %d", itag);
-        code.remove(QRegExp("itag=(\\d+)&url="));
-        code.replace("&sig=", "&signature=");
-        urlMap[itag] = code;
-        //qDebug("code: '%s'", code.toUtf8().constData());
+                // (2012-12-20) Youtube Fix by RVM for SMPlayer (http://smplayer.sourceforge.net)
+
+                /* qDebug("RetrieveYoutubeUrl::parse: code: '%s'", code.toLatin1().constData()); */
+
+                int itag = 0;
+                QString n_url;
+                QString url;
+                QString s_itag;
+
+                QStringList par_list = code.split(QRegExp("&|\\?"));
+                foreach(QString par, par_list) {
+                        /* qDebug("RetrieveYoutubeUrl::parse: par: %s", par.toLatin1().constData()); */
+
+                        if (par.startsWith("url=")) url = par.mid(4);
+                        else
+                        if (par.startsWith("itag=")) {
+                                if (s_itag.isEmpty()) {
+                                        s_itag = par;
+                                        QRegExp rx("itag=(\\d+)");
+                                        if (rx.indexIn(s_itag) != -1) itag = rx.cap(1).toInt();
+                                        /* qDebug("RetrieveYoutubeUrl::parse: itag: %d", itag); */
+                                }
+                        }
+                        else {
+                                if (!n_url.isEmpty()) n_url += "&";
+                                n_url += par;
+                        }
+                }
+                n_url = url + "?" + s_itag + "&" + n_url;
+                n_url.replace("&sig=", "&signature=");
+
+                /* qDebug("RetrieveYoutubeUrl::parse: n_url: '%s'", n_url.toLatin1().constData()); */
+
+                urlMap[itag] = n_url;
     }
 

smplayer/trunk/src/youtube/retrieveyoutubeurl.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2012 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