enlightenment/terminology
enlightenment
/
terminology
9
6
Fork 7
Code Issues 7 Pull Requests Projects Releases Wiki Activity

fix some media handling of mp3's and music files with tyls+thumb links.

This commit is contained in:
Carsten Haitzler 2013-03-25 16:42:55 +09:00
parent 1fb9a04ad8
commit 4caebb56b7
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/termio.c
View File

@ -553,9 +553,14 @@ _smart_media_clicked(void *data, Evas_Object *obj, void *info __UNUSED__)
{ {
if (blk->link) if (blk->link)
{ {
int type = media_src_type_get(blk->link);
Config *config = termio_config_get(data); Config *config = termio_config_get(data);
if (config) if (config)
{
if ((!config->helper.inline_please) ||
(!((type == TYPE_IMG) || (type == TYPE_SCALE) ||
(type == TYPE_EDJE) || (type == TYPE_MOV))))
{ {
const char *cmd = NULL; const char *cmd = NULL;
@ -572,6 +577,8 @@ _smart_media_clicked(void *data, Evas_Object *obj, void *info __UNUSED__)
return; return;
} }
} }
file = blk->link;
}
} }
} }
evas_object_smart_callback_call(data, "popup", (void *)file); evas_object_smart_callback_call(data, "popup", (void *)file);

12
src/bin/tyls.c
View File

@ -345,12 +345,12 @@ const Cmatch fmatch[] =
{ 3, 4, 5, 9, 9, 9, "*.264", NULL}, { 3, 4, 5, 9, 9, 9, "*.264", NULL},
{ 3, 4, 5, 9, 9, 9, "*.3gp", NULL}, { 3, 4, 5, 9, 9, 9, "*.3gp", NULL},
{ 2, 3, 5, 9, 9, 9, "*.mp3", NULL}, { 2, 3, 5, 9, 9, 9, "*.mp3", "audio-x-mpeg.svg"},
{ 2, 3, 5, 9, 9, 9, "*.MP3", NULL}, { 2, 3, 5, 9, 9, 9, "*.MP3", "audio-x-mpeg.svg"},
{ 2, 3, 5, 9, 9, 9, "*.aac", NULL}, { 2, 3, 5, 9, 9, 9, "*.aac", "audio-x-generic.svg"},
{ 2, 3, 5, 9, 9, 9, "*.AAC", NULL}, { 2, 3, 5, 9, 9, 9, "*.AAC", "audio-x-generic.svg"},
{ 2, 3, 5, 9, 9, 9, "*.wav", NULL}, { 2, 3, 5, 9, 9, 9, "*.wav", "audio-x-wav.svg"},
{ 2, 3, 5, 9, 9, 9, "*.WAV", NULL}, { 2, 3, 5, 9, 9, 9, "*.WAV", "audio-x-wav.svg"},
{ 2, 3, 5, 9, 9, 9, "*.m3u", "audio-x-mp3-playlist"}, { 2, 3, 5, 9, 9, 9, "*.m3u", "audio-x-mp3-playlist"},
{ 2, 3, 5, 9, 9, 9, "*.M3U", "audio-x-mp3-playlist"}, { 2, 3, 5, 9, 9, 9, "*.M3U", "audio-x-mp3-playlist"},