From c292a8d56fc0531297775cf64f14190b26b9b216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 23 Dec 2007 17:18:36 +0100 Subject: Mark all supported_types constant. --- src/dxr3/dxr3_decode_spu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dxr3/dxr3_decode_spu.c') diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c index 8280d4714..7c51b5c4b 100644 --- a/src/dxr3/dxr3_decode_spu.c +++ b/src/dxr3/dxr3_decode_spu.c @@ -64,7 +64,7 @@ static void *dxr3_spudec_init_plugin(xine_t *xine, void *); /* plugin catalog information */ -static uint32_t supported_types[] = { BUF_SPU_DVD, 0 }; +static const uint32_t supported_types[] = { BUF_SPU_DVD, 0 }; static const decoder_info_t dxr3_spudec_info = { supported_types, /* supported types */ -- cgit v1.2.3 From a6a44d3e64f6b32ce53128937c8bb894fce4644d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 23 Dec 2007 19:01:18 +0100 Subject: Don't create extra variables now that node is transparent to xine's build. --- src/dxr3/dxr3_decode_spu.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/dxr3/dxr3_decode_spu.c') diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c index 7c51b5c4b..f3163e331 100644 --- a/src/dxr3/dxr3_decode_spu.c +++ b/src/dxr3/dxr3_decode_spu.c @@ -144,19 +144,15 @@ static inline void dxr3_swab_clut(int* clut); /* inline helper implementations */ static inline int dxr3_present(xine_stream_t *stream) { - plugin_node_t *node; - video_driver_class_t *vo_class; int present = 0; - if (stream->video_driver && stream->video_driver->node) { - node = (plugin_node_t *)stream->video_driver->node; - if (node->plugin_class) { - vo_class = (video_driver_class_t *)node->plugin_class; - if (vo_class->identifier) - present = (strcmp(vo_class->identifier, DXR3_VO_ID) == 0); - } + if (stream->video_driver && stream->video_driver->node && + stream->video_driver->node->plugin_class ) { + const video_driver_class_t *const vo_class = (video_driver_class_t *)node->plugin_class; + if (vo_class->identifier) + present = (strcmp(vo_class->identifier, DXR3_VO_ID) == 0); } - llprintf(LOG_SPU, "dxr3 %s\n", present ? "present" : "not present"); + llprintf(LOG_VID, "dxr3 %s\n", present ? "present" : "not present"); return present; } -- cgit v1.2.3 From f2524801047b6cc4d9178e45cd4799e452854ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 23 Dec 2007 19:03:43 +0100 Subject: Move dxr3_present() in dxr3.h to avoid duplicating the function. --- src/dxr3/dxr3_decode_spu.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'src/dxr3/dxr3_decode_spu.c') diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c index f3163e331..01dd20b05 100644 --- a/src/dxr3/dxr3_decode_spu.c +++ b/src/dxr3/dxr3_decode_spu.c @@ -142,20 +142,6 @@ static int dxr3_spudec_copy_nav_to_btn(dxr3_spudec_t *this, int32_t mode static inline void dxr3_swab_clut(int* clut); /* inline helper implementations */ -static inline int dxr3_present(xine_stream_t *stream) -{ - int present = 0; - - if (stream->video_driver && stream->video_driver->node && - stream->video_driver->node->plugin_class ) { - const video_driver_class_t *const vo_class = (video_driver_class_t *)node->plugin_class; - if (vo_class->identifier) - present = (strcmp(vo_class->identifier, DXR3_VO_ID) == 0); - } - llprintf(LOG_VID, "dxr3 %s\n", present ? "present" : "not present"); - return present; -} - static inline void dxr3_spudec_clear_nav_list(dxr3_spudec_t *this) { while (this->pci_cur.next) { -- cgit v1.2.3