diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-07-11 12:18:11 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-07-11 12:18:11 +0000 |
| commit | 22e00ee57fc92b358b2becdb559ed4570b0b0daa (patch) | |
| tree | d1a37daf7951ab42de104b61558d07d3dcbae80d | |
| parent | 2fcc45440b9d055525880784979955d2767c5d7f (diff) | |
| download | gst-plugins-bad-22e00ee57fc92b358b2becdb559ed4570b0b0daa.tar.gz gst-plugins-bad-22e00ee57fc92b358b2becdb559ed4570b0b0daa.tar.bz2 gst-plugins-bad-22e00ee57fc92b358b2becdb559ed4570b0b0daa.zip | |
Compile against newer libxine, update requirement (#309503).
Original commit message from CVS:
Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* configure.ac:
* ext/xine/xineaudiodec.c: (gst_xine_audio_dec_init_plugin):
* ext/xine/xineaudiosink.c: (gst_xine_audio_sink_init_plugin):
* ext/xine/xineinput.c: (gst_xine_input_init_plugin):
Compile against newer libxine, update requirement (#309503).
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | ext/xine/xineaudiodec.c | 2 | ||||
| -rw-r--r-- | ext/xine/xineaudiosink.c | 8 | ||||
| -rw-r--r-- | ext/xine/xineinput.c | 8 |
5 files changed, 24 insertions, 6 deletions
@@ -1,3 +1,13 @@ +2005-07-11 Thomas Zajic <zlatko@gmx.at> + + Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net> + + * configure.ac: + * ext/xine/xineaudiodec.c: (gst_xine_audio_dec_init_plugin): + * ext/xine/xineaudiosink.c: (gst_xine_audio_sink_init_plugin): + * ext/xine/xineinput.c: (gst_xine_input_init_plugin): + Compile against newer libxine, update requirement (#309503). + 2005-07-11 Ronald S. Bultje <rbultje@ronald.bitfreak.net> * ext/theora/theoradec.c: (theora_dec_chain): diff --git a/configure.ac b/configure.ac index 0eebb1a3..80142c0f 100644 --- a/configure.ac +++ b/configure.ac @@ -1770,7 +1770,7 @@ GST_CHECK_FEATURE(WAVPACK, [wavpack plug-in], wavpack, [ dnl *** xine *** translit(dnm, m, l) AM_CONDITIONAL(USE_XINE, true) GST_CHECK_FEATURE(XINE, [xine wrapper], xine, [ - PKG_CHECK_MODULES(XINE, libxine >= 1.0.0, HAVE_XINE=yes, HAVE_XINE=no) + PKG_CHECK_MODULES(XINE, libxine >= 1.0.1, HAVE_XINE=yes, HAVE_XINE=no) AC_SUBST(XINE_CFLAGS) AC_SUBST(XINE_LIBS) ],disabled) 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); |