From: Daniel Caujolle-B. <f1...@us...> - 2003-07-26 01:45:23
|
Update of /cvsroot/xine/xine-ui/src/xitk In directory sc8-pr-cvs1:/tmp/cvs-serv11619 Modified Files: actions.c file_browser.c mediamark.c post.c setup.c tvset.c Log Message: fix layer above init (and make valgrind happy). Fix realloc bug. Don't add subtitle entry in toxine's playlists if subtitle is NULL. Index: actions.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/actions.c,v retrieving revision 1.207 retrieving revision 1.208 diff -u -r1.207 -r1.208 --- actions.c 22 Jul 2003 21:33:08 -0000 1.207 +++ actions.c 25 Jul 2003 22:52:57 -0000 1.208 @@ -649,7 +649,7 @@ mmk = (mediamark_t **) xine_xmalloc(sizeof(mediamark_t *) * 2); else { if(new_num > 1) { - mmk = (mediamark_t **) realloc(mmk, sizeof(mediamark_t *) * (new_num + 1)); + mmk = (mediamark_t **) realloc(mmk, sizeof(mediamark_t *) * (new_num + 2)); } } Index: file_browser.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/file_browser.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- file_browser.c 14 Jul 2003 22:44:09 -0000 1.37 +++ file_browser.c 25 Jul 2003 22:52:57 -0000 1.38 @@ -1459,6 +1459,7 @@ w = xitk_get_widget_width(fb->files_browser); cmb.skin_element_name = NULL; + cmb.layer_above = (is_layer_above()); cmb.parent_wlist = fb->widget_list; cmb.entries = fb->file_filters; cmb.parent_wkey = &fb->widget_key; Index: mediamark.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/mediamark.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- mediamark.c 19 Jul 2003 13:37:06 -0000 1.50 +++ mediamark.c 25 Jul 2003 22:52:57 -0000 1.51 @@ -2441,7 +2441,8 @@ fprintf(fd, "\nentry {\n"); fprintf(fd, "\tidentifier = %s;\n", gGui->playlist.mmk[i]->ident); fprintf(fd, "\tmrl = %s;\n", gGui->playlist.mmk[i]->mrl); - fprintf(fd, "\tsubtitle = %s;\n", (gGui->playlist.mmk[i]->sub) ? gGui->playlist.mmk[i]->sub : ""); + if(gGui->playlist.mmk[i]->sub) + fprintf(fd, "\tsubtitle = %s;\n", gGui->playlist.mmk[i]->sub); fprintf(fd, "\tstart = %d;\n", gGui->playlist.mmk[i]->start); fprintf(fd, "\tend = %d;\n", gGui->playlist.mmk[i]->end); fprintf(fd, "\toffset = %d;\n", gGui->playlist.mmk[i]->offset); Index: post.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/post.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- post.c 25 Jul 2003 18:19:42 -0000 1.21 +++ post.c 25 Jul 2003 22:52:57 -0000 1.22 @@ -561,6 +561,7 @@ XITK_WIDGET_INIT(&cmb, gGui->imlib_data); cmb.skin_element_name = NULL; + cmb.layer_above = (is_layer_above()); cmb.parent_wlist = pplugin->widget_list; cmb.entries = pobj->param->enum_values; cmb.parent_wkey = &pplugin->widget_key; @@ -635,6 +636,7 @@ XITK_WIDGET_INIT(&cmb, gGui->imlib_data); cmb.skin_element_name = NULL; + cmb.layer_above = (is_layer_above()); cmb.parent_wlist = pplugin->widget_list; cmb.entries = (char **)(pobj->param_data + pobj->param->offset); cmb.parent_wkey = &pplugin->widget_key; @@ -860,6 +862,7 @@ XITK_WIDGET_INIT(&cmb, gGui->imlib_data); cmb.skin_element_name = NULL; + cmb.layer_above = (is_layer_above()); cmb.parent_wlist = pplugin->widget_list; cmb.entries = pobj->properties_names; cmb.parent_wkey = &pplugin->widget_key; @@ -1041,6 +1044,7 @@ XITK_WIDGET_INIT(&cmb, gGui->imlib_data); cmb.skin_element_name = NULL; + cmb.layer_above = (is_layer_above()); cmb.parent_wlist = pplugin->widget_list; cmb.entries = pplugin->plugin_names; cmb.parent_wkey = &pplugin->widget_key; Index: setup.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/setup.c,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- setup.c 18 Jul 2003 20:01:25 -0000 1.80 +++ setup.c 25 Jul 2003 22:52:57 -0000 1.81 @@ -818,6 +818,7 @@ ADD_FRAME(title); cmb.skin_element_name = NULL; + cmb.layer_above = (is_layer_above()); cmb.parent_wlist = setup->widget_list; cmb.entries = entry->enum_values; cmb.parent_wkey = &setup->kreg; Index: tvset.c =================================================================== RCS file: /cvsroot/xine/xine-ui/src/xitk/tvset.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tvset.c 18 Jul 2003 21:41:44 -0000 1.3 +++ tvset.c 25 Jul 2003 22:52:57 -0000 1.4 @@ -419,6 +419,7 @@ XITK_WIDGET_INIT(&cmb, gGui->imlib_data); cmb.skin_element_name = NULL; + cmb.layer_above = (is_layer_above()); cmb.parent_wlist = tvset->widget_list; cmb.entries = tvset->system_entries; cmb.parent_wkey = &tvset->widget_key; @@ -440,6 +441,7 @@ XITK_WIDGET_INIT(&cmb, gGui->imlib_data); cmb.skin_element_name = NULL; + cmb.layer_above = (is_layer_above()); cmb.parent_wlist = tvset->widget_list; cmb.entries = tvset->chann_entries; cmb.parent_wkey = &tvset->widget_key; @@ -490,6 +492,7 @@ XITK_WIDGET_INIT(&cmb, gGui->imlib_data); cmb.skin_element_name = NULL; + cmb.layer_above = (is_layer_above()); cmb.parent_wlist = tvset->widget_list; cmb.entries = tvset->vidstd_entries; cmb.parent_wkey = &tvset->widget_key; |