summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/libflash/config.in2
-rw-r--r--core/multimedia/opieplayer/libflash/shape.cc2
-rw-r--r--core/multimedia/opieplayer/libmad/config.in2
-rw-r--r--core/multimedia/opieplayer/libmpeg3/config.in2
-rw-r--r--core/multimedia/opieplayer/modplug/config.in2
-rw-r--r--core/multimedia/opieplayer/wavplugin/config.in2
6 files changed, 7 insertions, 5 deletions
diff --git a/core/multimedia/opieplayer/libflash/config.in b/core/multimedia/opieplayer/libflash/config.in
index 91a57da..258e8ee 100644
--- a/core/multimedia/opieplayer/libflash/config.in
+++ b/core/multimedia/opieplayer/libflash/config.in
@@ -1,4 +1,4 @@
# config #LIBFLASH
# boolean "libflash"
# default "y"
-# depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+# depends ( LIBQPE || LIBQPE-X11 )
diff --git a/core/multimedia/opieplayer/libflash/shape.cc b/core/multimedia/opieplayer/libflash/shape.cc
index 0d8df93..4d4ecb8 100644
--- a/core/multimedia/opieplayer/libflash/shape.cc
+++ b/core/multimedia/opieplayer/libflash/shape.cc
@@ -1,216 +1,218 @@
/////////////////////////////////////////////////////////////
// Flash Plugin and Player
// Copyright (C) 1998,1999 Olivier Debon
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//
///////////////////////////////////////////////////////////////
// Author : Olivier Debon <odebon@club-internet.fr>
//
#include "swf.h"
+#include "math.h"
+
#ifdef RCSID
static char *rcsid = "$Id$";
#endif
#define PRINT 0
#define ABS(v) ((v) < 0 ? -(v) : (v))
static void prepareStyles(GraphicDevice *gd, Matrix *matrix, Cxform *cxform, FillStyleDef *f, long n);
static void clearStyles(GraphicDevice *gd, FillStyleDef *f, long n);
static void drawShape(GraphicDevice *gd, Matrix *matrix1, Cxform *cxform, Shape *shape,
ShapeAction shapeAction, void *id,ScanLineFunc scan_line_func);
// Constructor
Shape::Shape(long id, int level) : Character(ShapeType, id)
{
defLevel = level;
defaultFillStyle.type = f_Solid;
defaultFillStyle.color.red = 0;
defaultFillStyle.color.green = 0;
defaultFillStyle.color.blue = 0;
defaultFillStyle.color.alpha = ALPHA_OPAQUE;
defaultLineStyle.width = 0;
// This is to force a first update
lastMat.a = 0;
lastMat.d = 0;
shape_size += sizeof(Shape);
shape_nb ++;
file_ptr = NULL;
getStyles = 0;
getAlpha = 0;
}
Shape::~Shape()
{
if (file_ptr) {
free(file_ptr);
}
}
void
Shape::setBoundingBox(Rect rect)
{
boundary = rect;
}
void
Shape::getBoundingBox(Rect *bb, DisplayListEntry *e)
{
*bb = boundary;
}
int
Shape::execute(GraphicDevice *gd, Matrix *matrix, Cxform *cxform)
{
//printf("TagId = %d\n", getTagId());
//if (getTagId() != 220) return 0;
if (cxform) {
defaultFillStyle.color = cxform->getColor(gd->getForegroundColor());
} else {
defaultFillStyle.color = gd->getForegroundColor();
}
defaultFillStyle.color.pixel = gd->allocColor(defaultFillStyle.color);
drawShape(gd, matrix, cxform, this, ShapeDraw, NULL, 0);
return 0;
}
void
Shape::getRegion(GraphicDevice *gd, Matrix *matrix, void *id, ScanLineFunc scan_line_func)
{
gd->setClipping(0);
drawShape(gd,matrix,0,this,ShapeGetRegion,id,scan_line_func);
gd->setClipping(1);
}
/************************************************************************/
/* create a new path */
static void newPath(ShapeParser *shape,
long x, long y)
{
Path *p;
long x1,y1;
p=&shape->curPath;
x1 = shape->matrix->getX(x, y);
y1 = shape->matrix->getY(x, y);
p->lastX = x1;
p->lastY = y1;
p->nb_edges = 0;
p->nb_segments = 0;
}
static void addSegment1(ShapeParser *shape,
long x, long y,
FillStyleDef *f0,
FillStyleDef *f1,
LineStyleDef *l)
{
Path *p;
p=&shape->curPath;
if (l) {
/* a line is defined ... it will be drawn later */
LineSegment *ls;
ls = new LineSegment;
if (ls != NULL) {
ls->l = l;
ls->x1 = p->lastX;
ls->y1 = p->lastY;
ls->x2 = x;
ls->y2 = y;
ls->first = (p->nb_segments == 0);
ls->next = NULL;
if (shape->last_line == NULL) {
shape->first_line = ls;
} else {
shape->last_line->next = ls;
}
shape->last_line = ls;
}
}
/* anti antialiasing not needed if line */
if (!shape->reverse) {
shape->gd->addSegment(p->lastX,p->lastY,x,y,f0,f1,l ? 0 : 1);
} else {
shape->gd->addSegment(p->lastX,p->lastY,x,y,f1,f0,l ? 0 : 1);
}
p->lastX = x;
p->lastY = y;
p->nb_segments++;
}
static void addLine(ShapeParser *shape, long x, long y,
FillStyleDef *f0,
FillStyleDef *f1,
LineStyleDef *l)
{
long x1,y1;
Path *p;
p=&shape->curPath;
x1 = shape->matrix->getX(x, y);
y1 = shape->matrix->getY(x, y);
addSegment1(shape,x1,y1,f0,f1,l);
p->nb_edges++;
}
// This is based on Divide and Conquer algorithm.
#define BFRAC_BITS 0
#define BFRAC (1 << BFRAC_BITS)
static void
bezierBuildPoints (ShapeParser *s,
int subdivisions,
long a1X, long a1Y,
long cX, long cY,
long a2X, long a2Y)
{
long c1X,c1Y;
long c2X,c2Y;
long X,Y;
long xmin,ymin,xmax,ymax;
if (subdivisions != 0) {
/* find the bounding box */
diff --git a/core/multimedia/opieplayer/libmad/config.in b/core/multimedia/opieplayer/libmad/config.in
index 72249dc..f38e52d 100644
--- a/core/multimedia/opieplayer/libmad/config.in
+++ b/core/multimedia/opieplayer/libmad/config.in
@@ -1,4 +1,4 @@
config LIBMAD
boolean "opieplayer1-libmadplugin (plugin with shoutcast/icecast support to play MP3 files)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER
+ depends ( LIBQPE || LIBQPE-X11 ) && OPIEPLAYER
diff --git a/core/multimedia/opieplayer/libmpeg3/config.in b/core/multimedia/opieplayer/libmpeg3/config.in
index b965a40..d964fb9 100644
--- a/core/multimedia/opieplayer/libmpeg3/config.in
+++ b/core/multimedia/opieplayer/libmpeg3/config.in
@@ -1,4 +1,4 @@
config LIBMPEG3
boolean "opieplayer1-libmpeg3plugin (play MPEG3 video files)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER
+ depends ( LIBQPE || LIBQPE-X11 ) && OPIEPLAYER
diff --git a/core/multimedia/opieplayer/modplug/config.in b/core/multimedia/opieplayer/modplug/config.in
index 86e4725..d7496b0 100644
--- a/core/multimedia/opieplayer/modplug/config.in
+++ b/core/multimedia/opieplayer/modplug/config.in
@@ -1,4 +1,4 @@
config MODPLUG
boolean "opieplayer1-modplugin (play MOD/XM/S3M/IT amiga tracker modules)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER
+ depends ( LIBQPE || LIBQPE-X11 ) && OPIEPLAYER
diff --git a/core/multimedia/opieplayer/wavplugin/config.in b/core/multimedia/opieplayer/wavplugin/config.in
index 56bdfab..b7dddc5 100644
--- a/core/multimedia/opieplayer/wavplugin/config.in
+++ b/core/multimedia/opieplayer/wavplugin/config.in
@@ -1,4 +1,4 @@
config WAVPLUGIN
boolean "opieplayer1-wavplugin (play WAV files)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER
+ depends ( LIBQPE || LIBQPE-X11 ) && OPIEPLAYER