E CVS: eplayer technikolor

[<enl...@li...>]

Enlightenment CVS committal

Author  : technikolor
Project : misc
Module  : eplayer

Dir     : misc/eplayer/src


Modified Files:
	callbacks.c interface.c playlist_item.c 


Log Message:
Esmart update.

===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/callbacks.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- callbacks.c	16 Feb 2004 15:31:47 -0000	1.52
+++ callbacks.c	4 Jun 2004 08:23:09 -0000	1.53
@@ -1,10 +1,10 @@
 /*
- * $Id: callbacks.c,v 1.52 2004/02/16 15:31:47 tsauerbeck Exp $
+ * $Id: callbacks.c,v 1.53 2004/06/04 08:23:09 technikolor Exp $
  */
 
 #include <config.h>
 #include <Edje.h>
-#include <Esmart/container.h>
+#include <Esmart/Esmart_Container.h>
 #include <Ecore_X.h>
 #include <assert.h>
 #include <ewl/Ewl.h>
@@ -220,7 +220,7 @@
 	                                      "PlaylistFontSize");
 
 	/* it's * 3 because we're scrolling 3 elements at once */
-	e_container_scroll(player->gui.playlist, size * 3);
+	esmart_container_scroll(player->gui.playlist, size * 3);
 }
 
 EDJE_CB(playlist_scroll_down) {
@@ -228,7 +228,7 @@
 	                                      "PlaylistFontSize");
 
 	/* it's * 3 because we're scrolling 3 elements at once */
-	e_container_scroll(player->gui.playlist, size * -3);
+	esmart_container_scroll(player->gui.playlist, size * -3);
 }
 
 EDJE_CB(playlist_item_play) {
@@ -277,7 +277,7 @@
 }
 
 EDJE_CB(playlist_item_selected) {
-	Evas_List *items = e_container_elements_get(player->gui.playlist);
+	Evas_List *items = esmart_container_elements_get(player->gui.playlist);
 	Evas_List *l;
 
 	for (l = items; l; l = l->next)
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/interface.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- interface.c	15 Feb 2004 20:37:21 -0000	1.55
+++ interface.c	4 Jun 2004 08:23:09 -0000	1.56
@@ -1,12 +1,12 @@
 /*
- * $Id: interface.c,v 1.55 2004/02/15 20:37:21 tsauerbeck Exp $
+ * $Id: interface.c,v 1.56 2004/06/04 08:23:09 technikolor Exp $
  */
 
 #include <config.h>
 #include <assert.h>
 #include "eplayer.h"
-#include <Esmart/container.h>
-#include <Esmart/dragable.h>
+#include <Esmart/Esmart_Container.h>
+#include <Esmart/Esmart_Draggies.h>
 #include <Edje.h>
 #include <Ewl.h>
 #include "callbacks.h"
@@ -319,15 +319,15 @@
 	if (!edje_object_part_exists(player->gui.edje, "playlist"))
 		return;
 
-	player->gui.playlist = e_container_new(player->gui.evas);
+	player->gui.playlist = esmart_container_new(player->gui.evas);
 	assert(player->gui.playlist);
 
 	evas_object_name_set(player->gui.playlist, "PlayList");
 	evas_object_data_set(player->gui.playlist, "ePlayer", player);
 
-	e_container_direction_set(player->gui.playlist, 1);
-	e_container_spacing_set(player->gui.playlist, 0);
-	e_container_fill_policy_set(player->gui.playlist,
+	esmart_container_direction_set(player->gui.playlist, 1);
+	esmart_container_spacing_set(player->gui.playlist, 0);
+	esmart_container_fill_policy_set(player->gui.playlist,
 	                            CONTAINER_FILL_POLICY_FILL_X);
 	
 	edje_object_part_swallow(player->gui.edje, "playlist",
===================================================================
RCS file: /cvsroot/enlightenment/misc/eplayer/src/playlist_item.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- playlist_item.c	15 Feb 2004 18:12:40 -0000	1.8
+++ playlist_item.c	4 Jun 2004 08:23:09 -0000	1.9
@@ -1,10 +1,10 @@
 /*
- * $Id: playlist_item.c,v 1.8 2004/02/15 18:12:40 tsauerbeck Exp $
+ * $Id: playlist_item.c,v 1.9 2004/06/04 08:23:09 technikolor Exp $
  */
 
 #include <config.h>
 #include <Edje.h>
-#include <Esmart/container.h>
+#include <Esmart/Esmart_Container.h>
 #include <stdio.h>
 #include <assert.h>
 #include "callbacks.h"
@@ -41,7 +41,7 @@
 	pthread_mutex_destroy(&pli->pos_mutex);
 
 	if (pli->container)
-		e_container_element_remove(pli->container, pli->edje);
+		esmart_container_element_remove(pli->container, pli->edje);
 	
 	if (pli->edje)
 		evas_object_del(pli->edje);
@@ -129,7 +129,7 @@
 	edje_object_signal_callback_add(pli->edje, "PLAYLIST_ITEM_REMOVE", "",
 	                                (EdjeCb) cb_playlist_item_remove, udata);
 
-	e_container_element_append(pli->container, pli->edje);
+	esmart_container_element_append(pli->container, pli->edje);
 
 	return true;
 }