Removed SubTV

2 files changed, 0 insertions, 28 deletions

diff --git a/src/unittest/testwebvi.py b/src/unittest/testwebvi.py
index 1bf1044..2af3c16 100644
--- a/src/unittest/testwebvi.py
+++ b/src/unittest/testwebvi.py
@@ -392,33 +392,6 @@ class TestServiceModules(unittest.TestCase):
     #     self.assertNotEqual(resultref, None)
     #     self.downloadAndExtractLinks(resultref, 1, 'search result')
 
-    def testSubtv(self):
-        # Category page
-        ref = self.getServiceReference('../../templates/www.sub.fi')
-        links = self.downloadAndExtractLinks(ref, 4, 'series')
-
-        # Program page
-        plinks = []
-        for li in links:
-            plinks = self.downloadAndExtractLinks(li.ref, 0, 'program')
-            if plinks:
-                break
-        if not plinks:
-            self.assertTrue(False, 'None of the program pages has links')
-
-        # Video link
-        videolink = plinks[0]
-        self.assertNotEqual(videolink.stream, None, 'No media object in a video link')
-        self.assertNotEqual(videolink.ref, None, 'No description page in a video link')
-
-        # Direct video page link
-        queries, params = self.extractQueryParams(plinks[0].stream)
-        self.assertTrue('srcurl' in queries and 'pid' in params, 'Required parameter missing in video link')
-        videopageurl = queries['srcurl'] + '?' + params['pid']
-        videopageref = self.urlToWvtref(videopageurl)
-        self.checkMediaUrl(videopageref)
-        
-
 
 if __name__ == '__main__':
     testnames = sys.argv[1:]
diff --git a/src/vdr-plugin/timer.c b/src/vdr-plugin/timer.c
index b5a5c2b..6346763 100644
--- a/src/vdr-plugin/timer.c
+++ b/src/vdr-plugin/timer.c
@@ -323,7 +323,6 @@ char *cWebviTimerManager::UpgradedTemplatePath(char *ref) {
      {"wvt:///metacafe/", "wvt:///www.metacafe.com/"},
      {"wvt:///vimeo/", "wvt:///www.vimeo.com/"},
      {"wvt:///katsomo/", "wvt:///www.katsomo.fi/"},
-     {"wvt:///subtv/", "wvt:///www.sub.fi/"},
      {"wvt:///ruutufi/", "wvt:///www.ruutu.fi/"},
      {"wvt:///google/", "wvt:///video.google.com/"},
      {"wvt:///yleareena/", "wvt:///areena.yle.fi/"}};