"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/xitk/oxine/oxine.c" between
xine-ui-0.99.13.tar.bz2 and xine-ui-0.99.14.tar.bz2

About: xine is a free video player which plays mpeg-2 and mpeg-1 video, DVDs (unlocked/unencrypted only), video CDs, SVCDs, and AVI files (using Win32 codecs) with synchronized audio and video, and optionally fullscreen using the Xv extensions in Xfree86 4.x (user interface).

oxine.c  (xine-ui-0.99.13.tar.bz2):oxine.c  (xine-ui-0.99.14.tar.bz2)
skipping to change at line 313 skipping to change at line 313
if (!oxine) if (!oxine)
return; return;
autoplay_mrls = xine_get_autoplay_mrls (gui->xine, parameter, &num_mrls); autoplay_mrls = xine_get_autoplay_mrls (gui->xine, parameter, &num_mrls);
if (autoplay_mrls) { if (autoplay_mrls) {
playlist_delete_all (gui); playlist_delete_all (gui);
for (j = 0; j < num_mrls; j++) for (j = 0; j < num_mrls; j++)
mediamark_append_entry (gui, (const char *)autoplay_mrls[j], gui_playlist_append (gui, (const char *)autoplay_mrls[j],
(const char *)autoplay_mrls[j], NULL, 0, -1, 0, 0); (const char *)autoplay_mrls[j], NULL, 0, -1, 0, 0);
oxine->pauseplay = NULL; oxine->pauseplay = NULL;
oxine->main_window = NULL; oxine->main_window = NULL;
otk_clear(oxine->otk); otk_clear(oxine->otk);
oxine->mode = OXINE_MODE_NORMAL; oxine->mode = OXINE_MODE_NORMAL;
gui->playlist.cur = 0; gui->playlist.cur = 0;
gui_set_current_mmk (gui, mediamark_get_current_mmk (gui)); gui_current_set_index (gui, GUI_MMK_CURRENT);
gui_xine_open_and_play (gui, gui->mmk.mrl, gui->mmk.sub, 0, gui_xine_open_and_play (gui, gui->mmk.mrl, gui->mmk.sub, 0,
gui->mmk.start, gui->mmk.av_offset, gui->mmk.spu_offs et, 0); gui->mmk.start, gui->mmk.av_offset, gui->mmk.spu_offs et, 0);
} }
oxine_instance_unget(oxine); oxine_instance_unget(oxine);
} }
#if 0 #if 0
static void playing_menu_update(void *data) { static void playing_menu_update(void *data) {
skipping to change at line 438 skipping to change at line 438
fd = xine_open_cloexec(mrl, O_RDONLY); fd = xine_open_cloexec(mrl, O_RDONLY);
if (fd<0) if (fd<0)
return NULL; return NULL;
buf = ho_newstring((*file_size)+1); buf = ho_newstring((*file_size)+1);
if (!buf) if (!buf)
return NULL; return NULL;
buf[*file_size]=0;
*file_size = read (fd, buf, *file_size); *file_size = read (fd, buf, *file_size);
buf[*file_size]=0;
close (fd); close (fd);
return buf; return buf;
} }
static menuitem_t *menuitem_load(xml_node_t *node) { static menuitem_t *menuitem_load(xml_node_t *node) {
menuitem_t *item = ho_new(menuitem_t); menuitem_t *item = ho_new(menuitem_t);
item->x = atoi(xml_parser_get_property(node, "x")); item->x = atoi(xml_parser_get_property(node, "x"));
skipping to change at line 492 skipping to change at line 492
} }
} }
} }
} while ( (node = node->next) != NULL ); } while ( (node = node->next) != NULL );
return item; return item;
} }
static int read_main_menu(oxine_t *oxine, list_t *list, const char *mrl) { static int read_main_menu(oxine_t *oxine, list_t *list, const char *mrl) {
int size; int size = 0;
char *file = read_entire_file(mrl, &size); char *file = read_entire_file(mrl, &size);
xml_node_t *node; xml_node_t *node;
if (!file) return 0; if (!file) return 0;
xml_parser_init_R (xml_parser_t *xml, file, strlen (file), XML_PARSER_CASE_INS ENSITIVE); xml_parser_init_R (xml_parser_t *xml, file, size, XML_PARSER_CASE_INSENSITIVE) ;
if (xml_parser_build_tree_R (xml, &node)<0) { if (xml_parser_build_tree_R (xml, &node)<0) {
lprintf("xml parsing of %s failed\n", mrl); lprintf("xml parsing of %s failed\n", mrl);
xml_parser_finalize_R (xml); xml_parser_finalize_R (xml);
return 0; return 0;
} }
if (strcasecmp (node->name, "oxinemm")) { if (strcasecmp (node->name, "oxinemm")) {
lprintf ("error, root node must be OXINEMM\n"); lprintf ("error, root node must be OXINEMM\n");
xml_parser_finalize_R (xml); xml_parser_finalize_R (xml);
 End of changes. 6 change blocks. 
6 lines changed or deleted 6 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)