Menu
▾
▴
[xine-cvs] CVS: xine-ui/src/xitk errors.c,1.9,1.10 event.c,1.124,1.125 event.h,1.52,1.53 main.c,1.131,1.132 videowin.c,1.129,1.130
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-10-28 22:51:39
|
Update of /cvsroot/xine/xine-ui/src/xitk
In directory usw-pr-cvs1:/tmp/cvs-serv22287/src/xitk
Modified Files:
errors.c event.c event.h main.c videowin.c
Log Message:
Add mrl management (xine_logo is now installed by xine-ui). BTW, xine-engine seems
unable to playback elementary.
Index: errors.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/errors.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- errors.c 18 Oct 2002 16:33:17 -0000 1.9
+++ errors.c 28 Oct 2002 22:51:36 -0000 1.10
@@ -194,17 +194,21 @@
case XINE_ERROR_NO_INPUT_PLUGIN:
xine_error_with_more(_("- xine engine error -\n\n"
- "There is no input plugin available to handle '%s'.\nMaybe MRL syntax is wrong or file/stream source doesn't exist."),
+ "There is no input plugin available to handle '%s'.\n"
+ "Maybe MRL syntax is wrong or file/stream source doesn't exist."),
gGui->filename);
break;
case XINE_ERROR_NO_DEMUX_PLUGIN:
xine_error_with_more(_("- xine engine error -\n\nThere is no demuxer plugin available "
- "to handle '%s'.\nUsually this means that the file format was not recognized."), gGui->filename);
+ "to handle '%s'.\n"
+ "Usually this means that the file format was not recognized."),
+ gGui->filename);
break;
case XINE_ERROR_DEMUX_FAILED:
- xine_error_with_more(_("- xine engine error -\n\ndemuxer failed. Maybe '%s' is a broken file?\n"),
+ xine_error_with_more(_("- xine engine error -\n\ndemuxer failed. "
+ "Maybe '%s' is a broken file?\n"),
gGui->filename);
break;
Index: event.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/event.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- event.c 28 Oct 2002 22:07:41 -0000 1.124
+++ event.c 28 Oct 2002 22:51:36 -0000 1.125
@@ -967,6 +967,12 @@
panel_update_mrl_display ();
panel_update_runtime_display();
+ printf("gGui->playlist_num %d\n", gGui->playlist_num);
+ printf("gGui->playlist[%s]\n", gGui->playlist[gGui->playlist_cur]);
+
+ if(!(xine_open(gGui->stream, gGui->logo_mrl) && xine_play(gGui->stream, 0, 0)))
+ printf("That shouldn't happen.\n");
+
/* autoscan playlist */
if(gGui->autoscan_plugin != NULL) {
const char *const *autoscan_plugins = xine_get_autoplay_input_plugin_ids(gGui->xine);
Index: event.h
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/event.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- event.h 18 Oct 2002 16:33:17 -0000 1.52
+++ event.h 28 Oct 2002 22:51:36 -0000 1.53
@@ -60,6 +60,8 @@
/* xine lib/gui configuration filename */
char *configfile;
+ const char *logo_mrl;
+
/* stuff like FULL_ON_START, QUIT_ON_STOP */
action_id_t actions_on_start[16];
char *autoscan_plugin;
Index: main.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/main.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- main.c 24 Oct 2002 13:55:22 -0000 1.131
+++ main.c 28 Oct 2002 22:51:36 -0000 1.132
@@ -236,6 +236,9 @@
return _argv;
}
+static void main_change_logo_cb(void *data, xine_cfg_entry_t *cfg) {
+ gGui->logo_mrl = cfg->str_value;
+}
/*
*
*/
@@ -558,7 +561,7 @@
xine_cfg_entry_t cfg_entry;
int cfg_err_result;
- cfg_err_result = xine_config_lookup_entry(gGui->xine, "misc.logo_mrl", &cfg_entry);
+ cfg_err_result = xine_config_lookup_entry(gGui->xine, "gui.logo_mrl", &cfg_entry);
if(strcmp(cfg_entry.str_value, uevent->data)) {
if(gGui->auto_vo_visibility) {
@@ -986,14 +989,13 @@
* Setup logo.
*/
gGui->stream = xine_stream_new(gGui->xine, gGui->ao_driver, gGui->vo_driver);
-#warning USE REAL LOGO
-#if 0
- if(!xine_open(gGui->stream, XINE_LOGO_MRL)) {
- printf("Can't open the logo\n");
- exit(1);
- }
-#endif
+ gGui->logo_mrl = xine_config_register_string (gGui->xine, "gui.gui.logo_mrl", XINE_LOGO_MRL,
+ _("Logo mrl"),
+ CONFIG_NO_HELP,
+ CONFIG_LEVEL_EXP,
+ main_change_logo_cb,
+ CONFIG_NO_DATA);
#warning FIXME NEWAPI
#if 0
xine_tvmode_init2(gGui->xine);
Index: videowin.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/videowin.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- videowin.c 28 Oct 2002 22:07:51 -0000 1.129
+++ videowin.c 28 Oct 2002 22:51:36 -0000 1.130
@@ -1363,12 +1363,13 @@
* Change displayed logo, if selected skin want to customize it.
*/
void video_window_change_skins(void) {
- xine_cfg_entry_t cfg_entry;
+ xine_cfg_entry_t cfg_entry;
char *skin_logo;
static int sk_changed = 0;
- int cfg_err_result;
+ int cfg_err_result;
+
memset(&cfg_entry, 0, sizeof(xine_cfg_entry_t));
- cfg_err_result = xine_config_lookup_entry(gGui->xine, "misc.logo_mrl", &cfg_entry);
+ cfg_err_result = xine_config_lookup_entry(gGui->xine, "gui.logo_mrl", &cfg_entry);
skin_logo = xitk_skin_get_logo(gGui->skin_config);
if(skin_logo) {
@@ -1379,7 +1380,7 @@
return;
}
- config_update_string("misc.logo_mrl", skin_logo);
+ config_update_string("gui.logo_mrl", skin_logo);
}
else { /* Skin don't use logo feature, set to xine's default */
@@ -1388,7 +1389,7 @@
* change, not at the first skin loading.
**/
if((cfg_err_result) && sk_changed)
- config_update_string("misc.logo_mrl", XINE_LOGO_MRL);
+ config_update_string("gui.logo_mrl", XINE_LOGO_MRL);
}
sk_changed++;
|