Enlightenment CVS committal
Author : chaos
Project : e17
Module : apps/evfs
Dir : e17/apps/evfs/src/plugins/meta
Modified Files:
evfs_meta_audio.c evfs_meta_extractor.c
Log Message:
Phase 1 of EvfsIO rewrite/cleanup:
* evfs_filereference -> EvfsFilereference
* evfs_event -> EvfsEvent/hierarchy
* Simplified IO model for EET comms client<->server
* More sane accessor functions for command files
* More logical concatenation of structs to serve multiple purposes
* Speed improvements
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/plugins/meta/evfs_meta_audio.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evfs_meta_audio.c 18 Aug 2006 23:48:23 -0000 1.3
+++ evfs_meta_audio.c 16 Aug 2007 11:31:17 -0000 1.4
@@ -74,9 +74,9 @@
char buf[100];
Evas_List* ret_list = NULL;
- evfs_meta_obj* obj;
+ EvfsMetaObject* obj;
- taglib_file = taglib_file_new(command->file_command.files[0]->path);
+ taglib_file =
taglib_file_new(evfs_command_first_file_get(command)->path);
if (!taglib_file) goto faildone;
taglib_tag = taglib_file_tag(taglib_file);
@@ -87,13 +87,13 @@
tmp = taglib_tag_artist(taglib_tag);
if (tmp) {
- obj = calloc(1,sizeof(evfs_meta_obj));
+ obj = calloc(1,sizeof(EvfsMetaObject));
obj->key = strdup("artist");
obj->value = strdup(tmp);
ret_list = evas_list_append(ret_list, obj);
} else {
- obj = calloc(1,sizeof(evfs_meta_obj));
+ obj = calloc(1,sizeof(EvfsMetaObject));
obj->key = strdup("artist");
obj->value = NULL;
ret_list = evas_list_append(ret_list, obj);
@@ -101,12 +101,12 @@
tmp = taglib_tag_title(taglib_tag);
if (tmp) {
- obj = calloc(1,sizeof(evfs_meta_obj));
+ obj = calloc(1,sizeof(EvfsMetaObject));
obj->key = strdup("title");
obj->value = strdup(tmp);
ret_list = evas_list_append(ret_list, obj);
} else {
- obj = calloc(1,sizeof(evfs_meta_obj));
+ obj = calloc(1,sizeof(EvfsMetaObject));
obj->key = strdup("title");
obj->value = NULL;
ret_list = evas_list_append(ret_list, obj);
@@ -114,12 +114,12 @@
tmp = taglib_tag_album(taglib_tag);
if (tmp) {
- obj = calloc(1,sizeof(evfs_meta_obj));
+ obj = calloc(1,sizeof(EvfsMetaObject));
obj->key = strdup("album");
obj->value = strdup(tmp);
ret_list = evas_list_append(ret_list, obj);
} else {
- obj = calloc(1,sizeof(evfs_meta_obj));
+ obj = calloc(1,sizeof(EvfsMetaObject));
obj->key = strdup("album");
obj->value = NULL;
ret_list = evas_list_append(ret_list, obj);
@@ -129,13 +129,13 @@
if(taglib_props) {
snprintf(buf, 100, "%d",
taglib_audioproperties_length(taglib_props));
- obj = calloc(1,sizeof(evfs_meta_obj));
+ obj = calloc(1,sizeof(EvfsMetaObject));
obj->key = strdup("length");
obj->value = strdup(buf);
ret_list = evas_list_append(ret_list, obj);
} else {
- obj = calloc(1,sizeof(evfs_meta_obj));
+ obj = calloc(1,sizeof(EvfsMetaObject));
obj->key = strdup("length");
obj->value = NULL;
ret_list = evas_list_append(ret_list, obj);
@@ -146,7 +146,7 @@
goto done;
faildone:
- obj = calloc(1,sizeof(evfs_meta_obj));
+ obj = calloc(1,sizeof(EvfsMetaObject));
obj->key = strdup("file");
obj->value = strdup("invalid");
ret_list = evas_list_append(ret_list, obj);
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/plugins/meta/evfs_meta_extractor.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evfs_meta_extractor.c 22 Jul 2006 16:12:46 -0000 1.4
+++ evfs_meta_extractor.c 16 Aug 2007 11:31:17 -0000 1.5
@@ -93,11 +93,11 @@
Evas_List* evfs_file_meta_retrieve(evfs_client* client, evfs_command* command)
{
Evas_List* ret_list = NULL;
- evfs_meta_obj* obj;
+ EvfsMetaObject* obj;
char* key;
- evfs_filereference* ref;
+ EvfsFilereference* ref;
- ref = command->file_command.files[0];
+ ref = evfs_command_first_file_get(command);
keywords=EXTRACTOR_getKeywords(_extractors, ref->path);
keywords=EXTRACTOR_removeDuplicateKeywords(keywords,0);
@@ -106,7 +106,7 @@
key=EXTRACTOR_getKeywordTypeAsString(keywords->keywordType);
- obj = calloc(1,sizeof(evfs_meta_obj));
+ obj = calloc(1,sizeof(EvfsMetaObject));
obj->key = strdup(key);
obj->value = strdup(keywords->keyword);
ret_list = evas_list_append(ret_list, obj);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
