summaryrefslogtreecommitdiff
path: root/src/xine-engine/load_plugins.c
diff options
context:
space:
mode:
authorFrantišek Dvořák <valtri@users.sourceforge.net>2006-10-16 22:18:24 +0000
committerFrantišek Dvořák <valtri@users.sourceforge.net>2006-10-16 22:18:24 +0000
commitfd821f5c182e0c6f2da2f299b7d1341affd0914f (patch)
tree4d6765e0e45102c4a69bf114f2e6ebe38297ea8d /src/xine-engine/load_plugins.c
parenteebe97a3fe85f26ec95ad237a327ed02a2a2bfb2 (diff)
downloadxine-lib-fd821f5c182e0c6f2da2f299b7d1341affd0914f.tar.gz
xine-lib-fd821f5c182e0c6f2da2f299b7d1341affd0914f.tar.bz2
Fixed several warnings (but warnings due to APIs not solved).
CVS patchset: 8344 CVS date: 2006/10/16 22:18:24
Diffstat (limited to 'src/xine-engine/load_plugins.c')
-rw-r--r--src/xine-engine/load_plugins.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index a0e245040..0a6b182f9 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: load_plugins.c,v 1.225 2006/09/26 21:32:08 dgp85 Exp $
+ * $Id: load_plugins.c,v 1.226 2006/10/16 22:18:24 valtri Exp $
*
*
* Load input/demux/audio_out/video_out/codec plugins
@@ -181,7 +181,7 @@ static void map_decoder_list (xine_t *this,
for (list_id = 0; list_id < list_size; list_id++) {
plugin_node_t *node = xine_sarray_get(decoder_list, list_id);
- uint32_t *type = ((decoder_info_t *)node->info->special_info)->supported_types;
+ const uint32_t *type = ((decoder_info_t *)node->info->special_info)->supported_types;
int priority = get_decoder_priority(this, node);
lprintf ("mapping decoder %s\n", node->info->id);
@@ -955,34 +955,34 @@ static void load_plugin_list(FILE *fp, xine_sarray_t *plugins) {
switch (node->info->type & PLUGIN_TYPE_MASK){
case PLUGIN_VIDEO_OUT:
- vo_info = node->info->special_info =
+ node->info->special_info = vo_info =
xine_xmalloc(sizeof(vo_info_t));
break;
case PLUGIN_AUDIO_OUT:
- ao_info = node->info->special_info =
- xine_xmalloc(sizeof(ao_info_t));
+ node->info->special_info = ao_info =
+ xine_xmalloc(sizeof(ao_info_t));
break;
case PLUGIN_DEMUX:
- demuxer_info = node->info->special_info =
+ node->info->special_info = demuxer_info =
xine_xmalloc(sizeof(demuxer_info_t));
break;
case PLUGIN_INPUT:
- input_info = node->info->special_info =
+ node->info->special_info = input_info =
xine_xmalloc(sizeof(input_info_t));
break;
case PLUGIN_AUDIO_DECODER:
case PLUGIN_VIDEO_DECODER:
case PLUGIN_SPU_DECODER:
- decoder_info = node->info->special_info =
+ node->info->special_info = decoder_info =
xine_xmalloc(sizeof(decoder_info_t));
break;
case PLUGIN_POST:
- post_info = node->info->special_info =
+ node->info->special_info = post_info =
xine_xmalloc(sizeof(post_info_t));
break;
}
@@ -1527,7 +1527,7 @@ vo_driver_t *_x_load_video_output_plugin(xine_t *this,
node = xine_sarray_get (catalog->plugin_lists[PLUGIN_VIDEO_OUT - 1], list_id);
- vo_info = node->info->special_info;
+ vo_info = (vo_info_t *)node->info->special_info;
if (vo_info->visual_type == visual_type) {
if (id) {
if (!strcasecmp (node->info->id, id)) {
@@ -1591,7 +1591,7 @@ xine_video_port_t *xine_new_framegrab_video_port (xine_t *this) {
node = xine_sarray_get (catalog->plugin_lists[PLUGIN_VIDEO_OUT - 1], list_id);
- vo_info = node->info->special_info;
+ vo_info = (vo_info_t *)node->info->special_info;
if (!strcasecmp (node->info->id, id)) {
driver = _load_video_driver (this, node, NULL);
break;
@@ -1674,7 +1674,7 @@ xine_audio_port_t *xine_open_audio_driver (xine_t *this, const char *id,
node = xine_sarray_get (this->plugin_catalog->plugin_lists[PLUGIN_AUDIO_OUT - 1], list_id);
- ao_info = node->info->special_info;
+ ao_info = (ao_info_t *)node->info->special_info;
if (id) {
if (!strcasecmp(node->info->id, id)) {
@@ -2546,7 +2546,7 @@ static void dispose_plugin_list (xine_sarray_t *list) {
free (decoder_info->supported_types);
default:
- free (node->info->special_info);
+ free ((void *)node->info->special_info);
break;
}