diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-05-01 19:42:56 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-05-01 19:42:56 +0000 |
| commit | f5ef61ef9364a04765b71d80ea19675a80616f40 (patch) | |
| tree | d5e5d3b26d57bcf6af977fa95a1daaf376fea784 /src/libspudec | |
| parent | 47760fada8acc782d6f3037017733aff8d49a4f5 (diff) | |
| download | xine-lib-f5ef61ef9364a04765b71d80ea19675a80616f40.tar.gz xine-lib-f5ef61ef9364a04765b71d80ea19675a80616f40.tar.bz2 | |
big cleanup on plugin dispose handling, small improvements on version handling for decoder plugins
CVS patchset: 1824
CVS date: 2002/05/01 19:42:56
Diffstat (limited to 'src/libspudec')
| -rw-r--r-- | src/libspudec/spu_decoder_api.h | 6 | ||||
| -rw-r--r-- | src/libspudec/xine_decoder.c | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/libspudec/spu_decoder_api.h b/src/libspudec/spu_decoder_api.h index f7f4a6bcb..bbde5786a 100644 --- a/src/libspudec/spu_decoder_api.h +++ b/src/libspudec/spu_decoder_api.h @@ -24,7 +24,9 @@ #ifndef HAVE_SPU_API_H #define HAVE_SPU_API_H - /* +#define SPU_DECODER_IFACE_VERSION 7 + +/* * generic xine spu decoder plugin interface * * for a dynamic plugin make sure you provide this function call: @@ -54,8 +56,6 @@ struct spu_decoder_s { int priority; - metronom_t *metronom; - }; typedef struct spu_button_s spu_button_t; diff --git a/src/libspudec/xine_decoder.c b/src/libspudec/xine_decoder.c index 818b10959..333267261 100644 --- a/src/libspudec/xine_decoder.c +++ b/src/libspudec/xine_decoder.c @@ -19,7 +19,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: xine_decoder.c,v 1.66 2002/04/24 20:26:07 jcdutton Exp $ + * $Id: xine_decoder.c,v 1.67 2002/05/01 19:42:56 guenter Exp $ * * stuff needed to turn libspu into a xine decoder plugin */ @@ -301,7 +301,7 @@ spu_decoder_t *init_spu_decoder_plugin (int iface_version, xine_t *xine) { spudec_decoder_t *this ; - if (iface_version != 6) { + if (iface_version != 7) { printf("libspudec: Doesn't support plugin API version %d.\n" "libspudec: This means there is a version mismatch between XINE and\n" "libspudec: this plugin.\n", iface_version); @@ -309,8 +309,6 @@ spu_decoder_t *init_spu_decoder_plugin (int iface_version, xine_t *xine) { } this = (spudec_decoder_t *) xine_xmalloc (sizeof (spudec_decoder_t)); -/* xine_xmalloc does memset */ -/* memset (this, 0, sizeof(*this)); */ this->spu_decoder.interface_version = iface_version; this->spu_decoder.can_handle = spudec_can_handle; |