scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-04-05 07:04:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'trunk'

Browse Source 
Conflicts:
	src/rtp/rtpenc_h264.c
This commit is contained in:
Martin Pulec
2014-09-09 14:42:33 +02:00
parent 206ef5ed4e cbd3ecc5ce
commit 8ea0043ed8
8 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/control_socket.cpp
View File

@@ -161,7 +161,7 @@ static fd_t create_internal_port(int *port)
}
int control_init(int port, struct control_state **state, struct module *root_module)
int control_init(int port, int connection_type, struct control_state **state, struct module *root_module)
{
control_state *s = new control_state;
@@ -174,8 +174,8 @@ int control_init(int port, struct control_state **state, struct module *root_mod
s->mod.cls = MODULE_CLASS_CONTROL;
s->mod.priv_data = s;
if(port == -1) {
s->network_port = DEFAULT_CONTROL_PORT;
if(connection_type == 0) {
s->network_port = port;
s->connection_type = SERVER;
} else {
s->network_port = port;