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

Merge pull request #93 from glyptodon/video-stream

Browse Source 
GUAC-1354: Remove duration from video instruction.
This commit is contained in:
James Muehlner 2015-10-19 11:42:17 -07:00
commit 3ebd780872
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/libguac/guacamole/protocol.h
View File

@ -375,15 +375,23 @@ int guac_protocol_send_end(guac_socket* socket, const guac_stream* stream);
* If an error occurs sending the instruction, a non-zero value is * If an error occurs sending the instruction, a non-zero value is
* returned, and guac_error is set appropriately. * returned, and guac_error is set appropriately.
* *
* @param socket The guac_socket connection to use. * @param socket
* @param stream The stream to use. * The guac_socket connection to use when sending the video instruction.
* @param layer The destination layer. *
* @param mimetype The mimetype of the data being sent. * @param stream
* @param duration The duration of the video being sent, in milliseconds. * The stream to use for future video data.
* @return Zero on success, non-zero on error. *
* @param layer
* The destination layer on which the streamed video should be played.
*
* @param mimetype
* The mimetype of the video data which will be sent over the given stream.
*
* @return
* Zero on success, non-zero on error.
*/ */
int guac_protocol_send_video(guac_socket* socket, const guac_stream* stream, int guac_protocol_send_video(guac_socket* socket, const guac_stream* stream,
const guac_layer* layer, const char* mimetype, double duration); const guac_layer* layer, const char* mimetype);
/* DRAWING INSTRUCTIONS */ /* DRAWING INSTRUCTIONS */

4
src/libguac/protocol.c
View File

@ -1074,7 +1074,7 @@ int guac_protocol_send_undefine(guac_socket* socket,
} }
int guac_protocol_send_video(guac_socket* socket, const guac_stream* stream, int guac_protocol_send_video(guac_socket* socket, const guac_stream* stream,
const guac_layer* layer, const char* mimetype, double duration) { const guac_layer* layer, const char* mimetype) {
int ret_val; int ret_val;
@ -1086,8 +1086,6 @@ int guac_protocol_send_video(guac_socket* socket, const guac_stream* stream,
|| __guac_socket_write_length_int(socket, layer->index) || __guac_socket_write_length_int(socket, layer->index)
|| guac_socket_write_string(socket, ",") || guac_socket_write_string(socket, ",")
|| __guac_socket_write_length_string(socket, mimetype) || __guac_socket_write_length_string(socket, mimetype)
|| guac_socket_write_string(socket, ",")
|| __guac_socket_write_length_double(socket, duration)
|| guac_socket_write_string(socket, ";"); || guac_socket_write_string(socket, ";");
guac_socket_instruction_end(socket); guac_socket_instruction_end(socket);