diff options
Diffstat (limited to 'src/audio_out/audio_file_out.c')
-rw-r--r-- | src/audio_out/audio_file_out.c | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c index bc40d4efd..0a4471a19 100644 --- a/src/audio_out/audio_file_out.c +++ b/src/audio_out/audio_file_out.c @@ -32,12 +32,12 @@ #include <inttypes.h> #include <sys/stat.h> -#include "xine_internal.h" -#include "xineutils.h" -#include "audio_out.h" +#include <xine/xine_internal.h> +#include <xine/xineutils.h> +#include <xine/audio_out.h> #include "bswap.h" -#define AO_OUT_FILE_IFACE_VERSION 8 +#define AO_OUT_FILE_IFACE_VERSION 9 #define GAP_TOLERANCE INT_MAX @@ -85,7 +85,7 @@ typedef struct file_driver_s { uint32_t bits_per_sample; uint32_t bytes_per_frame; - char *fname; + const char *fname; int fd; size_t bytes_written; struct timeval endtime; @@ -376,22 +376,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, /* * class functions */ - -static char* get_identifier (audio_driver_class_t *this_gen) { - return "file"; -} - -static char* get_description (audio_driver_class_t *this_gen) { - return _("xine file audio output plugin"); -} - -static void dispose_class (audio_driver_class_t *this_gen) { - - file_class_t *this = (file_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { file_class_t *this; @@ -403,9 +387,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 = "file"; + this->driver_class.description = N_("xine file audio output plugin"); + this->driver_class.dispose = default_audio_driver_class_dispose; this->config = xine->config; this->xine = xine; |