rendered paste bodyIndex: libs/libmythui/mythpainter.cpp
===================================================================
--- libs/libmythui/mythpainter.cpp (revision 21131)
+++ libs/libmythui/mythpainter.cpp (working copy)
@@ -9,16 +9,18 @@
{
}
-void MythPainter::DrawImage(int x, int y, MythImage *im, int alpha)
+void MythPainter::DrawImage(int x, int y, MythImage *im, int alpha, Effects)
{
+ // Effects effect;
assert(im);
QRect dest = QRect(x, y, im->width(), im->height());
QRect src = im->rect();
- DrawImage(dest, im, src, alpha);
+ DrawImage(dest, im, src, alpha, Effects);
}
-void MythPainter::DrawImage(const QPoint &topLeft, MythImage *im, int alpha)
+void MythPainter::DrawImage(const QPoint &topLeft, MythImage *im, int alpha, Effects)
{
- DrawImage(topLeft.x(), topLeft.y(), im, alpha);
+ //Effects effect;
+ DrawImage(topLeft.x(), topLeft.y(), im, alpha, Effects);
}
Index: libs/libmythui/mythpainter_qt.cpp
===================================================================
--- libs/libmythui/mythpainter_qt.cpp (revision 21131)
+++ libs/libmythui/mythpainter_qt.cpp (working copy)
@@ -72,7 +72,7 @@
}
void MythQtPainter::DrawImage(const QRect &r, MythImage *im,
- const QRect &src, int alpha)
+ const QRect &src, int alpha, Effects effect)
{
assert(painter);
(void)alpha;
Index: libs/libmythui/mythpainter.h
===================================================================
--- libs/libmythui/mythpainter.h (revision 21131)
+++ libs/libmythui/mythpainter.h (working copy)
@@ -20,7 +20,11 @@
public:
MythPainter() : m_Parent(0) { }
virtual ~MythPainter() { }
-
+struct Effects
+{
+ int rotate;
+ int reflectionAxis;
+};
virtual QString GetName(void) = 0;
virtual bool SupportsAnimation(void) = 0;
virtual bool SupportsAlpha(void) = 0;
@@ -34,10 +38,10 @@
QWidget *GetParent(void) { return m_Parent; }
virtual void DrawImage(const QRect &dest, MythImage *im, const QRect &src,
- int alpha) = 0;
+ int alpha, Effects) = 0;
- void DrawImage(int x, int y, MythImage *im, int alpha);
- void DrawImage(const QPoint &topLeft, MythImage *im, int alph);
+ void DrawImage(int x, int y, MythImage *im, int alpha, Effects effect);
+ void DrawImage(const QPoint &topLeft, MythImage *im, int alph, Effects);
virtual void DrawText(const QRect &dest, const QString &msg, int flags,
const MythFontProperties &font, int alpha,
Index: libs/libmythui/mythpainter_qt.h
===================================================================
--- libs/libmythui/mythpainter_qt.h (revision 21131)
+++ libs/libmythui/mythpainter_qt.h (working copy)
@@ -25,7 +25,7 @@
virtual void SetClipRect(const QRect &clipRect);
virtual void DrawImage(const QRect &dest, MythImage *im, const QRect &src,
- int alpha);
+ int alpha, Effects);
virtual void DrawText(const QRect &dest, const QString &msg, int flags,
const MythFontProperties &font, int alpha,
const QRect &boundRect);
Index: libs/libmythui/mythpainter_ogl.h
===================================================================
--- libs/libmythui/mythpainter_ogl.h (revision 21131)
+++ libs/libmythui/mythpainter_ogl.h (working copy)
@@ -21,7 +21,7 @@
virtual void End();
virtual void DrawImage(const QRect &dest, MythImage *im, const QRect &src,
- int alpha);
+ int alpha, Effects);
virtual void DrawText(const QRect &dest, const QString &msg, int flags,
const MythFontProperties &font, int alpha,
const QRect &boundRect);
Index: libs/libmythui/mythuiimage.cpp
===================================================================
--- libs/libmythui/mythuiimage.cpp (revision 21131)
+++ libs/libmythui/mythuiimage.cpp (working copy)
@@ -564,7 +564,7 @@
srcRect = m_cropRect.toQRect();
else
srcRect = currentImageArea;
-
+
p->DrawImage(area, currentImage, srcRect, alpha);
}
}
Index: libs/libmythui/mythpainter_ogl.cpp
===================================================================
--- libs/libmythui/mythpainter_ogl.cpp (revision 21131)
+++ libs/libmythui/mythpainter_ogl.cpp (working copy)
@@ -249,7 +249,7 @@
}
void MythOpenGLPainter::DrawImage(const QRect &r, MythImage *im,
- const QRect &src, int alpha)
+ const QRect &src, int alpha, Effects effect)
{
double x1, y1, x2, y2;
Index: libs/libmythui/mythuiimage.h
===================================================================
--- libs/libmythui/mythuiimage.h (revision 21131)
+++ libs/libmythui/mythuiimage.h (working copy)
@@ -24,7 +24,7 @@
/** Must be followed by a call to Load() to load the image. */
void SetFilename(const QString &filename);
-
+
/** Must be followed by a call to Load() to load the image. */
void SetFilepattern(const QString &filepattern, int low, int high);