Index: mythtv/programs/mythbackend/mythxml.cpp =================================================================== --- mythtv/programs/mythbackend/mythxml.cpp (revision 27361) +++ mythtv/programs/mythbackend/mythxml.cpp (arbetskopia) @@ -123,6 +123,7 @@ if (sURI == "GetVideoArt" ) return MXML_GetVideoArt; if (sURI == "GetInternetSearch" ) return MXML_GetInternetSearch; if (sURI == "GetInternetSources" ) return MXML_GetInternetSources; + if (sURI == "GetInternetContent" ) return MXML_GetInternetContent; return MXML_Unknown; } @@ -229,6 +230,9 @@ case MXML_GetInternetSources : GetInternetSources( pRequest ); return true; + case MXML_GetInternetContent : + GetInternetContent( pRequest ); + return true; case MXML_GetConnectionInfo : GetConnectionInfo( pRequest ); @@ -1662,6 +1666,34 @@ pRequest->FormatActionResponse( list ); } +void MythXML::GetInternetContent( HTTPRequest *pRequest ) +{ + pRequest->m_eResponseType = ResponseTypeHTML; + + QString grabber = pRequest->m_mapParams[ "Grabber" ]; + + if (grabber.isEmpty()) + return; + + QString contentDir = QString("%1internetcontent/").arg(GetShareDir()); + QString htmlFile(contentDir + grabber); + + // Try to prevent directory traversal + QFileInfo fileInfo(htmlFile); + if (fileInfo.canonicalFilePath().startsWith(contentDir) && + QFile::exists( htmlFile )) + { + pRequest->m_eResponseType = ResponseTypeFile; + pRequest->m_nResponseStatus = 200; + pRequest->m_sFileName = htmlFile; + } + else + { + pRequest->FormatRawResponse( QString("File %1 does " + "not exist!").arg(htmlFile) ); + } +} + ///////////////////////////////////////////////////////////////////////////// // ///////////////////////////////////////////////////////////////////////////// Index: mythtv/programs/mythbackend/mythxml.h =================================================================== --- mythtv/programs/mythbackend/mythxml.h (revision 27361) +++ mythtv/programs/mythbackend/mythxml.h (arbetskopia) @@ -54,10 +54,11 @@ MXML_GetVideoArt = 17, MXML_GetInternetSearch = 18, MXML_GetInternetSources = 19, + MXML_GetInternetContent = 20, - MXML_GetFile = 20, - MXML_GetFileList = 21, - MXML_GetFileLinks = 22, + MXML_GetFile = 21, + MXML_GetFileList = 22, + MXML_GetFileLinks = 23, } MythXMLMethod; @@ -127,6 +128,7 @@ void GetInternetSearch( HTTPRequest *pRequest ); void GetInternetSources( HTTPRequest *pRequest ); + void GetInternetContent( HTTPRequest *pRequest ); void GetDeviceDesc ( HTTPRequest *pRequest ); void GetFile ( HTTPRequest *pRequest, QString sFileName ); Index: mythplugins/mythbrowser/mythbrowser/bookmarkmanager.cpp =================================================================== --- mythplugins/mythbrowser/mythbrowser/bookmarkmanager.cpp (revision 27361) +++ mythplugins/mythbrowser/mythbrowser/bookmarkmanager.cpp (arbetskopia) @@ -19,6 +19,7 @@ #include "bookmarkeditor.h" #include "browserdbutil.h" #include "mythbrowser.h" +#include "mythflashplayer.h" // --------------------------------------------------- @@ -381,7 +382,11 @@ { MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack(); - MythBrowser *mythbrowser = new MythBrowser(mainStack, urls, zoom.toFloat()); + MythScreenType *mythbrowser; + if (urls[0].startsWith("mythflash://")) + mythbrowser = new MythFlashPlayer(mainStack, urls); + else + mythbrowser = new MythBrowser(mainStack, urls, zoom.toFloat()); if (mythbrowser->Create()) { Index: mythplugins/mythbrowser/mythbrowser/mythflashplayer.h =================================================================== --- mythplugins/mythbrowser/mythbrowser/mythflashplayer.h (revision 0) +++ mythplugins/mythbrowser/mythbrowser/mythflashplayer.h (revision 0) @@ -0,0 +1,25 @@ +#ifndef MYTHFLASHPLAYER_H +#define MYTHFLASHPLAYER_H + +#include + +class MythUIWebBrowser; + +class MythFlashPlayer : public MythScreenType +{ + Q_OBJECT + + public: + MythFlashPlayer(MythScreenStack *parent, QStringList &urlList); + ~MythFlashPlayer(); + + bool Create(void); + bool keyPressEvent(QKeyEvent *); + + private: + QVariant evaluateJavaScript(const QString&); + MythUIWebBrowser* m_browser; + QString m_url; +}; + +#endif Index: mythplugins/mythbrowser/mythbrowser/mythbrowser.pro =================================================================== --- mythplugins/mythbrowser/mythbrowser/mythbrowser.pro (revision 27361) +++ mythplugins/mythbrowser/mythbrowser/mythbrowser.pro (arbetskopia) @@ -16,9 +16,9 @@ INSTALLS += installimages # Input -HEADERS += mythbrowser.h webpage.h +HEADERS += mythbrowser.h mythflashplayer.h webpage.h HEADERS += bookmarkmanager.h bookmarkeditor.h browserdbutil.h -SOURCES += main.cpp mythbrowser.cpp webpage.cpp +SOURCES += main.cpp mythbrowser.cpp mythflashplayer.cpp webpage.cpp SOURCES += bookmarkmanager.cpp bookmarkeditor.cpp browserdbutil.cpp include ( ../../libs-targetfix.pro ) Index: mythplugins/mythbrowser/mythbrowser/main.cpp =================================================================== --- mythplugins/mythbrowser/mythbrowser/main.cpp (revision 27361) +++ mythplugins/mythbrowser/mythbrowser/main.cpp (arbetskopia) @@ -15,6 +15,7 @@ #include "bookmarkmanager.h" #include "browserdbutil.h" #include "mythbrowser.h" +#include "mythflashplayer.h" using namespace std; @@ -30,9 +31,12 @@ float zoom = gCoreContext->GetSetting("WebBrowserZoomLevel", "1.4").toFloat(); MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack(); + MythScreenType *mythbrowser; + if (urls[0].startsWith("mythflash://")) + mythbrowser = new MythFlashPlayer(mainStack, urls); + else + mythbrowser = new MythBrowser(mainStack, urls, zoom); - MythBrowser *mythbrowser = new MythBrowser(mainStack, urls, zoom); - if (mythbrowser->Create()) mainStack->AddScreen(mythbrowser); else Index: mythplugins/mythbrowser/mythbrowser/mythflashplayer.cpp =================================================================== --- mythplugins/mythbrowser/mythbrowser/mythflashplayer.cpp (revision 0) +++ mythplugins/mythbrowser/mythbrowser/mythflashplayer.cpp (revision 0) @@ -0,0 +1,98 @@ +#include +#include + +// qt +#include +#include + +// myth +#include +#include +#include +#include + +// mythbrowser +#include "webpage.h" +#include "mythflashplayer.h" + +using namespace std; + +MythFlashPlayer::MythFlashPlayer(MythScreenStack *parent, + QStringList &urlList) + : MythScreenType (parent, "mythflashplayer"), + m_browser(NULL), m_url(urlList[0]) +{ + qApp->setOverrideCursor(QCursor(Qt::BlankCursor)); +} + + +MythFlashPlayer::~MythFlashPlayer() +{ + qApp->restoreOverrideCursor(); + + if (m_browser) + { + m_browser->disconnect(); + DeleteChild(m_browser); + m_browser = NULL; + } +} + +bool MythFlashPlayer::Create(void) +{ + m_browser = new MythUIWebBrowser(this, "mythflashplayer"); + m_browser->SetArea(GetMythMainWindow()->GetUIScreenRect()); + m_browser->Init(); + m_browser->SetActive(true); + m_browser->Show(); + + BuildFocusList(); + + SetFocusWidget(m_browser); + + m_url.replace("mythflash://", "http://"); + VERBOSE(VB_GENERAL, QString("Opening %1").arg(m_url)); + m_browser->LoadPage(QUrl::fromEncoded(m_url.toLocal8Bit())); + + return true; +} + +QVariant MythFlashPlayer::evaluateJavaScript(const QString& source) +{ + return m_browser->evaluateJavaScript(source); +} + +bool MythFlashPlayer::keyPressEvent(QKeyEvent *event) +{ + QStringList actions; + bool handled = GetMythMainWindow()->TranslateKeyPress("TV Playback", event, actions); + + for (int i = 0; i < actions.size() && !handled; i++) + { + QString action = actions[i]; + handled = true; + + if (action == "PAUSE") + evaluateJavaScript("play();"); + else if (action == "SEEKFFWD") + evaluateJavaScript("seek(10);"); + else if (action == "SEEKRWND") + evaluateJavaScript("seek(-10);"); + else if (action == "CHANNELUP") + evaluateJavaScript("seek(60);"); + else if (action == "CHANNELDOWN") + evaluateJavaScript("seek(-60);"); + else + handled = false; + + if (handled) + return true; + } + + handled = m_browser->keyPressEvent(event); + + if (!handled && MythScreenType::keyPressEvent(event)) + handled = true; + + return handled; +} Index: mythtv/libs/libmythui/mythuiwebbrowser.h =================================================================== --- mythtv/libs/libmythui/mythuiwebbrowser.h (revision 27361) +++ mythtv/libs/libmythui/mythuiwebbrowser.h (arbetskopia) @@ -72,6 +72,8 @@ bool CanGoForward(void); bool CanGoBack(void); + QVariant evaluateJavaScript(const QString& scriptSource); + public slots: void Back(void); void Forward(void); Index: mythtv/libs/libmythui/mythuiwebbrowser.cpp =================================================================== --- mythtv/libs/libmythui/mythuiwebbrowser.cpp (revision 27361) +++ mythtv/libs/libmythui/mythuiwebbrowser.cpp (arbetskopia) @@ -322,6 +322,7 @@ { if (m_browser) { + m_browser->hide(); m_browser->disconnect(); m_browser->deleteLater(); m_browser = NULL; @@ -551,6 +552,18 @@ return QUrl(); } +/** \fn MythUIWebBrowser::evaluateJavaScript(const QString& scriptSource) + * \brief Evaluates the JavaScript code in \a scriptSource. + * \return QVariant + */ +QVariant MythUIWebBrowser::evaluateJavaScript(const QString& scriptSource) +{ + if (m_browser) + return m_browser->page()->mainFrame()->evaluateJavaScript(scriptSource); + else + return QVariant(); +} + void MythUIWebBrowser::slotLoadStarted(void) { emit loadStarted(); 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; + } + }; + + + +
+