Enlightenment CVS committal
Author : tsauerbeck
Project : misc
Module : eplayer
Dir : misc/eplayer/src
Modified Files:
callbacks.c eplayer.c interface.c playlist_item.c
Log Message:
Themes don't have to provide a visible playlist
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/callbacks.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- callbacks.c 12 Feb 2004 15:33:41 -0000 1.50
+++ callbacks.c 14 Feb 2004 11:00:37 -0000 1.51
@@ -1,5 +1,5 @@
/*
- * $Id: callbacks.c,v 1.50 2004/02/12 15:33:41 tsauerbeck Exp $
+ * $Id: callbacks.c,v 1.51 2004/02/14 11:00:37 tsauerbeck Exp $
*/
#include <config.h>
@@ -309,7 +309,7 @@
PlayListItem *pli = playlist_current_item_get(player->playlist);
int cur_time = pli->plugin->get_current_pos();
- debug(DEBUG_LEVEL_INFO, "Seeking backward - Current Pos: %i\n",
+ debug(DEBUG_LEVEL_INFO, "Seeking backward\n",
cur_time);
eplayer_playback_stop(player);
@@ -324,26 +324,26 @@
}
EDJE_CB(seek_forward_start) {
- debug(DEBUG_LEVEL_INFO, "Start Seeking Forward");
+ debug(DEBUG_LEVEL_INFO, "Start seeking forward\n");
player->flags.seeking = true;
player->flags.seek_dir = 1;
ecore_timer_add(.02, _eplayer_seek_timer, player);
}
EDJE_CB(seek_forward_stop) {
- debug(DEBUG_LEVEL_INFO, "Stop Seeking Forward");
+ debug(DEBUG_LEVEL_INFO, "Stop seeking forward\n");
player->flags.seeking = false;
}
EDJE_CB(seek_backward_start) {
- debug(DEBUG_LEVEL_INFO, "Start Seeking Backward");
+ debug(DEBUG_LEVEL_INFO, "Start seeking backward\n");
player->flags.seeking = true;
player->flags.seek_dir = -1;
ecore_timer_add(.02, _eplayer_seek_timer, player);
}
EDJE_CB(seek_backward_stop) {
- debug(DEBUG_LEVEL_INFO, "Stop Seeking Backward");
+ debug(DEBUG_LEVEL_INFO, "Stop seeking backward\n");
player->flags.seeking = false;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/eplayer.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- eplayer.c 6 Feb 2004 15:05:45 -0000 1.38
+++ eplayer.c 14 Feb 2004 11:00:38 -0000 1.39
@@ -2,7 +2,7 @@
/* Edje Overhaul startnig phase 4 - Started 7/30/03 */
/*
- * $Id: eplayer.c,v 1.38 2004/02/06 15:05:45 tsauerbeck Exp $
+ * $Id: eplayer.c,v 1.39 2004/02/14 11:00:38 tsauerbeck Exp $
*/
#include <config.h>
@@ -342,8 +342,8 @@
ecore_timer_add(1.5, ui_refresh_volume, player);
debug(DEBUG_LEVEL_INFO, "Starting main loop\n");
-
ecore_main_loop_begin();
+ debug(DEBUG_LEVEL_INFO, "Shutting down\n");
eplayer_free(player);
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/interface.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- interface.c 6 Feb 2004 15:05:45 -0000 1.52
+++ interface.c 14 Feb 2004 11:00:38 -0000 1.53
@@ -1,5 +1,5 @@
/*
- * $Id: interface.c,v 1.52 2004/02/06 15:05:45 tsauerbeck Exp $
+ * $Id: interface.c,v 1.53 2004/02/14 11:00:38 tsauerbeck Exp $
*/
#include <config.h>
@@ -23,9 +23,7 @@
static void setup_playlist(ePlayer *player);
static void register_callbacks(ePlayer *player);
-static int app_signal_exit(void *data, int type, void *event) {
- debug(DEBUG_LEVEL_INFO, "Exit called, shutting down\n");
-
+static int app_signal_exit(void *data, int type, void *event) {
ecore_main_loop_quit();
return 1;
}
@@ -306,6 +304,9 @@
* @param player
*/
static void setup_playlist(ePlayer *player) {
+ if (!edje_object_part_exists(player->gui.edje, "playlist"))
+ return;
+
player->gui.playlist = e_container_new(player->gui.evas);
assert(player->gui.playlist);
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/playlist_item.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- playlist_item.c 6 Feb 2004 11:39:58 -0000 1.6
+++ playlist_item.c 14 Feb 2004 11:00:38 -0000 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: playlist_item.c,v 1.6 2004/02/06 11:39:58 technikolor Exp $
+ * $Id: playlist_item.c,v 1.7 2004/02/14 11:00:38 tsauerbeck Exp $
*/
#include <config.h>
@@ -39,7 +39,8 @@
pthread_mutex_destroy(&pli->pos_mutex);
- e_container_element_remove(pli->container, pli->edje);
+ if (pli->container)
+ e_container_element_remove(pli->container, pli->edje);
if (pli->edje)
evas_object_del(pli->edje);
@@ -78,6 +79,7 @@
void *udata;
assert(pli);
+ assert(pli->container);
/* add the item to the container */
if (!(pli->edje = edje_object_add(pli->evas)))
@@ -93,13 +95,11 @@
edje_object_part_text_set(pli->edje, "length", len);
/* If there is no title, use the file name */
- if( strcmp( pli->comment[COMMENT_ID_TITLE], "" )) {
- edje_object_part_text_set(pli->edje, "title",
- pli->comment[COMMENT_ID_TITLE]);
- } else {
- edje_object_part_text_set(pli->edje, "title",
- pli->file);
- }
+ if (strcmp(pli->comment[COMMENT_ID_TITLE], ""))
+ edje_object_part_text_set(pli->edje, "title",
+ pli->comment[COMMENT_ID_TITLE]);
+ else
+ edje_object_part_text_set(pli->edje, "title", pli->file);
/* set parts dimensions */
edje_object_size_min_get(pli->edje, &w, &h);
@@ -148,7 +148,6 @@
assert(file);
assert(evas);
assert(plugins);
- assert(container);
assert(theme);
if (!(pli = calloc(1, sizeof(PlayListItem))))
@@ -171,7 +170,7 @@
pli->container = container;
pli->theme = theme;
- if (!playlist_item_show(pli)) {
+ if (container && !playlist_item_show(pli)) {
playlist_item_free(pli);
return NULL;
}
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
