X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fytsinglevideosource.cpp;h=09936cad8f1a541deb831f31331c4e45f351219c;hb=8cea1b650a0122369e8a3d60da1f263767b67614;hp=cf734b73349a7b04fc96aedf1141f3fe42d42193;hpb=29f9a13b38a0547b70236d24300668385e1dbf6e;p=minitube
diff --git a/src/ytsinglevideosource.cpp b/src/ytsinglevideosource.cpp
index cf734b7..09936ca 100644
--- a/src/ytsinglevideosource.cpp
+++ b/src/ytsinglevideosource.cpp
@@ -19,27 +19,15 @@ along with Minitube. If not, see .
$END_LICENSE */
#include "ytsinglevideosource.h"
-#include "networkaccess.h"
+#include "http.h"
+#include "httputils.h"
#include "video.h"
-#include "compatibility/qurlqueryhelper.h"
-#ifdef APP_YT3
#include "yt3.h"
#include "yt3listparser.h"
-#else
-#include "ytfeedreader.h"
-#endif
-namespace The {
-NetworkAccess* http();
-}
-
-YTSingleVideoSource::YTSingleVideoSource(QObject *parent) : PaginatedVideoSource(parent),
- video(0),
- startIndex(0),
- max(0) { }
-
-#ifdef APP_YT3
+YTSingleVideoSource::YTSingleVideoSource(QObject *parent)
+ : PaginatedVideoSource(parent), video(nullptr), startIndex(0), max(0) {}
void YTSingleVideoSource::loadVideos(int max, int startIndex) {
aborted = false;
@@ -49,12 +37,11 @@ void YTSingleVideoSource::loadVideos(int max, int startIndex) {
QUrl url;
if (startIndex == 1) {
-
if (video) {
- QList