Index: mythtv/bindings/python/MythTV/methodheap.py
===================================================================
--- mythtv/bindings/python/MythTV/methodheap.py (revision 27361)
+++ mythtv/bindings/python/MythTV/methodheap.py (arbetskopia)
@@ -995,6 +995,10 @@
find('InternetContent').findall('grabber'):
yield InternetSource.fromEtree(grabber, self)
+ def getInternetContentUrl(self, grabber, videocode):
+ return "mythflash://%s:%s/Myth/GetInternetContent?Grabber=%s&videocode=%s" \
+ % (self.host, self.port, grabber, videocode)
+
def getPreviewImage(self, chanid, starttime, width=None, \
height=None, secsin=None):
starttime = datetime.duck(starttime)
Index: mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_api.py
===================================================================
--- mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_api.py (revision 27361)
+++ mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_api.py (arbetskopia)
@@ -61,6 +61,7 @@
import xml.etree.ElementTree as ET
import inspect
import oauth.oauth_api as oauth
+from MythTV import MythXML
from vimeo_exceptions import (VimeoUrlError, VimeoHttpError, VimeoResponseError, VimeoVideoNotFound, VimeoRequestTokenError, VimeoAuthorizeTokenError, VimeoVideosSearchError, VimeoAllChannelError, __errmsgs__)
@@ -669,6 +670,7 @@
"""
self.config = {}
+ self.mythxml = MythXML()
self.config['debug_enabled'] = debug # show debugging messages
@@ -980,7 +982,9 @@
if url.get('type') == 'video':
if url.text: # Make the link fullscreen and auto play
if embed_flag:
- v_details[url.tag] = self.ampReplace(url.text.strip().replace(u'http://vimeo.com/', u'http://vimeo.com/moogaloop.swf?clip_id=')+u'&autoplay=1')
+ playerUrl = self.mythxml.getInternetContentUrl("nv_python_libs/configs/HTML/vimeo.html", \
+ url.text.strip().replace(u'http://vimeo.com/', ''))
+ v_details[url.tag] = self.ampReplace(playerUrl)
else:
v_details[url.tag] = self.ampReplace(url.text.strip())
else:
Index: mythtv/programs/scripts/internetcontent/nv_python_libs/configs/HTML/vimeo.html
===================================================================
--- mythtv/programs/scripts/internetcontent/nv_python_libs/configs/HTML/vimeo.html (revision 0)
+++ mythtv/programs/scripts/internetcontent/nv_python_libs/configs/HTML/vimeo.html (revision 0)
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
Index: mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_api.py
===================================================================
--- mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_api.py (revision 27361)
+++ mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_api.py (arbetskopia)
@@ -38,6 +38,7 @@
import os, struct, sys, re, time
import urllib, urllib2
import logging
+from MythTV import MythXML
try:
import xml.etree.cElementTree as ElementTree
@@ -148,6 +149,7 @@
"""
self.config = {}
+ self.mythxml = MythXML()
if apikey is not None:
self.config['apikey'] = apikey
@@ -522,7 +524,13 @@
continue
if not elem.get(key) == '5':
continue
- item['video'] = self.ampReplace((elem.get('url')+'&autoplay=1'))
+ m = re.search("/v/([^?]+)", elem.get("url"))
+ if m:
+ url = self.mythxml.getInternetContentUrl("nv_python_libs/configs/HTML/youtube.html", \
+ m.group(1))
+ item['video'] = self.ampReplace(url)
+ else:
+ item['video'] = self.ampReplace((elem.get('url')+'&autoplay=1'))
flash = True
continue
if not item.has_key('video'):
Index: mythtv/programs/scripts/internetcontent/nv_python_libs/configs/HTML/youtube.html
===================================================================
--- mythtv/programs/scripts/internetcontent/nv_python_libs/configs/HTML/youtube.html (revision 27361)
+++ mythtv/programs/scripts/internetcontent/nv_python_libs/configs/HTML/youtube.html (arbetskopia)
@@ -1,30 +1,76 @@
-
-
-
+
-
+ var myth_player = null;
+
+ var params = {
+ allowScriptAccess: "always",
+ allowfullscreen: 'true',
+ wmode: 'opaque'
+ };
+ var atts = { id: "myytplayer" };
+ swfobject.embedSWF("http://www.youtube.com/apiplayer?enablejsapi=1&playerapiid=ytplayer",
+ "myth_player", window.innerWidth, window.innerHeight, "8", null, null, params, atts);
+
+ function onYouTubePlayerReady(playerId) {
+ myth_player = document.getElementById("myytplayer");
+ var videocode = gup('videocode');
+ if (videocode != "") {
+ myth_player.cueVideoById(videocode);
+ myth_player.playVideo();
+ }
+ }
+
+ function play() {
+ if (myth_player) {
+ var state = myth_player.getPlayerState();
+ if (state == 1) // Playing
+ myth_player.pauseVideo();
+ else if (state != 3) // Video is either unstarted, ended, paused or cued
+ myth_player.playVideo();
+ }
+ }
+
+ function seek(amount) {
+ if (myth_player) {
+ myth_player.seekTo(myth_player.getCurrentTime() + amount, true);
+ }
+ }
+
+ window.onresize = function() {
+ document.body.style.width = window.innerWidth;
+ document.body.style.height = window.innerHeight;
+ if (myth_player) {
+ // myth_player.setSize(window.innerWidth, window.innerHeight);
+ document.getElementById("myytplayer").width = window.innerWidth;
+ document.getElementById("myytplayer").height = window.innerHeight;
+ }
+ };
+
+
+
+
+