summaryrefslogtreecommitdiffstats
path: root/abs/mv-core/myth/release-fixes/mythtv-release-fixes/screenshots.diff
diff options
context:
space:
mode:
Diffstat (limited to 'abs/mv-core/myth/release-fixes/mythtv-release-fixes/screenshots.diff')
-rw-r--r--abs/mv-core/myth/release-fixes/mythtv-release-fixes/screenshots.diff458
1 files changed, 458 insertions, 0 deletions
diff --git a/abs/mv-core/myth/release-fixes/mythtv-release-fixes/screenshots.diff b/abs/mv-core/myth/release-fixes/mythtv-release-fixes/screenshots.diff
new file mode 100644
index 0000000..2b5dabe
--- /dev/null
+++ b/abs/mv-core/myth/release-fixes/mythtv-release-fixes/screenshots.diff
@@ -0,0 +1,458 @@
+Index: libs/libmythui/mythmainwindow.cpp
+===================================================================
+--- libs/libmythui/mythmainwindow.cpp (revision 15827)
++++ libs/libmythui/mythmainwindow.cpp (working copy)
+@@ -504,6 +507,81 @@
+ d->repaintRegion = d->repaintRegion.unite(pe->region());
+ }
+
++bool MythMainWindow::screenShot(QString fname, int x, int y, int x2, int y2, int w, int h)
++{
++ bool ret = false;
++
++ QString extension = fname.section('.', -1, -2);
++
++ if (extension == "jpg")
++ extension = "JPEG";
++ else
++ extension = "PNG";
++
++ VERBOSE(VB_GENERAL, QString("MythMainWindow::screenShot saving winId %1 to %2 (%3 x %4) [ %5/%6 - %7/%8]")
++ .arg(QApplication::desktop()->winId())
++ .arg(fname)
++ .arg(w)
++ .arg(h)
++ .arg(x)
++ .arg(y)
++ .arg(x2)
++ .arg(y2));
++
++ QPixmap p;
++ p = QPixmap::grabWindow( QApplication::desktop()->winId(), x, y, x2, y2);
++
++ QImage img = p.convertToImage();
++
++ if ( w == 0 )
++ w = img.width();
++
++ if ( h == 0 )
++ h = img.height();
++
++ VERBOSE(VB_GENERAL, QString("Scaling to %1 x %2 from %3 x %4")
++ .arg(w)
++ .arg(h)
++ .arg(img.width())
++ .arg(img.height()));
++
++ img = img.smoothScale( w, h , QImage::ScaleMin);
++
++ if (img.save(fname ,extension))
++ {
++ VERBOSE(VB_GENERAL, "MythMainWindow::screenShot succeeded");
++ ret = true;
++ }
++ else
++ {
++ VERBOSE(VB_GENERAL, "MythMainWindow::screenShot Failed!");
++ ret = false;
++ }
++
++ return ret;
++}
++
++bool MythMainWindow::screenShot(int x, int y, int x2, int y2)
++{
++ QString fPath = gContext->GetSetting("ScreenShotPath","/tmp/");
++ QString fName = QString("/%1/myth-screenshot-%2.png")
++ .arg(gContext->GetSetting("ScreenShotPath","/tmp/"))
++ .arg(QDateTime::currentDateTime().toString("yyyy-mm-ddThh-mm-ss.zzz"));
++
++ return screenShot(fName, x, y, x2, y2, 0, 0);
++}
++
++bool MythMainWindow::screenShot(QString fname, int w, int h)
++{
++ return screenShot(fname, 0, 0, -1, -1, w, h);
++}
++
++
++bool MythMainWindow::screenShot(void)
++{
++ return screenShot(0,0,-1,-1);
++}
++
+ #ifdef USING_APPLEREMOTE
+ // This may be possible via installEventFilter() instead?
+
+Index: libs/libmythui/mythmainwindow.h
+===================================================================
+--- libs/libmythui/mythmainwindow.h (revision 15827)
++++ libs/libmythui/mythmainwindow.h (working copy)
+@@ -101,6 +101,11 @@
+
+ MythPainter *GetCurrentPainter();
+
++ bool screenShot(QString fname, int x, int y, int x2, int y2, int w, int h);
++ bool screenShot(int x, int y, int x2, int y2);
++ bool screenShot(QString fname, int w, int h);
++ bool screenShot(void);
++
+ void AllowInput(bool allow);
+
+ QRect GetUIScreenRect();
+Index: programs/mythfrontend/mediarenderer.cpp
+===================================================================
+--- programs/mythfrontend/mediarenderer.cpp (revision 15827)
++++ programs/mythfrontend/mediarenderer.cpp (working copy)
+@@ -9,6 +9,7 @@
+ /////////////////////////////////////////////////////////////////////////////
+
+ #include "mediarenderer.h"
++#include "mythfexml.h"
+ #include "compat.h"
+
+ /////////////////////////////////////////////////////////////////////////////
+@@ -85,6 +86,11 @@
+ "http-get:*:video/mpeg:*,"
+ "http-get:*:video/nupplevideo:*,"
+ "http-get:*:video/x-ms-wmv:*";
++ // ------------------------------------------------------------------
++ // Register the MythFEXML protocol...
++ // ------------------------------------------------------------------
++ VERBOSE(VB_UPNP, "MediaRenderer::Registering MythFEXML Service." );
++ m_pHttpServer->RegisterExtension( new MythFEXML( RootDevice() ));
+
+ // VERBOSE(VB_UPNP, QString( "MediaRenderer::Registering AVTransport Service." ));
+ // m_pHttpServer->RegisterExtension( m_pUPnpAVT = new UPnpAVTransport( RootDevice() ));
+Index: programs/mythfrontend/MFEXML_scpd.xml
+===================================================================
+--- programs/mythfrontend/MFEXML_scpd.xml (revision 0)
++++ programs/mythfrontend/MFEXML_scpd.xml (revision 0)
+@@ -0,0 +1,34 @@
++<?xml version="1.0" encoding="utf-8"?>
++<scpd xmlns="urn:schemas-upnp-org:service-1-0">
++ <specVersion>
++ <major>1</major>
++ <minor>0</minor>
++ </specVersion>
++ <actionList>
++ <action>
++ <name>GetScreenShot</name>
++ <argumentList>
++ <argument>
++ <name>Height</name>
++ <direction>in</direction>
++ <relatedStateVariable>A_ARG_TYPE_Height</relatedStateVariable>
++ </argument>
++ <argument>
++ <name>Width</name>
++ <direction>in</direction>
++ <relatedStateVariable>A_ARG_TYPE_Width</relatedStateVariable>
++ </argument>
++ </argumentList>
++ </action>
++ </actionList>
++ <serviceStateTable>
++ <stateVariable sendEvents="no">
++ <name>A_ARG_TYPE_Height</name>
++ <dataType>i2</dataType>
++ </stateVariable>
++ <stateVariable sendEvents="no">
++ <name>A_ARG_TYPE_Width</name>
++ <dataType>i2</dataType>
++ </stateVariable>
++ </serviceStateTable>
++</scpd>
+Index: programs/mythfrontend/globalsettings.cpp
+===================================================================
+--- programs/mythfrontend/globalsettings.cpp (revision 15827)
++++ programs/mythfrontend/globalsettings.cpp (working copy)
+@@ -2182,6 +2182,15 @@
+ return ge;
+ }
+
++static HostLineEdit *ScreenShotPath()
++{
++ HostLineEdit *ge = new HostLineEdit("ScreenShotPath");
++ ge->setLabel(QObject::tr("ScreenShotPath"));
++ ge->setValue("");
++ ge->setHelpText(QObject::tr("Path to screenshot storage location. Should be writable by the frontend"));
++ return ge;
++}
++
+ static HostCheckBox *UseArrowAccels()
+ {
+ HostCheckBox *gc = new HostCheckBox("UseArrowAccels");
+@@ -4455,6 +4464,7 @@
+ MythMediaSettings *mediaMon = new MythMediaSettings();
+
+ general->addChild(LircKeyPressedApp());
++ general->addChild(ScreenShotPath());
+ general->addChild(row);
+ general->addChild(NetworkControlPort());
+ general->addChild(mediaMon);
+Index: programs/mythfrontend/mythfexml.h
+===================================================================
+--- programs/mythfrontend/mythfexml.h (revision 0)
++++ programs/mythfrontend/mythfexml.h (revision 0)
+@@ -0,0 +1,66 @@
++//////////////////////////////////////////////////////////////////////////////
++// Program Name: mythxml.h
++//
++// Purpose - Myth Frontend XML protocol HttpServerExtension
++//
++//////////////////////////////////////////////////////////////////////////////
++
++#ifndef MYTHFEXML_H_
++#define MYTHFEXML_H_
++
++#include <qdom.h>
++#include <qdatetime.h>
++
++#include "upnp.h"
++#include "eventing.h"
++#include "mythcontext.h"
++
++typedef enum
++{
++ MFEXML_Unknown = 0,
++ MFEXML_GetScreenShot = 1
++
++} MythFEXMLMethod;
++
++class MythFEXML : public Eventing
++{
++ private:
++
++ QString m_sControlUrl;
++ QString m_sServiceDescFileName;
++
++ protected:
++
++ // Implement UPnpServiceImpl methods that we can
++
++ virtual QString GetServiceType () { return "urn:schemas-mythtv-org:service:MythTv:1"; }
++ virtual QString GetServiceId () { return "urn:mythtv-org:serviceId:MYTHTV_1-0"; }
++ virtual QString GetServiceControlURL() { return m_sControlUrl.mid( 1 ); }
++ virtual QString GetServiceDescURL () { return m_sControlUrl.mid( 1 ) + "/GetServDesc"; }
++
++ private:
++
++ MythFEXMLMethod GetMethod( const QString &sURI );
++
++ void GetScreenShot ( HTTPRequest *pRequest );
++
++ public:
++ MythFEXML( UPnpDevice *pDevice );
++ virtual ~MythFEXML();
++
++ bool ProcessRequest( HttpWorkerThread *pThread, HTTPRequest *pRequest );
++
++ // Static methods shared with HttpStatus
++
++};
++
++/////////////////////////////////////////////////////////////////////////////
++/////////////////////////////////////////////////////////////////////////////
++//
++//
++//
++/////////////////////////////////////////////////////////////////////////////
++/////////////////////////////////////////////////////////////////////////////
++#endif
++
++
+Index: programs/mythfrontend/main.cpp
+===================================================================
+--- programs/mythfrontend/main.cpp (revision 15827)
++++ programs/mythfrontend/main.cpp (working copy)
+@@ -799,6 +799,11 @@
+ }
+ }
+
++void getScreenShot(void)
++{
++ (void) gContext->GetMainWindow()->screenShot();
++}
++
+ void InitJumpPoints(void)
+ {
+ REG_JUMP("Reload Theme", "", "", reloadTheme);
+@@ -817,6 +822,8 @@
+ REG_JUMP("Status Screen", "", "", showStatus);
+ REG_JUMP("Previously Recorded", "", "", startPrevious);
+
++ REG_JUMPEX("ScreenShot","","",getScreenShot,false);
++
+ REG_KEY("qt", "DELETE", "Delete", "D");
+ REG_KEY("qt", "EDIT", "Edit", "E");
+
+Index: programs/mythfrontend/mythfrontend.pro
+===================================================================
+--- programs/mythfrontend/mythfrontend.pro (revision 15827)
++++ programs/mythfrontend/mythfrontend.pro (working copy)
+@@ -15,7 +15,7 @@
+ setting.files += util_menu.xml info_settings.xml main_settings.xml
+ setting.files += recpriorities_settings.xml tv_search.xml tv_lists.xml
+ setting.files += library.xml manage_recordings.xml optical_menu.xml tvmenu.xml
+-setting.files += tv_settings.xml
++setting.files += tv_settings.xml MFEXML_scpd.xml
+ setting.extra = -ldconfig
+
+ INSTALLS += setting
+@@ -26,13 +26,13 @@
+ HEADERS += manualbox.h playbackbox.h viewscheduled.h globalsettings.h
+ HEADERS += manualschedule.h programrecpriority.h channelrecpriority.h
+ HEADERS += statusbox.h networkcontrol.h custompriority.h
+-HEADERS += mediarenderer.h
++HEADERS += mediarenderer.h mythfexml.h
+ HEADERS += mythappearance.h
+
+ SOURCES += main.cpp manualbox.cpp playbackbox.cpp viewscheduled.cpp
+ SOURCES += globalsettings.cpp manualschedule.cpp programrecpriority.cpp
+ SOURCES += channelrecpriority.cpp statusbox.cpp networkcontrol.cpp
+-SOURCES += mediarenderer.cpp
++SOURCES += mediarenderer.cpp mythfexml.cpp
+ SOURCES += custompriority.cpp
+ SOURCES += mythappearance.cpp
+
+Index: programs/mythfrontend/mythfexml.cpp
+===================================================================
+--- programs/mythfrontend/mythfexml.cpp (revision 0)
++++ programs/mythfrontend/mythfexml.cpp (revision 0)
+@@ -0,0 +1,135 @@
++//////////////////////////////////////////////////////////////////////////////
++// Program Name: MythXML.cpp
++//
++// Purpose - Html & XML status HttpServerExtension
++//
++// Created By : David Blain Created On : Oct. 24, 2005
++// Modified By : Daniel Kristjansson Modified On: Oct. 31, 2007
++//
++//////////////////////////////////////////////////////////////////////////////
++
++#include "mythfexml.h"
++
++#include "libmyth/mythcontext.h"
++#include "libmyth/util.h"
++#include "libmyth/mythdbcon.h"
++
++#include "mythmainwindow.h"
++
++#include <qtextstream.h>
++#include <qdir.h>
++#include <qfile.h>
++#include <qregexp.h>
++#include <qbuffer.h>
++#include <math.h>
++
++#include "../../config.h"
++
++/////////////////////////////////////////////////////////////////////////////
++//
++/////////////////////////////////////////////////////////////////////////////
++
++MythFEXML::MythFEXML( UPnpDevice *pDevice ) : Eventing( "MythFEXML", "MYTHTV_Event" )
++{
++
++ QString sUPnpDescPath = UPnp::g_pConfig->GetValue( "UPnP/DescXmlPath", m_sSharePath );
++
++ m_sServiceDescFileName = sUPnpDescPath + "MFEXML_scpd.xml";
++ m_sControlUrl = "/MythFE";
++
++ // Add our Service Definition to the device.
++
++ RegisterService( pDevice );
++}
++
++/////////////////////////////////////////////////////////////////////////////
++//
++/////////////////////////////////////////////////////////////////////////////
++
++MythFEXML::~MythFEXML()
++{
++}
++
++/////////////////////////////////////////////////////////////////////////////
++//
++/////////////////////////////////////////////////////////////////////////////
++
++MythFEXMLMethod MythFEXML::GetMethod( const QString &sURI )
++{
++ if (sURI == "GetScreenShot" ) return MFEXML_GetScreenShot;
++
++ return( MFEXML_Unknown );
++}
++
++/////////////////////////////////////////////////////////////////////////////
++//
++/////////////////////////////////////////////////////////////////////////////
++
++bool MythFEXML::ProcessRequest( HttpWorkerThread *pThread, HTTPRequest *pRequest )
++{
++ try
++ {
++ if (pRequest)
++ {
++ if (pRequest->m_sBaseUrl != m_sControlUrl)
++ return( false );
++
++ VERBOSE(VB_UPNP, QString("MythFEXML::ProcessRequest: %1 : %2")
++ .arg(pRequest->m_sMethod)
++ .arg(pRequest->m_sRawRequest));
++
++ switch( GetMethod( pRequest->m_sMethod ))
++ {
++ case MFEXML_GetScreenShot : GetScreenShot ( pRequest ); return true;
++
++
++ default:
++ {
++ UPnp::FormatErrorResponse( pRequest, UPnPResult_InvalidAction );
++
++ return true;
++ }
++ }
++ }
++ }
++ catch( ... )
++ {
++ VERBOSE( VB_IMPORTANT, "MythFEXML::ProcessRequest() - Unexpected Exception" );
++ }
++
++ return( false );
++}
++
++// ==========================================================================
++// Request handler Methods
++// ==========================================================================
++
++/////////////////////////////////////////////////////////////////////////////
++//
++/////////////////////////////////////////////////////////////////////////////
++
++void MythFEXML::GetScreenShot( HTTPRequest *pRequest )
++{
++ bool bDefaultPixmap = false;
++
++ pRequest->m_eResponseType = ResponseTypeFile;
++
++ // Optional Parameters
++
++ int nWidth = pRequest->m_mapParams[ "Width" ].toInt();
++ int nHeight = pRequest->m_mapParams[ "Height" ].toInt();
++
++ // Read Icon file path from database
++
++ QString sFileName = "/tmp/moo.jpg";
++
++
++ if (!gContext->GetMainWindow()->screenShot(sFileName,nWidth, nHeight))
++ {
++ VERBOSE(VB_GENERAL, "MythFEXML: Failed to take screenshot. Aborting");
++ return;
++ }
++
++ pRequest->m_sFileName = sFileName;
++}
++
generated by cgit v0.12 at 2025-02-18 02:21:09 (GMT)