3 files changed, 13 insertions, 5 deletions
diff --git a/ext/xine/xineaudiodec.c b/ext/xine/xineaudiodec.c
index dee0242f..69c74720 100644
--- a/ext/xine/xineaudiodec.c
+++ b/ext/xine/xineaudiodec.c
@@ -533,7 +533,7 @@ gst_xine_audio_dec_init_plugin (GstPlugin * plugin)
 
   klass = g_type_class_ref (GST_TYPE_XINE);
 
-  list = klass->xine->plugin_catalog->audio->first;
+  list = klass->xine->plugin_catalog->plugin_lists[PLUGIN_AUDIO_DECODER]->first;
   while (list) {
     plugin_node_t *node = list->content;
     decoder_info_t *dec;
diff --git a/ext/xine/xineaudiosink.c b/ext/xine/xineaudiosink.c
index 64c5e6f8..5049787f 100644
--- a/ext/xine/xineaudiosink.c
+++ b/ext/xine/xineaudiosink.c
@@ -312,7 +312,9 @@ gst_xine_audio_sink_init_plugin (GstPlugin * plugin)
 
   klass = g_type_class_ref (GST_TYPE_XINE);
 
-  node = xine_list_first_content (klass->xine->plugin_catalog->aout);
+  node =
+      xine_list_first_content (klass->xine->plugin_catalog->
+      plugin_lists[PLUGIN_AUDIO_OUT]);
   while (node) {
     gchar *plugin_name = g_strdup_printf ("xineaudiosink_%s", node->info->id);
     gchar *type_name = g_strdup_printf ("GstXineAudioSink%s", node->info->id);
@@ -329,7 +331,9 @@ gst_xine_audio_sink_init_plugin (GstPlugin * plugin)
     }
     g_free (plugin_name);
 
-    node = xine_list_next_content (klass->xine->plugin_catalog->aout);
+    node =
+        xine_list_next_content (klass->xine->plugin_catalog->
+        plugin_lists[PLUGIN_AUDIO_OUT]);
   }
 
   g_type_class_unref (klass);
diff --git a/ext/xine/xineinput.c b/ext/xine/xineinput.c
index 35aa1dca..ca076284 100644
--- a/ext/xine/xineinput.c
+++ b/ext/xine/xineinput.c
@@ -324,7 +324,9 @@ gst_xine_input_init_plugin (GstPlugin * plugin)
 
   klass = g_type_class_ref (GST_TYPE_XINE);
 
-  node = xine_list_first_content (klass->xine->plugin_catalog->input);
+  node =
+      xine_list_first_content (klass->xine->plugin_catalog->
+      plugin_lists[PLUGIN_INPUT]);
   while (node) {
     gchar *plugin_name = g_strdup_printf ("xinesrc_%s", node->info->id);
     gchar *type_name = g_strdup_printf ("GstXineInput%s", node->info->id);
@@ -341,7 +343,9 @@ gst_xine_input_init_plugin (GstPlugin * plugin)
     }
     g_free (plugin_name);
 
-    node = xine_list_next_content (klass->xine->plugin_catalog->input);
+    node =
+        xine_list_next_content (klass->xine->plugin_catalog->
+        plugin_lists[PLUGIN_INPUT]);
   }
 
   g_type_class_unref (klass);