Hello community,
here is the log from the commit of package smtube for openSUSE:Factory checked
in at 2019-08-05 10:37:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/smtube (Old)
and /work/SRC/openSUSE:Factory/.smtube.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "smtube"
Mon Aug 5 10:37:53 2019 rev:11 rq:720239 version:19.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/smtube/smtube.changes 2018-11-26
10:24:44.733419619 +0100
+++ /work/SRC/openSUSE:Factory/.smtube.new.4126/smtube.changes 2019-08-05
10:38:24.223319922 +0200
@@ -1,0 +2,6 @@
+Wed Jul 31 11:10:18 UTC 2019 - Cor Blom <corne...@solcon.nl>
+
+- Update to version 19.6.0:
+ * Fix for YouTube, so that it works again with changed Youtube code
+
+-------------------------------------------------------------------
Old:
----
smtube-18.11.0.tar.bz2
New:
----
smtube-19.6.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ smtube.spec ++++++
--- /var/tmp/diff_new_pack.k5tiby/_old 2019-08-05 10:38:24.979319830 +0200
+++ /var/tmp/diff_new_pack.k5tiby/_new 2019-08-05 10:38:24.983319829 +0200
@@ -1,7 +1,7 @@
#
# spec file for package smtube
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2012 Pascal Bleser <pascal.ble...@opensuse.org>
#
# All modifications and additions to the file contributed by third parties
@@ -19,7 +19,7 @@
%bcond_with restricted
Name: smtube
-Version: 18.11.0
+Version: 19.6.0
Release: 0
Summary: Small YouTube Browser
License: GPL-2.0-or-later
++++++ smtube-18.11.0.tar.bz2 -> smtube-19.6.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/Changelog new/smtube-19.6.0/Changelog
--- old/smtube-18.11.0/Changelog 2018-11-15 00:08:47.000000000 +0100
+++ new/smtube-19.6.0/Changelog 2019-06-16 21:16:48.000000000 +0200
@@ -1,3 +1,9 @@
+Version 19.6:
+
+(2019-06-03)
+ * Fix the youtube code.
+
+
Version 18.11:
(2018-10-21)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/OBS/Makefile
new/smtube-19.6.0/OBS/Makefile
--- old/smtube-18.11.0/OBS/Makefile 2018-11-15 00:08:47.000000000 +0100
+++ new/smtube-19.6.0/OBS/Makefile 2019-06-16 21:27:03.000000000 +0200
@@ -2,7 +2,7 @@
# deb packages at build.opensuse.org
PACKAGE = smtube
-VERSION = 18.11.0
+VERSION = 19.6.0
#DEPENDS = debhelper (>= 5.0.0), qtbase5-dev, qt5-qmake, qtscript5-dev,
qttools5-dev-tools, qt5-default, libqt5webkit5-dev
DEPENDS = debhelper (>= 5.0.0), libqt4-dev, libqtwebkit-dev
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/Readme.txt
new/smtube-19.6.0/Readme.txt
--- old/smtube-18.11.0/Readme.txt 2018-01-09 21:58:00.000000000 +0100
+++ new/smtube-19.6.0/Readme.txt 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
SMTube - a small YouTube browser for SMPlayer
- Copyright (C) 2015-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2015-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/Release_notes.txt
new/smtube-19.6.0/Release_notes.txt
--- old/smtube-18.11.0/Release_notes.txt 2018-11-10 23:23:34.000000000
+0100
+++ new/smtube-19.6.0/Release_notes.txt 2019-06-16 21:16:48.000000000 +0200
@@ -1,3 +1,6 @@
+Version 19.6
+ * The YouTube code has been fixed.
+
Version 18.10
* New option in the context menu to play the video with a web browser.
The web browser may allow you to download the video.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/create_deb.sh
new/smtube-19.6.0/create_deb.sh
--- old/smtube-18.11.0/create_deb.sh 2018-11-15 00:12:13.000000000 +0100
+++ new/smtube-19.6.0/create_deb.sh 2019-06-16 21:27:03.000000000 +0200
@@ -4,7 +4,7 @@
cp debian-orig/changelog-orig debian-orig/changelog
./get_svn_revision.sh
-#dch -v 18.11.0-`cat svn_revision` "New version"
+#dch -v 19.6.0-`cat svn_revision` "New version"
#dpkg-buildpackage -rfakeroot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/debian-orig/changelog-orig
new/smtube-19.6.0/debian-orig/changelog-orig
--- old/smtube-18.11.0/debian-orig/changelog-orig 2018-11-15
00:13:17.000000000 +0100
+++ new/smtube-19.6.0/debian-orig/changelog-orig 2019-06-16
21:27:03.000000000 +0200
@@ -1,3 +1,9 @@
+smtube (19.6.0) precise; urgency=low
+
+ * The YouTube code has been fixed.
+
+ -- Ricardo Villalba <r...@users.sourceforge.net> Sun, 16 Jun 2019 21:23:48
+0200
+
smtube (18.11.0) precise; urgency=low
* New option in the context menu to play the video with a web browser.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/setup/translations/french.nsh
new/smtube-19.6.0/setup/translations/french.nsh
--- old/smtube-18.11.0/setup/translations/french.nsh 2017-01-31
23:00:34.000000000 +0100
+++ new/smtube-19.6.0/setup/translations/french.nsh 2019-06-16
21:21:41.000000000 +0200
@@ -24,7 +24,7 @@
; Directory Page
${LangFileString} DirectoryPage_Text "$(^DirText)$\r$\n$\r$\nSMTube doit être
installé dans un répertoire contentant une installation ${SMTUBE_INST_ARCH}
${SMTUBE_QT_VER} de SMPlayer."
-${LangFileString} DirectoryIsNotWritable "Le répertoire choisi pour
l'installation n'est pas accessible en écriture et pourrait nécessiter le
redémarrage du programme d'installation avec les privilèges
d'administrateur.$\r$\n$\r$\nContinuer l'installation ?"
+${LangFileString} DirectoryIsNotWritable "Le répertoire choisi pour
l'installation n'est pas accessible en écriture et pourrait nécessiter le
redémarrage du programme d'installation avec les privilèges
d'administrateur.$\r$\n$\r$\nContinuer l'installation ?"
; Misc
${LangFileString} Info_QtArch_Bypassed "Vérification de SMPlayer,
l'architecture et la version de Qt contournée par la ligne de commande."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/setup/translations/po_files/french.po
new/smtube-19.6.0/setup/translations/po_files/french.po
--- old/smtube-18.11.0/setup/translations/po_files/french.po 2018-01-09
22:03:20.000000000 +0100
+++ new/smtube-19.6.0/setup/translations/po_files/french.po 2019-06-16
21:21:41.000000000 +0200
@@ -3,11 +3,11 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# groucho <grouchomarx...@gmail.com>, 2016
+# groucho <grouchomarx...@gmail.com>, 2016,2019
msgid ""
msgstr ""
"Project-Id-Version: smplayer\n"
-"PO-Revision-Date: 2017-09-22 21:36+0000\n"
+"PO-Revision-Date: 2019-06-12 11:24+0000\n"
"Last-Translator: groucho <grouchomarx...@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/rvm/smplayer/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -54,7 +54,7 @@
"The chosen installation directory is not writable and may require restarting"
" the installer with administrator privileges.[:r:][:n:][:r:][:n:]Proceed "
"with installation?"
-msgstr "Le répertoire choisi pour l'installation n'est pas accessible en
écriture et pourrait nécessiter le redémarrage du programme d'installation avec
les privilèges d'administrateur.[:r:][:n:][:r:][:n:]Continuer l'installation ?"
+msgstr "Le répertoire choisi pour l'installation n'est pas accessible en
écriture et pourrait nécessiter le redémarrage du programme d'installation avec
les privilèges d'administrateur.[:r:][:n:][:r:][:n:]Continuer l'installation ?"
# Info_QtArch_Bypassed
msgid "SMPlayer, architecture and Qt version check bypassed by command-line."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/setup/translations/po_files/malay.po
new/smtube-19.6.0/setup/translations/po_files/malay.po
--- old/smtube-18.11.0/setup/translations/po_files/malay.po 2018-01-09
22:03:20.000000000 +0100
+++ new/smtube-19.6.0/setup/translations/po_files/malay.po 2019-06-16
21:21:41.000000000 +0200
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: smplayer\n"
-"PO-Revision-Date: 2017-09-22 21:36+0000\n"
+"PO-Revision-Date: 2018-12-24 06:11+0000\n"
"Last-Translator: abuyop <abu...@gmail.com>\n"
"Language-Team: Malay (Malaysia)
(http://www.transifex.com/rvm/smplayer/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/smtube.spec
new/smtube-19.6.0/smtube.spec
--- old/smtube-18.11.0/smtube.spec 2018-11-15 00:08:47.000000000 +0100
+++ new/smtube-19.6.0/smtube.spec 2019-06-16 21:27:03.000000000 +0200
@@ -1,5 +1,5 @@
Name: smtube
-Version: 18.11.0
+Version: 19.6.0
Release: 1%{?dist}
Summary: YouTube browser for SMPlayer
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/about.cpp
new/smtube-19.6.0/src/about.cpp
--- old/smtube-18.11.0/src/about.cpp 2018-01-09 21:58:00.000000000 +0100
+++ new/smtube-19.6.0/src/about.cpp 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* smtube, a small youtube browser.
- Copyright (C) 2012-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2012-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@
info->setHtml(
"<b>"+ tr("YouTube%1 Browser for SMPlayer").arg(QChar(0x2122))
+"</b>"
- "<p>© 2015-2018 Ricardo Villalba
<r...@users.sourceforge.net>" +
+ "<p>© 2015-2019 Ricardo Villalba
<r...@users.sourceforge.net>" +
"<p><b>" +
tr("Version: %1").arg(smtubeVersion()) + "</b>"
#if PORTABLE_APP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/about.h
new/smtube-19.6.0/src/about.h
--- old/smtube-18.11.0/src/about.h 2018-01-09 21:58:00.000000000 +0100
+++ new/smtube-19.6.0/src/about.h 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* smtube, a small youtube browser.
- Copyright (C) 2012-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2012-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/browserwindow.cpp
new/smtube-19.6.0/src/browserwindow.cpp
--- old/smtube-18.11.0/src/browserwindow.cpp 2018-10-24 19:07:32.000000000
+0200
+++ new/smtube-19.6.0/src/browserwindow.cpp 2019-06-03 22:15:20.000000000
+0200
@@ -1,5 +1,5 @@
/* SMTUBE2, a small YouTube browser for SMPlayer
- Copyright (C) 2015-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2015-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -651,7 +651,7 @@
settings->setValue("playback_resolution", preferred_resolution);
settings->setValue("user_agent", ryu->userAgent());
settings->setValue("use_https_main", ryu->useHttpsMain());
- settings->setValue("use_https_vi", ryu->useHttpsVi());
+ //settings->setValue("use_https_vi", ryu->useHttpsVi());
#ifdef D_BUTTON
settings->setValue("add_download_button", add_download_button);
@@ -708,7 +708,7 @@
preferred_resolution = settings->value("playback_resolution",
RetrieveYoutubeUrl::R360p).toInt();
ryu->setUserAgent(settings->value("user_agent", "").toString());
ryu->setUseHttpsMain(settings->value("use_https_main", false).toBool());
- ryu->setUseHttpsVi(settings->value("use_https_vi", false).toBool());
+ //ryu->setUseHttpsVi(settings->value("use_https_vi", false).toBool());
#ifdef D_BUTTON
add_download_button = settings->value("add_download_button",
false).toBool();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/browserwindow.h
new/smtube-19.6.0/src/browserwindow.h
--- old/smtube-18.11.0/src/browserwindow.h 2018-10-22 00:54:19.000000000
+0200
+++ new/smtube-19.6.0/src/browserwindow.h 2019-06-03 22:06:34.000000000
+0200
@@ -1,5 +1,5 @@
/* SMTUBE2, a small YouTube browser for SMPlayer
- Copyright (C) 2015-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2015-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/codedownloader.h
new/smtube-19.6.0/src/codedownloader.h
--- old/smtube-18.11.0/src/codedownloader.h 2018-01-09 21:58:00.000000000
+0100
+++ new/smtube-19.6.0/src/codedownloader.h 2019-06-03 22:06:34.000000000
+0200
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2006-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/configdialog.cpp
new/smtube-19.6.0/src/configdialog.cpp
--- old/smtube-18.11.0/src/configdialog.cpp 2018-10-21 22:15:11.000000000
+0200
+++ new/smtube-19.6.0/src/configdialog.cpp 2019-06-03 22:06:34.000000000
+0200
@@ -1,5 +1,5 @@
/* SMTUBE2, a small YouTube browser for SMPlayer
- Copyright (C) 2015-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2015-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/configdialog.h
new/smtube-19.6.0/src/configdialog.h
--- old/smtube-18.11.0/src/configdialog.h 2018-10-11 22:57:06.000000000
+0200
+++ new/smtube-19.6.0/src/configdialog.h 2019-06-03 22:06:34.000000000
+0200
@@ -1,5 +1,5 @@
/* SMTUBE2, a small YouTube browser for SMPlayer
- Copyright (C) 2015-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2015-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/desktopinfo.cpp
new/smtube-19.6.0/src/desktopinfo.cpp
--- old/smtube-18.11.0/src/desktopinfo.cpp 2018-01-09 21:58:00.000000000
+0100
+++ new/smtube-19.6.0/src/desktopinfo.cpp 2019-06-03 22:06:34.000000000
+0200
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2006-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/desktopinfo.h
new/smtube-19.6.0/src/desktopinfo.h
--- old/smtube-18.11.0/src/desktopinfo.h 2018-01-09 21:58:00.000000000
+0100
+++ new/smtube-19.6.0/src/desktopinfo.h 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2006-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/filechooser.cpp
new/smtube-19.6.0/src/filechooser.cpp
--- old/smtube-18.11.0/src/filechooser.cpp 2018-01-09 21:58:00.000000000
+0100
+++ new/smtube-19.6.0/src/filechooser.cpp 2019-06-03 22:06:34.000000000
+0200
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2006-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/filechooser.h
new/smtube-19.6.0/src/filechooser.h
--- old/smtube-18.11.0/src/filechooser.h 2018-01-09 21:58:00.000000000
+0100
+++ new/smtube-19.6.0/src/filechooser.h 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2006-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/hcplayer.h
new/smtube-19.6.0/src/hcplayer.h
--- old/smtube-18.11.0/src/hcplayer.h 2018-01-09 21:58:00.000000000 +0100
+++ new/smtube-19.6.0/src/hcplayer.h 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* smtube, a small youtube browser.
- Copyright (C) 2012-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2012-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/hdpisupport.cpp
new/smtube-19.6.0/src/hdpisupport.cpp
--- old/smtube-18.11.0/src/hdpisupport.cpp 2018-01-09 21:58:00.000000000
+0100
+++ new/smtube-19.6.0/src/hdpisupport.cpp 2019-06-03 22:06:34.000000000
+0200
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2006-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/hdpisupport.h
new/smtube-19.6.0/src/hdpisupport.h
--- old/smtube-18.11.0/src/hdpisupport.h 2018-01-09 21:58:00.000000000
+0100
+++ new/smtube-19.6.0/src/hdpisupport.h 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2006-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/lineedit_with_icon.cpp
new/smtube-19.6.0/src/lineedit_with_icon.cpp
--- old/smtube-18.11.0/src/lineedit_with_icon.cpp 2018-01-09
21:58:00.000000000 +0100
+++ new/smtube-19.6.0/src/lineedit_with_icon.cpp 2019-06-03
22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2006-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/lineedit_with_icon.h
new/smtube-19.6.0/src/lineedit_with_icon.h
--- old/smtube-18.11.0/src/lineedit_with_icon.h 2018-01-09 21:58:00.000000000
+0100
+++ new/smtube-19.6.0/src/lineedit_with_icon.h 2019-06-03 22:06:34.000000000
+0200
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2006-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/links.h
new/smtube-19.6.0/src/links.h
--- old/smtube-18.11.0/src/links.h 2018-01-09 21:58:00.000000000 +0100
+++ new/smtube-19.6.0/src/links.h 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* SMTUBE2, a small YouTube browser for SMPlayer
- Copyright (C) 2015-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2015-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/loadpage.cpp
new/smtube-19.6.0/src/loadpage.cpp
--- old/smtube-18.11.0/src/loadpage.cpp 2018-01-09 21:58:00.000000000 +0100
+++ new/smtube-19.6.0/src/loadpage.cpp 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2006-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/loadpage.h
new/smtube-19.6.0/src/loadpage.h
--- old/smtube-18.11.0/src/loadpage.h 2018-01-09 21:58:00.000000000 +0100
+++ new/smtube-19.6.0/src/loadpage.h 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2006-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/main.cpp
new/smtube-19.6.0/src/main.cpp
--- old/smtube-18.11.0/src/main.cpp 2018-01-09 21:58:00.000000000 +0100
+++ new/smtube-19.6.0/src/main.cpp 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* SMTUBE2, a small YouTube browser for SMPlayer
- Copyright (C) 2015-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2015-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/mycookiejar.cpp
new/smtube-19.6.0/src/mycookiejar.cpp
--- old/smtube-18.11.0/src/mycookiejar.cpp 2018-01-09 21:58:00.000000000
+0100
+++ new/smtube-19.6.0/src/mycookiejar.cpp 2019-06-03 22:06:34.000000000
+0200
@@ -1,5 +1,5 @@
/* SMTUBE2, a small YouTube browser for SMPlayer
- Copyright (C) 2015-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2015-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/mycookiejar.h
new/smtube-19.6.0/src/mycookiejar.h
--- old/smtube-18.11.0/src/mycookiejar.h 2018-01-09 21:58:00.000000000
+0100
+++ new/smtube-19.6.0/src/mycookiejar.h 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* SMTUBE2, a small YouTube browser for SMPlayer
- Copyright (C) 2015-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2015-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/myscroller.cpp
new/smtube-19.6.0/src/myscroller.cpp
--- old/smtube-18.11.0/src/myscroller.cpp 2018-01-09 21:58:00.000000000
+0100
+++ new/smtube-19.6.0/src/myscroller.cpp 2019-06-03 22:06:34.000000000
+0200
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2006-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/myscroller.h
new/smtube-19.6.0/src/myscroller.h
--- old/smtube-18.11.0/src/myscroller.h 2018-01-09 21:58:00.000000000 +0100
+++ new/smtube-19.6.0/src/myscroller.h 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2006-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/mywebpage.cpp
new/smtube-19.6.0/src/mywebpage.cpp
--- old/smtube-18.11.0/src/mywebpage.cpp 2018-01-09 21:58:00.000000000
+0100
+++ new/smtube-19.6.0/src/mywebpage.cpp 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* SMTUBE2, a small YouTube browser for SMPlayer
- Copyright (C) 2015-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2015-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/mywebpage.h
new/smtube-19.6.0/src/mywebpage.h
--- old/smtube-18.11.0/src/mywebpage.h 2018-01-09 21:58:00.000000000 +0100
+++ new/smtube-19.6.0/src/mywebpage.h 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* SMTUBE2, a small YouTube browser for SMPlayer
- Copyright (C) 2015-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2015-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/mywebview.cpp
new/smtube-19.6.0/src/mywebview.cpp
--- old/smtube-18.11.0/src/mywebview.cpp 2018-10-26 22:01:10.000000000
+0200
+++ new/smtube-19.6.0/src/mywebview.cpp 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* SMTUBE2, a small YouTube browser for SMPlayer
- Copyright (C) 2015-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2015-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/mywebview.h
new/smtube-19.6.0/src/mywebview.h
--- old/smtube-18.11.0/src/mywebview.h 2018-10-22 21:12:40.000000000 +0200
+++ new/smtube-19.6.0/src/mywebview.h 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* SMTUBE2, a small YouTube browser for SMPlayer
- Copyright (C) 2015-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2015-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/playerdialog.cpp
new/smtube-19.6.0/src/playerdialog.cpp
--- old/smtube-18.11.0/src/playerdialog.cpp 2018-10-12 00:40:21.000000000
+0200
+++ new/smtube-19.6.0/src/playerdialog.cpp 2019-06-03 22:06:34.000000000
+0200
@@ -1,5 +1,5 @@
/* SMTUBE2, a small YouTube browser for SMPlayer
- Copyright (C) 2015-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2015-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/playerdialog.h
new/smtube-19.6.0/src/playerdialog.h
--- old/smtube-18.11.0/src/playerdialog.h 2018-10-11 22:57:06.000000000
+0200
+++ new/smtube-19.6.0/src/playerdialog.h 2019-06-03 22:06:34.000000000
+0200
@@ -1,5 +1,5 @@
/* SMTUBE2, a small YouTube browser for SMPlayer
- Copyright (C) 2015-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2015-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/players.cpp
new/smtube-19.6.0/src/players.cpp
--- old/smtube-18.11.0/src/players.cpp 2018-10-21 22:26:43.000000000 +0200
+++ new/smtube-19.6.0/src/players.cpp 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* smtube, a small youtube browser.
- Copyright (C) 2012-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2012-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/players.h
new/smtube-19.6.0/src/players.h
--- old/smtube-18.11.0/src/players.h 2018-10-11 22:57:06.000000000 +0200
+++ new/smtube-19.6.0/src/players.h 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* smtube, a small youtube browser.
- Copyright (C) 2012-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2012-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/retrieveyoutubeurl.cpp
new/smtube-19.6.0/src/retrieveyoutubeurl.cpp
--- old/smtube-18.11.0/src/retrieveyoutubeurl.cpp 2018-10-11
22:56:05.000000000 +0200
+++ new/smtube-19.6.0/src/retrieveyoutubeurl.cpp 2019-06-03
22:15:20.000000000 +0200
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2006-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -51,9 +51,9 @@
#endif
, preferred_resolution(R720p)
, use_https_main(false)
- , use_https_vi(false)
#ifdef YT_DASH_SUPPORT
, use_dash(false)
+ , use_60fps(false)
#endif
{
clearData();
@@ -215,9 +215,8 @@
void RetrieveYoutubeUrl::fetchVideoInfoPage(const QString & url) {
QString video_id = getVideoID(url);
- QString scheme = use_https_vi ? "https" : "http";
- QString u =
QString("%2://www.youtube.com/get_video_info?video_id=%1&disable_polymer=true&eurl=https://youtube.googleapis.com/v/%1&gl=US&hl=en";).arg(video_id).arg(scheme);
- qDebug() << "RetrieveYoutubeUrl::fetchVideoInfoPage: url:" << url;
+ QString u =
QString("https://www.youtube.com/get_video_info?video_id=%1&disable_polymer=true&eurl=https://youtube.googleapis.com/v/%1&gl=US&hl=en";).arg(video_id);
+ qDebug() << "RetrieveYoutubeUrl::fetchVideoInfoPage: url:" << u;
if (u.toLower().startsWith("https") && !QSslSocket::supportsSsl()) {
qDebug() << "RetrieveYoutubeUrl::fetchVideoInfoPage: no support
for ssl";
@@ -333,6 +332,18 @@
return;
}
}
+
+ QRegExp manifest_rx("\\\\\"hlsManifestUrl\\\\\":\\\\\"(.*)\\\\\"");
+ manifest_rx.setMinimal(true);
+ if (manifest_rx.indexIn(replyString) != -1) {
+ QString manifest_url =
QUrl::fromPercentEncoding(manifest_rx.cap(1).toLatin1()).replace("\\/", "/");
+ qDebug() << "RetrieveYoutubeUrl::processVideoPage:" <<
manifest_url;
+
+ if (!manifest_url.isEmpty()) {
+ fetchStreamPage(manifest_url);
+ return;
+ }
+ }
#endif
QString fmtArray;
@@ -519,7 +530,7 @@
setUrlMap(url_map);
#ifdef YT_DASH_SUPPORT
- selected_quality = findPreferredResolution(url_map,
preferred_resolution, use_dash);
+ selected_quality = findPreferredResolution(url_map,
preferred_resolution, use_dash, use_60fps);
#else
selected_quality = findPreferredResolution(url_map,
preferred_resolution);
#endif
@@ -563,6 +574,20 @@
}
#endif
+OptMap RetrieveYoutubeUrl::extractOptions(const QByteArray & urldata) {
+ OptMap data;
+ QList<QByteArray> l = urldata.split('&');
+ foreach(QByteArray o, l) {
+ QList<QByteArray> p = o.split('=');
+ if (p.count() > 1) {
+ QString tag = QUrl::fromPercentEncoding(p[0]);
+ QString value = QUrl::fromPercentEncoding(p[1]);
+ data[tag] = value;
+ }
+ }
+ return data;
+}
+
UrlMap RetrieveYoutubeUrl::extractURLs(QString fmtArray, bool allow_https,
bool use_player) {
UrlMap url_map;
@@ -578,40 +603,37 @@
//qDebug() << "RetrieveYoutubeUrl::extractURLs: codeList.count:" <<
codeList.count();
foreach(QByteArray code, codeList) {
- code = QUrl::fromPercentEncoding(code).toLatin1();
//qDebug() << "RetrieveYoutubeUrl::extractURLs: code:" << code;
+ OptMap opt_map = extractOptions(code);
+ //qDebug() << "RetrieveYoutubeUrl::extractURLs: opt_map:" <<
opt_map;
- QUrl line;
- #if QT_VERSION >= 0x050000
- q->setQuery(code);
- #else
- QUrl * q = &line;
- q->setEncodedQuery(code);
- #endif
+ if (opt_map.contains("url")) {
+ QUrl url(opt_map["url"]);
+ //qDebug() << "RetrieveYoutubeUrl::extractURLs: url:"
<< url;
- if (q->hasQueryItem("url")) {
- QUrl url( q->queryItemValue("url") );
- line.setScheme(url.scheme());
- line.setHost(url.host());
- line.setPath(url.path());
- q->removeQueryItem("url");
#if QT_VERSION >= 0x050000
- q->setQuery( q->query(QUrl::FullyDecoded) + "&" +
url.query(QUrl::FullyDecoded) );
+ q->setQuery(url.query(QUrl::FullyDecoded));
#else
- q->setEncodedQuery( q->encodedQuery() + "&" +
url.encodedQuery() );
+ QUrl * q = &url;
#endif
- if (q->hasQueryItem("sig")) {
- q->addQueryItem("signature",
q->queryItemValue("sig"));
- q->removeQueryItem("sig");
+ QString signature_name = "signature";
+ if (opt_map.contains("sp")) {
+ signature_name = opt_map["sp"];
+ //qDebug() << "RetrieveYoutubeUrl::extractURLs:
signature field:" << signature_name;
+ }
+
+ if (opt_map.contains("sig")) {
+ q->addQueryItem(signature_name, opt_map["sig"]);
}
else
- if (q->hasQueryItem("s")) {
+ if (opt_map.contains("s")) {
#ifdef YT_USE_SIG
QString player = sig.html5_player;
- QString signature =
aclara(q->queryItemValue("s"), use_player ? player : QString::null);
+ QString enc_sig = opt_map["s"];
+ QString signature = aclara(enc_sig, use_player
? player : QString::null);
if (!signature.isEmpty()) {
- q->addQueryItem("signature", signature);
+ q->addQueryItem(signature_name,
signature);
} else {
failed_to_decrypt_signature = true;
}
@@ -626,7 +648,14 @@
if (!q->hasQueryItem("ratebypass"))
q->addQueryItem("ratebypass", "yes");
- if ((q->hasQueryItem("itag")) &&
(q->hasQueryItem("signature"))) {
+ if (opt_map.contains("clen")) {
+ if (opt_map["clen"] == "0") {
+ qDebug() <<
"RetrieveYoutubeUrl::extractURLs: discarted url with empty clen";
+ continue;
+ }
+ }
+
+ if ((q->hasQueryItem("itag")) /*&&
(q->hasQueryItem(signature_name))*/) {
QString itag = q->queryItemValue("itag");
// Remove duplicated queries
@@ -637,6 +666,7 @@
q->addQueryItem(item.first,
item.second);
}
+ QUrl line = url;
#if QT_VERSION >= 0x050000
line.setQuery(q->query(QUrl::FullyDecoded));
#endif
@@ -669,7 +699,7 @@
return None;
}
-RetrieveYoutubeUrl::Quality RetrieveYoutubeUrl::findPreferredResolution(const
UrlMap & url_map, Resolution res, bool use_dash) {
+RetrieveYoutubeUrl::Quality RetrieveYoutubeUrl::findPreferredResolution(const
UrlMap & url_map, Resolution res, bool use_dash, bool use_60fps) {
Quality chosen_quality = None;
QList<Quality> l2160p, l1440p, l1080p, l720p, l480p, l360p, l240p;
@@ -694,12 +724,12 @@
l2160p << DASH_VIDEO_WEBM_2160p60hdr;
#endif
- #if 0
- l720p << DASH_VIDEO_720p60 << DASH_VIDEO_WEBM_720p60;
- l1080p << DASH_VIDEO_1080p60 << DASH_VIDEO_WEBM_1080p60;
- l1440p << DASH_VIDEO_WEBM_1440p60;
- l2160p << DASH_VIDEO_WEBM_2160p60;
- #endif
+ if (use_60fps) {
+ l720p << DASH_VIDEO_720p60 << DASH_VIDEO_WEBM_720p60;
+ l1080p << DASH_VIDEO_1080p60 << DASH_VIDEO_WEBM_1080p60;
+ l1440p << DASH_VIDEO_WEBM_1440p60;
+ l2160p << DASH_VIDEO_WEBM_2160p60;
+ }
l2160p << DASH_VIDEO_2160p << DASH_VIDEO_2160p2 <<
DASH_VIDEO_WEBM_2160p << DASH_VIDEO_WEBM_2160p2;
l1440p << DASH_VIDEO_1440p << DASH_VIDEO_WEBM_1440p;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/retrieveyoutubeurl.h
new/smtube-19.6.0/src/retrieveyoutubeurl.h
--- old/smtube-18.11.0/src/retrieveyoutubeurl.h 2018-10-11 22:56:05.000000000
+0200
+++ new/smtube-19.6.0/src/retrieveyoutubeurl.h 2019-06-03 22:15:20.000000000
+0200
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2006-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -38,6 +38,7 @@
#endif
typedef QMap<int,QString> UrlMap;
+typedef QMap<QString,QString> OptMap;
class RetrieveYoutubeUrl : public QObject
{
@@ -125,6 +126,9 @@
void setUseDASH(bool b) { use_dash = b; }
bool useDASH() { return use_dash; }
+ void enable60fps(bool b) { use_60fps = b; }
+ bool is60fpsEnabled() { return use_60fps; }
+
QString selectedAudioUrl() { return selected_audio_url; }
Quality selectedAudioQuality() { return selected_audio_quality; }
#endif
@@ -135,9 +139,7 @@
QString fullUrl(const QString & url);
void setUseHttpsMain(bool b) { use_https_main = b; };
- void setUseHttpsVi(bool b) { use_https_vi = b; };
bool useHttpsMain() { return use_https_main; };
- bool useHttpsVi() { return use_https_vi; };
static QString extensionForItag(int itag);
@@ -183,6 +185,7 @@
void setUrlMap(const UrlMap & map) { urlmap = map; }
QString getVideoID(QString video_url);
+ OptMap extractOptions(const QByteArray & urldata);
UrlMap extractURLs(QString fmtArray, bool allow_https, bool use_player);
void finish(const UrlMap & url_map);
@@ -192,7 +195,7 @@
#endif
static Quality findResolution(const UrlMap & url_map, QList<Quality> l);
- static Quality findPreferredResolution(const UrlMap & url_map,
Resolution res, bool use_dash = false);
+ static Quality findPreferredResolution(const UrlMap & url_map,
Resolution res, bool use_dash = false, bool use_60fps = false);
#ifdef YT_DASH_SUPPORT
static Quality findBestAudio(const QMap<int, QString>& url_map);
#endif
@@ -220,7 +223,6 @@
Resolution preferred_resolution;
bool use_https_main;
- bool use_https_vi;
QString yt_url;
QString url_title;
@@ -232,6 +234,7 @@
QString selected_audio_url;
Quality selected_audio_quality;
bool use_dash;
+ bool use_60fps;
#endif
UrlMap urlmap;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/sig.cpp
new/smtube-19.6.0/src/sig.cpp
--- old/smtube-18.11.0/src/sig.cpp 2018-10-11 22:56:05.000000000 +0200
+++ new/smtube-19.6.0/src/sig.cpp 2019-06-03 22:15:20.000000000 +0200
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2006-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
QString p = player_name.toUtf8().toBase64();
return QString("http://updates.smplayer.info/ytsig/?e=%1&c=1";).arg(p);
#else
- return
QString("http://s.ytimg.com/yts/jsbin/%1/base.js";).arg(player_name);
+ return
QString("http://www.youtube.com/yts/jsbin/%1/base.js";).arg(player_name);
#endif
}
@@ -103,13 +103,10 @@
qDebug() << "Sig::findFunctions: sts:" << sts;
QString sig_name;
- //QRegExp rx_sig("\\.sig\\|\\|([a-zA-Z0-9\\$]+)\\(");
- //QRegExp rx_sig("([\"\'])signature\\1\\s*,\\s*([a-zA-Z0-9$]+)\\(");
- QRegExp
rx_sig("yt\\.akamaized\\.net\\/\\).*\\.set\\(.*,([a-zA-Z0-9$]+)\\(");
+ QRegExp rx_sig("akamaized\\.net.*encodeURIComponent\\((.*)\\(");
rx_sig.setMinimal(true);
if (rx_sig.indexIn(text) != -1) {
sig_name = rx_sig.cap(1);
- //sig_name = rx_sig.cap(2);
}
qDebug() << "Sig::findFunctions: sig_name:" << sig_name;
@@ -201,7 +198,11 @@
#ifdef SIG_USE_JSCODE
QString Sig::aclaraJS(const QString & signature) {
int dot = signature.indexOf('.');
- qDebug("Sig::aclaraJS: length: %d (%d.%d)", signature.size(), dot,
signature.size()-dot-1);
+ if (dot != -1) {
+ qDebug("Sig::aclaraJS: length: %d (%d.%d)", signature.size(),
dot, signature.size()-dot-1);
+ } else {
+ qDebug("Sig::aclaraJS: length: %d", signature.size());
+ }
QString res;
@@ -240,7 +241,11 @@
QString Sig::aclaraNoJS(const QString & signature) {
int dot = signature.indexOf('.');
- qDebug("Sig::aclaraNoJS: length: %d (%d.%d)", signature.size(), dot,
signature.size()-dot-1);
+ if (dot != -1) {
+ qDebug("Sig::aclaraNoJS: length: %d (%d.%d)", signature.size(),
dot, signature.size()-dot-1);
+ } else {
+ qDebug("Sig::aclaraNoJS: length: %d", signature.size());
+ }
QString s = signature;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/sig.h new/smtube-19.6.0/src/sig.h
--- old/smtube-18.11.0/src/sig.h 2018-10-11 22:56:05.000000000 +0200
+++ new/smtube-19.6.0/src/sig.h 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2006-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/smtube.rc
new/smtube-19.6.0/src/smtube.rc
--- old/smtube-18.11.0/src/smtube.rc 2018-11-15 00:08:47.000000000 +0100
+++ new/smtube-19.6.0/src/smtube.rc 2019-06-16 21:27:03.000000000 +0200
@@ -1,7 +1,7 @@
#include <winver.h>
-#define SMTUBE_FILEVERSION 18,11,0,0
-#define SMTUBE_PRODVERSION "18.11.0.0\0"
+#define SMTUBE_FILEVERSION 19,6,0,0
+#define SMTUBE_PRODVERSION "19.6.0.0\0"
VS_VERSION_INFO VERSIONINFO
FILEVERSION SMTUBE_FILEVERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/supportedurls.cpp
new/smtube-19.6.0/src/supportedurls.cpp
--- old/smtube-18.11.0/src/supportedurls.cpp 2018-01-09 21:58:00.000000000
+0100
+++ new/smtube-19.6.0/src/supportedurls.cpp 2019-06-03 22:06:34.000000000
+0200
@@ -1,5 +1,5 @@
/* SMTUBE2, a small YouTube browser for SMPlayer
- Copyright (C) 2015-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2015-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/supportedurls.h
new/smtube-19.6.0/src/supportedurls.h
--- old/smtube-18.11.0/src/supportedurls.h 2018-01-09 21:58:00.000000000
+0100
+++ new/smtube-19.6.0/src/supportedurls.h 2019-06-03 22:06:34.000000000
+0200
@@ -1,5 +1,5 @@
/* SMTUBE2, a small YouTube browser for SMPlayer
- Copyright (C) 2015-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2015-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/translations/smtube_da.ts
new/smtube-19.6.0/src/translations/smtube_da.ts
--- old/smtube-18.11.0/src/translations/smtube_da.ts 2018-10-29
00:22:10.000000000 +0100
+++ new/smtube-19.6.0/src/translations/smtube_da.ts 2019-06-16
21:20:12.000000000 +0200
@@ -241,7 +241,7 @@
<message>
<location filename="../browserwindow.cpp" line="284"/>
<source>Loading... %1%</source>
- <translation>Indlæser... %1%</translation>
+ <translation>Indlæser ... %1%</translation>
</message>
</context>
<context>
@@ -314,7 +314,7 @@
<message>
<location filename="../configdialog.ui" line="298"/>
<source>C&hange...</source>
- <translation>&Vælg...</translation>
+ <translation>&Vælg ...</translation>
</message>
<message>
<location filename="../configdialog.ui" line="68"/>
@@ -355,7 +355,7 @@
<message>
<location filename="../mywebview.cpp" line="48"/>
<source>&Save link...</source>
- <translation>&Gem link...</translation>
+ <translation>&Gem link ...</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="51"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/translations/smtube_el.ts
new/smtube-19.6.0/src/translations/smtube_el.ts
--- old/smtube-18.11.0/src/translations/smtube_el.ts 2018-10-29
00:22:10.000000000 +0100
+++ new/smtube-19.6.0/src/translations/smtube_el.ts 2019-06-16
21:20:12.000000000 +0200
@@ -350,17 +350,17 @@
<message>
<location filename="../mywebview.cpp" line="37"/>
<source>Open in &YouTube</source>
- <translation type="unfinished"></translation>
+ <translation>Άνοιγμα στο &YouTube</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="48"/>
<source>&Save link...</source>
- <translation type="unfinished"></translation>
+ <translation>&Αποθήκευση συνδέσμου...</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="51"/>
<source>Copy &link to clipboard</source>
- <translation type="unfinished"></translation>
+ <translation>Αντιγραφή του συνδέσμου στο πρόχειρο</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="52"/>
@@ -370,37 +370,37 @@
<message>
<location filename="../mywebview.cpp" line="54"/>
<source>&Copy text to clipboard</source>
- <translation type="unfinished"></translation>
+ <translation>&Αντιγραφή του κειμένου στο πρόχειρο</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="55"/>
<source>Open link in &new window</source>
- <translation type="unfinished"></translation>
+ <translation>Άνοιγμα του δεσμού σε &νέο παράθυρο</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="79"/>
<source>&Play with</source>
- <translation type="unfinished"></translation>
+ <translation>&Αναπαραγωγή με</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="84"/>
<source>Play &audio with</source>
- <translation type="unfinished"></translation>
+ <translation>Αναπαραγωγή &ήχου με</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="137"/>
<source>&Play with %1</source>
- <translation type="unfinished"></translation>
+ <translation>&Αναπαραγωγή με %1</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="144"/>
<source>Play &audio with %1</source>
- <translation type="unfinished"></translation>
+ <translation>Αναπαραγωγή &ήχου με %1</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="151"/>
<source>Play video with a &web browser</source>
- <translation type="unfinished"></translation>
+ <translation>Αναπαραγωγή του βίντεο στον
&φυλλομετρητή</translation>
</message>
</context>
<context>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/translations/smtube_fr.ts
new/smtube-19.6.0/src/translations/smtube_fr.ts
--- old/smtube-18.11.0/src/translations/smtube_fr.ts 2018-10-29
00:22:10.000000000 +0100
+++ new/smtube-19.6.0/src/translations/smtube_fr.ts 2019-06-16
21:20:12.000000000 +0200
@@ -31,7 +31,7 @@
<message>
<location filename="../about.cpp" line="37"/>
<source>Version: %1</source>
- <translation>Version : %1</translation>
+ <translation>Version : %1</translation>
</message>
<message>
<location filename="../about.cpp" line="39"/>
@@ -46,7 +46,7 @@
<message>
<location filename="../about.cpp" line="44"/>
<source>Visit our website for updates:</source>
- <translation>Visitez notre site web pour les mises à jour
:</translation>
+ <translation>Visitez notre site web pour les mises à jour
:</translation>
</message>
<message>
<location filename="../about.cpp" line="87"/>
@@ -196,7 +196,7 @@
<message>
<location filename="../browserwindow.cpp" line="547"/>
<source>Do you want to update the YouTube code? This may fix the
problem.</source>
- <translation>Voulez-vous mettre à jour le code Youtube ? Cela pourrait
résoudre le problème.</translation>
+ <translation>Voulez-vous mettre à jour le code Youtube ? Cela pourrait
résoudre le problème.</translation>
</message>
<message>
<location filename="../browserwindow.cpp" line="555"/>
@@ -226,7 +226,7 @@
<message>
<location filename="../browserwindow.cpp" line="579"/>
<source>Important:</source>
- <translation>Important :</translation>
+ <translation>Important :</translation>
</message>
<message>
<location filename="../browserwindow.cpp" line="580"/>
@@ -279,7 +279,7 @@
<message>
<location filename="../configdialog.ui" line="39"/>
<source>Preferred &quality:</source>
- <translation>&Qualité préférée :</translation>
+ <translation>&Qualité préférée :</translation>
</message>
<message>
<location filename="../configdialog.ui" line="167"/>
@@ -304,12 +304,12 @@
<message>
<location filename="../configdialog.ui" line="248"/>
<source>&Style:</source>
- <translation>&Style :</translation>
+ <translation>&Style :</translation>
</message>
<message>
<location filename="../configdialog.ui" line="284"/>
<source>Font:</source>
- <translation>Police :</translation>
+ <translation>Police :</translation>
</message>
<message>
<location filename="../configdialog.ui" line="298"/>
@@ -350,17 +350,17 @@
<message>
<location filename="../mywebview.cpp" line="37"/>
<source>Open in &YouTube</source>
- <translation type="unfinished"></translation>
+ <translation>Ouvrir dans &YouTube</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="48"/>
<source>&Save link...</source>
- <translation type="unfinished"></translation>
+ <translation>&Enregistrer le lien...</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="51"/>
<source>Copy &link to clipboard</source>
- <translation type="unfinished"></translation>
+ <translation>Copier le &lien dans le presse-papier</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="52"/>
@@ -370,37 +370,37 @@
<message>
<location filename="../mywebview.cpp" line="54"/>
<source>&Copy text to clipboard</source>
- <translation type="unfinished"></translation>
+ <translation>&Copier le texte dans le presse-papier</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="55"/>
<source>Open link in &new window</source>
- <translation type="unfinished"></translation>
+ <translation>Ouvrir le lien dans une &nouvelle
fenêtre</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="79"/>
<source>&Play with</source>
- <translation type="unfinished"></translation>
+ <translation>&Lire avec</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="84"/>
<source>Play &audio with</source>
- <translation type="unfinished"></translation>
+ <translation>Lire l'&audio avec</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="137"/>
<source>&Play with %1</source>
- <translation type="unfinished"></translation>
+ <translation>&Lire avec %1</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="144"/>
<source>Play &audio with %1</source>
- <translation type="unfinished"></translation>
+ <translation>Lire l'&audio avec %1</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="151"/>
<source>Play video with a &web browser</source>
- <translation type="unfinished"></translation>
+ <translation>Lire la vidéo avec un &navigateur</translation>
</message>
</context>
<context>
@@ -413,17 +413,17 @@
<message>
<location filename="../playerdialog.ui" line="22"/>
<source>&Name:</source>
- <translation>&Nom :</translation>
+ <translation>&Nom :</translation>
</message>
<message>
<location filename="../playerdialog.ui" line="39"/>
<source>&Executable:</source>
- <translation>&Exécutable :</translation>
+ <translation>&Exécutable :</translation>
</message>
<message>
<location filename="../playerdialog.ui" line="56"/>
<source>&Parameters:</source>
- <translation>&Paramètres :</translation>
+ <translation>&Paramètres :</translation>
</message>
<message>
<location filename="../playerdialog.ui" line="71"/>
@@ -438,12 +438,12 @@
<message>
<location filename="../playerdialog.ui" line="87"/>
<source>Preferred &quality:</source>
- <translation>&Qualité préférée :</translation>
+ <translation>&Qualité préférée :</translation>
</message>
<message>
<location filename="../playerdialog.ui" line="117"/>
<source>Add to &menu:</source>
- <translation>Ajouter dans le &menu :</translation>
+ <translation>Ajouter dans le &menu :</translation>
</message>
<message>
<location filename="../playerdialog.cpp" line="28"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/translations/smtube_hr.ts
new/smtube-19.6.0/src/translations/smtube_hr.ts
--- old/smtube-18.11.0/src/translations/smtube_hr.ts 2018-10-29
00:22:10.000000000 +0100
+++ new/smtube-19.6.0/src/translations/smtube_hr.ts 2019-06-16
21:20:12.000000000 +0200
@@ -119,7 +119,7 @@
<message>
<location filename="../browserwindow.cpp" line="164"/>
<source>Statusbar</source>
- <translation>Statusna traka</translation>
+ <translation>Traka stanja</translation>
</message>
<message>
<location filename="../browserwindow.cpp" line="168"/>
@@ -350,17 +350,17 @@
<message>
<location filename="../mywebview.cpp" line="37"/>
<source>Open in &YouTube</source>
- <translation type="unfinished"></translation>
+ <translation>Otvori u &YouTubu</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="48"/>
<source>&Save link...</source>
- <translation type="unfinished"></translation>
+ <translation>&Spremi poveznicu...</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="51"/>
<source>Copy &link to clipboard</source>
- <translation type="unfinished"></translation>
+ <translation>Kopiraj &poveznicu u međuspremnik</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="52"/>
@@ -370,37 +370,37 @@
<message>
<location filename="../mywebview.cpp" line="54"/>
<source>&Copy text to clipboard</source>
- <translation type="unfinished"></translation>
+ <translation>&Kopiraj tekst u međuspremnik</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="55"/>
<source>Open link in &new window</source>
- <translation type="unfinished"></translation>
+ <translation>Otvori poveznicu u &novom prozoru</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="79"/>
<source>&Play with</source>
- <translation type="unfinished"></translation>
+ <translation>&Gledaj sa</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="84"/>
<source>Play &audio with</source>
- <translation type="unfinished"></translation>
+ <translation>&Slušaj sa</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="137"/>
<source>&Play with %1</source>
- <translation type="unfinished"></translation>
+ <translation>&Gledaj sa %1</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="144"/>
<source>Play &audio with %1</source>
- <translation type="unfinished"></translation>
+ <translation>&Slušaj sa %1</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="151"/>
<source>Play video with a &web browser</source>
- <translation type="unfinished"></translation>
+ <translation>Gledaj video snimku u &web pregledniku</translation>
</message>
</context>
<context>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/translations/smtube_hu.ts
new/smtube-19.6.0/src/translations/smtube_hu.ts
--- old/smtube-18.11.0/src/translations/smtube_hu.ts 2018-10-29
00:22:10.000000000 +0100
+++ new/smtube-19.6.0/src/translations/smtube_hu.ts 2019-06-16
21:20:12.000000000 +0200
@@ -294,7 +294,7 @@
<message>
<location filename="../configdialog.ui" line="204"/>
<source>A&dd predefined players</source>
- <translation>Előre meghatározott lejátszók
&hozzáadása</translation>
+ <translation>Lejátszók &hozzáadása</translation>
</message>
<message>
<location filename="../configdialog.ui" line="240"/>
@@ -350,17 +350,17 @@
<message>
<location filename="../mywebview.cpp" line="37"/>
<source>Open in &YouTube</source>
- <translation type="unfinished"></translation>
+ <translation>Megnyitás a &Youtube weboldalán</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="48"/>
<source>&Save link...</source>
- <translation type="unfinished"></translation>
+ <translation>Hivatkozás mentése...</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="51"/>
<source>Copy &link to clipboard</source>
- <translation type="unfinished"></translation>
+ <translation>Hivatkozás vágólapra másolása</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="52"/>
@@ -370,37 +370,37 @@
<message>
<location filename="../mywebview.cpp" line="54"/>
<source>&Copy text to clipboard</source>
- <translation type="unfinished"></translation>
+ <translation>Szöveg vágólapra másolása</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="55"/>
<source>Open link in &new window</source>
- <translation type="unfinished"></translation>
+ <translation>Hivatkozás megnyitása új ablakban</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="79"/>
<source>&Play with</source>
- <translation type="unfinished"></translation>
+ <translation>Lejátszás</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="84"/>
<source>Play &audio with</source>
- <translation type="unfinished"></translation>
+ <translation>Hang lejátszása</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="137"/>
<source>&Play with %1</source>
- <translation type="unfinished"></translation>
+ <translation>Lejátszás ezzel: %1</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="144"/>
<source>Play &audio with %1</source>
- <translation type="unfinished"></translation>
+ <translation>Hang lejátszása ezzel: %1</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="151"/>
<source>Play video with a &web browser</source>
- <translation type="unfinished"></translation>
+ <translation>Videó lejátszása webböngészővel</translation>
</message>
</context>
<context>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/translations/smtube_tr.ts
new/smtube-19.6.0/src/translations/smtube_tr.ts
--- old/smtube-18.11.0/src/translations/smtube_tr.ts 2018-10-29
00:22:10.000000000 +0100
+++ new/smtube-19.6.0/src/translations/smtube_tr.ts 2019-06-16
21:20:12.000000000 +0200
@@ -355,12 +355,12 @@
<message>
<location filename="../mywebview.cpp" line="48"/>
<source>&Save link...</source>
- <translation type="unfinished"></translation>
+ <translation>&Bağlantıyı kaydet...</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="51"/>
<source>Copy &link to clipboard</source>
- <translation type="unfinished"></translation>
+ <translation>&Bağlantıyı panoya kopyala</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="52"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/translations/smtube_zh_CN.ts
new/smtube-19.6.0/src/translations/smtube_zh_CN.ts
--- old/smtube-18.11.0/src/translations/smtube_zh_CN.ts 2018-10-29
00:22:10.000000000 +0100
+++ new/smtube-19.6.0/src/translations/smtube_zh_CN.ts 2019-06-16
21:20:12.000000000 +0200
@@ -350,17 +350,17 @@
<message>
<location filename="../mywebview.cpp" line="37"/>
<source>Open in &YouTube</source>
- <translation type="unfinished"></translation>
+ <translation>在 YouTube 中打开(&Y)</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="48"/>
<source>&Save link...</source>
- <translation type="unfinished"></translation>
+ <translation>保存链接...(&S)</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="51"/>
<source>Copy &link to clipboard</source>
- <translation type="unfinished"></translation>
+ <translation>复制链接到剪贴板(&l)</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="52"/>
@@ -370,37 +370,37 @@
<message>
<location filename="../mywebview.cpp" line="54"/>
<source>&Copy text to clipboard</source>
- <translation type="unfinished"></translation>
+ <translation>复制文字到剪贴板(&C)</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="55"/>
<source>Open link in &new window</source>
- <translation type="unfinished"></translation>
+ <translation>在新窗口中打开链接(&n)</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="79"/>
<source>&Play with</source>
- <translation type="unfinished"></translation>
+ <translation>使用此设备播放(&P)</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="84"/>
<source>Play &audio with</source>
- <translation type="unfinished"></translation>
+ <translation>使用此设备播放音频(&a)</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="137"/>
<source>&Play with %1</source>
- <translation type="unfinished"></translation>
+ <translation>使用 %1 播放(&P)</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="144"/>
<source>Play &audio with %1</source>
- <translation type="unfinished"></translation>
+ <translation>使用 1% 播放音频(&a)</translation>
</message>
<message>
<location filename="../mywebview.cpp" line="151"/>
<source>Play video with a &web browser</source>
- <translation type="unfinished"></translation>
+ <translation>使用网页浏览器播放视频(&w)</translation>
</message>
</context>
<context>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/version.cpp
new/smtube-19.6.0/src/version.cpp
--- old/smtube-18.11.0/src/version.cpp 2018-11-15 00:08:47.000000000 +0100
+++ new/smtube-19.6.0/src/version.cpp 2019-06-16 21:27:03.000000000 +0200
@@ -1,5 +1,5 @@
/* smtube, a small youtube browser.
- Copyright (C) 2012-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2012-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
#define USE_SVN_VERSIONS 0
-#define VERSION "18.11.0"
+#define VERSION "19.6.0"
#if USE_SVN_VERSIONS
#include "svn_revision.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/version.h
new/smtube-19.6.0/src/version.h
--- old/smtube-18.11.0/src/version.h 2018-01-09 21:58:00.000000000 +0100
+++ new/smtube-19.6.0/src/version.h 2019-06-03 22:06:34.000000000 +0200
@@ -1,5 +1,5 @@
/* smtube, a small youtube browser.
- Copyright (C) 2012-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2012-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/ytsig.cpp
new/smtube-19.6.0/src/ytsig.cpp
--- old/smtube-18.11.0/src/ytsig.cpp 2018-01-09 21:58:00.000000000 +0100
+++ new/smtube-19.6.0/src/ytsig.cpp 2019-06-03 22:15:20.000000000 +0200
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2006-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -98,10 +98,3 @@
}
}
-
-void YTSig::check(QString & u) {
- if (!parsed_ts.isEmpty()) {
- u.append(QString("&%1").arg(parsed_ts));
- }
-}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/smtube-18.11.0/src/ytsig.h
new/smtube-19.6.0/src/ytsig.h
--- old/smtube-18.11.0/src/ytsig.h 2018-01-09 21:58:00.000000000 +0100
+++ new/smtube-19.6.0/src/ytsig.h 2019-06-03 22:15:20.000000000 +0200
@@ -1,5 +1,5 @@
/* smplayer, GUI front-end for mplayer.
- Copyright (C) 2006-2018 Ricardo Villalba <r...@users.sourceforge.net>
+ Copyright (C) 2006-2019 Ricardo Villalba <r...@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -25,19 +25,14 @@
{
public:
static QString aclara(const QString & text, const QString & player =
"", const QString & function_name = QString::null);
-
- static void check(QString & u);
-
static void setScriptFile(const QString & f) { script_filename = f;
reloadScriptFile(); };
+ static QString parsed_ts;
private:
static QString script;
static QString default_script;
static QString script_filename;
static void reloadScriptFile();
-
-private:
- static QString parsed_ts;
};
#endif
