summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Pang <athp@users.sourceforge.net>2004-09-09 06:38:45 +0000
committerAndre Pang <athp@users.sourceforge.net>2004-09-09 06:38:45 +0000
commit80482ceb426acac5ebeda5433fdcf7d7176c0b1c (patch)
tree66df0b7836917b687f6fc2d0c62855605f5f82f6
parent7d34c6992692dede72d8fe067a1a7dd0c30aecde (diff)
downloadxine-lib-80482ceb426acac5ebeda5433fdcf7d7176c0b1c.tar.gz
xine-lib-80482ceb426acac5ebeda5433fdcf7d7176c0b1c.tar.bz2
Small tidyups and turn off logging in CMML decoder
CVS patchset: 6953 CVS date: 2004/09/09 06:38:45
-rw-r--r--src/libspucmml/xine_decoder.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/libspucmml/xine_decoder.c b/src/libspucmml/xine_decoder.c
index d01c07acc..5334ec5f0 100644
--- a/src/libspucmml/xine_decoder.c
+++ b/src/libspucmml/xine_decoder.c
@@ -17,13 +17,15 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_decoder.c,v 1.1 2004/09/09 06:35:44 athp Exp $
+ * $Id: xine_decoder.c,v 1.2 2004/09/09 06:38:45 athp Exp $
*
*/
-#define LOG
#define LOG_MODULE "libspucmml"
#define LOG_VERBOSE
+/*
+#define LOG
+*/
#define LOG_OSD 0
#define LOG_SCHEDULING 0
#define LOG_WIDTH 0
@@ -44,9 +46,7 @@ typedef enum {
typedef struct spucmml_class_s {
spu_decoder_class_t class;
-
char *src_encoding; /* encoding of subtitle file */
-
xine_t *xine;
} spucmml_class_t;
@@ -69,8 +69,8 @@ typedef struct spucmml_decoder_s {
int lines;
char text[SUB_MAX_TEXT][SUB_BUFSIZE];
- int cached_width; /* frame width */
- int cached_height; /* frame height */
+ int cached_width; /* frame width */
+ int cached_height; /* frame height */
int64_t cached_img_duration;
int font_size;
int line_height;
@@ -86,6 +86,7 @@ typedef struct spucmml_decoder_s {
cmml_anchor_t current_anchor;
} spucmml_decoder_t;
+
static void video_frame_format_change_callback (void *user_data, const xine_event_t *event);