diff options
Diffstat (limited to 'src/dxr3')
| -rw-r--r-- | src/dxr3/dxr3_decode_spu.c | 14 | ||||
| -rw-r--r-- | src/dxr3/dxr3_decode_video.c | 16 |
2 files changed, 4 insertions, 26 deletions
diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c index 6cfcf619c..01b445d0d 100644 --- a/src/dxr3/dxr3_decode_spu.c +++ b/src/dxr3/dxr3_decode_spu.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: dxr3_decode_spu.c,v 1.17 2002/09/05 12:52:24 mroi Exp $ + * $Id: dxr3_decode_spu.c,v 1.18 2002/09/05 22:18:54 mroi Exp $ */ /* dxr3 spu decoder plugin. @@ -66,14 +66,13 @@ static decoder_info_t dxr3_spudec_info = { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_SPU_DECODER, 10, "dxr3-spudec", XINE_VERSION_CODE, &dxr3_spudec_info, &dxr3_spudec_init_plugin }, + { PLUGIN_SPU_DECODER, 9, "dxr3-spudec", XINE_VERSION_CODE, &dxr3_spudec_info, &dxr3_spudec_init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; /* functions required by xine api */ static char *dxr3_spudec_get_id(void); -static int dxr3_spudec_can_handle(spu_decoder_t *this_gen, int buf_type); static void dxr3_spudec_init(spu_decoder_t *this_gen, vo_instance_t *vo_out); static void dxr3_spudec_decode_data(spu_decoder_t *this_gen, buf_element_t *buf); static void dxr3_spudec_reset(spu_decoder_t *this_gen); @@ -145,13 +144,11 @@ static void *dxr3_spudec_init_plugin(xine_t *xine, void* data) } this->spu_decoder.get_identifier = dxr3_spudec_get_id; - this->spu_decoder.can_handle = dxr3_spudec_can_handle; this->spu_decoder.init = dxr3_spudec_init; this->spu_decoder.decode_data = dxr3_spudec_decode_data; this->spu_decoder.reset = dxr3_spudec_reset; this->spu_decoder.close = dxr3_spudec_close; this->spu_decoder.dispose = dxr3_spudec_dispose; - this->spu_decoder.priority = 10; this->xine = xine; /* We need to talk to dxr3 video out to coordinate spus and overlays */ @@ -175,13 +172,6 @@ static char *dxr3_spudec_get_id(void) return "dxr3-spudec"; } -static int dxr3_spudec_can_handle(spu_decoder_t *this_gen, int buf_type) -{ - int type = buf_type & 0xFFFF0000; - return (type == BUF_SPU_PACKAGE || type == BUF_SPU_CLUT || - type == BUF_SPU_NAV || type == BUF_SPU_SUBP_CONTROL); -} - static void dxr3_spudec_init(spu_decoder_t *this_gen, vo_instance_t *vo_out) { dxr3_spudec_t *this = (dxr3_spudec_t *)this_gen; diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c index 15bdf1387..89b82937c 100644 --- a/src/dxr3/dxr3_decode_video.c +++ b/src/dxr3/dxr3_decode_video.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: dxr3_decode_video.c,v 1.14 2002/09/05 20:44:39 mroi Exp $ + * $Id: dxr3_decode_video.c,v 1.15 2002/09/05 22:18:54 mroi Exp $ */ /* dxr3 video decoder plugin. @@ -130,7 +130,6 @@ static void parse_mpeg_header(dxr3_decoder_t *this, uint8_t *buffer); static int get_duration(dxr3_decoder_t *this); /* config callbacks */ -static void dxr3_update_priority(void *this_gen, xine_cfg_entry_t *entry); static void dxr3_update_sync_mode(void *this_gen, xine_cfg_entry_t *entry); static void dxr3_update_enhanced_mode(void *this_gen, xine_cfg_entry_t *entry); static void dxr3_update_correct_durations(void *this_gen, xine_cfg_entry_t *entry); @@ -171,11 +170,7 @@ static void *dxr3_init_plugin(xine_t *xine, void *data) this->video_decoder.reset = dxr3_reset; this->video_decoder.close = dxr3_close; this->video_decoder.dispose = dxr3_dispose; - this->video_decoder.priority = cfg->register_num(cfg, - "dxr3.decoder_priority", 10, _("Dxr3: video decoder priority"), - _("Decoder priorities greater 5 enable hardware decoding, 0 disables it."), 20, - dxr3_update_priority, this); - + this->scr = NULL; this->xine = xine; @@ -672,13 +667,6 @@ static int get_duration(dxr3_decoder_t *this) return duration; } -static void dxr3_update_priority(void *this_gen, xine_cfg_entry_t *entry) -{ - ((dxr3_decoder_t *)this_gen)->video_decoder.priority = entry->num_value; - printf("dxr3_decode_video: setting decoder priority to %d\n", - entry->num_value); -} - static void dxr3_update_sync_mode(void *this_gen, xine_cfg_entry_t *entry) { ((dxr3_decoder_t *)this_gen)->sync_every_frame = entry->num_value; |