kill global variable af from all audio format handlers

[paraslash.git] / ogg_afh.c

diff --git a/ogg_afh.c b/ogg_afh.c
index f972c630ee837953fe6d56c11b332c1124e131d3..1034091358b51b300737fcd3ae5404ac0a5363fe 100644 (file)
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -33,7 +33,6 @@
 static double chunk_time = 0.25;
 
 FILE *audio_file;
-static struct audio_format_handler *af;
 
 static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
 {
@@ -286,10 +285,9 @@ static const char* ogg_suffixes[] = {"ogg", NULL};
  *
  * \param p pointer to the struct to initialize
  */
-void ogg_init(struct audio_format_handler *p)
+void ogg_init(struct audio_format_handler *afh)
 {
-       af = p;
-       af->get_file_info = ogg_get_file_info,
-       af->close_audio_file = ogg_close_audio_file;
-       af->suffixes = ogg_suffixes;
+       afh->get_file_info = ogg_get_file_info,
+       afh->close_audio_file = ogg_close_audio_file;
+       afh->suffixes = ogg_suffixes;
 }