Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : apps/evfs
Dir : e17/apps/evfs/src/include
Modified Files:
evfs.h evfs_command.h evfs_commands.h evfs_event_helper.h
evfs_server_handle.h
Log Message:
* Added 'evfscat' - similar to unix cat. Allows such cool things as 'evfscat
smb://host/filename.mpg | mplayer -cache 8192 -' to play videos from a remote
filesystem
* Client exposed versions of evfs_open/evfs_close/evfs_read etc
* Integer fd support and hash mappings for remoting of file references to client
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/evfs/src/include/evfs.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- evfs.h 17 Nov 2005 08:01:56 -0000 1.29
+++ evfs.h 6 Dec 2005 06:16:58 -0000 1.30
@@ -103,7 +103,9 @@
EVFS_EV_NOTIFY_ID = 2,
EVFS_EV_STAT = 3,
EVFS_EV_DIR_LIST = 4,
- EVFS_EV_FILE_PROGRESS = 5
+ EVFS_EV_FILE_PROGRESS = 5,
+ EVFS_EV_FILE_OPEN= 6,
+ EVFS_EV_FILE_READ = 7
} evfs_eventtype;
typedef enum evfs_eventtype_sub {
@@ -123,12 +125,14 @@
EVFS_EV_PART_FILE_REFERENCE_PASSWORD = 10,
EVFS_EV_PART_PROGRESS = 11,
-
- EVFS_COMMAND_TYPE = 12,
- EVFS_FILE_REFERENCE = 13,
- EVFS_FILE_REFERENCE_PASSWORD = 14,
- EVFS_FILE_REFERENCE_USERNAME = 15,
- EVFS_COMMAND_END = 16,
+
+ EVFS_COMMAND_EXTRA = 12,
+ EVFS_COMMAND_TYPE = 13,
+ EVFS_FILE_REFERENCE = 14,
+ EVFS_FILE_REFERENCE_PASSWORD = 15,
+ EVFS_FILE_REFERENCE_USERNAME = 16,
+ EVFS_FILE_REFERENCE_FD = 17,
+ EVFS_COMMAND_END = 18,
EVFS_EV_PART_END = 1000
@@ -189,6 +193,11 @@
evfs_progress_type type;
} evfs_event_progress;
+typedef struct evfs_event_data {
+ long size;
+ char* bytes;
+} evfs_event_data;
+
//Would be good if this could be a union -> but evfs_command changes size :( */
typedef struct evfs_event {
evfs_eventtype type;
@@ -199,6 +208,8 @@
evfs_event_file_monitor file_monitor;
evfs_event_stat stat;
evfs_event_progress progress;
+
+ evfs_event_data data;
}
evfs_event;
/*---------------------------------------------------------------------*/
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/evfs/src/include/evfs_command.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evfs_command.h 16 Oct 2005 10:09:05 -0000 1.1
+++ evfs_command.h 6 Dec 2005 06:16:58 -0000 1.2
@@ -15,7 +15,9 @@
EVFS_CMD_LIST_DIR = 7,
EVFS_CMD_FILE_STAT = 8,
EVFS_CMD_FILE_OPEN = 9,
- EVFS_CMD_FILE_TEST = 10
+ EVFS_CMD_FILE_READ = 10,
+ EVFS_CMD_FILE_TEST = 11,
+
}
evfs_command_type;
@@ -23,6 +25,7 @@
typedef struct evfs_command_file {
evfs_command_type type;
int num_files;
+ int extra;
evfs_filereference** files;
}
evfs_command_file;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/evfs/src/include/evfs_commands.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evfs_commands.h 16 Oct 2005 10:09:05 -0000 1.7
+++ evfs_commands.h 6 Dec 2005 06:16:58 -0000 1.8
@@ -9,6 +9,8 @@
void evfs_client_dir_list(evfs_connection* conn, evfs_filereference* file);
void evfs_client_file_open(evfs_connection* conn, evfs_filereference* file);
void evfs_client_file_copy(evfs_connection* conn, evfs_filereference* from,
evfs_filereference* to);
+void evfs_client_file_open(evfs_connection* conn, evfs_filereference* file);
+void evfs_client_file_read(evfs_connection* conn, evfs_filereference* file,
int read_size);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/evfs/src/include/evfs_event_helper.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- evfs_event_helper.h 20 Nov 2005 12:12:33 -0000 1.9
+++ evfs_event_helper.h 6 Dec 2005 06:16:58 -0000 1.10
@@ -10,5 +10,7 @@
void evfs_stat_event_create(evfs_client* client, evfs_command* command, struct
stat* stat_obj);
void evfs_list_dir_event_create(evfs_client* client, evfs_command* command,
Ecore_List* files);
void evfs_file_progress_event_create(evfs_client* client, evfs_command*
command, double progress,evfs_progress_type type);
+void evfs_open_event_create(evfs_client* client, evfs_command* command);
+void evfs_read_event_create(evfs_client* client, evfs_command* command, char*
bytes, long size);
#endif
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/evfs/src/include/evfs_server_handle.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- evfs_server_handle.h 3 Nov 2005 12:39:46 -0000 1.9
+++ evfs_server_handle.h 6 Dec 2005 06:16:58 -0000 1.10
@@ -9,3 +9,5 @@
void evfs_handle_file_stat_command(evfs_client* client, evfs_command* command);
void evfs_handle_dir_list_command(evfs_client* client, evfs_command* command);
void evfs_handle_file_copy(evfs_client* client, evfs_command* command);
+void evfs_handle_file_open_command(evfs_client* client, evfs_command* command);
+void evfs_handle_file_read_command(evfs_client* client, evfs_command* command);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
