diff options
Diffstat (limited to 'src/audio_out/audio_directx_out.c')
| -rw-r--r--[-rwxr-xr-x] | src/audio_out/audio_directx_out.c | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c index d2147ac52..5d16698b2 100755..100644 --- a/src/audio_out/audio_directx_out.c +++ b/src/audio_out/audio_directx_out.c @@ -15,12 +15,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * audio_directx_out.c, direct sound audio output plugin for xine * by Matthew Grooms <elon@altavista.com> - * - * $Id: audio_directx_out.c,v 1.17 2006/09/21 15:01:08 valtri Exp $ */ /* @@ -40,8 +38,8 @@ typedef unsigned char boolean; #define LOG */ -#include "audio_out.h" -#include "xine_internal.h" +#include <xine/audio_out.h> +#include <xine/xine_internal.h> #define MAX_CHANNELS 6 @@ -54,7 +52,7 @@ typedef unsigned char boolean; #define DSBUFF_LEFT 1 #define DSBUFF_RIGHT 2 -#define AO_DIRECTX_IFACE_VERSION 8 +#define AO_DIRECTX_IFACE_VERSION 9 /***************************************************************************** * DirectDraw GUIDs. @@ -821,20 +819,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da return ( ao_driver_t * ) ao_directx; } -static char* get_identifier (audio_driver_class_t *this_gen) { - return "DirectX"; -} - -static char* get_description (audio_driver_class_t *this_gen) { - return _("xine audio output plugin for win32 using directx"); -} - -static void dispose_class (audio_driver_class_t *this_gen) { - audiox_class_t *audiox = (audiox_class_t *) this_gen; - - free (audiox); -} - static void *init_class (xine_t *xine, void *data) { audiox_class_t *audiox; @@ -848,9 +832,9 @@ static void *init_class (xine_t *xine, void *data) { return NULL; audiox->driver_class.open_plugin = open_plugin; - audiox->driver_class.get_identifier = get_identifier; - audiox->driver_class.get_description = get_description; - audiox->driver_class.dispose = dispose_class; + audiox->driver_class.identifier = "DirectX"; + audiox->driver_class.description = N_("xine audio output plugin for win32 using directx"); + audiox->driver_class.dispose = default_audio_driver_class_dispose; audiox->xine = xine; audiox->config = xine->config; |