maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove audio/video event (use handshake instead)

Browse Source
This commit is contained in:
Michael Jumper 2012-10-23 11:17:25 -07:00
parent eca4245566
commit ebdc70058e
4 changed files with 1 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libguac/ChangeLog
View File

@ -1,7 +1,7 @@
2012-10-22 Michael Jumper <zhangmzike@users.sourceforge.net> 2012-10-22 Michael Jumper <zhangmzike@users.sourceforge.net>
* Implement protocol nesting (via "nest" instruction) * Implement protocol nesting (via "nest" instruction)
* Add size/audio/video events * Add size events
* Add guac_client_info structure to be populated during handshake * Add guac_client_info structure to be populated during handshake
2012-07-23 Michael Jumper <zhangmaike@users.sourceforge.net> 2012-07-23 Michael Jumper <zhangmaike@users.sourceforge.net>

14
libguac/include/client-handlers.h
View File

@ -106,20 +106,6 @@ int __guac_handle_clipboard(guac_client* client, guac_instruction* instruction);
*/ */
int __guac_handle_size(guac_client* client, guac_instruction* instruction); int __guac_handle_size(guac_client* client, guac_instruction* instruction);
/**
* Internal initial handler for the video instruction. When a video instruction
* is received, this handler will be called. The client's video handler will
* be invoked if defined.
*/
int __guac_handle_video(guac_client* client, guac_instruction* instruction);
/**
* Internal initial handler for the audio instruction. When a audio instruction
* is received, this handler will be called. The client's audio handler will
* be invoked if defined.
*/
int __guac_handle_audio(guac_client* client, guac_instruction* instruction);
/** /**
* Internal initial handler for the disconnect instruction. When a disconnect instruction * Internal initial handler for the disconnect instruction. When a disconnect instruction
* is received, this handler will be called. Disconnect instructions are automatically * is received, this handler will be called. Disconnect instructions are automatically

34
libguac/include/client.h
View File

@ -355,40 +355,6 @@ struct guac_client {
*/ */
guac_client_size_handler* size_handler; guac_client_size_handler* size_handler;
/**
* Handler for audio format events sent by the Guacamole web-client.
*
* The handler takes the mimetype of the audio format being advertised
* as supported by the client.
*
* Example:
* @code
* int audio_handler(guac_client* client, char* mimetype);
*
* int guac_client_init(guac_client* client, int argc, char** argv) {
* client->audio_handler = audio_handler;
* }
* @endcode
*/
guac_client_audio_handler* audio_handler;
/**
* Handler for video format events sent by the Guacamole web-client.
*
* The handler takes the mimetype of the video format being advertised
* as supported by the client.
*
* Example:
* @code
* int video_handler(guac_client* client, char* mimetype);
*
* int guac_client_init(guac_client* client, int argc, char** argv) {
* client->video_handler = video_handler;
* }
* @endcode
*/
guac_client_video_handler* video_handler;
/** /**
* Handler for freeing data when the client is being unloaded. * Handler for freeing data when the client is being unloaded.
* *

20
libguac/src/client-handlers.c
View File

@ -51,8 +51,6 @@ __guac_instruction_handler_mapping __guac_instruction_handler_map[] = {
{"clipboard", __guac_handle_clipboard}, {"clipboard", __guac_handle_clipboard},
{"disconnect", __guac_handle_disconnect}, {"disconnect", __guac_handle_disconnect},
{"size", __guac_handle_size}, {"size", __guac_handle_size},
{"audio", __guac_handle_audio},
{"video", __guac_handle_video},
{NULL, NULL} {NULL, NULL}
}; };
@ -128,24 +126,6 @@ int __guac_handle_size(guac_client* client, guac_instruction* instruction) {
return 0; return 0;
} }
int __guac_handle_video(guac_client* client, guac_instruction* instruction) {
if (client->video_handler)
return client->video_handler(
client,
instruction->argv[0] /* mimetype */
);
return 0;
}
int __guac_handle_audio(guac_client* client, guac_instruction* instruction) {
if (client->audio_handler)
return client->audio_handler(
client,
instruction->argv[0] /* mimetype */
);
return 0;
}
int __guac_handle_disconnect(guac_client* client, guac_instruction* instruction) { int __guac_handle_disconnect(guac_client* client, guac_instruction* instruction) {
/* Return error code to force disconnect */ /* Return error code to force disconnect */
return -1; return -1;