Enlightenment CVS committal
Author : tsauerbeck
Project : misc
Module : eplayer
Dir : misc/eplayer/src
Modified Files:
callbacks.c callbacks.h eplayer.h interface.c
Log Message:
Fixed playlist scrolling, added repeat mode stuff
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/callbacks.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- callbacks.c 10 Nov 2003 20:55:17 -0000 1.12
+++ callbacks.c 15 Nov 2003 15:45:39 -0000 1.13
@@ -58,21 +58,26 @@
*/
void cb_track_next(ePlayer *player, Evas *e, Evas_Object *o,
void *event) {
+ int play = 0;
+
debug(DEBUG_LEVEL_INFO, "Next File Called\n");
eplayer_playback_stop(player);
if (player->playlist->cur_item->next) {
player->playlist->cur_item = player->playlist->cur_item->next;
- eplayer_playback_start(player, 1);
- paused = 0;
+ play = 1;
} else {
- /* there's no next item, so move to the beginning again
- * but don't start playing yet.
- */
+ /* there's no next item, so move to the beginning again */
player->playlist->cur_item = player->playlist->items;
- track_open(player); /* refresh track info parts */
+ play = player->cfg.repeat;
}
+
+ if (play) {
+ eplayer_playback_start(player, 1);
+ paused = 0;
+ } else /* refresh track info parts, but don't start playing yet */
+ track_open(player);
}
/**
@@ -131,6 +136,11 @@
const char *emission, const char *src) {
player->cfg.time_display = !player->cfg.time_display;
track_update_time(player);
+}
+
+void cb_repeat_mode_toggle(ePlayer *player, Evas_Object *obj,
+ const char *emission, const char *src) {
+ player->cfg.repeat = !player->cfg.repeat;
}
/**
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/callbacks.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- callbacks.h 23 Oct 2003 17:01:49 -0000 1.4
+++ callbacks.h 15 Nov 2003 15:45:39 -0000 1.5
@@ -16,6 +16,9 @@
void cb_time_display_toggle(void *udata, Evas_Object *obj,
const char *emission, const char *src);
+void cb_repeat_mode_toggle(void *udata, Evas_Object *obj,
+ const char *emission, const char *src);
+
void cb_volume_raise(void *udata, Evas_Object *obj,
const char *emission, const char *src);
void cb_volume_lower(void *udata, Evas_Object *obj,
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/eplayer.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- eplayer.h 14 Nov 2003 16:40:19 -0000 1.11
+++ eplayer.h 15 Nov 2003 15:45:39 -0000 1.12
@@ -15,6 +15,7 @@
char evas_engine[255];
char output_plugin[255];
TimeDisplay time_display;
+ int repeat;
} Config;
typedef struct {
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/interface.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- interface.c 14 Nov 2003 16:40:19 -0000 1.12
+++ interface.c 15 Nov 2003 15:45:39 -0000 1.13
@@ -115,9 +115,13 @@
cb_volume_lower, player);
edje_object_signal_callback_add(player->gui.edje,
- "SWITCH_TIME_DISPLAY", "time_text",
+ "TOGGLE_TIME_DISPLAY_MODE", "time_text",
cb_time_display_toggle, player);
+ edje_object_signal_callback_add(player->gui.edje,
+ "TOGGLE_REPEAT_MODE", "repeat_mode",
+ cb_repeat_mode_toggle, player);
+
return 1;
}
@@ -165,6 +169,13 @@
e_container_element_append(player->gui.playlist,
player->gui.playlist_col[i]);
}
+
+ edje_object_signal_callback_add(player->gui.edje,
+ "PLAYLIST_SCROLL_DOWN", "playlist",
+ cb_playlist_scroll_down, player);
+ edje_object_signal_callback_add(player->gui.edje,
+ "PLAYLIST_SCROLL_UP", "playlist",
+ cb_playlist_scroll_up, player);
}
void show_playlist_item(PlayListItem *pli, void *data) {
@@ -212,13 +223,6 @@
*/
player->gui.playlist_font_size[i] = h;
}
-
- edje_object_signal_callback_add(player->gui.edje,
- "PLAYLIST_SCROLL_DOWN", "playlist",
- cb_playlist_scroll_down, player);
- edje_object_signal_callback_add(player->gui.edje,
- "PLAYLIST_SCROLL_UP", "playlist",
- cb_playlist_scroll_up, player);
}
int refresh_volume(void *udata) {
-------------------------------------------------------
This SF. Net email is sponsored by: GoToMyPC
GoToMyPC is the fast, easy and secure way to access your computer from
any Web browser or wireless device. Click here to Try it Free!
https://www.gotomypc.com/tr/OSDN/AW/Q4_2003/t/g22lp?Target=mm/g22lp.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
