Remove audio/video event (use handshake instead)
This commit is contained in:
parent
eca4245566
commit
ebdc70058e
@ -1,7 +1,7 @@
|
||||
2012-10-22 Michael Jumper <zhangmzike@users.sourceforge.net>
|
||||
|
||||
* Implement protocol nesting (via "nest" instruction)
|
||||
* Add size/audio/video events
|
||||
* Add size events
|
||||
* Add guac_client_info structure to be populated during handshake
|
||||
|
||||
2012-07-23 Michael Jumper <zhangmaike@users.sourceforge.net>
|
||||
|
@ -106,20 +106,6 @@ int __guac_handle_clipboard(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
|
||||
* is received, this handler will be called. Disconnect instructions are automatically
|
||||
|
@ -355,40 +355,6 @@ struct guac_client {
|
||||
*/
|
||||
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.
|
||||
*
|
||||
|
@ -51,8 +51,6 @@ __guac_instruction_handler_mapping __guac_instruction_handler_map[] = {
|
||||
{"clipboard", __guac_handle_clipboard},
|
||||
{"disconnect", __guac_handle_disconnect},
|
||||
{"size", __guac_handle_size},
|
||||
{"audio", __guac_handle_audio},
|
||||
{"video", __guac_handle_video},
|
||||
{NULL, NULL}
|
||||
};
|
||||
|
||||
@ -128,24 +126,6 @@ int __guac_handle_size(guac_client* client, guac_instruction* instruction) {
|
||||
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) {
|
||||
/* Return error code to force disconnect */
|
||||
return -1;
|
||||
|
Loading…
Reference in New Issue
Block a user