Update all audio output plugins to the new identifier/description interface.

9 files changed, 18 insertions, 92 deletions

diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index 4ce2b1be3..472863ac1 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -1663,14 +1663,6 @@ static void alsa_speaker_arrangement_cb (void *user_data,
  * class functions
  */
 
-static char* get_identifier (audio_driver_class_t *this_gen) {
-  return "alsa";
-}
-
-static char* get_description (audio_driver_class_t *this_gen) {
-  return _("xine audio output plugin using alsa-compliant audio devices/drivers");
-}
-
 static void dispose_class (audio_driver_class_t *this_gen) {
 
   alsa_class_t *this = (alsa_class_t *) this_gen;
@@ -1687,8 +1679,8 @@ 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.identifier      = "alsa";
+  this->driver_class.description     = _("xine audio output plugin using alsa-compliant audio devices/drivers");
   this->driver_class.dispose         = dispose_class;
 
 /*  this->config = xine->config; */
diff --git a/src/audio_out/audio_coreaudio_out.c b/src/audio_out/audio_coreaudio_out.c
index eecab8f95..33c009511 100644
--- a/src/audio_out/audio_coreaudio_out.c
+++ b/src/audio_out/audio_coreaudio_out.c
@@ -561,14 +561,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 "coreaudio";
-}
-
-static char* get_description (audio_driver_class_t *this_gen) {
-  return _("xine output plugin for Coreaudio/Mac OS X");
-}
-
 static void dispose_class (audio_driver_class_t *this_gen) {
 
   coreaudio_class_t *this = (coreaudio_class_t *) this_gen;
@@ -587,8 +579,8 @@ 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.identifier      = "coreaudio";
+  this->driver_class.description     = _("xine output plugin for Coreaudio/Mac OS X");
   this->driver_class.dispose         = dispose_class;
 
   this->config = xine->config;
diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c
index d9688b647..d35fb310c 100644
--- a/src/audio_out/audio_directx2_out.c
+++ b/src/audio_out/audio_directx2_out.c
@@ -989,16 +989,6 @@ static ao_driver_t *open_plugin(audio_driver_class_t *class_gen, const void *dat
 }
 
 
-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);
 }
@@ -1014,8 +1004,8 @@ 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.identifier      = "directx2";
+  this->driver_class.description     = _("second xine audio output plugin using directx");
   this->driver_class.dispose         = dispose_class;
 
   this->xine = xine;
diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c
index 77e3e15b9..496ef545a 100644
--- a/src/audio_out/audio_directx_out.c
+++ b/src/audio_out/audio_directx_out.c
@@ -819,14 +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;
 
@@ -846,8 +838,8 @@ 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.identifier      = "DirectX";
+  audiox->driver_class.description     = _("xine audio output plugin for win32 using directx");
   audiox->driver_class.dispose         = dispose_class;
 
   audiox->xine                         = xine;
diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c
index 4b209bea1..b7b6a2baa 100644
--- a/src/audio_out/audio_esd_out.c
+++ b/src/audio_out/audio_esd_out.c
@@ -564,14 +564,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 "esd";
-}
-
-static char* get_description (audio_driver_class_t *this_gen) {
-  return _("xine audio output plugin using esound");
-}
-
 static void dispose_class (audio_driver_class_t *this_gen) {
 
   esd_class_t *this = (esd_class_t *) this_gen;
@@ -588,8 +580,8 @@ 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.identifier      = "esd";
+  this->driver_class.description     = _("xine audio output plugin using esound");
   this->driver_class.dispose         = dispose_class;
 
   this->xine = xine;
diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c
index 225d64d0e..5473dcaa8 100644
--- a/src/audio_out/audio_file_out.c
+++ b/src/audio_out/audio_file_out.c
@@ -354,14 +354,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;
@@ -380,8 +372,8 @@ 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.identifier      = "file";
+	this->driver_class.description     = _("xine file audio output plugin");
 	this->driver_class.dispose         = dispose_class;
 
 	this->config = xine->config;
diff --git a/src/audio_out/audio_jack_out.c b/src/audio_out/audio_jack_out.c
index 1bc070527..214e8d4fa 100644
--- a/src/audio_out/audio_jack_out.c
+++ b/src/audio_out/audio_jack_out.c
@@ -398,14 +398,6 @@ static ao_driver_t *open_jack_plugin (audio_driver_class_t *class_gen,
  * class functions
  */
 
-static char* get_identifier (audio_driver_class_t *this_gen) {
-    return "jack";
-}
-
-static char* get_description (audio_driver_class_t *this_gen) {
-    return _("xine output plugin for JACK Audio Connection Kit");
-}
-
 static void dispose_class (audio_driver_class_t *this_gen) {
 
     jack_class_t *this = (jack_class_t *) this_gen;
@@ -419,8 +411,8 @@ static void *init_class (xine_t *xine, void *data) {
     this = (jack_class_t *) xine_xmalloc (sizeof (jack_class_t));
 
     this->driver_class.open_plugin     = open_jack_plugin;
-    this->driver_class.get_identifier  = get_identifier;
-    this->driver_class.get_description = get_description;
+    this->driver_class.identifier      = "jack";
+    this->driver_class.description     = _("xine output plugin for JACK Audio Connection Kit");
     this->driver_class.dispose         = dispose_class;
 
     this->config = xine->config;
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index a6e0fe494..3de1c708b 100644
--- a/src/audio_out/audio_oss_out.c
+++ b/src/audio_out/audio_oss_out.c
@@ -1146,14 +1146,6 @@ static void oss_speaker_arrangement_cb (void *user_data,
  * class functions
  */
 
-static char* get_identifier (audio_driver_class_t *this_gen) {
-  return "oss";
-}
-
-static char* get_description (audio_driver_class_t *this_gen) {
-  return _("xine audio output plugin using oss-compliant audio devices/drivers");
-}
-
 static void dispose_class (audio_driver_class_t *this_gen) {
 
   oss_class_t *this = (oss_class_t *) this_gen;
@@ -1170,8 +1162,8 @@ 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.identifier      = "oss";
+  this->driver_class.description     = _("xine audio output plugin using oss-compliant audio devices/drivers");
   this->driver_class.dispose         = dispose_class;
 
   this->config = xine->config;
diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c
index 838230dbe..d2ca3bf6f 100644
--- a/src/audio_out/audio_sun_out.c
+++ b/src/audio_out/audio_sun_out.c
@@ -1012,14 +1012,6 @@ static ao_driver_t *ao_sun_open_plugin (audio_driver_class_t *class_gen, const v
  * class functions
  */
 
-static char* ao_sun_get_identifier (audio_driver_class_t *this_gen) {
-  return "sun";
-}
-
-static char* ao_sun_get_description (audio_driver_class_t *this_gen) {
-  return _("xine audio output plugin using sun-compliant audio devices/drivers");
-}
-
 static void ao_sun_dispose_class (audio_driver_class_t *this_gen) {
 
   sun_class_t *this = (sun_class_t *) this_gen;
@@ -1035,8 +1027,8 @@ static void *ao_sun_init_class (xine_t *xine, void *data) {
     return NULL;
 
   this->driver_class.open_plugin     = ao_sun_open_plugin;
-  this->driver_class.get_identifier  = ao_sun_get_identifier;
-  this->driver_class.get_description = ao_sun_get_description;
+  this->driver_class.identifier      = "sun";
+  this->driver_class.description     = _("xine audio output plugin using sun-compliant audio devices/drivers");
   this->driver_class.dispose         = ao_sun_dispose_class;
 
   this->xine = xine;