From f5cf37c4a97fe0ce55e9aa1a482328329faa10e7 Mon Sep 17 00:00:00 2001 From: Johan Andersson Date: Mon, 21 Apr 2014 20:29:55 +0200 Subject: [PATCH] remove old subtitle functions from kanal5 and svtplay --- lib/svtplay_dl/service/kanal5.py | 5 ----- lib/svtplay_dl/service/svtplay.py | 7 ------- 2 files changed, 12 deletions(-) diff --git a/lib/svtplay_dl/service/kanal5.py b/lib/svtplay_dl/service/kanal5.py index 5f8f4ad..d649d69 100644 --- a/lib/svtplay_dl/service/kanal5.py +++ b/lib/svtplay_dl/service/kanal5.py @@ -69,8 +69,3 @@ class Kanal5(Service): sys.exit(2) options.other = "-W %s -y %s " % ("http://www.kanal5play.se/flash/K5StandardPlayer.swf", i["source"]) yield RTMP(options, steambaseurl, i["bitrate"]) - - def get_subtitle(self, options): - if self.subtitle: - data = get_http_data(self.subtitle, cookiejar=self.cj) - subtitle_json(options, data) diff --git a/lib/svtplay_dl/service/svtplay.py b/lib/svtplay_dl/service/svtplay.py index 7b76ad1..0325d3d 100644 --- a/lib/svtplay_dl/service/svtplay.py +++ b/lib/svtplay_dl/service/svtplay.py @@ -72,13 +72,6 @@ class Svtplay(Service, OpenGraphThumbMixin): else: yield HTTP(options, i["url"], "0") - def get_subtitle(self, options): - if self.subtitle: - if options.output != "-": - data = get_http_data(self.subtitle) - subtitle_wsrt(options, data) - - def find_all_episodes(self, options): match = re.search(r']*href="([^"]+)"', self.get_urldata())