[EGIT] [admin/devs] master 01/01: promote derekf to regular developer
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/admin/devs.git/commit/?id=59df53f17e42a37c3fb8f1fc34dcbb9af0722823
commit 59df53f17e42a37c3fb8f1fc34dcbb9af0722823
Author: zmike <michael.blumenkra...@gmail.com>
Date: Mon Apr 25 16:41:16 2016 -0400
promote derekf to regular developer
---
{probies => developers}/derekf/efl.pub | 0
{probies => developers}/derekf/info.txt | 0
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/probies/derekf/efl.pub b/developers/derekf/efl.pub
similarity index 100%
rename from probies/derekf/efl.pub
rename to developers/derekf/efl.pub
diff --git a/probies/derekf/info.txt b/developers/derekf/info.txt
similarity index 100%
rename from probies/derekf/info.txt
rename to developers/derekf/info.txt
--
[EGIT] [apps/empc] master 01/01: remove broken list variable aliasing during apm update processing
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/apps/empc.git/commit/?id=bd77f49f3c8eebffef3ee086a5abcfb038fe6d3c
commit bd77f49f3c8eebffef3ee086a5abcfb038fe6d3c
Author: zmike <michael.blumenkra...@gmail.com>
Date: Fri Feb 26 20:52:32 2016 -0500
remove broken list variable aliasing during apm update processing
ref 2e101a73d501a1e11bc20d6e636872deef0d74b3
---
src/modules/auto_playlist_manager.c | 20 +---
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/modules/auto_playlist_manager.c
b/src/modules/auto_playlist_manager.c
index 4c10587..152bc10 100644
--- a/src/modules/auto_playlist_manager.c
+++ b/src/modules/auto_playlist_manager.c
@@ -202,7 +202,6 @@ static void
run_adds(void)
{
char *file;
- Eina_List *l;
last_queue_length = empd_queue_length;
while (adds)
@@ -213,8 +212,7 @@ run_adds(void)
Elm_Object_Item *item;
Eina_Bool done = EINA_FALSE;
-l = eina_list_data_get(adds);
-file = eina_list_data_get(l);
+file = eina_list_data_get(adds);
a = strrchr(file, '/');
if (a)
b = strchr(file, '/');
@@ -227,7 +225,7 @@ run_adds(void)
if (a == b)
{
empd_empdd_list_info_call(empd_proxy, info_cb, file, file);
- adds = eina_list_remove_list(adds, l);
+ adds = eina_list_remove_list(adds, adds);
return;
}
@@ -264,16 +262,16 @@ run_adds(void)
post_add(1, file);
empd_empdd_add_id_list_call(empd_proxy, file,
ss->song_pos + 1);
done = EINA_TRUE;
- while (eina_list_next(l))
+ while (eina_list_next(adds))
{
char *f2;
pos++;
-f2 = eina_list_data_get(eina_list_next(l));
+f2 = eina_list_data_get(eina_list_next(adds));
if (!is_same_path(file, a, f2, NULL)) break;
empd_empdd_add_id_list_call(empd_proxy, file,
ss->song_pos + pos);
post_add(1, f2);
-adds = eina_list_remove_list(adds,
eina_list_next(l));
+adds = eina_list_remove_list(adds,
eina_list_next(adds));
free(f2);
}
break;
@@ -288,17 +286,17 @@ run_adds(void)
/* sequentially append all songs from matching directory
structure */
empd_empdd_add_list_call(empd_proxy, file);
post_add(0, file);
- while (eina_list_next(l))
+ while (eina_list_next(adds))
{
- f2 = eina_list_data_get(eina_list_next(l));
+ f2 = eina_list_data_get(eina_list_next(adds));
if (!is_same_path(file, a, f2, NULL)) break;
empd_empdd_add_list_call(empd_proxy, f2);
post_add(0, f2);
- adds = eina_list_remove_list(adds, eina_list_next(l));
+ adds = eina_list_remove_list(adds, eina_list_next(adds));
free(f2);
}
}
-adds = eina_list_remove_list(adds, l);
+adds = eina_list_remove_list(adds, adds);
free(file);
}
}
--
[EGIT] [apps/empc] master 01/01: force updates on current song info display when queue list updates
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/apps/empc.git/commit/?id=2157ed3e66d862ecdfe45e2426155253028c84a6
commit 2157ed3e66d862ecdfe45e2426155253028c84a6
Author: zmike <michael.blumenkra...@gmail.com>
Date: Tue Sep 8 22:27:35 2015 -0400
force updates on current song info display when queue list updates
should improve handling when metadata for current song is changed
---
src/bin/empc.c | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/bin/empc.c b/src/bin/empc.c
index b81f0dc..84792f1 100644
--- a/src/bin/empc.c
+++ b/src/bin/empc.c
@@ -2896,7 +2896,21 @@ queue_list_handler(Eina_Value *value, Eina_Bool cached)
eina_hash_add(empd_current_queue, >songid, it);
}
if (so->songid == empd_songid)
- empd_song_item = it;
+ {
+ Eina_Bool title;
+
+ empd_song_item = it;
+ /* force updates in case song info has changed */
+ if ((so->artist != empd_song_artist) || (so->album !=
empd_song_album))
+ bg_update(bg_next_get(), so->artist, so->album, so->uri);
+ eina_stringshare_refplace(_song_album, so->album);
+ title = eina_stringshare_refplace(_song_title, so->title);
+ if (title || (empd_song_track != so->track))
+ elm_object_signal_emit(layout, "empc,title,change,next",
"empc");
+ empd_song_track = so->track;
+ if (eina_stringshare_refplace(_song_artist, so->artist) ||
title)
+ title_update();
+ }
if ((album != so->album) || (artist != so->artist))
{
if (itl)
--
[EGIT] [apps/empc] master 01/01: ...and go back to old-style html content-type header for xml return
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/apps/empc.git/commit/?id=5b3ef97f3a647ac0ca51da2f1d181fbc18ade6ff
commit 5b3ef97f3a647ac0ca51da2f1d181fbc18ade6ff
Author: zmike <michael.blumenkra...@gmail.com>
Date: Sun Sep 6 20:35:17 2015 -0400
...and go back to old-style html content-type header for xml return
ffs lyricwiki
---
src/modules/excetra.c | 4
1 file changed, 4 deletions(-)
diff --git a/src/modules/excetra.c b/src/modules/excetra.c
index d9f73b8..6857ba9 100644
--- a/src/modules/excetra.c
+++ b/src/modules/excetra.c
@@ -184,11 +184,7 @@ lyricwiki_complete(void *d EINA_UNUSED, int type
EINA_UNUSED, Ecore_Con_Event_Ur
tp = azy_util_transport_get(h);
if (tp == AZY_NET_TRANSPORT_JAVASCRIPT) break;
-#ifdef OLD_FETCH
if (tp == AZY_NET_TRANSPORT_HTML)
-#else
-if (tp == AZY_NET_TRANSPORT_XML)
-#endif
{
stub = EINA_FALSE;
break;
--
[EGIT] [apps/empc] master 01/01: only allow parent directory searches for filesystem loader if still in album directory
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/apps/empc.git/commit/?id=f1fe7471fd3ff81e03575fe07e14730cc0fb5ec8
commit f1fe7471fd3ff81e03575fe07e14730cc0fb5ec8
Author: zmike <michael.blumenkra...@gmail.com>
Date: Sun Sep 6 09:21:11 2015 -0400
only allow parent directory searches for filesystem loader if still in
album directory
fixes erroneous setting of cover art from other albums
---
src/modules/filesystem_loader.c | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/modules/filesystem_loader.c b/src/modules/filesystem_loader.c
index 1be6d97..983ba7b 100644
--- a/src/modules/filesystem_loader.c
+++ b/src/modules/filesystem_loader.c
@@ -134,8 +134,11 @@ fsrun(FSInfo *fsi, Ecore_Thread *eth)
if (p)
{
p[0] = 0;
- it = eina_file_stat_ls(buf);
- files = fsscan(it, files, !!fsi->req->album);
+ if (strstr(buf, fsi->req->album))
+ {
+ it = eina_file_stat_ls(buf);
+ files = fsscan(it, files, !!fsi->req->album);
+ }
}
}
ecore_thread_feedback(eth, files);
--
[EGIT] [apps/empc] master 01/02: also ensure filesystem loader recurses as expected for artist art
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/apps/empc.git/commit/?id=2ac5edb399954fbe44f0d1d403f7b1bbba007f2b
commit 2ac5edb399954fbe44f0d1d403f7b1bbba007f2b
Author: zmike <michael.blumenkra...@gmail.com>
Date: Sun Sep 6 09:26:56 2015 -0400
also ensure filesystem loader recurses as expected for artist art
---
src/modules/filesystem_loader.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/filesystem_loader.c b/src/modules/filesystem_loader.c
index 983ba7b..d616a28 100644
--- a/src/modules/filesystem_loader.c
+++ b/src/modules/filesystem_loader.c
@@ -134,7 +134,7 @@ fsrun(FSInfo *fsi, Ecore_Thread *eth)
if (p)
{
p[0] = 0;
- if (strstr(buf, fsi->req->album))
+ if (strstr(buf, fsi->req->album ?: fsi->req->artist))
{
it = eina_file_stat_ls(buf);
files = fsscan(it, files, !!fsi->req->album);
--
[EGIT] [apps/empc] master 02/02: simplify filesystem loader thread conditional
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/apps/empc.git/commit/?id=2f8bd94ee7d280bed3321a71d9a05eaf95a5ffc8
commit 2f8bd94ee7d280bed3321a71d9a05eaf95a5ffc8
Author: zmike <michael.blumenkra...@gmail.com>
Date: Sun Sep 6 09:28:52 2015 -0400
simplify filesystem loader thread conditional
---
src/modules/filesystem_loader.c | 12 ++--
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/modules/filesystem_loader.c b/src/modules/filesystem_loader.c
index d616a28..fd9397e 100644
--- a/src/modules/filesystem_loader.c
+++ b/src/modules/filesystem_loader.c
@@ -115,16 +115,8 @@ fsrun(FSInfo *fsi, Ecore_Thread *eth)
memcpy(buf, fsi->uri, MIN((unsigned int)(p - fsi->uri), sizeof(buf) -
1));
}
- if (fsi->req->album)
- {
-it = eina_file_stat_ls(isdir ? fsi->uri : buf);
-files = fsscan(it, files, EINA_TRUE);
- }
- else
- {
-it = eina_file_stat_ls(isdir ? fsi->uri : buf);
-files = fsscan(it, files, EINA_FALSE);
- }
+ it = eina_file_stat_ls(isdir ? fsi->uri : buf);
+ files = fsscan(it, files, !!fsi->req->album);
eina_iterator_free(it);
if ((!files) && (!isdir))
{
--
[EGIT] [apps/empc] master 01/01: fix prev_album skip action when activating during the first album
discomfitor pushed a commit to branch master. http://git.enlightenment.org/apps/empc.git/commit/?id=e893b6cbc1f3a971cee0e08a5be9e24f3ae7b40f commit e893b6cbc1f3a971cee0e08a5be9e24f3ae7b40f Author: zmike michael.blumenkra...@gmail.com Date: Mon Aug 17 19:51:16 2015 -0400 fix prev_album skip action when activating during the first album this should wrap back to the last album, not repeatedly skip to the first album --- src/bin/empc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bin/empc.c b/src/bin/empc.c index 653716a..fce1738 100644 --- a/src/bin/empc.c +++ b/src/bin/empc.c @@ -2963,8 +2963,10 @@ control_skip_back_album() if (!empd_song_item) return; pick = queue_list_header_prev_get(elm_genlist_item_parent_get(empd_song_item)); - if (!pick) + if ((!pick) || (pick == elm_genlist_item_parent_get(empd_song_item))) pick = elm_genlist_item_parent_get(elm_genlist_last_item_get(queue_list)); + if (!pick) + pick = elm_genlist_last_item_get(queue_list); so = elm_object_item_data_get(pick); empd_empdd_play_id_call(empd_proxy, so-songid); } --
[EGIT] [apps/empc] master 01/01: block Delete current song deletion if not in player view
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/apps/empc.git/commit/?id=8eafb3e56e32797545f4352645b633fa85670a60
commit 8eafb3e56e32797545f4352645b633fa85670a60
Author: zmike michael.blumenkra...@gmail.com
Date: Sun Jul 12 15:13:50 2015 -0400
block Delete current song deletion if not in player view
---
src/bin/empc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/empc.c b/src/bin/empc.c
index 087b57f..653716a 100644
--- a/src/bin/empc.c
+++ b/src/bin/empc.c
@@ -3139,7 +3139,7 @@ key_down(void *data EINA_UNUSED, int t EINA_UNUSED,
Ecore_Event_Key *ev)
}
if ((!strcmp(ev-key, q)) (ev-modifiers ECORE_EVENT_MODIFIER_CTRL))
ecore_main_loop_quit();
- else if (!strcmp(ev-key, Delete))
+ else if ((!ctxpopup) (!queue_list_state) (!filesystem_state)
(!strcmp(ev-key, Delete)))
{
if (empd_song_item)
{
--
[EGIT] [apps/empc] master 01/01: refresh current filesystem's realized items after completing a url paste
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/apps/empc.git/commit/?id=88a10f349733114c954860a627675e25780f6372
commit 88a10f349733114c954860a627675e25780f6372
Author: zmike michael.blumenkra...@gmail.com
Date: Thu Apr 16 08:50:38 2015 -0400
refresh current filesystem's realized items after completing a url paste
should fix race condition when attempting to load the pasted/saved url
out of the cache immediately after the paste
---
src/bin/empc.c | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/bin/empc.c b/src/bin/empc.c
index 9fa6c5e..4dc34a2 100644
--- a/src/bin/empc.c
+++ b/src/bin/empc.c
@@ -846,7 +846,6 @@ bg_paste(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, Elm_Selection_Dat
evas_object_data_set(win, __empc_bg_paste, ev);
elm_gengrid_item_update(it);
evas_object_data_del(win, __empc_bg_paste);
-elm_gengrid_item_update(it);
return EINA_TRUE;
}
switch (ev-format)
@@ -1519,6 +1518,16 @@ filesystem_item_image(void *data, Empc_Fetch_Request
*req, Evas_Object *obj)
}
static void
+filesystem_item_content_get_post_save(void)
+{
+ Eina_List *l;
+ Elm_Object_Item *it;
+
+ EINA_LIST_FOREACH(filesystems_realized, l, it)
+ elm_gengrid_item_update(it);
+}
+
+static void
filesystem_paste_download_start(void *data EINA_UNUSED, Evas_Object *obj, void
*event_info EINA_UNUSED)
{
evas_object_data_set(obj, __empc_downloading, (void*)1);
@@ -1602,14 +1611,14 @@ filesystem_item_content_get(Empc_Entity *ent,
Evas_Object *obj, const char *part
memcpy(album, p, pp - p);
album[pp - p] = 0;
if (img || uri)
- save_image(EINA_TRUE, uri ? NULL : img, uri, artist,
album, NULL);
+ save_image(EINA_TRUE, uri ? NULL : img, uri, artist,
album, uri ? filesystem_item_content_get_post_save : NULL);
else
req = metadata_fetch_begin(EMPC_METADATA_TYPE_IMAGE, obj,
artist, album, dir-uri, EINA_FALSE, EINA_FALSE, filesystem_item_image, cur);
}
else
{
if (img || uri)
- save_image(EINA_TRUE, uri ? NULL : img, uri, artist, p,
NULL);
+ save_image(EINA_TRUE, uri ? NULL : img, uri, artist, p,
uri ? filesystem_item_content_get_post_save : NULL);
else
req = metadata_fetch_begin(EMPC_METADATA_TYPE_IMAGE, obj,
artist, p, dir-uri, EINA_FALSE, EINA_FALSE, filesystem_item_image, cur);
}
@@ -1617,7 +1626,7 @@ filesystem_item_content_get(Empc_Entity *ent, Evas_Object
*obj, const char *part
else
{
if (img || uri)
-save_image(EINA_TRUE, uri ? NULL : img, uri, dir-uri, NULL,
NULL);
+save_image(EINA_TRUE, uri ? NULL : img, uri, dir-uri, NULL,
uri ? filesystem_item_content_get_post_save : NULL);
else
req = metadata_fetch_begin(EMPC_METADATA_TYPE_IMAGE, obj,
dir-uri, NULL, dir-uri, EINA_FALSE, EINA_FALSE, filesystem_item_image, cur);
}
--
[EGIT] [apps/empc] master 02/02: fix apm to add all new/updated albums, not just first album
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/apps/empc.git/commit/?id=764297867cc67275175a3e5b868fcb77b7688e67
commit 764297867cc67275175a3e5b868fcb77b7688e67
Author: zmike michael.blumenkra...@gmail.com
Date: Wed Apr 15 22:20:26 2015 -0400
fix apm to add all new/updated albums, not just first album
---
src/modules/auto_playlist_manager.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/modules/auto_playlist_manager.c
b/src/modules/auto_playlist_manager.c
index 5f8cc2e..5be64e3 100644
--- a/src/modules/auto_playlist_manager.c
+++ b/src/modules/auto_playlist_manager.c
@@ -19,6 +19,7 @@ static Ecore_Timer *update_timer;
static Eina_List *adds;
static unsigned int wait_count;
+static unsigned int last_queue_length;
static void auto_playlist_manager_shutdown(void);
@@ -187,6 +188,7 @@ run_adds(void)
char *file;
Eina_List *l, *ll;
+ last_queue_length = empd_queue_length;
EINA_LIST_FOREACH_SAFE(adds, l, ll, file)
{
const char *a, *b = NULL;
@@ -287,7 +289,7 @@ static Eina_Bool
queue_update()
{
- if (adds wait_count) wait_count--;
+ if (wait_count) wait_count -= (empd_queue_length - last_queue_length);
if (adds (!wait_count))
run_adds();
return ECORE_CALLBACK_RENEW;
--
[EGIT] [apps/empc] master 01/02: export empd_queue_length for use in modules
discomfitor pushed a commit to branch master. http://git.enlightenment.org/apps/empc.git/commit/?id=b5f571087e8cacfd74272d0e5dcddf30fee0b4df commit b5f571087e8cacfd74272d0e5dcddf30fee0b4df Author: zmike michael.blumenkra...@gmail.com Date: Wed Apr 15 22:12:55 2015 -0400 export empd_queue_length for use in modules --- src/bin/empc.c | 2 +- src/bin/empc.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin/empc.c b/src/bin/empc.c index 866a1ee..9fa6c5e 100644 --- a/src/bin/empc.c +++ b/src/bin/empc.c @@ -95,7 +95,7 @@ static Eina_Stringshare *empd_song_album = NULL; static Elm_Object_Item *empd_song_item = NULL; static unsigned int empd_song_length = 0; static unsigned int empd_song_elapsed = 0; -static unsigned int empd_queue_length = 0; +EAPI unsigned int empd_queue_length = 0; static unsigned char background_num = 0; diff --git a/src/bin/empc.h b/src/bin/empc.h index 76e3d5b..75bd398 100644 --- a/src/bin/empc.h +++ b/src/bin/empc.h @@ -76,6 +76,7 @@ void empc_metadata_image_download(Empc_Fetch_Request *req, const char *url); void empc_metadata_image_download_queue(Empc_Fetch_Request *req, const char *url); #endif extern Eina_Stringshare *empd_music_directory; +extern unsigned int empd_queue_length; extern Eina_Bool master; EAPI extern void *empd_proxy; --
[EGIT] [apps/empc] master 01/01: use int for empd_song_track
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/apps/empc.git/commit/?id=2a580715edbdd6363c44d91fa964745d6faac965
commit 2a580715edbdd6363c44d91fa964745d6faac965
Author: zmike michael.blumenkra...@gmail.com
Date: Sat Apr 11 11:43:30 2015 -0400
use int for empd_song_track
a song can have a track == 0, which results in multiple empc,bg,changed
signal
callbacks being added, which ruins cover animations
---
src/bin/empc.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/bin/empc.c b/src/bin/empc.c
index d9eb3b7..866a1ee 100644
--- a/src/bin/empc.c
+++ b/src/bin/empc.c
@@ -88,7 +88,7 @@ EAPI Eina_Hash *empd_current_queue_headers = NULL;
Eina_Stringshare *empd_music_directory = NULL;
static int empd_songid = -1;
-static unsigned int empd_song_track = 0;
+static int empd_song_track = -1;
static Eina_Stringshare *empd_song_title = NULL;
static Eina_Stringshare *empd_song_artist = NULL;
static Eina_Stringshare *empd_song_album = NULL;
@@ -933,7 +933,7 @@ album_changed(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, const char *
static void
title_text_set(void)
{
- if (empd_song_track)
+ if (empd_song_track 0)
{
char buf[1024];
@@ -1034,7 +1034,7 @@ songid_update(int songid)
/* don't allow set until song exists */
if (!so) return 0;
empd_song_item = it;
- if (!empd_song_track)
+ if (empd_song_track == -1)
elm_object_signal_callback_add(layout, empc,bg,changed, empc,
bg_changed, NULL);
empd_song_track = so-track;
eina_stringshare_refplace(empd_song_title, so-title);
@@ -2827,7 +2827,7 @@ queue_list_handler(Eina_Value *value, Eina_Bool cached)
elm_genlist_item_update(it);
if (so-songid == empd_songid)
{
-if ((so-track != (int)empd_song_track) ||
(empd_song_title != so-title))
+if ((so-track != empd_song_track) ||
(empd_song_title != so-title))
{
empd_song_track = so-track;
eina_stringshare_refplace(empd_song_title,
so-title);
--
