-rw-r--r-- | core/multimedia/opieplayer/libflash/config.in | 2 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libflash/shape.cc | 2 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmad/config.in | 2 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmpeg3/config.in | 2 | ||||
-rw-r--r-- | core/multimedia/opieplayer/modplug/config.in | 2 | ||||
-rw-r--r-- | core/multimedia/opieplayer/wavplugin/config.in | 2 |
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 @@ | |||
1 | # config #LIBFLASH | 1 | # config #LIBFLASH |
2 | # boolean "libflash" | 2 | # boolean "libflash" |
3 | # default "y" | 3 | # default "y" |
4 | # depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | # 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,72 +1,74 @@ | |||
1 | ///////////////////////////////////////////////////////////// | 1 | ///////////////////////////////////////////////////////////// |
2 | // Flash Plugin and Player | 2 | // Flash Plugin and Player |
3 | // Copyright (C) 1998,1999 Olivier Debon | 3 | // Copyright (C) 1998,1999 Olivier Debon |
4 | // | 4 | // |
5 | // This program is free software; you can redistribute it and/or | 5 | // This program is free software; you can redistribute it and/or |
6 | // modify it under the terms of the GNU General Public License | 6 | // modify it under the terms of the GNU General Public License |
7 | // as published by the Free Software Foundation; either version 2 | 7 | // as published by the Free Software Foundation; either version 2 |
8 | // of the License, or (at your option) any later version. | 8 | // of the License, or (at your option) any later version. |
9 | // | 9 | // |
10 | // This program is distributed in the hope that it will be useful, | 10 | // This program is distributed in the hope that it will be useful, |
11 | // but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | // but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | // GNU General Public License for more details. | 13 | // GNU General Public License for more details. |
14 | // | 14 | // |
15 | // You should have received a copy of the GNU General Public License | 15 | // You should have received a copy of the GNU General Public License |
16 | // along with this program; if not, write to the Free Software | 16 | // along with this program; if not, write to the Free Software |
17 | // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | // | 18 | // |
19 | /////////////////////////////////////////////////////////////// | 19 | /////////////////////////////////////////////////////////////// |
20 | // Author : Olivier Debon <odebon@club-internet.fr> | 20 | // Author : Olivier Debon <odebon@club-internet.fr> |
21 | // | 21 | // |
22 | 22 | ||
23 | #include "swf.h" | 23 | #include "swf.h" |
24 | 24 | ||
25 | #include "math.h" | ||
26 | |||
25 | #ifdef RCSID | 27 | #ifdef RCSID |
26 | static char *rcsid = "$Id$"; | 28 | static char *rcsid = "$Id$"; |
27 | #endif | 29 | #endif |
28 | 30 | ||
29 | #define PRINT 0 | 31 | #define PRINT 0 |
30 | 32 | ||
31 | #define ABS(v) ((v) < 0 ? -(v) : (v)) | 33 | #define ABS(v) ((v) < 0 ? -(v) : (v)) |
32 | 34 | ||
33 | static void prepareStyles(GraphicDevice *gd, Matrix *matrix, Cxform *cxform, FillStyleDef *f, long n); | 35 | static void prepareStyles(GraphicDevice *gd, Matrix *matrix, Cxform *cxform, FillStyleDef *f, long n); |
34 | 36 | ||
35 | static void clearStyles(GraphicDevice *gd, FillStyleDef *f, long n); | 37 | static void clearStyles(GraphicDevice *gd, FillStyleDef *f, long n); |
36 | 38 | ||
37 | static void drawShape(GraphicDevice *gd, Matrix *matrix1, Cxform *cxform, Shape *shape, | 39 | static void drawShape(GraphicDevice *gd, Matrix *matrix1, Cxform *cxform, Shape *shape, |
38 | ShapeAction shapeAction, void *id,ScanLineFunc scan_line_func); | 40 | ShapeAction shapeAction, void *id,ScanLineFunc scan_line_func); |
39 | 41 | ||
40 | // Constructor | 42 | // Constructor |
41 | 43 | ||
42 | Shape::Shape(long id, int level) : Character(ShapeType, id) | 44 | Shape::Shape(long id, int level) : Character(ShapeType, id) |
43 | { | 45 | { |
44 | defLevel = level; | 46 | defLevel = level; |
45 | 47 | ||
46 | defaultFillStyle.type = f_Solid; | 48 | defaultFillStyle.type = f_Solid; |
47 | defaultFillStyle.color.red = 0; | 49 | defaultFillStyle.color.red = 0; |
48 | defaultFillStyle.color.green = 0; | 50 | defaultFillStyle.color.green = 0; |
49 | defaultFillStyle.color.blue = 0; | 51 | defaultFillStyle.color.blue = 0; |
50 | defaultFillStyle.color.alpha = ALPHA_OPAQUE; | 52 | defaultFillStyle.color.alpha = ALPHA_OPAQUE; |
51 | 53 | ||
52 | defaultLineStyle.width = 0; | 54 | defaultLineStyle.width = 0; |
53 | 55 | ||
54 | // This is to force a first update | 56 | // This is to force a first update |
55 | lastMat.a = 0; | 57 | lastMat.a = 0; |
56 | lastMat.d = 0; | 58 | lastMat.d = 0; |
57 | shape_size += sizeof(Shape); | 59 | shape_size += sizeof(Shape); |
58 | shape_nb ++; | 60 | shape_nb ++; |
59 | 61 | ||
60 | file_ptr = NULL; | 62 | file_ptr = NULL; |
61 | getStyles = 0; | 63 | getStyles = 0; |
62 | getAlpha = 0; | 64 | getAlpha = 0; |
63 | } | 65 | } |
64 | 66 | ||
65 | Shape::~Shape() | 67 | Shape::~Shape() |
66 | { | 68 | { |
67 | if (file_ptr) { | 69 | if (file_ptr) { |
68 | free(file_ptr); | 70 | free(file_ptr); |
69 | } | 71 | } |
70 | } | 72 | } |
71 | 73 | ||
72 | void | 74 | void |
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 @@ | |||
1 | config LIBMAD | 1 | config LIBMAD |
2 | boolean "opieplayer1-libmadplugin (plugin with shoutcast/icecast support to play MP3 files)" | 2 | boolean "opieplayer1-libmadplugin (plugin with shoutcast/icecast support to play MP3 files)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER | 4 | 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 @@ | |||
1 | config LIBMPEG3 | 1 | config LIBMPEG3 |
2 | boolean "opieplayer1-libmpeg3plugin (play MPEG3 video files)" | 2 | boolean "opieplayer1-libmpeg3plugin (play MPEG3 video files)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER | 4 | 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 @@ | |||
1 | config MODPLUG | 1 | config MODPLUG |
2 | boolean "opieplayer1-modplugin (play MOD/XM/S3M/IT amiga tracker modules)" | 2 | boolean "opieplayer1-modplugin (play MOD/XM/S3M/IT amiga tracker modules)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER | 4 | 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 @@ | |||
1 | config WAVPLUGIN | 1 | config WAVPLUGIN |
2 | boolean "opieplayer1-wavplugin (play WAV files)" | 2 | boolean "opieplayer1-wavplugin (play WAV files)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER | 4 | depends ( LIBQPE || LIBQPE-X11 ) && OPIEPLAYER |