diff options
Diffstat (limited to 'src/audio_out/audio_directx2_out.c')
| -rw-r--r-- | src/audio_out/audio_directx2_out.c | 37 |
1 files changed, 8 insertions, 29 deletions
diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c index aff4412ec..309edf961 100644 --- a/src/audio_out/audio_directx2_out.c +++ b/src/audio_out/audio_directx2_out.c @@ -15,9 +15,7 @@ * * 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 - * - * $Id: audio_directx2_out.c,v 1.9 2006/07/16 16:18:09 dsalt Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * * xine audio output plugin using DirectX @@ -60,11 +58,11 @@ #define LOG */ -#include "xine_internal.h" -#include "audio_out.h" +#include <xine/xine_internal.h> +#include <xine/audio_out.h> -#define AO_OUT_DIRECTX2_IFACE_VERSION 8 +#define AO_OUT_DIRECTX2_IFACE_VERSION 9 /* * buffer size in miliseconds @@ -151,10 +149,7 @@ static int buffer_ready(dx2_driver_t *this); /* popup a dialog with error */ -static void -#ifdef __GNUC__ - __attribute__((format (printf, 1, 2))) -#endif +static void XINE_FORMAT_PRINTF(1, 2) error_message(const char *fmt, ...) { char message[256]; va_list ap; @@ -993,22 +988,6 @@ static ao_driver_t *open_plugin(audio_driver_class_t *class_gen, const void *dat return (ao_driver_t *)this; } - -static char* get_identifier(audio_driver_class_t *this_gen) { - return "directx2"; -} - - -static char *get_description(audio_driver_class_t *this_gen) { - return _("second xine audio output plugin using directx"); -} - - -static void dispose_class(audio_driver_class_t *this_gen) { - free(this_gen); -} - - static void *init_class(xine_t *xine, void *data) { dx2_class_t *this; @@ -1019,9 +998,9 @@ static void *init_class(xine_t *xine, void *data) { return NULL; this->driver_class.open_plugin = open_plugin; - this->driver_class.get_identifier = get_identifier; - this->driver_class.get_description = get_description; - this->driver_class.dispose = dispose_class; + this->driver_class.identifier = "directx2"; + this->driver_class.description = N_("second xine audio output plugin using directx"); + this->driver_class.dispose = default_audio_driver_class_dispose; this->xine = xine; |