Enlightenment CVS committal
Author : captainigloo
Project : misc
Module : enna
Dir : misc/enna/src/bin
Modified Files:
enna.c enna_emusic.c enna_fm_db.c enna_miniplayer.c
enna_miniplayer.h enna_module_music.c enna_scanner.c
enna_scanner.h enna_util.c
Log Message:
* Remove some dbg infos
* Fix few memory leaks
* Remove reflection on miniplayer
* Fix miniplayer size
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- enna.c 28 Jan 2008 18:57:32 -0000 1.3
+++ enna.c 29 Jan 2008 23:05:03 -0000 1.4
@@ -171,6 +171,8 @@
if (!enna)
return;
enna_module_selected_name_set (enna->modules, "MediaPlayer Module");
+ enna_miniplayer_select(enna->miniplayer);
+
}
static int
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_emusic.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- enna_emusic.c 28 Jan 2008 18:57:32 -0000 1.3
+++ enna_emusic.c 29 Jan 2008 23:05:03 -0000 1.4
@@ -468,8 +468,6 @@
edje_object_part_geometry_get(sd->edje, "enna.swallow.cover", NULL,
NULL, &w, &h);
cover = enna_scanner_cover_get(metadata->album, metadata->artist);
-
-
if (cover)
evas_object_image_file_set(sd->cover, cover, NULL);
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_fm_db.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- enna_fm_db.c 28 Jan 2008 18:57:32 -0000 1.2
+++ enna_fm_db.c 29 Jan 2008 23:05:03 -0000 1.3
@@ -286,14 +286,10 @@
{
enna_list_append_with_icon_name(sd->o_view, "icon_album", item_name,
- _select_album_cb, NULL, sd,
- item_name);
- dbg("%s %s\n",sd->album, item_name);
-
+ _select_album_cb, NULL, sd,
+ item_name);
if (sd->album && !strcmp(sd->album, item_name))
{
-
- dbg("found\n");
to_select = i;
ENNA_FREE(sd->album);
}
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_miniplayer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- enna_miniplayer.c 14 Jan 2008 22:16:05 -0000 1.1
+++ enna_miniplayer.c 29 Jan 2008 23:05:03 -0000 1.2
@@ -148,9 +148,9 @@
edje_object_part_swallow(sd->edje, "enna.swallow.cover", sd->cover);
edje_object_part_geometry_get(sd->edje, "enna.swallow.cover", NULL,
NULL, &w, &h);
- enna_reflection_file_set(sd->cover, cover);
+ enna_image_file_set(sd->cover, cover, NULL);
evas_object_resize(sd->cover, w, h);
- evas_object_show(sd->cover);
+ edje_object_part_swallow(sd->edje, "swallow.cover", sd->cover);
}
else
edje_object_signal_emit(sd->edje, "enna,cover,hide", "enna");
@@ -159,6 +159,19 @@
enna_miniplayer_play(sd->obj);
}
+EAPI void enna_miniplayer_select(Evas_Object *obj)
+{
+ API_ENTRY return;
+ edje_object_signal_emit(sd->edje, "miniplayer,select", "enna");
+}
+
+EAPI void enna_miniplayer_unselect(Evas_Object *obj)
+{
+ API_ENTRY return;
+ edje_object_signal_emit(sd->edje, "miniplayer,unselect", "enna");
+}
+
+
static void
_e_smart_init(void)
{
@@ -198,11 +211,9 @@
sd->h = 0;
sd->edje = edje_object_add(evas_object_evas_get(obj));
edje_object_file_set(sd->edje, enna_config_theme_get(),
"widget/miniplayer");
- sd->cover = enna_reflection_add(evas_object_evas_get(obj));
+ sd->cover = enna_image_add(evas_object_evas_get(obj));
edje_object_part_swallow(sd->edje, "swallow.cover", sd->cover);
- evas_object_show(sd->edje);
- evas_object_show(sd->cover);
enna_miniplayer_stop(sd->obj);
evas_object_smart_member_add(sd->edje, obj);
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_miniplayer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- enna_miniplayer.h 14 Jan 2008 22:16:05 -0000 1.1
+++ enna_miniplayer.h 29 Jan 2008 23:05:03 -0000 1.2
@@ -10,5 +10,7 @@
EAPI void enna_miniplayer_play(Evas_Object * obj);
EAPI void enna_miniplayer_pause(Evas_Object * obj);
EAPI void enna_miniplayer_stop(Evas_Object * obj);
+EAPI void enna_miniplayer_select(Evas_Object *obj);
+EAPI void enna_miniplayer_unselect(Evas_Object *obj);
#endif
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_module_music.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- enna_module_music.c 28 Jan 2008 18:57:32 -0000 1.2
+++ enna_module_music.c 29 Jan 2008 23:05:03 -0000 1.3
@@ -135,9 +135,6 @@
{
API_ENTRY return;
- dbg("event : %d\n", event);
-
-
if (sd->state == MUSIC_MODULE_STATE_MAINMENU)
{
enna_list_process_event(sd->menu, event);
@@ -147,16 +144,13 @@
if (event == enna_event_escape)
{
sd->state = MUSIC_MODULE_STATE_MAINMENU;
- dbg("MAINMENU\n");
_update_mainmenu(sd);
}
else
enna_list_process_event(sd->menu_music, event);
}
else if ( sd->state == MUSIC_MODULE_STATE_BROWSE_FOLDER)
- {
- dbg("event\n");
-
+ {
if ((event == enna_event_1))
{
sd->popup = enna_popup_add(sd->enna->evas);
@@ -168,10 +162,6 @@
else if (event == enna_event_escape)
edje_object_signal_emit(sd->edje, "enna,state,infos,hide", "enna");
- /*else if ((event == enna_event_up || event == enna_event_down))
- * {
- * edje_object_signal_emit (sd->edje, "enna,state,infos,hide", "enna");
- * } */
enna_fm_process_event(sd->fm, event);
}
else if ( sd->state == MUSIC_MODULE_STATE_BROWSE_DB)
@@ -187,15 +177,12 @@
evas_object_hide(sd->popup);
evas_object_del(sd->popup);
sd->state = sd->old_state;
-
}
else
{
enna_popup_process_event(sd->popup, event);
}
-
}
-
}
EAPI void
@@ -332,6 +319,7 @@
NULL, &w, &h);
enna_reflection_file_set(sd->cover, cover);
evas_object_resize(sd->cover, w, h);
+ ENNA_FREE(cover);
}
else
{
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_scanner.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- enna_scanner.c 28 Jan 2008 18:57:32 -0000 1.1
+++ enna_scanner.c 29 Jan 2008 23:05:03 -0000 1.2
@@ -54,10 +54,10 @@
{
unsigned int commit_interval;
unsigned int slave_timeout;
- char *db_path;
+ const char *db_path;
Ecore_List *parsers;
- char *charset;
- char *scan_path;
+ const char *charset;
+ const char *scan_path;
lms_t *lms;
sqlite3 *db;
int fd_ev_read;
@@ -444,9 +444,9 @@
scanner->slave_timeout = 1000; /* 1sec */
/* Set db filename */
sprintf(tmp, "%s/.enna/%s", enna_util_user_home_get(), "enna_music.db");
- scanner->db_path = strdup(tmp) ;
+ scanner->db_path = evas_stringshare_add(tmp) ;
/* Set charset to UTF-8 */
- scanner->charset = strdup("iso-8859-1");
+ scanner->charset = evas_stringshare_add("iso-8859-1");
/* Set base path */
scanner->scan_path = enna_config_get_conf_value_or_default("music_module",
"base_path", "/");
@@ -493,15 +493,15 @@
error:
lms_free(scanner->lms);
- ENNA_FREE(scanner->db_path);
- ENNA_FREE(scanner->charset);
+ evas_stringshare_del(scanner->db_path);
+ evas_stringshare_del(scanner->charset);
ENNA_FREE(scanner);
}
static void
_metadata_print(Enna_Metadata * metadata)
{
-#if 1
+#if 0
dbg("---------\n");
dbg("\n\tfile:\t%s\n\ttitle:\t%s\n\tartist:\t%s\n\talbum:\t%s\n\tgenre:\t%s\n"
"\ttrack\t%d\n\tplay count:\t%d\n",
@@ -522,8 +522,8 @@
lms_stop_processing(scanner->lms);
//pthread_join(scanner->scanner_thread, NULL);
lms_free(scanner->lms);
- ENNA_FREE(scanner->db_path);
- ENNA_FREE(scanner->charset);
+ evas_stringshare_del(scanner->db_path);
+ evas_stringshare_del(scanner->charset);
ENNA_FREE(scanner);
}
@@ -560,7 +560,7 @@
sprintf(cover_filename, "%s/.enna/covers/%s - %s.jpg",
enna_util_user_home_get(), artist, album);
if (ecore_file_exists(cover_filename))
- return strdup(cover_filename);
+ return strdup(cover_filename);
else
return NULL;
}
@@ -598,13 +598,11 @@
"path like ?");
if (!stmt)
return NULL;
- dbg("ok\n");
ret = _db_bind_blob(stmt, 1, filename, strlen(filename));
if (ret != 0)
goto done;
- dbg("ok\n");
r = sqlite3_step(stmt);
if (r == SQLITE_DONE) {
fprintf(stderr, "ERROR: could not get file info from table: %s\n",
@@ -612,7 +610,7 @@
ret = 1;
goto done;
}
- dbg("ok\n");
+
id = sqlite3_column_int(stmt, 0);
m->uri = (char*)sqlite3_column_blob(stmt, 1);
m->title = (char*)sqlite3_column_blob(stmt, 2);
@@ -625,7 +623,6 @@
m->play_count = sqlite3_column_int(stmt, 9);
_metadata_print(m);
- dbg("ID of filename : %d size : %d\n", id, m->size);
return m;
@@ -717,6 +714,7 @@
goto done;
albums = ecore_list_new();
+ ecore_list_free_cb_set(albums, free);
while ( sqlite3_step ( stmt ) == SQLITE_ROW )
{
char *album;
@@ -808,7 +806,7 @@
m->title = strdup((char*)sqlite3_column_text(stmt,0));
m->uri = strdup((char*)sqlite3_column_text(stmt,1));
- m->track_nb = (char*)sqlite3_column_int(stmt,2);
+ m->track_nb = sqlite3_column_int(stmt,2);
if (m)
ecore_list_append(tracks, m);
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_scanner.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- enna_scanner.h 28 Jan 2008 18:57:32 -0000 1.1
+++ enna_scanner.h 29 Jan 2008 23:05:03 -0000 1.2
@@ -23,6 +23,7 @@
EAPI void enna_scanner_shutdown();
EAPI int enna_scanner_nb_medias_get(int type);
+EAPI char *enna_scanner_cover_get(const char *album, const char *artist);
EAPI Enna_Metadata *enna_scanner_audio_metadata_get(const char *filename);
EAPI int enna_scanner_audio_nb_albums_get();
EAPI int enna_scanner_audio_nb_artists_get();
===================================================================
RCS file: /cvs/e/misc/enna/src/bin/enna_util.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- enna_util.c 22 Jan 2008 18:25:57 -0000 1.2
+++ enna_util.c 29 Jan 2008 23:05:03 -0000 1.3
@@ -38,7 +38,7 @@
EAPI char *
enna_util_user_home_get()
{
- static char *home = NULL;
+ static char *home = NULL;
if (home)
return home;
@@ -67,7 +67,7 @@
for (i = 0; i < strlen(str); i++)
tmp[i] = tolower(str[i]);
result |= ecore_str_has_suffix(tmp, (char *)l->data);
- free(tmp);
+ ENNA_FREE(tmp);
}
return result;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs