Enlightenment CVS committal
Author : tsauerbeck
Project : misc
Module : eplayer
Dir : misc/eplayer/src
Modified Files:
eplayer.c eplayer.h interface.c
Log Message:
The theme that's to be used can now be set in eplayer.db
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/eplayer.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- eplayer.c 17 Nov 2003 21:03:10 -0000 1.16
+++ eplayer.c 18 Nov 2003 18:35:59 -0000 1.17
@@ -41,6 +41,7 @@
"software");
snprintf(cfg->output_plugin, sizeof(cfg->output_plugin),
"OSS");
+ snprintf(cfg->theme, sizeof(cfg->theme), "eplayer");
}
static int config_load(Config *cfg, const char *file) {
@@ -64,6 +65,11 @@
if ((str = e_db_str_get(edb, "/eplayer/output_plugin"))) {
snprintf(cfg->output_plugin, sizeof(cfg->output_plugin), str);
+ free(str);
+ }
+
+ if ((str = e_db_str_get(edb, "/eplayer/theme"))) {
+ snprintf(cfg->theme, sizeof(cfg->theme), str);
free(str);
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/eplayer.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- eplayer.h 17 Nov 2003 21:03:10 -0000 1.14
+++ eplayer.h 18 Nov 2003 18:35:59 -0000 1.15
@@ -14,6 +14,7 @@
typedef struct {
char evas_engine[255];
char output_plugin[255];
+ char theme[255];
TimeDisplay time_display;
int repeat;
} Config;
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/interface.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- interface.c 18 Nov 2003 17:58:54 -0000 1.16
+++ interface.c 18 Nov 2003 18:35:59 -0000 1.17
@@ -57,15 +57,19 @@
}
static int setup_edje(ePlayer *player, Ecore_Evas *ee) {
+ char eet[PATH_MAX + 1];
double edje_w = 0, edje_h = 0;
debug(DEBUG_LEVEL_INFO, "EDJE: Defining Edje \n");
player->gui.edje = edje_object_add(player->gui.evas);
- if (!(edje_object_file_set(player->gui.edje,
- DATA_DIR "/themes/eplayer.eet", "eplayer"))) {
- debug(DEBUG_LEVEL_CRITICAL, "Cannot load theme!\n");
+ snprintf(eet, sizeof(eet), DATA_DIR "/themes/%s.eet",
+ player->cfg.theme);
+
+ if (!edje_object_file_set(player->gui.edje, eet, "eplayer")) {
+ debug(DEBUG_LEVEL_CRITICAL, "Cannot load theme '%s'!\n",
+ player->cfg.theme);
return 0;
}
@@ -134,14 +138,16 @@
void show_playlist_item(PlayListItem *pli, void *data) {
ePlayer *player = data;
Evas_Object *o;
- char len[32];
+ char len[32], eet[PATH_MAX + 1];
double w = 0, h = 0;
/* add the item to the container */
o = edje_object_add(player->gui.evas);
- edje_object_file_set(o, DATA_DIR "/themes/eplayer.eet",
- "playlist_item");
+ snprintf(eet, sizeof(eet), DATA_DIR "/themes/%s.eet",
+ player->cfg.theme);
+
+ edje_object_file_set(o, eet, "playlist_item");
/* set parts text */
snprintf(len, sizeof(len), "%i:%02i", pli->duration / 60,
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
