diff options
| -rwxr-xr-x | src/audio_out/audio_directx_out.c | 10 | ||||
| -rw-r--r-- | src/xine-engine/buffer.h | 3 | ||||
| -rw-r--r-- | src/xine-engine/buffer_types.c | 9 |
3 files changed, 4 insertions, 18 deletions
diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c index 2d233278e..12b66fb08 100755 --- a/src/audio_out/audio_directx_out.c +++ b/src/audio_out/audio_directx_out.c @@ -923,13 +923,7 @@ static void *init_class (xine_t *xine, void *data) { return audiox; } -static uint32_t audio_types[] = { - BUF_AUDIO_DIRECTX, - 0 - }; - -static decoder_info_t dec_info_audio = { - audio_types, /* supported types */ +static ao_info_t ao_info_directx = { 1 /* priority */ }; @@ -938,7 +932,7 @@ static decoder_info_t dec_info_audio = { */ plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_AUDIO_OUT, AO_DIRECTX_IFACE_VERSION, "directx", XINE_VERSION_CODE, &dec_info_audio, init_class }, + { PLUGIN_AUDIO_OUT, AO_DIRECTX_IFACE_VERSION, "directx", XINE_VERSION_CODE, &ao_info_directx, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h index 7abfa9992..afe8defdc 100644 --- a/src/xine-engine/buffer.h +++ b/src/xine-engine/buffer.h @@ -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: buffer.h,v 1.108 2003/04/22 23:30:52 tchamp Exp $ + * $Id: buffer.h,v 1.109 2003/04/23 16:15:01 mroi Exp $ * * * contents: @@ -197,7 +197,6 @@ extern "C" { #define BUF_AUDIO_FLAC 0x032C0000 #define BUF_AUDIO_DV 0x032D0000 #define BUF_AUDIO_WMAV 0x032E0000 -#define BUF_AUDIO_DIRECTX 0x032F0000 /* spu buffer types: */ diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index ff66dfc06..ac91a244b 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.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: buffer_types.c,v 1.57 2003/04/22 23:30:53 tchamp Exp $ + * $Id: buffer_types.c,v 1.58 2003/04/23 16:15:01 mroi Exp $ * * * contents: @@ -833,13 +833,6 @@ static audio_db_t audio_db[] = { BUF_AUDIO_DV, "DV Audio" }, -{ - { - 0 - }, - BUF_AUDIO_DIRECTX, - "Directx Audio" -}, { { 0 }, 0, "last entry" } }; |