From: Enlightenment S. <no-...@en...> - 2010-10-10 23:07:08
|
Log: lets not segv shall we when some fileds dont exist in songs? :) Author: raster Date: 2010-10-10 16:07:01 -0700 (Sun, 10 Oct 2010) New Revision: 53244 Modified: trunk/enjoy/src/bin/win.c Modified: trunk/enjoy/src/bin/win.c =================================================================== --- trunk/enjoy/src/bin/win.c 2010-10-10 21:30:05 UTC (rev 53243) +++ trunk/enjoy/src/bin/win.c 2010-10-10 23:07:01 UTC (rev 53244) @@ -185,17 +185,21 @@ { Evas_Object *cover; int label_size; - char *artist_title; + char *artist_title, *s1, *s2; cover = cover_album_fetch_by_id(w->win, w->db,w->song->album_id, 256); // TODO: size! elm_layout_content_set(w->nowplaying, "ejy.swallow.cover", cover); db_song_artist_fetch(w->db, w->song); - label_size = strlen(w->song->title) + strlen(w->song->artist) + 4; + s1 = w->song->title; + s2 = w->song->artist; + if (!s1) s1 = ""; + if (!s2) s2 = ""; + label_size = strlen(s1) + strlen(s2) + 4; artist_title = malloc(label_size); if (!artist_title) return; - if (snprintf(artist_title, label_size, "%s - %s", w->song->artist, w->song->title) >= label_size) + if (snprintf(artist_title, label_size, "%s - %s", s1, s2) >= label_size) { CRITICAL("could not set nowplaying title"); goto nowplaying_error; |
From: Enlightenment S. <no-...@en...> - 2010-10-10 23:46:25
|
Log: bugsors. Author: raster Date: 2010-10-10 16:46:17 -0700 (Sun, 10 Oct 2010) New Revision: 53247 Modified: trunk/enjoy/src/bin/main.c Modified: trunk/enjoy/src/bin/main.c =================================================================== --- trunk/enjoy/src/bin/main.c 2010-10-10 23:39:32 UTC (rev 53246) +++ trunk/enjoy/src/bin/main.c 2010-10-10 23:46:17 UTC (rev 53247) @@ -106,7 +106,10 @@ elm_run(); - evas_object_del(app.win); +// don't del win - autodel is set. choose. either use autodel and then set win +// handle to NULL in callback sou dont del it here, or set up del req callback +// that exits mainloop and comes to here. for now - disable this. +// evas_object_del(app.win); end: EINA_LIST_FREE(app.add_dirs, s) free(s); |
From: Enlightenment S. <no-...@en...> - 2010-10-18 23:15:37
|
Log: adapt to song length change... any time! :) oh and use right callbacks too. Author: raster Date: 2010-10-18 16:15:30 -0700 (Mon, 18 Oct 2010) New Revision: 53585 Modified: trunk/enjoy/src/bin/win.c Modified: trunk/enjoy/src/bin/win.c =================================================================== --- trunk/enjoy/src/bin/win.c 2010-10-18 23:02:02 UTC (rev 53584) +++ trunk/enjoy/src/bin/win.c 2010-10-18 23:15:30 UTC (rev 53585) @@ -150,14 +150,11 @@ { Edje_Message_Float_Set *mf; - if ((w->play.length < 0.1) || (w->play.position < 0.5)) + w->play.length = emotion_object_play_length_get(w->emotion); + if ((w->song) && (w->song->length != (int)w->play.length)) { - w->play.length = emotion_object_play_length_get(w->emotion); - if ((w->song) && (w->song->length != (int)w->play.length)) - { - db_song_length_set(w->db, w->song, w->play.length); - list_song_updated(w->list); - } + db_song_length_set(w->db, w->song, w->play.length); + list_song_updated(w->list); } w->play.position = emotion_object_position_get(w->emotion); @@ -264,6 +261,13 @@ } static void +_win_play_begin(void *data, Evas_Object *o __UNUSED__, void *event_info __UNUSED__) +{ + Win *w = data; + _win_play_eval(w); +} + +static void _win_play_end(void *data, Evas_Object *o __UNUSED__, void *event_info __UNUSED__) { Win *w = data; @@ -477,7 +481,9 @@ evas_object_smart_callback_add (w->emotion, "frame_decode", _win_play_pos_update, w); evas_object_smart_callback_add - (w->emotion, "decode_stop", _win_play_end, w); + (w->emotion, "playback_started", _win_play_begin, w); + evas_object_smart_callback_add + (w->emotion, "playback_finished", _win_play_end, w); w->layout = elm_layout_add(w->win); if (!w->layout) goto error; |
From: Enlightenment S. <no-...@en...> - 2010-10-18 23:19:19
|
Log: group get length + pos Author: raster Date: 2010-10-18 16:19:13 -0700 (Mon, 18 Oct 2010) New Revision: 53587 Modified: trunk/enjoy/src/bin/win.c Modified: trunk/enjoy/src/bin/win.c =================================================================== --- trunk/enjoy/src/bin/win.c 2010-10-18 23:17:47 UTC (rev 53586) +++ trunk/enjoy/src/bin/win.c 2010-10-18 23:19:13 UTC (rev 53587) @@ -150,15 +150,15 @@ { Edje_Message_Float_Set *mf; + w->play.position = emotion_object_position_get(w->emotion); w->play.length = emotion_object_play_length_get(w->emotion); + if ((w->song) && (w->song->length != (int)w->play.length)) { db_song_length_set(w->db, w->song, w->play.length); list_song_updated(w->list); } - w->play.position = emotion_object_position_get(w->emotion); - mf = alloca(sizeof(Edje_Message_Float_Set) + sizeof(double)); mf->count = 2; mf->val[0] = w->play.position; |
From: Enlightenment S. <no-...@en...> - 2010-11-09 06:28:24
|
Log: why update item? jsut causes overhead in elm thinking it changed and trying to re-eval stuff. Author: raster Date: 2010-11-08 22:28:18 -0800 (Mon, 08 Nov 2010) New Revision: 54357 Modified: trunk/enjoy/src/bin/win.c Modified: trunk/enjoy/src/bin/win.c =================================================================== --- trunk/enjoy/src/bin/win.c 2010-11-09 06:07:07 UTC (rev 54356) +++ trunk/enjoy/src/bin/win.c 2010-11-09 06:28:18 UTC (rev 54357) @@ -170,7 +170,8 @@ if ((w->song) && (w->song->length != (int)w->play.length)) { db_song_length_set(w->db, w->song, w->play.length); - list_song_updated(w->list); +// why do this? item doesnt have any new fields in the item. +// list_song_updated(w->list); } mf = alloca(sizeof(Edje_Message_Float_Set) + sizeof(double)); |
From: Enlightenment S. <no-...@en...> - 2011-10-21 03:09:38
|
Log: hmm lets return a value from a func... that is required to init enjoy.. :) Author: raster Date: 2011-10-20 20:09:32 -0700 (Thu, 20 Oct 2011) New Revision: 64226 Trac: http://trac.enlightenment.org/e/changeset/64226 Modified: trunk/enjoy/src/bin/dbus.c Modified: trunk/enjoy/src/bin/dbus.c =================================================================== --- trunk/enjoy/src/bin/dbus.c 2011-10-21 02:53:13 UTC (rev 64225) +++ trunk/enjoy/src/bin/dbus.c 2011-10-21 03:09:32 UTC (rev 64226) @@ -123,6 +123,7 @@ e_dbus_request_name (conn, DBUS_NAME, DBUS_NAME_FLAG_DO_NOT_QUEUE, _cb_dbus_request_name, NULL); + return EINA_TRUE; } void |
From: Enlightenment S. <no-...@en...> - 2011-11-30 06:28:43
|
Log: fix enjoy build breaks.. and warnings. Author: raster Date: 2011-11-29 22:28:36 -0800 (Tue, 29 Nov 2011) New Revision: 65710 Trac: http://trac.enlightenment.org/e/changeset/65710 Modified: trunk/enjoy/src/bin/cover.c trunk/enjoy/src/bin/dbus.c trunk/enjoy/src/bin/main.c trunk/enjoy/src/bin/page.c trunk/enjoy/src/bin/win.c Modified: trunk/enjoy/src/bin/cover.c =================================================================== --- trunk/enjoy/src/bin/cover.c 2011-11-30 05:15:18 UTC (rev 65709) +++ trunk/enjoy/src/bin/cover.c 2011-11-30 06:28:36 UTC (rev 65710) @@ -122,13 +122,15 @@ } return cover; } - +/* + * not used static Evas_Object * _cover_without_image_add(Evas_Object *parent, unsigned short size) { Evas_Object *cover = _cover_empty_add(parent, size); return _cover_without_image_set(cover); } +*/ /* TODO: do this from configure dialog as well * @@ -263,7 +265,7 @@ Evas_Object * cover_album_fetch(Evas_Object *parent, DB *db, Album *album, unsigned short size, - void (*cb_success)(void *data), void *data) + void (*cb_success)(void *data) __UNUSED__, void *data __UNUSED__) { Evas_Object *cover; unsigned int min_error = (unsigned int)-1; Modified: trunk/enjoy/src/bin/dbus.c =================================================================== --- trunk/enjoy/src/bin/dbus.c 2011-11-30 05:15:18 UTC (rev 65709) +++ trunk/enjoy/src/bin/dbus.c 2011-11-30 06:28:36 UTC (rev 65710) @@ -71,7 +71,6 @@ { DBusError new_err; dbus_uint32_t msgtype; - E_DBus_Interface *iface; if (dbus_error_is_set(err)) { Modified: trunk/enjoy/src/bin/main.c =================================================================== --- trunk/enjoy/src/bin/main.c 2011-11-30 05:15:18 UTC (rev 65709) +++ trunk/enjoy/src/bin/main.c 2011-11-30 06:28:36 UTC (rev 65710) @@ -390,6 +390,8 @@ return ECORE_CALLBACK_PASS_ON; } +/* not used + * static DBusMessage * _cb_dbus_quit(E_DBus_Object *obj __UNUSED__, DBusMessage *msg) { @@ -418,6 +420,7 @@ dbus_message_iter_close_container(&iter, &siter); return reply; } +*/ EAPI int elm_main(int argc, char **argv) Modified: trunk/enjoy/src/bin/page.c =================================================================== --- trunk/enjoy/src/bin/page.c 2011-11-30 05:15:18 UTC (rev 65709) +++ trunk/enjoy/src/bin/page.c 2011-11-30 06:28:36 UTC (rev 65710) @@ -333,18 +333,18 @@ s = edje_object_data_get(page->edje_list, "homogeneous"); elm_genlist_homogeneous_set(page->list, s ? !!atoi(s) : EINA_FALSE); - elm_layout_content_set(obj_list, "ejy.swallow.list", page->list); + elm_object_part_content_set(obj_list, "ejy.swallow.list", page->list); if (edje_object_part_exists(page->edje_list, "ejy.swallow.index")) { page->index = elm_index_add(obj_list); evas_object_smart_callback_add (page->index, "delay,changed", _page_index_changed, page); - elm_layout_content_set(obj_list, "ejy.swallow.index", page->index); + elm_object_part_content_set(obj_list, "ejy.swallow.index", page->index); } page->edje = elm_layout_edje_get(page->layout); - elm_layout_content_set(page->layout, "elm.swallow.content", page->layout_list); + elm_object_part_content_set(page->layout, "elm.swallow.content", page->layout_list); edje_object_part_text_set(page->edje, "elm.text.title", page->title); edje_object_signal_callback_add(page->edje, "elm,action,back", "", @@ -578,7 +578,7 @@ } static void -_page_songs_after_populate(Page *page) +_page_songs_after_populate(Page *page __UNUSED__) { ecore_event_add(ENJOY_EVENT_TRACKLIST_TRACKLIST_CHANGE, NULL, NULL, NULL); } @@ -625,7 +625,7 @@ DBG("cover view changed size to %dx%d, query cover size %d", w, h, size); cover = cover_album_fetch(page->layout, page->container, page->model, size, NULL, NULL); - elm_layout_content_set(page->layout_list, "ejy.swallow.cover", cover); + elm_object_part_content_set(page->layout_list, "ejy.swallow.cover", cover); } static Eina_Bool @@ -645,7 +645,7 @@ if (size < 32) size = 32; cover = cover_album_fetch(page->layout, db, album, size, NULL, NULL); - elm_layout_content_set(page->layout_list, "ejy.swallow.cover", cover); + elm_object_part_content_set(page->layout_list, "ejy.swallow.cover", cover); part = (Evas_Object *) edje_object_part_object_get(page->edje_list, "ejy.swallow.cover"); Modified: trunk/enjoy/src/bin/win.c =================================================================== --- trunk/enjoy/src/bin/win.c 2011-11-30 05:15:18 UTC (rev 65709) +++ trunk/enjoy/src/bin/win.c 2011-11-30 06:28:36 UTC (rev 65710) @@ -17,11 +17,11 @@ Libmgr *mgr; Song *song; struct { - Elm_Toolbar_Item *play; + Elm_Object_Item *play; Elm_Toolbar_Item_State *pause; - Elm_Toolbar_Item *next; - Elm_Toolbar_Item *prev; - Elm_Toolbar_Item *nowplaying; + Elm_Object_Item *next; + Elm_Object_Item *prev; + Elm_Object_Item *nowplaying; Elm_Toolbar_Item_State *playlist; } action; struct { @@ -198,7 +198,7 @@ { cover = cover_album_fetch_by_id(w->win, w->db, w->song->album_id, 480, NULL, NULL); // TODO: size! - elm_layout_content_set(w->nowplaying, "ejy.swallow.cover", cover); + elm_object_part_content_set(w->nowplaying, "ejy.swallow.cover", cover); } db_song_artist_fetch(w->db, w->song); @@ -764,10 +764,10 @@ return list_song_nth_get(w->list, position); } -static Elm_Toolbar_Item * +static Elm_Object_Item * _toolbar_item_add(Win *w, const char *icon, const char *label, int priority, Evas_Smart_Cb cb) { - Elm_Toolbar_Item *item = elm_toolbar_item_append(w->toolbar, icon, label, + Elm_Object_Item *item = elm_toolbar_item_append(w->toolbar, icon, label, cb, w); elm_toolbar_item_priority_set(item, priority); return item; @@ -876,7 +876,7 @@ CRITICAL("cannot create list"); goto error; } - elm_layout_content_set(w->layout, "elm.swallow.content", w->list); + elm_object_part_content_set(w->layout, "elm.swallow.content", w->list); evas_object_smart_callback_add(w->list, "selected", _win_list_selected, w); w->nowplaying = nowplaying_add(w->layout); @@ -890,7 +890,7 @@ (nowplaying_edje, "ejy,shuffle,on", "ejy", _win_shuffle_on, w); edje_object_signal_callback_add (nowplaying_edje, "ejy,shuffle,off", "ejy", _win_shuffle_off, w); - elm_layout_content_set(w->layout, "ejy.swallow.nowplaying", w->nowplaying); + elm_object_part_content_set(w->layout, "ejy.swallow.nowplaying", w->nowplaying); edje_object_size_min_get(w->edje, &(w->min.w), &(w->min.h)); edje_object_size_min_restricted_calc (w->edje, &(w->min.w), &(w->min.h), w->min.w, w->min.h); |
From: Enlightenment S. <no-...@en...> - 2012-02-21 02:31:33
|
Log: dont segv after genlist item class changes. Author: raster Date: 2012-02-20 18:31:26 -0800 (Mon, 20 Feb 2012) New Revision: 68182 Trac: http://trac.enlightenment.org/e/changeset/68182 Modified: trunk/enjoy/src/bin/page.c trunk/enjoy/src/bin/preferences.c Modified: trunk/enjoy/src/bin/page.c =================================================================== --- trunk/enjoy/src/bin/page.c 2012-02-21 01:53:40 UTC (rev 68181) +++ trunk/enjoy/src/bin/page.c 2012-02-21 02:31:26 UTC (rev 68182) @@ -587,6 +587,7 @@ _page_songs_add(Evas_Object *parent, NameID *nameid, Eina_Iterator *it, const char *title) { static const Elm_Genlist_Item_Class song_item_cls = { + ELM_GENLIST_ITEM_CLASS_HEADER, "media", { _song_item_text_get, @@ -672,6 +673,7 @@ DB *db = _page_db_get(parent); Eina_Iterator *it; static const Elm_Genlist_Item_Class song_item_cls = { + ELM_GENLIST_ITEM_CLASS_HEADER, "media-album", { _song_item_text_get, @@ -966,6 +968,7 @@ _page_albums_artist_add(Evas_Object *parent, NameID *nameid, Eina_Iterator *it, const char *title) { static const Elm_Genlist_Item_Class album_item_cls = { + ELM_GENLIST_ITEM_CLASS_HEADER, "media-preview", { _album_item_text_get, @@ -1011,6 +1014,7 @@ _page_albums_add(Evas_Object *parent, NameID *nameid, Eina_Iterator *it, const char *title) { static const Elm_Genlist_Item_Class album_item_cls = { + ELM_GENLIST_ITEM_CLASS_HEADER, "media-preview", { _album_item_text_get, @@ -1069,6 +1073,7 @@ static const Elm_Genlist_Item_Class _item_all_songs_cls = { + ELM_GENLIST_ITEM_CLASS_HEADER, "media-preview", { _item_all_songs_text_get, @@ -1137,6 +1142,7 @@ _page_artists_add(Evas_Object *parent, NameID *nameid, Eina_Iterator *it, const char *title) { static const Elm_Genlist_Item_Class nameid_item_cls = { + ELM_GENLIST_ITEM_CLASS_HEADER, "default", { _nameid_item_text_get, @@ -1207,6 +1213,7 @@ _page_genres_add(Evas_Object *parent, Eina_Iterator *it, const char *title) { static const Elm_Genlist_Item_Class nameid_item_cls = { + ELM_GENLIST_ITEM_CLASS_HEADER, "default", { _nameid_item_text_get, @@ -1301,6 +1308,7 @@ page_root_add(Evas_Object *parent) { static const Elm_Genlist_Item_Class root_item_cls = { + ELM_GENLIST_ITEM_CLASS_HEADER, "default", { _static_item_text_get, NULL, NULL, NULL } }; static const Page_Class root_cls = { Modified: trunk/enjoy/src/bin/preferences.c =================================================================== --- trunk/enjoy/src/bin/preferences.c 2012-02-21 01:53:40 UTC (rev 68181) +++ trunk/enjoy/src/bin/preferences.c 2012-02-21 02:31:26 UTC (rev 68182) @@ -44,6 +44,7 @@ } static const Elm_Genlist_Item_Class preferences_itc_item = { + ELM_GENLIST_ITEM_CLASS_HEADER, "default", { preferences_itc_item_text_get, @@ -54,6 +55,7 @@ }; static const Elm_Genlist_Item_Class preferences_itc_category = { + ELM_GENLIST_ITEM_CLASS_HEADER, "group_index", { preferences_itc_category_text_get, |